diff --git a/.gitattributes b/.gitattributes index 5761e0eb5c..e8266f4046 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,13 @@ +* text working-tree-encoding=UTF-8 + # Set the default behavior, in case people don't have core.autocrlf set. * text=auto +# For safety +*.yyp text eol=crlf +*.yy text eol=crlf +*.gml text eol=crlf + # Re-classify .yy files (for GMS 2 projects) *.yy linguist-language=GML *.yyp linguist-language=GML diff --git a/.github/pr-title-checker-config.json b/.github/pr-title-checker-config.json index be898e9522..497f9249ad 100644 --- a/.github/pr-title-checker-config.json +++ b/.github/pr-title-checker-config.json @@ -1,6 +1,6 @@ { "CHECKS": { - "regexp": "((feat|fix|ci|chore|docs|test|refactor|revert|style|perf|build)(\\(.*\\))?: )|Merge branch" + "regexp": "((feat|fix|ci|chore|docs|test|refactor|revert|style|perf|build)(\\(.*\\))?!?: )|Merge branch" }, "MESSAGES": { "failure": "Invalid PR Title. Please use the following formats: `(): `. Refer to the list of [conventional commit types](https://github.com/pvdlg/conventional-commit-types?tab=readme-ov-file#commit-types)." diff --git a/.github/pr_labeler_contents.yml b/.github/pr_labeler_contents.yml index ccdec76495..77f436312d 100644 --- a/.github/pr_labeler_contents.yml +++ b/.github/pr_labeler_contents.yml @@ -40,3 +40,13 @@ labels: title: "^perf" - label: "Type: Performance" body: "(?i)(\\[performance\\]|\\[perf\\])" + +- label: "Type: Revert" + title: "^revert" +- label: "Type: Revert" + body: "(?i)\\[revert\\]" + +- label: "Type: Build" + title: "^build" +- label: "Type: Build" + body: "(?i)\\[build\\]" diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 9cfc5c257d..d2315d4e38 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,23 +1,15 @@ -### Purpose - +## Purpose and Description + - Self-descriptive. -### Describe your changes/additions - -- Self-descriptive. - -### What can/needs to be improved/changed - -- Nothing. - -### Testing done +## Testing done - None, and I understand the risks. -### Related things and/or additional context +## Related things and/or additional context -- None. +- diff --git a/.github/workflows/discord-prerelease-notification.yml b/.github/workflows/discord-prerelease-notification.yml new file mode 100644 index 0000000000..2f696e251c --- /dev/null +++ b/.github/workflows/discord-prerelease-notification.yml @@ -0,0 +1,22 @@ +name: Discord Release Notification +on: + release: + types: [prereleased] +permissions: + contents: read +jobs: + github-releases-to-discord: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: GitHub Releases to Discord + uses: SethCohen/github-releases-to-discord@v1.19.0 + with: + webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }} + username: "GitHub Releases" + content: |- + <@&1318332223232938014> + -# :warning: These builds are auto-generated. They may be **heavily unstable**, in which case try using an older build (10 exist at the same time), or divert to <#1283955919566143561>. :warning: + reduce_headings: true diff --git a/.github/workflows/gamemaker_build.yml b/.github/workflows/gamemaker_build.yml index fa9efaacf6..b9fad50eae 100644 --- a/.github/workflows/gamemaker_build.yml +++ b/.github/workflows/gamemaker_build.yml @@ -24,17 +24,18 @@ jobs: - uses: actions/checkout@v4 with: lfs: true - - - name: fetch tags - run: git fetch --tags origin - + fetch-depth: 0 + fetch-tags: true + + # Causing issues with the stable release workflow; + # - name: fetch tags + # run: git fetch --tags origin + - name: Set date-time and version info id: version_info shell: pwsh run: | # Generate current date-time directly in the format you want - git fetch --tags - Write-Output "GITHUB_EVENT_NAME is: $env:GITHUB_EVENT_NAME" if (-not "${{ inputs.build_date }}") { @@ -80,29 +81,36 @@ jobs: name: Find The yyp File run: | # Search for .yyp file recursively in the repository - $yyp = Get-ChildItem -Path ${{ github.workspace }} -Recurse -Filter *.yyp + $yypFiles = Get-ChildItem -Path ${{ github.workspace }} -Recurse -Filter ChapterMaster.yyp # Check if the file was found - if ($yyp.Count -eq 0) { - Write-Error "No .yyp file found in the repository" - exit 1 + if ($yypFiles.Count -eq 0) { + Write-Error "No .yyp file found in the repository" + exit 1 + } + + $yypPath = $yypFiles[0].FullName + + if ($yypFiles.Count -gt 1) { + Write-Host "::warning:: Multiple .yyp files found. Using the first one: $yypPath" } + # If found, output the path of the .yyp file - Write-Output "YYP file found at: $yyp" - "yyp-path=$yyp" | Out-File -FilePath $env:GITHUB_OUTPUT -Append + Write-Output "YYP file found at: $yypPath" + "yyp-path=$yypPath" | Out-File -FilePath $env:GITHUB_OUTPUT -Append # This step sets up the GameMaker build CLI tool Igor https://github.com/bscotch/igor-setup - id: igor_setup name: Setup Igor - uses: bscotch/igor-setup@v1.1.0 + uses: bscotch/igor-setup@v1.2.1 with: target-yyp: ${{ steps.find_yyp.outputs.yyp-path }} access-key: ${{ secrets.GM_ACCESS_KEY }} - + # Update the version.json file with build date and other versioning information - id: igor_build name: Build with Igor - uses: bscotch/igor-build@v1.0.3 + uses: bscotch/igor-build@v1.1.0 with: yyp-path: ${{ steps.find_yyp.outputs.yyp-path }} user-dir: ${{ steps.igor_setup.outputs.user-dir }} diff --git a/.github/workflows/release_dev.yml b/.github/workflows/release_dev.yml index 6b9e821054..0ccf153d82 100644 --- a/.github/workflows/release_dev.yml +++ b/.github/workflows/release_dev.yml @@ -11,7 +11,7 @@ on: - YYC - VM schedule: - - cron: "0 0 * * *" + - cron: "0 22 * * *" # every day at 22:00 UTC jobs: build_needed: @@ -36,32 +36,55 @@ jobs: # manual override if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then - echo "Manually triggered → build." + echo "Manually triggered → build." echo "needed=true" >> $GITHUB_OUTPUT exit 0 fi # determine commit range since last tag + # Use 2>/dev/null to suppress error if no tags exist LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "") if [ -n "$LAST_TAG" ]; then RANGE="$LAST_TAG..HEAD" + echo "Checking commits in range: $RANGE (since last tag '$LAST_TAG')" else - RANGE="HEAD" + RANGE="HEAD" # If no tags, check all commits up to HEAD + echo "No previous tags found. Checking all commits up to HEAD." fi - echo "Commit range: $RANGE" + + # Check if there are *any* commits in the range. + # git log -n 1 --format=%H will return the latest commit SHA if there's at least one. + # If the range is empty (HEAD is same as LAST_TAG), it returns nothing. + COMMITS_IN_RANGE=$(git log $RANGE -n 1 --format=%H 2>/dev/null || echo "") + + if [ -z "$COMMITS_IN_RANGE" ]; then + echo "No new commits found in the range '$RANGE'. HEAD is likely the same as the last tag ($LAST_TAG)." + echo "Skipping build as no changes since the last tagged build." + # needed is already defaulted to false, so we just exit. + exit 0 + fi + + # If we reached here, there are new commits in the range. + echo "New commits found in range '$RANGE'. Checking their messages." # collect all commit messages in range - ALL_MSGS=$(git log $RANGE --pretty=%B) + ALL_MSGS=$(git log $RANGE --pretty=%s) echo "Messages in range:" - echo "$ALL_MSGS" + # Use sed to indent messages for clarity in logs + echo "$ALL_MSGS" | sed 's/^/ /' - # only skip if every message matches exclude pattern + # only build if at least one message does NOT match exclude pattern + # The -v option inverts the match; -E enables extended regex; -q suppresses output. + # The overall command exits successfully (0) if a non-matching line is found. EXCLUDE="^(docs|chore|style|ci)" if echo "$ALL_MSGS" | grep -vEq "$EXCLUDE"; then - echo "Found non-excluded commit → build needed." + echo "Found at least one commit message not matching the exclude pattern '$EXCLUDE'." + echo "Build needed." echo "needed=true" >> $GITHUB_OUTPUT else - echo "All commits are docs/chore/style/ci → skipping build." + echo "All new commit messages match the exclude pattern '$EXCLUDE'." + echo "Skipping build." + # needed is already defaulted to false. fi prepare_release: @@ -92,26 +115,58 @@ jobs: - name: Cleanup old releases run: | - # tag_name looks like: branch-name/date + set -euo pipefail # Exit immediately if a command exits with a non-zero status + + # tag_name looks like: branch-name/date (e.g., main/2025-05-10-2220) TAG_NAME="${{ steps.tag_info.outputs.tag_name }}" - BRANCH_SUFFIX="${TAG_NAME%%/*}" - PREFIX="${BRANCH_SUFFIX}/" - echo "Checking releases with prefix: $PREFIX" + # Extract the branch prefix from the tag name (e.g., "main/") + # This assumes your tag format is always 'branch-name/date' + BRANCH_PREFIX="${TAG_NAME%%/*}/" - # Get tags starting with the prefix, sort reverse chronologically (best effort with default sort) - # Using gh release list is more reliable than just git tags if releases exist - TAGS=$(gh release list --limit 100 | awk '{print $1}' | grep "^${PREFIX}" | sort -r) + echo "Starting cleanup for releases with prefix: ${BRANCH_PREFIX}" - COUNT=0 + # --- Added Step: List all tag names found before filtering --- + echo "--- All tag names found by 'gh release list --json tagName': ---" + # Get all tag names first + ALL_TAG_NAMES=$(gh release list --limit 100 --json tagName | jq -r '.[].tagName' || true) + if [ -z "$ALL_TAG_NAMES" ]; then + echo "No releases found at all." + else + echo "$ALL_TAG_NAMES" | cat -n # List all found tags with line numbers + fi + echo "-----------------------------------------------------------" + + + # Get tag names starting with the prefix, sort reverse chronologically by tag name. + # We use the previously fetched ALL_TAG_NAMES to avoid calling gh release list again + # Use || true at the end of the pipe to prevent the step from failing if no releases match the prefix + TAGS_TO_PROCESS=$(echo "$ALL_TAG_NAMES" | grep "^${BRANCH_PREFIX}" | sort -r || true) + + if [ -z "$TAGS_TO_PROCESS" ]; then + echo "No releases found matching prefix '${BRANCH_PREFIX}'. No cleanup needed." + exit 0 + fi + + # --- The rest of the logic (count, keep, delete) remains the same --- + # Count the filtered tags + NUM_MATCHING=$(echo "$TAGS_TO_PROCESS" | wc -l) RELEASES_TO_KEEP=10 # How many releases per branch prefix to keep - for TAG in $TAGS; do + echo "Found ${NUM_MATCHING} releases matching prefix '${BRANCH_PREFIX}'. Will keep the latest $RELEASES_TO_KEEP." + + COUNT=0 + IFS=$'\n' # Set IFS to newline to correctly iterate over tags + for TAG in $TAGS_TO_PROCESS; do COUNT=$((COUNT + 1)) if [ $COUNT -gt $RELEASES_TO_KEEP ]; then echo "Deleting old release+tag: $TAG" - gh release delete "$TAG" -y --cleanup-tag || echo "Failed to delete release $TAG, maybe already deleted?" + gh release delete "$TAG" -y --cleanup-tag || echo "Warning: Failed to delete release $TAG. It may have been deleted already." + else + echo "Keeping release+tag: $TAG (it's within the latest $RELEASES_TO_KEEP)" fi done + unset IFS # Reset IFS + env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needs permissions to delete releases/tags @@ -156,14 +211,13 @@ jobs: - id: create_release name: Create a release and upload the build - uses: softprops/action-gh-release@v2 + uses: softprops/action-gh-release@v2.3.2 with: name: ${{ steps.prep_release_name.outputs.release_name }} + token: ${{ secrets.RELEASE_TOKEN_SECRET }} tag_name: ${{ needs.prepare_release.outputs.tag_name }} prerelease: true generate_release_notes: true make_latest: false files: | ./build_output/${{ needs.gamemaker_build.outputs.built_file }}/* - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release_stable.yml b/.github/workflows/release_stable.yml index 4bdd6318d3..b02ac17c52 100644 --- a/.github/workflows/release_stable.yml +++ b/.github/workflows/release_stable.yml @@ -9,27 +9,29 @@ jobs: uses: ./.github/workflows/gamemaker_build.yml secrets: inherit with: - build_date: "" yyc: true + build_date: "" release: name: Release - runs-on: windows-2022 + runs-on: ubuntu-latest needs: gamemaker_build + permissions: + contents: write steps: - - uses: actions/checkout@v4 - with: - lfs: true - - name: Download built file artifact + - id: download_artifact + name: Download built file artifact uses: actions/download-artifact@v4 with: name: built-file path: ./build_output + - id: create_release - name: Create Release - uses: softprops/action-gh-release@v2.0.9 + name: Create a release and upload the build + uses: softprops/action-gh-release@v2.3.2 with: name: ChapterMaster ${{ github.ref_name }} tag_name: ${{ github.ref_name }} + token: ${{ secrets.RELEASE_TOKEN_SECRET }} prerelease: false generate_release_notes: true make_latest: true diff --git a/.github/workflows/stale_labeler.yml b/.github/workflows/stale_labeler.yml index 6d0bb9466f..0277edc566 100644 --- a/.github/workflows/stale_labeler.yml +++ b/.github/workflows/stale_labeler.yml @@ -1,7 +1,7 @@ name: "Mark stale issues and PRs" on: schedule: - - cron: '0 0 * * *' # every day at midnight UTC + - cron: '0 22 * * *' # every day at 22:00 UTC jobs: stale: diff --git a/.gitignore b/.gitignore index 385ac1a4b2..2286793224 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,10 @@ ChapterMaster.resource_order tmp/ stitch.config.json + +objects/obj_garbage_collector/ + +# If all of your sprite sources are in this repo you can stick a "!" in front of this to track this file. Otherwise this file is machine-specific and should be ignored. +sprites.import.json +# This is a cache file for speeding up subsequent pipeline operations. It should not be tracked in git. +sprites.info.json \ No newline at end of file diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index d1d7b3e64a..db1fc93259 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -33,6 +33,7 @@ {"$GMFolder":"","%Name":"object","folderPath":"folders/Scripts/compatibility/object.yy","name":"object","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"view","folderPath":"folders/Scripts/compatibility/view.yy","name":"view","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Diplomacy","folderPath":"folders/Scripts/Diplomacy.yy","name":"Diplomacy","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"events_and_missions","folderPath":"folders/Scripts/events_and_missions.yy","name":"events_and_missions","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"fleet","folderPath":"folders/Scripts/fleet.yy","name":"fleet","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Helpers","folderPath":"folders/Scripts/Helpers.yy","name":"Helpers","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Draw Shapes","folderPath":"folders/Scripts/Helpers/Draw Shapes.yy","name":"Draw Shapes","resourceType":"GMFolder","resourceVersion":"2.0",}, @@ -40,6 +41,7 @@ {"$GMFolder":"","%Name":"Text","folderPath":"folders/Scripts/Helpers/Text.yy","name":"Text","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Interface Help","folderPath":"folders/Scripts/Interface Help.yy","name":"Interface Help","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Interface","folderPath":"folders/Scripts/Interface.yy","name":"Interface","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"marines_and_profiles","folderPath":"folders/Scripts/marines_and_profiles.yy","name":"marines_and_profiles","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Names","folderPath":"folders/Scripts/Names.yy","name":"Names","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"save_load","folderPath":"folders/Scripts/save_load.yy","name":"save_load","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Sys","folderPath":"folders/Scripts/Sys.yy","name":"Sys","resourceType":"GMFolder","resourceVersion":"2.0",}, @@ -53,6 +55,8 @@ {"$GMFolder":"","%Name":"Shaders","folderPath":"folders/Shaders.yy","name":"Shaders","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Sounds","folderPath":"folders/Sounds.yy","name":"Sounds","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Themes","folderPath":"folders/Sounds/Themes.yy","name":"Themes","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"UI","folderPath":"folders/Sounds/UI.yy","name":"UI","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"Unused","folderPath":"folders/Sounds/Unused.yy","name":"Unused","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Sprites","folderPath":"folders/Sprites.yy","name":"Sprites","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Marine Viewer","folderPath":"folders/Sprites/Marine Viewer.yy","name":"Marine Viewer","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"allies","folderPath":"folders/Sprites/Marine Viewer/allies.yy","name":"allies","resourceType":"GMFolder","resourceVersion":"2.0",}, @@ -61,6 +65,7 @@ {"$GMFolder":"","%Name":"bionics","folderPath":"folders/Sprites/Marine Viewer/bionics.yy","name":"bionics","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"body_types","folderPath":"folders/Sprites/Marine Viewer/body_types.yy","name":"body_types","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"artificer_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/artificer_complex.yy","name":"artificer_complex","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"cata_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy","name":"cata_complex","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"indomitus_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy","name":"indomitus_complex","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"mk_3_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy","name":"mk_3_complex","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"mk_4_complex","folderPath":"folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy","name":"mk_4_complex","resourceType":"GMFolder","resourceVersion":"2.0",}, @@ -105,6 +110,7 @@ {"$GMFolder":"","%Name":"Menu and Load","folderPath":"folders/Sprites/UI/New UI/Menu and Load.yy","name":"Menu and Load","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Purge","folderPath":"folders/Sprites/UI/New UI/Purge.yy","name":"Purge","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"tooltips","folderPath":"folders/Sprites/UI/New UI/tooltips.yy","name":"tooltips","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"servo_Skull","folderPath":"folders/Sprites/UI/servo_Skull.yy","name":"servo_Skull","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Unused","folderPath":"folders/Sprites/Unused.yy","name":"Unused","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Deprecated","folderPath":"folders/Sprites/Unused/Deprecated.yy","name":"Deprecated","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Groundside","folderPath":"folders/Sprites/Unused/Groundside.yy","name":"Groundside","resourceType":"GMFolder","resourceVersion":"2.0",}, @@ -112,8 +118,11 @@ {"$GMFolder":"","%Name":"Tile Sets","folderPath":"folders/Tile Sets.yy","name":"Tile Sets","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Timelines","folderPath":"folders/Timelines.yy","name":"Timelines","resourceType":"GMFolder","resourceVersion":"2.0",}, ], - "ForcedPrefabProjectReferences":[], + "ForcedPrefabProjectReferences":[ + {"link":"io.gamemaker.sdfshaders-1.0.0","name":"io.gamemaker.sdfshaders-1.0.0","path":"io.gamemaker.sdfshaders-1.0.0.yyp",}, + ], "IncludedFiles":[ + {"$GMIncludedFile":"","%Name":"sisters.json","CopyToMask":-1,"filePath":"datafiles/data/dialogue","name":"sisters.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"psychic_disciplines.json","CopyToMask":-1,"filePath":"datafiles/data","name":"psychic_disciplines.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"psychic_powers.json","CopyToMask":-1,"filePath":"datafiles/data","name":"psychic_powers.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"traits.json","CopyToMask":-1,"filePath":"datafiles/data","name":"traits.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -131,15 +140,19 @@ {"$GMIncludedFile":"","%Name":"blood_angels.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"blood_angels.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"blood_ravens.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"blood_ravens.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"carcharodons.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"carcharodons.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"celestial_lions.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"celestial_lions.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"consecrators.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"consecrators.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"conservators.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"conservators.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"crimson_fists.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"crimson_fists.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"dark_angels.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"dark_angels.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"deathwatch.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"deathwatch.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"emperors_nightmare.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"emperors_nightmare.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"flesh_tearers.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"flesh_tearers.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"imperial_fists.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"imperial_fists.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"iron_hands.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"iron_hands.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"lamenters.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"lamenters.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"minotaurs.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"minotaurs.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"raptors.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"raptors.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"raven_guard.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"raven_guard.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"red_scorpions.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"red_scorpions.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"salamanders.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/icons","name":"salamanders.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -163,6 +176,7 @@ {"$GMIncludedFile":"","%Name":"3.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/splash","name":"3.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"32.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/splash","name":"32.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"33.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/splash","name":"33.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"36.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/splash","name":"36.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"4.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/splash","name":"4.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"5.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/splash","name":"5.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"6.png","CopyToMask":-1,"filePath":"datafiles/images/creation/chapters/splash","name":"6.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -514,6 +528,10 @@ {"$GMIncludedFile":"","%Name":"31.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"31.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"32.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"32.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"33.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"33.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"34.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"34.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"35.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"35.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"36.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"36.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"37.json","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"37.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"4.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"4.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"5.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"5.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"6.JSON","CopyToMask":-1,"filePath":"datafiles/main/chapters","name":"6.JSON","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -553,6 +571,8 @@ {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/ten","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/three","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_shoulder/two","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/mycrusaderbits/crusader_helm","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, + {"$GMIncludedFile":"","%Name":"data.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/mycrusaderbits","name":"data.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"data.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Test_set","name":"data.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"1.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Test_set/test_sprite","name":"1.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, {"$GMIncludedFile":"","%Name":"use_sets.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets","name":"use_sets.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -561,7 +581,7 @@ "isEcma":false, "LibraryEmitters":[], "MetaData":{ - "IDEVersion":"2024.1300.0.785", + "IDEVersion":"2024.1400.3.974", }, "name":"ChapterMaster", "resources":[ @@ -574,6 +594,7 @@ {"id":{"name":"fnt_40k_30b","path":"fonts/fnt_40k_30b/fnt_40k_30b.yy",},}, {"id":{"name":"fnt_cul_14","path":"fonts/fnt_cul_14/fnt_cul_14.yy",},}, {"id":{"name":"fnt_cul_18","path":"fonts/fnt_cul_18/fnt_cul_18.yy",},}, + {"id":{"name":"fnt_Embossed_metal","path":"fonts/fnt_Embossed_metal/fnt_Embossed_metal.yy",},}, {"id":{"name":"fnt_fancy","path":"fonts/fnt_fancy/fnt_fancy.yy",},}, {"id":{"name":"fnt_info","path":"fonts/fnt_info/fnt_info.yy",},}, {"id":{"name":"fnt_large","path":"fonts/fnt_large/fnt_large.yy",},}, @@ -704,6 +725,7 @@ {"id":{"name":"clean_tags","path":"scripts/clean_tags/clean_tags.yy",},}, {"id":{"name":"d3d_set_fog","path":"scripts/d3d_set_fog/d3d_set_fog.yy",},}, {"id":{"name":"debugl","path":"scripts/debugl/debugl.yy",},}, + {"id":{"name":"DebugView","path":"scripts/DebugView/DebugView.yy",},}, {"id":{"name":"DiploBasicNodes","path":"scripts/DiploBasicNodes/DiploBasicNodes.yy",},}, {"id":{"name":"DiploCommonComponents","path":"scripts/DiploCommonComponents/DiploCommonComponents.yy",},}, {"id":{"name":"draw_line_dashed","path":"scripts/draw_line_dashed/draw_line_dashed.yy",},}, @@ -734,7 +756,6 @@ {"id":{"name":"scr_arti_descr","path":"scripts/scr_arti_descr/scr_arti_descr.yy",},}, {"id":{"name":"scr_audience","path":"scripts/scr_audience/scr_audience.yy",},}, {"id":{"name":"scr_battle_allies","path":"scripts/scr_battle_allies/scr_battle_allies.yy",},}, - {"id":{"name":"scr_battle_roster","path":"scripts/scr_battle_roster/scr_battle_roster.yy",},}, {"id":{"name":"scr_battle_sort","path":"scripts/scr_battle_sort/scr_battle_sort.yy",},}, {"id":{"name":"scr_bionics_count","path":"scripts/scr_bionics_count/scr_bionics_count.yy",},}, {"id":{"name":"scr_boarding_actions","path":"scripts/scr_boarding_actions/scr_boarding_actions.yy",},}, @@ -742,8 +763,11 @@ {"id":{"name":"scr_bomb_world","path":"scripts/scr_bomb_world/scr_bomb_world.yy",},}, {"id":{"name":"scr_buttons","path":"scripts/scr_buttons/scr_buttons.yy",},}, {"id":{"name":"scr_chaos_alliance_test","path":"scripts/scr_chaos_alliance_test/scr_chaos_alliance_test.yy",},}, + {"id":{"name":"scr_chapter_managent_events","path":"scripts/scr_chapter_managent_events/scr_chapter_managent_events.yy",},}, + {"id":{"name":"scr_chapter_master","path":"scripts/scr_chapter_master/scr_chapter_master.yy",},}, {"id":{"name":"scr_chapter_new","path":"scripts/scr_chapter_new/scr_chapter_new.yy",},}, {"id":{"name":"scr_chapter_random","path":"scripts/scr_chapter_random/scr_chapter_random.yy",},}, + {"id":{"name":"scr_ChapterTraits","path":"scripts/scr_ChapterTraits/scr_ChapterTraits.yy",},}, {"id":{"name":"scr_cheatcode","path":"scripts/scr_cheatcode/scr_cheatcode.yy",},}, {"id":{"name":"scr_check_equip","path":"scripts/scr_check_equip/scr_check_equip.yy",},}, {"id":{"name":"scr_choose_weighted","path":"scripts/scr_choose_weighted/scr_choose_weighted.yy",},}, @@ -764,6 +788,7 @@ {"id":{"name":"scr_creation","path":"scripts/scr_creation/scr_creation.yy",},}, {"id":{"name":"scr_crusade","path":"scripts/scr_crusade/scr_crusade.yy",},}, {"id":{"name":"scr_culture_visuals","path":"scripts/scr_culture_visuals/scr_culture_visuals.yy",},}, + {"id":{"name":"scr_DataSlate","path":"scripts/scr_DataSlate/scr_DataSlate.yy",},}, {"id":{"name":"scr_dead_marines","path":"scripts/scr_dead_marines/scr_dead_marines.yy",},}, {"id":{"name":"scr_demand","path":"scripts/scr_demand/scr_demand.yy",},}, {"id":{"name":"scr_destroy_planet","path":"scripts/scr_destroy_planet/scr_destroy_planet.yy",},}, @@ -788,6 +813,7 @@ {"id":{"name":"scr_enemy_ai_d","path":"scripts/scr_enemy_ai_d/scr_enemy_ai_d.yy",},}, {"id":{"name":"scr_enemy_ai_e","path":"scripts/scr_enemy_ai_e/scr_enemy_ai_e.yy",},}, {"id":{"name":"scr_equipment_struct","path":"scripts/scr_equipment_struct/scr_equipment_struct.yy",},}, + {"id":{"name":"scr_event_code","path":"scripts/scr_event_code/scr_event_code.yy",},}, {"id":{"name":"scr_event_dudes","path":"scripts/scr_event_dudes/scr_event_dudes.yy",},}, {"id":{"name":"scr_event_gossip","path":"scripts/scr_event_gossip/scr_event_gossip.yy",},}, {"id":{"name":"scr_event_log","path":"scripts/scr_event_log/scr_event_log.yy",},}, @@ -802,6 +828,7 @@ {"id":{"name":"scr_get_diag_integer","path":"scripts/scr_get_diag_integer/scr_get_diag_integer.yy",},}, {"id":{"name":"scr_get_diag_string","path":"scripts/scr_get_diag_string/scr_get_diag_string.yy",},}, {"id":{"name":"scr_get_item_names","path":"scripts/scr_get_item_names/scr_get_item_names.yy",},}, + {"id":{"name":"scr_gift_items","path":"scripts/scr_gift_items/scr_gift_items.yy",},}, {"id":{"name":"scr_gov_disp","path":"scripts/scr_gov_disp/scr_gov_disp.yy",},}, {"id":{"name":"scr_ground_ai_helpers","path":"scripts/scr_ground_ai_helpers/scr_ground_ai_helpers.yy",},}, {"id":{"name":"scr_has_adv","path":"scripts/scr_has_adv/scr_has_adv.yy",},}, @@ -814,6 +841,7 @@ {"id":{"name":"scr_ini_ship_cleanup","path":"scripts/scr_ini_ship_cleanup/scr_ini_ship_cleanup.yy",},}, {"id":{"name":"scr_initialize_custom","path":"scripts/scr_initialize_custom/scr_initialize_custom.yy",},}, {"id":{"name":"scr_inquisition_fleet_functions","path":"scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.yy",},}, + {"id":{"name":"scr_inquisition_inspection","path":"scripts/scr_inquisition_inspection/scr_inquisition_inspection.yy",},}, {"id":{"name":"scr_inquisition_mission","path":"scripts/scr_inquisition_mission/scr_inquisition_mission.yy",},}, {"id":{"name":"scr_item_count","path":"scripts/scr_item_count/scr_item_count.yy",},}, {"id":{"name":"scr_json_functions","path":"scripts/scr_json_functions/scr_json_functions.yy",},}, @@ -830,6 +858,7 @@ {"id":{"name":"scr_load","path":"scripts/scr_load/scr_load.yy",},}, {"id":{"name":"scr_log","path":"scripts/scr_log/scr_log.yy",},}, {"id":{"name":"scr_loyalty","path":"scripts/scr_loyalty/scr_loyalty.yy",},}, + {"id":{"name":"scr_manage_tags","path":"scripts/scr_manage_tags/scr_manage_tags.yy",},}, {"id":{"name":"scr_manage_task_selector","path":"scripts/scr_manage_task_selector/scr_manage_task_selector.yy",},}, {"id":{"name":"scr_management","path":"scripts/scr_management/scr_management.yy",},}, {"id":{"name":"scr_map_and_warp_functions","path":"scripts/scr_map_and_warp_functions/scr_map_and_warp_functions.yy",},}, @@ -857,8 +886,11 @@ {"id":{"name":"scr_player_fleet_functions","path":"scripts/scr_player_fleet_functions/scr_player_fleet_functions.yy",},}, {"id":{"name":"scr_player_ship_functions","path":"scripts/scr_player_ship_functions/scr_player_ship_functions.yy",},}, {"id":{"name":"scr_population_influence","path":"scripts/scr_population_influence/scr_population_influence.yy",},}, + {"id":{"name":"scr_popup_functions","path":"scripts/scr_popup_functions/scr_popup_functions.yy",},}, {"id":{"name":"scr_popup","path":"scripts/scr_popup/scr_popup.yy",},}, + {"id":{"name":"scr_post_battle_events","path":"scripts/scr_post_battle_events/scr_post_battle_events.yy",},}, {"id":{"name":"scr_powers","path":"scripts/scr_powers/scr_powers.yy",},}, + {"id":{"name":"scr_promote","path":"scripts/scr_promote/scr_promote.yy",},}, {"id":{"name":"scr_punit_combat_heplers","path":"scripts/scr_punit_combat_heplers/scr_punit_combat_heplers.yy",},}, {"id":{"name":"scr_purge_world","path":"scripts/scr_purge_world/scr_purge_world.yy",},}, {"id":{"name":"scr_quest","path":"scripts/scr_quest/scr_quest.yy",},}, @@ -867,9 +899,11 @@ {"id":{"name":"scr_random_marine","path":"scripts/scr_random_marine/scr_random_marine.yy",},}, {"id":{"name":"scr_recent","path":"scripts/scr_recent/scr_recent.yy",},}, {"id":{"name":"scr_recruit_data","path":"scripts/scr_recruit_data/scr_recruit_data.yy",},}, + {"id":{"name":"scr_reequip_units","path":"scripts/scr_reequip_units/scr_reequip_units.yy",},}, {"id":{"name":"scr_restart_variables","path":"scripts/scr_restart_variables/scr_restart_variables.yy",},}, {"id":{"name":"scr_return_ship","path":"scripts/scr_return_ship/scr_return_ship.yy",},}, {"id":{"name":"scr_role_count","path":"scripts/scr_role_count/scr_role_count.yy",},}, + {"id":{"name":"scr_role_setup","path":"scripts/scr_role_setup/scr_role_setup.yy",},}, {"id":{"name":"scr_roman_numerals","path":"scripts/scr_roman_numerals/scr_roman_numerals.yy",},}, {"id":{"name":"scr_roman","path":"scripts/scr_roman/scr_roman.yy",},}, {"id":{"name":"scr_roster","path":"scripts/scr_roster/scr_roster.yy",},}, @@ -899,13 +933,14 @@ {"id":{"name":"scr_struct_functions","path":"scripts/scr_struct_functions/scr_struct_functions.yy",},}, {"id":{"name":"scr_system_search_helpers","path":"scripts/scr_system_search_helpers/scr_system_search_helpers.yy",},}, {"id":{"name":"scr_system_spawn_functions","path":"scripts/scr_system_spawn_functions/scr_system_spawn_functions.yy",},}, + {"id":{"name":"scr_Table","path":"scripts/scr_Table/scr_Table.yy",},}, {"id":{"name":"scr_target","path":"scripts/scr_target/scr_target.yy",},}, {"id":{"name":"scr_text_hit","path":"scripts/scr_text_hit/scr_text_hit.yy",},}, {"id":{"name":"scr_thought","path":"scripts/scr_thought/scr_thought.yy",},}, {"id":{"name":"scr_tooltip_draw","path":"scripts/scr_tooltip_draw/scr_tooltip_draw.yy",},}, - {"id":{"name":"scr_trade_add","path":"scripts/scr_trade_add/scr_trade_add.yy",},}, {"id":{"name":"scr_trade_dep","path":"scripts/scr_trade_dep/scr_trade_dep.yy",},}, {"id":{"name":"scr_trade","path":"scripts/scr_trade/scr_trade.yy",},}, + {"id":{"name":"scr_transfer_marines","path":"scripts/scr_transfer_marines/scr_transfer_marines.yy",},}, {"id":{"name":"scr_turn_first","path":"scripts/scr_turn_first/scr_turn_first.yy",},}, {"id":{"name":"scr_ui_advisors","path":"scripts/scr_ui_advisors/scr_ui_advisors.yy",},}, {"id":{"name":"scr_ui_diplomacy","path":"scripts/scr_ui_diplomacy/scr_ui_diplomacy.yy",},}, @@ -939,6 +974,7 @@ {"id":{"name":"helm_shader","path":"shaders/helm_shader/helm_shader.yy",},}, {"id":{"name":"light_dark_shader","path":"shaders/light_dark_shader/light_dark_shader.yy",},}, {"id":{"name":"reverse_draw_shader","path":"shaders/reverse_draw_shader/reverse_draw_shader.yy",},}, + {"id":{"name":"right_left_swap_shader","path":"shaders/right_left_swap_shader/right_left_swap_shader.yy",},}, {"id":{"name":"shd_multiply_blend","path":"shaders/shd_multiply_blend/shd_multiply_blend.yy",},}, {"id":{"name":"Ship_shader","path":"shaders/Ship_shader/Ship_shader.yy",},}, {"id":{"name":"skin_tone_shader","path":"shaders/skin_tone_shader/skin_tone_shader.yy",},}, @@ -964,6 +1000,8 @@ {"id":{"name":"dsgsdgsdg","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},}, {"id":{"name":"mk7_chest_variants","path":"sprites/mk7_chest_variants/mk7_chest_variants.yy",},}, {"id":{"name":"spr_advisors","path":"sprites/spr_advisors/spr_advisors.yy",},}, + {"id":{"name":"spr_alpha_backpack","path":"sprites/spr_alpha_backpack/spr_alpha_backpack.yy",},}, + {"id":{"name":"spr_angelic_wings","path":"sprites/spr_angelic_wings/spr_angelic_wings.yy",},}, {"id":{"name":"spr_apoth_area_pad","path":"sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy",},}, {"id":{"name":"spr_apothecary_lights","path":"sprites/spr_apothecary_lights/spr_apothecary_lights.yy",},}, {"id":{"name":"spr_aquila_colors","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},}, @@ -998,6 +1036,8 @@ {"id":{"name":"spr_battle_block","path":"sprites/spr_battle_block/spr_battle_block.yy",},}, {"id":{"name":"spr_battle_block2","path":"sprites/spr_battle_block2/spr_battle_block2.yy",},}, {"id":{"name":"spr_beakie_colors","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},}, + {"id":{"name":"spr_binders_belt","path":"sprites/spr_binders_belt/spr_binders_belt.yy",},}, + {"id":{"name":"spr_binders_robe","path":"sprites/spr_binders_robe/spr_binders_robe.yy",},}, {"id":{"name":"spr_binders_robes","path":"sprites/spr_binders_robes/spr_binders_robes.yy",},}, {"id":{"name":"spr_bio_fighter","path":"sprites/spr_bio_fighter/spr_bio_fighter.yy",},}, {"id":{"name":"spr_bionic_eye_2","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},}, @@ -1014,6 +1054,7 @@ {"id":{"name":"spr_bionics_leg_2","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},}, {"id":{"name":"spr_bionics_leg_3","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},}, {"id":{"name":"spr_bionics_leg","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},}, + {"id":{"name":"spr_blank","path":"sprites/spr_blank/spr_blank.yy",},}, {"id":{"name":"spr_blog","path":"sprites/spr_blog/spr_blog.yy",},}, {"id":{"name":"spr_bolt","path":"sprites/spr_bolt/spr_bolt.yy",},}, {"id":{"name":"spr_bonding_studs_left","path":"sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy",},}, @@ -1021,9 +1062,41 @@ {"id":{"name":"spr_build_tiny","path":"sprites/spr_build_tiny/spr_build_tiny.yy",},}, {"id":{"name":"spr_build_tiny2","path":"sprites/spr_build_tiny2/spr_build_tiny2.yy",},}, {"id":{"name":"spr_bullet","path":"sprites/spr_bullet/spr_bullet.yy",},}, + {"id":{"name":"spr_buy_tiny","path":"sprites/spr_buy_tiny/spr_buy_tiny.yy",},}, {"id":{"name":"spr_cancel_small","path":"sprites/spr_cancel_small/spr_cancel_small.yy",},}, {"id":{"name":"spr_cannon","path":"sprites/spr_cannon/spr_cannon.yy",},}, {"id":{"name":"spr_carrion_breath","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},}, + {"id":{"name":"spr_cata_belt","path":"sprites/spr_cata_belt/spr_cata_belt.yy",},}, + {"id":{"name":"spr_cata_complex","path":"sprites/spr_cata_complex/spr_cata_complex.yy",},}, + {"id":{"name":"spr_cata_cowl_trim_1","path":"sprites/spr_cata_cowl_trim_1/spr_cata_cowl_trim_1.yy",},}, + {"id":{"name":"spr_cata_cowl_trim","path":"sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy",},}, + {"id":{"name":"spr_cata_gorget","path":"sprites/spr_cata_gorget/spr_cata_gorget.yy",},}, + {"id":{"name":"spr_cata_head","path":"sprites/spr_cata_head/spr_cata_head.yy",},}, + {"id":{"name":"spr_cata_heavy_toe_left","path":"sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy",},}, + {"id":{"name":"spr_cata_heavy_toe_right","path":"sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy",},}, + {"id":{"name":"spr_cata_left_arm","path":"sprites/spr_cata_left_arm/spr_cata_left_arm.yy",},}, + {"id":{"name":"spr_cata_left_armtrim","path":"sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy",},}, + {"id":{"name":"spr_cata_left_knee","path":"sprites/spr_cata_left_knee/spr_cata_left_knee.yy",},}, + {"id":{"name":"spr_cata_left_leg","path":"sprites/spr_cata_left_leg/spr_cata_left_leg.yy",},}, + {"id":{"name":"spr_cata_left_trim_1","path":"sprites/spr_cata_left_trim_1/spr_cata_left_trim_1.yy",},}, + {"id":{"name":"spr_cata_left_trim_2","path":"sprites/spr_cata_left_trim_2/spr_cata_left_trim_2.yy",},}, + {"id":{"name":"spr_cata_left_trim","path":"sprites/spr_cata_left_trim/spr_cata_left_trim.yy",},}, + {"id":{"name":"spr_cata_right_arm","path":"sprites/spr_cata_right_arm/spr_cata_right_arm.yy",},}, + {"id":{"name":"spr_cata_right_armtrim","path":"sprites/spr_cata_right_armtrim/spr_cata_right_armtrim.yy",},}, + {"id":{"name":"spr_cata_right_knee","path":"sprites/spr_cata_right_knee/spr_cata_right_knee.yy",},}, + {"id":{"name":"spr_cata_right_leg","path":"sprites/spr_cata_right_leg/spr_cata_right_leg.yy",},}, + {"id":{"name":"spr_cata_right_trim_1","path":"sprites/spr_cata_right_trim_1/spr_cata_right_trim_1.yy",},}, + {"id":{"name":"spr_cata_right_trim_2","path":"sprites/spr_cata_right_trim_2/spr_cata_right_trim_2.yy",},}, + {"id":{"name":"spr_cata_right_trim","path":"sprites/spr_cata_right_trim/spr_cata_right_trim.yy",},}, + {"id":{"name":"spr_cata_shoulder_hanging_leather_left_tips","path":"sprites/spr_cata_shoulder_hanging_leather_left_tips/spr_cata_shoulder_hanging_leather_left_tips.yy",},}, + {"id":{"name":"spr_cata_shoulder_hanging_leather_left","path":"sprites/spr_cata_shoulder_hanging_leather_left/spr_cata_shoulder_hanging_leather_left.yy",},}, + {"id":{"name":"spr_cata_shoulder_hanging_leather_right_tips","path":"sprites/spr_cata_shoulder_hanging_leather_right_tips/spr_cata_shoulder_hanging_leather_right_tips.yy",},}, + {"id":{"name":"spr_cata_shoulder_hanging_leather_right","path":"sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy",},}, + {"id":{"name":"spr_cata_shoulder_hanging_mail_left","path":"sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy",},}, + {"id":{"name":"spr_cata_shoulder_hanging_mail_right","path":"sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy",},}, + {"id":{"name":"spr_cata_tabbard_leather_hangings","path":"sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy",},}, + {"id":{"name":"spr_cata_tabbard_leather","path":"sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy",},}, + {"id":{"name":"spr_cata_tabbard_mail","path":"sprites/spr_cata_tabbard_mail/spr_cata_tabbard_mail.yy",},}, {"id":{"name":"spr_chain_mail_tabbard","path":"sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy",},}, {"id":{"name":"spr_chap_area_pad","path":"sprites/spr_chap_area_pad/spr_chap_area_pad.yy",},}, {"id":{"name":"spr_chap_trim_left","path":"sprites/spr_chap_trim_left/spr_chap_trim_left.yy",},}, @@ -1033,7 +1106,9 @@ {"id":{"name":"spr_chaplain_wolf_helm","path":"sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy",},}, {"id":{"name":"spr_chaplain_wolfterm_helm","path":"sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy",},}, {"id":{"name":"spr_charisma_icon","path":"sprites/spr_charisma_icon/spr_charisma_icon.yy",},}, + {"id":{"name":"spr_checker_texture_small","path":"sprites/spr_checker_texture_small/spr_checker_texture_small.yy",},}, {"id":{"name":"spr_checker_texture","path":"sprites/spr_checker_texture/spr_checker_texture.yy",},}, + {"id":{"name":"spr_clear_checker","path":"sprites/spr_clear_checker/spr_clear_checker.yy",},}, {"id":{"name":"spr_cloak_cloth","path":"sprites/spr_cloak_cloth/spr_cloak_cloth.yy",},}, {"id":{"name":"spr_cloak_fur","path":"sprites/spr_cloak_fur/spr_cloak_fur.yy",},}, {"id":{"name":"spr_cloak_image_0","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},}, @@ -1043,8 +1118,14 @@ {"id":{"name":"spr_clothing_colors","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},}, {"id":{"name":"spr_cm_specialty","path":"sprites/spr_cm_specialty/spr_cm_specialty.yy",},}, {"id":{"name":"spr_cog_pinion","path":"sprites/spr_cog_pinion/spr_cog_pinion.yy",},}, + {"id":{"name":"spr_combat_shield_bottom_part","path":"sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy",},}, {"id":{"name":"spr_company_title","path":"sprites/spr_company_title/spr_company_title.yy",},}, {"id":{"name":"spr_constitution_icon","path":"sprites/spr_constitution_icon/spr_constitution_icon.yy",},}, + {"id":{"name":"spr_Contemptor_assault_cannon","path":"sprites/spr_Contemptor_assault_cannon/spr_Contemptor_assault_cannon.yy",},}, + {"id":{"name":"spr_contemptor_CCW","path":"sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy",},}, + {"id":{"name":"spr_contemptor_chasis_colors","path":"sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy",},}, + {"id":{"name":"spr_Contemptor_Conversion_Beamer","path":"sprites/spr_Contemptor_Conversion_Beamer/spr_Contemptor_Conversion_Beamer.yy",},}, + {"id":{"name":"spr_contemptor_head_colors","path":"sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy",},}, {"id":{"name":"spr_craftworld","path":"sprites/spr_craftworld/spr_craftworld.yy",},}, {"id":{"name":"spr_creation_arrow","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},}, {"id":{"name":"spr_creation_check","path":"sprites/spr_creation_check/spr_creation_check.yy",},}, @@ -1056,9 +1137,11 @@ {"id":{"name":"spr_creation_slate","path":"sprites/spr_creation_slate/spr_creation_slate.yy",},}, {"id":{"name":"spr_credits_bg","path":"sprites/spr_credits_bg/spr_credits_bg.yy",},}, {"id":{"name":"spr_crusader","path":"sprites/spr_crusader/spr_crusader.yy",},}, + {"id":{"name":"spr_crux_belt_fancy","path":"sprites/spr_crux_belt_fancy/spr_crux_belt_fancy.yy",},}, {"id":{"name":"spr_crux_on_chain","path":"sprites/spr_crux_on_chain/spr_crux_on_chain.yy",},}, {"id":{"name":"spr_cthonian_tabbard","path":"sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy",},}, {"id":{"name":"spr_cursor","path":"sprites/spr_cursor/spr_cursor.yy",},}, + {"id":{"name":"spr_cyclone_launcher","path":"sprites/spr_cyclone_launcher/spr_cyclone_launcher.yy",},}, {"id":{"name":"spr_da_backpack","path":"sprites/spr_da_backpack/spr_da_backpack.yy",},}, {"id":{"name":"spr_da_chaplain","path":"sprites/spr_da_chaplain/spr_da_chaplain.yy",},}, {"id":{"name":"spr_da_mk3","path":"sprites/spr_da_mk3/spr_da_mk3.yy",},}, @@ -1076,6 +1159,7 @@ {"id":{"name":"spr_darkstar","path":"sprites/spr_darkstar/spr_darkstar.yy",},}, {"id":{"name":"spr_data_slate_back","path":"sprites/spr_data_slate_back/spr_data_slate_back.yy",},}, {"id":{"name":"spr_data_slate_border","path":"sprites/spr_data_slate_border/spr_data_slate_border.yy",},}, + {"id":{"name":"spr_data_slate_corner_decoration","path":"sprites/spr_data_slate_corner_decoration/spr_data_slate_corner_decoration.yy",},}, {"id":{"name":"spr_data_slate","path":"sprites/spr_data_slate/spr_data_slate.yy",},}, {"id":{"name":"spr_death_watch_pauldron","path":"sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy",},}, {"id":{"name":"spr_def_fortress","path":"sprites/spr_def_fortress/spr_def_fortress.yy",},}, @@ -1141,6 +1225,7 @@ {"id":{"name":"spr_formation_splash","path":"sprites/spr_formation_splash/spr_formation_splash.yy",},}, {"id":{"name":"spr_fur_tabbard","path":"sprites/spr_fur_tabbard/spr_fur_tabbard.yy",},}, {"id":{"name":"spr_fur_tail_topknot","path":"sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy",},}, + {"id":{"name":"spr_gear_apoth_eye","path":"sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy",},}, {"id":{"name":"spr_gear_apoth","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},}, {"id":{"name":"spr_gear_chap","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},}, {"id":{"name":"spr_gear_combat_shield","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},}, @@ -1180,6 +1265,7 @@ {"id":{"name":"spr_heresy_colors","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},}, {"id":{"name":"spr_hero_skull","path":"sprites/spr_hero_skull/spr_hero_skull.yy",},}, {"id":{"name":"spr_hero","path":"sprites/spr_hero/spr_hero.yy",},}, + {"id":{"name":"spr_holo_pad","path":"sprites/spr_holo_pad/spr_holo_pad.yy",},}, {"id":{"name":"spr_honor_helm","path":"sprites/spr_honor_helm/spr_honor_helm.yy",},}, {"id":{"name":"spr_icon_apothecarion","path":"sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy",},}, {"id":{"name":"spr_icon_ballistic_skill","path":"sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy",},}, @@ -1209,7 +1295,12 @@ {"id":{"name":"spr_indomitus_backpack_variants","path":"sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy",},}, {"id":{"name":"spr_indomitus_belt","path":"sprites/spr_indomitus_belt/spr_indomitus_belt.yy",},}, {"id":{"name":"spr_indomitus_chest_variants","path":"sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy",},}, + {"id":{"name":"spr_indomitus_complex_psy_hood_cables","path":"sprites/spr_indomitus_complex_psy_hood_cables/spr_indomitus_complex_psy_hood_cables.yy",},}, + {"id":{"name":"spr_indomitus_complex_psy_hood_crown","path":"sprites/spr_indomitus_complex_psy_hood_crown/spr_indomitus_complex_psy_hood_crown.yy",},}, + {"id":{"name":"spr_indomitus_complex_psy_hood","path":"sprites/spr_indomitus_complex_psy_hood/spr_indomitus_complex_psy_hood.yy",},}, + {"id":{"name":"spr_indomitus_complex_shadows","path":"sprites/spr_indomitus_complex_shadows/spr_indomitus_complex_shadows.yy",},}, {"id":{"name":"spr_indomitus_complex","path":"sprites/spr_indomitus_complex/spr_indomitus_complex.yy",},}, + {"id":{"name":"spr_indomitus_head_variants_shadows","path":"sprites/spr_indomitus_head_variants_shadows/spr_indomitus_head_variants_shadows.yy",},}, {"id":{"name":"spr_indomitus_head_variants","path":"sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy",},}, {"id":{"name":"spr_indomitus_knightly_robe","path":"sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy",},}, {"id":{"name":"spr_indomitus_left_arm_bionic","path":"sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy",},}, @@ -1217,13 +1308,17 @@ {"id":{"name":"spr_indomitus_left_eye_bionic","path":"sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy",},}, {"id":{"name":"spr_indomitus_left_knee_crux","path":"sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy",},}, {"id":{"name":"spr_indomitus_left_leg_bionic","path":"sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy",},}, + {"id":{"name":"spr_indomitus_left_shin_shadow","path":"sprites/spr_indomitus_left_shin_shadow/spr_indomitus_left_shin_shadow.yy",},}, {"id":{"name":"spr_indomitus_left_shin","path":"sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy",},}, + {"id":{"name":"spr_indomitus_leg_variants_shadows","path":"sprites/spr_indomitus_leg_variants_shadows/spr_indomitus_leg_variants_shadows.yy",},}, {"id":{"name":"spr_indomitus_leg_variants","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},}, {"id":{"name":"spr_indomitus_right_arm_bionic","path":"sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy",},}, + {"id":{"name":"spr_indomitus_right_arm_shadows","path":"sprites/spr_indomitus_right_arm_shadows/spr_indomitus_right_arm_shadows.yy",},}, {"id":{"name":"spr_indomitus_right_arm","path":"sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy",},}, {"id":{"name":"spr_indomitus_right_eye_bionic","path":"sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy",},}, {"id":{"name":"spr_indomitus_right_knee_crux","path":"sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy",},}, {"id":{"name":"spr_indomitus_right_leg_bionic","path":"sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy",},}, + {"id":{"name":"spr_indomitus_right_shin_shadows","path":"sprites/spr_indomitus_right_shin_shadows/spr_indomitus_right_shin_shadows.yy",},}, {"id":{"name":"spr_indomitus_right_shin","path":"sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy",},}, {"id":{"name":"spr_ingame_menu","path":"sprites/spr_ingame_menu/spr_ingame_menu.yy",},}, {"id":{"name":"spr_inspect_small","path":"sprites/spr_inspect_small/spr_inspect_small.yy",},}, @@ -1231,6 +1326,7 @@ {"id":{"name":"spr_iron_colors","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},}, {"id":{"name":"spr_iron2_colors","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},}, {"id":{"name":"spr_jump_pack_complex","path":"sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy",},}, + {"id":{"name":"spr_jump_pack_serpha_complex","path":"sprites/spr_jump_pack_serpha_complex/spr_jump_pack_serpha_complex.yy",},}, {"id":{"name":"spr_knightly_belt","path":"sprites/spr_knightly_belt/spr_knightly_belt.yy",},}, {"id":{"name":"spr_knightly_personal_livery","path":"sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy",},}, {"id":{"name":"spr_knightly_robes","path":"sprites/spr_knightly_robes/spr_knightly_robes.yy",},}, @@ -1281,6 +1377,7 @@ {"id":{"name":"spr_maximus_colors2","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},}, {"id":{"name":"spr_medicine_icon","path":"sprites/spr_medicine_icon/spr_medicine_icon.yy",},}, {"id":{"name":"spr_melta","path":"sprites/spr_melta/spr_melta.yy",},}, + {"id":{"name":"spr_metal_tabbard_shadow","path":"sprites/spr_metal_tabbard_shadow/spr_metal_tabbard_shadow.yy",},}, {"id":{"name":"spr_metal_tabbard","path":"sprites/spr_metal_tabbard/spr_metal_tabbard.yy",},}, {"id":{"name":"spr_mk3_belt","path":"sprites/spr_mk3_belt/spr_mk3_belt.yy",},}, {"id":{"name":"spr_mk3_chest","path":"sprites/spr_mk3_chest/spr_mk3_chest.yy",},}, @@ -1290,13 +1387,14 @@ {"id":{"name":"spr_mk3_forehead_variants","path":"sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy",},}, {"id":{"name":"spr_mk3_head_variants","path":"sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy",},}, {"id":{"name":"spr_mk3_left_arm","path":"sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy",},}, - {"id":{"name":"spr_mk3_left_leg_variants","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},}, + {"id":{"name":"spr_mk3_left_knee","path":"sprites/spr_mk3_left_knee/spr_mk3_left_knee.yy",},}, {"id":{"name":"spr_mk3_left_trim","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},}, {"id":{"name":"spr_mk3_mouth_flame_cult","path":"sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy",},}, {"id":{"name":"spr_mk3_mouth_prussian","path":"sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy",},}, {"id":{"name":"spr_mk3_mouth","path":"sprites/spr_mk3_mouth/spr_mk3_mouth.yy",},}, + {"id":{"name":"spr_mk3_right_arm_shadow","path":"sprites/spr_mk3_right_arm_shadow/spr_mk3_right_arm_shadow.yy",},}, {"id":{"name":"spr_mk3_right_arm","path":"sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy",},}, - {"id":{"name":"spr_mk3_right_leg_variants","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},}, + {"id":{"name":"spr_mk3_right_knee","path":"sprites/spr_mk3_right_knee/spr_mk3_right_knee.yy",},}, {"id":{"name":"spr_mk3_right_trim","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},}, {"id":{"name":"spr_mk3_runic_chest","path":"sprites/spr_mk3_runic_chest/spr_mk3_runic_chest.yy",},}, {"id":{"name":"spr_mk4_chest_fastenings","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},}, @@ -1311,6 +1409,7 @@ {"id":{"name":"spr_mk4_mongol_chest_variants","path":"sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy",},}, {"id":{"name":"spr_mk4_mongol_hat","path":"sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy",},}, {"id":{"name":"spr_mk4_mouth_variants","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},}, + {"id":{"name":"spr_mk4_right_arm_shadow","path":"sprites/spr_mk4_right_arm_shadow/spr_mk4_right_arm_shadow.yy",},}, {"id":{"name":"spr_mk4_right_arm","path":"sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy",},}, {"id":{"name":"spr_mk4_right_trim","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},}, {"id":{"name":"spr_mk5_chest_variants","path":"sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy",},}, @@ -1319,6 +1418,7 @@ {"id":{"name":"spr_mk5_complex","path":"sprites/spr_mk5_complex/spr_mk5_complex.yy",},}, {"id":{"name":"spr_mk5_head_variants","path":"sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy",},}, {"id":{"name":"spr_mk5_left_arm","path":"sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy",},}, + {"id":{"name":"spr_mk5_right_arm_shadow","path":"sprites/spr_mk5_right_arm_shadow/spr_mk5_right_arm_shadow.yy",},}, {"id":{"name":"spr_mk5_right_arm","path":"sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy",},}, {"id":{"name":"spr_mk5_samuri_faceplate","path":"sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy",},}, {"id":{"name":"spr_mk6_complex_backpack","path":"sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy",},}, @@ -1335,11 +1435,14 @@ {"id":{"name":"spr_mk7_chest_ultra","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},}, {"id":{"name":"spr_mk7_chest_variants","path":"sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy",},}, {"id":{"name":"spr_mk7_colors","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},}, + {"id":{"name":"spr_mk7_complex_backpack_shadow","path":"sprites/spr_mk7_complex_backpack_shadow/spr_mk7_complex_backpack_shadow.yy",},}, {"id":{"name":"spr_mk7_complex_backpack","path":"sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy",},}, {"id":{"name":"spr_mk7_complex_belt","path":"sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy",},}, {"id":{"name":"spr_mk7_complex_crux_belt","path":"sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy",},}, {"id":{"name":"spr_mk7_complex_knees","path":"sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy",},}, - {"id":{"name":"spr_mk7_complex_left_pauldron","path":"sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy",},}, + {"id":{"name":"spr_mk7_complex_left_knee_1","path":"sprites/spr_mk7_complex_left_knee_1/spr_mk7_complex_left_knee_1.yy",},}, + {"id":{"name":"spr_mk7_complex_right_knee","path":"sprites/spr_mk7_complex_right_knee/spr_mk7_complex_right_knee.yy",},}, + {"id":{"name":"spr_mk7_complex_right_pauldron_shadow","path":"sprites/spr_mk7_complex_right_pauldron_shadow/spr_mk7_complex_right_pauldron_shadow.yy",},}, {"id":{"name":"spr_mk7_complex_right_pauldron","path":"sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy",},}, {"id":{"name":"spr_mk7_complex","path":"sprites/spr_mk7_complex/spr_mk7_complex.yy",},}, {"id":{"name":"spr_mk7_full_colour","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},}, @@ -1348,11 +1451,13 @@ {"id":{"name":"spr_mk7_knightly_chest","path":"sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy",},}, {"id":{"name":"spr_mk7_left_arm","path":"sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy",},}, {"id":{"name":"spr_mk7_left_trim","path":"sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy",},}, + {"id":{"name":"spr_mk7_leg_variants_shadows","path":"sprites/spr_mk7_leg_variants_shadows/spr_mk7_leg_variants_shadows.yy",},}, {"id":{"name":"spr_mk7_leg_variants","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},}, {"id":{"name":"spr_mk7_mongol_chest_variants","path":"sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy",},}, {"id":{"name":"spr_mk7_mouth_prussian","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},}, {"id":{"name":"spr_mk7_mouth_variants","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},}, {"id":{"name":"spr_mk7_prussia_chest","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},}, + {"id":{"name":"spr_mk7_right_arm_shadow","path":"sprites/spr_mk7_right_arm_shadow/spr_mk7_right_arm_shadow.yy",},}, {"id":{"name":"spr_mk7_right_arm","path":"sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy",},}, {"id":{"name":"spr_mk7_right_trim","path":"sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy",},}, {"id":{"name":"spr_mk7_rope_belt","path":"sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy",},}, @@ -1363,6 +1468,7 @@ {"id":{"name":"spr_mk7_wolf_cult_chest_variants","path":"sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy",},}, {"id":{"name":"spr_mk8_colors","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},}, {"id":{"name":"spr_mk8_gorget","path":"sprites/spr_mk8_gorget/spr_mk8_gorget.yy",},}, + {"id":{"name":"spr_mk8_gorgot_shadows","path":"sprites/spr_mk8_gorgot_shadows/spr_mk8_gorgot_shadows.yy",},}, {"id":{"name":"spr_mm_butts_small","path":"sprites/spr_mm_butts_small/spr_mm_butts_small.yy",},}, {"id":{"name":"spr_mm_butts","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},}, {"id":{"name":"spr_mm_glow","path":"sprites/spr_mm_glow/spr_mm_glow.yy",},}, @@ -1396,6 +1502,10 @@ {"id":{"name":"spr_pixel_button_left","path":"sprites/spr_pixel_button_left/spr_pixel_button_left.yy",},}, {"id":{"name":"spr_pixel_button_middle","path":"sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy",},}, {"id":{"name":"spr_pixel_button_right","path":"sprites/spr_pixel_button_right/spr_pixel_button_right.yy",},}, + {"id":{"name":"spr_pixel_camo_texture","path":"sprites/spr_pixel_camo_texture/spr_pixel_camo_texture.yy",},}, + {"id":{"name":"spr_pixel_cherub","path":"sprites/spr_pixel_cherub/spr_pixel_cherub.yy",},}, + {"id":{"name":"spr_pixel_servo_skull","path":"sprites/spr_pixel_servo_skull/spr_pixel_servo_skull.yy",},}, + {"id":{"name":"spr_planet_screen_servo_holder","path":"sprites/spr_planet_screen_servo_holder/spr_planet_screen_servo_holder.yy",},}, {"id":{"name":"spr_planet_screen","path":"sprites/spr_planet_screen/spr_planet_screen.yy",},}, {"id":{"name":"spr_planet_splash","path":"sprites/spr_planet_splash/spr_planet_splash.yy",},}, {"id":{"name":"spr_planets","path":"sprites/spr_planets/spr_planets.yy",},}, @@ -1411,8 +1521,13 @@ {"id":{"name":"spr_popup","path":"sprites/spr_popup/spr_popup.yy",},}, {"id":{"name":"spr_postbattle_space","path":"sprites/spr_postbattle_space/spr_postbattle_space.yy",},}, {"id":{"name":"spr_postbattle","path":"sprites/spr_postbattle/spr_postbattle.yy",},}, + {"id":{"name":"spr_pow_sword_blade_additions","path":"sprites/spr_pow_sword_blade_additions/spr_pow_sword_blade_additions.yy",},}, + {"id":{"name":"spr_pow_sword_cross_guard","path":"sprites/spr_pow_sword_cross_guard/spr_pow_sword_cross_guard.yy",},}, {"id":{"name":"spr_prussian_spike","path":"sprites/spr_prussian_spike/spr_prussian_spike.yy",},}, + {"id":{"name":"spr_psy_hood_alpha","path":"sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy",},}, + {"id":{"name":"spr_psy_hood_alpha2","path":"sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy",},}, {"id":{"name":"spr_psy_hood_complex","path":"sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy",},}, + {"id":{"name":"spr_psy_hood_components","path":"sprites/spr_psy_hood_components/spr_psy_hood_components.yy",},}, {"id":{"name":"spr_psy_hood","path":"sprites/spr_psy_hood/spr_psy_hood.yy",},}, {"id":{"name":"spr_pulse","path":"sprites/spr_pulse/spr_pulse.yy",},}, {"id":{"name":"spr_purge_1","path":"sprites/spr_purge_1/spr_purge_1.yy",},}, @@ -1427,6 +1542,7 @@ {"id":{"name":"spr_railgun","path":"sprites/spr_railgun/spr_railgun.yy",},}, {"id":{"name":"spr_rectangle","path":"sprites/spr_rectangle/spr_rectangle.yy",},}, {"id":{"name":"spr_red_button","path":"sprites/spr_red_button/spr_red_button.yy",},}, + {"id":{"name":"spr_red_scale_texture","path":"sprites/spr_red_scale_texture/spr_red_scale_texture.yy",},}, {"id":{"name":"spr_requisition","path":"sprites/spr_requisition/spr_requisition.yy",},}, {"id":{"name":"spr_research_bar","path":"sprites/spr_research_bar/spr_research_bar.yy",},}, {"id":{"name":"spr_rg_mk5_helm","path":"sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy",},}, @@ -1439,6 +1555,7 @@ {"id":{"name":"spr_rocket_ork","path":"sprites/spr_rocket_ork/spr_rocket_ork.yy",},}, {"id":{"name":"spr_rocket_whirl","path":"sprites/spr_rocket_whirl/spr_rocket_whirl.yy",},}, {"id":{"name":"spr_rocket","path":"sprites/spr_rocket/spr_rocket.yy",},}, + {"id":{"name":"spr_roman_centurian_crest_shadows","path":"sprites/spr_roman_centurian_crest_shadows/spr_roman_centurian_crest_shadows.yy",},}, {"id":{"name":"spr_roman_centurian_crest","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},}, {"id":{"name":"spr_roman_cloak","path":"sprites/spr_roman_cloak/spr_roman_cloak.yy",},}, {"id":{"name":"spr_roman_tabbard","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},}, @@ -1461,10 +1578,15 @@ {"id":{"name":"spr_scout_left","path":"sprites/spr_scout_left/spr_scout_left.yy",},}, {"id":{"name":"spr_scout_new","path":"sprites/spr_scout_new/spr_scout_new.yy",},}, {"id":{"name":"spr_scout_right","path":"sprites/spr_scout_right/spr_scout_right.yy",},}, + {"id":{"name":"spr_sell_tiny","path":"sprites/spr_sell_tiny/spr_sell_tiny.yy",},}, {"id":{"name":"spr_servo_arm","path":"sprites/spr_servo_arm/spr_servo_arm.yy",},}, {"id":{"name":"spr_servo_harness","path":"sprites/spr_servo_harness/spr_servo_harness.yy",},}, + {"id":{"name":"spr_servo_left_arm","path":"sprites/spr_servo_left_arm/spr_servo_left_arm.yy",},}, + {"id":{"name":"spr_servo_right_arm","path":"sprites/spr_servo_right_arm/spr_servo_right_arm.yy",},}, + {"id":{"name":"spr_servo_skull_head","path":"sprites/spr_servo_skull_head/spr_servo_skull_head.yy",},}, {"id":{"name":"spr_settings_bg","path":"sprites/spr_settings_bg/spr_settings_bg.yy",},}, {"id":{"name":"spr_settings_button","path":"sprites/spr_settings_button/spr_settings_button.yy",},}, + {"id":{"name":"spr_sgt_forehead","path":"sprites/spr_sgt_forehead/spr_sgt_forehead.yy",},}, {"id":{"name":"spr_ship_aconite","path":"sprites/spr_ship_aconite/spr_ship_aconite.yy",},}, {"id":{"name":"spr_ship_ammer","path":"sprites/spr_ship_ammer/spr_ship_ammer.yy",},}, {"id":{"name":"spr_ship_apoc","path":"sprites/spr_ship_apoc/spr_ship_apoc.yy",},}, @@ -1512,6 +1634,7 @@ {"id":{"name":"spr_ship_veng","path":"sprites/spr_ship_veng/spr_ship_veng.yy",},}, {"id":{"name":"spr_ship_void","path":"sprites/spr_ship_void/spr_ship_void.yy",},}, {"id":{"name":"spr_ship_warden","path":"sprites/spr_ship_warden/spr_ship_warden.yy",},}, + {"id":{"name":"spr_shutter_button_cover","path":"sprites/spr_shutter_button_cover/spr_shutter_button_cover.yy",},}, {"id":{"name":"spr_shutter_button","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},}, {"id":{"name":"spr_sister_hospitaler","path":"sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy",},}, {"id":{"name":"spr_sister_of_battle","path":"sprites/spr_sister_of_battle/spr_sister_of_battle.yy",},}, @@ -1519,6 +1642,9 @@ {"id":{"name":"spr_skull_on_chain","path":"sprites/spr_skull_on_chain/spr_skull_on_chain.yy",},}, {"id":{"name":"spr_skulls_belt","path":"sprites/spr_skulls_belt/spr_skulls_belt.yy",},}, {"id":{"name":"spr_slate_2","path":"sprites/spr_slate_2/spr_slate_2.yy",},}, + {"id":{"name":"spr_slate_featureless","path":"sprites/spr_slate_featureless/spr_slate_featureless.yy",},}, + {"id":{"name":"spr_slate_side","path":"sprites/spr_slate_side/spr_slate_side.yy",},}, + {"id":{"name":"spr_slate_top","path":"sprites/spr_slate_top/spr_slate_top.yy",},}, {"id":{"name":"spr_sororitas1","path":"sprites/spr_sororitas1/spr_sororitas1.yy",},}, {"id":{"name":"spr_space_bg","path":"sprites/spr_space_bg/spr_space_bg.yy",},}, {"id":{"name":"spr_special_helm","path":"sprites/spr_special_helm/spr_special_helm.yy",},}, @@ -1532,29 +1658,42 @@ {"id":{"name":"spr_sw_mk7_helm","path":"sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy",},}, {"id":{"name":"spr_sword_pendant","path":"sprites/spr_sword_pendant/spr_sword_pendant.yy",},}, {"id":{"name":"spr_tartaros_arms","path":"sprites/spr_tartaros_arms/spr_tartaros_arms.yy",},}, + {"id":{"name":"spr_tartaros_chest_shadows","path":"sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy",},}, {"id":{"name":"spr_tartaros_chest","path":"sprites/spr_tartaros_chest/spr_tartaros_chest.yy",},}, {"id":{"name":"spr_tartaros_colors","path":"sprites/spr_tartaros_colors/spr_tartaros_colors.yy",},}, {"id":{"name":"spr_tartaros_complex","path":"sprites/spr_tartaros_complex/spr_tartaros_complex.yy",},}, {"id":{"name":"spr_tartaros_faceplate","path":"sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy",},}, + {"id":{"name":"spr_tartaros_forehead_shadows","path":"sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy",},}, + {"id":{"name":"spr_tartaros_forehead_variants","path":"sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy",},}, + {"id":{"name":"spr_tartaros_gorget_shadows","path":"sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy",},}, {"id":{"name":"spr_tartaros_gorget","path":"sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy",},}, + {"id":{"name":"spr_tartaros_head_shadows","path":"sprites/spr_tartaros_head_shadows/spr_tartaros_head_shadows.yy",},}, {"id":{"name":"spr_tartaros_head_variants","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},}, {"id":{"name":"spr_tartaros_left_arm","path":"sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy",},}, {"id":{"name":"spr_tartaros_left_leg","path":"sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy",},}, {"id":{"name":"spr_tartaros_left_trim","path":"sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy",},}, + {"id":{"name":"spr_tartaros_leg_rivets","path":"sprites/spr_tartaros_leg_rivets/spr_tartaros_leg_rivets.yy",},}, + {"id":{"name":"spr_tartaros_right_arm_shadows","path":"sprites/spr_tartaros_right_arm_shadows/spr_tartaros_right_arm_shadows.yy",},}, {"id":{"name":"spr_tartaros_right_arm","path":"sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy",},}, + {"id":{"name":"spr_tartaros_right_leg_shadows","path":"sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy",},}, {"id":{"name":"spr_tartaros_right_leg","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},}, + {"id":{"name":"spr_tartaros_right_trim_shadows","path":"sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy",},}, {"id":{"name":"spr_tartaros_right_trim","path":"sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy",},}, + {"id":{"name":"spr_tartaros_shadows","path":"sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy",},}, {"id":{"name":"spr_tartaros_wep_fix","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},}, {"id":{"name":"spr_tartaros2_colors","path":"sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy",},}, {"id":{"name":"spr_tech_area_pad","path":"sprites/spr_tech_area_pad/spr_tech_area_pad.yy",},}, {"id":{"name":"spr_tech_belt","path":"sprites/spr_tech_belt/spr_tech_belt.yy",},}, + {"id":{"name":"spr_tech_face_plate_shadow","path":"sprites/spr_tech_face_plate_shadow/spr_tech_face_plate_shadow.yy",},}, {"id":{"name":"spr_tech_face_plate","path":"sprites/spr_tech_face_plate/spr_tech_face_plate.yy",},}, {"id":{"name":"spr_techmarine_chest","path":"sprites/spr_techmarine_chest/spr_techmarine_chest.yy",},}, {"id":{"name":"spr_techmarine_complex","path":"sprites/spr_techmarine_complex/spr_techmarine_complex.yy",},}, {"id":{"name":"spr_techmarine_core","path":"sprites/spr_techmarine_core/spr_techmarine_core.yy",},}, {"id":{"name":"spr_techmarine_head","path":"sprites/spr_techmarine_head/spr_techmarine_head.yy",},}, + {"id":{"name":"spr_techmarine_left_leg_shadow","path":"sprites/spr_techmarine_left_leg_shadow/spr_techmarine_left_leg_shadow.yy",},}, {"id":{"name":"spr_techmarine_left_leg","path":"sprites/spr_techmarine_left_leg/spr_techmarine_left_leg.yy",},}, {"id":{"name":"spr_techmarine_left_trim","path":"sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy",},}, + {"id":{"name":"spr_techmarine_right_leg_shadow","path":"sprites/spr_techmarine_right_leg_shadow/spr_techmarine_right_leg_shadow.yy",},}, {"id":{"name":"spr_techmarine_right_leg","path":"sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy",},}, {"id":{"name":"spr_techmarine_right_trim","path":"sprites/spr_techmarine_right_trim/spr_techmarine_right_trim.yy",},}, {"id":{"name":"spr_technology_icon","path":"sprites/spr_technology_icon/spr_technology_icon.yy",},}, @@ -1596,6 +1735,7 @@ {"id":{"name":"spr_um_mk6_helm","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},}, {"id":{"name":"spr_um_mk7_helm","path":"sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy",},}, {"id":{"name":"spr_view_small","path":"sprites/spr_view_small/spr_view_small.yy",},}, + {"id":{"name":"spr_Volkite_Culverins","path":"sprites/spr_Volkite_Culverins/spr_Volkite_Culverins.yy",},}, {"id":{"name":"spr_warp_level_icon","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},}, {"id":{"name":"spr_warp_storm","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},}, {"id":{"name":"spr_weapon_assca","path":"sprites/spr_weapon_assca/spr_weapon_assca.yy",},}, @@ -1605,8 +1745,10 @@ {"id":{"name":"spr_weapon_boarding","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},}, {"id":{"name":"spr_weapon_bolter","path":"sprites/spr_weapon_bolter/spr_weapon_bolter.yy",},}, {"id":{"name":"spr_weapon_boltpis","path":"sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy",},}, + {"id":{"name":"spr_weapon_boltstorm_gauntlet_shadows","path":"sprites/spr_weapon_boltstorm_gauntlet_shadows/spr_weapon_boltstorm_gauntlet_shadows.yy",},}, {"id":{"name":"spr_weapon_boltstorm_gauntlet_small","path":"sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy",},}, {"id":{"name":"spr_weapon_boltstorm_gauntlet","path":"sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy",},}, + {"id":{"name":"spr_weapon_chainfist_shadows","path":"sprites/spr_weapon_chainfist_shadows/spr_weapon_chainfist_shadows.yy",},}, {"id":{"name":"spr_weapon_chainfist_small","path":"sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy",},}, {"id":{"name":"spr_weapon_chainfist","path":"sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy",},}, {"id":{"name":"spr_weapon_chaxe","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},}, @@ -1617,10 +1759,13 @@ {"id":{"name":"spr_weapon_commelta","path":"sprites/spr_weapon_commelta/spr_weapon_commelta.yy",},}, {"id":{"name":"spr_weapon_complas","path":"sprites/spr_weapon_complas/spr_weapon_complas.yy",},}, {"id":{"name":"spr_weapon_crozarc","path":"sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy",},}, + {"id":{"name":"spr_weapon_cthon_autocannon","path":"sprites/spr_weapon_cthon_autocannon/spr_weapon_cthon_autocannon.yy",},}, {"id":{"name":"spr_weapon_eldsword","path":"sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy",},}, {"id":{"name":"spr_weapon_evisc","path":"sprites/spr_weapon_evisc/spr_weapon_evisc.yy",},}, {"id":{"name":"spr_weapon_flamer","path":"sprites/spr_weapon_flamer/spr_weapon_flamer.yy",},}, + {"id":{"name":"spr_weapon_frcaxe","path":"sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy",},}, {"id":{"name":"spr_weapon_frcstaff","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},}, + {"id":{"name":"spr_weapon_frcsword","path":"sprites/spr_weapon_frcsword/spr_weapon_frcsword.yy",},}, {"id":{"name":"spr_weapon_grav_cannon","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},}, {"id":{"name":"spr_weapon_grav_gun","path":"sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy",},}, {"id":{"name":"spr_weapon_grav_pistol","path":"sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy",},}, @@ -1634,11 +1779,18 @@ {"id":{"name":"spr_weapon_knife","path":"sprites/spr_weapon_knife/spr_weapon_knife.yy",},}, {"id":{"name":"spr_weapon_lasca","path":"sprites/spr_weapon_lasca/spr_weapon_lasca.yy",},}, {"id":{"name":"spr_weapon_lightning1","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},}, + {"id":{"name":"spr_weapon_lightning2_shadows","path":"sprites/spr_weapon_lightning2_shadows/spr_weapon_lightning2_shadows.yy",},}, {"id":{"name":"spr_weapon_lightning2","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},}, {"id":{"name":"spr_weapon_mace_of_absolution","path":"sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy",},}, + {"id":{"name":"spr_weapon_mars_hbolt","path":"sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy",},}, + {"id":{"name":"spr_weapon_mars_plasc","path":"sprites/spr_weapon_mars_plasc/spr_weapon_mars_plasc.yy",},}, {"id":{"name":"spr_weapon_melta","path":"sprites/spr_weapon_melta/spr_weapon_melta.yy",},}, {"id":{"name":"spr_weapon_missile","path":"sprites/spr_weapon_missile/spr_weapon_missile.yy",},}, {"id":{"name":"spr_weapon_mmelta","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},}, + {"id":{"name":"spr_weapon_omnissian_axe","path":"sprites/spr_weapon_omnissian_axe/spr_weapon_omnissian_axe.yy",},}, + {"id":{"name":"spr_weapon_ph_flmr","path":"sprites/spr_weapon_ph_flmr/spr_weapon_ph_flmr.yy",},}, + {"id":{"name":"spr_weapon_phobos_bolter","path":"sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy",},}, + {"id":{"name":"spr_weapon_phobos_boltpis","path":"sprites/spr_weapon_phobos_boltpis/spr_weapon_phobos_boltpis.yy",},}, {"id":{"name":"spr_weapon_plasc","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},}, {"id":{"name":"spr_weapon_plasg","path":"sprites/spr_weapon_plasg/spr_weapon_plasg.yy",},}, {"id":{"name":"spr_weapon_plasma_cannon_term","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},}, @@ -1647,16 +1799,24 @@ {"id":{"name":"spr_weapon_powfist_old","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},}, {"id":{"name":"spr_weapon_powfist","path":"sprites/spr_weapon_powfist/spr_weapon_powfist.yy",},}, {"id":{"name":"spr_weapon_powfist2","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},}, + {"id":{"name":"spr_weapon_powfist4_shadows","path":"sprites/spr_weapon_powfist4_shadows/spr_weapon_powfist4_shadows.yy",},}, {"id":{"name":"spr_weapon_powfist4","path":"sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy",},}, {"id":{"name":"spr_weapon_powmace","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},}, {"id":{"name":"spr_weapon_powmaul","path":"sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy",},}, + {"id":{"name":"spr_weapon_powscythe","path":"sprites/spr_weapon_powscythe/spr_weapon_powscythe.yy",},}, {"id":{"name":"spr_weapon_powspear","path":"sprites/spr_weapon_powspear/spr_weapon_powspear.yy",},}, {"id":{"name":"spr_weapon_powspear2","path":"sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy",},}, {"id":{"name":"spr_weapon_powspear3","path":"sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy",},}, {"id":{"name":"spr_weapon_powswo","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},}, + {"id":{"name":"spr_weapon_prim_mltg","path":"sprites/spr_weapon_prim_mltg/spr_weapon_prim_mltg.yy",},}, + {"id":{"name":"spr_weapon_prot_mmlt","path":"sprites/spr_weapon_prot_mmlt/spr_weapon_prot_mmlt.yy",},}, {"id":{"name":"spr_weapon_relbla","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},}, {"id":{"name":"spr_weapon_relic_blade","path":"sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy",},}, + {"id":{"name":"spr_weapon_ryza_lasca","path":"sprites/spr_weapon_ryza_lasca/spr_weapon_ryza_lasca.yy",},}, + {"id":{"name":"spr_weapon_ryza_plasg","path":"sprites/spr_weapon_ryza_plasg/spr_weapon_ryza_plasg.yy",},}, + {"id":{"name":"spr_weapon_ryza_plasp","path":"sprites/spr_weapon_ryza_plasp/spr_weapon_ryza_plasp.yy",},}, {"id":{"name":"spr_weapon_sbolter","path":"sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy",},}, + {"id":{"name":"spr_weapon_shotgun","path":"sprites/spr_weapon_shotgun/spr_weapon_shotgun.yy",},}, {"id":{"name":"spr_weapon_skill_icon","path":"sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy",},}, {"id":{"name":"spr_weapon_sniper","path":"sprites/spr_weapon_sniper/spr_weapon_sniper.yy",},}, {"id":{"name":"spr_weapon_stalker","path":"sprites/spr_weapon_stalker/spr_weapon_stalker.yy",},}, @@ -1669,11 +1829,21 @@ {"id":{"name":"spr_weapon_sword_oriental","path":"sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy",},}, {"id":{"name":"spr_weapon_sword_turk","path":"sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy",},}, {"id":{"name":"spr_weapon_thhammer","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},}, + {"id":{"name":"spr_weapon_tigris_combi","path":"sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy",},}, + {"id":{"name":"spr_weapon_volkite_caliver","path":"sprites/spr_weapon_volkite_caliver/spr_weapon_volkite_caliver.yy",},}, + {"id":{"name":"spr_weapon_volkite_charger","path":"sprites/spr_weapon_volkite_charger/spr_weapon_volkite_charger.yy",},}, + {"id":{"name":"spr_weapon_volkite_culverin_term","path":"sprites/spr_weapon_volkite_culverin_term/spr_weapon_volkite_culverin_term.yy",},}, + {"id":{"name":"spr_weapon_volkite_culverin","path":"sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy",},}, + {"id":{"name":"spr_weapon_volkite_serpenta","path":"sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy",},}, + {"id":{"name":"spr_weapon_webber_shadow","path":"sprites/spr_weapon_webber_shadow/spr_weapon_webber_shadow.yy",},}, + {"id":{"name":"spr_weapon_webber","path":"sprites/spr_weapon_webber/spr_weapon_webber.yy",},}, {"id":{"name":"spr_weapon_xenophase_blade_var1","path":"sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy",},}, + {"id":{"name":"spr_weapoon_powso_flamberge","path":"sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy",},}, {"id":{"name":"spr_welcome_bg","path":"sprites/spr_welcome_bg/spr_welcome_bg.yy",},}, {"id":{"name":"spr_wings","path":"sprites/spr_wings/spr_wings.yy",},}, {"id":{"name":"spr_wisdom_icon","path":"sprites/spr_wisdom_icon/spr_wisdom_icon.yy",},}, {"id":{"name":"spr_wolf_tail","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},}, + {"id":{"name":"spr_woodland_camo_texture","path":"sprites/spr_woodland_camo_texture/spr_woodland_camo_texture.yy",},}, {"id":{"name":"spr_ws_mk3__pualdron_veteran","path":"sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy",},}, {"id":{"name":"spr_ws_mk4_monovisor","path":"sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy",},}, {"id":{"name":"spr_ws_mk5_helm","path":"sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy",},}, @@ -1693,6 +1863,7 @@ {"id":{"name":"sprite267","path":"sprites/sprite267/sprite267.yy",},}, {"id":{"name":"sprite269","path":"sprites/sprite269/sprite269.yy",},}, {"id":{"name":"Sprite544","path":"sprites/Sprite544/Sprite544.yy",},}, + {"id":{"name":"sword_Works","path":"sprites/sword_Works/sword_Works.yy",},}, ], "resourceType":"GMProject", "resourceVersion":"2.0", diff --git a/datafiles/data/dialogue/sisters.json b/datafiles/data/dialogue/sisters.json new file mode 100644 index 0000000000..f26bf7f929 --- /dev/null +++ b/datafiles/data/dialogue/sisters.json @@ -0,0 +1,189 @@ +{ + "intro":{ + "multi_part" : true, + "parts":[ + [ + "[[Old and experienced, this Prioress of the Sisters of Battle is not a woman to be trifled with. Clad in an elaborate set of full power armour and with her face sporting several scars, {faction_leader} exudes battlefield experience.]]", + "[[The Ecclesiarchy have assigned one of their militant arm to their dealings with you- Prioress {faction_leader} The woman wears a set of well-used powered armour that has seen many battles, if its charred exterior is to be believed. Incense burners hang from chains on her belt and waft smoke around her body.]]" + ], + "\n\n" + , + [ + "Hail, Chapter Master! As a son of the Emperor, you will no doubt take great joy in bringing his light to this benighted sector. I look forward to watching heretics fall before your armies.", + "And the Emperor spoke; “You shall know my servants by the eagle they bear, so the people of old Terra did know the eagle as the symbol of enlightenment and freedom.” Fitting that we, the instruments of His will, still bear the eagle? May the Emperor's gaze be upon you, Space Marine." + + ] + ] + }, + + "hello" : { + "relationship" : { + "friendly" : "Hail, hero of {sector}, how may I assist you this day?", + "neutral" : "Praise be to the Emperor. What is your business here?", + "hostile":"State your business, for many heretics pray the Emperor's mercy.", + } + }, + + "trade_close" : { + "relationship" : { + "friendly" : "Ave Imperator, Chapter Master. No doubt an unslain Xenos calls for your blade.", + "neutral" : "I hope there is a good reason for this affront, Chapter Master, for it is never wise to slight the Emperor's truest servants.", + "hostile":"While it is immaterial whether the Ecclesiarchy needed those supplies, it is a sign of disrespect for you to act thus. When you slight us, you slight the Emperor, Chapter Master.", + } + }, + + "demand_refused" : { + "friendly" : [ + "Ave Imperator, Chapter Master. No doubt an unslain Xenos calls for your blade.", + "I do not believe we can fulfil your request. Ask the Emperor for guidance and perhaps he will see fit to deliver." + ], + "neutral" : [ + "Unless we receive a sign from the Lords of Terra to the contrary, we cannot comply with your request.", + "It is not something that we can condone or agree with." + ], + "hostile":[ + "Flee back to the darkness, heretic. You will have nothing from us.", + "While we will not fulfill your request, perhaps your warp spawned allies will, heretic scum?" + ], + }, + + "agree": { + "friendly": [ + "Let it be so.", + "You need but ask, Chapter Master, and your commands will be fulfilled.", + "As you command, son of the Emperor." + ], + "neutral": [ + "It shall be done.", + "I agree, and may the Emperor look favorably upon this venture.", + "Doubt is anathema to a true servant of the Emperor, but still... I have little choice but to agree." + ], + "hostile": [ + "It will take some time in penitence to erase the crime of this action, but I agree.", + "Circumstances force me to agree.", + "Had I any other option, you would be burning in purifying flame at this moment... but I do not. I am with you." + ] + }, + "attacked" :"You pile infamy on sin, traitorous dog. I will be happy to wipe the stain of your existence from the galaxy.", + + "declare_war" :"There is a price for all things and the accounting is now. Know that you reap only what you have sown.", + + "accept_peace" :"It leaves a bitter taste in my mouth, but you may go in peace. I will be watching you from now on, however.", + + "ignored":"Human we may be, but the Adepta Sororitas are second in loyalty only to the astartes themselves. Why do you ignore us so?", + + "denounced": { + "friendly": [ + "I'm sure you have your reasons for saying such things, my lord.", + "Ha, your words would wound me if I thought you were any less loyal to the Emperor.", + "Lucky for you I don't take offense easily." + ], + "neutral": [ + "You are wrong and I will show you this.", + "I couldn't give less of a damn for your words.", + "I don't care what you think, only what you do." + ], + "hostile": [ + "Send your poison elsewhere; it is actions and not words that make a man.", + "So men act well but speak lies, some speak beautiful truths but act like common criminals. But you manage to get the worst of both worlds. It is almost impressive.", + "When my flame sends you to your dark gods, it will be too late for such words." + ] + }, + + "disagree": { + "friendly": [ + "I am sorry Chapter Master but I cannot help you.", + "Perhaps another Imperial faction can assist you, but I am unable to.", + "My hands are tied in this matter, my Lord, else I would rush to your aide." + ], + "neutral": [ + "I cannot agree.", + "My sisters and I are unwilling to join you in this course of action.", + "It would not be fitting for my order to join you." + ], + "hostile": [ + "I would rather die, heretic. You have turned from His light and will pay the price!", + "When I made my vows to the Emperor, I made them for life, unlike you. Take your deal and burn with it.", + "Your attempt to draw me away from the light are as clumsy as an ork's handwriting! I say thee nay!" + ], + "override": [ + { + "relationship": "neutral", + "min_annoyed": 8, + "line": "I cannot agree to this, Chapter Master, no matter how stubborn you may be." + } + ] + }, + "praised": { + "friendly": [ + "Thank you, Chapter Master. That means a lot from a warrior such as you.", + "Your words raise my spirits, comrade. I hope to see you on the battlefield soon..", + "Apply your mind to defeating the Emperor's enemies, not thinking up clever compliments to pile at my feet. Unless you feel you can do both?" + ], + "neutral": [ + "We thank you, but will not let words alter our disposition.", + "The only praise that matters is the praise we give to the Emperor.", + "Venerate the Emperor with the same enthusiasm and He may look kindly upon you." + ], + "hostile": [ + "Your words will not stall my forces.", + "Compliments will not put out the cleansing flame I will bathe you in.", + "Save your breath for prayers of forgiveness, for I will destroy you." + ] + }, + + "open_trade" : "Make me an offer, Space Marine, and I will pray for the guidance to respond.", + + "propose_arti_trade" : "Propose a trade for the Artifact", + + "leave_it":"Leave it be; Exit.", + + "artifact": "You have done a service to us by making us aware of this artifact. It is a little amusing that is was under our noses this whole time, though now I am sure it can be retrieved.", + + "artifact_thanks":"You are a true servant of the Emperor! This artifact, while it might be of great value to others, shall forever be a symbol of our friendship.", + + "penitent_end": [ + "Yours is the glory, Chapter Master. I admit that I did not expect you to survive this ordeal, having wronged the name of the Emperor as you have. It seems, in his wisdom, that he has chosen to spare you for greater things. That you marched through the fires of war and return practically unscathed... it is all the proof I need of your favour with the God Emperor. Take his word to the heretic, the mutant and the Xenos, Astartes. You have once more earned that right.", + "Penitent crusades are a cathartic experience, are they not? To bathe oneself in the blood of The Imperium's foes, until one's faults are washed away. To let oneself forget restraint and self control, to simply revel in the joy of spilling heretical, Xenos blood. Make no mistake, I envy you. It is a long time since I had not thought but of the next kill to fall under my blade. Congratulations on not losing yourself, however. Few return from penitent crusades with as much of their minds in tact as you seem to have." + ], + + "artifact_daemon": { + "friendly": [ + "I am sure it was not your intention, Chapter Master, but to give a daemonic artifact to the Ecclesiarchy is a great insult. Only the Inquisition has been given leave to wield such things, and few among our number agree with the practice. You will be forgiven this time, but do not let it happen again." + ], + "neutral": [ + "It is possible that you did not know of the presence of the daemon within this artifact, but ignorance is no excuse. Maybe you are simply too corrupt to notice the heretical whispers and temptations that the item exudes. I will pray for your soul, or cleanse it with holy fire." + ], + "hostile": [ + "Heretic! You dare to hand us, the Emperor's most devout followers, a artifact tainted by the presence of a monstrous daemon!? Beneath the facade of an Astartes, you are the very embodiment of servant of chaos! We will not forget this." + ] + }, + + "artifact_angry": [ + "How dare you strike at us, the truest and most devoted servants of the Emperor!? That artifact was on our territory! You had no right and you shall pay in blood for your actions!" + ], + + "stc_thanks": [ + "On behalf of Imperium, I extend our deepest gratitude to {chapter_name} for the invaluable gift given to us." + ], + + "offer": [ + "Is this trade acceptable to you?", + "The Emperor, hallowed be His name, would doubtless endorse this trade.", + "Ask yourself; would a true son of the Emperor turn down this trade?" + ], + + "trading_demand": { + "friendly": [ + "{master_name}?" + ], + "neutral": [ + "What is the meaning of this?" + ], + "hostile": [ + "The Heretic and Blasphemer can offer no excuse for their crimes. Those who are pardoned merely live to further shroud Humanity from the Light of the Emperor with the Darkness of their souls." + ] + } + + +} \ No newline at end of file diff --git a/datafiles/data/traits.json b/datafiles/data/traits.json index 54f9cd50de..1d090f0ba2 100644 --- a/datafiles/data/traits.json +++ b/datafiles/data/traits.json @@ -41,6 +41,11 @@ "flavour_text": "For all their talent they are dogged by poor luck", "display_name": "Shitty Luck" }, + "great_luck": { + "luck": 4, + "flavour_text": "Blessed by great luck", + "display_name": "Great Luck" + }, "very_hard_to_kill": { "constitution": 15, "luck": 2, @@ -89,7 +94,8 @@ "max" ], "flavour_text": "Seen many young warriors rise and die before them but they themselves still remain", - "display_name": "Old Guard" + "display_name": "Old Guard", + "effect": "All loyalty changes are halved", }, "seasoned": { "luck": 1, @@ -314,7 +320,8 @@ "max" ], "display_name": "Faithless", - "flavour_text": "Puts great emphasis on a pragmatic and logical approach in place of faith and spiritual beliefs" + "flavour_text": "Puts great emphasis on a pragmatic and logical approach in place of faith and spiritual beliefs", + "effect" : "corruption attempts are less effective" }, "feet_floor": { "wisdom": 1, @@ -413,7 +420,8 @@ "max" ], "display_name": "Charismatic", - "flavour_text": "Liked by most without even trying" + "flavour_text": "Liked by most without even trying", + "effect" : "failed charisma rolls are re-rolled", }, "recluse": { "charisma": [ @@ -441,7 +449,8 @@ "display_name": "Jaded", "flavour_text": "Their past has led them to form a deep distrust and cynical outlook on most parts of their life", "charisma": -2, - "wisdom": -1 + "wisdom": -1, + "effect" : "negative loyalty effects are doubled" }, "observant": { "display_name": "Observant", @@ -584,10 +593,13 @@ "soft_target": { "display_name": "Marked for death", "constitution": [ - -5, - 2 + -3, + 2, + "min" ], - "flavour_text": "This Marine can't shake the feeling that his days are numbered; in battle enemy attacks seem to find their way to softer sections of armor" + "luck" : -2, + "flavour_text": "This Marine can't shake the feeling that his days are numbered; in battle enemy attacks seem to find their way to softer sections of armor", + "effect" : "-10 modifier for rolls against constitution", }, "fast_learner": { "display_name": "Quick Learner", @@ -708,7 +720,7 @@ 1 ], "flavour_text": "Is known for their impeccable honor even in the heat of battle", - "effect": "If commanding garrison will prevent disposition loss" + "effect": "If commanding garrison will prevent disposition loss, losses to loyalty are halved" }, "duelist": { "weapon_skill": [ diff --git a/datafiles/images/creation/chapters/icons/celestial_lions.png b/datafiles/images/creation/chapters/icons/celestial_lions.png new file mode 100644 index 0000000000..cef0226c45 Binary files /dev/null and b/datafiles/images/creation/chapters/icons/celestial_lions.png differ diff --git a/datafiles/images/creation/chapters/icons/consecrators.png b/datafiles/images/creation/chapters/icons/consecrators.png new file mode 100644 index 0000000000..a2f2f6e50c Binary files /dev/null and b/datafiles/images/creation/chapters/icons/consecrators.png differ diff --git a/datafiles/images/creation/chapters/icons/flesh_tearers.png b/datafiles/images/creation/chapters/icons/flesh_tearers.png new file mode 100644 index 0000000000..fcbe84d98d Binary files /dev/null and b/datafiles/images/creation/chapters/icons/flesh_tearers.png differ diff --git a/datafiles/images/creation/chapters/icons/raptors.png b/datafiles/images/creation/chapters/icons/raptors.png new file mode 100644 index 0000000000..479c0d6b45 Binary files /dev/null and b/datafiles/images/creation/chapters/icons/raptors.png differ diff --git a/datafiles/images/creation/chapters/splash/36.png b/datafiles/images/creation/chapters/splash/36.png new file mode 100644 index 0000000000..77861349ca Binary files /dev/null and b/datafiles/images/creation/chapters/splash/36.png differ diff --git a/datafiles/main/chapters/33.json b/datafiles/main/chapters/33.json index c7929f2b9f..a0df79d6a7 100644 --- a/datafiles/main/chapters/33.json +++ b/datafiles/main/chapters/33.json @@ -620,7 +620,7 @@ } ] ], - "sternguard_veteran_squad": [ + "veteran_squad": [ // Proteus Kill Team - Versatile [ "Veteran", @@ -717,129 +717,130 @@ } ] ], - "vanguard_veteran_squad": [ - // Malleus Kill Team - Anti Vehicle / Anti Large - // Vanguard Veteran Sergeant - [ - "Veteran Sergeant", - { - "max": 1, - "min": 1, - "role": "Malleus Watch Sergeant", - "loadout": { - "required": { - "wep1": [ - "Stalker Pattern Bolter", - 1 - ], - "wep2": [ - "Combat Knife", - 1 - ] - } - } - } - ], - // Vanguard Veterans - [ - "Veteran", - { - "max": 4, - "min": 1, - "role": "Vanguard Veteran", - "loadout": { - "required": { - "wep1": [ - "", - 0 - ], - "wep2": [ - "", - 0 - ] - }, - "option": { - "wep1": [ - [ - [ - "Infernus Heavy Bolter", - "Infernus Heavy Bolter", - "Infernus Heavy Bolter", - "Infernus Heavy Bolter", - "Missile Launcher", - "Missile Launcher", - "Multi-Melta", - "Lascannon" - ], - 3 - ], - [ - [ - "Stalker Pattern Bolter" - ], - 2, - { - "wep2": "Combat Knife" - } - ] - ] - } - } - } - ], - [ - "Terminator", - { - "max": 4, - "min": 1, - "role": "Terminator", - "loadout": { - "required": { - "wep1": [ - "Plasma Cannon", - 1 - ] - }, - "option": { - "wep1": [ - [ - [ - "Heavy Thunder Hammer" - ], - 1 - ], - [ - [ - "Lascannon" - ], - 1 - ], - [ - [ - "Multi-Melta" - ], - 1 - ], - ], - } - } - } - ], - [ - "type_data", - { - "display_data": "Malleus Kill Team", - "formation_options": [ - "devastator", - "veteran", - "assault", - "scout", - "tactical", - "terminator" - ] - } - ] - ], + // Will return as soon as custom squads are supported; + // "veteran_squad": [ + // // Malleus Kill Team - Anti Vehicle / Anti Large + // // Vanguard Veteran Sergeant + // [ + // "Veteran Sergeant", + // { + // "max": 1, + // "min": 1, + // "role": "Malleus Watch Sergeant", + // "loadout": { + // "required": { + // "wep1": [ + // "Stalker Pattern Bolter", + // 1 + // ], + // "wep2": [ + // "Combat Knife", + // 1 + // ] + // } + // } + // } + // ], + // // Vanguard Veterans + // [ + // "Veteran", + // { + // "max": 4, + // "min": 1, + // "role": "Vanguard Veteran", + // "loadout": { + // "required": { + // "wep1": [ + // "", + // 0 + // ], + // "wep2": [ + // "", + // 0 + // ] + // }, + // "option": { + // "wep1": [ + // [ + // [ + // "Infernus Heavy Bolter", + // "Infernus Heavy Bolter", + // "Infernus Heavy Bolter", + // "Infernus Heavy Bolter", + // "Missile Launcher", + // "Missile Launcher", + // "Multi-Melta", + // "Lascannon" + // ], + // 3 + // ], + // [ + // [ + // "Stalker Pattern Bolter" + // ], + // 2, + // { + // "wep2": "Combat Knife" + // } + // ] + // ] + // } + // } + // } + // ], + // [ + // "Terminator", + // { + // "max": 4, + // "min": 1, + // "role": "Terminator", + // "loadout": { + // "required": { + // "wep1": [ + // "Plasma Cannon", + // 1 + // ] + // }, + // "option": { + // "wep1": [ + // [ + // [ + // "Heavy Thunder Hammer" + // ], + // 1 + // ], + // [ + // [ + // "Lascannon" + // ], + // 1 + // ], + // [ + // [ + // "Multi-Melta" + // ], + // 1 + // ], + // ], + // } + // } + // } + // ], + // [ + // "type_data", + // { + // "display_data": "Malleus Kill Team", + // "formation_options": [ + // "devastator", + // "veteran", + // "assault", + // "scout", + // "tactical", + // "terminator" + // ] + // } + // ] + // ], "terminator_squad": [ // Purgatus Kill Team - Librarian Led assassins // Librarian Leader diff --git a/datafiles/main/chapters/34.json b/datafiles/main/chapters/34.json new file mode 100644 index 0000000000..5de8330fb9 --- /dev/null +++ b/datafiles/main/chapters/34.json @@ -0,0 +1,1277 @@ +{ + "chapter": { + "name": "Flesh Tearers", + "mutations": { + "betchers": 0.0, + "catalepsean": 0.0, + "secretions": 0.0, + "occulobe": 0.0, + "zygote": 0.0, + "mucranoid": 0.0, + "preomnor": 0.0, + "voice": 0.0, + "doomed": 0.0, + "lyman": 0.0, + "omophagea": 1.0, + "ossmodula": 0.0, + "membrane": 0.0 + }, + "battle_cry": "By the Blood of Sanguinius", + "equal_specialists": 1.0, + "origin": 2, + "custom_advisors": {}, + "load_to_ships": { + "escort_load": 2.0, + "split_scouts": 0.0, + "split_vets": 0.0 + }, + "company_titles": [ + "", + "", + "", + "", + "Death Company", + "", + "", + "", + "", + "", + "" + ], + "id": 34, + "chapter_master": { + "ranged": 1.0, + "specialty": 2.0, + "traits": [], + "melee": 7.0, + "name": "Gabriel Seth" + }, + "fleet_type": 1.0, + "strength": 5.0, + "extra_ships": { + "battle_barges": 0.0, + "gladius": 0.0, + "strike_cruisers": 0.0, + "hunters": 0.0 + }, + "extra_specialists": { + "assault": 30.0, + "veteran": 0.0, + "devastator": -10.0, + "chaplains": 0.0, + "apothecary": 0.0, + "techmarines": 0.0, + "epistolary": 0.0, + "codiciery": 0.0, + "lexicanum": 0.0, + "terminator": 0.0 + }, + "extra_marines": { + "second": 0.0, + "third": 0.0, + "fourth": 0.0, + "fifth": 0.0, + "sixth": 0.0, + "seventh": 0.0, + "eighth": 0.0, + "ninth": 0.0, + "tenth": -50.0 + }, + "extra_vehicles": { + "whirlwind": 0.0, + "predator": 0.0, + "land_raider": 0.0, + "land_speeder": 0.0, + "rhino": 0.0 + }, + "extra_equipment": [], + "custom_roles": { + "honour_guard": { + "name": "Sanguinary Guard", + "wep1": "Power Axe", + "wep2": "Bolt Pistol", + "armour": "Artificer Armour", + "mobi": "Jump Pack" + }, + "apothecary": { + "name": "Sanguinary Priest", + "wep1": "Power Axe" + } + }, + "squad_name": "Squad", + "recruiting": "Death", + "custom_squads": {}, + "points": 0.0, + "names": { + "hchaplain": "Appollus", + "clibrarian": "Luciferus", + "fmaster": "Alfie", + "hapothecary": "", + "honorcapt": "Barakiel", + "watchmaster": "Crassun", + "arsenalmaster": "Cain Severan", + "admiral": "Tanthius", + "marchmaster": "", + "ritesmaster": "", + "victualler": "", + "lordexec": "", + "relmaster": "", + "recruiter": "Akrasiel" + }, + "flavor": "The Flesh Tearers are a Second Founding chapter, created when the Blood Angels legion split up after the Horus Heresy in accordance with the Codex Astartes. They suffer from a mutation in their gene-seed, making them far more prone to suffer the Black Rage than other chapters with Blood Angels gene-seed. If no cure is found the chapter is likely to be extinct within the next two millennia. The Flesh Tearers are also ill-famed for their savageness and thirst for blood in battle", + "founding": 5.0, + "successors": 0.0, + "splash": 97.0, + "icon_name": "flesh_tearers", + "aspirant_trial": 0, + "purity": 9.0, + "stability": 97.0, + "cooperation": 5.0, + "homeworld": "Temperate", + "homeworld_name": "Cretacia", + "homeworld_exists": 1.0, + "recruiting_exists": 1.0, + "recruiting_name": "Noctae", + "homeworld_rule": 1.0, + "home_spawn_loc": 1.0, + "recruit_home_relationship": 1.0, + "home_warp": 1.0, + "culture_styles": [], + "home_planets": 1.0, + "flagship_name": "Victus", + "monastary_name": "", + "advantages": [ + "", + "Assault Doctrine", + "", + "", + "", + "", + "", + "", + "" + ], + "disadvantages": [ + "", + "Black Rage", + "Enduring Angels", + "", + "", + "", + "", + "", + "" + ], + "discipline": "librarius", + "full_liveries": [ + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 0.0, + "left_trim": 0.0, + "left_chest": 8, + "right_chest": 8, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 8, + "left_hand": 8, + "right_arm": 8, + "right_hand": 8, + "left_head": 8, + "right_head": 8, + "left_muzzle": 8, + "right_muzzle": 8, + "eye_lense": 9, + "right_backpack": 8, + "left_backpack": 8, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8, + "left_pauldron": 9.0, + "is_changed": true, + "left_leg_lower": 8, + "left_leg_upper": 8, + "left_leg_knee": 8, + "right_leg_lower": 8, + "right_leg_upper": 8, + "right_leg_knee": 8, + "metallic_trim": 0.0 + }, + { + "right_trim": 0.0, + "left_trim": 0.0, + "left_chest": 0, + "right_chest": 0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 0, + "left_hand": 0, + "right_arm": 0, + "right_hand": 0, + "left_head": 0, + "right_head": 0, + "left_muzzle": 0, + "right_muzzle": 0, + "eye_lense": 9, + "right_backpack": 0, + "left_backpack": 0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 0, + "left_pauldron": 9.0, + "is_changed": true, + "left_leg_lower": 0, + "left_leg_upper": 0, + "left_leg_knee": 0, + "right_leg_lower": 0, + "right_leg_upper": 0, + "right_leg_knee": 0, + "metallic_trim": 0.0 + }, + { + "right_trim": 0.0, + "left_trim": 0.0, + "left_chest": 9, + "right_chest": 9, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 9, + "left_hand": 9, + "right_arm": 9, + "right_hand": 9, + "left_head": 9, + "right_head": 9, + "left_muzzle": 9, + "right_muzzle": 9, + "eye_lense": 23, + "right_backpack": 9, + "left_backpack": 9, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 9, + "left_pauldron": 9.0, + "is_changed": true, + "left_leg_lower": 9, + "left_leg_upper": 9, + "left_leg_knee": 9, + "right_leg_lower": 9, + "right_leg_upper": 9, + "right_leg_knee": 9, + "metallic_trim": 0.0 + }, + { + "right_trim": 0.0, + "left_trim": 0.0, + "left_chest": 34, + "right_chest": 34, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 34, + "left_hand": 34, + "right_arm": 34, + "right_hand": 34, + "left_head": 34, + "right_head": 34, + "left_muzzle": 34, + "right_muzzle": 34, + "eye_lense": 28, + "right_backpack": 34, + "left_backpack": 34, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 34, + "left_pauldron": 9.0, + "is_changed": true, + "left_leg_lower": 34, + "left_leg_upper": 34, + "left_leg_knee": 34, + "right_leg_lower": 34, + "right_leg_upper": 34, + "right_leg_knee": 34, + "metallic_trim": 0.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + }, + { + "right_trim": 7.0, + "left_trim": 7.0, + "left_chest": 11.0, + "right_chest": 11.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 11.0, + "left_hand": 11.0, + "right_arm": 11.0, + "right_hand": 11.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": 22.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 11.0, + "left_leg_upper": 11.0, + "left_leg_knee": 11.0, + "right_leg_lower": 11.0, + "right_leg_upper": 11.0, + "right_leg_knee": 11.0, + "metallic_trim": 7.0 + } + ], + "company_liveries": [ + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + }, + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + }, + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + }, + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + }, + { + "right_trim": 8.0, + "left_trim": 8.0, + "left_chest": 8.0, + "right_chest": 8.0, + "left_thorax": 8.0, + "right_thorax": 8.0, + "left_arm": 8.0, + "left_hand": 8.0, + "right_arm": 8.0, + "right_hand": 8.0, + "left_head": 8.0, + "right_head": 8.0, + "left_muzzle": 8.0, + "right_muzzle": 8.0, + "eye_lense": -1.0, + "right_backpack": 8.0, + "left_backpack": 8.0, + "weapon_primary": 8.0, + "weapon_secondary": 8.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": 8.0, + "left_pauldron": 8.0, + "is_changed": true, + "left_leg_lower": 8.0, + "left_leg_upper": 8.0, + "left_leg_knee": 8.0, + "right_leg_lower": 8.0, + "right_leg_upper": 8.0, + "right_leg_knee": 8.0, + "metallic_trim": -1.0 + }, + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + }, + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + }, + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + }, + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + }, + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + }, + { + "right_trim": -1.0, + "left_trim": -1.0, + "left_chest": -1.0, + "right_chest": -1.0, + "left_thorax": -1.0, + "right_thorax": -1.0, + "left_arm": -1.0, + "left_hand": -1.0, + "right_arm": -1.0, + "right_hand": -1.0, + "left_head": -1.0, + "right_head": -1.0, + "left_muzzle": -1.0, + "right_muzzle": -1.0, + "eye_lense": -1.0, + "right_backpack": -1.0, + "left_backpack": -1.0, + "weapon_primary": -1.0, + "weapon_secondary": -1.0, + "company_marks": -1.0, + "company_marks_loc": -1.0, + "right_pauldron": -1.0, + "left_pauldron": -1.0, + "is_changed": false, + "left_leg_lower": -1.0, + "left_leg_upper": -1.0, + "left_leg_knee": -1.0, + "right_leg_lower": -1.0, + "right_leg_upper": -1.0, + "right_leg_knee": -1.0, + "metallic_trim": -1.0 + } + ], + "complex_livery_data": { + "sgt": { + "helm_lens": 0.0, + "helm_pattern": 3.0, + "helm_primary": 0.0, + "helm_secondary": 0.0, + "helm_detail": 0.0 + }, + "veteran": { + "helm_lens": 0.0, + "helm_pattern": 3.0, + "helm_primary": 0.0, + "helm_secondary": 0.0, + "helm_detail": 0.0 + }, + "vet_sgt": { + "helm_lens": 0.0, + "helm_pattern": 3.0, + "helm_primary": 0.0, + "helm_secondary": 0.0, + "helm_detail": 0.0 + }, + "captain": { + "helm_lens": 0.0, + "helm_pattern": 3.0, + "helm_primary": 0.0, + "helm_secondary": 0.0, + "helm_detail": 0.0 + } + }, + "colors": { + "secondary": "Black", + "pauldron_r": "Black", + "pauldron_l": "Black", + "trim": "Lighter Black", + "lens": "Lime", + "weapon": "Black", + "main": "Dark Red", + "special": 0.0 + }, + "disposition": [ + 0.0, + 60.0, + 58.0, + 40.0, + 27.6, + 38.6, + 0.0, + 0.0 + ] + } +} \ No newline at end of file diff --git a/datafiles/main/chapters/35.json b/datafiles/main/chapters/35.json new file mode 100644 index 0000000000..23544b5a82 --- /dev/null +++ b/datafiles/main/chapters/35.json @@ -0,0 +1,328 @@ +{ + "chapter": { + "id": 35, + "name": "Celestial Lions", + "flavor": "The Celestial Lions are a Space Marine chapter nearly annihilated by the Inquisition after they dared question Inquisitorial atrocities on Armageddon, with their remnants saved from extinction only through the intervention of the Black Templars. Currently they have barely a hundred brothers left.", + "origin": 2, // 1 - Founding, 2 - Successor, 3 - Other/non-canon/fanmade, 4 - Custom + "points": 150, + "founding": 4, // The id of the founding chapter, 0 for unknown or none, 10 for random + "splash": 98, // in \images\creation\chapters\splash folder, the img number, 1 being Dark Angels etc. + "icon_name": "celestial_lions", + "fleet_type": 2, // 1= Homeworld, 2 = Fleet based, 3 = Penitent + "strength": 1, // 1-10 + "purity": 10, // 1-10 + "stability": 99, // 1-99 + "cooperation": 5, // 1-10 + "homeworld_exists": 1, // 1 = true + "recruiting_exists": 1, // 1 = true + "homeworld_rule": 1, // 1 = Govenor, 2 = Countries, 3 = Personal Rule + "homeworld": "", // one of "Lava" "Desert" "Forge" "Hive" "Death" "Agri" "Feudal" "Temperate" "Ice" "Dead" "Shrine" + "homeworld_name": "", // Homeworld Planet name, leave blank to autogenerate + "recruiting": "Death", // one of "Lava" "Desert" "Forge" "Hive" "Death" "Agri" "Feudal" "Temperate" "Ice" "Dead" "Shrine" + "recruiting_name": "", // Recruiting Planet name, leave blank to autogenerate + "discipline": "librarius", // one of 'default' 'biomancy' 'pyromancy' 'telekinesis' 'rune_magic' + "aspirant_trial": "SURVIVAL", // one of "BLOODDUEL" "HUNTING" "SURVIVAL" "EXPOSURE" "KNOWLEDGE" "CHALLENGE" "APPRENTICESHIP" + "advantages": [ + "", // leave the first entry blank for now + "Enemy: Orks", + "", + "", + "", + "", + "", + "", + "" + ], + "disadvantages": [ + "", // leave the first entry blank for now + "Obliterated", + "Suspicious", + "", + "", + "", + "", + "", + "" + ], + "colors": { + "secondary": "Gold", + "pauldron_r": "Turqoise", + "pauldron_l": "Turqoise", + "trim": "Lighter Black", + "lens": "Red", + "weapon": "Black", + "main": "Gold", + "special": 0.0 + }, + "complex_livery_data": { + "sgt": { + "helm_lens": 11.0, + "helm_pattern": 0.0, + "helm_primary": 8.0, + "helm_secondary": 0.0, + "helm_detail": 0.0 + }, + "veteran": { + "helm_lens": 11.0, + "helm_pattern": 0.0, + "helm_primary": 29.0, + "helm_secondary": 0.0, + "helm_detail": 0.0 + }, + "vet_sgt": { + "helm_lens": 11.0, //dark red + "helm_pattern": 0.0, + "helm_primary": 8.0, //black + "helm_secondary": 0.0, + "helm_detail": 0.0 + }, + "captain": { + "helm_lens": 22.0, //lime + "helm_pattern": 0.0, + "helm_primary": 29.0, //turquoise + "helm_secondary": 0.0, + "helm_detail": 0.0 + } + }, + "names": { + //Chapter Staff + "hchaplain": "", // Head Chaplain + "clibrarian": "", // Chief Librarian + "fmaster": "", // Forge Master + "hapothecary": "", // Head Apothecary + //Company Captains 1 - 10 + "honorcapt": "", + "watchmaster": "", + "arsenalmaster": "", + "admiral": "", + "marchmaster": "", + "ritesmaster": "", + "victualler": "", + "lordexec": "", + "relmaster": "", + "recruiter": "" + }, + "battle_cry": "For the Emperor!", + "equal_specialists": 0, // 0 if no, 1 if yes. If yes, will distribute specialist roles like Assaults and Devastators equally between companies. Otherwise all Assaults go in Company 8 and all Devastators in Company 9 + "load_to_ships": { + "escort_load": 2, // 0 no, 2 yes, 1 doesnt do anything :) + "split_scouts": 0, // 0 no, 1 yes. If yes, splits scouts between companies equally. Otherwise all scouts are kept in 10th Company. + "split_vets": 0 // 0 no, 1 yes. If yes, all veterans are distrubuted equally between companies. Otherwise all veterans are kept in the 1st Company + }, + "successors": 0, //total number of successor chapters + "mutations": { + "preomnor": 0, + "voice": 0, + "doomed": 0, + "lyman": 0, + "omophagea": 0, + "ossmodula": 0, + "membrane": 0, + "zygote": 0, + "betchers": 0, + "catalepsean": 0, + "secretions": 0, + "occulobe": 0, + "mucranoid": 0 + }, + "disposition": [ + 0, // nothing + 0, // Progenitor faction + 42, // Imperium + 50, // Admech + 22, //Inquisition + 24, // Ecclesiarchy + 50, // Astartes + 0 // nothing + ], + "chapter_master": { + "name": "Ekene Dubaku", + "specialty": 1, //1 Leader, 2 Champion, 3 Psyker, + "melee": 5, // 1 twin power fists ... 8 force staff + "ranged": 3, // 1 boltstorm gauntlets ... 7 storm shield + // All chapter masters have the trait `Lead by Example` by default + "traits": [ + "" + ], + "gear": "", + "mobi": "", + "armour": "" // default is Artificer armour, only needed to set if changing to something else. + }, + "artifact": [], + "company_titles": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "flagship_name": "Hex", // leave blank to autogenerate + /** + * * Default fleet composition + * * Homeworld + * - 2 Battle Barges, 8 Strike cruisers, 7 Gladius, 3 Hunters + * * Fleet based and Penitent + * - 4 Battle Barges, 3 Strike Cruisers, 7 Gladius, 3 Hunters + * + * use negative numbers to subtract ships + * * Stacks with advantages/disadvantages + */ + "extra_ships": { + "battle_barges": 0, + "gladius": 0, + "strike_cruisers": 0, + "hunters": 0 + }, + /** + * * Default HQ Layout (Does not include company specialists) + * - 8 Chaplains, 8 Techmarines, 8 Apothecary, 2 Epistolary (librarian), + * - 2 Codiciery, 4 Lexicanum + * * Default Company specialists (divided based on `load_to_ships.split_vets` setting) + * - 20 Terminators, 85 Veterans, 20 Devastators, 20 Assault + * Use negative numbers to subtract + * * Stacks with advantages/disadvantages + */ + "extra_specialists": { + "chaplains": 0, + "techmarines": 0, + "apothecary": -10, + "epistolary": 0, + "codiciery": 0, + "lexicanum": 0, + "terminator": -10, + "assault": 0, + "veteran": 45, //offset obliterated + "devastator": 0 + }, + /** + * * Default Marine strength + * - 100 marines per company + * use negative numbers to subtract + * * Stacks with strength for non-founding chapters only + */ + "extra_marines": { + "second": 0, + "third": 0, + "fourth": 0, + "fifth": 0, + "sixth": 0, + "seventh": 0, + "eighth": 0, + "ninth": 0, + "tenth": 40 //offset obliterated + }, + /** + * All vehicles are added to the 10th company at the start of the game + */ + "extra_vehicles": { + "rhino": 0, + "whirlwind": 0, + "predator": 0, + "land_raider": 0, + "land_speeder": 0 + }, + /** Add extra starting items ["Item Name", Number to add] */ + "extra_equipment": [ + // [ + // "Bolter", + // 20 + // ] + ], + /** + * Provide a place to change the default name and equipment preferences of roles for this chapter + * `custom_roles` should be used for specialist/leadership type roles, + * To affect an entire squad, see `custom_squads` below + */ + "custom_roles": { + "captain": { + "name": "Warleader" + }, + "sergeant": { + "name": "Pride Leader" + }, + "chaplain": { + "name": "Deathspeaker" + }, + "librarian": { + "name": "Spiritwalker" + }, + "apothecary": { + "name": "Lifebinder" + } + // "tactical": { + // "name": "Tactical" + // }, + // "devastator": { + // "name": "Devastator" + // }, + // "assault": { + // "name": "Assault", + // "wep1": "Chainsword" + // }, + // "scout": { + // "name": "Scout", + // "wep1": "Sniper Rifle" + // }, + // "chaplain": { + // "name": "Chaplain", + // }, + // "techmarine": { + // "name": "Techmarine", + // "wep1": "Power Axe" + // }, + // "apothecary": { + // "name": "Apothecary", + // "wep1": "Power Axe" + // }, + // "librarian": { + // "name": "Librarian", + // "wep1": "Force Staff" + // }, + // "sergeant": { + // "name": "Sergeant", + // "wep1": "Chainaxe" + // }, + // "veteran_sergeant": { + // "name": "Veteran Sergeant", + // "wep1": "Chainaxe" + // } + }, + /** + * * Custom squad roles, loadouts and formations + * When companies are made, squads are formed based on these rules: + * - squad name: one of captain, terminator, terminator_assault, sternguard_veteran, + vanguard_veteran, devastator, tactical, assault, scout, scout_sniper + * - squad array layout [Role, Role, ...Role, type_data] + * - each element of the array is a default Role, and their settings. + - if you changed the role using `custom_roles` you need to reference the role with this new name + - for non-leader roles it is better to change the name of the role in the squad layout instead + * - unit layout [Role Name, Settings Struct] + * - settings struct: + * - max: The most amount of this unit is allowed per squad + * - min: The squad can't be formed unless at least 1 of this unit is in it + * - role: The name of the unit when it is a member of the squad. This is where you rename roles e.g. + "Terminator" > "Deathwing Terminator" + ** - loadout: Struct containing Required and Optional weaponry this unit can equip + a required loadout always follows this syntax :[,] + so "wep1":["Bolter",4], will mean four marines are always equipped with 4 bolters in the wep1 slot + * option loadouts follow the following syntax :[[],] + for example [["Flamer", "Meltagun"],1], means the role can have a max of one flamer or meltagun + [["Plasma Pistol","Bolt Pistol"], 4] means the role can have a mix of 4 plasma pistols and bolt pistols on top + of all required loadout options + - wep1: right hand weapon + - wep2: left hand weapon + - mobi: Mobility item, e.g. Jump Packs. + - armour: required armour + - gear: special equipment needed for certain roles, like a Roasrius or Narthecium + * - type_data: names the squad, allows certain formations + */ + "squad_name": "Squad", + "custom_squads": {} + } +} \ No newline at end of file diff --git a/datafiles/main/chapters/36.json b/datafiles/main/chapters/36.json new file mode 100644 index 0000000000..20b224dcc2 --- /dev/null +++ b/datafiles/main/chapters/36.json @@ -0,0 +1,1028 @@ +{ + "chapter": { + "id": 36, + "name": "Raptors", + "flavor": "The Raptors are a Successor Chapter of the Raven Guard, created in the Second Founding. They are famous for their exceptional survival abilities, and extremely skilled in guerrilla warfare and infiltration operations", + "origin": 2, // 1 - Founding, 2 - Successor, 3 - Other/non-canon/fanmade, 4 - Custom + "points": 150, + "founding": 9, // The id of the founding chapter, 0 for unknown or none, 10 for random + "splash": 36, // in \images\creation\chapters\splash folder, the img number, 1 being Dark Angels etc. + "icon_name": "raptors", + "fleet_type": 1, // 1= Homeworld, 2 = Fleet based, 3 = Penitent + "strength": 5, // 1-10 + "purity": 9, // 1-10 + "stability": 99, // 1-99 + "cooperation": 5, // 1-10 + "homeworld_exists": 1, // 1 = true + "recruiting_exists": 1, // 1 = true + "homeworld_rule": 3, // 1 = Govenor, 2 = Countries, 3 = Personal Rule + "homeworld": "Temperate", // one of "Lava" "Desert" "Forge" "Hive" "Death" "Agri" "Feudal" "Temperate" "Ice" "Dead" "Shrine" + "homeworld_name": "Tarrengast", // Homeworld Planet name, leave blank to autogenerate + "recruiting": "Death", // one of "Lava" "Desert" "Forge" "Hive" "Death" "Agri" "Feudal" "Temperate" "Ice" "Dead" "Shrine" + "recruiting_name": "Numina", // Recruiting Planet name, leave blank to autogenerate + "discipline": "librarius", // one of 'default' 'biomancy' 'pyromancy' 'telekinesis' 'rune_magic' + "aspirant_trial": "HUNTING", // one of "BLOODDUEL" "HUNTING" "SURVIVAL" "EXPOSURE" "KNOWLEDGE" "CHALLENGE" "APPRENTICESHIP" + "advantages": [ + "", // leave the first entry blank for now + "Ambushers", + "", + "", + "", + "", + "", + "", + "" + ], + "disadvantages": [ + "", // leave the first entry blank for now + "", + "", + "", + "", + "", + "", + "", + "" + ], + "colors": { + "main": "Raptors Green", + "secondary": "Raptors Green", + "pauldron_r": "Raptors Green", + "pauldron_l": "Raptors Green", + "trim": "Raptors Green", + "lens": "Red", + "weapon": "Raptors Green", + "special": 0, // 0 - normal, 1 - Breastplate, 2 - Vertical, 3 - Quadrant + }, + "complex_livery_data": { + "sgt": { + "helm_lens": 9.0, + "helm_pattern": 0.0, + "helm_primary": 38.0, + "helm_secondary": 38.0, + "helm_detail": 0.0 + }, + "veteran": { + "helm_lens": 9.0, + "helm_pattern": 0.0, + "helm_primary": 38.0, + "helm_secondary": 38.0, + "helm_detail": 0.0 + }, + "vet_sgt": { + "helm_lens": 9.0, + "helm_pattern": 0.0, + "helm_primary": 38.0, + "helm_secondary": 38.0, + "helm_detail": 0.0 + }, + "captain": { + "helm_lens": 9.0, + "helm_pattern": 0.0, + "helm_primary": 38.0, + "helm_secondary": 38.0, + "helm_detail": 0.0 + } + }, + "names": { + //Chapter Staff + "hchaplain": "", // Head Chaplain + "clibrarian": "", // Chief Librarian + "fmaster": "", // Forge Master + "hapothecary": "", // Head Apothecary + //Company Captains 1 - 10 + "honorcapt": "Kassayan", + "watchmaster": "", + "arsenalmaster": "Orelius", + "admiral": "Nigelus", + "marchmaster": "Benedict", + "ritesmaster": "", + "victualler": "", + "lordexec": "", + "relmaster": "", + "recruiter": "" + }, + "battle_cry": "...", + "equal_specialists": 1, // 0 if no, 1 if yes. If yes, will distribute specialist roles like Assaults and Devastators equally between companies. Otherwise all Assaults go in Company 8 and all Devastators in Company 9 + "load_to_ships": { + "escort_load": 2, // 0 no, 2 yes, 1 doesnt do anything :) + "split_scouts": 1, // 0 no, 1 yes. If yes, splits scouts between companies equally. Otherwise all scouts are kept in 10th Company. + "split_vets": 0 // 0 no, 1 yes. If yes, all veterans are distrubuted equally between companies. Otherwise all veterans are kept in the 1st Company + }, + "successors": 0, //total number of successor chapters + "mutations": { + "preomnor": 0, + "voice": 0, + "doomed": 0, + "lyman": 0, + "omophagea": 0, + "ossmodula": 0, + "membrane": 0, + "zygote": 0, + "betchers": 0, + "catalepsean": 0, + "secretions": 0, + "occulobe": 0, + "mucranoid": 1 + }, + "disposition": [ + 0, // nothing + 0, // Progenitor faction + 50, // Imperium + 50, // Admech + 50, //Inquisition + 50, // Ecclesiarchy + 50, // Astartes + 0 // nothing + ], + "chapter_master": { + "name": "Lias Issodon", + "specialty": 1, //1 Leader, 2 Champion, 3 Psyker, + "melee": 5, // 1 twin power fists ... 8 force staff + "ranged": 3, // 1 boltstorm gauntlets ... 7 storm shield + // All chapter masters have the trait `Lead by Example` by default + "traits": [ + "" + ], + "gear": "", + "mobi": "", + "armour": "" // default is Artificer armour, only needed to set if changing to something else. + }, + "artifact": [ + { + "name": "Malius", + "description": "Malice has been with Lias since his time in the Raptors' scout company and shares most characteristics of the standard bolter but is capable of a higher rate of fire and has an extended range", + "base_weapon_type": "Stalker Pattern Bolter", + "slot": "wep2" + } + ], + "company_titles": [ + "", + "1st Company", + "2nd Company", + "3rd Company", + "4th Company", + "5th Company", + "6th Company", + "7th Company", + "8th Company", + "9th Company", + "10th Company" + ], + "flagship_name": "Accipiter", // leave blank to autogenerate + /** + * * Default fleet composition + * * Homeworld + * - 2 Battle Barges, 8 Strike cruisers, 7 Gladius, 3 Hunters + * * Fleet based and Penitent + * - 4 Battle Barges, 3 Strike Cruisers, 7 Gladius, 3 Hunters + * + * use negative numbers to subtract ships + * * Stacks with advantages/disadvantages + */ + "extra_ships": { + "battle_barges": 0, + "gladius": 0, + "strike_cruisers": 0, + "hunters": 0 + }, + /** + * * Default HQ Layout (Does not include company specialists) + * - 8 Chaplains, 8 Techmarines, 8 Apothecary, 2 Epistolary (librarian), + * - 2 Codiciery, 4 Lexicanum + * * Default Company specialists (divided based on `load_to_ships.split_vets` setting) + * - 20 Terminators, 85 Veterans, 20 Devastators, 20 Assault + * Use negative numbers to subtract + * * Stacks with advantages/disadvantages + */ + "extra_specialists": { + "chaplains": 0, + "techmarines": 0, + "apothecary": 0, + "epistolary": 0, + "codiciery": 0, + "lexicanum": 0, + "terminator": 0, + "assault": 0, + "veteran": 0, + "devastator": 0 + }, + /** + * * Default Marine strength + * - 100 marines per company + * use negative numbers to subtract + * * Stacks with strength for non-founding chapters only + */ + "extra_marines": { + "second": 0, + "third": 0, + "fourth": 0, + "fifth": 0, + "sixth": 0, + "seventh": 0, + "eighth": 0, + "ninth": 0, + "tenth": 0 + }, + /** + * All vehicles are added to the 10th company at the start of the game + */ + "extra_vehicles": { + "rhino": 0, + "whirlwind": 0, + "predator": 0, + "land_raider": 0, + "land_speeder": 0 + }, + /** Add extra starting items ["Item Name", Number to add] */ + "extra_equipment": [ + // [ + // "Bolter", + // 20 + // ] + ], + /** + * Provide a place to change the default name and equipment preferences of roles for this chapter + * `custom_roles` should be used for specialist/leadership type roles, + * To affect an entire squad, see `custom_squads` below + */ + "custom_roles": { + // "honour_guard": { + // "name": "Honour Guard", + // "wep1": "Power Sword", + // "wep2": "Bolter" + // }, + // "veteran": { + // "name": "Veteran", + // "wep1": "Chainaxe" + // }, + // "captain": { + // "name": "Captain", + // "wep1": "Power Sword" + // }, + // "tactical": { + // "name": "Tactical" + // }, + // "devastator": { + // "name": "Devastator" + // }, + // "assault": { + // "name": "Assault", + // "wep1": "Chainsword" + // }, + // "scout": { + // "name": "Scout", + // "wep1": "Sniper Rifle" + // }, + // "chaplain": { + // "name": "Chaplain", + // }, + // "techmarine": { + // "name": "Techmarine", + // "wep1": "Power Axe" + // }, + // "apothecary": { + // "name": "Apothecary", + // "wep1": "Power Axe" + // }, + // "librarian": { + // "name": "Librarian", + // "wep1": "Force Staff" + // }, + // "sergeant": { + // "name": "Sergeant", + // "wep1": "Chainaxe" + // }, + // "veteran_sergeant": { + // "name": "Veteran Sergeant", + // "wep1": "Chainaxe" + // } + }, + /** + * * Custom squad roles, loadouts and formations + * When companies are made, squads are formed based on these rules: + * - squad name: one of captain, terminator, terminator_assault, sternguard_veteran, + vanguard_veteran, devastator, tactical, assault, scout, scout_sniper + * - squad array layout [Role, Role, ...Role, type_data] + * - each element of the array is a default Role, and their settings. + - if you changed the role using `custom_roles` you need to reference the role with this new name + - for non-leader roles it is better to change the name of the role in the squad layout instead + * - unit layout [Role Name, Settings Struct] + * - settings struct: + * - max: The most amount of this unit is allowed per squad + * - min: The squad can't be formed unless at least 1 of this unit is in it + * - role: The name of the unit when it is a member of the squad. This is where you rename roles e.g. + "Terminator" > "Deathwing Terminator" + ** - loadout: Struct containing Required and Optional weaponry this unit can equip + a required loadout always follows this syntax :[,] + so "wep1":["Bolter",4], will mean four marines are always equipped with 4 bolters in the wep1 slot + * option loadouts follow the following syntax :[[],] + for example [["Flamer", "Meltagun"],1], means the role can have a max of one flamer or meltagun + [["Plasma Pistol","Bolt Pistol"], 4] means the role can have a mix of 4 plasma pistols and bolt pistols on top + of all required loadout options + - wep1: right hand weapon + - wep2: left hand weapon + - mobi: Mobility item, e.g. Jump Packs. + - armour: required armour + - gear: special equipment needed for certain roles, like a Roasrius or Narthecium + * - type_data: names the squad, allows certain formations + */ + "squad_name": "Squad", + "custom_squads": {}, + "full_liveries": [ + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 8, + "left_leg_upper": 8, + "left_leg_knee": 8, + "right_leg_lower": 8, + "right_leg_upper": 8, + "right_leg_knee": 8, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 8, + "right_chest": 8, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 8, + "left_hand": 8, + "right_arm": 8, + "right_hand": 8, + "left_head": 8, + "right_head": 8, + "left_muzzle": 8, + "right_muzzle": 8, + "eye_lense": 9, + "right_backpack": 8, + "left_backpack": 8, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 8, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 0, + "left_leg_upper": 0, + "left_leg_knee": 0, + "right_leg_lower": 0, + "right_leg_upper": 0, + "right_leg_knee": 0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 0, + "right_chest": 0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 0, + "left_hand": 0, + "right_arm": 0, + "right_hand": 0, + "left_head": 0, + "right_head": 0, + "left_muzzle": 0, + "right_muzzle": 0, + "eye_lense": 9, + "right_backpack": 0, + "left_backpack": 0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 9, + "left_leg_upper": 9, + "left_leg_knee": 9, + "right_leg_lower": 9, + "right_leg_upper": 9, + "right_leg_knee": 9, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 9, + "right_chest": 9, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 9, + "left_hand": 9, + "right_arm": 9, + "right_hand": 9, + "left_head": 9, + "right_head": 9, + "left_muzzle": 9, + "right_muzzle": 9, + "eye_lense": 23, + "right_backpack": 9, + "left_backpack": 9, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 9, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 34, + "left_leg_upper": 34, + "left_leg_knee": 34, + "right_leg_lower": 34, + "right_leg_upper": 34, + "right_leg_knee": 34, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 34, + "right_chest": 34, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 34, + "left_hand": 34, + "right_arm": 34, + "right_hand": 34, + "left_head": 34, + "right_head": 34, + "left_muzzle": 34, + "right_muzzle": 34, + "eye_lense": 28, + "right_backpack": 34, + "left_backpack": 34, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 34, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + }, + { + "is_changed": true, + "left_leg_lower": 38.0, + "left_leg_upper": 38.0, + "left_leg_knee": 38.0, + "right_leg_lower": 38.0, + "right_leg_upper": 38.0, + "right_leg_knee": 38.0, + "metallic_trim": 3.0, + "right_trim": 38.0, + "left_trim": 38.0, + "left_chest": 38.0, + "right_chest": 38.0, + "left_thorax": 0.0, + "right_thorax": 0.0, + "left_arm": 38.0, + "left_hand": 38.0, + "right_arm": 38.0, + "right_hand": 38.0, + "left_head": 38.0, + "right_head": 38.0, + "left_muzzle": 38.0, + "right_muzzle": 38.0, + "eye_lense": 9.0, + "right_backpack": 38.0, + "left_backpack": 38.0, + "weapon_primary": 38.0, + "weapon_secondary": 38.0, + "company_marks": 0.0, + "company_marks_loc": 0.0, + "right_pauldron": 38.0, + "left_pauldron": 38.0 + } + ], + } +} \ No newline at end of file diff --git a/datafiles/main/chapters/37.json b/datafiles/main/chapters/37.json new file mode 100644 index 0000000000..7ecbbecac5 --- /dev/null +++ b/datafiles/main/chapters/37.json @@ -0,0 +1,339 @@ +{ + "chapter": { + "id": 37, + "name": "Consecrators", + "flavor": "The Consecrators are a secretive Dark Angels successor chapter dedicated to preserving ancient technologies and traditions from the early Imperium, maintaining a substantial armory of rare Heresy-era weaponry and equipment while continuing their parent chapter's hunt for the Fallen Angels.", + "origin": 2, // 1 - Founding, 2 - Successor, 3 - Other/non-canon/fanmade, 4 - Custom + "points": 150, + "founding": 0, // The id of the founding chapter, 0 for unknown or none, 10 for random + "splash": 1, // in \images\creation\chapters\splash folder, the img number, 1 being Dark Angels etc. + "icon_name": "consecrators", + "fleet_type": 2, // 1= Homeworld, 2 = Fleet based, 3 = Penitent + "strength": 5, // 1-10 + "purity": 5, // 1-10 + "stability": 50, // 1-99 + "cooperation": 5, // 1-10 + "homeworld_exists": 0, // 1 = true + "recruiting_exists": 1, // 1 = true + "homeworld_rule": 1, // 1 = Govenor, 2 = Countries, 3 = Personal Rule + "homeworld": "Hive", // one of "Lava" "Desert" "Forge" "Hive" "Death" "Agri" "Feudal" "Temperate" "Ice" "Dead" "Shrine" + "homeworld_name": "", // Homeworld Planet name, leave blank to autogenerate + "recruiting": "Death", // one of "Lava" "Desert" "Forge" "Hive" "Death" "Agri" "Feudal" "Temperate" "Ice" "Dead" "Shrine" + "recruiting_name": "", // Recruiting Planet name, leave blank to autogenerate + "discipline": "librarius", // one of 'default' 'biomancy' 'pyromancy' 'telekinesis' 'rune_magic' + "aspirant_trial": "SURVIVAL", // one of "BLOODDUEL" "HUNTING" "SURVIVAL" "EXPOSURE" "KNOWLEDGE" "CHALLENGE" "APPRENTICESHIP" + "advantages": [ + "", // leave the first entry blank for now + "Enemy: Fallen", + "Ancient Armoury", + "", + "", + "", + "", + "", + "" + ], + "disadvantages": [ + "", // leave the first entry blank for now + "Never Forgive", + "Enduring Angels", + "", + "", + "", + "", + "", + "" + ], + "colors": { + "main": "Black", + "secondary": "Black", + "pauldron_r": "Black", + "pauldron_l": "Black", + "trim": "Black", + "lens": "Gold", + "weapon": "Dark Red", + "special": 0, // 0 - normal, 1 - Breastplate, 2 - Vertical, 3 - Quadrant + //"trim_on": 0 // 0 no, 1 yes for pauldron trim colours. Trim colour will still be used for certain complex livery items + }, + "complex_livery_data": { + "vet_sgt": { + "helm_lens": 12.0, + "helm_pattern": 1.0, + "helm_primary": 8.0, + "helm_secondary": 11.0, + "helm_detail": 0.0 + }, + "captain": { + "helm_lens": 12.0, + "helm_pattern": 1.0, + "helm_primary": 8.0, + "helm_secondary": 11.0, + "helm_detail": 0.0 + }, + "veteran": { + "helm_lens": 12.0, + "helm_pattern": 1.0, + "helm_primary": 8.0, + "helm_secondary": 11.0, + "helm_detail": 0.0 + }, + "sgt": { + "helm_lens": 12.0, + "helm_pattern": 1.0, + "helm_primary": 8.0, + "helm_secondary": 11.0, + "helm_detail": 0.0 + }, + "all_others": { + "helm_lens": 12.0, + "helm_pattern": 1.0, + "helm_primary": 8.0, + "helm_secondary": 11.0, + "helm_detail": 0.0 + } + }, + "names": { + //Chapter Staff + "hchaplain": "", // Head Chaplain + "clibrarian": "", // Chief Librarian + "fmaster": "", // Forge Master + "hapothecary": "", // Head Apothecary + //Company Captains 1 - 10 + "honorcapt": "", + "watchmaster": "", + "arsenalmaster": "", + "admiral": "", + "marchmaster": "", + "ritesmaster": "", + "victualler": "", + "lordexec": "", + "relmaster": "", + "recruiter": "" + }, + "battle_cry": "For the Emperor!", + "equal_specialists": 0, // 0 if no, 1 if yes. If yes, will distribute specialist roles like Assaults and Devastators equally between companies. Otherwise all Assaults go in Company 8 and all Devastators in Company 9 + "load_to_ships": { + "escort_load": 2, // 0 no, 2 yes, 1 doesnt do anything :) + "split_scouts": 0, // 0 no, 1 yes. If yes, splits scouts between companies equally. Otherwise all scouts are kept in 10th Company. + "split_vets": 0 // 0 no, 1 yes. If yes, all veterans are distrubuted equally between companies. Otherwise all veterans are kept in the 1st Company + }, + "successors": 0, //total number of successor chapters + "mutations": { + "preomnor": 0, + "voice": 0, + "doomed": 0, + "lyman": 0, + "omophagea": 0, + "ossmodula": 0, + "membrane": 0, + "zygote": 0, + "betchers": 0, + "catalepsean": 0, + "secretions": 0, + "occulobe": 0, + "mucranoid": 0 + }, + "disposition": [ + 0, // nothing + 0, // Progenitor faction + 50, // Imperium + 50, // Admech + 50, //Inquisition + 50, // Ecclesiarchy + 50, // Astartes + 0 // nothing + ], + "chapter_master": { + "name": "Nakir", + "specialty": 1, //1 Leader, 2 Champion, 3 Psyker, + "melee": 5, // 1 twin power fists ... 8 force staff + "ranged": 3, // 1 boltstorm gauntlets ... 7 storm shield + // All chapter masters have the trait `Lead by Example` by default + "traits": [ + "recluse", + "secretive_knights", + ], + "gear": "Rosarius", + "mobi": "", + "armour": "MK3 Iron Armour" // default is Artificer armour, only needed to set if changing to something else. + }, + "artifact": [ + { + "name": "Sword of Sanctity", + "description": "One of the few Heavenfall Blades from the chapter's armoury and utilizes small amounts of obsidian in its workings, similar to the Sword of Secrets wielded by Supreme Grand Master Azrael of the Dark Angels", + "base_weapon_type": "Power Sword", + "slot": "wep1" + } + ], + "company_titles": [ + "", + "1st Company", + "2nd Company", + "3rd Company", + "4th Company", + "5th Company", + "6th Company", + "7th Company", + "8th Company", + "9th Company", + "10th Company" + ], + "flagship_name": "Reliquaria", // leave blank to autogenerate + /** + * * Default fleet composition + * * Homeworld + * - 2 Battle Barges, 8 Strike cruisers, 7 Gladius, 3 Hunters + * * Fleet based and Penitent + * - 4 Battle Barges, 3 Strike Cruisers, 7 Gladius, 3 Hunters + * + * use negative numbers to subtract ships + * * Stacks with advantages/disadvantages + */ + "extra_ships": { + "battle_barges": 0, + "gladius": 0, + "strike_cruisers": 0, + "hunters": 0 + }, + /** + * * Default HQ Layout (Does not include company specialists) + * - 8 Chaplains, 8 Techmarines, 8 Apothecary, 2 Epistolary (librarian), + * - 2 Codiciery, 4 Lexicanum + * * Default Company specialists (divided based on `load_to_ships.split_vets` setting) + * - 20 Terminators, 85 Veterans, 20 Devastators, 20 Assault + * Use negative numbers to subtract + * * Stacks with advantages/disadvantages + */ + "extra_specialists": { + "chaplains": 0, + "techmarines": 0, + "apothecary": 0, + "epistolary": 0, + "codiciery": 0, + "lexicanum": 0, + "terminator": 0, + "assault": 0, + "veteran": 0, + "devastator": 0 + }, + /** + * * Default Marine strength + * - 100 marines per company + * use negative numbers to subtract + * * Stacks with strength for non-founding chapters only + */ + "extra_marines": { + "second": 0, + "third": 0, + "fourth": 0, + "fifth": 0, + "sixth": 0, + "seventh": 0, + "eighth": 0, + "ninth": 0, + "tenth": 0 + }, + /** + * All vehicles are added to the 10th company at the start of the game + */ + "extra_vehicles": { + "rhino": 0, + "whirlwind": 0, + "predator": 0, + "land_raider": 0, + "land_speeder": 0 + }, + /** Add extra starting items ["Item Name", Number to add] */ + "extra_equipment": [ + // [ + // "Bolter", + // 20 + // ] + ], + /** + * Provide a place to change the default name and equipment preferences of roles for this chapter + * `custom_roles` should be used for specialist/leadership type roles, + * To affect an entire squad, see `custom_squads` below + */ + "custom_roles": { + "chapter_master": { + "name": "Grand Master", + }, + // "veteran": { + // "name": "Veteran", + // "wep1": "Chainaxe" + // }, + "captain": { + "name": "Master", + }, + // "tactical": { + // "name": "Tactical" + // }, + // "devastator": { + // "name": "Devastator" + // }, + // "assault": { + // "name": "Assault", + // "wep1": "Chainsword" + // }, + // "scout": { + // "name": "Scout", + // "wep1": "Sniper Rifle" + // }, + // "chaplain": { + // "name": "Chaplain", + // }, + // "techmarine": { + // "name": "Techmarine", + // "wep1": "Power Axe" + // }, + // "apothecary": { + // "name": "Apothecary", + // "wep1": "Power Axe" + // }, + // "librarian": { + // "name": "Librarian", + // "wep1": "Force Staff" + // }, + // "sergeant": { + // "name": "Sergeant", + // "wep1": "Chainaxe" + // }, + // "veteran_sergeant": { + // "name": "Veteran Sergeant", + // "wep1": "Chainaxe" + // } + }, + /** + * * Custom squad roles, loadouts and formations + * When companies are made, squads are formed based on these rules: + * - squad name: one of captain, terminator, terminator_assault, sternguard_veteran, + vanguard_veteran, devastator, tactical, assault, scout, scout_sniper + * - squad array layout [Role, Role, ...Role, type_data] + * - each element of the array is a default Role, and their settings. + - if you changed the role using `custom_roles` you need to reference the role with this new name + - for non-leader roles it is better to change the name of the role in the squad layout instead + * - unit layout [Role Name, Settings Struct] + * - settings struct: + * - max: The most amount of this unit is allowed per squad + * - min: The squad can't be formed unless at least 1 of this unit is in it + * - role: The name of the unit when it is a member of the squad. This is where you rename roles e.g. + "Terminator" > "Deathwing Terminator" + ** - loadout: Struct containing Required and Optional weaponry this unit can equip + a required loadout always follows this syntax :[,] + so "wep1":["Bolter",4], will mean four marines are always equipped with 4 bolters in the wep1 slot + * option loadouts follow the following syntax :[[],] + for example [["Flamer", "Meltagun"],1], means the role can have a max of one flamer or meltagun + [["Plasma Pistol","Bolt Pistol"], 4] means the role can have a mix of 4 plasma pistols and bolt pistols on top + of all required loadout options + - wep1: right hand weapon + - wep2: left hand weapon + - mobi: Mobility item, e.g. Jump Packs. + - armour: required armour + - gear: special equipment needed for certain roles, like a Roasrius or Narthecium + * - type_data: names the squad, allows certain formations + */ + "squad_name": "Squad", + "custom_squads": {} + } +} \ No newline at end of file diff --git a/datafiles/main/chapters/7.JSON b/datafiles/main/chapters/7.JSON index f19df0a9a9..6a13b67f73 100644 --- a/datafiles/main/chapters/7.JSON +++ b/datafiles/main/chapters/7.JSON @@ -229,7 +229,12 @@ }, /** Add extra starting items ["Item Name", Number to add] */ "full_liveries":[ - { "left_pauldron" : [ "icon",{ "icon" : "ultramarines", "colour" : 34, "type" : 2 } ], "right_pauldron" : 34, "is_changed" : 1, "left_leg_lower" : 34, "left_leg_upper" : 34, "left_leg_knee" : 34, "right_leg_lower" : 34, "right_leg_upper" : 34, "right_leg_knee" : 34, "metallic_trim" : 12, "left_chest" : 34, "right_chest" : 34, "left_thorax" : 0, "right_thorax" : 0, "left_hand" : 34, "right_hand" : 34, "left_head" : 34, "right_head" : 34, "left_muzzle" : 34, "right_muzzle" : 34, "eye_lense" : 9, "right_backpack" : 34, "left_backpack" : 34, "weapon_primary" : 9, "weapon_secondary" : 9, "company_marks" : 0, "company_marks_loc" : 0, "left_arm" : 34, "right_arm" : 34, "left_trim" : 12, "right_trim" : 12 }, + { + "left_pauldron" : [ "icon",{ "icon" : "ultramarines", "colour" : 34, "type" : 2 } ], + "right_pauldron" : 34, + "is_changed" : 1, + "left_leg_lower" : 34, "left_leg_upper" : 34, "left_leg_knee" : 34, "right_leg_lower" : 34, "right_leg_upper" : 34, "right_leg_knee" : 34, "metallic_trim" : 12, "left_chest" : 34, "right_chest" : 34, "left_thorax" : 0, "right_thorax" : 0, "left_hand" : 34, "right_hand" : 34, "left_head" : 34, "right_head" : 34, "left_muzzle" : 34, "right_muzzle" : 34, "eye_lense" : 9, "right_backpack" : 34, "left_backpack" : 34, "weapon_primary" : 9, "weapon_secondary" : 9, "company_marks" : 0, "company_marks_loc" : 0, "left_arm" : 34, "right_arm" : 34, "left_trim" : 12, "right_trim" : 12 + }, ], "company_liveries" : [ {}, diff --git a/datafiles/main/chapters/8.JSON b/datafiles/main/chapters/8.JSON index f873483ba1..405741b694 100644 --- a/datafiles/main/chapters/8.JSON +++ b/datafiles/main/chapters/8.JSON @@ -225,7 +225,7 @@ "custom_roles": { "veteran": { "name": "Firedrake", - "wep1": "Power Sword" + "wep2": "Power Sword" }, "veteran_sergeant": { "name": "Firedrake Master" diff --git a/datafiles/main/chapters/template.JSON b/datafiles/main/chapters/template.JSON index 19dc0970c6..4f4ee40a63 100644 --- a/datafiles/main/chapters/template.JSON +++ b/datafiles/main/chapters/template.JSON @@ -77,8 +77,8 @@ "equal_specialists": 0, // 0 if no, 1 if yes. If yes, will distribute specialist roles like Assaults and Devastators equally between companies. Otherwise all Assaults go in Company 8 and all Devastators in Company 9 "load_to_ships": { "escort_load": 2, // 0 no, 2 yes, 1 doesnt do anything :) - "split_scouts": 0, // 0 no, 1 yes. If yes, splits scouts between companies equally. Otherwise all scouts are kept in 10th Company. - "split_vets": 0 // 0 no, 1 yes. If yes, all veterans are distrubuted equally between companies. Otherwise all veterans are kept in the 1st Company + "split_scouts": 0, // 0 no, 1 yes. If yes, splits scouts between ships equally. Otherwise all scouts are kept on the homeworld. + "split_vets": 0 // 0 no, 1 yes. If yes, all veterans are distrubuted equally between ships. Otherwise all veterans are kept in the flagship }, "successors": 0, //total number of successor chapters "mutations": { @@ -168,15 +168,20 @@ */ "extra_specialists": { "chaplains": 0, + "chaplains_per_company": 0, "techmarines": 0, + "techmarines_per_company": 0, "apothecary": 0, + "apothecary_per_company": 0, "epistolary": 0, + "epistolary_per_company": 0, "codiciery": 0, "lexicanum": 0, "terminator": 0, "assault": 0, "veteran": 0, - "devastator": 0 + "devastator": 0, + "dreadnought": 0 }, /** * * Default Marine strength diff --git a/datafiles/main/visual_sets/mycrusaderbits/crusader_helm/1.png b/datafiles/main/visual_sets/mycrusaderbits/crusader_helm/1.png new file mode 100644 index 0000000000..6c13d1e5c8 Binary files /dev/null and b/datafiles/main/visual_sets/mycrusaderbits/crusader_helm/1.png differ diff --git a/datafiles/main/visual_sets/mycrusaderbits/data.json b/datafiles/main/visual_sets/mycrusaderbits/data.json new file mode 100644 index 0000000000..46cdc8347b --- /dev/null +++ b/datafiles/main/visual_sets/mycrusaderbits/data.json @@ -0,0 +1,82 @@ +[ + { + "name" : "one", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [1], + }, + }, + { + "name" : "two", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [2], + }, + }, + { + "name" : "three", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [3], + }, + }, + { + "name" : "four", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [4], + }, + }, + { + "name" : "five", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [5], + }, + }, + { + "name" : "six", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [6], + }, + }, + { + "name" : "seven", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [7], + }, + }, + { + "name" : "eight", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [8], + }, + }, + { + "name" : "nine", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [9], + }, + }, + { + "name" : "ten", + "data" : { + "body_types" :[0], + "position" : "right_pauldron", + "company" : [10], + }, + }, +] \ No newline at end of file diff --git a/datafiles/main/visual_sets/use_sets.json b/datafiles/main/visual_sets/use_sets.json index 193d856041..d38400a255 100644 --- a/datafiles/main/visual_sets/use_sets.json +++ b/datafiles/main/visual_sets/use_sets.json @@ -1,3 +1,3 @@ [ - "Company_marks_roman_right_shoulder" + "Company_marks_roman_right_shoulder", ] \ No newline at end of file diff --git a/docs/CHEATCODES.md b/docs/CHEATCODES.md index 037b6a3da6..fcf90e217b 100644 --- a/docs/CHEATCODES.md +++ b/docs/CHEATCODES.md @@ -18,6 +18,7 @@ Arguments with stars `(argument*)` can be omitted. - `artifact (type*) (number*)` - spawns an artifact of a random type, if unspecified. - `(type*)` - possible values: random, random_nodemon, Weapon, Armour, Gear, Device, Robot, Tome, chaos_gift, good. Case sensitive. - `artifactpopulate` - spawns artifacts on all planets. +- `stcpopulate` - spawns an STC fragment on all planets. - `additem "(name)" (number*) (quality*)` - spawns an item(s) with specified parameters. - `"(name)"` - item name in quotes, as it's written in the game. Case sensitive. "Bolter", "Power Axe", etc. - `(quality*)` - possible values: standard, master_crafted, artificer, artifact, exemplary. Case insensitive. @@ -43,8 +44,21 @@ Arguments with stars `(argument*)` can be omitted. - `techuprising` - triggers the Tech Heretics Uprising event. - `inspection` - triggers the Inquisitorial Inspection event. - `slaughtersong` - triggers the Starship event. + - `surfremove` - triggers inquisition surf removal + - `strangebuild` - triggers strange build event + - `factionenemy` - triggers the made a faction enemy event + - `stopall` - stops random events + - `startevents` - restart random events - `inquisarti` - triggers the Artifact Loan quest. -- `govmission` - spawns governor missions on all planets. +- `govmission (mission*)` - spawns governor missions on all planets. run with a mission name to spawn a particular mission + - `provide_garrison` + - `join_communion` + - `hunt_beast` + - `protect_raiders` + - `recover_artifacts` + - `purge_enemies` + - `raid_black_market` + - `show_of_power` - `inquismission (mission*)` - triggers an inquisition mission. You must have met the inquisition for this to work - `planet` - investigate planet mission - `purge` - purge planet mission @@ -54,6 +68,10 @@ Arguments with stars `(argument*)` can be omitted. - `ethereal` - not implemented yet - `tyranid_organism` - capture tyranis mission - `demon` clear demon world mission. Requires at least one planet to have demons on it +- `mechmission (mission*)` - triggers a mechaniicus mission, can be run as is or with an optional missiono parameter to specify a particular mission + - `mech_mars` + - `mech_raider` + - `mech_bionics` ### Disposition: diff --git a/docs/CODE_STYLE.md b/docs/CODE_STYLE.md index 6685b600e7..a54294301b 100644 --- a/docs/CODE_STYLE.md +++ b/docs/CODE_STYLE.md @@ -21,7 +21,8 @@ All variable names, function names, etc., should use `snake_case` unless stated - Recommended to have a `_` prefix. - Ease readability. - Prevent namespace clashes with instance variables and scripts. -- Example: `var _example_e1`. + - Not required for loop indices (e.g., `for (var i = 0; i < count; i++) { ... }`). +- Example: `var _player_health`. **Instance Variables**: - No special rules, aside from `snake_case`. For now. @@ -45,14 +46,15 @@ All variable names, function names, etc., should use `snake_case` unless stated ### Constants **Macros**: -- To denote their group, use a short prefix in all caps (e.g., `PREFIX_`). -- The rest should be in all caps `SNAKE_CASE`. +- Written in all caps `SNAKE_CASE`. +- Try to denote their group using a short prefix (e.g., `PREFIX_`). - Example: `#macro COL_DARK_RED`. **Enums**: -- Enum names should start with an `e` prefix and be in all caps. -- Enum entries should use `PascalCase`. -- Example: `enum eCOLORS` with entries `DarkRed`, `Blue`, etc. + - Enum names should start with an `e` prefix. + - Written in all caps `SNAKE_CASE`. + - Enum entries should use `PascalCase`. + - Example: `enum eCOLORS` with entries `DarkRed`, `Blue`, etc. ### General Styling @@ -72,21 +74,6 @@ All variable names, function names, etc., should use `snake_case` unless stated ### Formatters -> [!WARNING] -> Gobo formatter turns structs into single line abominations.\ -> Format with a JS formatter afterwards. - -> [!WARNING] -> JavaScript formatters break `$"something {variable}"` syntax by adding a space after `$`.\ -> Manually correct this as needed, but keep in mind, that if using regex, it can match struct assessors and replace them. - -A solid GameMaker-specific formatter, that formats most of the elements that can get untidy, is [Gobo](https://github.com/Pizzaandy/Gobo/). -- Disable tab indent and set it to 4 spaces. -- Set max line width to something like 9999, to prevent condition checks from breaking into unreadable multiple lines. -- The above step will format structs into a single line, so you'll have to use a JS formatter afterwards to fix this. - -You can use [this](https://beautifier.io/) JavaScript formatter to fix broken structs. -- Indent with 4 spaces. -- Allow unlimited newlines between tokens. -- Don't wrap lines. -- Spaces before conditional. +A solid GameMaker-specific formatter, that formats most of the elements that can get untidy, is [Gobo (EttyKitty fork)](https://ettykitty.github.io/Gobo/). +- This is a fork made by EttyKitty. Default settings comply with what is expected in this project, with the addition of some nice new ones. +- Vertical arrays is an optional toggle, enable/disable it as you see fit. This formats array literals with each element on a new line for improved readability. diff --git a/docs/README.md b/docs/README.md index 875976f38a..a276764bb1 100644 --- a/docs/README.md +++ b/docs/README.md @@ -18,7 +18,7 @@ This project aims to continue development on the game, fix any bugs, expand and - If you can code, draw, design, help with the GitHub stuff or just want to help in any way possible - you'll be welcomed with open arms. - If you just love WH40K and want to chat - you'll have a great time in the server as well. -- 1d6Chan Wiki: [Chapter Master: Adeptus Dominus](https://1d6chan.miraheze.org/wiki/Category:Chapter_Master_:_Adeptus_Dominus) +- 1d6Chan Wiki: [Chapter Master: Adeptus Dominus](https://1d6chan.miraheze.org/wiki/Chapter_Master:_Adeptus_Dominus) - With some helpful pages that explain some of the new systems added in the Adeptus Dominus version. - Help with expanding it will be welcomed. @@ -40,6 +40,12 @@ Everything else **must** be covered by [paid **GameMaker** subscriptions](https: ## Contributing Best bet is to ask about everything in our Discord, because things bellow are probably not very helpful at the moment. +- [Working with GameMaker projects](https://github.com/Adeptus-Dominus/ChapterMaster/wiki/Working-with-GameMaker-projects) +- [Useful Tools/Resources](https://github.com/Adeptus-Dominus/ChapterMaster/wiki/Useful-resources) - [Contributing](https://github.com/Adeptus-Dominus/ChapterMaster/wiki/Contributing) wiki page (not filled properly) - [Code Style](https://github.com/Adeptus-Dominus/ChapterMaster/blob/main/docs/CODE_STYLE.md) (may be a bit dated) - [Code Guidance](https://github.com/Adeptus-Dominus/ChapterMaster/blob/main/docs/code_guidance.md) (probably dated as well) + +This project exists thanks to all the people who have contributed: + +[![Contributors](https://contrib.rocks/image?repo=Adeptus-Dominus/ChapterMaster)](https://github.com/Adeptus-Dominus/ChapterMaster/graphs/contributors) diff --git a/fonts/fnt_Embossed_metal/MessingLettern.ttf b/fonts/fnt_Embossed_metal/MessingLettern.ttf new file mode 100644 index 0000000000..bf538802da Binary files /dev/null and b/fonts/fnt_Embossed_metal/MessingLettern.ttf differ diff --git a/fonts/fnt_Embossed_metal/fnt_Embossed_metal.old.png b/fonts/fnt_Embossed_metal/fnt_Embossed_metal.old.png new file mode 100644 index 0000000000..63e2c6aca4 Binary files /dev/null and b/fonts/fnt_Embossed_metal/fnt_Embossed_metal.old.png differ diff --git a/fonts/fnt_Embossed_metal/fnt_Embossed_metal.old.yy b/fonts/fnt_Embossed_metal/fnt_Embossed_metal.old.yy new file mode 100644 index 0000000000..9b6a778347 --- /dev/null +++ b/fonts/fnt_Embossed_metal/fnt_Embossed_metal.old.yy @@ -0,0 +1,143 @@ +{ + "$GMFont":"", + "%Name":"fnt_Embossed_metal", + "AntiAlias":1, + "applyKerning":0, + "ascender":30, + "ascenderOffset":0, + "bold":false, + "canGenerateBitmap":true, + "charset":0, + "first":0, + "fontName":"Messing Lettern", + "glyphOperations":0, + "glyphs":{ + "32":{"character":32,"h":37,"offset":0,"shift":16,"w":16,"x":2,"y":2,}, + "33":{"character":33,"h":37,"offset":0,"shift":8,"w":7,"x":104,"y":80,}, + "34":{"character":34,"h":37,"offset":0,"shift":13,"w":12,"x":90,"y":80,}, + "35":{"character":35,"h":37,"offset":0,"shift":18,"w":18,"x":70,"y":80,}, + "36":{"character":36,"h":37,"offset":0,"shift":14,"w":14,"x":54,"y":80,}, + "37":{"character":37,"h":37,"offset":0,"shift":28,"w":27,"x":25,"y":80,}, + "38":{"character":38,"h":37,"offset":0,"shift":21,"w":21,"x":2,"y":80,}, + "39":{"character":39,"h":37,"offset":0,"shift":7,"w":7,"x":497,"y":41,}, + "40":{"character":40,"h":37,"offset":0,"shift":11,"w":10,"x":485,"y":41,}, + "41":{"character":41,"h":37,"offset":0,"shift":11,"w":10,"x":473,"y":41,}, + "42":{"character":42,"h":37,"offset":0,"shift":14,"w":14,"x":113,"y":80,}, + "43":{"character":43,"h":37,"offset":0,"shift":13,"w":13,"x":458,"y":41,}, + "44":{"character":44,"h":37,"offset":0,"shift":8,"w":8,"x":432,"y":41,}, + "45":{"character":45,"h":37,"offset":0,"shift":12,"w":11,"x":419,"y":41,}, + "46":{"character":46,"h":37,"offset":0,"shift":8,"w":8,"x":409,"y":41,}, + "47":{"character":47,"h":37,"offset":0,"shift":14,"w":14,"x":393,"y":41,}, + "48":{"character":48,"h":37,"offset":0,"shift":16,"w":16,"x":375,"y":41,}, + "49":{"character":49,"h":37,"offset":-1,"shift":11,"w":12,"x":361,"y":41,}, + "50":{"character":50,"h":37,"offset":0,"shift":14,"w":14,"x":345,"y":41,}, + "51":{"character":51,"h":37,"offset":1,"shift":16,"w":15,"x":328,"y":41,}, + "52":{"character":52,"h":37,"offset":0,"shift":18,"w":18,"x":308,"y":41,}, + "53":{"character":53,"h":37,"offset":0,"shift":14,"w":14,"x":442,"y":41,}, + "54":{"character":54,"h":37,"offset":0,"shift":16,"w":16,"x":129,"y":80,}, + "55":{"character":55,"h":37,"offset":0,"shift":14,"w":15,"x":147,"y":80,}, + "56":{"character":56,"h":37,"offset":0,"shift":16,"w":16,"x":164,"y":80,}, + "57":{"character":57,"h":37,"offset":1,"shift":16,"w":15,"x":2,"y":119,}, + "58":{"character":58,"h":37,"offset":0,"shift":8,"w":8,"x":496,"y":80,}, + "59":{"character":59,"h":37,"offset":0,"shift":8,"w":8,"x":486,"y":80,}, + "60":{"character":60,"h":37,"offset":0,"shift":16,"w":15,"x":469,"y":80,}, + "61":{"character":61,"h":37,"offset":0,"shift":11,"w":11,"x":456,"y":80,}, + "62":{"character":62,"h":37,"offset":0,"shift":16,"w":15,"x":439,"y":80,}, + "63":{"character":63,"h":37,"offset":0,"shift":14,"w":14,"x":423,"y":80,}, + "64":{"character":64,"h":37,"offset":2,"shift":29,"w":25,"x":396,"y":80,}, + "65":{"character":65,"h":37,"offset":0,"shift":17,"w":16,"x":378,"y":80,}, + "66":{"character":66,"h":37,"offset":1,"shift":16,"w":15,"x":361,"y":80,}, + "67":{"character":67,"h":37,"offset":0,"shift":16,"w":15,"x":344,"y":80,}, + "68":{"character":68,"h":37,"offset":1,"shift":16,"w":15,"x":327,"y":80,}, + "69":{"character":69,"h":37,"offset":1,"shift":13,"w":12,"x":313,"y":80,}, + "70":{"character":70,"h":37,"offset":0,"shift":12,"w":12,"x":299,"y":80,}, + "71":{"character":71,"h":37,"offset":0,"shift":16,"w":16,"x":281,"y":80,}, + "72":{"character":72,"h":37,"offset":0,"shift":15,"w":15,"x":264,"y":80,}, + "73":{"character":73,"h":37,"offset":0,"shift":8,"w":7,"x":255,"y":80,}, + "74":{"character":74,"h":37,"offset":0,"shift":16,"w":15,"x":238,"y":80,}, + "75":{"character":75,"h":37,"offset":0,"shift":15,"w":17,"x":219,"y":80,}, + "76":{"character":76,"h":37,"offset":0,"shift":13,"w":13,"x":204,"y":80,}, + "77":{"character":77,"h":37,"offset":0,"shift":20,"w":20,"x":182,"y":80,}, + "78":{"character":78,"h":37,"offset":0,"shift":16,"w":16,"x":290,"y":41,}, + "79":{"character":79,"h":37,"offset":0,"shift":16,"w":16,"x":272,"y":41,}, + "80":{"character":80,"h":37,"offset":1,"shift":16,"w":15,"x":255,"y":41,}, + "81":{"character":81,"h":37,"offset":0,"shift":16,"w":16,"x":373,"y":2,}, + "82":{"character":82,"h":37,"offset":1,"shift":16,"w":15,"x":344,"y":2,}, + "83":{"character":83,"h":37,"offset":0,"shift":14,"w":14,"x":328,"y":2,}, + "84":{"character":84,"h":37,"offset":0,"shift":15,"w":15,"x":311,"y":2,}, + "85":{"character":85,"h":37,"offset":0,"shift":16,"w":16,"x":293,"y":2,}, + "86":{"character":86,"h":37,"offset":1,"shift":16,"w":15,"x":276,"y":2,}, + "87":{"character":87,"h":37,"offset":0,"shift":25,"w":25,"x":249,"y":2,}, + "88":{"character":88,"h":37,"offset":0,"shift":18,"w":18,"x":229,"y":2,}, + "89":{"character":89,"h":37,"offset":0,"shift":16,"w":16,"x":211,"y":2,}, + "90":{"character":90,"h":37,"offset":0,"shift":14,"w":15,"x":194,"y":2,}, + "91":{"character":91,"h":37,"offset":0,"shift":10,"w":10,"x":361,"y":2,}, + "92":{"character":92,"h":37,"offset":0,"shift":14,"w":14,"x":178,"y":2,}, + "93":{"character":93,"h":37,"offset":0,"shift":10,"w":9,"x":154,"y":2,}, + "94":{"character":94,"h":37,"offset":-1,"shift":12,"w":14,"x":138,"y":2,}, + "95":{"character":95,"h":37,"offset":0,"shift":22,"w":22,"x":114,"y":2,}, + "96":{"character":96,"h":37,"offset":-1,"shift":7,"w":8,"x":104,"y":2,}, + "97":{"character":97,"h":37,"offset":1,"shift":16,"w":14,"x":88,"y":2,}, + "98":{"character":98,"h":37,"offset":1,"shift":16,"w":15,"x":71,"y":2,}, + "99":{"character":99,"h":37,"offset":0,"shift":16,"w":15,"x":54,"y":2,}, + "100":{"character":100,"h":37,"offset":0,"shift":16,"w":15,"x":37,"y":2,}, + "101":{"character":101,"h":37,"offset":0,"shift":16,"w":15,"x":20,"y":2,}, + "102":{"character":102,"h":37,"offset":0,"shift":10,"w":11,"x":165,"y":2,}, + "103":{"character":103,"h":37,"offset":0,"shift":16,"w":15,"x":391,"y":2,}, + "104":{"character":104,"h":37,"offset":1,"shift":16,"w":15,"x":61,"y":41,}, + "105":{"character":105,"h":37,"offset":0,"shift":8,"w":7,"x":408,"y":2,}, + "106":{"character":106,"h":37,"offset":-3,"shift":8,"w":11,"x":226,"y":41,}, + "107":{"character":107,"h":37,"offset":1,"shift":16,"w":15,"x":209,"y":41,}, + "108":{"character":108,"h":37,"offset":0,"shift":8,"w":7,"x":200,"y":41,}, + "109":{"character":109,"h":37,"offset":0,"shift":23,"w":23,"x":175,"y":41,}, + "110":{"character":110,"h":37,"offset":0,"shift":16,"w":15,"x":158,"y":41,}, + "111":{"character":111,"h":37,"offset":1,"shift":16,"w":15,"x":141,"y":41,}, + "112":{"character":112,"h":37,"offset":0,"shift":16,"w":15,"x":124,"y":41,}, + "113":{"character":113,"h":37,"offset":0,"shift":16,"w":15,"x":107,"y":41,}, + "114":{"character":114,"h":37,"offset":0,"shift":16,"w":15,"x":90,"y":41,}, + "115":{"character":115,"h":37,"offset":0,"shift":14,"w":14,"x":239,"y":41,}, + "116":{"character":116,"h":37,"offset":0,"shift":10,"w":10,"x":78,"y":41,}, + "117":{"character":117,"h":37,"offset":1,"shift":16,"w":15,"x":44,"y":41,}, + "118":{"character":118,"h":37,"offset":0,"shift":14,"w":15,"x":27,"y":41,}, + "119":{"character":119,"h":37,"offset":0,"shift":23,"w":23,"x":2,"y":41,}, + "120":{"character":120,"h":37,"offset":0,"shift":17,"w":17,"x":490,"y":2,}, + "121":{"character":121,"h":37,"offset":0,"shift":16,"w":15,"x":473,"y":2,}, + "122":{"character":122,"h":37,"offset":0,"shift":14,"w":15,"x":456,"y":2,}, + "123":{"character":123,"h":37,"offset":0,"shift":13,"w":13,"x":441,"y":2,}, + "124":{"character":124,"h":37,"offset":0,"shift":8,"w":7,"x":432,"y":2,}, + "125":{"character":125,"h":37,"offset":0,"shift":13,"w":13,"x":417,"y":2,}, + "126":{"character":126,"h":37,"offset":0,"shift":12,"w":12,"x":19,"y":119,}, + "9647":{"character":9647,"h":37,"offset":5,"shift":19,"w":10,"x":33,"y":119,}, + }, + "hinting":0, + "includeTTF":true, + "interpreter":0, + "italic":false, + "kerningPairs":[], + "last":0, + "lineHeight":37, + "maintainGms1Font":false, + "name":"fnt_Embossed_metal", + "parent":{ + "name":"New Fonts", + "path":"folders/Fonts/New Fonts.yy", + }, + "pointRounding":0, + "ranges":[ + {"lower":32,"upper":127,}, + {"lower":9647,"upper":9647,}, + ], + "regenerateBitmap":false, + "resourceType":"GMFont", + "resourceVersion":"2.0", + "sampleText":"abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", + "sdfSpread":8, + "size":14.0, + "styleName":"Regular", + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "TTFName":"/Users/admin/Documents/ChapterMaster/fonts/fnt_Embossed_metal/MessingLettern.ttf", + "usesSDF":false, +} \ No newline at end of file diff --git a/fonts/fnt_Embossed_metal/fnt_Embossed_metal.png b/fonts/fnt_Embossed_metal/fnt_Embossed_metal.png new file mode 100644 index 0000000000..466c59a937 Binary files /dev/null and b/fonts/fnt_Embossed_metal/fnt_Embossed_metal.png differ diff --git a/fonts/fnt_Embossed_metal/fnt_Embossed_metal.yy b/fonts/fnt_Embossed_metal/fnt_Embossed_metal.yy new file mode 100644 index 0000000000..6de02b868d --- /dev/null +++ b/fonts/fnt_Embossed_metal/fnt_Embossed_metal.yy @@ -0,0 +1,143 @@ +{ + "$GMFont":"", + "%Name":"fnt_Embossed_metal", + "AntiAlias":1, + "applyKerning":0, + "ascender":26, + "ascenderOffset":0, + "bold":false, + "canGenerateBitmap":true, + "charset":0, + "first":0, + "fontName":"Messing Lettern", + "glyphOperations":0, + "glyphs":{ + "32":{"character":32,"h":32,"offset":0,"shift":14,"w":14,"x":2,"y":2,}, + "33":{"character":33,"h":32,"offset":0,"shift":7,"w":6,"x":33,"y":138,}, + "34":{"character":34,"h":32,"offset":0,"shift":11,"w":11,"x":20,"y":138,}, + "35":{"character":35,"h":32,"offset":0,"shift":16,"w":16,"x":2,"y":138,}, + "36":{"character":36,"h":32,"offset":0,"shift":13,"w":13,"x":226,"y":104,}, + "37":{"character":37,"h":32,"offset":0,"shift":24,"w":24,"x":200,"y":104,}, + "38":{"character":38,"h":32,"offset":0,"shift":18,"w":18,"x":180,"y":104,}, + "39":{"character":39,"h":32,"offset":0,"shift":6,"w":6,"x":172,"y":104,}, + "40":{"character":40,"h":32,"offset":0,"shift":9,"w":9,"x":161,"y":104,}, + "41":{"character":41,"h":32,"offset":0,"shift":10,"w":9,"x":150,"y":104,}, + "42":{"character":42,"h":32,"offset":0,"shift":13,"w":12,"x":41,"y":138,}, + "43":{"character":43,"h":32,"offset":0,"shift":11,"w":11,"x":137,"y":104,}, + "44":{"character":44,"h":32,"offset":0,"shift":7,"w":7,"x":114,"y":104,}, + "45":{"character":45,"h":32,"offset":0,"shift":10,"w":10,"x":102,"y":104,}, + "46":{"character":46,"h":32,"offset":0,"shift":7,"w":7,"x":93,"y":104,}, + "47":{"character":47,"h":32,"offset":0,"shift":13,"w":13,"x":78,"y":104,}, + "48":{"character":48,"h":32,"offset":0,"shift":14,"w":14,"x":62,"y":104,}, + "49":{"character":49,"h":32,"offset":-1,"shift":10,"w":10,"x":50,"y":104,}, + "50":{"character":50,"h":32,"offset":0,"shift":13,"w":12,"x":36,"y":104,}, + "51":{"character":51,"h":32,"offset":0,"shift":14,"w":14,"x":20,"y":104,}, + "52":{"character":52,"h":32,"offset":0,"shift":16,"w":16,"x":2,"y":104,}, + "53":{"character":53,"h":32,"offset":0,"shift":13,"w":12,"x":123,"y":104,}, + "54":{"character":54,"h":32,"offset":0,"shift":14,"w":14,"x":55,"y":138,}, + "55":{"character":55,"h":32,"offset":0,"shift":13,"w":13,"x":71,"y":138,}, + "56":{"character":56,"h":32,"offset":0,"shift":14,"w":14,"x":86,"y":138,}, + "57":{"character":57,"h":32,"offset":0,"shift":14,"w":14,"x":148,"y":172,}, + "58":{"character":58,"h":32,"offset":0,"shift":7,"w":7,"x":139,"y":172,}, + "59":{"character":59,"h":32,"offset":0,"shift":7,"w":7,"x":130,"y":172,}, + "60":{"character":60,"h":32,"offset":0,"shift":14,"w":13,"x":115,"y":172,}, + "61":{"character":61,"h":32,"offset":0,"shift":9,"w":9,"x":104,"y":172,}, + "62":{"character":62,"h":32,"offset":0,"shift":14,"w":14,"x":88,"y":172,}, + "63":{"character":63,"h":32,"offset":0,"shift":13,"w":12,"x":74,"y":172,}, + "64":{"character":64,"h":32,"offset":1,"shift":25,"w":23,"x":49,"y":172,}, + "65":{"character":65,"h":32,"offset":0,"shift":15,"w":14,"x":33,"y":172,}, + "66":{"character":66,"h":32,"offset":0,"shift":14,"w":14,"x":17,"y":172,}, + "67":{"character":67,"h":32,"offset":0,"shift":14,"w":13,"x":2,"y":172,}, + "68":{"character":68,"h":32,"offset":0,"shift":14,"w":14,"x":232,"y":138,}, + "69":{"character":69,"h":32,"offset":0,"shift":11,"w":11,"x":219,"y":138,}, + "70":{"character":70,"h":32,"offset":0,"shift":11,"w":11,"x":206,"y":138,}, + "71":{"character":71,"h":32,"offset":0,"shift":14,"w":14,"x":190,"y":138,}, + "72":{"character":72,"h":32,"offset":0,"shift":13,"w":13,"x":175,"y":138,}, + "73":{"character":73,"h":32,"offset":0,"shift":7,"w":6,"x":167,"y":138,}, + "74":{"character":74,"h":32,"offset":0,"shift":14,"w":13,"x":152,"y":138,}, + "75":{"character":75,"h":32,"offset":0,"shift":13,"w":15,"x":135,"y":138,}, + "76":{"character":76,"h":32,"offset":0,"shift":11,"w":11,"x":122,"y":138,}, + "77":{"character":77,"h":32,"offset":0,"shift":18,"w":18,"x":102,"y":138,}, + "78":{"character":78,"h":32,"offset":0,"shift":14,"w":14,"x":224,"y":70,}, + "79":{"character":79,"h":32,"offset":0,"shift":14,"w":14,"x":208,"y":70,}, + "80":{"character":80,"h":32,"offset":0,"shift":14,"w":14,"x":192,"y":70,}, + "81":{"character":81,"h":32,"offset":0,"shift":14,"w":14,"x":90,"y":36,}, + "82":{"character":82,"h":32,"offset":0,"shift":14,"w":14,"x":64,"y":36,}, + "83":{"character":83,"h":32,"offset":0,"shift":13,"w":13,"x":49,"y":36,}, + "84":{"character":84,"h":32,"offset":0,"shift":13,"w":13,"x":34,"y":36,}, + "85":{"character":85,"h":32,"offset":0,"shift":14,"w":14,"x":18,"y":36,}, + "86":{"character":86,"h":32,"offset":0,"shift":14,"w":14,"x":2,"y":36,}, + "87":{"character":87,"h":32,"offset":0,"shift":22,"w":22,"x":225,"y":2,}, + "88":{"character":88,"h":32,"offset":0,"shift":15,"w":16,"x":207,"y":2,}, + "89":{"character":89,"h":32,"offset":0,"shift":14,"w":14,"x":191,"y":2,}, + "90":{"character":90,"h":32,"offset":0,"shift":13,"w":13,"x":176,"y":2,}, + "91":{"character":91,"h":32,"offset":0,"shift":9,"w":8,"x":80,"y":36,}, + "92":{"character":92,"h":32,"offset":0,"shift":13,"w":13,"x":161,"y":2,}, + "93":{"character":93,"h":32,"offset":0,"shift":9,"w":8,"x":140,"y":2,}, + "94":{"character":94,"h":32,"offset":-1,"shift":10,"w":12,"x":126,"y":2,}, + "95":{"character":95,"h":32,"offset":0,"shift":19,"w":20,"x":104,"y":2,}, + "96":{"character":96,"h":32,"offset":-1,"shift":6,"w":7,"x":95,"y":2,}, + "97":{"character":97,"h":32,"offset":0,"shift":14,"w":14,"x":79,"y":2,}, + "98":{"character":98,"h":32,"offset":0,"shift":14,"w":14,"x":63,"y":2,}, + "99":{"character":99,"h":32,"offset":0,"shift":14,"w":13,"x":48,"y":2,}, + "100":{"character":100,"h":32,"offset":0,"shift":14,"w":13,"x":33,"y":2,}, + "101":{"character":101,"h":32,"offset":0,"shift":14,"w":13,"x":18,"y":2,}, + "102":{"character":102,"h":32,"offset":0,"shift":9,"w":9,"x":150,"y":2,}, + "103":{"character":103,"h":32,"offset":0,"shift":14,"w":13,"x":106,"y":36,}, + "104":{"character":104,"h":32,"offset":0,"shift":14,"w":14,"x":18,"y":70,}, + "105":{"character":105,"h":32,"offset":0,"shift":7,"w":6,"x":121,"y":36,}, + "106":{"character":106,"h":32,"offset":-2,"shift":7,"w":9,"x":166,"y":70,}, + "107":{"character":107,"h":32,"offset":0,"shift":14,"w":14,"x":150,"y":70,}, + "108":{"character":108,"h":32,"offset":0,"shift":7,"w":6,"x":142,"y":70,}, + "109":{"character":109,"h":32,"offset":0,"shift":20,"w":20,"x":120,"y":70,}, + "110":{"character":110,"h":32,"offset":0,"shift":14,"w":13,"x":105,"y":70,}, + "111":{"character":111,"h":32,"offset":1,"shift":14,"w":13,"x":90,"y":70,}, + "112":{"character":112,"h":32,"offset":0,"shift":14,"w":13,"x":75,"y":70,}, + "113":{"character":113,"h":32,"offset":0,"shift":14,"w":13,"x":60,"y":70,}, + "114":{"character":114,"h":32,"offset":0,"shift":14,"w":13,"x":45,"y":70,}, + "115":{"character":115,"h":32,"offset":0,"shift":13,"w":13,"x":177,"y":70,}, + "116":{"character":116,"h":32,"offset":0,"shift":9,"w":9,"x":34,"y":70,}, + "117":{"character":117,"h":32,"offset":0,"shift":14,"w":14,"x":2,"y":70,}, + "118":{"character":118,"h":32,"offset":0,"shift":13,"w":13,"x":232,"y":36,}, + "119":{"character":119,"h":32,"offset":0,"shift":20,"w":20,"x":210,"y":36,}, + "120":{"character":120,"h":32,"offset":0,"shift":15,"w":15,"x":193,"y":36,}, + "121":{"character":121,"h":32,"offset":0,"shift":14,"w":13,"x":178,"y":36,}, + "122":{"character":122,"h":32,"offset":0,"shift":13,"w":13,"x":163,"y":36,}, + "123":{"character":123,"h":32,"offset":0,"shift":11,"w":11,"x":150,"y":36,}, + "124":{"character":124,"h":32,"offset":0,"shift":7,"w":6,"x":142,"y":36,}, + "125":{"character":125,"h":32,"offset":0,"shift":11,"w":11,"x":129,"y":36,}, + "126":{"character":126,"h":32,"offset":0,"shift":10,"w":10,"x":164,"y":172,}, + "9647":{"character":9647,"h":32,"offset":4,"shift":17,"w":9,"x":176,"y":172,}, + }, + "hinting":0, + "includeTTF":true, + "interpreter":0, + "italic":false, + "kerningPairs":[], + "last":0, + "lineHeight":32, + "maintainGms1Font":false, + "name":"fnt_Embossed_metal", + "parent":{ + "name":"New Fonts", + "path":"folders/Fonts/New Fonts.yy", + }, + "pointRounding":0, + "ranges":[ + {"lower":32,"upper":127,}, + {"lower":9647,"upper":9647,}, + ], + "regenerateBitmap":false, + "resourceType":"GMFont", + "resourceVersion":"2.0", + "sampleText":"abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", + "sdfSpread":8, + "size":12.0, + "styleName":"Regular", + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "TTFName":"/Users/admin/Documents/ChapterMaster/fonts/fnt_Embossed_metal/MessingLettern.ttf", + "usesSDF":false, +} \ No newline at end of file diff --git a/fonts/fnt_menu/fnt_menu.yy b/fonts/fnt_menu/fnt_menu.yy index d529a1caec..0c8516b188 100644 --- a/fonts/fnt_menu/fnt_menu.yy +++ b/fonts/fnt_menu/fnt_menu.yy @@ -221,7 +221,7 @@ "ranges":[ {"lower":32,"upper":255,}, ], - "regenerateBitmap":true, + "regenerateBitmap":false, "resourceType":"GMFont", "resourceVersion":"2.0", "sampleText":"abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", diff --git a/notes/compatibility_report_040421_2234143414/compatibility_report_040421_2234143414.yy b/notes/compatibility_report_040421_2234143414/compatibility_report_040421_2234143414.yy index b3b3a91586..9546aa042b 100644 --- a/notes/compatibility_report_040421_2234143414/compatibility_report_040421_2234143414.yy +++ b/notes/compatibility_report_040421_2234143414/compatibility_report_040421_2234143414.yy @@ -1,5 +1,5 @@ { - "$GMNotes":"", + "$GMNotes":"v1", "%Name":"compatibility_report_040421_2234143414", "name":"compatibility_report_040421_2234143414", "parent":{ diff --git a/notes/notes/notes.yy b/notes/notes/notes.yy index 12c9b69e52..9d80786dae 100644 --- a/notes/notes/notes.yy +++ b/notes/notes/notes.yy @@ -1,5 +1,5 @@ { - "$GMNotes":"", + "$GMNotes":"v1", "%Name":"notes", "name":"notes", "parent":{ diff --git a/objects/obj_al_ship/Draw_0.gml b/objects/obj_al_ship/Draw_0.gml index ed4732623b..956101b16d 100644 --- a/objects/obj_al_ship/Draw_0.gml +++ b/objects/obj_al_ship/Draw_0.gml @@ -6,7 +6,7 @@ if (!__b__){ draw_self(); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_font(fnt_info); draw_set_halign(fa_center); diff --git a/objects/obj_bomb_select/Draw_0.gml b/objects/obj_bomb_select/Draw_0.gml index c4336ce603..5c96a594ef 100644 --- a/objects/obj_bomb_select/Draw_0.gml +++ b/objects/obj_bomb_select/Draw_0.gml @@ -211,7 +211,7 @@ if (max_ships>0)and (instance_exists(obj_star_select)){ if (point_and_click(bombard_button)){ if (ships_selected>0) { bomb_score = 0; - for(var i=0; i0)and (instance_exists(obj_star_select)){ } } // Start bombardment here - scr_bomb_world(p_data.system,p_data.planet,target,bomb_score,str); + p_data.bombard(target,bomb_score,str); } } var cancel_button = draw_unit_buttons([bomb_window.x2-166, bomb_window.y2-40],"Cancel",[1,1],#34bc75,fa_center,fnt_40k_14b); diff --git a/objects/obj_controller/Alarm_1.gml b/objects/obj_controller/Alarm_1.gml index 394ae2956a..278dd034d1 100644 --- a/objects/obj_controller/Alarm_1.gml +++ b/objects/obj_controller/Alarm_1.gml @@ -419,7 +419,7 @@ if (did){ } } - + instance_activate_object(obj_ini); if (field=="both"){ if (obj_ini.fleet_type==ePlayerBase.penitent) then orkz+=3; orkz+=3; @@ -530,7 +530,6 @@ with(obj_creation){ instance_destroy(); } - create_complex_star_routes(_player_star.id); /* //135 testing crusade object diff --git a/objects/obj_controller/Alarm_3.gml b/objects/obj_controller/Alarm_3.gml index 04923e0c04..4fd76921d6 100644 --- a/objects/obj_controller/Alarm_3.gml +++ b/objects/obj_controller/Alarm_3.gml @@ -1 +1,2 @@ script_execute(scr_income,0,0,0,0,0); +create_start_imperial_fleets(); diff --git a/objects/obj_controller/Alarm_5.gml b/objects/obj_controller/Alarm_5.gml index 42056cfbb4..2dc4e54fd1 100644 --- a/objects/obj_controller/Alarm_5.gml +++ b/objects/obj_controller/Alarm_5.gml @@ -118,12 +118,8 @@ if (turn=240) and (global.chapter_name="Lamenters"){ // ** Battlefield Loot ** if (scr_has_adv("Tech-Scavengers")){ var lroll1,lroll2,loot=""; - lroll1=floor(random(100))+1; - lroll2=floor(random(100))+1; - if (scr_has_disadv("Shitty Luck")){ - lroll1+=2; - lroll2+=25; - } + lroll1=roll_dice_chapter(1, 100, "low"); + lroll2=roll_dice_chapter(1, 100, "low"); if (lroll1<=5){ loot=choose("Chainsword","Bolt Pistol","Combat Knife","Narthecium"); if (lroll2<=80) then loot=choose("Power Sword","Storm Bolter"); @@ -259,7 +255,7 @@ for (var c = 0; c < 11; c++){ penit_co[p]=c; penit_id[p]=e; penitorium+=1; - unit.loyalty--; + unit.alter_loyalty(-1); if (unit.corruption<90) and (unit.corruption>0){ var heresy_old=0,heresy_new=0; heresy_old=round((unit.corruption*unit.corruption)/50)-0.5; @@ -367,91 +363,29 @@ if (penitent==1) and (blood_debt==0){ } // ** Ork WAAAAGH ** if ((turn>=irandom(200)+100) or (obj_ini.fleet_type==eFACTION.Mechanicus)) and (faction_defeated[eFACTION.Ork]==0){ - var waaagh=floor(random(100))+1; - with(obj_star){ - if (owner==eFACTION.Ork) then instance_create(x,y,obj_temp2); - } - if ((instance_number(obj_temp2)>=5) and (waaagh<=instance_number(obj_temp2)) and (obj_controller.known[eFACTION.Ork]==0))/* or (obj_controller.is_test_map=true)*/{ - obj_controller.known[eFACTION.Ork]=0.5; - //set an alarm for all ork controlled planets - with(obj_star){ - if (owner==eFACTION.Ork) then alarm[4]=1; - } - if (!instance_exists(obj_turn_end)) then scr_popup("WAAAAGH!","The greenskins have swelled in activity, their numbers increasing seemingly without relent. A massive Warboss has risen to take control, leading most of the sector's Orks on a massive WAAAGH!","waaagh",""); - - if (instance_exists(obj_turn_end)){ - obj_turn_end.popups+=1; - obj_turn_end.popup[obj_turn_end.popups]=1; - obj_turn_end.popup_type[obj_turn_end.popups]="WAAAAGH!"; - obj_turn_end.popup_text[obj_turn_end.popups]="The greenskins have swelled in activity, their numbers increasing seemingly without relent. A massive Warboss has risen to take control, leading most of the sector's Orks on a massive WAAAGH!"; - obj_turn_end.popup_image[obj_turn_end.popups]="waaagh"; - scr_event_log("red","Ork WAAAAGH! begins."); - - with(obj_star){ - if (owner==eFACTION.Ork){ - rund=floor(random(planets))+1; - if (p_owner[rund]==eFACTION.Ork) and (p_pdf[rund]==0) and (p_guardsmen[rund]==0) and (p_orks[rund]>=2) then instance_create(x,y,obj_temp6); - } - } - if (instance_exists(obj_temp6)){ - var you2,you; - rund=0; - you2=instance_nearest(random(room_width),random(room_height),obj_temp6); - you=instance_nearest(you2.x,you2.y,obj_star); - - with(obj_temp2){instance_destroy();} - for(var i=0; i<10; i++){ - if (!instance_exists(obj_temp2)){ - rund=round(random(you.planets)); - if (rund>0) and(rund<5){ - if (you.p_owner[rund]==eFACTION.Ork) and (you.p_pdf[rund]+you.p_guardsmen[rund]==0) and (you.p_orks[rund]>=2) then array_push( you.p_feature[rund], new NewPlanetFeature(P_features.OrkWarboss)); - } - if (you.p_orks[rund]<4) then you.p_orks[rund]=4; - if (planet_feature_bool(you.p_feature[rund], P_features.OrkWarboss)==1) then instance_create(x,y,obj_temp2); - } - } - } - with(obj_temp6){instance_destroy();} - with(obj_temp2){instance_destroy();} - } - } - with(obj_temp2){instance_destroy();} } -// if (known[eFACTION.Ecclesiarchy]=1){var spikky;spikky=choose(0,0,0,1,1);if (spikky=1) then with(obj_turn_end){audiences+=1;audien[audiences]=5;audien_topic[audiences]="intro";}} if (known[eFACTION.Ecclesiarchy]==1){ spikky=choose(0,1,1); - if (spikky==1) then with(obj_turn_end){ - audiences+=1; - audien[audiences]=eFACTION.Ecclesiarchy; - known[eFACTION.Ecclesiarchy] = 2; - audien_topic[audiences]="intro"; - if (obj_controller.faction_status[eFACTION.Ecclesiarchy]=="War") then audien_topic[audiences]="declare_war"; + if (spikky){ + var _topic = faction_status[eFACTION.Ecclesiarchy]=="War" ? "declare_war" : "intro"; + scr_audience(eFACTION.Ecclesiarchy, _topic); } } if (known[eFACTION.Eldar]==1) and (faction_defeated[eFACTION.Eldar]==0){ spikky=choose(0,1); - if (spikky==1) then with(obj_turn_end){ - audiences+=1; - audien[audiences]= eFACTION.Eldar; - audien_topic[audiences]="intro1"; + if (spikky==1){ + scr_audience(eFACTION.Eldar, "intro1"); } } if (known[eFACTION.Ork]==0.5) and (faction_defeated[eFACTION.Ork]==0){ - spikky=floor(random(7)); - if (spikky==1) then with(obj_turn_end){ - audiences+=1; - audien[audiences]=eFACTION.Ork; - audien_topic[audiences]="intro"; + if (1==irandom(7)){ + scr_audience(eFACTION.Ork, "intro"); } } if (known[eFACTION.Tau]==1) and (faction_defeated[eFACTION.Tau]==0){ - with(obj_turn_end){ - audiences+=1; - audien[audiences]=8; - audien_topic[audiences]="intro"; - } + scr_audience(eFACTION.Tau, "intro"); } // ** Quests here ** // 135 ; quests @@ -516,218 +450,12 @@ with(obj_temp6){instance_destroy();} for(var i=1; i<=10; i++){ if (turns_ignored[i]==0) and (annoyed[i]>0) then annoyed[i]-=1; } -// ** Various checks for imperium and faction relations ** -for(var i=1; i<=99; i++){ - if (event[i]!="") and (event_duration[i]>0){ - event_duration[i]-=1; - if (event_duration[i]==0){ - - if (event[i]=="game_over_man") then obj_controller.alarm[8]=1; - // Removes planetary governor installed by the chapter - if (string_count("remove_serf",event[i])>0){ - explode_script(event[i],"|"); - var ta=string(explode[0]); - var star_name=string(explode[1]); - var planet=real(explode[2]); - var event_star = star_by_name(star_name); - if (event_star!="none"){ - event_star.dispo[planet]=-10;// Resets - var twix=$"Inquisition executes Chapter Serf in control of {star_name} {planet} and installs a new Planetary Governor."; - if (event_star.p_owner[planet]=eFACTION.Player) then event_star.p_owner[planet]=event_star.p_first[planet]; - scr_alert("","",twix,0,0); - scr_event_log("",twix, star_name); - } - } - // Changes relation to good - if (event[i]=="enemy_imperium"){ - scr_alert("green","enemy","You have made amends with your enemy in the Imperium.",0,0); - disposition[eFACTION.Imperium]+=20; - scr_event_log("","Amends made with Imperium."); - } - if (event[i]=="enemy_mechanicus"){ - scr_alert("green","enemy","You have made amends with your Mechanicus enemy.",0,0); - disposition[eFACTION.Mechanicus]+=20; - scr_event_log("","Amends made with Mechanicus enemy."); - } - if (event[i]=="enemy_inquisition"){ - scr_alert("green","enemy","You have made amends with your enemy in the Inquisition.",0,0); - disposition[eFACTION.Inquisition]+=20; - scr_event_log("","Amends made with Inquisition enemy."); - } - if (event[i]=="enemy_ecclesiarchy"){ - scr_alert("green","enemy","You have made amends with your enemy in the Ecclesiarchy.",0,0); - disposition[eFACTION.Ecclesiarchy]+=20; - scr_event_log("","Amends made with Ecclesiarchy enemy."); - } - // Sector commander losses its mind - if (event[i]=="imperium_daemon"){ - var alert_string = $"Sector Commander {faction_leader[eFACTION.Imperium]} has gone insane." - scr_alert("red","lol",alert_string,0,0); - faction_defeated[eFACTION.Imperium]=1; - scr_event_log("red",alert_string); - } - // Starts chaos invasion - if (event[i]=="chaos_invasion"){ - var xx=0,yy=0,flee=0,dirr=0; - var star_id = scr_random_find(1,true,"",""); - if(star_id != undefined){ - scr_event_log("purple","Chaos Fleets exit the warp near the "+string(star_id.name)+" system.", star_id.name); - for(var j=0; j<4; j++){ - dirr+=irandom_range(50,100); - xx=star_id.x+lengthdir_x(72,dirr); - yy=star_id.y+lengthdir_y(72,dirr); - flee=instance_create(xx,yy,obj_en_fleet); - flee.owner=eFACTION.Chaos; - flee.sprite_index=spr_fleet_chaos; - flee.image_index=4; - flee.capital_number=choose(0,1); - flee.frigate_number=choose(2,3); - flee.escort_number=choose(4,5,6); - flee.trade_goods="csm"; - obj_controller.chaos_fleets+=1; - flee.action_x=star_id.x; - flee.action_y=star_id.y; - flee.alarm[4]=1; - } - } - } - // Ships construction - if (string_count("new_",event[i])>0){ - var new_ship_event=event[i]; - var active_forges = []; - var chosen_star = false; - with(obj_star){ - if (owner==eFACTION.Mechanicus){ - for (i=1;i<=planets;i++){ - if (p_type[i]=="Forge") and (p_owner[i]==eFACTION.Mechanicus){ - array_push(active_forges,new PlanetData(i, self)); - } - } - } - } - if (array_length(active_forges)>0){ - var ship_spawn = active_forges[irandom(array_length(active_forges)-1)]; - var _new_player_fleet=instance_create(ship_spawn.system.x,ship_spawn.system.y,obj_p_fleet); - - // Creates the ship - var last_ship = new_player_ship(new_ship_event, ship_spawn.system.name); - - add_ship_to_fleet(last_ship, _new_player_fleet) - - // show_message(string(obj_ini.ship_class[last_ship])+":"+string(obj_ini.ship[last_ship])); - - if (obj_ini.ship_size[last_ship]!=1) then scr_popup("Ship Constructed",$"Your new {obj_ini.ship_class[last_ship]} '{obj_ini.ship[last_ship]}' has finished being constructed. It is orbiting {ship_spawn.system.name} and awaits its maiden voyage.","shipyard",""); - if (obj_ini.ship_size[last_ship]==1) then scr_popup("Ship Constructed",$"Your new {obj_ini.ship_class[last_ship]} Escort '{obj_ini.ship[last_ship]}' has finished being constructed. It is orbiting {ship_spawn.system.name} and awaits its maiden voyage.","shipyard",""); - var bob=instance_create(ship_spawn.system.x+16,ship_spawn.system.y-24,obj_star_event); - bob.image_alpha=1; - bob.image_speed=1; - } - if (array_length(active_forges)==0){ - event_duration[i]=2; - scr_popup("Ship Construction halted",$"A lack of suitable forge worlds in the system has halted construction of your requested ship","shipyard",""); - } - event[i]=""; - event_duration[i]-=1; - } - // Spare the inquisitor - if (string_count("inquisitor_spared",event[i])>0){ - var diceh=floor(random(100))+1; - - if (scr_has_disadv("Shitty Luck")) then diceh-=25; - if (diceh<=25){ - alarm[8]=1; - scr_loyalty("Crossing the Inquisition","+"); - } - if (diceh>25) and (diceh<=50){scr_loyalty("Crossing the Inquisition","+");} - if (diceh>50) and (diceh<=85){} - if (diceh>85) and (event[i]="inquisitor_spared2"){ - scr_popup("Anonymous Message","You recieve an anonymous letter of thanks. It mentions that motions are underway to destroy any local forces of Chaos.","",""); - with(obj_star){ - for(var o=1; o<=planets; o++){ - p_heresy[o]=max(0,p_heresy[o]-10); - } - } - } - } - - if (string_count("strange_building",event[i])>0){ - var b_event="",marine_name="",comp=0,marine_num=0,item="",unit; - explode_script(event[i],"|"); - b_event=string(explode[0]); - marine_name=string(explode[1]); - comp=real(explode[2]); - marine_num=real(explode[3]); - unit=obj_ini.TTRPG[comp][marine_num]; - item=string(explode[4]); - - var killy=0,tixt=string(obj_ini.role[100][16])+" "+string(marine_name)+" has finished his work- "; - - if (item=="Icon"){ - tixt+="it is a "+string(global.chapter_name)+" Icon wrought in metal, finely decorated. Pride for his chapter seems to have overtaken him. There are no corrections to be made and the item is placed where many may view it."; - } - if (item=="Statue"){ - tixt+="it is a small, finely crafted statue wrought in metal. The "+string(obj_ini.role[100][16])+" is scolded for the waste of material, but none daresay the quality of the piece."; - } - if (item=="Bike"){ - scr_add_item("Bike",1); - tixt+="it is a finely crafted Bike, conforming mostly to STC standards. The other "+string(obj_ini.role[100][16])+" are surprised at the rapid pace of his work."; - } - if (item=="Rhino"){ - scr_add_vehicle("Rhino",0,"Storm Bolter","Storm Bolter","","Artificer Hull","Dozer Blades"); - tixt+="it is a finely crafted Rhino, conforming to STC standards. The other "+string(obj_ini.role[100][16])+" are surprised at the rapid pace of his work."; - } - if (item=="Artifact"){ - var last_artifact=0; - scr_event_log("",string(obj_ini.role[100][16])+" "+string(marine_name)+" constructs an Artifact."); - if (obj_ini.fleet_type==ePlayerBase.home_world){ - last_artifact = scr_add_artifact("random_nodemon","",0,obj_ini.home_name,2); - } else { - if (obj_ini.fleet_type != ePlayerBase.home_world){ - last_artifact = scr_add_artifact("random_nodemon","",0,obj_ini.ship_location[0],501); - } - } - - tixt+=$"some form of divine inspiration has seemed to have taken hold of him. An artifact {obj_ini.artifact[last_artifact]} has been crafted."; - } - if (item=="baby"){ - unit.edit_corruption(choose(8,12,16,20)) - tixt+="some form of horrendous statue. A weird amalgram of limbs and tentacles, the sheer atrocity of it is made worse by the tiny, baby-like form, the once natural shape of a human child twisted nearly beyond recognition."; - } - else if (item=="robot"){ - unit.edit_corruption(choose(2,4,6,8,10)); - tixt+=$"some form of small, box-like robot. It seems to teeter around haphazardly, nearly falling over with each step. {unit.name()} maintains that it has no AI, though the other "+string(obj_ini.role[100][16])+" express skepticism."; - unit.add_trait("tech_heretic"); - } - else if (item=="demon"){ - unit.edit_corruption(choose(8,12,16,20)); - tixt+="some form of horrendous statue. What was meant to be some sort of angel, or primarch, instead has a mishappen face that is hardly human in nature. Between the fetid, ragged feathers and empty sockets it is truly blasphemous."; - unit.add_trait("tech_heretic"); - } - else if (item=="fusion"){ - //TODO if tech heretic chosen don't kill the dude - // unit.corruption+=choose(70); - tixt+=$"some kind of ill-mannered ascension. One of your battle-brothers enters the armamentarium to find {marine_name} fused to a vehicle, his flesh twisted and submerged into the frame. Mechendrites and weapons fire upon the marine without warning, a windy scream eminating from the abomination. It takes several battle-brothers to take out what was once a "+string(obj_ini.role[100][16])+"."; - - // This is causing the problem - - scr_kill_unit(comp,marine_num) - with(obj_ini){scr_company_order(0);} - } - scr_popup("He Built It",tixt,"tech_build","target_marine|"+string(marine_name)+"|"+string(comp)+"|"+string(marine_num)+"|"); - } - if (event_duration[i]<=0) then event[i]=""; - } - } -} -for(var i=1; i<=99; i++){ - if (event[i]!="") and (event_duration[i]<=0) then event[i]=""; - if (event[i]=="") and (event_duration[i]==0) and (event[i+1]!=""){ - event[i]=event[i+1]; - event_duration[i]=event_duration[i+1]; - event[i+1]=""; - event_duration[i+1]=0; - } +// ** Various checks for imperium and faction relations ** +try{ + event_end_turn_action(); +} catch(_exception){ + handle_exception(_exception); } // Right here need to sort the battles within the obj_turn_end with(obj_turn_end){scr_battle_sort();} @@ -818,8 +546,9 @@ if (fest_scheduled>0) and (fest_repeats>0){ research_end(); merge_ork_fleets(); location_viewer.update_mission_log(); -//complex route plotting for player fleets +init_ork_waagh(); return_lost_ships_chance(); +//complex route plotting for player fleets with (obj_p_fleet){ if (array_length(complex_route)>0 && action == ""){ set_new_player_fleet_course(complex_route); @@ -828,6 +557,10 @@ with (obj_p_fleet){ }); +if (helpful_places != false){ + helpful_places = new HelpfulPlaces(); +} + instance_activate_object(obj_star); instance_activate_object(obj_en_fleet); diff --git a/objects/obj_controller/Alarm_8.gml b/objects/obj_controller/Alarm_8.gml index ff278b80a4..3131d23158 100644 --- a/objects/obj_controller/Alarm_8.gml +++ b/objects/obj_controller/Alarm_8.gml @@ -3,40 +3,12 @@ instance_activate_object(obj_star); var witch=obj_controller; if (instance_exists(obj_turn_end)) then witch=obj_turn_end; -witch.audiences+=1; -witch.audien[witch.audiences]=4; -witch.audien_topic[witch.audiences]="declare_war"; -if (gene_xeno>99995) then witch.audien_topic[witch.audiences]="gene_xeno"; -obj_controller.disposition[4]-=50; -obj_controller.faction_status[eFACTION.Inquisition]="War"; -obj_controller.turns_ignored[4]=9999; -if (known[eFACTION.Inquisition]>0) then known[eFACTION.Inquisition]=4; -witch.audiences+=1; -witch.audien[witch.audiences]=2; -witch.audien_topic[witch.audiences]="declare_war"; -obj_controller.disposition[2]-=40; -obj_controller.faction_status[eFACTION.Imperium]="War"; -obj_controller.turns_ignored[2]=9999; -if (known[eFACTION.Imperium]>0) then known[eFACTION.Imperium]=2; -obj_controller.faction_status[eFACTION.Mechanicus]="War"; -obj_controller.turns_ignored[3]=9999; -obj_controller.disposition[3]-=30; -if (known[eFACTION.Mechanicus]>0) then known[eFACTION.Mechanicus]=2; - -if (known[eFACTION.Ecclesiarchy]>0){ - witch.audiences+=1;witch.audien[witch.audiences]=5; - witch.audien_topic[witch.audiences]="declare_war";known[eFACTION.Ecclesiarchy]=2; -} -obj_controller.faction_status[eFACTION.Ecclesiarchy]="War"; -obj_controller.turns_ignored[5]=9999; -obj_controller.disposition[5]-=40; +decare_war_on_imperium_audiences() if (obj_controller.faction_gender[10]==1) and (obj_controller.known[eFACTION.Chaos]==0) and (obj_controller.faction_defeated[10]==0){ - witch.audiences+=1; - witch.audien[witch.audiences]=10; - witch.audien_topic[witch.audiences]="intro"; + scr_audience(10, "intro"); } with(obj_star){ diff --git a/objects/obj_controller/Alarm_9.gml b/objects/obj_controller/Alarm_9.gml deleted file mode 100644 index c179d77b5c..0000000000 --- a/objects/obj_controller/Alarm_9.gml +++ /dev/null @@ -1,94 +0,0 @@ -// Create an imperial fleet -with(obj_p_fleet){ - var steh=instance_nearest(x,y,obj_star); - - var choices = [ - eFACTION.Player, - eFACTION.Imperium, - eFACTION.Mechanicus, - eFACTION.Inquisition, - eFACTION.Ecclesiarchy - ] - - for(var b=1; b<=4; b++) { - var is_valid = array_contains(choices, steh.p_first[b]) - if is_valid and (steh.dispo[b]>-30) and (steh.dispo[b]<0) { - var curr_imp_dispo = obj_controller.disposition[eFACTION.Imperium] - steh.dispo[b]=min(obj_ini.imperium_disposition,curr_imp_dispo)+choose(-1,-2,-3,-4,0,1,2,3,4); - } - } - if (steh.visited==0) { - for(var planet_num = 1; planet_num<5; planet_num++) { - if (array_length(steh.p_feature[planet_num])!=0) { - with(steh){ - scr_planetary_feature(planet_num); - } - } - } - steh.visited = 1 - } -} - -with(obj_star){ - var sco=0; - for(var o=1; o<=4; o++){ - if (p_type[o]="Hive") then sco+=3; - if (p_type[o]="Temperate") then sco+=1; - } - if (sco>=4) then instance_create(x,y,obj_temp_inq); -} - -if (instance_number(obj_temp_inq) < target_navy_number){ - with(obj_temp_inq) { - instance_destroy(); - } - with(obj_star) { - var sco=0; - for(var o=1; o<=planets; o++){ - if (p_type[o]="Hive") then sco+=3; - if (p_type[o]="Temperate") then sco+=1; - } - if (sco>=3) then instance_create(x,y,obj_temp_inq); - } -} -for(var i=0; i<30; i++){ - if (instance_number(obj_temp_inq) > target_navy_number){ - var kebob= instance_nearest(random(room_width),random(room_height),obj_temp_inq); - with(kebob) {instance_destroy();} - } -} - -with(obj_temp_inq){ - var ii=0,nav=instance_create(x,y,obj_en_fleet); - nav.owner=eFACTION.Imperium; - nav.navy=1; - - nav.capital_number=choose(1,2,3); - nav.frigate_number=(nav.capital_number*2)+3; - nav.escort_number=12; - nav.home_x=x;nav.home_y=y; - nav.orbiting=instance_nearest(x,y,obj_star); - nav.orbiting.present_fleet[eFACTION.Imperium] += 1; - nav.warp_able=true; - - nav.image_speed=0; - ii+=nav.capital_number-1; - ii+=round((nav.frigate_number/2)); - ii+=round((nav.escort_number/4)); - if (ii<=1) and (nav.capital_number+nav.frigate_number+nav.escort_number>0) then ii=1; - nav.image_index=ii; - instance_destroy(); -} - -with(obj_en_fleet){ - if (owner== eFACTION.Imperium) and (navy==1){ - for(var i=1; i<=capital_number; i++){ - capital_max_imp[i]=(((floor(random(15))+1)*1000000)+15000000)*2; - capital_imp[i]=capital_max_imp[i]; - } - for(var i=1; i<=frigate_number; i++){ - frigate_max_imp[i]=(500000+(floor(random(50))+1)*10000)*2; - frigate_imp[i]=frigate_max_imp[i]; - } - } -} diff --git a/objects/obj_controller/CleanUp_0.gml b/objects/obj_controller/CleanUp_0.gml index 4686f609d9..e43d58b1e2 100644 --- a/objects/obj_controller/CleanUp_0.gml +++ b/objects/obj_controller/CleanUp_0.gml @@ -1,7 +1,7 @@ global.name_generator = new NameGenerator(); var _star_arrays = []; -ds_map_values_to_array(obj_controller.star_sprites,_star_arrays); +ds_map_values_to_array(global.star_sprites,_star_arrays); for (var i=0;i100) then disposition_max[5]=100; } -// ** Max disposition for non imperials ** -disposition_max[6]=0; -disposition_max[7]=0; -disposition_max[8]=0; -disposition_max[9]=0; -disposition_max[10]=0; -disposition_max[11]=0; -disposition_max[12]=0; -disposition_max[13]=0; // ** Sets up faction leader names as well as player faction stuff ** -faction_leader[0]=""; -faction_title[0]=""; -faction_status[0]=""; -faction_leader[1]=""; -faction_title[1]=""; -faction_status[1]=""; +faction_leader = array_create(14, ""); +faction_title = array_create(14, ""); +faction_status = array_create(14, ""); // Sector Command faction faction_leader[eFACTION.Imperium]=global.name_generator.generate_imperial_name(); -faction_title[2]="Sector Commander"; +faction_title[eFACTION.Imperium]="Sector Commander"; faction_status[eFACTION.Imperium]="Allied"; // Mechanicus faction faction_leader[eFACTION.Mechanicus]=global.name_generator.generate_imperial_name(); -faction_title[3]="Magos"; +faction_title[eFACTION.Mechanicus]="Magos"; faction_status[eFACTION.Mechanicus]="Allied"; if (faction_leader[eFACTION.Mechanicus]==faction_leader[eFACTION.Imperium]) then faction_leader[eFACTION.Mechanicus]=global.name_generator.generate_space_marine_name(); // Inquisition faction faction_leader[eFACTION.Inquisition]=global.name_generator.generate_imperial_name(); if (faction_leader[eFACTION.Inquisition]==faction_leader[eFACTION.Mechanicus]) then faction_leader[eFACTION.Inquisition]=global.name_generator.generate_imperial_name(); -faction_title[4]="Inquisitor Lord"; +faction_title[eFACTION.Inquisition]="Inquisitor Lord"; faction_status[eFACTION.Inquisition]="Allied"; // Sisters faction faction_leader[eFACTION.Ecclesiarchy]=global.name_generator.generate_imperial_name(false); -faction_title[5]="Prioress"; +faction_title[eFACTION.Ecclesiarchy]="Prioress"; faction_status[eFACTION.Ecclesiarchy]="Allied"; // Eldar faction faction_leader[eFACTION.Eldar]=global.name_generator.generate_eldar_name(2); -faction_title[6]="Farseer"; +faction_title[eFACTION.Eldar]="Farseer"; faction_status[eFACTION.Eldar]="Antagonism";// If disposition = 0 then instead set it to "Antagonism" // Orkz faction faction_leader[eFACTION.Ork]=global.name_generator.generate_ork_name(); -faction_title[7]="Warboss"; +faction_title[eFACTION.Ork]="Warboss"; faction_status[eFACTION.Ork]="War"; // Tau faction faction_leader[eFACTION.Tau] = global.name_generator.generate_tau_leader_name(); -faction_title[8]="Diplomat"; +faction_title[eFACTION.Tau]="Diplomat"; faction_status[eFACTION.Tau]="Antagonism"; // Other factions unkown to player -faction_leader[eFACTION.Tyranids]=""; -faction_title[9]=""; faction_status[eFACTION.Tyranids]="War"; - -faction_leader[eFACTION.Chaos]=":D"; -faction_title[10]="Chaos Lord"; +faction_title[eFACTION.Chaos]="Chaos Lord"; faction_status[eFACTION.Chaos]="War"; - -faction_leader[eFACTION.Heretics]=""; -faction_title[11]=""; faction_status[eFACTION.Heretics]="War"; - -faction_leader[12]=""; -faction_title[12]=""; -faction_status[12]="War"; - -faction_leader[eFACTION.Necrons]=""; -faction_title[13]=""; +faction_status[eFACTION.Genestealer]="War"; faction_status[eFACTION.Necrons]="War"; // ** Sets faction gender for names ** -faction_gender[0]=1; -faction_gender[1]=1; -faction_gender[2]=1; -faction_gender[3]=1; -faction_gender[4]=1; -faction_gender[10]=1; -faction_gender[5]=1; +faction_gender = array_create(14, 1); faction_gender[6]=choose(1,2); -faction_gender[7]=1; faction_gender[8]=choose(1,1,2); -faction_gender[9]=1; if (faction_gender[4]=2) then faction_leader[eFACTION.Inquisition]=global.name_generator.generate_imperial_name(false); faction_gender[10]=choose(1,1,1,2,2); if (faction_gender[10]==1) then faction_leader[eFACTION.Chaos]=choose("1","1","1","2"); if (faction_gender[10]==2) then faction_leader[eFACTION.Chaos]=choose("1","2","2","2"); if (faction_leader[eFACTION.Chaos]=="1") then faction_leader[eFACTION.Chaos]=global.name_generator.generate_space_marine_name(); if (faction_leader[eFACTION.Chaos]=="2") then faction_leader[eFACTION.Chaos]=global.name_generator.generate_chaos_name(); -faction_gender[11]=1; -faction_gender[12]=1; -faction_gender[13]=1; +known = array_create(14, 0); known[0]=2; known[eFACTION.Player]=999; known[eFACTION.Imperium]=1; known[eFACTION.Mechanicus]=1; -known[eFACTION.Inquisition]=0; -known[eFACTION.Ecclesiarchy]=0; -known[eFACTION.Eldar]=0; -known[eFACTION.Ork]=0; -known[eFACTION.Tau]=0; -known[eFACTION.Tyranids]=0; -known[eFACTION.Chaos]=0; -known[eFACTION.Heretics]=0; -known[12]=0; -known[eFACTION.Necrons]=0; // UI testing // known[eFACTION.Inquisition]=1;known[eFACTION.Ecclesiarchy]=1;known[eFACTION.Eldar]=1;known[eFACTION.Ork]=1;known[eFACTION.Tau]=1;known[eFACTION.Tyranids]=1;known[eFACTION.Chaos]=1; @@ -1185,35 +1005,9 @@ known[eFACTION.Necrons]=0; // disposition[4]=90; // disposition[3]=60; // ** Sets diplomacy annoyed status ** -annoyed[0]=0; -annoyed[eFACTION.Player]=0; -annoyed[eFACTION.Imperium]=0; -annoyed[eFACTION.Mechanicus]=0; -annoyed[eFACTION.Inquisition]=0; -annoyed[eFACTION.Ecclesiarchy]=0; -annoyed[eFACTION.Eldar]=0; -annoyed[eFACTION.Ork]=0; -annoyed[eFACTION.Tau]=0; -annoyed[eFACTION.Tyranids]=0; -annoyed[eFACTION.Chaos]=0; -annoyed[eFACTION.Heretics]=0; -annoyed[12]=0; -annoyed[eFACTION.Necrons]=0; +annoyed = array_create(14, 0); // ** Sets diplomacy ignore status ** -ignore[0]=0; -ignore[eFACTION.Player]=0; -ignore[eFACTION.Imperium]=0; -ignore[eFACTION.Mechanicus]=0; -ignore[eFACTION.Inquisition]=0; -ignore[eFACTION.Ecclesiarchy]=0; -ignore[eFACTION.Eldar]=0; -ignore[eFACTION.Ork]=0; -ignore[eFACTION.Tau]=0; -ignore[eFACTION.Tyranids]=0; -ignore[eFACTION.Chaos]=0; -ignore[eFACTION.Heretics]=0; -ignore[12]=0; -ignore[eFACTION.Necrons]=0; +ignore = array_create(14, 0); // ** Sets diplomacy turns to be ignored ** turns_ignored[0]=0; turns_ignored[1]=0; @@ -1370,10 +1164,11 @@ serialize = function(){ loyalty, spec_train_data, forge_queue: specialist_point_handler.forge_queue, + chapter_master_data : chapter_master } var excluded_from_save = ["temp", "serialize", "deserialize", "build_chaos_gods", "company_data","menu_buttons", - "location_viewer", "production_research_pathways", "specialist_point_handler", "spec_train_data"] + "location_viewer", "production_research_pathways", "specialist_point_handler", "spec_train_data", "tooltips", "last_unit", "unit_manage_constants", "unit_manage_image"]; var excluded_from_save_start = ["restart_"]; copy_serializable_fields(object_controller, save_data, excluded_from_save, excluded_from_save_start); @@ -1384,7 +1179,6 @@ serialize = function(){ // Deserialization is done within scr_load #endregion - // ** Loads the game ** if (global.load>=0){ load_game=global.load; @@ -1415,7 +1209,7 @@ if (global.load>=0){ var xx,yy,me,dist,go,planet; -global.custom=1; +global.custom=eCHAPTER_TYPE.RANDOM; // ** Sets up base training level and trainees at game start ** training_apothecary=0; @@ -1508,7 +1302,7 @@ ork=1; eldar=1; // if tau = 1 then tau spawn. also does eldar /* -if (global.custom=1){ +if (global.custom==eCHAPTER_TYPE.RANDOM){ tau=choose(0,0,1); eldar=choose(0,1); } @@ -1516,6 +1310,7 @@ if (global.custom=1){ // ** Sets up loyalty ** loyalty=100; loyalty_hidden=100;// Updated when inquisitors do an inspection + // ** Sets up gene seed ** gene_seed=20; if scr_has_disadv("Sieged") then gene_seed=floor(random_range(250,400)); @@ -1532,15 +1327,15 @@ squads = false; system_fleet_strength = 0; // **sets up starting forge_points specialist_point_handler = new SpecialistPointHandler(); -specialist_point_handler.calculate_research_points(); - +specialist_point_handler.calculate_research_points(true); + //** sets up marine_by_location views location_viewer = new UnitQuickFindPanel(); // ** Sets up the number of marines per company ** -marines=0; -marines=obj_ini.specials+obj_ini.firsts+obj_ini.seconds+obj_ini.thirds+obj_ini.fourths+obj_ini.fifths; +marines = 0; +marines = obj_ini.specials+obj_ini.firsts+obj_ini.seconds+obj_ini.thirds+obj_ini.fourths+obj_ini.fifths; marines+=obj_ini.sixths+obj_ini.sevenths+obj_ini.eighths+obj_ini.ninths+obj_ini.tenths; command=0; command=obj_ini.commands; diff --git a/objects/obj_controller/Draw_0.gml b/objects/obj_controller/Draw_0.gml index 1b20b40b28..c162cbd167 100644 --- a/objects/obj_controller/Draw_0.gml +++ b/objects/obj_controller/Draw_0.gml @@ -4,30 +4,38 @@ try{ scr_ui_manage(); } catch(_exception){ handle_exception(_exception); - manage = 0; - menu = 0; - + main_map_defaults(); } + try{ scr_ui_advisors(); } catch(_exception){ handle_exception(_exception); - manage = 0; - menu = 0; -} -try{ - scr_ui_diplomacy(); -} catch(_exception){ - handle_exception(_exception); - manage = 0; - menu = 0; + main_map_defaults(); } + if (menu == MENU.Diplomacy){ + try{ + /*if (audience > 0 && instance_exists(obj_turn_end)){ + menu = 20; + }*/ + + scr_ui_diplomacy(); + } catch(_exception){ + handle_exception(_exception); + main_map_defaults(); + } + } try{ scr_ui_settings(); + scr_ui_popup(); } catch(_exception){ handle_exception(_exception); - manage = 0; - menu = 0; + main_map_defaults(); } -scr_ui_popup(); \ No newline at end of file +//star fleet edbug options spawn +if (global.cheat_debug == true && mouse_check_button_pressed(mb_right)){ + if (!instances_exist_any([obj_turn_end,obj_ncombat,obj_fleet,obj_fleet_select,obj_popup,obj_star_select])){ + new_system_debug_popup(); + } +} \ No newline at end of file diff --git a/objects/obj_controller/Draw_64.gml b/objects/obj_controller/Draw_64.gml index 2fab4dfa21..f012982139 100644 --- a/objects/obj_controller/Draw_64.gml +++ b/objects/obj_controller/Draw_64.gml @@ -10,6 +10,8 @@ if (instance_exists(obj_fleet)) then exit; if (global.load>=0) then exit; if (invis==true) then exit; + +add_draw_return_values(); if (is_test_map==true){ draw_set_color(c_yellow); draw_set_alpha(0.5); @@ -17,27 +19,75 @@ if (is_test_map==true){ draw_set_alpha(1); } // if (instance_exists(obj_turn_end)) then exit; - +draw_set_alpha(1); +draw_set_valign(fa_top); +draw_set_halign(fa_left); var xx = 0; var yy = 0; +if (menu == MENU.Diplomacy){ + add_draw_return_values(); + if (diplomacy > 0){ + draw_diplomacy_diplo_text(); + if (trading==true){ + if ((diplomacy>1) && is_struct(trade_attempt)){ + try { + trade_attempt.draw_trade_screen(); + } catch(_exception){ + handle_exception(_exception); + delete trade_attempt; + trading = false; + + } + } + } else if (diplomacy!=10.1){ + draw_character_diplomacy_base_page() + } + } else if (diplomacy == -1){ + if (is_struct(character_diplomacy)){ + draw_character_diplomacy(); + } + } + pop_draw_return_values(); +} // Main UI if (!zoomed && !zui){ + add_draw_return_values(); + if (menu == MENU.Default){ + location_viewer.draw(); + helpful_places_button.update({x1 : 1451,y1:62+sprite_get_height(spr_new_banner)}); + + if (helpful_places_button.draw()){ + + if (helpful_places == false){ + helpful_places = new HelpfulPlaces(); + } else{ + helpful_places = false; + } + } + if (helpful_places != false){ + if (!instances_exist_any([obj_turn_end,obj_ncombat,obj_fleet,obj_fleet_select,obj_popup,obj_star_select])){ + helpful_places.draw(); + } + } + } draw_sprite(spr_new_ui,menu==0,0,0); draw_set_color(c_white); - menu_buttons.chapter_manage.draw(34,838+y_slide, "Chapter Management",1,1,145) - menu_buttons.chapter_settings.draw(179,838+y_slide, "Chapter Settings",1,1,145) - menu_buttons.apoth.draw(357,838+y_slide, "Apothecarium") - menu_buttons.reclu.draw(473,838+y_slide, "Reclusium") - menu_buttons.lib.draw(590,838+y_slide, "Librarium") - menu_buttons.arm.draw(706,838+y_slide, "Armamentarium") - menu_buttons.recruit.draw(822,838+y_slide, "Recruitment") - menu_buttons.fleet.draw(938,838+y_slide, "Fleet") - menu_buttons.diplo.draw(1130,838+y_slide, "Diplomacy",1,1,145) - menu_buttons.event.draw(1275,838+y_slide, "Event Log",1,1,145) - menu_buttons.end_turn.draw(1420,838+y_slide, "End Turn",1,1,145); - menu_buttons.help.draw(1374,8+y_slide, "Help"); - menu_buttons.menu.draw(1484,8+y_slide, "Menu"); + if (!instance_exists(obj_popup)){ + menu_buttons.chapter_manage.draw(34,838+y_slide, "Chapter Management",1,1,145) + menu_buttons.chapter_settings.draw(179,838+y_slide, "Chapter Settings",1,1,145) + menu_buttons.apoth.draw(357,838+y_slide, "Apothecarium") + menu_buttons.reclu.draw(473,838+y_slide, "Reclusium") + menu_buttons.lib.draw(590,838+y_slide, "Librarium") + menu_buttons.arm.draw(706,838+y_slide, "Armamentarium") + menu_buttons.recruit.draw(822,838+y_slide, "Recruitment") + menu_buttons.fleet.draw(938,838+y_slide, "Fleet") + menu_buttons.diplo.draw(1130,838+y_slide, "Diplomacy",1,1,145) + menu_buttons.event.draw(1275,838+y_slide, "Event Log",1,1,145) + menu_buttons.end_turn.draw(1420,838+y_slide, "End Turn",1,1,145); + menu_buttons.help.draw(1374,8+y_slide, "Help"); + menu_buttons.menu.draw(1484,8+y_slide, "Menu"); + } if (y_slide>0) then draw_set_alpha((100-(y_slide*2))/100); @@ -56,9 +106,10 @@ if (!zoomed && !zui){ } - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_font(fnt_menu); draw_set_halign(fa_center); + draw_set_valign(fa_top); // Draws the sector name var _sector_string = $"Sector {obj_ini.sector_name ?? "Terra Nova"}"; draw_text(775,17,_sector_string); @@ -77,7 +128,7 @@ if (!zoomed && !zui){ draw_set_color(c_red); draw_text(998,17,string_hash_to_newline(string(min(100,floor((penitent_current/penitent_max)*100)))+"% Penitent")); draw_text(998,17.5,string_hash_to_newline(string(min(100,floor((penitent_current/penitent_max)*100)))+"% Penitent")); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); // TODO Need a tooltip for here to display the actual amounts } } @@ -86,7 +137,7 @@ if (!zoomed && !zui){ draw_set_color(255); draw_text(998,17,string_hash_to_newline("Renegade")); draw_text(998,17.5,string_hash_to_newline("Renegade")); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); } if (menu==0){ if (obj_controller.imp_ships == 0 && obj_controller.turn<2){ @@ -143,12 +194,9 @@ if (!zoomed && !zui){ // Draws the current marines in your command draw_sprite(spr_new_resource,3,475-10,17); draw_set_color(16291875); - draw_text(495-10,16,string_hash_to_newline(string(marines)+"/"+string(command))); - draw_text(495.5-10,16.5,string_hash_to_newline(string(marines)+"/"+string(command))); - - if (menu==0){ - location_viewer.draw(); - } + draw_text(495-10,16,string(marines)+"/"+string(command)); + draw_text(495.5-10,16.5,string(marines)+"/"+string(command)); + pop_draw_return_values(); } draw_set_font(fnt_40k_14b); draw_set_color(c_red); @@ -156,10 +204,9 @@ draw_set_halign(fa_left); draw_set_alpha(1); // Sets up debut mode if (global.cheat_debug == true){ - draw_text(1124, 7, string_hash_to_newline("DEBUG MODE")); + draw_text(1124, 7, "DEBUG MODE"); } - function draw_line(x1, y1, y_slide, variable) { l_hei = 37; l_why = 0; @@ -175,9 +222,30 @@ function draw_line(x1, y1, y_slide, variable) { } +try{ + if (menu == MENU.Manage) { + if (managing != 0){ + draw_sprite_and_unit_equip_data(); + } + if (managing == -1){ + scr_manage_task_selector(); + } + if (managing > 0){ + company_specific_management(); + } + } else if (menu == MENU.Armamentarium) { + scr_draw_armentarium_gui(); + } else if (menu == MENU.Librarium){ + scr_librarium_gui(); + } +} catch(_exception){ + handle_exception(_exception); + menu = MENU.Default; +} +pop_draw_return_values(); diff --git a/objects/obj_controller/Mouse_50.gml b/objects/obj_controller/Mouse_50.gml index 1476e5f7f9..a373429b3c 100644 --- a/objects/obj_controller/Mouse_50.gml +++ b/objects/obj_controller/Mouse_50.gml @@ -169,742 +169,45 @@ else if (menu==15) and (cooldown<=0){ // ** Diplomacy ** -if (menu==20) and (diplomacy>0) or ((diplomacy<-5) and (diplomacy>-6)) and (cooldown<=0) and (diplomacy<10){ - if (trading==0) and (diplo_option[1]=="") and (diplo_option[2]=="") and (diplo_option[3]=="") and (diplo_option[4]==""){ - if (force_goodbye<=0){ - if (audience==0){ - // Trade - if (mouse_x>=xx+442) and (mouse_y>=yy+718) and (mouse_x=xx+561) and (mouse_y>=yy+718) and (mouse_x=xx+682) and (mouse_y>=yy+718) and (mouse_x=xx+442) and (mouse_y>=yy+752) and (mouse_x=xx+561) and (mouse_y>=yy+752) and (mouse_x=xx+682) and (mouse_y>=yy+752) and (mouse_x=xx+818) and (mouse_y>=yy+795) and (mouse_x0) and (!instance_exists(obj_turn_end)){ - cooldown=8; - diplomacy=0; - menu=0; - audience=0; - force_goodbye=0; - exit; - } - if (audience>0) and (instance_exists(obj_turn_end)){ - if (complex_event==false){ - cooldown=8; - diplomacy=0; - menu=0; - obj_turn_end.alarm[1]=1; - audience=0; - force_goodbye=0; - exit; - } - if (complex_event=true){ - // TODO - } - }// Have this check for the next audience, if any - } - // Trade goods go here - if (trading==1) or (trading==2){ - for(var i=0;i<7;i++){ - trade_theirs[i]=""; - trade_disp[i]=-100; - } - - trade_req=requisition; - trade_gene=gene_seed; - trade_chip=stc_wargear_un+stc_vehicles_un+stc_ships_un; - trade_info=info_chips; - - // Imperium trade goods - if (diplomacy==2){ - cooldown=8; - trade_theirs[1]="Requisition"; - trade_theirs[2]="Recruiting Planet"; - trade_theirs[3]="License: Repair"; - trade_theirs[4]="License: Crusade"; - } - // Mechanicus trade goods - if (diplomacy==3){ - cooldown=8; - trade_theirs[1]="Terminator Armour"; - trade_theirs[2]="Land Raider"; - trade_theirs[3]="Minor Artifact"; - trade_theirs[4]="Skitarii"; - trade_theirs[5]="Techpriest"; - trade_disp[1]=30; - trade_disp[2]=20; - trade_disp[3]=40; - trade_disp[4]=25; - trade_disp[5]=55; - } - // Inquisition trade goods - if (diplomacy==4){ - cooldown=8; - // TODO: Condemnor Boltgun trade is temporarily disabled due to crashes as the item doesn't exist in other parts of the game. - // To re-enable: Implement the Condemnor Boltgun item in the game's inventory, equipment, and combat systems. - // trade_theirs[1]="Condemnor Boltgun"; - trade_theirs[1]="Hellrifle"; - trade_theirs[2]="Incinerator"; - trade_theirs[3]="Crusader"; - trade_theirs[4]="Exterminatus"; - trade_theirs[5]="Cyclonic Torpedo"; - // trade_disp[1]=20; - trade_disp[1]=30; - trade_disp[2]=20; - trade_disp[3]=25; - trade_disp[4]=40; - trade_disp[5]=60; - } - // Ecclesiarchy trade goods - if (diplomacy==5){ - cooldown=8; - trade_theirs[1]="Eviscerator"; - trade_theirs[2]="Heavy Flamer"; - trade_theirs[3]="Inferno Bolts"; - trade_theirs[4]="Sister of Battle"; - trade_theirs[5]="Sister Hospitaler"; - trade_disp[1]=20; - trade_disp[2]=30; - trade_disp[3]=30; - trade_disp[4]=40; - trade_disp[5]=45; - } - // Eldar trade goods - if (diplomacy==6){ - cooldown=8; - trade_theirs[1]="Master Crafted Power Sword"; - trade_theirs[2]="Archeotech Laspistol"; - trade_theirs[3]="Ranger"; - trade_theirs[4]="Useful Information"; - trade_disp[1]=-10; - trade_disp[2]=-10; - trade_disp[3]=10; - trade_disp[4]=-15; - if (random_event_next != EVENT.none) and ((string_count("WL10|",useful_info)>0) or (turn0) or (known[eFACTION.Ork]<1)) and (string_count("WG|",useful_info)>1) and (string_count("CM|",useful_info)>0) then trade_disp[4]=1000; - } - // Ork trade goods - if (diplomacy==7){ - cooldown=8; - trade_theirs[1]="Power Klaw"; - trade_theirs[2]="Ork Sniper"; - trade_theirs[3]="Flash Git"; - } - if (diplomacy==8) then trade_theirs[1]="Test"; - } - } - if (trading==0) and ((diplo_option[1]!="") or (diplo_option[2]!="") or (diplo_option[3]!="") or (diplo_option[4]!="")){ +if (menu==MENU.Diplomacy) and (diplomacy>0) or ((diplomacy<-5) and (diplomacy>-6)) and (cooldown<=0) and (diplomacy<10){ + if (trading==0) and (valid_diplomacy_options()){ if (force_goodbye==0) and (cooldown<=0){ - var diplo_pressed=0; - yy=__view_get( e__VW.YView, 0 )+0; - - var opts=0; - for(var dp=1; dp<=4; dp++){if (diplo_option[dp]!="") then opts+=1;} - if (opts==4) then yy-=30; - if (opts==2) then yy+=30; - if (opts==1) then yy+=60; - for(var slot=1; slot<=4; slot++){ - if (diplo_option[slot]!=""){ - if (mouse_x>=xx+354) and (mouse_y>=yy+694) and (mouse_x0) and (diplo_goto[diplo_pressed]!="") and (cooldown<=0){ - click2=1; - scr_dialogue(diplo_goto[diplo_pressed]); - cooldown=4000; - exit; - } - if (diplo_pressed==1){ - click2=1; - if (questing==0) and (trading_artifact==0) and (trading_demand==0){ - if (diplomacy==4) and (diplo_option[1]=="It will not happen again"){// It will not happen again mang - scr_dialogue("you_better"); - diplo_option[1]=""; - diplo_option[2]=""; - diplo_option[3]=""; - force_goodbye=1; - - var tb,tc; - explode_script(obj_controller.temp[1008],"|"); - tb=string(explode[0]); - tc=real(explode[1]); - var ev=0; - for(var v=1; v<=99; v++){if (ev==0) and (event[v]=="") then ev=v;} - event[ev]="remove_serf|"+string(tb)+"|"+string(tc)+"|"; - event_duration[ev]=choose(1,2); - exit; - } - } - if (questing!=0){ - cooldown=8; - if (questing==1) and (diplomacy==6){ - if (requisition>=500){ - scr_loyalty("Xeno Trade","+"); - scr_dialogue("mission1_thanks"); - scr_quest(2,"fund_elder",6,0); - requisition-=500;questing=0; - diplo_option[1]=""; - diplo_option[2]=""; - diplo_option[3]=""; - exit; - } - } - } - if ((diplomacy==3) or (diplomacy==5)) and (trading_artifact!=0){ - trading=1; - scr_dialogue("open_trade"); - trade_take[1]="Artifact"; - trade_tnum[1]=1; - trade_req=requisition; - trade_gene=gene_seed; - trade_chip=info_chips; - trade_info=stc_wargear_un+stc_vehicles_un+stc_ships_un; - } - if (trading_demand>0) and (diplo_option[1]!="Cancel") and (diplo_option[1]!="") then scr_demand(1); - } - if (diplo_pressed==2){ - click2=1; - - if (questing==0) and (trading_artifact==0) and (trading_demand==0){// Don't want no trabble - if (diplomacy==4) and (diplo_option[2]=="Very well"){ - diplo_option[1]=""; - diplo_option[2]=""; - diplo_option[3]=""; - force_goodbye=1; - - var tb,tc; - explode_script(obj_controller.temp[1008],"|"); - tb=string(explode[0]); - tc=real(explode[1]); - var ev=0; - for(var v=1; v<=99; v++){if (ev==0) and (event[v]=="") then ev=v;} - event[ev]="remove_serf|"+string(tb)+"|"+string(tc)+"|"; - event_duration[ev]=choose(1,2); - cooldown=8; - diplomacy=0; - menu=0; - obj_turn_end.alarm[1]=1; - audience=0; - force_goodbye=0; - exit; - } - } - if (questing!=0){ - cooldown=8; - if (questing==1) and (diplomacy==6){ - scr_dialogue("quest_maybe"); - questing=0; - diplo_option[1]=""; - diplo_option[2]=""; - diplo_option[3]=""; - exit; - } - } - if (trading_demand>0) and (diplo_option[2]!="Cancel") and (diplo_option[2]!="") then scr_demand(2); - if (trading_demand>0) and (diplo_option[2]=="Cancel"){ - cooldown=8000; - trading_demand=0; - diplo_option[1]=""; - diplo_option[2]=""; - diplo_option[3]=""; - diplo_text="..."; - diplo_txt="..."; - } - if (diplomacy>0) and (trading_artifact>0) and (menu==20){ - cooldown=8; - obj_ground_mission.alarm[1]=2; - trading_artifact=0; - menu=0; - diplomacy=0; - diplo_option[1]=""; - diplo_option[2]=""; - diplo_option[3]=""; - } - } - if (diplo_pressed==3){ - click2=1; - if (questing==0) and (trading_artifact==0) and (trading_demand==0){ - if (diplomacy==4) and (string_count("You will not",diplo_option[3])>0){// MIIIIINE!!!1 - scr_dialogue("die_heretic"); - diplo_option[1]=""; - diplo_option[2]=""; - diplo_option[3]=""; - force_goodbye=1; - exit; - } - } - if (questing!=0){ - cooldown=8; - if (questing==1) and (diplomacy==6){// That +2 counteracts the WAITED TOO LONG penalty - scr_dialogue("mission1_refused"); - scr_quest(3,"fund_elder",6,0); - questing=0; - diplo_option[1]=""; - diplo_option[2]=""; - diplo_option[3]=""; - exit; - } - } - if (trading_demand>0) and (diplo_option[3]!="Cancel") and (diplo_option[3]!="") then scr_demand(3); - if (trading_demand>0) and (diplo_option[3]=="Cancel"){ - cooldown=8; - trading_demand=0; - diplo_option[1]=""; - diplo_option[2]=""; - diplo_option[3]=""; - diplo_text="..."; - diplo_txt="..."; - } - } } if (force_goodbye!=0) and (cooldown<=0){// Want to check to see if the deal went fine here if (trading_artifact!=0){ click2=1; - obj_controller.diplo_option[1]=""; - obj_controller.diplo_option[2]=""; - diplo_option[3]=""; + clear_diplo_choices(); diplomacy=0; menu=0; force_goodbye=0; with(obj_popup){instance_destroy();} - if (trading_artifact!=2) then obj_ground_mission.alarm[1]=1; - if (trading_artifact==2) then obj_ground_mission.alarm[2]=1; - exit; - } - } - } - // - if (trading==1) or (trading==2){ - // Exit - if (scr_hit(xx+818,yy+796,xx+897,yy+815)==true){ - cooldown=8; - trading=0; - scr_dialogue("trade_close"); - click2=1; - - for(var i=0;i<6;i++){ - trade_take[i]=""; - trade_tnum[i]=0; - trade_give[i]=""; - trade_mnum[i]=0; - } - if (trading_artifact!=0){ - diplomacy=0; - menu=0; - force_goodbye=0; - with(obj_popup){instance_destroy();} - obj_ground_mission.alarm[1]=1; - exit; - } - // Also need to disable the popup OFFER TERMS option - } - // Clear Terms - if (scr_hit(xx+510,yy+649,xx+615,yy+668)==true){ - cooldown=8; - click2=1; - trade_likely=""; - trade_req=requisition; - trade_gene=gene_seed; - trade_chip=stc_wargear_un+stc_vehicles_un+stc_ships_un; - trade_info=info_chips; - - for(var i=0;i<6;i++){ - if (trading_artifact==0){ - trade_take[i]=""; - trade_tnum[i]=0; + if (trading_artifact!=2){ + obj_ground_mission.alarm[1]=1; } - trade_give[i]=""; - trade_mnum[i]=0; - } - } - // Trade Here? - if (scr_hit(xx+630,yy+649,xx+735,yy+668)==true){ - cooldown=8; - click2=1; - if (diplo_last!="offer") then scr_trade(true); - } - - var minz=0; - if (trade_give[4]=="") then minz=4; - if (trade_give[3]=="") then minz=3; - if (trade_give[2]=="") then minz=2; - if (trade_give[1]=="") then minz=1; - - // Opponent things to offer - if (trading_artifact==0){ - if (scr_hit(xx+342,yy+371,xx+485,yy+422)==true) and (cooldown<=0) and (disposition[diplomacy]>=trade_disp[1]){ - cooldown=8; - click2=1; - scr_trade_add(string(trade_theirs[1])); - } - if (scr_hit(xx+342,yy+422,xx+485,yy+470)==true) and (cooldown<=0) and (disposition[diplomacy]>=trade_disp[2]){ - cooldown=8; - click2=1; - scr_trade_add(string(trade_theirs[2])); - } - if (scr_hit(xx+342,yy+470,xx+485,yy+517)==true) and (cooldown<=0) and (disposition[diplomacy]>=trade_disp[3]){ - cooldown=8; - click2=1; - scr_trade_add(string(trade_theirs[3])); - } - if (scr_hit(xx+342,yy+517,xx+485,yy+564)==true) and (cooldown<=0) and (disposition[diplomacy]>=trade_disp[4]){ - cooldown=8; - click2=1; - scr_trade_add(string(trade_theirs[4])); - } - if (scr_hit(xx+342,yy+564,xx+485,yy+611)==true) and (cooldown<=0) and (disposition[diplomacy]>=trade_disp[5]){ - cooldown=8; - click2=1; - scr_trade_add(string(trade_theirs[5])); - } - } - xx+=419; - // Player Things to Offer - // Requisition - if (!instance_exists(obj_popup_dialogue)){ - if (scr_hit(xx+342,yy+371,xx+485,yy+422)==true) and (minz!=0) and (cooldown<=0) and (trade_req>0){ - cooldown=8000; - click2=1; - get_diag_integer("Requisition offered?",trade_req,"m"+string(minz),"Requisition"); - scr_trade(false); - } - // Gene-seed - else if (scr_hit(xx+342,yy+422,xx+485,yy+470)==true) and (minz!=0) and (cooldown<=0) and (trade_gene>0){ - cooldown=8000; - click2=1; - get_diag_integer("Gene-Seed offered?",trade_gene,"m"+string(minz),"Gene-Seed"); - scr_trade(false); - } - // STC Fragment - else if (scr_hit(xx+342,yy+470,xx+485,yy+517)==true) and (minz!=0) and (cooldown<=0) and (trade_chip>0){ - cooldown=8000; - click2=1; - get_diag_integer("STC Fragments offered?",trade_chip,"m"+string(minz),"STC Fragment"); - scr_trade(false); - } - // Info Chips - if (scr_hit(xx+342,yy+517,xx+485,yy+564)==true) and (minz!=0) and (cooldown<=0) and (trade_info>0){ - cooldown=8000; - click2=1; - get_diag_integer("Info Chips offered?",trade_info,"m"+string(minz),"Info Chip"); - scr_trade(false); - } - } - xx-=419; - // Remove items buttons - if (trading_artifact==0){ - if (scr_hit(xx+507,yy+399,xx+527,yy+418)==true) and (trade_tnum[2]==0) and (trade_tnum[1]!=0) and (cooldown<=0){ - trade_tnum[1]=0; - trade_take[1]=""; - cooldown=8000; - click2=1; - scr_trade(false); - } - if (scr_hit(xx+507,yy+419,xx+527,yy+438)==true) and (trade_tnum[3]==0) and (trade_tnum[2]!=0) and (cooldown<=0){ - trade_tnum[2]=0; - trade_take[2]=""; - cooldown=8000; - click2=1; - scr_trade(false); - } - if (scr_hit(xx+507,yy+439,xx+527,yy+458)==true) and (trade_tnum[4]==0) and (trade_tnum[3]!=0) and (cooldown<=0){ - trade_tnum[3]=0; - trade_take[3]=""; - cooldown=8000; - click2=1; - scr_trade(false); - } - if (scr_hit(xx+507,yy+459,xx+527,yy+478)==true) and (trade_tnum[4]!=0) and (cooldown<=0){ - trade_tnum[4]=0; - trade_take[4]=""; - cooldown=8000; - click2=1; - scr_trade(false); + if (trading_artifact == 2 && instance_exists(obj_ground_mission)){ + with (obj_ground_mission){ + recieve_artifact_in_discussion(); + } + } + exit; } } - if (scr_hit(xx+507,yy+547,xx+527,yy+566)==true) and (trade_mnum[2]==0) and (trade_mnum[1]!=0) and (cooldown<=0){ - if (trade_give[1]=="Requisition") then trade_req+=trade_mnum[1]; - if (trade_give[1]=="Gene-Seed") then trade_gene+=trade_mnum[1]; - if (trade_give[1]=="STC Fragment") then trade_chip+=trade_mnum[1]; - if (trade_give[1]=="Info Chip") then trade_info+=trade_mnum[1]; - trade_mnum[1]=0; - trade_give[1]=""; - cooldown=8000; - click2=1; - scr_trade(false); - } - if (scr_hit(xx+507,yy+567,xx+527,yy+586)==true) and (trade_mnum[3]==0) and (trade_mnum[2]!=0) and (cooldown<=0){ - if (trade_give[2]=="Requisition") then trade_req+=trade_mnum[2]; - if (trade_give[2]=="Gene-Seed") then trade_gene+=trade_mnum[2]; - if (trade_give[2]=="STC Fragment") then trade_chip+=trade_mnum[2]; - if (trade_give[2]=="Info Chip") then trade_info+=trade_mnum[2]; - trade_mnum[2]=0; - trade_give[2]=""; - cooldown=8000; - click2=1; - scr_trade(false); - } - if (scr_hit(xx+507,yy+587,xx+527,yy+606)==true) and (trade_mnum[4]==0) and (trade_mnum[3]!=0) and (cooldown<=0){ - if (trade_give[3]=="Requisition") then trade_req+=trade_mnum[3]; - if (trade_give[3]=="Gene-Seed") then trade_gene+=trade_mnum[3]; - if (trade_give[3]=="STC Fragment") then trade_chip+=trade_mnum[3]; - if (trade_give[3]=="Info Chip") then trade_info+=trade_mnum[3]; - trade_mnum[3]=0; - trade_give[3]=""; - cooldown=8000; - click2=1; - scr_trade(false); - } - if (scr_hit(xx+507,yy+607,xx+527,yy+626)==true) and (trade_mnum[4]!=0) and (cooldown<=0){ - if (trade_give[4]=="Requisition") then trade_req+=trade_mnum[4]; - if (trade_give[4]=="Gene-Seed") then trade_gene+=trade_mnum[4]; - if (trade_give[4]=="STC Fragment") then trade_chip+=trade_mnum[4]; - if (trade_give[4]=="Info Chip") then trade_info+=trade_mnum[4]; - trade_mnum[4]=0; - trade_give[4]=""; - cooldown=8000; - click2=1; - scr_trade(false); - } } } // Diplomacy -if (zoomed==0) and (cooldown<=0) and (menu==20) and (diplomacy==0){ +if (zoomed==0) and (cooldown<=0) and (menu==MENU.Diplomacy) and (diplomacy==0){ xx+=55; yy-=20; var onceh=0 // Daemon emmissary - if (point_in_rectangle(mouse_x, mouse_y, xx+688,yy+181,xx+1028,yy+281)){ - diplomacy=10.1; - diplomacy_pathway="intro"; - scr_dialogue(diplomacy_pathway); - onceh=1; - cooldown = 1; - } - var faction_interact_coords=[ - [ - [xx+194,yy+355,xx+288,yy+369],//imperium - [xx+292,yy+355,xx+350,yy+369], - 2 - ], - [ - [xx+194,yy+491,xx+288,yy+503],//mechanicus - [xx+292,yy+491,xx+350,yy+503], - 3 - ], - [ - [xx+194,yy+630,xx+288,yy+644],//Inquisition - [xx+292,yy+630,xx+350,yy+644], - 4 - ], - [ - [xx+194,yy+760,xx+288,yy+774],//sisters - [xx+292,yy+760,xx+350,yy+774], - 5 - ], - [ - [xx+1203,yy+355,xx+1300,yy+369],//eldar - [xx+1303,yy+355,xx+1350,yy+369], - 6 - ], - [ - [xx+1203,yy+491,xx+1300,yy+503],//orks - [xx+1303,yy+491,xx+1350,yy+503], - 7 - ], - [ - [xx+1203,yy+630,xx+1300,yy+644],//Tau - [xx+1303,yy+630,xx+1350,yy+644], - 8 - ], - [ - [xx+1203,yy+760,xx+1300,yy+774],//heretic - [xx+1303,yy+760,xx+1350,yy+774], - 10 - ], - ] - for (var i=0;i0) and (cooldown==8000){ - onceh=0; - if (known[diplomacy]==1) and (diplomacy!=4) and (onceh==0){ - scr_dialogue("intro"); - onceh=1; - known[diplomacy]=2; - faction_justmet=1; - } - if (known[diplomacy]>=2) and (diplomacy!=4) and (onceh==0){ - scr_dialogue("hello"); - onceh=1; - } - if (known[eFACTION.Inquisition]==1) and (diplomacy==4) and (onceh==0){ - scr_dialogue("intro"); - onceh=1; - known[diplomacy]=2; - faction_justmet=1; - obj_controller.last_mission=turn+1; - } - if (known[eFACTION.Inquisition]==3) and (diplomacy==4) and (onceh==0){ - scr_dialogue("intro"); - onceh=1; - known[diplomacy]=4; - faction_justmet=1; - obj_controller.last_mission=turn+1; - } - if (known[diplomacy]>=4) and (diplomacy==4) and (onceh==0){ - scr_dialogue("hello"); - onceh=1; - } - } + if (point_in_rectangle(mouse_x, mouse_y, xx+688,yy+181,xx+1028,yy+281)){ + diplomacy=10.1; + diplomacy_pathway="intro"; + scr_dialogue(diplomacy_pathway); + onceh=1; + cooldown = 1; + } } @@ -930,12 +233,12 @@ scr_menu_clear_up(function(){ yy=yy+0; if (mouse_x>=xx+22) and (mouse_y>=yy+84) and (mouse_x0) || (managing<0) and (!view_squad || !company_report){ + if (menu=MENU.Manage) and (managing>0) || (managing<0) and (!view_squad || !company_report){ var unit; var eventing=false, bb=""; xx=__view_get( e__VW.XView, 0 )+0; @@ -964,7 +267,7 @@ scr_menu_clear_up(function(){ if (menu==50) and (managing>0) and (cooldown<=0){ if (mouse_x>=xx+217) and (mouse_y>=yy+28) and (mouse_x= 0) { @@ -434,264 +434,17 @@ try { force_tool = 0; top = man_current; sel = top; - var unit = ""; yy += 77; } - if (is_struct(temp[120])) { - var ach = 0, - damage_res = 1, - armour_value = 0; + if (is_struct(unit_focus)) { + // Checks if the marine is not hidden - var unit = temp[120]; + var _unit = unit_focus; if (!is_array(last_unit)) { - last_unit = [0, 0]; + last_unit = [-1, -1]; } - if ((unit.base_group != "none") && (last_unit[1] != unit.marine_number || last_unit[0] != unit.company)) { - last_unit = [unit.company, unit.marine_number]; - marine_armour[0] = unit.armour(); - fix_right = 0; - equip_data = unit.unit_equipment_data(); - temp[100] = "1"; - if (unit.race() != 1) { - temp[100] = unit.race(); - } - - damage_res = unit.damage_resistance(); - - if (is_struct(equip_data.armour_data)) { - temp[103] = equip_data.armour_data.item_tooltip_desc_gen(); - } else { - temp[103] = ""; - } - // Sets up the description for the equipement of current marine - //temp[103]=""; - // Gear - temp[104] = unit.gear(); - if (is_struct(equip_data.gear_data)) { - temp[105] = equip_data.gear_data.item_tooltip_desc_gen(); - } else { - temp[105] = ""; - } - //if (string_count("&",temp[104])>0) then temp[104]=clean_tags(temp[104]); - // Mobility Item - temp[106] = unit.mobility_item(); - if (is_struct(equip_data.mobility_data)) { - temp[107] = equip_data.mobility_data.item_tooltip_desc_gen(); - } else { - temp[107] = ""; - } - temp[108] = unit.weapon_one(); - if (is_struct(equip_data.weapon_one_data)) { - temp[109] = equip_data.weapon_one_data.item_tooltip_desc_gen(); - } else { - temp[109] = ""; - } - temp[110] = unit.weapon_two(); - if (is_struct(equip_data.weapon_two_data)) { - temp[111] = equip_data.weapon_two_data.item_tooltip_desc_gen(); - } else { - temp[111] = ""; - } - //if (string_count("&",temp[106])>0) then temp[106]=clean_tags(temp[106]); - // Experience - temp[113] = string(floor(unit.experience)); - // Psyker things - temp[119] = ""; - temp[123] = ""; - var _psy_powers_known = unit.powers_known; - var _psy_powers_count = array_length(_psy_powers_known); - if (_psy_powers_count > 0) { - var _psy_discipline = unit.psy_discipline(); - var _psy_discipline_name = get_discipline_data(_psy_discipline, "name"); - temp[119] = $"{unit.psionic}/{_psy_powers_count}"; - - var _tooltip = ""; - _tooltip += $"Psychic Rating: {unit.psionic}"; - - var _equipment_psychic_amplification = unit.gear_special_value("psychic_amplification"); - var _character_psychic_amplification = unit.psychic_amplification() * 100; - var _equipment_psychic_focus = unit.gear_special_value("psychic_focus"); - var _character_psychic_focus = unit.psychic_focus(); - var _perils_chance = unit.perils_threshold() / 10; - _tooltip += $"\nAmplification from Equipment: {_equipment_psychic_amplification}%"; - _tooltip += $"\nAmplification from Attributes (Psy Rating and EXP): {_character_psychic_amplification}%"; - - _tooltip += $"\n\nFocus Success Chance: {100 - unit.psychic_focus_difficulty()}%"; - _tooltip += $"\nFocus from Equipment: {_equipment_psychic_focus}%"; - _tooltip += $"\nFocus from Attributes (WIS and EXP): {_character_psychic_focus}%"; - - _tooltip += $"\n\nPerils of the Warp Chance: {_perils_chance}%"; - - _tooltip += $"\n\nMain Discipline: {_psy_discipline_name}"; - _tooltip += $"\nKnown Powers: "; - for (var i = 0; i < _psy_powers_count; i++) { - _tooltip += get_power_data(_psy_powers_known[i], "name"); - _tooltip += smart_delimeter_sign(_psy_powers_count, i, false); - } - temp[123] = _tooltip; - } - // Corruption - if ((obj_controller.chaos_rating > 0) && (temp[119] != "")) { - temp[119] += "#" + string(max(0, unit.corruption())) + "% Corruption."; - } - if ((obj_controller.chaos_rating > 0) && (temp[119] == "")) { - temp[119] = string(max(0, unit.corruption())) + "% Corruption."; - } - // Melee Attack - temp[116] = unit.melee_attack(); - // Ranged Attack - temp[117] = unit.ranged_attack(); - // Damage Resistance - temp[118] = string(damage_res) + "%"; - temp[130] = "Health damage taken by the marine is reduced by this percentage. This happens after the flat reduction from armor.\n\nContributing factors:\n"; - var equipment_types = ["armour", "weapon_one", "weapon_two", "mobility", "gear"]; - for (var i = 0; i < array_length(equipment_types); i++) { - var equipment_type = equipment_types[i]; - var dr = 0; - var name = ""; - switch (equipment_type) { - case "armour": - dr = unit.get_armour_data("damage_resistance_mod"); - name = unit.get_armour_data("name"); - break; - case "weapon_one": - dr = unit.get_weapon_one_data("damage_resistance_mod"); - name = unit.get_weapon_one_data("name"); - break; - case "weapon_two": - dr = unit.get_weapon_two_data("damage_resistance_mod"); - name = unit.get_weapon_two_data("name"); - break; - case "mobility": - dr = unit.get_mobility_data("damage_resistance_mod"); - name = unit.get_mobility_data("name"); - break; - case "gear": - dr = unit.get_gear_data("damage_resistance_mod"); - name = unit.get_gear_data("name"); - break; - } - if (dr != 0) { - temp[130] += $"{name}: {dr}%\n"; - } - } - temp[130] += string("CON: {0}%\nEXP: {1}%", round(unit.constitution / 2), round(unit.experience / 10)); - if (is_struct(temp[121])) { - try { - temp[121].destroy_image(); - } - delete temp[121]; - } - temp[124] = $"{round(unit.hp())}/{round(unit.max_health())}"; // Health Tracker - temp[125] = $"A measure how much punishment the creature can take. Marines can go into the negatives and still survive, but they'll require a bionic to become fighting fit once more.\n\nContributing factors:\nCON: {round(100 * (1 + ((unit.constitution - 40) * 0.025)))}\n"; - for (var i = 0; i < array_length(equipment_types); i++) { - var equipment_type = equipment_types[i]; - var hp_mod = 0; - var name = ""; - switch (equipment_type) { - case "armour": - hp_mod = unit.get_armour_data("hp_mod"); - name = unit.get_armour_data("name"); - break; - case "weapon_one": - hp_mod = unit.get_weapon_one_data("hp_mod"); - name = unit.get_weapon_one_data("name"); - break; - case "weapon_two": - hp_mod = unit.get_weapon_two_data("hp_mod"); - name = unit.get_weapon_two_data("name"); - break; - case "mobility": - hp_mod = unit.get_mobility_data("hp_mod"); - name = unit.get_mobility_data("name"); - break; - case "gear": - hp_mod = unit.get_gear_data("hp_mod"); - name = unit.get_gear_data("name"); - break; - } - if (hp_mod != 0) { - temp[125] += $"{name}: {format_number_with_sign(hp_mod)}%\n"; - } - } - temp[126] = $"{unit.armour_calc()}"; // Armour Rating - temp[127] = "Reduces incoming damage at a flat rate. Certain enemies may attack in ways that may bypass your armor entirely, for example power weapons and some warp sorceries.\n\nContributing factors:\n"; - for (var i = 0; i < array_length(equipment_types); i++) { - var equipment_type = equipment_types[i]; - var ac = 0; - var name = ""; - switch (equipment_type) { - case "armour": - ac = unit.get_armour_data("armour_value"); - name = unit.get_armour_data("name"); - break; - case "weapon_one": - ac = unit.get_weapon_one_data("armour_value"); - name = unit.get_weapon_one_data("name"); - break; - case "weapon_two": - ac = unit.get_weapon_two_data("armour_value"); - name = unit.get_weapon_two_data("name"); - break; - case "mobility": - ac = unit.get_mobility_data("armour_value"); - name = unit.get_mobility_data("name"); - break; - case "gear": - ac = unit.get_gear_data("armour_value"); - name = unit.get_gear_data("name"); - break; - } - if (ac != 0) { - temp[127] += $"{name}: {ac}\n"; - } - } - if (obj_controller.stc_bonus[1] == 5 || obj_controller.stc_bonus[2] == 3) { - temp[127] += $"STC Bonus: x1.05\n"; - } - temp[128] = $"{unit.bionics}"; - var _body_parts = ARR_body_parts; - var _body_parts_display = ARR_body_parts_display; - temp[129] = "Bionic Augmentation is something a unit can do to both enhance their capabilities, but also replace a missing limb to get back into the fight."; - temp[129] += "\nThere is a limit of 10 Bionic augmentations. After that the damage is so extensive that a marine requires a dreadnought to keep going."; - temp[129] += "\nFor everyone else? It's time for the emperor's mercy."; - temp[129] += "\n\nCurrent Bionic Augmentations:\n"; - for (var part = 0; part < array_length(_body_parts); part++) { - if (struct_exists(unit.body[$ _body_parts[part]], "bionic")) { - var part_display = _body_parts_display[part]; - temp[129] += $"Bionic {part_display}"; - switch (part_display) { - case "Left Leg": - case "Right Leg": - temp[129] += $" (CON: +2 STR: +1 DEX: -2)\n"; - break; - case "Left Eye": - case "Right Eye": - temp[129] += $" (CON: +1 WIS: +1 DEX: +1)\n"; - break; - case "Left Arm": - case "Right Arm": - temp[129] += $" (CON: +2 STR: +2 WS: -1)\n"; - break; - case "Torso": - temp[129] += $" (CON: +4 STR: +1 DEX: -1)\n"; - break; - case "Throat": - temp[129] += $" (CHA: -1)\n"; - break; - case "Jaw": - case "Head": - temp[129] += $" (CON: +1)\n"; - break; - } - } - } - temp[121] = unit.draw_unit_image(); - - temp[122] = unit.handle_stat_growth(); - /*if (man[sel]="vehicle"){ - // TODO - }*/ + if ((_unit.base_group != "none") && (last_unit[1] != _unit.marine_number || last_unit[0] != _unit.company)) { + reset_manage_unit_constants(_unit); } } } @@ -727,15 +480,12 @@ try { } if ((trading_artifact == 0) && (trading == 0) && (trading_artifact == 0) && (faction_justmet == 1) && (questing == 0) && (trading_demand == 0) && (complex_event == false)) { - for (var h = 1; h <= 4; h++) { - obj_controller.diplo_option[h] = ""; - obj_controller.diplo_goto[h] = ""; - } + clear_diplo_choices(); } income = income_base + income_home + income_forge + income_agri + income_training + income_fleet + income_trade + income_tribute; - if ((menu == 20) && ((diplomacy > 0) || ((diplomacy < -5) && (diplomacy > -6)))) { + if ((menu == MENU.Diplomacy) && ((diplomacy > 0) || ((diplomacy < -5) && (diplomacy > -6)))) { if (string_length(diplo_txt) < string_length(diplo_text)) { diplo_char += 2; diplo_txt = string_copy(diplo_text, 0, diplo_char); @@ -746,6 +496,7 @@ try { } // Check if fleet is minimized or not if (instance_exists(obj_popup)) { + allow_shortcuts = false; if (obj_popup.type == 99) { fleet_minimized = 1; } @@ -798,7 +549,7 @@ try { } unit_id = unit.marine_number; company = unit.company; - obj_ini.loc[company][unit_id] = obj_ini.ship_location[b]; + unit.location_string = obj_ini.ship_location[b]; unit.ship_location = -1; unit.planet_location = unload; obj_ini.uid[company][unit_id] = 0; @@ -840,14 +591,13 @@ try { } // Resets selections if ((managing > 0) && (man_size == 0) && ((selecting_location != "") || (selecting_types != "") || (selecting_planet != 0) || (selecting_ship != -1))) { - selecting_location = ""; - selecting_types = ""; - selecting_planet = 0; - selecting_ship = -1; + reset_manage_selections(); } - if ((marines <= 0) && (alarm[7] == -1) && (!instance_exists(obj_fleet_controller)) && (!instance_exists(obj_ncombat))) { - alarm[7] = 15; + if (menu == 0 && !instances_exist_any([obj_ncombat,obj_fleet_controller])){ + if (!array_contains(obj_ini.role[0],obj_ini.role[100][eROLE.ChapterMaster]) && (alarm[7] == -1)){ + alarm[7] = 15; + } } } catch (_exception) { handle_exception(_exception); diff --git a/objects/obj_controller/Step_1.gml b/objects/obj_controller/Step_1.gml index e8292e24cd..4f1add4565 100644 --- a/objects/obj_controller/Step_1.gml +++ b/objects/obj_controller/Step_1.gml @@ -10,8 +10,3 @@ obj_cursor.image_yscale=1; - - - - - diff --git a/objects/obj_controller/obj_controller.yy b/objects/obj_controller/obj_controller.yy index 113332b0ef..5bcf8c48b1 100644 --- a/objects/obj_controller/obj_controller.yy +++ b/objects/obj_controller/obj_controller.yy @@ -3,7 +3,6 @@ "%Name":"obj_controller", "eventList":[ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":9,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":8,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":7,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":6,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, diff --git a/objects/obj_creation/CleanUp_0.gml b/objects/obj_creation/CleanUp_0.gml index 82d9187617..276e87902e 100644 --- a/objects/obj_creation/CleanUp_0.gml +++ b/objects/obj_creation/CleanUp_0.gml @@ -1 +1,2 @@ -chapter_icons_container.cleanup(); \ No newline at end of file +chapter_icons_container.cleanup(); +global.name_generator = new NameGenerator(); \ No newline at end of file diff --git a/objects/obj_creation/Create_0.gml b/objects/obj_creation/Create_0.gml index afc15d2bbd..0d060e163f 100644 --- a/objects/obj_creation/Create_0.gml +++ b/objects/obj_creation/Create_0.gml @@ -3,11 +3,6 @@ * It contains data and logic for setting up custom chapters as well as populating the new game menu with data for pre-existing chapters. */ keyboard_string=""; -try{ - load_visual_sets(); -} catch(_exception){ - handle_exception(_exception); -} #region Global Settings: volume, fullscreen etc ini_open("saves.ini"); @@ -44,36 +39,23 @@ successor_y = 250; custom_y = 463; /// y coord of Other section heading other_y = 593; -var show_debug = false; -if(show_debug){ - show_debug_overlay(true); - dbg_view("obj_creation_dbg", true); - dbg_section("Icon Grid"); - ref_to_max_cols = ref_create(self, "max_cols"); - ref_to_icon_width = ref_create(self, "icon_width"); - ref_to_icon_height = ref_create(self, "icon_height"); - ref_to_icon_grid_left_edge = ref_create(self, "icon_grid_left_edge"); - ref_to_icon_gap_y = ref_create(self, "icon_gap_y"); - ref_to_icon_gap_x = ref_create(self, "icon_gap_x"); - ref_to_icon_row_gap = ref_create(self, "icon_row_gap"); - dbg_slider_int(ref_to_max_cols,1,15); - dbg_slider_int(ref_to_icon_width,1,100); - dbg_slider_int(ref_to_icon_height,1,100); - dbg_slider_int(ref_to_icon_grid_left_edge,1,1000); - dbg_slider_int(ref_to_icon_gap_y,1,300); - dbg_slider_int(ref_to_icon_gap_x,1,300); - dbg_slider_int(ref_to_icon_row_gap,1,300); - - dbg_section("Heading Positions") - ref_to_founding_y = ref_create(self, "founding_y"); - ref_to_successor_y = ref_create(self, "successor_y"); - ref_to_custom_y = ref_create(self, "custom_y"); - ref_to_other_y = ref_create(self, "other_y"); - dbg_slider_int(ref_to_founding_y,1,1000); - dbg_slider_int(ref_to_successor_y,1,1000); - dbg_slider_int(ref_to_custom_y,1,1000); - dbg_slider_int(ref_to_other_y,1,1000); -} + +var view = new DebugView("Obj Creation Grid", self); +view.add_section("Icon Grid") +.add_slider_int("max_cols", 1, 15) +.add_slider_int("icon_width", 1 ,100) +.add_slider_int("icon_height", 1, 100) +.add_slider_int("icon_grid_left_edge", 1, 1000) +.add_slider_int("icon_gap_y", 1 , 300) +.add_slider_int("icon_gap_x", 1, 300) +.add_slider_int("icon_row_gap", 1, 300) +.add_section("Heading Positions") +.add_slider_int("founding_y", 1, 1000) +.add_slider_int("successor_y", 1, 1000) +.add_slider_int("custom_y", 1, 1000) +.add_slider_int("other_y", 1, 1000) +.hide(); + #endregion window_data=string(window_get_x())+"|"+string(window_get_y())+"|"+string(window_get_width())+"|"+string(window_get_height())+"|"; @@ -145,6 +127,17 @@ heheh=0; turn_selection_change=false; draw_helms = true; +var _culture_styles_array = []; + +for (var i=0;i obj_creation.maxpoints){ - is_disabled = true; - } - return is_disabled; - } - -} -function Disadvantage(_id, _name, _description, _points_cost) : ChapterTrait(_id, _name, _description, _points_cost) constructor { - - static add = function(slot){ - show_debug_message($"Adding disadv {name} to slot {slot} for points {points}"); - obj_creation.dis[slot] = name; - obj_creation.dis_num[slot] = id; - obj_creation.points-=points; - add_meta(); - } - - static remove = function(slot){ - show_debug_message($"Removing disadv {name} from slot {slot} for points {points}"); - obj_creation.dis[slot] = ""; - obj_creation.points+=points; - obj_creation.dis_num[slot]=0; - remove_meta(); - } - - static disable = function(){ - var is_disabled= false; - for (var i=0;i} @@ -785,6 +604,12 @@ var all_advantages = [ value : 40, meta : ["Gear Quality"] }, + { + name : "Ancient Armoury", + description : "Your chapter is dedicated to preserving ancient wargear and as such have substantially higher amounts of rare Heresy-era armour and weapons than normal.", + value: 20,//I'm not sure, but it could be higher since now this trait will bring much more benefits. + meta : ["Gear Quality"] + }, { name : "Enemy: Eldar", description : "Eldar are particularly hated by your chapter. When fighting Eldar damage is increased.", @@ -830,6 +655,11 @@ var all_advantages = [ { name : "Lightning Warriors", description : "Your chapter's style of warfare is built around the speedy execution of battle. Infantry have boosted attack at the cost of defense as well as two additional Land speeders and Biker squads.", + perks : [ + "Reduced Chances of loosing equipment during raids by 15%", + "Marines mmore likely spawn with lightning warrior trait", + "3% increase to base boarding capabilities", + ], value : 30, meta : ["Doctrine"], }, @@ -907,7 +737,13 @@ var all_advantages = [ description: "Your chapter is an elite fighting force comprised almost exclusively of Veterans. All Tactical Marines are replaced by Veterans.", value: 150, meta: ["Specialists"] - } + }, + { + name : "Great Luck", + description: "This is actually really helpful and beneficial for your chapter. Trust me.", + value: 20, + meta: ["Luck"] + }, ] @@ -962,8 +798,9 @@ var all_disadvantages = [ }, { name : "Shitty Luck", - description: "This is actually really helpful and beneficial for your chapter. Trust me.", + description: "This is actually really bad for your chapter. Trust me.", value: 20, + meta: ["Luck"] }, { name : "Sieged", @@ -1073,7 +910,6 @@ dis_num = array_create(9, 0); for(var slot = 99; slot <= 103; slot++){ for(var i = 0; i <= 50; i++){ race[slot,i]=1; - loc[slot,i]=""; role[slot,i]=""; wep1[slot,i]=""; wep2[slot,i]=""; @@ -1094,6 +930,8 @@ function load_default_gear(_role_id, _role_name, _wep1, _wep2, _armour, _mobi, _ gear[defaults_slot, _role_id] = _gear; race[defaults_slot, _role_id] = 1; } + +load_default_gear(eROLE.ChapterMaster, "Chapter Master", "Power Sword", "Bolter", "Artificer Armour", "", ""); load_default_gear(eROLE.HonourGuard, "Honour Guard", "Power Sword", "Bolter", "Artificer Armour", "", ""); load_default_gear(eROLE.Veteran, "Veteran", "Combiflamer", "Combat Knife", STR_ANY_POWER_ARMOUR, "", ""); load_default_gear(eROLE.Terminator, "Terminator", "Power Fist", "Storm Bolter", "Terminator Armour", "", ""); diff --git a/objects/obj_creation/Draw_0.gml b/objects/obj_creation/Draw_0.gml index 403b83e704..830ff7b582 100644 --- a/objects/obj_creation/Draw_0.gml +++ b/objects/obj_creation/Draw_0.gml @@ -1,3 +1,6 @@ + +add_draw_return_values(); +draw_set_valign(fa_top); try { //read // 850,860 @@ -35,7 +38,7 @@ try { draw_line(xx + 30, yy + 70 + (slate3 * 36), xx + 790, yy + 70 + (slate3 * 36)); } - allow_colour_click = (custom > 1) && (!instance_exists(obj_creation_popup)); + allow_colour_click = (custom == eCHAPTER_TYPE.CUSTOM) && (!instance_exists(obj_creation_popup)); draw_set_alpha(slate4 / 30); if (slate4 > 0) { @@ -53,14 +56,14 @@ try { tooltip2 = ""; if (goto_slide != 1) { - if (custom == 2) { + if (custom == eCHAPTER_TYPE.CUSTOM) { draw_sprite(spr_creation_other, 4, 0, 68); } - if (custom == 1) { + if (custom == eCHAPTER_TYPE.RANDOM) { draw_sprite(spr_creation_other, 5, 0, 68); } - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_rectangle(0, 68, 374, 781, 1); } @@ -101,7 +104,7 @@ try { tooltip2 = "The parent Chapter whos Gene-Seed your own originates from."; } - if (custom > 1) { + if (custom == eCHAPTER_TYPE.CUSTOM) { draw_sprite_stretched(spr_creation_arrow, 0, 1164 - 194, 160, 32, 32); draw_sprite_stretched(spr_creation_arrow, 1, 1164 - 144, 160, 32, 32); @@ -142,12 +145,14 @@ try { else if (slide == eCREATIONSLIDES.CHAPTERLIVERY) { scr_livery_setup(); + } else if (slide == eCREATIONSLIDES.CHAPTERROLES) { + scr_role_setup(); } /* Gene Seed Mutations, Disposition */ else if (slide == eCREATIONSLIDES.CHAPTERGENE) { - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); draw_set_alpha(1); @@ -158,7 +163,7 @@ try { draw_text(800, 80, string_hash_to_newline(string(chapter_name))); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_halign(fa_left); draw_text_transformed(580, 118, string_hash_to_newline("Successor Chapters: " + string(successors)), 0.6, 0.6, 0); draw_set_font(fnt_40k_14b); @@ -182,7 +187,7 @@ try { var x1, y1, spac = 34; - if (custom < 2 || purity == 10) { + if (custom != eCHAPTER_TYPE.CUSTOM || purity == 10) { draw_set_alpha(0.5); } var mutations_defects = [{ @@ -374,7 +379,7 @@ try { /* Chapter Master */ if (slide == eCREATIONSLIDES.CHAPTERMASTER) { - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); draw_set_alpha(1); @@ -385,15 +390,15 @@ try { tooltip2 = ""; obj_cursor.image_index = 0; - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_halign(fa_left); draw_text_transformed(580, 100, string_hash_to_newline("Chapter Master Name: "), 0.9, 0.9, 0); draw_set_font(fnt_40k_14b); - if ((text_selected != "cm") || (custom == 0)) { + if ((text_selected != "cm") || (custom == eCHAPTER_TYPE.PREMADE)) { draw_text_ext(580, 144, string_hash_to_newline(string(chapter_master_name)), -1, 580); } - if ((custom > 0) && (restarted == 0)) { + if ((custom != eCHAPTER_TYPE.PREMADE) && (restarted == 0)) { if ((text_selected == "cm") && (text_bar > 30)) { draw_text(580, 144, string_hash_to_newline(string(chapter_master_name))); } @@ -416,10 +421,10 @@ try { draw_rectangle(580 - 2, 144 - 2, 582 + 350, 146 + hei, 1); var _refresh_cm_name_btn = [943, 142, 947 + hei, 146 + hei]; - draw_unit_buttons(_refresh_cm_name_btn, "?", [1, 1], 38144, , fnt_40k_14b); + draw_unit_buttons(_refresh_cm_name_btn, "?", [1, 1], CM_GREEN_COLOR, , fnt_40k_14b); if (point_and_click(_refresh_cm_name_btn)) { var _new_cm_name = global.name_generator.generate_space_marine_name(); - show_debug_message($"regen name of chapter_master_name from {chapter_master_name} to {_new_cm_name}"); + show_debug_message_adv($"regen name of chapter_master_name from {chapter_master_name} to {_new_cm_name}"); chapter_master_name = _new_cm_name; } } @@ -439,7 +444,7 @@ try { x6 = 444; y6 = 265; spac = 25; - if ((custom == 0) || (restarted > 0)) { + if ((custom == eCHAPTER_TYPE.PREMADE) || (restarted > 0)) { draw_set_alpha(0.5); } @@ -476,7 +481,7 @@ try { } draw_sprite(spr_creation_check, yar, x6, y6); yar = 0; - if (point_and_click([x6, y6, x6 + 32, y6 + 32]) && (custom > 0) && (restarted == 0) && (!instance_exists(obj_creation_popup))) { + if (point_and_click([x6, y6, x6 + 32, y6 + 32]) && (custom != eCHAPTER_TYPE.PREMADE) && (restarted == 0) && (!instance_exists(obj_creation_popup))) { var onceh; onceh = 0; if ((chapter_master_melee == melee_choice_order) && (onceh == 0)) { @@ -509,7 +514,7 @@ try { } draw_sprite(spr_creation_check, yar, x6, y6); yar = 0; - if (point_and_click([x6, y6, x6 + 32, y6 + 32]) && (custom > 0) && (restarted == 0) && (!instance_exists(obj_creation_popup)) && (!array_contains([1, 2, 7], chapter_master_melee))) { + if (point_and_click([x6, y6, x6 + 32, y6 + 32]) && (custom != eCHAPTER_TYPE.PREMADE) && (restarted == 0) && (!instance_exists(obj_creation_popup)) && (!array_contains([1, 2, 7], chapter_master_melee))) { var onceh = 0; if (chapter_master_ranged == ranged_choice_order) { chapter_master_ranged = 0; @@ -548,7 +553,7 @@ try { if (nope) { draw_set_alpha(0.5); } - if ((custom < 2) || (restarted > 0)) { + if ((custom != eCHAPTER_TYPE.CUSTOM) || (restarted > 0)) { draw_set_alpha(0.5); } @@ -559,7 +564,7 @@ try { draw_sprite(spr_creation_check, chapter_master_specialty == h, x6, y6 + 214); - if (point_and_click([x6, y6 + 214, x6 + 32, y6 + 32 + 214]) && (custom > 1) && (restarted == 0) && (nope == 0)) { + if (point_and_click([x6, y6 + 214, x6 + 32, y6 + 32 + 214]) && (custom == eCHAPTER_TYPE.CUSTOM) && (restarted == 0) && (nope == 0)) { var onceh = 0; if ((chapter_master_specialty != h) && (onceh == 0)) { chapter_master_specialty = h; @@ -577,7 +582,7 @@ try { //adds "Save Chapter" button if custom chapter in a save slot - if (custom > 0 && global.chapter_id != eCHAPTERS.UNKNOWN) { + if (custom != eCHAPTER_TYPE.PREMADE && global.chapter_id != eCHAPTERS.UNKNOWN) { /// save chapter box var _sc_box = { x1: 980, @@ -675,10 +680,10 @@ try { var q, x3, y3; q = 1; - x3 = (room_width / 2) - 65; + x3 = (room_width / 2) - 77; y3 = 790; - draw_set_color(38144); - repeat (6) { + draw_set_color(CM_GREEN_COLOR); + repeat (7) { draw_circle(x3, y3, 10, 1); draw_circle(x3, y3, 9.5, 1); draw_circle(x3, y3, 9, 1); @@ -694,16 +699,16 @@ try { } } - if ((slide >= 2) || (goto_slide >= 2)) { + if ((slide >= eCREATIONSLIDES.CHAPTERTRAITS) || (goto_slide >= eCREATIONSLIDES.CHAPTERTRAITS)) { draw_set_alpha(1); draw_sprite(spr_creation_arrow, 0, 607, 761); draw_sprite(spr_creation_arrow, 1, 927, 761); - if (slide == 1) { + if (slide == eCREATIONSLIDES.CHAPTERSELECT) { draw_sprite(spr_creation_arrow, 2, 607, 761); } // skip to end >> button - if ((slide >= 2) && (slide < 6) && (custom != 2)) { + if ((slide >= eCREATIONSLIDES.CHAPTERTRAITS) && (slide < eCREATIONSLIDES.CHAPTERMASTER) && (custom != eCHAPTER_TYPE.CUSTOM)) { draw_set_alpha(0.8); if ((popup == "") && ((change_slide >= 70) || (change_slide <= 0)) && scr_hit(927 + 64 + 12, 761 + 12, 927 + 128 - 12, 761 + 64 - 12)) { draw_set_alpha(1); @@ -715,13 +720,14 @@ try { scr_creation(4); scr_creation(5); scr_creation(6); + scr_creation(7); } } draw_set_alpha(1); - var q = 1, x3 = (room_width / 2) - 65, y3 = 790; - draw_set_color(38144); - repeat (6) { + var q = 1, x3 = (room_width / 2) - 77, y3 = 790; + draw_set_color(CM_GREEN_COLOR); + repeat (7) { draw_circle(x3, y3, 10, 1); draw_circle(x3, y3, 9.5, 1); draw_circle(x3, y3, 9, 1); @@ -736,20 +742,21 @@ try { q += 1; } - if ((popup == "") && ((change_slide >= 70) || (change_slide <= 0))) { - if (point_and_click([925, 756, 997, 824]) && !instance_exists(obj_creation_popup)) { + //TODO refactor to make arrow buttoon objects + if ((popup == "") && ((change_slide >= 70) || (change_slide <= 0)) && (!instance_exists(obj_creation_popup))) { + if (point_and_click([925, 756, 997, 824])) { // Next slide - if (slide >= 2 && slide <= 6) { + if (slide >= eCREATIONSLIDES.CHAPTERTRAITS && slide <= eCREATIONSLIDES.CHAPTERMASTER) { scr_creation(slide); } } - if (point_and_click([604, 756, 675, 824]) && (!instance_exists(obj_creation_popup))) { + if (point_and_click([604, 756, 675, 824])) { // Previous slide change_slide = 1; goto_slide = slide - 1; popup = ""; - if (goto_slide == 1) { + if (goto_slide == eCREATIONSLIDES.CHAPTERSELECT) { highlight = 0; highlighting = 0; old_highlight = 0; @@ -769,7 +776,7 @@ try { var _height = string_height_ext(string_hash_to_newline(tooltip2), -1, 500); draw_rectangle(mouse_x + 18, mouse_y + 20, mouse_x + max(_width1, _width2) + 24, mouse_y + 44 + _height, 0); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_rectangle(mouse_x + 18, mouse_y + 20, mouse_x + max(_width1, _width2) + 24, mouse_y + 44 + _height, 1); draw_set_font(fnt_40k_14b); draw_text(mouse_x + 22, mouse_y + 22, string_hash_to_newline(string(tooltip))); @@ -780,3 +787,5 @@ try { handle_exception(_exception); room_goto(Main_Menu); } + +pop_draw_return_values(); diff --git a/objects/obj_creation/Step_0.gml b/objects/obj_creation/Step_0.gml index 343a851772..2f57804bf1 100644 --- a/objects/obj_creation/Step_0.gml +++ b/objects/obj_creation/Step_0.gml @@ -6,7 +6,7 @@ if (slide==1){ scr_chapter_new(chapter_name); keyboard_string=""; if (chapter_name!="nopw_nopw"){ - custom=0; + custom=eCHAPTER_TYPE.PREMADE; change_slide=1; goto_slide=2; chapter_string=chapter_name; @@ -66,7 +66,7 @@ if (change_slide==35) or (change_slide==36) or (chapter_name=="Doom Benefactors" chapter_name="Unnamed"; chapter_string="Unnamed"; - custom=0; + custom=eCHAPTER_TYPE.PREMADE; founding=ePROGENITOR.NONE; points=0; maxpoints=100; @@ -157,7 +157,7 @@ if (text_bar>60) then text_bar=1; if (cooldown>0) and (cooldown<=5000) then cooldown-=1; // Checks if the name already exists -if (custom==2){ +if (custom==eCHAPTER_TYPE.CUSTOM){ name_bad=0; if (chapter_name=="") then name_bad=1; if (chapter_name=="Dark Angels") then name_bad=1; diff --git a/objects/obj_creation_popup/Create_0.gml b/objects/obj_creation_popup/Create_0.gml index a291ba7fdc..a4d1547c0f 100644 --- a/objects/obj_creation_popup/Create_0.gml +++ b/objects/obj_creation_popup/Create_0.gml @@ -1,14 +1,13 @@ type=0; -target_gear=0; +target_gear=-1; tab=1; badname=0; rows=0; +picker = new ColourPicker(20, 550, 350); +start_colour = -1; tooltip=""; tooltip2=""; - - - diff --git a/objects/obj_creation_popup/Draw_0.gml b/objects/obj_creation_popup/Draw_0.gml index e31182bf57..4631f9f670 100644 --- a/objects/obj_creation_popup/Draw_0.gml +++ b/objects/obj_creation_popup/Draw_0.gml @@ -1,101 +1,88 @@ var equip = false; -tooltip="";tooltip2=""; +var co; +var ide; +tooltip=""; +tooltip2=""; col_shift = (is_string(type)); if (!col_shift){ col_shift=type>0; - var equip = type>20; + equip = type>20; } -if (col_shift){ - draw_set_color(0); - draw_rectangle(430,536,845,748,0); - draw_set_color(38144); - draw_rectangle(430,535,845,748,1); - draw_rectangle(430,536,845,748,1); - draw_rectangle(431,537,846,747,1); - - +if (col_shift){ if (!equip){ draw_set_font(fnt_40k_30b); - if (type=1) then draw_text_transformed(444,550,string_hash_to_newline("Primary Color"),0.6,0.6,0); - if (type=2) then draw_text_transformed(444,550,string_hash_to_newline("Secondary Color"),0.6,0.6,0); - if (type=3) then draw_text_transformed(444,550,string_hash_to_newline("Pauldron 1 Color"),0.6,0.6,0); - if (type=4) then draw_text_transformed(444,550,string_hash_to_newline("Pauldron 2 Color"),0.6,0.6,0); - if (type=5) then draw_text_transformed(444,550,string_hash_to_newline("Trim Color"),0.6,0.6,0); - if (type=6) then draw_text_transformed(444,550,string_hash_to_newline("Lens Color"),0.6,0.6,0); - if (type=7) then draw_text_transformed(444,550,string_hash_to_newline("Weapon Color"),0.6,0.6,0); - if (type="sgt_helm_primary") then draw_text_transformed(444,550,string_hash_to_newline("Sgt Helm"),0.6,0.6,0); - if (type="sgt_helm_secondary") then draw_text_transformed(444,550,string_hash_to_newline("Sgt Helm"),0.6,0.6,0); - rows = 4; - columns = 10; - var column; - var current_color = 0; - var row = 0; - repeat(rows) { - row += 1; - column = 0; - repeat(columns) { - column += 1; - if (current_color < global.colors_count) { - draw_set_color(make_color_rgb(obj_creation.col_r[current_color], obj_creation.col_g[current_color], obj_creation.col_b[current_color])); - var x1, x2, y1, y2; - x1 = 396 + (column * 40); - y1 = 541 + (row * 40); - x2 = 436 + (column * 40); - y2 = 581 + (row * 40); - draw_rectangle(x1, y1, x2, y2, 0); - draw_set_color(38144); - draw_rectangle(x1, y1, x2, y2, 1); - if (scr_hit(x1, y1, x2, y2) = true) { - draw_set_color(c_white); - draw_set_alpha(0.2); - draw_rectangle(x1, y1, x2, y2, 0); - draw_set_alpha(1); - if (scr_click_left()) { - if (type = 1) then obj_creation.main_color = current_color; - if (type = 2) then obj_creation.secondary_color = current_color; - if (type = 3) then obj_creation.left_pauldron = current_color; - if (type = 4) then obj_creation.right_pauldron = current_color; - if (type = 5) then obj_creation.main_trim = current_color; - if (type = 6) then obj_creation.lens_color = current_color; - if (type = 7) then obj_creation.weapon_color = current_color; - if (is_string(type)){ - obj_creation.complex_livery_data[$ role][$ type] = current_color; - } - with(obj_creation) { - shader_reset(); - } - obj_creation.alarm[0] = 1; - instance_destroy(); - } - } - current_color += 1; - } - } + var _colour_type = ""; + switch(type){ + case 1: _colour_type = "Primary Color";break; + case 2: _colour_type = "Secondary Color";break; + case 3: _colour_type = "Pauldron 1 Color";break; + case 4: _colour_type = "Pauldron 2 Color";break; + case 5: _colour_type = "Trim Color Color";break; + case 6: _colour_type = "Lens Color Color";break; + case 7: _colour_type = "Weapon Color Color";break; + case "sgt_helm_primary": _colour_type = "Sgt Helm Primary";break; + case "sgt_helm_secondary": _colour_type = "Sgt Helm Secondary";break; } - - if (point_and_click(draw_unit_buttons([700,550], "CANCEL",[1,1], 38144,, fnt_40k_14b, 1))){ - instance_destroy(); - } + picker.title = _colour_type; + //draw_text_transformed(444,550,_colour_type,0.6,0.6,0); - if (!scr_hit(430,536,845,748) && scr_click_left()) { + var _action = picker.draw(); + if (_action == "destroy"){ instance_destroy(); + exit; + } else { + var _col = picker.chosen + if (start_colour == -1){ + switch(type){ + case 1: start_colour = obj_creation.main_color; break; + case 2: start_colour = obj_creation.secondary_color; break; + case 3: start_colour = obj_creation.left_pauldron; break; + case 4: start_colour = obj_creation.right_pauldron; break; + case 5: start_colour = obj_creation.main_trim; break; + case 6: start_colour = obj_creation.lens_color; break; + case 7: + start_colour = obj_creation.weapon_color; + if (is_string(type)){ + start_colour = obj_creation.complex_livery_data[$ role][$ type]; + } + break; + } + } + if (_col == -1){ + _col = start_colour; + } + if (type = 1){obj_creation.main_color = _col;} + if (type = 2){obj_creation.secondary_color = _col;} + if (type = 3){obj_creation.left_pauldron = _col;} + if (type = 4){obj_creation.right_pauldron = _col;} + if (type = 5){obj_creation.main_trim = _col;} + if (type = 6){obj_creation.lens_color = _col;} + if (type = 7){obj_creation.weapon_color = _col;} + with (obj_creation){ + bulk_selection_buttons_setup(); + } + if (is_string(type)){ + obj_creation.complex_livery_data[$ role][$ type] = _col; + with (obj_creation){ + set_complex_livery_buttons(); + } + } } - draw_set_alpha(1); } - - if (equip) { - var co=100,ide=type-100; + co=100; + ide=type-100; draw_set_font(fnt_40k_30b); - if (obj_creation.role[co,ide]="") or (badname=1) then draw_set_color(c_red); - if (obj_creation.text_selected!="unit_name"+string(ide)) then draw_text_transformed(444,550,string_hash_to_newline(obj_creation.role[co,ide]),0.6,0.6,0); - if (obj_creation.text_selected="unit_name"+string(ide)) and (obj_creation.text_bar>30) then draw_text_transformed(444,550,string_hash_to_newline(string(obj_creation.role[co,ide])),0.6,0.6,0); - if (obj_creation.text_selected="unit_name"+string(ide)) and (obj_creation.text_bar<=30) then draw_text_transformed(444,550,string_hash_to_newline(string(obj_creation.role[co,ide])+"|"),0.6,0.6,0); + if (obj_creation.role[co,ide]=="") or (badname==1){draw_set_color(c_red);} + if (obj_creation.text_selected!="unit_name"+string(ide)) {draw_text_transformed(444,550,string_hash_to_newline(obj_creation.role[co,ide]),0.6,0.6,0);} + if (obj_creation.text_selected=="unit_name"+string(ide)) and (obj_creation.text_bar>30) {draw_text_transformed(444,550,string_hash_to_newline(string(obj_creation.role[co,ide])),0.6,0.6,0);} + if (obj_creation.text_selected=="unit_name"+string(ide)) and (obj_creation.text_bar<=30) {draw_text_transformed(444,550,string_hash_to_newline(string(obj_creation.role[co,ide])+"|"),0.6,0.6,0);} var hei=string_height_ext(string_hash_to_newline(string(obj_creation.role[co,ide])+"Q"),-1,580)*0.6; - if (scr_hit(444,550,820,550+hei)){obj_cursor.image_index=2; + if (scr_hit(444,550,820,550+hei)){ + obj_cursor.image_index=2; tooltip="Astartes Role Name"; tooltip2=$"The name of this Astartes Role. The plural form will be ''{obj_creation.role[co,ide]}s''."; if (scr_click_left()){ @@ -103,9 +90,9 @@ if (col_shift){ keyboard_string=obj_creation.role[co,ide]; } } - if (obj_creation.text_selected="unit_name"+string(ide)) then obj_creation.role[co,ide]=keyboard_string; + if (obj_creation.text_selected="unit_name"+string(ide)) {obj_creation.role[co,ide]=keyboard_string;} draw_rectangle(444-1,550-1,822,550+hei,1); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_font(fnt_40k_14b); draw_set_halign(fa_right); @@ -114,21 +101,21 @@ if (col_shift){ var x5 = 594; var y5 = 597 - spacing; - for (var gg = 1; gg <= 5; gg++) { + for (var slot_count = 0; slot_count <= 4; slot_count++) { y5 += spacing; - var title = $"{get_slot_name(type - 100, gg)}: "; - var geh; - switch (gg) { + var title = $"{get_slot_name(type - 100, slot_count)}: "; + var equipment_slot; + switch (slot_count) { // slots - case 1: geh = obj_creation.wep1[co, ide]; break; - case 2: geh = obj_creation.wep2[co, ide]; break; - case 3: geh = obj_creation.armour[co, ide]; break; - case 4: geh = obj_creation.gear[co, ide]; break; - case 5: geh = obj_creation.mobi[co, ide]; break; + case EquipmentSlot.WEAPON_ONE: equipment_slot = obj_creation.wep1[co, ide]; break; + case EquipmentSlot.WEAPON_TWO: equipment_slot = obj_creation.wep2[co, ide]; break; + case EquipmentSlot.ARMOUR: equipment_slot = obj_creation.armour[co, ide]; break; + case EquipmentSlot.GEAR: equipment_slot = obj_creation.gear[co, ide]; break; + case EquipmentSlot.MOBILITY: equipment_slot = obj_creation.mobi[co, ide]; break; } draw_set_halign(fa_right); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_rectangle(x5, y5, x5 - string_width(string_hash_to_newline(title)), y5 + string_height(string_hash_to_newline(title)) - 2, 1); draw_text(x5, y5, string_hash_to_newline(string(title))); @@ -140,23 +127,17 @@ if (col_shift){ if (scr_click_left()) { var unit_type = type - 100; var is_invalid = ( - unit_type == eROLE.Dreadnought && - ( - // slots - gg == 3 || - gg == 4 || - gg == 5 - ) + unit_type == eROLE.Dreadnought && slot_count > EquipmentSlot.WEAPON_TWO ); if (!is_invalid) { tab=1; - target_gear=gg; + target_gear=slot_count; item_name = []; scr_get_item_names( item_name, unit_type, // eROLE - gg, // slot + slot_count, // slot eENGAGEMENT.Ranged, false, // no company standard false // don't limit to available items @@ -165,18 +146,18 @@ if (col_shift){ } } draw_set_alpha(1); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_halign(fa_left); - draw_text(600, y5, string_hash_to_newline(string(geh))); + draw_text(600, y5, string_hash_to_newline(string(equipment_slot))); } var confirm_gear_button = { alpha: 1, rects: [], } - confirm_gear_button.alpha = target_gear > 0 ? 0.5 : 1; - confirm_gear_button.rects = draw_unit_buttons([614,716], "CONFIRM",[1,1], 38144,, fnt_40k_14b, confirm_gear_button.alpha); - if (point_and_click(confirm_gear_button.rects) and (target_gear = 0)) { + confirm_gear_button.alpha = target_gear > -1 ? 0.5 : 1; + confirm_gear_button.rects = draw_unit_buttons([614,716], "CONFIRM",[1,1], CM_GREEN_COLOR,, fnt_40k_14b, confirm_gear_button.alpha); + if (target_gear == -1 && point_and_click(confirm_gear_button.rects)) { var possible_custom_roles = [ ["chapter_master", eROLE.ChapterMaster], ["honour_guard",eROLE.HonourGuard], @@ -214,6 +195,9 @@ if (col_shift){ } instance_destroy(); + with (obj_creation){ + update_creation_roles_radio(2); + } } draw_set_halign(fa_left); @@ -225,9 +209,8 @@ if (col_shift){ } - - -if (target_gear > 0) { +if (target_gear > -1) { + draw_set_valign(fa_top); tab = 1; item_name = []; scr_get_item_names( @@ -242,14 +225,14 @@ if (target_gear > 0) { draw_set_color(0); draw_rectangle(851, 210, 1168, 749, 0); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_rectangle(844, 200, 1166, 748, 1); draw_rectangle(845, 201, 1165, 747, 1); draw_rectangle(846, 202, 1164, 746, 1); draw_set_font(fnt_40k_30b); var slot_name = get_slot_name(type - 100, target_gear); - draw_text_transformed(862, 215, string_hash_to_newline($"Select {slot_name}"), 0.6, 0.6, 0); + draw_text_transformed(862, 215, $"Select {slot_name}", 0.6, 0.6, 0); draw_set_font(fnt_40k_14b); var x3 = 862; @@ -257,10 +240,10 @@ if (target_gear > 0) { var space = 18; for (var h = 0; h < array_length(item_name); h++) { - draw_set_color(38144); - var scale = string_width(string_hash_to_newline(item_name[h])) >= 140 ? 0.75 : 1; - draw_text_transformed(x3, y3, string_hash_to_newline(item_name[h]), scale, 1, 0); - y3 += space; + draw_set_color(CM_GREEN_COLOR); + var scale = string_width(item_name[h]) >= 140 ? 0.75 : 1; + draw_text_transformed(x3, y3, item_name[h], scale, 1, 0); + y3 += space if (scr_hit(x3, y3 - space, x3 + 143, y3 + 17 - space)) { draw_set_color(c_white); @@ -271,18 +254,18 @@ if (target_gear > 0) { if (scr_click_left()) { var buh = item_name[h] == ITEM_NAME_NONE ? "" : item_name[h]; switch (target_gear) { - case 1: obj_creation.wep1[co, ide] = buh; break; - case 2: obj_creation.wep2[co, ide] = buh; break; - case 3: obj_creation.armour[co, ide] = buh; break; - case 4: obj_creation.gear[co, ide] = buh; break; - case 5: obj_creation.mobi[co, ide] = buh; break; + case 0: obj_creation.wep1[co, ide] = buh; break; + case 1: obj_creation.wep2[co, ide] = buh; break; + case 2: obj_creation.armour[co, ide] = buh; break; + case 3: obj_creation.gear[co, ide] = buh; break; + case 4: obj_creation.mobi[co, ide] = buh; break; } target_gear = 0; } } } - if (target_gear == 1 || target_gear == 2) { + if (target_gear == EquipmentSlot.WEAPON_ONE || target_gear == EquipmentSlot.WEAPON_TWO) { tab = 2; item_name = []; scr_get_item_names( @@ -298,55 +281,39 @@ if (target_gear > 0) { y3 = 245; for (var h = 0; h < array_length(item_name); h++) { - draw_set_color(38144); - var scale = string_width(string_hash_to_newline(item_name[h])) >= 140 ? 0.75 : 1; - draw_text_transformed(x3, y3, string_hash_to_newline(item_name[h]), scale, 1, 0); + draw_set_color(CM_GREEN_COLOR); + var scale = string_width(item_name[h]) >= 140 ? 0.75 : 1; + var _button = draw_unit_buttons([x3, y3], item_name[h], [scale,scale], CM_GREEN_COLOR); y3 += space; - if (scr_hit(x3, y3 - space, x3 + 143, y3 + 17 - space)) { - draw_set_color(c_white); - draw_set_alpha(0.2); - draw_text_transformed(x3, y3 - space, string_hash_to_newline(item_name[h]), scale, 1, 0); - draw_set_alpha(1); + if (point_and_click(_button)) { - if (scr_click_left()) { - var buh = item_name[h] == ITEM_NAME_NONE ? "" : item_name[h]; - switch (target_gear) { - case 1: obj_creation.wep1[co, ide] = buh; break; - case 2: obj_creation.wep2[co, ide] = buh; break; - case 3: obj_creation.armour[co, ide] = buh; break; - case 4: obj_creation.gear[co, ide] = buh; break; - case 5: obj_creation.mobi[co, ide] = buh; break; - } - target_gear = 0; + var buh = item_name[h] == ITEM_NAME_NONE ? "" : item_name[h]; + switch (target_gear) { + case 0: obj_creation.wep1[co, ide] = buh; break; + case 1: obj_creation.wep2[co, ide] = buh; break; + case 2: obj_creation.armour[co, ide] = buh; break; + case 3: obj_creation.gear[co, ide] = buh; break; + case 4: obj_creation.mobi[co, ide] = buh; break; } + target_gear = -1; } } - tab = 1; } - - if (point_and_click(draw_unit_buttons([980,716], "CANCEL",[1,1], 38144,, fnt_40k_14b, 1))){ - target_gear=0; + if (point_and_click(draw_unit_buttons([980,716], "CANCEL",[1,1], CM_GREEN_COLOR,, fnt_40k_14b, 1))){ + target_gear=-1; } } - - - - - if (tooltip!="") and (obj_creation.change_slide<=0){ draw_set_alpha(1); draw_set_font(fnt_40k_14);draw_set_halign(fa_left);draw_set_color(0); draw_rectangle(mouse_x+18,mouse_y+20,mouse_x+string_width_ext(string_hash_to_newline(tooltip2),-1,500)+24,mouse_y+44+string_height_ext(string_hash_to_newline(tooltip2),-1,500),0); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_rectangle(mouse_x+18,mouse_y+20,mouse_x+string_width_ext(string_hash_to_newline(tooltip2),-1,500)+24,mouse_y+44+string_height_ext(string_hash_to_newline(tooltip2),-1,500),1); draw_set_font(fnt_40k_14b);draw_text(mouse_x+22,mouse_y+22,string_hash_to_newline(string(tooltip))); draw_set_font(fnt_40k_14);draw_text_ext(mouse_x+22,mouse_y+42,string_hash_to_newline(string(tooltip2)),-1,500); } - -/* */ -/* */ diff --git a/objects/obj_crusade/Alarm_0.gml b/objects/obj_crusade/Alarm_0.gml index 0d47095150..3c279c6dab 100644 --- a/objects/obj_crusade/Alarm_0.gml +++ b/objects/obj_crusade/Alarm_0.gml @@ -7,7 +7,7 @@ if (duration=0){ if (owner=ns.owner) and (action="") and (home_x+home_y!=0) and (point_distance(x,y,ns.x,ns.y)<=ns.radius){ action_x=home_x; action_y=home_y; - alarm[4]=1; + set_fleet_movement(); } } if (instance_exists(obj_turn_end)){ diff --git a/objects/obj_crusade/Draw_0.gml b/objects/obj_crusade/Draw_0.gml index 6f91647514..405f3fef4b 100644 --- a/objects/obj_crusade/Draw_0.gml +++ b/objects/obj_crusade/Draw_0.gml @@ -1,6 +1,6 @@ if (show=true){ - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_alpha(0.5); draw_circle(x,y,radius,0); draw_set_alpha(0.5); @@ -8,7 +8,7 @@ if (show=true){ draw_circle(x,y,350,1); draw_circle(x,y,350.5,1); draw_set_alpha(1); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); if (obj_controller.zoomed=1){ diff --git a/objects/obj_crusade/Mouse_50.gml b/objects/obj_crusade/Mouse_50.gml index 9e9f6f846e..d6118ee7f0 100644 --- a/objects/obj_crusade/Mouse_50.gml +++ b/objects/obj_crusade/Mouse_50.gml @@ -12,7 +12,11 @@ if (placing=true) and (cooldown<=0){ if (instance_exists(obj_turn_end)){ if (obj_turn_end.audience>0){ with(obj_turn_end){ - cooldown=8;diplomacy=0;alarm[1]=1;audience=0;force_goodbye=0; + cooldown=8; + diplomacy=0; + alarm[1]=1; + audience=0; + force_goodbye=0; } } } diff --git a/objects/obj_drop_select/Create_0.gml b/objects/obj_drop_select/Create_0.gml index 617d106047..4668c55940 100644 --- a/objects/obj_drop_select/Create_0.gml +++ b/objects/obj_drop_select/Create_0.gml @@ -1,6 +1,8 @@ if !(variable_instance_exists(self, "attack")){ attack = 0; } +set_zoom_to_default(); //bandaid the purge screen flying off screen if zoomed out + once_only=0; raid_tact=1; diff --git a/objects/obj_drop_select/Mouse_56.gml b/objects/obj_drop_select/Mouse_56.gml index 2df23b6ffd..767d605be9 100644 --- a/objects/obj_drop_select/Mouse_56.gml +++ b/objects/obj_drop_select/Mouse_56.gml @@ -4,160 +4,160 @@ if __b__ { exit; - -var xx, yy; -xx=__view_get( e__VW.XView, 0 ); -yy=__view_get( e__VW.YView, 0 ); - - - -var i;i=-1;ships_selected=0; -repeat(31){ - i+=1; - if (ship_all[i]!=0) and (ship[i]!=""){ - ships_selected+=1; - } -} -if (ship_all[500]!=0) then ships_selected+=1; - - - - -var i, fy, why, onceh, loca, add_ground;i=0;why=0;onceh=0;loca=0;add_ground=0; - -if (l_size>0) then loca=1; - -if (obj_controller.cooldown<=0){fy=1; - if (fy=1) and (scr_hit(xx+47,yy+107+why,xx+161,yy+122+why)=true){// Leftest - if (loca=1) and (l_size>0){onceh=0;// Case 1: it is first slot, local - if (onceh=0) and (ship_all[500]=0){onceh=1;obj_controller.cooldown=8000;ship_all[500]=1;add_ground=1;} - if (onceh=0) and (ship_all[500]=1){onceh=1;obj_controller.cooldown=8000;ship_all[500]=0;add_ground=-1;} - } - } -} - -if (loca=1){fy+=1;if (fy=5) then fy=1;}i=0; - -if (obj_controller.cooldown<=0){ - repeat(24-loca){i+=1; - if (fy=1) and (scr_hit(xx+47,yy+107+why,xx+161,yy+122+why)=true){// Leftest - if (ship[i]!=""){// Case 3: it is a later slot, ship - if (onceh=0) and (ship_all[i]=0){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],true,i,attack);} - if (onceh=0) and (ship_all[i]=1){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],false,i,attack);} - } - } - if (fy=2) and (scr_hit(xx+164,yy+107+why,xx+278,yy+122+why)=true){// 2nd - if (ship[i]!=""){ - if (onceh=0) and (ship_all[i]=0){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],true,i,attack);} - if (onceh=0) and (ship_all[i]=1){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],false,i,attack);} - } - } - if (fy=3) and (scr_hit(xx+281,yy+107+why,xx+395,yy+122+why)=true){// 3rd - if (ship[i]!=""){ - if (onceh=0) and (ship_all[i]=0){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],true,i,attack);} - if (onceh=0) and (ship_all[i]=1){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],false,i,attack);} - } - } - if (fy=4) and (scr_hit(xx+398,yy+107+why,xx+512,yy+122+why)=true){// 4th - if (ship[i]!=""){ - if (onceh=0) and (ship_all[i]=0){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],true,i,attack);} - if (onceh=0) and (ship_all[i]=1){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],false,i,attack);} - } - } - fy+=1;if (fy=5){fy=1;why+=18;} - } -} - - - - -if (obj_controller.cooldown <= 0) { - if (mouse_x >= xx + 456) && (mouse_y >= yy + 378) && (mouse_x < xx + 519) && (mouse_y < yy + 403) { - instance_destroy(); - obj_controller.cooldown = 8000; - } - - if (mouse_x >= xx + 76) && (mouse_y >= yy + 82) && (mouse_x < xx + 102) && (mouse_y < yy + 95) { - var onceh; - once = 0; - i = 0; - if (all_sel = 0) && (onceh = 0) { - var ships_len = array_length(ship); - for (var i = 0; i < ships_len; i++) { - if (ship[i] != "") && (ship_all[i] = 0) { - ship_all[i] = 1; - scr_drop_fiddle(ship_ide[i], true, i, attack); - } - } - if (ship_all[500] = 0) && (l_size > 0) { - ship_all[500] = 1; - add_ground = 1; - } - onceh = 1; - all_sel = 1; - } - if (all_sel = 1) && (onceh = 0) { - var ships_len = array_length(ship); - for (var i = 0; i < ships_len; i++) { - if (ship[i] != "") && (ship_all[i] = 1) { - ship_all[i] = 0; - scr_drop_fiddle(ship_ide[i], false, i, attack); - } - } - if (ship_all[500] = 1) && (l_size > 0) { - ship_all[500] = 0; - add_ground = -1; - } - onceh = 1; - all_sel = 0; - } - } -} - -if (add_ground = 1) { - ships_selected += 1; - master += local_forces.master; - honor += local_forces.honor; - capts += local_forces.captains; - mahreens += l_mahreens; - veterans += l_veterans; - terminators += l_terminators; - dreads += l_dreads; - chaplains += l_chaplains; - psykers += l_psykers; - apothecaries += l_apothecaries; - techmarines += l_techmarines; - champions += l_champions; - - bikes += l_bikes; - rhinos += l_rhinos; - whirls += l_whirls; - predators += l_predators; - raiders += l_raiders; - speeders += l_speeders; -} -if (add_ground = -1) { - ships_selected -= 1; - master -= local_forces.master; - honor -= local_forces.honor; - capts -= local_forces.captains; - mahreens -= l_mahreens; - veterans -= l_veterans; - terminators -= l_terminators; - dreads -= l_dreads; - chaplains -= l_chaplains; - psykers -= l_psykers; - apothecaries -= l_apothecaries; - techmarines -= l_techmarines; - champions -= l_champions; - - bikes -= l_bikes; - rhinos -= l_rhinos; - whirls -= l_whirls; - predators -= l_predators; - raiders -= l_raiders; - speeders -= l_speeders; -} - +// TODO Check if code is still used or not +//var xx, yy; +//xx=__view_get( e__VW.XView, 0 ); +//yy=__view_get( e__VW.YView, 0 ); + + + +//var i;i=-1;ships_selected=0; +//repeat(31){ +// i+=1; +// if (ship_all[i]!=0) and (ship[i]!=""){ +// ships_selected+=1; +// } +//} +//if (ship_all[500]!=0) then ships_selected+=1; + + + + +//var i, fy, why, onceh, loca, add_ground;i=0;why=0;onceh=0;loca=0;add_ground=0; + +//if (l_size>0) then loca=1; + +//if (obj_controller.cooldown<=0){fy=1; +// if (fy=1) and (scr_hit(xx+47,yy+107+why,xx+161,yy+122+why)=true){// Leftest +// if (loca=1) and (l_size>0){onceh=0;// Case 1: it is first slot, local +// if (onceh=0) and (ship_all[500]=0){onceh=1;obj_controller.cooldown=8000;ship_all[500]=1;add_ground=1;} +// if (onceh=0) and (ship_all[500]=1){onceh=1;obj_controller.cooldown=8000;ship_all[500]=0;add_ground=-1;} +// } +// } +//} + +//if (loca=1){fy+=1;if (fy=5) then fy=1;}i=0; + +//if (obj_controller.cooldown<=0){ +// repeat(24-loca){i+=1; +// if (fy=1) and (scr_hit(xx+47,yy+107+why,xx+161,yy+122+why)=true){// Leftest +// if (ship[i]!=""){// Case 3: it is a later slot, ship +// if (onceh=0) and (ship_all[i]=0){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],true,i,attack);} +// if (onceh=0) and (ship_all[i]=1){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],false,i,attack);} +// } +// } +// if (fy=2) and (scr_hit(xx+164,yy+107+why,xx+278,yy+122+why)=true){// 2nd +// if (ship[i]!=""){ +// if (onceh=0) and (ship_all[i]=0){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],true,i,attack);} +// if (onceh=0) and (ship_all[i]=1){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],false,i,attack);} +// } +// } +// if (fy=3) and (scr_hit(xx+281,yy+107+why,xx+395,yy+122+why)=true){// 3rd +// if (ship[i]!=""){ +// if (onceh=0) and (ship_all[i]=0){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],true,i,attack);} +// if (onceh=0) and (ship_all[i]=1){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],false,i,attack);} +// } +// } +// if (fy=4) and (scr_hit(xx+398,yy+107+why,xx+512,yy+122+why)=true){// 4th +// if (ship[i]!=""){ +// if (onceh=0) and (ship_all[i]=0){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],true,i,attack);} +// if (onceh=0) and (ship_all[i]=1){onceh=1;obj_controller.cooldown=8000;scr_drop_fiddle(ship_ide[i],false,i,attack);} +// } +// } +// fy+=1;if (fy=5){fy=1;why+=18;} +// } +//} + + + + +//if (obj_controller.cooldown <= 0) { +// if (mouse_x >= xx + 456) && (mouse_y >= yy + 378) && (mouse_x < xx + 519) && (mouse_y < yy + 403) { +// instance_destroy(); +// obj_controller.cooldown = 8000; +// } + +// if (mouse_x >= xx + 76) && (mouse_y >= yy + 82) && (mouse_x < xx + 102) && (mouse_y < yy + 95) { +// var onceh; +// once = 0; +// i = 0; +// if (all_sel = 0) && (onceh = 0) { +// var ships_len = array_length(ship); +// for (var i = 0; i < ships_len; i++) { +// if (ship[i] != "") && (ship_all[i] = 0) { +// ship_all[i] = 1; +// scr_drop_fiddle(ship_ide[i], true, i, attack); +// } +// } +// if (ship_all[500] = 0) && (l_size > 0) { +// ship_all[500] = 1; +// add_ground = 1; +// } +// onceh = 1; +// all_sel = 1; +// } +// if (all_sel = 1) && (onceh = 0) { +// var ships_len = array_length(ship); +// for (var i = 0; i < ships_len; i++) { +// if (ship[i] != "") && (ship_all[i] = 1) { +// ship_all[i] = 0; +// scr_drop_fiddle(ship_ide[i], false, i, attack); +// } +// } +// if (ship_all[500] = 1) && (l_size > 0) { +// ship_all[500] = 0; +// add_ground = -1; +// } +// onceh = 1; +// all_sel = 0; +// } +// } +//} + +//if (add_ground = 1) { +// ships_selected += 1; +// master += local_forces.master; +// honor += local_forces.honor; +// capts += local_forces.captains; +// mahreens += l_mahreens; +// veterans += l_veterans; +// terminators += l_terminators; +// dreads += l_dreads; +// chaplains += l_chaplains; +// psykers += l_psykers; +// apothecaries += l_apothecaries; +// techmarines += l_techmarines; +// champions += l_champions; + +// bikes += l_bikes; +// rhinos += l_rhinos; +// whirls += l_whirls; +// predators += l_predators; +// raiders += l_raiders; +// speeders += l_speeders; +//} +//if (add_ground = -1) { +// ships_selected -= 1; +// master -= local_forces.master; +// honor -= local_forces.honor; +// capts -= local_forces.captains; +// mahreens -= l_mahreens; +// veterans -= l_veterans; +// terminators -= l_terminators; +// dreads -= l_dreads; +// chaplains -= l_chaplains; +// psykers -= l_psykers; +// apothecaries -= l_apothecaries; +// techmarines -= l_techmarines; +// champions -= l_champions; + +// bikes -= l_bikes; +// rhinos -= l_rhinos; +// whirls -= l_whirls; +// predators -= l_predators; +// raiders -= l_raiders; +// speeders -= l_speeders; +//} +// END OF CODE REVIEWING } diff --git a/objects/obj_dropdown_sel/Draw_0.gml b/objects/obj_dropdown_sel/Draw_0.gml index c6de74a804..9ca101db53 100644 --- a/objects/obj_dropdown_sel/Draw_0.gml +++ b/objects/obj_dropdown_sel/Draw_0.gml @@ -29,7 +29,7 @@ if (scr_hit(x,y,x+width,y+height)=true) and (obj_controller.dropdown_open=0){ tooltip=option[option_selected]; if (target="event_display") and (option[option_selected]!="None"){ tooltip=option[option_selected]; - tooltip2=obj_ini.artifact_struct[option_id[option_selected]].description(); + tooltip2=fetch_artifact(option_id[option_selected]).description(); } if (target="event_display") and (option[option_selected]="None"){ tooltip="Display"; @@ -63,7 +63,9 @@ if (opened=1){ draw_rectangle(x,y5,x+width,y5+hi,0); tooltip=option[ii]; - if (target="event_display") and (option[ii]!="None"){tooltip=option[ii];tooltip2=obj_ini.artifact_struct[option_id[ii]].description();} + if (target="event_display") and (option[ii]!="None"){ + tooltip=option[ii]; + tooltip2=fetch_artifact(option_id[ii]).description();} if (target="event_display") and (option[ii]="None"){tooltip="Display";tooltip2="There is no Artifact set to be displayed at the event.";} if (scr_click_left()){ diff --git a/objects/obj_dropdown_sel/Step_0.gml b/objects/obj_dropdown_sel/Step_0.gml index 96569f16d9..63bfafdc4e 100644 --- a/objects/obj_dropdown_sel/Step_0.gml +++ b/objects/obj_dropdown_sel/Step_0.gml @@ -101,20 +101,21 @@ if (target="event_loc") and (determined_planets=0){ coo+=1;ide=0; repeat(300){ide+=1; - if (obj_ini.role[coo][ide]!=obj_ini.role[100][6]) and (obj_ini.role[coo][ide]!="Venerable "+string(obj_ini.role[100][6])) and (obj_ini.TTRPG[coo][ide].planet_location>0){ + var _unit = fetch_unit([coo, ide]); + if (_unit.role()!=obj_ini.role[100][6]) and (_unit.role()!="Venerable "+string(obj_ini.role[100][6])) and (_unit.planet_location>0){ var stahp,first_open;stahp=0;q=0;first_open=0; repeat(100){ if (stahp=0){q+=1; if (star[q]="") and (first_open=0) then first_open=q; - if (star[q]=obj_ini.loc[coo][ide]) and (star_planet[q]=obj_ini.TTRPG[coo][ide].planet_location){ + if (star[q]=_unit.location_string && star_planet[q]=_unit.planet_location){ stahp=1;star_mahreens[q]+=1; } } } if (stahp=0){ - star[first_open]=obj_ini.loc[coo][ide]; - star_planet[first_open]=obj_ini.TTRPG[coo][ide].planet_location; + star[first_open]=_unit.location_string; + star_planet[first_open]=_unit.planet_location; star_marheens[first_open]=1; } } diff --git a/objects/obj_en_fleet/Alarm_1.gml b/objects/obj_en_fleet/Alarm_1.gml index 3816de9b42..93ce5b0489 100644 --- a/objects/obj_en_fleet/Alarm_1.gml +++ b/objects/obj_en_fleet/Alarm_1.gml @@ -3,7 +3,9 @@ try_and_report_loop("enemy fleet main end turn action",function(){ var orb=orbiting; -if (round(owner)!=eFACTION.Imperium) and (navy=1) then owner= noone; +if (round(owner)!=eFACTION.Imperium) and (navy=1){ + owner= noone; +} //TODO centralise orbiting logic var _is_orbiting = is_orbiting(); @@ -15,13 +17,13 @@ if (orbiting != 0 && action=="" && owner!=noone){ orbiting.present_fleet[owner]+=1; } } - if (!orbiting_found) { + else if (!orbiting_found) { orbiting = instance_nearest(x,y,obj_star); orbiting.present_fleet[owner]++; } } - -if ((trade_goods="Khorne_warband") or (trade_goods="Khorne_warband_landing_force")) and (owner=eFACTION.Chaos) { +var _khorne_cargo = fleet_has_cargo("warband"); +if (_khorne_cargo && owner=eFACTION.Chaos) { khorne_fleet_cargo(); } @@ -40,475 +42,20 @@ if (_is_orbiting) { handle_exception(_exception); } } +} else { + turns_static = 0; } -if (navy && action=="") { - if trade_goods != "player_hold" { - - - if (trade_goods="") and (_is_orbiting){ - if (orbiting.present_fleet[20]>0) then exit; - } - - - // Check if the ground battle is victorious or not - if (obj_controller.faction_status[eFACTION.Imperium]="War") and (trade_goods="invading_player") and (guardsmen_unloaded=1) { - if (_is_orbiting) { - - //slightly more verbose than the last way, but reduces reliance on fixed array sizes - var tar = array_reduce(orbiting.p_guardsmen, function(prev, curr, idx) { - return curr > 0 ? idx : prev; - },0) - - if (tar == 0) {// Guard all dead - trade_goods="recr"; - action=""; - } else { //this was always a dead path previously since tar could never be bigger than i, now it will - var _targ = new PlanetData(tar, orbiting); - if (orbiting.p_owner[tar]=eFACTION.Player) and (orbiting.p_player[tar]=0) and (planet_feature_bool(orbiting.p_feature[tar],P_features.Monastery)==0){ - _targ.return_to_first_owner(); - _targ.add_disposition(-50); - trade_goods=""; - action=""; - } - } - } - } - - // Invade the player homeworld as needed - navy_attack_player_world(); - // Bombard the shit out of the player homeworld - if (obj_controller.faction_status[eFACTION.Imperium]="War") and (trade_goods="") and (!guardsmen_unloaded) and (_is_orbiting){ - var bombard=false; - if (orbiting!=noone){ - if (orbiting.object_index==obj_star) then bombard=true; - } - if (bombard){ - var orbiting_guardsmen = array_sum(orbiting.p_guardsmen); - var player_forces = array_sum(orbiting.p_player); - - if (orbiting_guardsmen == 0) or (player_forces > 0) { - - //cleaned this up so it is easier to read, even though it reads more verbosely - var hostile_fleet_count = 0; - with(orbiting) { - hostile_fleet_count += present_fleet[eFACTION.Player] - + present_fleet[eFACTION.Eldar] - + present_fleet[eFACTION.Ork] - + present_fleet[eFACTION.Tau] - + present_fleet[eFACTION.Tyranids] - + present_fleet[eFACTION.Chaos] - + present_fleet[eFACTION.Necrons] - } - if (hostile_fleet_count == 0){ - - var bombard=0,deaths=0,hurss=0,onceh=0,wob=0,kill=0; - - for (var o=1;o<=orbiting.planets;o++){ - if (orbiting.p_owner[o]==eFACTION.Player){ - if (orbiting.p_population[o]+orbiting.p_pdf[o]>0) || (orbiting.p_player[o]>0){ - bombard=o; - break; - } - } - } - - if (bombard){ - var _orbiting_data = new PlanetData(bombard, orbiting); - scare=(capital_number*3)+frigate_number; - - if (scare>2) then scare=2; - if (scare<1) then scare=0; - //onceh=2; - - if (orbiting.p_large[bombard]) { - kill=scare*0.15; // Population if large - } else { - kill=scare*15000000; // pop if small - } - - var bombard_name = _orbiting_data.name(); - var bombard_report_string=$"Imperial Battlefleet bombards {bombard_name}."; - var PDF_loses=min(orbiting.p_pdf[bombard],(scare*15000000)/2); - - var civil_loss_mod = orbiting.p_large[bombard]?scare*0.15:scare*15000000; - - var civilian_losses=min(orbiting.p_population[bombard],civil_loss_mod) - - - if (civilian_losses>0) and (orbiting.p_large[bombard]=0) then { - bombard_report_string+=$" {civilian_losses} civilian casualties"; - } - if (civilian_losses>0) and (orbiting.p_large[bombard]=1) { - if (civilian_losses>=1) then bombard_report_string+=$" {civilian_losses} billion civilian casualties"; - if (civilian_losses<1) then bombard_report_string+=$" {floor(civilian_losses*1000)} million civilian casualties"; - } - if (PDF_loses>0) then bombard_report_string+=$" and {scr_display_number(PDF_loses)} PDF lost."; - if (PDF_loses<=0) and (civilian_losses>0) then bombard_report_string+="."; - if (civilian_losses=0) and (PDF_loses>0) then bombard_report_string+=" {PDF_loses} PDF lost."; - - if (bombard_report_string!="") { - scr_alert("red","owner",bombard_report_string,orbiting.x,orbiting.y); - scr_event_log("red",bombard_report_string, orbiting.name); - bombard_report_string=string_replace(bombard_report_string,",.",","); - } - - orbiting.p_pdf[bombard]-=(scare*15000000)/2; - if (orbiting.p_pdf[bombard]<0) then orbiting.p_pdf[bombard]=0; - - - orbiting.p_population[bombard]-=kill; - if (orbiting.p_population[bombard]<0) then orbiting.p_population[bombard]=0; - if (orbiting.p_pdf[bombard]<0) then orbiting.p_pdf[bombard]=0; - - if (orbiting.p_population[bombard]+orbiting.p_pdf[bombard]<=0) and (orbiting.p_owner[bombard]=eFACTION.Player){ - if (planet_feature_bool(orbiting.p_feature[bombard], P_features.Monastery)==0) { - _orbiting_data.return_to_first_owner(); - _orbiting_data.add_disposition(-50) - } else { - trade_goods="invade_player"; - } - } - exit; - } - } - } - } - } - - - if (obj_controller.faction_status[eFACTION.Imperium]="War") and (action="") and (trade_goods="") and (guardsmen_unloaded=0) { - var hold = false; - if (_is_orbiting){ - var player_owns_planet = scr_get_planet_with_owner(orbiting, eFACTION.Player); - hold = player_owns_planet or (orbiting.present_fleet[eFACTION.Player] > 0) - } - - if (hold){ - // Chase player fleets - var chase_fleet = get_nearest_player_fleet(x,y, false, true); - if (chase_fleet!="none"){ - var thatp,my_dis; - etah=chase_fleet.eta; - - var intercept = fleet_intercept_time_calculate(chase_fleet); - if (intercept){ - - if (intercept<=etah) { - target = chase_fleet.id; - chase_fleet_target_set(); - trade_goods="player_hold"; - exit; - } - } - with(obj_temp8){instance_destroy();} - } - // End chase - - - // Go after home planet or fleet? - - - if (trade_goods="") and (action="") { - var homeworld_distance,homeworld_nearby,fleet_nearby,fleet_distance,planet_nearby; - homeworld_distance=9999;fleet_distance=9999;fleet_nearby=0;homeworld_nearby=0;planet_nearby=0; - - with(obj_p_fleet){ - if (action="") then instance_create(x,y,obj_temp7); - } - with(obj_star) { - if array_contains(p_owner, eFACTION.Player) - instance_create(x,y,obj_temp8); - } - - if (instance_exists(obj_temp7)) { - fleet_nearby=instance_nearest(x,y,obj_temp7); - fleet_distance=point_distance(x,y,fleet_nearby.x,fleet_nearby.y); - } - if (instance_exists(obj_temp8)) {homeworld_nearby=instance_nearest(x,y,obj_temp8); - homeworld_distance=point_distance(x,y,homeworld_nearby.x,homeworld_nearby.y)-30; - } - - if (homeworld_distance40) {// Go towards planet - action_x=homeworld_nearby.x; - action_y=homeworld_nearby.y; - alarm[4]=1;// show_message("B"); - with(obj_temp7){instance_destroy();} - with(obj_temp8){instance_destroy();} - exit; - } - - - - if (fleet_distance40) and (instance_exists(obj_temp7)) {// Go towards that fleet - planet_nearby=instance_nearest(fleet_nearby.x,fleet_nearby.y,obj_star); - - if (instance_exists(planet_nearby)) and (_is_orbiting){ - if (fleet_distance<=500) and (planet_nearby!=orbiting){// Case 1; really close, wait for them to make the move - with(obj_temp7){instance_destroy();} - with(obj_temp8){instance_destroy();} - exit; - } - if (fleet_distance>500) {// Case 2; kind of far away, move closer - var diss=fleet_distance/2; - var goto=0; - var dirr=point_direction(x,y,fleet_nearby.x,fleet_nearby.y); - - with(orbiting){y-=20000;} - goto=instance_nearest(x+lengthdir_x(diss,dirr),y+lengthdir_x(diss,dirr),obj_star); - with(orbiting){y+=20000;} - if (goto.present_fleet[eFACTION.Player]=0) { - action_x=goto.x; - action_y=goto.y; - alarm[4]=1; - } - - with(obj_temp7){instance_destroy();} - with(obj_temp8){instance_destroy();} - exit; - } - } - - } - } - - with(obj_temp7){instance_destroy();} - with(obj_temp8){instance_destroy();} - - /*var homeworld_distance,homeworld_nearby,fleet_nearby,fleet_distance; - homeworld_distance=9999;fleet_distance=9999;fleet_nearby=0;homeworld_nearby=0; - - with(obj_p_fleet){if (action!="") then y-=20000;}// Disable non-stationary player fleets - if (instance_exists(obj_p_fleet)){fleet_nearby=instance_nearest(x,y,obj_p_fleet);fleet_distance=point_distance(x,y,fleet_nearby.x,fleet_nearby.y);}// Get closest player fleet - with(obj_star){if (owner = eFACTION.Player) then instance_create(x,y,obj_temp7);}// Create temp7 at player stars - if (instance_exists(obj_temp7)){homeworld_nearby=instance_nearest(x,y,obj_temp7);homeworld_distance=point_distance(x,y,homeworld_nearby.x,homeworld_nearby.y);}// Get closest star - with(obj_p_fleet){if (y<-10000) then y+=20000;}// Enable non-stationary player fleets - - if (homeworld_distance<=fleet_distance) and (homeworld_distance<7000) and (instance_exists(homeworld_nearby)){// Go towards planet - action_x=homeworld_nearby.x;action_y=homeworld_nearby.y;alarm[4]=1;exit; - } - - - */ - - } - } - - //Eldar shit I think? Doesn't check for eldar ships - if (!new_navy_ships_forge()){ - exit; - } - if (trade_goods=="building_ships") then exit; - - - //OK this calculates how many imperial guard the ships have and can have at a max - guardsmen_ratio = fleet_remaining_guard_ratio(); - with(obj_temp_inq){instance_destroy();} - - - - if (action="") and (_is_orbiting) and (guardsmen_unloaded=1){// Move from one planet to another - var o=0,that=0,highest=0,cr=0; - o=0;that=0;highest=0;cr=0; - - repeat(orbiting.planets){o+=1; - if (orbiting.p_guardsmen[o]>0) then cr=o; - if (orbiting.p_orks[o]+orbiting.p_chaos[o]+orbiting.p_tyranids[o]+orbiting.p_necrons[o]+orbiting.p_tau[o]+orbiting.p_traitors[o]>highest) and (orbiting.p_type[o]!="Daemon"){ - that=o; - highest=orbiting.p_orks[o]+orbiting.p_chaos[o]+orbiting.p_tyranids[o]+orbiting.p_necrons[o]+orbiting.p_tau[o]+orbiting.p_traitors[o]; - } - } - - - // Move on, man - if (orbiting.p_orks[cr]+orbiting.p_chaos[cr]+orbiting.p_tyranids[cr]+orbiting.p_necrons[cr]+orbiting.p_tau[cr]+orbiting.p_traitors[cr]=0){ - var player_war=false; - if ((orbiting.p_player[cr]>0) and (obj_controller.faction_status[eFACTION.Imperium]=="War")) then player_war=true; - - if (cr>0) and (that>0) and (!player_war){// Jump to next planet - orbiting.p_guardsmen[that]=orbiting.p_guardsmen[cr]; - orbiting.p_guardsmen[that]=0; - exit; - } - - if (cr>0) and (that=0) and (!player_war){// Get back onboard - var new_capacity; - var maxi = fleet_max_guard(); - new_capacity=orbiting.p_guardsmen[1]+orbiting.p_guardsmen[2]+orbiting.p_guardsmen[3]+orbiting.p_guardsmen[4]/maxi; - - for (var i=0;i=i) then capital_imp[i]=floor(capital_max_imp[i]*new_capacity); - if (frigate_number>=i) then frigate_imp[i]=floor(frigate_max_imp[i]*new_capacity); - if (escort_number>=i) then escort_imp[i]=floor(escort_max_imp[i]*new_capacity); - } - orbiting.p_guardsmen = array_create(5,0); - - trade_goods=""; - guardsmen_unloaded=0;exit; - } - } - } - - - if (navy_strength_calc()<=14) and (guardsmen_unloaded=0){ - dock_navy_at_forge(); - - send_navy_to_forge(); - } - // Bombard the shit out of things when able - else if (trade_goods=="") and (_is_orbiting) and (action=""){ - imperial_navy_bombard(); - } - - - // If the guardsmen all die then move on - var o=0; - if (guardsmen_unloaded=1) and (_is_orbiting){ - var o=0,guardsmen_alive=1; - repeat(orbiting.planets){ - o+=1; - if (orbiting.p_guardsmen[o]>0){ - guardsmen_alive=false; - break; - } - } - if (guardsmen_alive=1){ - guardsmen_unloaded=0; - guardsmen_ratio=0; - trade_goods=""; - } - } - - // Go to recruiting grounds - if ((guardsmen_unloaded=0) and (guardsmen_ratio<0.5) and ((trade_goods=""))) or (trade_goods="recr"){// determine what sort of planet is needed - var maxi = fleet_max_guard(); - var curr = fleet_guard_current(); - var guard_wanted=maxi-curr,planet_needed=0; - if (guard_wanted<=50000) then planet_needed=1;// Pretty much any - if (guard_wanted>50000) then planet_needed=2;// Feudal and up - if (guard_wanted>200000) then planet_needed=3;// Temperate and up - if (guard_wanted>2000000) then planet_needed=4;// Hive - obj_controller.temp[200]=guard_wanted;trade_goods=""; - - if (planet_needed=1) or (planet_needed=2){ - var good - with(obj_star){ - if (scr_is_star_owned_by_allies(self)) { - good=0;o=0; - repeat(planets){o+=1; - if (scr_is_planet_owned_by_allies(self, o)) and (p_type[o]!="Dead") and (p_population[o]>(obj_controller.temp[200]*6)){ - if (p_orks[o]+p_chaos[o]+p_tyranids[o]+p_necrons[o]+p_tau[o]+p_traitors[o]=0) then good=1; - } - } - if (good=1) then instance_create(x,y,obj_temp_inq); - } - } - } - if (planet_needed=3){ - var good - with(obj_star) { - if (scr_is_star_owned_by_allies(self)) { - good=0;o=0; - repeat(planets){o+=1; - if (scr_is_planet_owned_by_allies(self, o)) and ((p_population[o]>(obj_controller.temp[200]*6)) or ((p_large[o]=1) and (p_population[o]>0.1))){ - if (p_orks[o]+p_chaos[o]+p_tyranids[o]+p_necrons[o]+p_tau[o]+p_traitors[o]=0) then good=1; - } - } - if (good=1) then instance_create(x,y,obj_temp_inq); - } - } - } - if (planet_needed=4) { - var good - with(obj_star) { - if (scr_is_star_owned_by_allies(self)) { - good=0;o=0; - repeat(planets) { - o+=1; - if (scr_is_planet_owned_by_allies(self, o)) and ((p_large[o]=1) and (p_population[o]>0.1)){ - if (p_orks[o]+p_chaos[o]+p_tyranids[o]+p_necrons[o]+p_tau[o]+p_traitors[o]=0) then good=1; - } - } - if (good=1) then instance_create(x,y,obj_temp_inq); - } - } - } - - var closest,c_plan,closest_dist; - closest=instance_nearest(x,y,obj_temp_inq); - c_plan=instance_nearest(closest.x,closest.y,obj_temp_inq); - closest_dist=point_distance(x,y,closest.x,closest.y); - - if (c_plan=orbiting) then trade_goods="recruiting"; - if (c_plan!=orbiting){ - trade_goods="goto_recruiting"; - action_x=c_plan.x; - action_y=c_plan.y; - set_fleet_movement() - _is_orbiting=false; - } - - with(obj_temp_inq){ - instance_destroy(); - } - exit; - } - // Get recruits - if (action="") and (trade_goods="goto_recruiting"){ - if (_is_orbiting){ - var o=0,that=0,te=0,te_large=0; - repeat(orbiting.planets){ - o+=1; - if (orbiting.p_owner[o]<=5){ - if (orbiting.p_population[o]>te) and (orbiting.p_orks[o]+orbiting.p_chaos[o]+orbiting.p_tyranids[o]+orbiting.p_necrons[o]+orbiting.p_tau[o]+orbiting.p_traitors[o]=0){ - te=orbiting.p_population[o]; - that=o; - } - if (orbiting.p_large[o]=1) and (orbiting.p_population[o]>0) and (te_large=0) and (orbiting.p_orks[o]+orbiting.p_chaos[o]+orbiting.p_tyranids[o]+orbiting.p_necrons[o]+orbiting.p_tau[o]+orbiting.p_traitors[o]=0){ - te=orbiting.p_population[o]; - that=o; - te_large=1; - } - if (te_large=1) and (orbiting.p_population[o]>te) and (orbiting.p_large[o]=1) and (orbiting.p_orks[o]+orbiting.p_chaos[o]+orbiting.p_tyranids[o]+orbiting.p_necrons[o]+orbiting.p_tau[o]+orbiting.p_traitors[o]=0){ - te=orbiting.p_population[o]; - that=o; - te_large=1; - } - } - } - - var guard_wanted=fleet_max_guard()-fleet_guard_current(); - - // if (orbiting.p_population[that]guard_wanted) or (orbiting.p_large[that]=1){ - if (orbiting.p_large[that]=0){orbiting.p_population[that]-=guard_wanted; - i=0;repeat(20){i+=1;capital_imp[i]=capital_max_imp[i];} - i=0;repeat(30){i+=1;frigate_imp[i]=frigate_max_imp[i];} - i=0;repeat(30){i+=1;escort_imp[i]=escort_max_imp[i];} - } - if (orbiting.p_large[that]=1){guard_wanted=guard_wanted/1000000000; - orbiting.p_population[that]-=guard_wanted; - i=0;repeat(20){i+=1;capital_imp[i]=capital_max_imp[i];} - i=0;repeat(30){i+=1;frigate_imp[i]=frigate_max_imp[i];} - i=0;repeat(30){i+=1;escort_imp[i]=escort_max_imp[i];} - } - trade_goods="recruited"; - } - } - } - scr_navy_planet_action(); - if (trade_goods="recruited") then trade_goods=""; - /* */ - } -} var dir=0; var ret=0; - -if (action=="" && _is_orbiting){ +if (navy && action=="" && _is_orbiting) { + navy_orbiting_planet_end_turn_action(); +} +else if (action=="" && _is_orbiting){ var max_dis=400; @@ -540,7 +87,8 @@ if (action=="" && _is_orbiting){ var ns=instance_nearest(x,y,obj_star); if (ns.owner != eFACTION.Ork) and (point_distance(x,y,ns.x,ns.y)<=max_dis) and (point_distance(x,y,ns.x,ns.y)>40) and (instance_exists(obj_crusade)) and (image_index>3){ action_x=ns.x; - action_y=ns.y;alarm[4]=1; + action_y=ns.y; + set_fleet_movement(); home_x=orbiting.x; home_y=orbiting.y; exit; @@ -579,7 +127,7 @@ if (action=="" && _is_orbiting){ action_x=you.x;action_y=you.y; home_x=instance_nearest(x,y,obj_star).x; home_y=instance_nearest(x,y,obj_star).y; - alarm[4]=1;with(obj_temp3){instance_destroy();} + set_fleet_movement();with(obj_temp3){instance_destroy();} exit; } if (dis>=300) then ret=1; @@ -595,7 +143,7 @@ if (action=="" && _is_orbiting){ if ((cls.x!=home_x) or (cls.y!=home_y)) and (home_x+home_y>0){ action_x=home_x; action_y=home_y; - alarm[4]=1; + set_fleet_movement(); } } @@ -633,19 +181,19 @@ if (action=="" && _is_orbiting){ // Check for xenos or demon-equip items on those planets //TODO update this to check weapon or artifact tags var e=0,ia=-1,ca=0; - var unit; + var _unit; repeat(4400){ if (ca<=10) and (ca>=0){ ia+=1; if (ia=400){ca+=1;ia=1; if (ca=11) then ca=-5;} if (ca>=0) and (ca<11){ - unit=fetch_unit([ca,ia]); - if (obj_ini.loc[ca,ia]=cur_star.name) and (unit.planet_location>0){ - if (unit.role()="Ork Sniper") and (obj_ini.race[ca,ia]!=1){tem1_base=3;} - if (unit.role()="Flash Git") and (obj_ini.race[ca,ia]!=1){tem1_base=3;} - if (unit.role()="Ranger") and (obj_ini.race[ca,ia]!=1){tem1_base=3;} - if (unit.equipped_artifact_tag("daemon")){ + _unit=fetch_unit([ca,ia]); + if (_unit.location_string=cur_star.name) and (_unit.planet_location>0){ + if (_unit.role()="Ork Sniper") and (obj_ini.race[ca,ia]!=1){tem1_base=3;} + if (_unit.role()="Flash Git") and (obj_ini.race[ca,ia]!=1){tem1_base=3;} + if (_unit.role()="Ranger") and (obj_ini.race[ca,ia]!=1){tem1_base=3;} + if (_unit.equipped_artifact_tag("daemon")){ tem1_base+=3; dem+=1; } @@ -655,134 +203,7 @@ if (action=="" && _is_orbiting){ } repeat(cur_star.planets){ t+=1; - tem1=tem1_base;// Repeat to check each of the planets - if (cur_star.p_type[t]="Dead") and (array_length(cur_star.p_upgrades[t])>0){ - var base_search = search_planet_features(cur_star.p_upgrades[t], P_features.Secret_Base); - if (array_length(base_search) >0){ - var player_base = cur_star.p_upgrades[t][base_search[0]] - if (player_base.vox>0) then tem1+=2; - if (player_base.torture>0) then tem1+=1; - if (player_base.narcotics>0) then tem1+=3; - // Should probably also check for xenos - obj_controller.disposition[2]-=tem1*2;obj_controller.disposition[4]-=tem1*3; - obj_controller.disposition[5]-=tem1*3;popup=1; - - if (tem1>=3){popup=2;obj_controller.inqis_flag_lair+=1; - obj_controller.loyalty-=10;obj_controller.loyalty_hidden-=10; - if ((obj_controller.inqis_flag_lair=2) or (obj_controller.disposition[4]<0) or (obj_controller.loyalty<=0)) and (obj_controller.faction_status[eFACTION.Inquisition]!="War"){popup=0.3;obj_controller.alarm[8]=1;}// {popup=0.2;obj_controller.alarm[8]=1;} - } - if (player_base.inquis_hidden = 1){ - player_base.inquis_hidden = 0; - } - } - var arsenal_search = search_planet_features(cur_star.p_upgrades[t], P_features.Arsenal) - var arsenal; - - if (array_length(arsenal_search) > 0 ){ - e=0; - arsenal = cur_star.p_upgrades[t][arsenal_search[0]]; - arsenal.inquis_hidden = 0; - for (e=0;e=10) then popup=4; - - var start_inquisition_war = ((obj_controller.disposition[4]<0 || obj_controller.loyalty<=0) && obj_controller.faction_status[eFACTION.Inquisition]!="War") - - if (start_inquisition_war){ - if (popup==3){ - popup=0.3; - var moo=false; - if (!moo){ - if (obj_controller.penitent=1) { - obj_controller.alarm[8]=1; - moo=true; - }else if (obj_controller.penitent=0){ - scr_audience(4,"loyalty_zero",0,"",0,0); - } - } - } - else if (popup==4){ - popup=0.4; - var moo=false; - if (obj_controller.penitent=1) and (moo=false){obj_controller.alarm[8]=1;moo=true;} - if (obj_controller.penitent=0) and (moo=false) then scr_audience(4,"loyalty_zero",0,"",0,0); - } - } - } - var vault = search_planet_features(cur_star.p_upgrades[t], P_features.Arsenal) - var gene_vault; - if (array_length(vault) > 0 ){ - gene_vault = cur_star.p_upgrades[t][arsenal_search[0]]; - gene_vault.inquis_hidden = 0; - obj_controller.inqis_flag_gene+=1; - obj_controller.loyalty-=10;obj_controller.loyalty_hidden-=10; - obj_controller.disposition[4]-=tem1*3; - - if (obj_controller.inqis_flag_gene=1) then popup=5; - if (obj_controller.inqis_flag_gene=2) then popup=6; - if ((obj_controller.inqis_flag_gene>=3) or (obj_controller.loyalty<=0) or (obj_controller.disposition[4]<0)) and (obj_controller.faction_status[eFACTION.Inquisition]!="War"){popup=0.6;obj_controller.alarm[8]=1;} - } - - // Popup1: Lair Discovered - // Popup2: Heretic Lair Discovered - // Popup3: Arsenal Discovered - // Popup4: Aresenal with Chaos/Demonic Discovered - // Popup5: First Gene-Seed warning - // Popup6: Second Gene-Seed warning - var star_planet = $"{cur_star.name}{scr_roman(t)}"; - - if (popup=1){scr_event_log("",$"{inquis_string} discovers your Secret Lair on {star_planet}.");} - else if (popup=2) or (popup=0.2) {scr_event_log("red",$"{inquis_string} discovers your Secret Lair on {star_planet}.", cur_star);} - else if (popup=3) or (popup=0.3) {scr_event_log("",$"{inquis_string} discovers your Secret Arsenal on {star_planet}.", cur_star);} - else if (popup=4) or (popup=0.4) {scr_event_log("red",$"{inquis_string} discovers your Secret Arsenal on {star_planet}.", cur_star);} - else if (popup>=5) or (popup=0.6) {scr_event_log("",$"{inquis_string} discovers your Secret Gene-Vault on {star_planet}.", cur_star);} - - var pop_tit,pop_txt,pop_spe; - pop_tit="";pop_txt="";pop_spe=""; - if (popup=1){ - pop_tit="Inquisition Discovers Lair"; - pop_txt=$"{inquis_string} has discovered your Secret Lair on {star_planet}. A quick inspection revealed that there was no contraband or heresy, though the Inquisition does not appreciate your secrecy at all."; - } - else if (popup=2){ - pop_tit="Inquisition Discovers Lair"; - pop_txt=$"{inquis_string} has discovered your Secret Lair on {star_planet}. A quick inspection turned up heresy, most foul, and it has all been reported to the Inquisition. They are seething, as a whole, and relations are damaged."; - } - else if (popup=3){ - pop_tit="Inquisition Discovers Arsenal"; - pop_txt=$"{inquis_string} has discovered your Secret Arsenal on {star_planet}. A quick inspection revealed that there was no contraband or heresy, though the Inquisition does not appreciate your secrecy at all."; - } - else if (popup=4){ - pop_tit="Inquisition Discovers Arsenal"; - pop_txt=$"{inquis_string} has discovered your Secret Arsenal on {star_planet}. A quick inspection turned up heresy, most foul, and it has all been reported to the Inquisition. Relations have been heavily damaged."; - } - else if (popup=5){ - pop_tit="Inquisition Discovers Arsenal"; - pop_txt=$"{inquis_string} has discovered your Secret Gene-Vault on {star_planet} and reported it. The Inquisition does NOT appreciate your secrecy, nor the fact that you were able to mass produce Gene-Seed unknowest to the Imperium. Relations are damaged."; - } - else if (popup=6){ - pop_tit="Inquisition Discovers Arsenal"; - pop_txt=$"{inquis_string} has discovered your Secret Gene-Vault on {star_planet} and reported it. You were warned once already to not sneak about with Gene-Seed stores and Test-Slave incubators. Do not let it happen again or your Chapter will be branded heretics."; - } - - if ((dem*10)+(cha*3)>=10){ - pop_txt+="The Inquisitor responsible for the inspection also demands that you hand over all heretical materials and Artifacts."; - pop_spe="contraband";instance_create(x,y,obj_temp_arti); - } - - if (popup>=1) then scr_popup(pop_tit,pop_txt,"inquisition",pop_spe); - - } + inquisitor_contraband_take_popup(_cur_star,planet); } }else if (string_count("investigate",trade_goods)==0){ inquisition_inspection_logic(); @@ -808,7 +229,7 @@ if (action=="" && _is_orbiting){ action_x=exit_star.x; action_y=exit_star.y; orbiting=exit_star; - alarm[4]=1; + set_fleet_movement(); trade_goods="|DELETE|"; exit; } @@ -832,7 +253,7 @@ if (action=="" && _is_orbiting){ if (wop!=0) and (point_distance(x,y,wop.x,wop.y)<300) and (wop.x>5) and (wop.y>5){ target_x=wop.x;target_y=wop.y; home_x=x;home_y=y; - alarm[4]=1; + set_fleet_movement(); } } with(obj_temp5){instance_destroy();} @@ -914,12 +335,19 @@ if (action=="" && _is_orbiting){ new_fleet.action_x=plin2.x; new_fleet.action_y=plin2.y; - new_fleet.alarm[4]=1; + with(new_fleet){ + set_fleet_movement(); + } break; } - if (good=1) and (instance_exists(plin)){action_x=plin.x;action_y=plin.y;alarm[4]=1;if (n!=5) then good=5;} + if (good=1) and (instance_exists(plin)){ + action_x=plin.x; + action_y=plin.y; + set_fleet_movement(); + if (n!=5) then good=5; + } } } instance_activate_object(obj_star); diff --git a/objects/obj_en_fleet/Collision_obj_pnunit.gml b/objects/obj_en_fleet/Collision_obj_pnunit.gml index 9e8ab742ae..8abfbfce8a 100644 --- a/objects/obj_en_fleet/Collision_obj_pnunit.gml +++ b/objects/obj_en_fleet/Collision_obj_pnunit.gml @@ -3,15 +3,15 @@ exit; if (other.sprite_index!=self.sprite_index) then exit;// No colonists and fleets bashing together -if (other.action="") and (action="") and (other.owner=owner) and (string_count("her",trade_goods)=0) and (string_count("her",string(other.trade_goods))=0){ - if (obj_controller.faction_status[eFACTION.Imperium]="War") and (instance_nearest(x,y,obj_star).owner = eFACTION.Player) and (owner = eFACTION.Imperium) and (other.owner = eFACTION.Imperium){ - if (id>other.id){ - guardsmen+=other.guardsmen; - capital_number+=other.capital_number; - frigate_number+=other.frigate_number; - escort_number+=other.escort_number; - with(other){instance_destroy();} - } - } -} +//if (other.action="") and (action="") and (other.owner=owner) and (string_count("her",trade_goods)=0) and (string_count("her",string(other.trade_goods))=0){ +// if (obj_controller.faction_status[eFACTION.Imperium]="War") and (instance_nearest(x,y,obj_star).owner = eFACTION.Player) and (owner = eFACTION.Imperium) and (other.owner = eFACTION.Imperium){ +// if (id>other.id){ +// guardsmen+=other.guardsmen; +// capital_number+=other.capital_number; +// frigate_number+=other.frigate_number; +// escort_number+=other.escort_number; +// with(other){instance_destroy();} +// } +// } +//} diff --git a/objects/obj_en_fleet/Create_0.gml b/objects/obj_en_fleet/Create_0.gml index fa1dba0041..e2deb98a9b 100644 --- a/objects/obj_en_fleet/Create_0.gml +++ b/objects/obj_en_fleet/Create_0.gml @@ -32,17 +32,30 @@ image_yscale=1.25; var i=-1; repeat(21){i+=1; - capital[i]="";capital_num[i]=0;capital_sel[i]=1;capital_imp[i]=0;capital_max_imp[i]=0; + capital[i]=""; + capital_num[i]=0; + capital_sel[i]=1; + capital_imp[i]=0; + + capital_max_imp[i]=0; } var i;i=-1; repeat(31){i+=1; - frigate[i]="";frigate_num[i]=0;frigate_sel[i]=1;frigate_imp[i]=0;frigate_max_imp[i]=0; + frigate[i]=""; + frigate_num[i]=0; + frigate_sel[i]=1; + frigate_imp[i]=0; + frigate_max_imp[i]=0; } var i;i=-1; repeat(31){i+=1; - escort[i]="";escort_num[i]=0;escort_sel[i]=1;escort_imp[i]=0;escort_max_imp[i]=0; + escort[i]=""; + escort_num[i]=0; + escort_sel[i]=1; + escort_imp[i]=0; + escort_max_imp[i]=0; } image_speed=0; @@ -79,16 +92,17 @@ serialize = function(){ obj: object_get_name(object_index), x, y, + cargo_data : cargo_data, } - var excluded_from_save = ["temp", "serialize", "deserialize", "cargo_data"] + var excluded_from_save = ["temp", "serialize", "deserialize"]; copy_serializable_fields(object_fleet, save_data, excluded_from_save); return save_data; } deserialize = function(save_data){ - var exclusions = ["id"]; // skip automatic setting of certain vars, handle explicitly later + var exclusions = ["id","cargo_data"]; // skip automatic setting of certain vars, handle explicitly later // Automatic var setting var all_names = struct_get_names(save_data); @@ -99,18 +113,28 @@ deserialize = function(save_data){ continue; } var loaded_value = struct_get(save_data, var_name); - // show_debug_message($"en_fleet {en_fleet_instance.id} - var: {var_name} - val: {loaded_value}"); + // show_debug_message_adv($"en_fleet {en_fleet_instance.id} - var: {var_name} - val: {loaded_value}"); try { variable_struct_set(self, var_name, loaded_value); } catch (e){ - show_debug_message(e); + show_debug_message_adv(e); } } - - if(save_data.orbiting != 0){ + if(struct_exists(save_data, "cargo_data")){ + variable_struct_set(self, "cargo_data", save_data.cargo_data); + show_debug_message_adv("cargo_data"); + if (fleet_has_cargo("ork_warboss")){ + show_debug_message_adv("warboss_fleet"); + var _boss = new NewPlanetFeature(P_features.OrkWarboss); + _boss.load_json_data(cargo_data.ork_warboss) + cargo_data.ork_warboss = _boss; + } + } + + if(save_data.orbiting != 0 && action == ""){ var nearest_star = instance_nearest(x, y, obj_star); orbiting = nearest_star; - // show_debug_message($"p_fleet id {id} deserialized: {self}"); + // show_debug_message_adv($"p_fleet id {id} deserialized: {self}"); } } diff --git a/objects/obj_en_fleet/Destroy_0.gml b/objects/obj_en_fleet/Destroy_0.gml index 77f4f92ff7..fc746b0f66 100644 --- a/objects/obj_en_fleet/Destroy_0.gml +++ b/objects/obj_en_fleet/Destroy_0.gml @@ -15,7 +15,7 @@ if (action="") and (orbiting!=0){ if (instance_exists(obj_controller)){ - if ((trade_goods="Khorne_warband") or (trade_goods="Khorne_warband_landing_force")) and (obj_controller.faction_defeated[10]=0){ + if (fleet_has_cargo("warband")) and (obj_controller.faction_defeated[10]=0){ destroy_khorne_fleet(); } if (fleet_has_cargo("ork_warboss")) and (obj_controller.faction_defeated[7]<=0) and (safe=0){ diff --git a/objects/obj_en_fleet/Draw_0.gml b/objects/obj_en_fleet/Draw_0.gml index dbc8a81ae4..5495065c42 100644 --- a/objects/obj_en_fleet/Draw_0.gml +++ b/objects/obj_en_fleet/Draw_0.gml @@ -5,7 +5,7 @@ if (owner = eFACTION.Eldar) and (instance_exists(orbiting)) and (obj_controller. draw_set_color(c_red); draw_line_width(x,y,orbiting.x,orbiting.y,1); } - +var draw_icon = false; if (x<0) or (x>room_width) or (y<0) or (y>room_height) then exit; if (image_alpha=0) then exit; @@ -57,18 +57,29 @@ if (action!=""){ if (obj_controller.zoomed=0) then draw_text_transformed(x+12,y,string_hash_to_newline("ETA "+string(action_eta)),1,1,0); if (obj_controller.zoomed=1) then draw_text_transformed(x+24,y,string_hash_to_newline("ETA "+string(action_eta)),2,2,0);// was 1.4 } +switch(owner){ + case eFACTION.Ork: + var _has_warboss =false; + if (fleet_has_cargo("ork_warboss")){ + draw_icon = true; + _has_warboss = true; + } +} var fleet_descript=""; if (within=1) or (selected>0){ - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_font(fnt_40k_14b); draw_set_halign(fa_center); var fleet_descript=""; if (owner = eFACTION.Player) then fleet_descript="Renegade Fleet"; if (owner = eFACTION.Imperium){ - if (navy=0) then fleet_descript="Defense Fleet"; - if (navy=1) then fleet_descript="Imperial Navy"; + if (navy=1){ + fleet_descript="Imperial Navy"; + }else{ + fleet_descript="Defense Fleet"; + } } if (navy=0){ if (owner = eFACTION.Imperium){ @@ -92,6 +103,10 @@ if (within=1) or (selected>0){ break; case eFACTION.Ork: fleet_descript="Ork Fleet"; + if (_has_warboss){ + var _warboss = cargo_data.ork_warboss; + fleet_descript += $"\nWarboss {_warboss.name}" + } break; case eFACTION.Tau: fleet_descript="Tau Fleet"; @@ -101,7 +116,7 @@ if (within=1) or (selected>0){ break; case eFACTION.Chaos: fleet_descript="Heretic Fleet"; - if (trade_goods="Khorne_warband" || trade_goods="Khorne_warband_landing_force"){ + if (fleet_has_cargo("warband") || fleet_has_cargo("csm")){ fleet_descript=string(obj_controller.faction_leader[eFACTION.Chaos])+"'s Fleet"; if (string_count("s's Fleet",fleet_descript)>0) then fleet_descript=string_replace(fleet_descript,"s's Fleet","s' Fleet"); } @@ -124,7 +139,7 @@ if (within=1) or (selected>0){ } if (fleet_descript!="" && within){ - draw_text_transformed(x+(coords[0]*scale),y+((coords[1])*scale+(12*scale)),string_hash_to_newline(fleet_descript),1*scale,1*scale,0); + tooltip_draw(fleet_descript); draw_circle(x+(coords[0]*scale),y+(coords[1])*scale,12*scale,0); } else { var faction_colour = global.star_name_colors[owner]; @@ -132,6 +147,15 @@ if (fleet_descript!="" && within){ draw_set_alpha(0.5); draw_circle(x+(coords[0]*scale),y+(coords[1])*scale,12*scale,0); draw_set_alpha(1); + if (navy && owner == eFACTION.Imperium){ + draw_set_color(global.star_name_colors[eFACTION.Mechanicus]); + draw_circle(x+(coords[0]*scale),y+(coords[1])*scale,12*scale,1); + draw_circle(x+(coords[0]*scale),y+(coords[1])*scale,12.1*scale,1); + draw_circle(x+(coords[0]*scale),y+(coords[1])*scale,12.2*scale,1); + } +} +if (draw_icon){ + draw_sprite_ext(spr_faction_icons, owner,x+(coords[0]*scale)-(32*scale),y+(coords[1]*scale)-(32*scale),1*scale,1*scale,0,c_white,1) } draw_sprite_ext(sprite_index,image_index,x+(coords[0]*scale),y+(coords[1]*scale),1*scale,1*scale,0,c_white,1); diff --git a/objects/obj_en_fleet/Step_0.gml b/objects/obj_en_fleet/Step_0.gml index 48c73dfb25..00144c38dc 100644 --- a/objects/obj_en_fleet/Step_0.gml +++ b/objects/obj_en_fleet/Step_0.gml @@ -98,7 +98,9 @@ if (owner = eFACTION.Tau) and (action="") and (obj_controller.tau_messenger>=30) if (good=1){ fleet.action_x=stir.x; fleet.action_y=stir.y; - fleet.alarm[4]=1; + with(fleet){ + set_fleet_movement(); + } } } diff --git a/objects/obj_en_ship/Draw_0.gml b/objects/obj_en_ship/Draw_0.gml index 39e3c4578d..11ad8d73c7 100644 --- a/objects/obj_en_ship/Draw_0.gml +++ b/objects/obj_en_ship/Draw_0.gml @@ -10,7 +10,7 @@ draw_set_halign(fa_center); /*if (action="broadside"){ draw_set_color(c_blue);if (instance_exists(target_l)) then draw_line(x,y,target_l.x,target_l.y); draw_set_color(c_red);if (instance_exists(target_r)) then draw_line(x,y,target_r.x,target_r.y); -}draw_set_color(38144);*/ +}draw_set_color(CM_GREEN_COLOR);*/ draw_set_alpha(1); @@ -25,7 +25,7 @@ if (whip>0) and (instance_exists(target)){ scr_bolt(x-1,y+1,target.x-1,target.y+1,0); } -draw_set_color(38144); +draw_set_color(CM_GREEN_COLOR); if (class!="Battlekroozer") then draw_self(); if (class="Battlekroozer") then draw_sprite_ext(sprite_index,0,x,y,0.75,0.75,direction,c_white,1); diff --git a/objects/obj_enunit/Alarm_0.gml b/objects/obj_enunit/Alarm_0.gml index 07e44329f8..19e4b7e9cb 100644 --- a/objects/obj_enunit/Alarm_0.gml +++ b/objects/obj_enunit/Alarm_0.gml @@ -14,7 +14,6 @@ var enemy2 = enemy; //In melee check engaged = collision_point(x-10, y, obj_pnunit, 0, 1) || collision_point(x+10, y, obj_pnunit, 0, 1); -// show_debug_message($"enemy is in melee {engaged}") if (!engaged){ // Shooting for (var i=0;i= dist) { // The weapon is in range; @@ -84,7 +89,7 @@ if (!engaged){ // Shooting if (!instance_exists(obj_nfort)) or (flank) { if (block_has_armour(enemy)) or (enemy.veh_type[1]=="Defenses"){ scr_shoot(i,enemy,target_unit_index,"arp","ranged"); - // show_debug_message($"I'm shooting at a vehicle! {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); + // show_debug_message_adv($"I'm shooting at a vehicle! {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); continue; } else if (instance_number(obj_pnunit)>1) and (obj_ncombat.enemy!=7) { var x2=enemy.x; @@ -99,7 +104,7 @@ if (!engaged){ // Shooting } if (block_has_armour(enemy2)) { scr_shoot(i,enemy2,target_unit_index,"arp","ranged"); - // show_debug_message($"I'm shooting at a vehicle in another row! {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); + // show_debug_message_adv($"I'm shooting at a vehicle in another row! {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); _shot = true; break; } @@ -111,11 +116,9 @@ if (!engaged){ // Shooting } } else { enemy=instance_nearest(x,y,obj_nfort); - if (range[i] >= get_block_distance(enemy)) { scr_shoot(i,enemy,1,"arp","wall"); - // show_debug_message($"I'm shooting at the fort! {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); + // show_debug_message_adv($"I'm shooting at the fort! {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); continue; - } } } @@ -125,7 +128,7 @@ if (!engaged){ // Shooting if (enemy.men > 0) { // There are marines in the first column; scr_shoot(i, enemy, target_unit_index, "att", "ranged"); - // show_debug_message($"I'm shooting at a normal unit! {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); + // show_debug_message_adv($"I'm shooting at a normal unit! {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); continue; } else if (instance_number(obj_pnunit) > 1) { // There were no marines in the first column, looking behind; @@ -136,18 +139,18 @@ if (!engaged){ // Shooting x2 += !flank ? 10 : -10; var enemy2 = instance_nearest(x2, y, obj_pnunit); if (!target_block_is_valid(enemy2, obj_pnunit)) { - // show_debug_message($"The block is invalid!"); + // show_debug_message_adv($"The block is invalid!"); continue; } if (range[i] < get_block_distance(enemy2)) { - // show_debug_message($"The range is bad!"); + // show_debug_message_adv($"The range is bad!"); break; } var _back_column_size_value = enemy2.column_size; if (_back_column_size_value < _column_size_value) { - // show_debug_message($"Protection value is too big!"); + // show_debug_message_adv($"Protection value is too big!"); continue; } else { // Calculate chance of shots passing through to back row @@ -155,12 +158,12 @@ if (!engaged){ // Shooting // Maximum chance capped at 40% to ensure some protection remains var _pass_chance = ((_back_column_size_value / _column_size_value) - 1) * 100; if (irandom_range(1, 100) < min(_pass_chance, 80)) { - // show_debug_message($"I failed the protection check!"); + // show_debug_message_adv($"I failed the protection check!"); continue; } } scr_shoot(i, enemy2, target_unit_index, "att", "ranged"); - // show_debug_message($"I'm shooting at a normal unit in another row! {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); + // show_debug_message_adv($"I'm shooting at a normal unit in another row! {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); _shot = true; break; } @@ -172,7 +175,7 @@ if (!engaged){ // Shooting if (!instance_exists(obj_nfort)) or (flank) { if (block_has_armour(enemy)) or (enemy.veh_type[1]=="Defenses"){ scr_shoot(i,enemy,target_unit_index,"att","ranged"); - // show_debug_message($"I'm shooting at a vehicle, because I can't find a normal unit! {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); + // show_debug_message_adv($"I'm shooting at a vehicle, because I can't find a normal unit! {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); continue; } else if (instance_number(obj_pnunit)>1) and (obj_ncombat.enemy!=7) { var x2=enemy.x; @@ -187,27 +190,25 @@ if (!engaged){ // Shooting } if (block_has_armour(enemy2)) { scr_shoot(i,enemy2,target_unit_index,"att","ranged"); - // show_debug_message($"I'm shooting at a vehicle in another row, because I can't find a normal unit! {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); + // show_debug_message_adv($"I'm shooting at a vehicle in another row, because I can't find a normal unit! {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); break; } } } } else { enemy=instance_nearest(x,y,obj_nfort); - if (range[i] >= get_block_distance(enemy)) { scr_shoot(i,enemy,1,"att","wall"); - // show_debug_message($"I'm shooting at a fort, because I can't find a normal unit! {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); + // show_debug_message_adv($"I'm shooting at a fort, because I can't find a normal unit! {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); continue; - } } } } } else { - // show_debug_message($"I can't shoot, my range is too small! Weapon: {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}; Range: {range[i]}"); + // show_debug_message_adv($"I can't shoot, my range is too small! Weapon: {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}; Range: {range[i]}"); continue; } log_error($"{wep[i]} didn't find a valid target! This shouldn't happen!"); - // show_debug_message($"We didn't find a valid target! Weapon: {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); + // show_debug_message_adv($"We didn't find a valid target! Weapon: {wep[i]}; Column ID: {id}; Enemy Unit: {wep_owner[i]}"); } } //TODO: The melee code was not refactored; @@ -239,7 +240,7 @@ else if ((engaged || enemy.engaged) and target_block_is_valid( enemy,obj_pnunit) if (apa[i]=0) or (apa[i]0) then _armour_piercing=1;// Determines if it is _armour_piercing or not if (_armour_piercing) and (instance_exists(obj_nfort)) and (!flank){// Huff and puff and blow the wall down @@ -258,7 +259,7 @@ else if ((engaged || enemy.engaged) and target_block_is_valid( enemy,obj_pnunit) if (!good) then _armour_piercing=0;// Fuck it, shoot at infantry } - if (!_armour_piercing) and (target_block_is_valid(enemy)){// Check for men + if (!_armour_piercing) and (target_block_is_valid(enemy,obj_pnunit)){// Check for men // show_message(string(wep[i])); var enemy2,g=0,good=0; if ((enemy.men)){ diff --git a/objects/obj_enunit/Alarm_1.gml b/objects/obj_enunit/Alarm_1.gml index c9e59fd214..1b904441a6 100644 --- a/objects/obj_enunit/Alarm_1.gml +++ b/objects/obj_enunit/Alarm_1.gml @@ -73,7 +73,7 @@ repeat(20) { j += 1; if (obj_ncombat.started = 0) { if (dudes[j] = "Malcadon Spyrer") { - dudes_ac[j] = 35; + dudes_ac[j] = 25; dudes_hp[j] = 200; } } @@ -85,32 +85,34 @@ repeat(20) { if ((obj_ncombat.started = 0) or(neww = 1)) or(dudes_num[j] > 1) { if (dudes[j] = "Greater Daemon of Khorne") { - dudes_ac[j] = 18; - dudes_hp[j] = 600; + dudes_ac[j] = 25; + dudes_hp[j] = 700; } } if (dudes[j] = "Greater Daemon of Khorne") { scr_en_weapon("Khorne Demon Melee", true, dudes_num[j], dudes[j], j); - dudes_dr[j] = 0.5; + dudes_dr[j] = 0.6; medi += dudes_num[j]; if (obj_ncombat.battle_special = "ship_demon") then dudes_dr[j] = 0.65; } if ((obj_ncombat.started = 0) or(neww = 1)) or(dudes_num[j] > 1) { if (dudes[j] = "Greater Daemon of Slaanesh") { - dudes_ac[j] = 18; - dudes_hp[j] = 500; + dudes_ac[j] = 15; + dudes_hp[j] = 500; + dudes_dr[j] = 0.6; } } if (dudes[j] = "Greater Daemon of Slaanesh") { scr_en_weapon("Demon Melee", true, dudes_num[j], dudes[j], j); scr_en_weapon("Lash Whip", true, dudes_num[j], dudes[j], j); - dudes_dr[j] = 0.7; + dudes_dr[j] = 0.6; medi += dudes_num[j]; } if ((obj_ncombat.started = 0) or(neww = 1)) or(dudes_num[j] > 1) { if (dudes[j] = "Greater Daemon of Nurgle") { - dudes_ac[j] = 25; - dudes_hp[j] = 700; + dudes_ac[j] = 10; + dudes_hp[j] = 900; + dudes_dr[j] = 0.6; } } if (dudes[j] = "Greater Daemon of Nurgle") { @@ -121,42 +123,42 @@ repeat(20) { } if ((obj_ncombat.started = 0) or(neww = 1)) or(dudes_num[j] > 1) { if (dudes[j] = "Greater Daemon of Tzeentch") { - dudes_ac[j] = 18; - dudes_hp[j] = 500; + dudes_ac[j] = 10; + dudes_hp[j] = 600; } } if (dudes[j] = "Greater Daemon of Tzeentch") { scr_en_weapon("Demon Melee", true, dudes_num[j], dudes[j], j); scr_en_weapon("Witchfire", true, dudes_num[j], dudes[j], j); - dudes_dr[j] = 0.7; + dudes_dr[j] = 0.75; medi += dudes_num[j]; } if (dudes[j] = "Bloodletter") { scr_en_weapon("Bloodletter Melee", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 15; - dudes_hp[j] = 120; + dudes_hp[j] = 200; men += dudes_num[j]; - dudes_dr[j] = 0.7; + dudes_dr[j] = 0.6; } if (dudes[j] = "Daemonette") { scr_en_weapon("Daemonette Melee", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; - dudes_hp[j] = 100; + dudes_ac[j] = 10; + dudes_hp[j] = 150; men += dudes_num[j]; - dudes_dr[j] = 0.7; + dudes_dr[j] = 0.6; } if (dudes[j] = "Pink Horror") { scr_en_weapon("Eldritch Fire", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; + dudes_ac[j] = 10; dudes_hp[j] = 100; men += dudes_num[j]; - dudes_dr[j] = 0.8; + dudes_dr[j] = 0.6; } if (dudes[j] = "Plaguebearer") { scr_en_weapon("Plaguebearer Melee", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; - dudes_hp[j] = 145; + dudes_ac[j] = 10; + dudes_hp[j] = 300; men += dudes_num[j]; dudes_dr[j] = 0.6; } @@ -165,28 +167,28 @@ repeat(20) { scr_en_weapon("Power Fist", false, dudes_num[j], dudes[j], j); scr_en_weapon("Multi-Melta", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; - dudes_hp[j] = 100; + dudes_hp[j] = 300; veh += dudes_num[j]; dudes_vehicle[j] = 1; - dudes_dr[j] = 0.75; + dudes_dr[j] = 0.6; } if (dudes[j] = "Soul Grinder") { scr_en_weapon("Warpsword", false, dudes_num[j], dudes[j], j); scr_en_weapon("Iron Claw", false, dudes_num[j], dudes[j], j); scr_en_weapon("Battle Cannon", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; + dudes_ac[j] = 40; dudes_hp[j] = 350; veh += dudes_num[j]; dudes_vehicle[j] = 1; - dudes_dr[j] = 1; + dudes_dr[j] = 0.6; } if (dudes[j] = "Maulerfiend") { scr_en_weapon("Maulerfiend Claws", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; + dudes_ac[j] = 40; dudes_hp[j] = 250; veh += dudes_num[j]; dudes_vehicle[j] = 1; - dudes_dr[j] = 1; + dudes_dr[j] = 0.6; } } @@ -332,39 +334,43 @@ if __b__ { repeat(20) { j += 1; if (dudes[j] = "Imperial Guardsman") { - dudes_ac[j] = 20; - dudes_hp[j] = 20; + dudes_ac[j] = 40; + dudes_hp[j] = 5; men += dudes_num[j]; } if (dudes[j] = "Heavy Weapons Team") { scr_en_weapon("Heavy Bolter", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 0; + dudes_ac[j] = 10; dudes_hp[j] = 100; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Ogryn") { scr_en_weapon("Ripper Gun", true, dudes_num[j], dudes[j], j); scr_en_weapon("Ogryn Melee", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; + dudes_ac[j] = 15; dudes_hp[j] = 120; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "Chimera") { scr_en_weapon("Multi-Laster", false, dudes_num[j], dudes[j], j); scr_en_weapon("Heavy Bolter", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 150; + dudes_ac[j] = 30; + dudes_hp[j] = 200; + dudes_dr[j] = 0.5; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Basilisk") { scr_en_weapon("Earthshaker Cannon", false, dudes_num[j], dudes[j], j); scr_en_weapon("Storm Bolter", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; + dudes_ac[j] = 30; dudes_hp[j] = 150; + dudes_dr[j] = 0.5; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -373,6 +379,7 @@ if __b__ { scr_en_weapon("Lascannon", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; dudes_hp[j] = 250; + dudes_dr[j] = 0.5; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -381,13 +388,15 @@ if __b__ { scr_en_weapon("Lascannon", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; dudes_hp[j] = 250; + dudes_dr[j] = 0.5; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Vendetta") { scr_en_weapon("Twin-Linked Lascannon", false, dudes_num[j] * 3, dudes[j], j); dudes_ac[j] = 20; - dudes_hp[j] = 300; + dudes_hp[j] = 200; + dudes_dr[j] = 0.5; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -414,14 +423,16 @@ if __b__ { if (dudes[j] = "Thallax") { scr_en_weapon("Lightning Gun", true, dudes_num[j], dudes[j], j); scr_en_weapon("Thallax Melee", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 80; + dudes_ac[j] = 25; + dudes_hp[j] = 100; + dudes_dr[j] = 0.8; men += dudes_num[j]; } if (dudes[j] = "Praetorian Servitor") { scr_en_weapon("Phased Plasma-fusil", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 25; + dudes_ac[j] = 15; dudes_hp[j] = 150; + dudes_dr[j] = 0.85; medi += dudes_num[j]; } } @@ -440,56 +451,56 @@ if __b__ { scr_en_weapon("Blessed Weapon", true, dudes_num[j], dudes[j], j); scr_en_weapon("Laser Mace", true, dudes_num[j], dudes[j], j); scr_en_weapon("Infernus Pistol", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 35; + dudes_ac[j] = 15; if (obj_ncombat.started = 0) or(dudes_num[j] > 1) { dudes_hp[j] = 200; } men += dudes_num[j]; - dudes_dr[j] = 0.33; + dudes_dr[j] = 0.5; } if (dudes[j] = "Palatine") { scr_en_weapon("Plasma Pistol", true, dudes_num[j], dudes[j], j); scr_en_weapon("Power Weapon", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 22; + dudes_ac[j] = 15; dudes_hp[j] = 100; men += dudes_num[j]; dudes_dr[j] = 0.5; } if (dudes[j] = "Priest") { scr_en_weapon("Laspistol", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 0; - dudes_hp[j] = 30; + dudes_ac[j] = 5; + dudes_hp[j] = 50; men += dudes_num[j]; - dudes_dr[j] = 0.5; + dudes_dr[j] = 0.65; } if (dudes[j] = "Arco-Flagellent") { scr_en_weapon("Electro-Flail", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 0; + dudes_ac[j] = 5; dudes_hp[j] = 150; men += dudes_num[j]; - dudes_dr[j] = 0.65; + dudes_dr[j] = 0.7; } if (dudes[j] = "Celestian") { scr_en_weapon("Bolter", true, dudes_num[j], dudes[j], j); scr_en_weapon("Chainsword", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 40; + dudes_ac[j] = 15; + dudes_hp[j] = 60; men += dudes_num[j]; - dudes_dr[j] = 0.65; + dudes_dr[j] = 0.80; } if (dudes[j] = "Mistress") { scr_en_weapon("Neural Whip", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 40; + dudes_ac[j] = 15; + dudes_hp[j] = 60; men += dudes_num[j]; - dudes_dr[j] = 0.75; + dudes_dr[j] = 0.80; } if (dudes[j] = "Sister Repentia") { scr_en_weapon("Eviscerator", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 30; + dudes_ac[j] = 5; + dudes_hp[j] = 75; men += dudes_num[j]; dudes_dr[j] = 0.75; } @@ -503,24 +514,24 @@ if __b__ { scr_en_weapon("Bolter", true, dudes_num[j] - nem, dudes[j], j); } scr_en_weapon("Sarissa", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 40; + dudes_ac[j] = 15; + dudes_hp[j] = 60; men += dudes_num[j]; - dudes_dr[j] = 0.8; + dudes_dr[j] = 0.75; } if (dudes[j] = "Seraphim") { scr_en_weapon("Seraphim Pistols", true, dudes_num[j], dudes[j], j); scr_en_weapon("Chainsword", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 40; + dudes_ac[j] = 15; + dudes_hp[j] = 60; men += dudes_num[j]; - dudes_dr[j] = 0.75; + dudes_dr[j] = 0.6; } if (dudes[j] = "Dominion") { scr_en_weapon("Meltagun", true, dudes_num[j], dudes[j], j); scr_en_weapon("Meltabomb", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 40; + dudes_ac[j] = 15; + dudes_hp[j] = 60; men += dudes_num[j]; dudes_dr[j] = 0.75; } @@ -533,40 +544,43 @@ if __b__ { scr_en_weapon("Heavy Bolter", true, dudes_num[j] - nem, dudes[j], j); } scr_en_weapon("Bolt Pistol", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 40; + dudes_ac[j] = 15; + dudes_hp[j] = 60; men += dudes_num[j]; - dudes_dr[j] = 0.75; + dudes_dr[j] = 0.85; } - if (dudes[j] = "Follower") { + if (dudes[j] = "Follower") { //Frateris Militia scr_en_weapon("Laspistol", true, dudes_num[j], dudes[j], j); scr_en_weapon("melee0.5", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 0; - dudes_hp[j] = 20; + dudes_ac[j] = 5; + dudes_hp[j] = 30; men += dudes_num[j]; } if (dudes[j] = "Rhino") { scr_en_weapon("Storm Bolter", false, dudes_num[j] * 2, dudes[j], j); - dudes_ac[j] = 20; + dudes_ac[j] = 30; dudes_hp[j] = 200; + dudes_dr[j] = 0.75; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Chimera") { scr_en_weapon("Heavy Flamer", false, dudes_num[j] * 2, dudes[j], j); - dudes_ac[j] = 23; + dudes_ac[j] = 30; dudes_hp[j] = 200; + dudes_dr[j] = 0.75; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Immolator") { scr_en_weapon("Twin Linked Heavy Flamers", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 200; + dudes_ac[j] = 40; + dudes_hp[j] = 300; + dudes_dr[j] = 0.65; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -575,8 +589,9 @@ if __b__ { scr_en_weapon("Storm Bolter", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 30; if (obj_ncombat.started = 0) or(dudes_num[j] > 1) { - dudes_hp[j] = 300; + dudes_hp[j] = 200; } + dudes_dr[j] = 0.65; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -584,8 +599,9 @@ if __b__ { if (dudes[j] = "Penitent Engine") { scr_en_weapon("Close Combat Weapon", false, dudes_num[j] * 2, dudes[j], j); scr_en_weapon("Heavy Flamer", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 35; + dudes_ac[j] = 20; dudes_hp[j] = 150; + dudes_dr[j] = 0.8; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -612,8 +628,8 @@ if __b__ { if (dudes[j] = "Leader") { scr_en_weapon("Singing Spear", true, dudes_num[j], dudes[j], j); scr_en_weapon("Singing Spear Throw", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 300; + dudes_ac[j] = 15; + dudes_hp[j] = 150; men += dudes_num[j]; dudes_dr[j] = 0.5; } @@ -621,100 +637,112 @@ if __b__ { if (dudes[j] = "Autarch") { scr_en_weapon("Power Weapon", true, dudes_num[j], dudes[j], j); scr_en_weapon("Fusion Gun", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; + dudes_ac[j] = 15; dudes_hp[j] = 150; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "Farseer") { scr_en_weapon("Singing Spear", true, dudes_num[j], dudes[j], j); scr_en_weapon("Singing Spear Throw", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 150; + dudes_ac[j] = 15; + dudes_hp[j] = 120; + dudes_dr[j] = 0.6; men += dudes_num[j]; } if (dudes[j] = "Warlock") { scr_en_weapon("Witchblade", true, dudes_num[j], dudes[j], j); scr_en_weapon("Psyshock", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 100; + dudes_ac[j] = 10; + dudes_hp[j] = 80; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "Avatar") { scr_en_weapon("Wailing Doom", true, dudes_num[j], dudes[j], j); scr_en_weapon("Avatar Smite", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 40; + dudes_ac[j] = 30; dudes_hp[j] = 300; + dudes_dr[j] = 0.75; veh += dudes_num[j]; } if (dudes[j] = "Mighty Avatar") { scr_en_weapon("Wailing Doom", true, dudes_num[j], dudes[j], j); scr_en_weapon("Avatar Smite", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 55; + dudes_ac[j] = 40; dudes_hp[j] = 450; + dudes_dr[j] = 0.6; veh += dudes_num[j]; } if (dudes[j] = "Godly Avatar") { scr_en_weapon("Wailing Doom", true, dudes_num[j], dudes[j], j); scr_en_weapon("Avatar Smite", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 70; + dudes_ac[j] = 50; dudes_hp[j] = 600; + dudes_dr[j] = 0.5; veh += dudes_num[j]; } if (dudes[j] = "Ranger") { scr_en_weapon("Ranger Long Rifle", true, dudes_num[j], dudes[j], j); scr_en_weapon("Shuriken Pistol", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; - dudes_hp[j] = 30; + dudes_ac[j] = 5; + dudes_hp[j] = 40; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Pathfinder") { scr_en_weapon("Pathfinder Long Rifle", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 5; dudes_hp[j] = 60; + dudes_dr[j] = 0.8; men += dudes_num[j]; } if (dudes[j] = "Dire Avenger") { scr_en_weapon("Avenger Shuriken Catapult", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; - dudes_hp[j] = 30; + dudes_ac[j] = 10; + dudes_hp[j] = 40; men += dudes_num[j]; } if (dudes[j] = "Dire Avenger Exarch") { scr_en_weapon("Power Weapon", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 50; // Shimmershield + dudes_ac[j] = 10; + dudes_hp[j] = 70; // Shimmershield men += dudes_num[j]; } if (dudes[j] = "Howling Banshee") { scr_en_weapon("Power Weapon", true, dudes_num[j], dudes[j], j); scr_en_weapon("Shuriken Pistol", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; - dudes_hp[j] = 30; + dudes_ac[j] = 10; + dudes_hp[j] = 40; + dudes_dr[j] = 0.8; men += dudes_num[j]; } if (dudes[j] = "Howling Banshee Exarch") { scr_en_weapon("Executioner", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 50; + dudes_ac[j] = 10; + dudes_hp[j] = 60; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "Striking Scorpion") { scr_en_weapon("Scorpion Chainsword", true, dudes_num[j], dudes[j], j); scr_en_weapon("Shuriken Pistol", true, dudes_num[j], dudes[j], j); scr_en_weapon("Mandiblaster", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 30; + dudes_ac[j] = 10; + dudes_hp[j] = 60; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Striking Scorpion Exarch") { scr_en_weapon("Biting Blade", true, dudes_num[j], dudes[j], j); scr_en_weapon("Scorpion's Claw", true, dudes_num[j], dudes[j], j); scr_en_weapon("Mandiblaster", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 50; + dudes_ac[j] = 10; + dudes_hp[j] = 80; + dudes_dr[j] = 0.8; men += dudes_num[j]; } if (dudes[j] = "Fire Dragon") { @@ -722,88 +750,96 @@ if __b__ { scr_en_weapon("Meltabomb", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 15; - dudes_hp[j] = 30; + dudes_hp[j] = 40; men += dudes_num[j]; } if (dudes[j] = "Fire Dragon Exarch") { scr_en_weapon("Firepike", true, dudes_num[j], dudes[j], j); scr_en_weapon("Power Weapon", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 50; + dudes_ac[j] = 15; + dudes_hp[j] = 60; men += dudes_num[j]; } if (dudes[j] = "Warp Spider") { scr_en_weapon("Deathspinner", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; - dudes_hp[j] = 30; + dudes_ac[j] = 10; + dudes_hp[j] = 40; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Warp Spider Exarch") { scr_en_weapon("Dual Deathspinners", true, dudes_num[j], dudes[j], j); scr_en_weapon("Powerblades", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 50; + dudes_ac[j] = 10; + dudes_hp[j] = 60; + dudes_dr[j] = 0.8; men += dudes_num[j]; } if (dudes[j] = "Dark Reaper") { scr_en_weapon("Reaper Launcher", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 30; + dudes_ac[j] = 10; + dudes_hp[j] = 40; men += dudes_num[j]; } if (dudes[j] = "Dark Reaper Exarch") { - scr_en_weapon("Eldar Missile Launcher", true, dudes_num[j], dudes[j], j); + scr_en_weapon("Tempest Launcher", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; + dudes_ac[j] = 10; dudes_hp[j] = 50; men += dudes_num[j]; } if (dudes[j] = "Shining Spear") { scr_en_weapon("Laser Lance", true, dudes_num[j], dudes[j], j); scr_en_weapon("Twin Linked Shuriken Catapult", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 30; - men += dudes_num[j]; + dudes_ac[j] = 10; + dudes_hp[j] = 75; + dudes_dr[j] = 0.8; + veh += dudes_num[j]; + dudes_vehicle[j] = 1; } if (dudes[j] = "Guardian") { scr_en_weapon("Shuriken Catapult", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; + dudes_ac[j] = 5; dudes_hp[j] = 30; men += dudes_num[j]; } if (dudes[j] = "Grav Platform") { scr_en_weapon("Pulse Laser", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; - dudes_hp[j] = 70; + dudes_ac[j] = 10; + dudes_hp[j] = 60; men += dudes_num[j]; } if (dudes[j] = "Trouper") { scr_en_weapon("Power Weapon", true, dudes_num[j], dudes[j], j); scr_en_weapon("Fusion Pistol", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; + dudes_ac[j] = 10; dudes_hp[j] = 50; + dudes_dr[j] = 0.25; men += dudes_num[j]; } if (dudes[j] = "Athair") { scr_en_weapon("Plasma Pistol", true, dudes_num[j], dudes[j], j); scr_en_weapon("Harlequin's Kiss", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; + dudes_ac[j] = 10; dudes_hp[j] = 75; + dudes_dr[j] = 0.25; men += dudes_num[j]; } if (dudes[j] = "Wraithguard") { scr_en_weapon("Wraithcannon", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 80; + dudes_ac[j] = 25; + dudes_hp[j] = 125; + dudes_dr[j] = 0.7; men += dudes_num[j]; } if (dudes[j] = "Vyper") { scr_en_weapon("Twin Linked Shuriken Catapult", false, dudes_num[j], dudes[j], j); scr_en_weapon("Pulse Laser", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 40; + dudes_ac[j] = 20; dudes_hp[j] = 100; + dudes_dr[j] = 0.8; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -811,8 +847,9 @@ if __b__ { scr_en_weapon("Pulse Laser", false, dudes_num[j], dudes[j], j); scr_en_weapon("Shuriken Cannon", false, dudes_num[j], dudes[j], j); scr_en_weapon("Bright Lance", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 40; + dudes_ac[j] = 30; dudes_hp[j] = 200; + dudes_dr[j] = 0.6; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -821,22 +858,25 @@ if __b__ { scr_en_weapon("Prism Cannon", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; dudes_hp[j] = 200; + dudes_dr[j] = 0.50; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Nightspinner") { scr_en_weapon("Twin Linked Doomweaver", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 40; - dudes_hp[j] = 170; + dudes_ac[j] = 30; + dudes_hp[j] = 200; + dudes_dr[j] = 0.6; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Wraithlord") { scr_en_weapon("Two Power Fists", false, dudes_num[j], dudes[j], j); scr_en_weapon("Flamer", false, dudes_num[j] * 2, dudes[j], j); - scr_en_weapon("Star Cannon", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 40; + scr_en_weapon("Starcannon", false, dudes_num[j], dudes[j], j); + dudes_ac[j] = 30; dudes_hp[j] = 200; + dudes_dr[j] = 0.6; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -846,6 +886,7 @@ if __b__ { scr_en_weapon("Titan Starcannon", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 50; dudes_hp[j] = 800; + dudes_dr[j] = 0.4; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -863,7 +904,7 @@ if __b__ { scr_en_weapon("Power Klaw", true, dudes_num[j], dudes[j], j); scr_en_weapon("Rokkit Launcha", true, dudes_num[j], dudes[j], j); scr_en_weapon("Big Shoota", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 60; + dudes_ac[j] = 25; if (obj_ncombat.started = 0) or(dudes_num[j] > 1) { dudes_hp[j] = 600; } @@ -871,118 +912,127 @@ if __b__ { dudes_dr[j] = 0.5; } - if (dudes[j] = "Minor Warboss") { + if (dudes[j] = "Minor Warboss") { // 'Ead Nob scr_en_weapon("Choppa", true, dudes_num[j], dudes[j], j); scr_en_weapon("Big Shoota", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 40; + dudes_ac[j] = 10; if (obj_ncombat.started = 0) or(dudes_num[j] > 1) { dudes_hp[j] = 150; + dudes_dr[j] = 0.75; } men += dudes_num[j]; } if (dudes[j] = "Warboss") { scr_en_weapon("Power Klaw", true, dudes_num[j], dudes[j], j); scr_en_weapon("Rokkit Launcha", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 50; + dudes_ac[j] = 15; if (obj_ncombat.started = 0) or(dudes_num[j] > 1) { dudes_hp[j] = 200; + dudes_dr[j] = 0.7; } men += dudes_num[j]; } if (dudes[j] = "Big Warboss") { scr_en_weapon("Power Klaw", true, dudes_num[j], dudes[j], j); scr_en_weapon("Rokkit Launcha", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 60; + dudes_ac[j] = 25; if (obj_ncombat.started = 0) or(dudes_num[j] > 1) { dudes_hp[j] = 300; + dudes_dr[j] = 0.65; } - veh += dudes_num[j]; + men += dudes_num[j]; } if (dudes[j] = "Gretchin") { scr_en_weapon("Grot Blasta", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 0; + dudes_ac[j] = 5; dudes_hp[j] = 15; men += dudes_num[j]; } if (dudes[j] = "Slugga Boy") { scr_en_weapon("Choppa", true, dudes_num[j], dudes[j], j); scr_en_weapon("Slugga", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; - dudes_hp[j] = 50; + dudes_ac[j] = 5; + dudes_hp[j] = 60; men += dudes_num[j]; } if (dudes[j] = "Shoota Boy") { scr_en_weapon("Shoota", true, dudes_num[j], dudes[j], j); scr_en_weapon("Choppa", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; - dudes_hp[j] = 50; + dudes_ac[j] = 5; + dudes_hp[j] = 60; men += dudes_num[j]; } if (dudes[j] = "Mekboy") { scr_en_weapon("Power Klaw", true, dudes_num[j], dudes[j], j); scr_en_weapon("Big Shoota", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 60; + dudes_ac[j] = 15; + dudes_hp[j] = 100; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "Meganob") { scr_en_weapon("Power Klaw", true, dudes_num[j], dudes[j], j); scr_en_weapon("Big Shoota", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 40; - dudes_hp[j] = 120; + dudes_ac[j] = 15; + dudes_hp[j] = 150; + dudes_dr[j] = 0.65; men += dudes_num[j]; } if (dudes[j] = "Flash Git") { scr_en_weapon("Snazzgun", true, dudes_num[j], dudes[j], j); scr_en_weapon("Choppa", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 15; - dudes_hp[j] = 65; + dudes_ac[j] = 10; + dudes_hp[j] = 100; men += dudes_num[j]; } if (dudes[j] = "Cybork") { scr_en_weapon("Power Klaw", true, dudes_num[j], dudes[j], j); scr_en_weapon("Big Shoota", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 80; + dudes_ac[j] = 10; + dudes_hp[j] = 125; + dudes_dr[j] = 0.8; men += dudes_num[j]; } if (dudes[j] = "Ard Boy") { scr_en_weapon("Choppa", true, dudes_num[j], dudes[j], j); scr_en_weapon("Slugga", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 70; + dudes_ac[j] = 10; + dudes_hp[j] = 80; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Kommando") { scr_en_weapon("Choppa", true, dudes_num[j], dudes[j], j); scr_en_weapon("Rokkit Launcha", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 10; - dudes_hp[j] = 80; + dudes_hp[j] = 125; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Burna Boy") { scr_en_weapon("Choppa", true, dudes_num[j], dudes[j], j); scr_en_weapon("Burna", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; - dudes_hp[j] = 35; + dudes_ac[j] = 5; + dudes_hp[j] = 80; men += dudes_num[j]; } if (dudes[j] = "Tankbusta") { scr_en_weapon("Rokkit Launcha", true, dudes_num[j], dudes[j], j); scr_en_weapon("Tankbusta Bomb", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; - dudes_hp[j] = 50; + dudes_ac[j] = 5; + dudes_hp[j] = 80; men += dudes_num[j]; } if (dudes[j] = "Stormboy") { scr_en_weapon("Choppa", true, dudes_num[j], dudes[j], j); scr_en_weapon("Slugga", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; - dudes_hp[j] = 50; + dudes_ac[j] = 5; + dudes_hp[j] = 80; + dudes_dr[j] = 0.8; dudes_special[j] = "Jetpack"; men += dudes_num[j]; } @@ -991,8 +1041,9 @@ if __b__ { scr_en_weapon("Kannon", false, dudes_num[j], dudes[j], j); scr_en_weapon("Big Shoota", false, dudes_num[j] * 2, dudes[j], j); scr_en_weapon("Rokkit Launcha", false, dudes_num[j] * 2, dudes[j], j); - dudes_ac[j] = 40; - dudes_hp[j] = 200; + dudes_ac[j] = 30; + dudes_hp[j] = 350; + dudes_dr[j] = 0.55; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1000,8 +1051,9 @@ if __b__ { scr_en_weapon("Power Klaw", false, dudes_num[j] * 2, dudes[j], j); scr_en_weapon("Big Shoota", false, dudes_num[j], dudes[j], j); scr_en_weapon("Rokkit Launcha", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 35; - dudes_hp[j] = 150; + dudes_ac[j] = 30; + dudes_hp[j] = 300; + dudes_dr[j] = 0.6; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1018,81 +1070,80 @@ if __b__ { scr_en_weapon("Plasma Rifle", true, dudes_num[j], dudes[j], j); scr_en_weapon("Fusion Blaster", true, dudes_num[j], dudes[j], j); scr_en_weapon("Cyclic Ion Blaster", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 150; - medi += dudes_num[j]; - dudes_vehicle[j] = 1; + dudes_ac[j] = 15; + dudes_hp[j] = 300; + dudes_dr[j] = 0.65; + men += dudes_num[j]; } if (dudes[j] = "XV8 Bodyguard") { scr_en_weapon("Plasma Rifle", true, dudes_num[j], dudes[j], j); scr_en_weapon("Burst Rifle", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 100; - medi += dudes_num[j]; - dudes_vehicle[j] = 1; + dudes_ac[j] = 25; + dudes_hp[j] = 200; + dudes_dr[j] = 0.65; + men += dudes_num[j]; } if (dudes[j] = "XV8 Crisis") { scr_en_weapon("Plasma Rifle", true, dudes_num[j], dudes[j], j); scr_en_weapon("Missile Pod", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 75; - medi += dudes_num[j]; - dudes_vehicle[j] = 1; + dudes_ac[j] = 15; + dudes_hp[j] = 150; + dudes_dr[j] = 0.75; + men += dudes_num[j]; } if (dudes[j] = "XV8 (Brightknife)") { scr_en_weapon("Fusion Blaster", true, dudes_num[j] * 2, dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 75; - medi += dudes_num[j]; - dudes_vehicle[j] = 1; + dudes_ac[j] = 15; + dudes_hp[j] = 150; + dudes_dr[j] = 0.75; + men += dudes_num[j]; } if (dudes[j] = "Shield Drone") { - dudes_ac[j] = 30; - dudes_hp[j] = 100; - medi += dudes_num[j]; - dudes_vehicle[j] = 1; + dudes_ac[j] = 5; + dudes_hp[j] = 50; + men += dudes_num[j]; } if (dudes[j] = "XV88 Broadside") { scr_en_weapon("Smart Missile System", true, dudes_num[j] * 2, dudes[j], j); scr_en_weapon("Small Railgun", true, dudes_num[j] * 2, dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 150; - medi += dudes_num[j]; - dudes_vehicle[j] = 1; + dudes_ac[j] = 25; + dudes_hp[j] = 250; + dudes_dr[j] = 0.7; + men += dudes_num[j]; } if (dudes[j] = "XV25 Stealthsuit") { scr_en_weapon("Burst Rifle", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 50; + dudes_ac[j] = 15; + dudes_hp[j] = 75; + dudes_dr[j] = 0.85; men += dudes_num[j]; - dudes_vehicle[j] = 1; } if (dudes[j] = "Fire Warrior") { scr_en_weapon("Pulse Rifle", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 20; + dudes_ac[j] = 10; + dudes_hp[j] = 40; men += dudes_num[j]; } if (dudes[j] = "Pathfinder") { scr_en_weapon("Rail Rifle", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 20; + dudes_ac[j] = 5; + dudes_hp[j] = 40; men += dudes_num[j]; } if (dudes[j] = "Kroot") { scr_en_weapon("Kroot Rifle", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee2", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 5; - dudes_hp[j] = 30; + dudes_hp[j] = 50; men += dudes_num[j]; } if (dudes[j] = "Vespid") { scr_en_weapon("Vespid Crystal", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee2", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 10; - dudes_hp[j] = 50; + dudes_hp[j] = 75; men += dudes_num[j]; } @@ -1100,14 +1151,16 @@ if __b__ { scr_en_weapon("Smart Missile System", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 30; dudes_hp[j] = 150; + dudes_dr[j] = 0.6; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Hammerhead") { scr_en_weapon("Railgun", false, dudes_num[j], dudes[j], j); scr_en_weapon("Smart Missile System", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 40; - dudes_hp[j] = 250; + dudes_ac[j] = 30; + dudes_hp[j] = 150; + dudes_dr[j] = 0.6; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1124,91 +1177,94 @@ if __b__ { scr_en_weapon("Bonesword", true, dudes_num[j], dudes[j], j); scr_en_weapon("Lashwhip", true, dudes_num[j], dudes[j], j); scr_en_weapon("Heavy Venom Cannon", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 35; - dudes_hp[j] = 250; + dudes_ac[j] = 25; + dudes_hp[j] = 400; + dudes_dr[j] = 0.5; men += dudes_num[j]; } if (dudes[j] = "Tyrant Guard") { scr_en_weapon("Crushing Claws", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 100; + dudes_ac[j] = 25; + dudes_hp[j] = 200; + dudes_dr[j] = 0.7; men += dudes_num[j]; } if (dudes[j] = "Tyranid Warrior") { scr_en_weapon("Rending Claws", true, dudes_num[j], dudes[j], j); scr_en_weapon("Devourer", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; + dudes_ac[j] = 15; dudes_hp[j] = 100; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Zoanthrope") { scr_en_weapon("Zoanthrope Blast", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 40; - dudes_hp[j] = 200; + dudes_ac[j] = 10; + dudes_hp[j] = 300; dudes_dr[j] = 0.5; - medi += dudes_num[j]; - dudes_vehicle[j] = 1.5; + men += dudes_num[j]; } if (dudes[j] = "Carnifex") { scr_en_weapon("Carnifex Claws", false, dudes_num[j], dudes[j], j); scr_en_weapon("Venom Cannon", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 40; + dudes_ac[j] = 30; dudes_hp[j] = 300; - dudes_dr[j] = 0.75; + dudes_dr[j] = 0.6; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Termagaunt") { scr_en_weapon("Fleshborer", true, dudes_num[j] / 10, dudes[j], j); - dudes_ac[j] = 0; - dudes_hp[j] = 20; + dudes_ac[j] = 5; + dudes_hp[j] = 25; men += dudes_num[j]; } if (dudes[j] = "Hormagaunt") { scr_en_weapon("Scything Talons", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 0; - dudes_hp[j] = 20; + dudes_ac[j] = 5; + dudes_hp[j] = 25; men += dudes_num[j]; } if (dudes[j] = "Cultist") { scr_en_weapon("Autogun", true, dudes_num[j], dudes[j], j); scr_en_weapon("melee0.5", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 0; - dudes_hp[j] = 20; + dudes_ac[j] = 10; + dudes_hp[j] = 35; men += dudes_num[j]; } if (dudes[j] = "Genestealer") { scr_en_weapon("Genestealer Claws", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 10; - dudes_hp[j] = 50; + dudes_hp[j] = 75; men += dudes_num[j]; } if (dudes[j] = "Genestealer Patriarch") { scr_en_weapon("Genestealer Claws", true, dudes_num[j], dudes[j], j); scr_en_weapon("Witchfire", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 150; - dudes_dr[j] = 0.75; + dudes_ac[j] = 15; + dudes_hp[j] = 300; + dudes_dr[j] = 0.65; men += dudes_num[j]; } if (dudes[j] = "Armoured Limousine") { scr_en_weapon("Autogun", false, dudes_num[j] * 4, dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 20; dudes_hp[j] = 150; + dudes_dr[j] = 0.75; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Lictor") { scr_en_weapon("Lictor Claws", true, dudes_num[j], dudes[j], j); scr_en_weapon("Flesh Hooks", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 150; + dudes_ac[j] = 15; + dudes_hp[j] = 300; + dudes_dr[j] = 0.70; men += dudes_num[j]; } - dudes_dr[j] += 0.25; } /* */ @@ -1220,31 +1276,31 @@ if __b__ { repeat(20) { j += 1; - if (dudes[j] = "Leader") and(obj_controller.faction_gender[10] = 1) { + if (dudes[j] = "Leader") and(obj_controller.faction_gender[10] = 1) { // Terminator Chaos Lord scr_en_weapon("Meltagun", true, dudes_num[j], dudes[j], j); scr_en_weapon("Power Fist", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 40; + dudes_ac[j] = 35; if (obj_ncombat.started = 0) or(dudes_num[j] > 1) { dudes_hp[j] = 300; } men += dudes_num[j]; dudes_dr[j] = 0.5; } - if (dudes[j] = "Leader") and(obj_controller.faction_gender[10] = 2) { + if (dudes[j] = "Leader") and(obj_controller.faction_gender[10] = 2) { // World Eater Lord scr_en_weapon("Khorne Demon Melee", true, dudes_num[j] * 2, dudes[j], j); - dudes_ac[j] = 44; + dudes_ac[j] = 25; if (obj_ncombat.started = 0) or(dudes_num[j] > 1) { dudes_hp[j] = 300; } men += dudes_num[j]; - dudes_dr[j] = 0.4; + dudes_dr[j] = 0.6; } if (dudes[j] = "Fallen") { scr_en_weapon("Bolt Pistol", true, dudes_num[j], dudes[j], j); scr_en_weapon("Power Weapon", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 120; + dudes_ac[j] = 25; + dudes_hp[j] = 150; men += dudes_num[j]; dudes_dr[j] = 0.5; } @@ -1252,23 +1308,26 @@ if __b__ { if (dudes[j] = "Chaos Lord") { scr_en_weapon("Plasma Pistol", true, dudes_num[j], dudes[j], j); scr_en_weapon("Power Weapon", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; + dudes_ac[j] = 25; dudes_hp[j] = 150; + dudes_dr[j] = 0.5; men += dudes_num[j]; } if (dudes[j] = "Chaos Sorcerer") { scr_en_weapon("Plasma Pistol", true, dudes_num[j], dudes[j], j); scr_en_weapon("Force Staff", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 25; - dudes_hp[j] = 100; + dudes_hp[j] = 150; + dudes_dr[j] = 0.5; men += dudes_num[j]; } if (dudes[j] = "Warpsmith") { scr_en_weapon("Chainfist", true, dudes_num[j], dudes[j], j); scr_en_weapon("Meltagun", true, dudes_num[j], dudes[j], j); scr_en_weapon("Flamer", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 100; + dudes_ac[j] = 25; + dudes_hp[j] = 150; + dudes_dr[j] = 0.5; men += dudes_num[j]; } @@ -1276,76 +1335,82 @@ if __b__ { scr_en_weapon("Power Fist", true, dudes_num[j], dudes[j], j); scr_en_weapon("Bolter", true, dudes_num[j], dudes[j], j); scr_en_weapon("Combi-Flamer", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 40; - dudes_hp[j] = 100; + dudes_ac[j] = 35; + dudes_hp[j] = 125; men += dudes_num[j]; - dudes_dr[j] = 0.7; + dudes_dr[j] = 0.5; } if (dudes[j] = "Venerable Chaos Terminator") { scr_en_weapon("Power Fist", true, dudes_num[j], dudes[j], j); scr_en_weapon("Bolter", true, dudes_num[j], dudes[j], j); scr_en_weapon("Combi-Flamer", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 40; - dudes_hp[j] = 120; + dudes_ac[j] = 35; + dudes_hp[j] = 150; men += dudes_num[j]; - dudes_dr[j] = 0.6; + dudes_dr[j] = 0.5; } if (dudes[j] = "World Eaters Terminator") { scr_en_weapon("Power Fist", true, dudes_num[j] * 2, dudes[j], j); scr_en_weapon("Meltagun", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 40; - dudes_hp[j] = 120; + dudes_ac[j] = 35; + dudes_hp[j] = 150; men += dudes_num[j]; - dudes_dr[j] = 0.6; + dudes_dr[j] = 0.5; } if (dudes[j] = "Obliterator") { scr_en_weapon("Power Fist", true, dudes_num[j], dudes[j], j); scr_en_weapon("Obliterator Weapon", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 200; + dudes_ac[j] = 25; + dudes_hp[j] = 300; + dudes_dr[j] = 0.5; men += dudes_num[j]; } if (dudes[j] = "Chaos Chosen") { scr_en_weapon("Meltagun", true, dudes_num[j], dudes[j], j); scr_en_weapon("Chainsword", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 17; + dudes_ac[j] = 15; dudes_hp[j] = 125; + dudes_dr[j] = 0.85; men += dudes_num[j]; } if (dudes[j] = "Venerable Chaos Chosen") { scr_en_weapon("Meltagun", true, dudes_num[j], dudes[j], j); scr_en_weapon("Chainsword", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 125; + dudes_ac[j] = 15; + dudes_hp[j] = 150; men += dudes_num[j]; dudes_dr[j] = 0.75; } if (dudes[j] = "Possessed") { scr_en_weapon("Possessed Claws", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 17; + dudes_ac[j] = 15; dudes_hp[j] = 150; + dudes_dr[j] = 0.6; men += dudes_num[j]; } if (dudes[j] = "Chaos Space Marine") { scr_en_weapon("Bolter", true, dudes_num[j], dudes[j], j); scr_en_weapon("Chainsword", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; + dudes_ac[j] = 15; dudes_hp[j] = 100; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Havoc") { scr_en_weapon("Missile Launcher", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; + dudes_ac[j] = 15; dudes_hp[j] = 100; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Raptor") { scr_en_weapon("Chainsword", true, dudes_num[j], dudes[j], j); scr_en_weapon("Bolt Pistol", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; + dudes_ac[j] = 15; dudes_hp[j] = 100; + dudes_dr[j] = 0.75; dudes_special[j] = "Jump Pack"; men += dudes_num[j]; } @@ -1353,81 +1418,90 @@ if __b__ { if (dudes[j] = "World Eater") { scr_en_weapon("Bolter", true, dudes_num[j], dudes[j], j); scr_en_weapon("Chainaxe", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; + dudes_ac[j] = 15; dudes_hp[j] = 100; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "World Eaters Veteran") { scr_en_weapon("Combi-Flamer", true, dudes_num[j], dudes[j], j); scr_en_weapon("Chainaxe", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 100; + dudes_ac[j] = 15; + dudes_hp[j] = 125; + dudes_dr[j] = 0.7; men += dudes_num[j]; } if (dudes[j] = "Khorne Berzerker") { scr_en_weapon("Chainaxe", true, dudes_num[j], dudes[j], j); scr_en_weapon("Bolt Pistol", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 100; + dudes_ac[j] = 15; + dudes_hp[j] = 200; + dudes_dr[j] = 0.65; men += dudes_num[j]; } if (dudes[j] = "Plague Marine") { scr_en_weapon("Bolter", true, dudes_num[j], dudes[j], j); scr_en_weapon("Poison Chainsword", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 150; + dudes_ac[j] = 15; + dudes_hp[j] = 180; + dudes_dr[j] = 0.65; men += dudes_num[j]; } if (dudes[j] = "Noise Marine") { scr_en_weapon("Sonic Blaster", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 100; + dudes_ac[j] = 15; + dudes_hp[j] = 125; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "Rubric Marine") { scr_en_weapon("Rubric Bolter", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee1", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 25; - dudes_hp[j] = 125; + dudes_ac[j] = 15; + dudes_hp[j] = 150; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "Rubric Sorcerer") { scr_en_weapon("Witchfire", true, dudes_num[j], dudes[j], j); scr_en_weapon("Force Staff", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 25; + dudes_ac[j] = 15; dudes_hp[j] = 150; + dudes_dr[j] = 0.5; men += dudes_num[j]; } if (dudes[j] = "Cultist") { scr_en_weapon("Autogun", true, dudes_num[j], dudes[j], j); scr_en_weapon("melee0.5", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 0; - dudes_hp[j] = 30; + dudes_ac[j] = 5; + dudes_hp[j] = 35; men += dudes_num[j]; } if (dudes[j] = "Hellbrute") { scr_en_weapon("Power Fist", false, dudes_num[j], dudes[j], j); scr_en_weapon("Meltagun", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; - dudes_hp[j] = 200; - dudes_dr[j] = 0.75; + dudes_hp[j] = 300; + dudes_dr[j] = 0.6; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Rhino") { scr_en_weapon("Storm Bolter", false, dudes_num[j] * 2, dudes[j], j); - dudes_ac[j] = 20; + dudes_ac[j] = 30; dudes_hp[j] = 200; + dudes_dr[j] = 0.75; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Predator") { scr_en_weapon("Lascannon", false, dudes_num[j] * 2, dudes[j], j); scr_en_weapon("Twin Linked Lascannon", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 300; + dudes_ac[j] = 40; + dudes_hp[j] = 350; + dudes_dr[j] = 0.65; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1436,21 +1510,24 @@ if __b__ { scr_en_weapon("Havoc Launcher", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; dudes_hp[j] = 300; + dudes_dr[j] = 0.65; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Land Raider") { scr_en_weapon("Twin Linked Heavy Bolters", false, dudes_num[j], dudes[j], j); scr_en_weapon("Twin Linked Lascannon", false, dudes_num[j] * 2, dudes[j], j); - dudes_ac[j] = 40; + dudes_ac[j] = 50; dudes_hp[j] = 400; + dudes_dr[j] = 0.5; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Heldrake") { scr_en_weapon("Baleflame", false, dudes_num[j] * 5, dudes[j], j); - dudes_ac[j] = 25; + dudes_ac[j] = 40; dudes_hp[j] = 400; + dudes_dr[j] = 0.5; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1461,6 +1538,7 @@ if __b__ { scr_en_weapon("Flamer", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; dudes_hp[j] = 300; + dudes_dr[j] = 0.65; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1468,36 +1546,38 @@ if __b__ { if (dudes[j] = "Arch Heretic") { scr_en_weapon("Power Weapon", true, dudes_num[j], dudes[j], j); scr_en_weapon("Plasma Pistol", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; - dudes_hp[j] = 30; - dudes_dr[j] = 0.7; + dudes_ac[j] = 15; + dudes_hp[j] = 40; + dudes_dr[j] = 0.85; men += dudes_num[j]; } if (dudes[j] = "Cultist Elite") { scr_en_weapon("Lasgun", true, dudes_num[j], dudes[j], j); scr_en_weapon("Chainaxe", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 10; - dudes_hp[j] = 20; + dudes_hp[j] = 40; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Mutant") { scr_en_weapon("Flesh Hooks", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 0; - dudes_hp[j] = 30; + dudes_ac[j] = 5; + dudes_hp[j] = 50; men += dudes_num[j]; } if (dudes[j] = "Daemonhost") { scr_en_weapon("Daemonhost Claws", true, dudes_num[j], dudes[j], j); scr_en_weapon("Daemonhost_Powers", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 30; - dudes_hp[j] = 300; - dudes_dr[j] = 0.5; + dudes_ac[j] = 15; + dudes_hp[j] = 200; + dudes_dr[j] = 0.7; medi += dudes_num[j]; } if (dudes[j] = "Possessed") { scr_en_weapon("Possessed Claws", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 17; + dudes_ac[j] = 10; dudes_hp[j] = 100; + dudes_dr[j] = 0.75; men += dudes_num[j]; } @@ -1511,8 +1591,9 @@ if __b__ { if (dudes[j] = "Technical") { scr_en_weapon("Autogun", false, dudes_num[j] * 2, dudes[j], j); scr_en_weapon("Heavy Bolter", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 20; dudes_hp[j] = 100; + dudes_dr[j] = 0.75; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1522,14 +1603,16 @@ if __b__ { scr_en_weapon("Heavy Bolter", false, dudes_num[j], dudes[j], j); dudes_ac[j] = 40; dudes_hp[j] = 250; + dudes_dr[j] = 0.5; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Chaos Basilisk") { scr_en_weapon("Earthshaker Cannon", false, dudes_num[j], dudes[j], j); scr_en_weapon("Heavy Bolter", false, dudes_num[j], dudes[j], j); - dudes_ac[j] = 20; + dudes_ac[j] = 30; dudes_hp[j] = 150; + dudes_dr[j] = 0.75; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1557,53 +1640,59 @@ if __b__ { scr_en_weapon("Staff of Light", true, dudes_num[j], dudes[j], j); scr_en_weapon("Staff of Light Shooting", true, dudes_num[j], dudes[j], j); if (obj_ncombat.started = 0) or(dudes_num[j] > 1) { - dudes_ac[j] = 25; + dudes_ac[j] = 15; dudes_hp[j] = 300; + dudes_dr[j] = 0.5; } men += dudes_num[j]; } if (dudes[j] = "Lychguard") { scr_en_weapon("Warscythe", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 35; + dudes_ac[j] = 25; dudes_hp[j] = 100; + dudes_dr[j] = 0.75; men += dudes_num[j]; } if (dudes[j] = "Flayed One") { scr_en_weapon("Melee5", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 25; - dudes_hp[j] = 100; + dudes_ac[j] = 10; + dudes_hp[j] = 75; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Necron Warrior") { scr_en_weapon("Gauss Flayer", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee3", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 25; - dudes_hp[j] = 100; + dudes_ac[j] = 10; + dudes_hp[j] = 75; + dudes_dr[j] = 0.9; men += dudes_num[j]; } if (dudes[j] = "Necron Immortal") { scr_en_weapon("Gauss Blaster", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee3", true, dudes_num[j], dudes[j], j); - dudes_ac[j] = 25; - dudes_hp[j] = 100; + dudes_ac[j] = 15; + dudes_hp[j] = 90; + dudes_dr[j] = 0.85; men += dudes_num[j]; } if (dudes[j] = "Necron Wraith") { scr_en_weapon("Wraith Claws", true, dudes_num[j], dudes[j], j); if (obj_ncombat.started = 0) or(dudes_num[j] > 1) { - dudes_ac[j] = 25; + dudes_ac[j] = 10; dudes_hp[j] = 200; } men += dudes_num[j]; - dudes_dr[j] = 0.65; + dudes_dr[j] = 0.75; } if (dudes[j] = "Necron Destroyer") { scr_en_weapon("Gauss Cannon", true, dudes_num[j], dudes[j], j); scr_en_weapon("Melee3", true, dudes_num[j], dudes[j], j); dudes_ac[j] = 25; - dudes_hp[j] = 175; + dudes_hp[j] = 250; + dudes_dr[j] = 0.75; men += dudes_num[j]; } @@ -1613,41 +1702,45 @@ if __b__ { scr_en_weapon("Claws", false, dudes_num[j] * 5, dudes[j], j); if (obj_ncombat.started = 0) or(dudes_num[j] > 1) { dudes_ac[j] = 30; - dudes_hp[j] = 600; + dudes_hp[j] = 300; } + dudes_dr[j] = 0.65; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Canoptek Spyder") { scr_en_weapon("Claws", false, dudes_num[j] * 2, dudes[j], j); if (obj_ncombat.started = 0) or(dudes_num[j] > 1) { - dudes_ac[j] = 30; - dudes_hp[j] = 300; + dudes_ac[j] = 20; + dudes_hp[j] = 200; } + dudes_dr[j] = 0.80; veh += dudes_num[j]; dudes_vehicle[j] = 1; } if (dudes[j] = "Canoptek Scarab") { scr_en_weapon("Melee3", false, dudes_num[j] * 2, dudes[j], j); - dudes_ac[j] = 10; + dudes_ac[j] = 5; dudes_hp[j] = 30; + dudes_dr[j] = 0.75; men += dudes_num[j]; dudes_vehicle[j] = 0; } if (dudes[j] = "Necron Monolith") { scr_en_weapon("Gauss Flux Arc", false, dudes_num[j] * 4, dudes[j], j); scr_en_weapon("Particle Whip", false, dudes_num[j] * 1, dudes[j], j); - dudes_ac[j] = 70; - dudes_hp[j] = 300; + dudes_ac[j] = 40; + dudes_hp[j] = 500; + dudes_dr[j] = 0.5; veh += dudes_num[j]; dudes_vehicle[j] = 1; - // was 50 / 500 } if (dudes[j] = "Doomsday Arc") { scr_en_weapon("Gauss Flayer Array", false, dudes_num[j] * 2, dudes[j], j); scr_en_weapon("Doomsday Cannon", false, dudes_num[j] * 1, dudes[j], j); dudes_ac[j] = 30; - dudes_hp[j] = 150; + dudes_hp[j] = 350; + dudes_dr[j] = 0.65; veh += dudes_num[j]; dudes_vehicle[j] = 1; } @@ -1679,16 +1772,14 @@ if (obj_ncombat.battle_special = "ruins") or(obj_ncombat.battle_special = "ruins */ if (men + veh + medi <= 0) { - instance_destroy(); + instance_destroy(id); exit; } if (obj_ncombat.started = 0) { obj_ncombat.enemy_forces += self.men + self.veh + self.medi; } - -if (!collision_point(x + 10, y, obj_pnunit, 0, 1)) and(!collision_point(x - 10, y, obj_pnunit, 0, 1)) then engaged = 0; -if (collision_point(x + 10, y, obj_pnunit, 0, 1)) or(collision_point(x - 10, y, obj_pnunit, 0, 1)) then engaged = 1; +engaged = (collision_point(x + 12, y, obj_pnunit, 0, 1)) or(collision_point(x - 12, y, obj_pnunit, 0, 1)); if (neww = 1) then neww = 0; diff --git a/objects/obj_enunit/obj_enunit.yy b/objects/obj_enunit/obj_enunit.yy index d6b979d297..81d72921bc 100644 --- a/objects/obj_enunit/obj_enunit.yy +++ b/objects/obj_enunit/obj_enunit.yy @@ -31,8 +31,8 @@ "physicsSensor":false, "physicsShape":0, "physicsShapePoints":[ - {"x":0,"y":0,}, - {"x":5,"y":5,}, + {"x":0.0,"y":0.0,}, + {"x":5.0,"y":5.0,}, ], "physicsStartAwake":true, "properties":[], diff --git a/objects/obj_event_log/Draw_0.gml b/objects/obj_event_log/Draw_0.gml index 34d8e07b63..6b22dfde5b 100644 --- a/objects/obj_event_log/Draw_0.gml +++ b/objects/obj_event_log/Draw_0.gml @@ -3,7 +3,7 @@ __b__ = action_if_variable(help, 0, 0); if (__b__) { var bad = 1; if (instance_exists(obj_controller)) { - if (obj_controller.menu = 17) { + if (obj_controller.menu == MENU.EventLog) { bad = 0; } } @@ -17,7 +17,7 @@ if (__b__) { draw_set_alpha(0.5); draw_sprite(spr_rock_bg, 0, xx, yy); draw_set_alpha(1); - draw_set_color(c_gray); // 38144 + draw_set_color(c_gray); // CM_GREEN_COLOR draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); draw_text(xx + 800, yy + 74, string(global.chapter_name) + " Event Log"); @@ -26,7 +26,7 @@ if (__b__) { p = -1, cur_event; var ent = array_length(event); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); if (ent == 0) { draw_text(xx + 25, yy + 120, "No entries logged."); } else { @@ -43,8 +43,7 @@ if (__b__) { if (point_and_click(draw_unit_buttons([xx + 1400, yy + 120 + (p * 26)], "View", [1, 1], c_green, , fnt_40k_14b, 1,true))) { var view_star = star_by_name(cur_event.event_target); if (view_star != "none") { - obj_controller.menu = 0; - obj_controller.hide_banner = 0; + main_map_defaults(); obj_controller.x = view_star.x; obj_controller.y = view_star.y; } @@ -86,7 +85,7 @@ if (__b__) { draw_sprite(spr_help_exit, 1, xx + 1104, yy + 72); if (scr_click_left()) { with(obj_controller) { - menu = 0; + main_map_defaults(); onceh = 1; click = 1; hide_banner = 0; diff --git a/objects/obj_fleet/Alarm_1.gml b/objects/obj_fleet/Alarm_1.gml index 8a1f4a4ff8..e4450c8a7c 100644 --- a/objects/obj_fleet/Alarm_1.gml +++ b/objects/obj_fleet/Alarm_1.gml @@ -34,17 +34,40 @@ if (enemy=6){ if (enemy=7){ - var i;i=0;i=en_capital; - - if (i>0){en_column[1]="Dethdeala";en_num[1]=floor(random(i))+1;i-=en_num[1];en_size[1]=3;} + var i=en_capital; - if (i>0){en_column[2]="Gorbag's Revenge";en_num[2]=floor(random(i))+1;i-=en_num[2];en_size[2]=3;}// en_num[2]+=en_num[1]+1; - - if (i>0){en_column[3]="Kroolboy";en_num[3]=i;i-=en_num[3];en_size[3]=3;}// en_num[3]+=en_num[2]+1; + if (i>0){ + en_column[1]="Dethdeala"; + en_num[1]=irandom_range(1, i); + i-=en_num[1]; + en_size[1]=3; + } - if (en_frigate>0){en_column[4]="Battlekroozer";en_num[4]=en_frigate;en_size[4]=2;}// en_num[4]+=en_num[3]+1; + if (i>0){ + en_column[2]="Gorbag's Revenge"; + en_num[2]=irandom_range(1, i); + i-=en_num[2]; + en_size[2]=3; + }// en_num[2]+=en_num[1]+1; - if (en_escort>0){en_column[5]="Ravager";en_num[5]=en_escort;en_size[5]=1;}// en_num[5]+=en_num[4]+1; + if (i>0){ + en_column[3]="Kroolboy"; + en_num[3]=i; + i-=en_num[3]; + en_size[3]=3; + }// en_num[3]+=en_num[2]+1; + + if (en_frigate>0){ + en_column[4]="Battlekroozer"; + en_num[4]=en_frigate; + en_size[4]=2; + }// en_num[4]+=en_num[3]+1; + + if (en_escort>0){ + en_column[5]="Ravager"; + en_num[5]=en_escort; + en_size[5]=1; + }// en_num[5]+=en_num[4]+1; } if (enemy=8){ diff --git a/objects/obj_fleet/Alarm_4.gml b/objects/obj_fleet/Alarm_4.gml index dada200d89..605cd4a9b5 100644 --- a/objects/obj_fleet/Alarm_4.gml +++ b/objects/obj_fleet/Alarm_4.gml @@ -35,16 +35,14 @@ if (player_started=1){ if (instance_exists(obj_star_select)) then with(obj_star_select){ alarm[1]=1;player_fleet=0; - var i;i=-1;repeat(15){i+=1;en_fleet[i]=0;} + var i=-1;repeat(15){i+=1;en_fleet[i]=0;} } if (instance_exists(pla_fleet)){ pla_fleet.acted=2; if (capital+frigate+escort=0) then with(pla_fleet){instance_destroy();} } if (enemy[1]!=4) and (obj_controller.faction_status[enemy[1]]!="War"){ - obj_controller.audiences+=1;obj_controller.audien[obj_controller.audiences]=enemy[1]; - obj_controller.audien_topic[obj_controller.audiences]="declare_war"; - obj_controller.disposition[enemy[1]]-=20; + scr_audience(enemy[1], "declare_war", obj_controller.disposition[enemy[1]]-20, "War", 3, 2); } } diff --git a/objects/obj_fleet/Draw_64.gml b/objects/obj_fleet/Draw_64.gml index 4e7986415a..dd80258628 100644 --- a/objects/obj_fleet/Draw_64.gml +++ b/objects/obj_fleet/Draw_64.gml @@ -1,4 +1,4 @@ -var _ui_green = #009500; +var _ui_green = CM_GREEN_COLOR var _text_color = #080000; var _surface_w = surface_get_width(application_surface); var _surface_h = surface_get_height(application_surface); diff --git a/objects/obj_fleet_controller/Draw_0.gml b/objects/obj_fleet_controller/Draw_0.gml index 18c0496280..b8410aa1df 100644 --- a/objects/obj_fleet_controller/Draw_0.gml +++ b/objects/obj_fleet_controller/Draw_0.gml @@ -4,30 +4,27 @@ if (obj_controller.zoomed=1) then draw_sprite(spr_space_bg,0,0,0); exit; -draw_set_color(38144); +draw_set_color(CM_GREEN_COLOR); draw_set_font(fnt_menu); - -if (zoomed=0){ - draw_text(__view_get( e__VW.XView, 0 )+0,__view_get( e__VW.YView, 0 )+0,string_hash_to_newline("Morale: High")); - draw_text(__view_get( e__VW.XView, 0 )+1,__view_get( e__VW.YView, 0 )+0,string_hash_to_newline("Morale:")); +//if (zoomed=0){ +// draw_text(__view_get( e__VW.XView, 0 )+0,__view_get( e__VW.YView, 0 )+0,string_hash_to_newline("Morale: High")); +// draw_text(__view_get( e__VW.XView, 0 )+1,__view_get( e__VW.YView, 0 )+0,string_hash_to_newline("Morale:")); - draw_text(__view_get( e__VW.XView, 0 )+0,__view_get( e__VW.YView, 0 )+16,string_hash_to_newline("Ships Remaining: "+string(instance_number(obj_p_ship)))); - draw_text(__view_get( e__VW.XView, 0 )+1,__view_get( e__VW.YView, 0 )+16,string_hash_to_newline("Ships Remaining:")); +// draw_text(__view_get( e__VW.XView, 0 )+0,__view_get( e__VW.YView, 0 )+16,string_hash_to_newline("Ships Remaining: "+string(instance_number(obj_p_ship)))); +// draw_text(__view_get( e__VW.XView, 0 )+1,__view_get( e__VW.YView, 0 )+16,string_hash_to_newline("Ships Remaining:")); - draw_text(__view_get( e__VW.XView, 0 )+0,__view_get( e__VW.YView, 0 )+32,string_hash_to_newline("Thunderhawks: "+string(instance_number(obj_p_th)))); - draw_text(__view_get( e__VW.XView, 0 )+1,__view_get( e__VW.YView, 0 )+32,string_hash_to_newline("Thunderhawks:")); -} +// draw_text(__view_get( e__VW.XView, 0 )+0,__view_get( e__VW.YView, 0 )+32,string_hash_to_newline("Thunderhawks: "+string(instance_number(obj_p_th)))); +// draw_text(__view_get( e__VW.XView, 0 )+1,__view_get( e__VW.YView, 0 )+32,string_hash_to_newline("Thunderhawks:")); +//} -if (zoomed=1){ - draw_text_transformed(0,0,string_hash_to_newline("Morale: High"),2,2,0); - draw_text_transformed(2,0,string_hash_to_newline("Morale:"),2,2,0); +//if (zoomed=1){ +// draw_text_transformed(0,0,string_hash_to_newline("Morale: High"),2,2,0); +// draw_text_transformed(2,0,string_hash_to_newline("Morale:"),2,2,0); - draw_text_transformed(0,32,string_hash_to_newline("Ships Remaining: "+string(instance_number(obj_p_ship))),2,2,0); - draw_text_transformed(2,32,string_hash_to_newline("Ships Remaining:"),2,2,0); +// draw_text_transformed(0,32,string_hash_to_newline("Ships Remaining: "+string(instance_number(obj_p_ship))),2,2,0); +// draw_text_transformed(2,32,string_hash_to_newline("Ships Remaining:"),2,2,0); - draw_text_transformed(0,64,string_hash_to_newline("Thunderhawk: "+string(instance_number(obj_p_th))),2,2,0); - draw_text_transformed(2,64,string_hash_to_newline("Thunderhawk:"),2,2,0); -} - - +// draw_text_transformed(0,64,string_hash_to_newline("Thunderhawk: "+string(instance_number(obj_p_th))),2,2,0); +// draw_text_transformed(2,64,string_hash_to_newline("Thunderhawk:"),2,2,0); +//} diff --git a/objects/obj_fleet_select/Create_0.gml b/objects/obj_fleet_select/Create_0.gml index 7483d4d642..7fd220a21a 100644 --- a/objects/obj_fleet_select/Create_0.gml +++ b/objects/obj_fleet_select/Create_0.gml @@ -18,6 +18,8 @@ void_wid=0; void_hei=0; player_fleet=false; +helpful_navigator=new HelpfulPlaces(); + selection_window.inside_method = function(){ var mnz=0; var xx = selection_window.XX; @@ -54,19 +56,16 @@ selection_window.inside_method = function(){ var math_string = (string_width("Manage Units")/2)+6 if (point_and_click(draw_unit_buttons([center_draw-math_string, yy+height-50], "Manage Units",[1,1],c_blue))){ - var fleet_array = fleet_full_ship_array(current_fleet); - var fleet_marines_temp = []; - var fleet_marines = []; - for (var i = 0; i < array_length(fleet_array); i++) { - fleet_marines_temp = collect_role_group("all", ["", 0, fleet_array[i]]); - array_copy(fleet_marines, array_length(fleet_marines), fleet_marines_temp, 0, array_length(fleet_marines_temp)); - } - group_selection(fleet_marines,{ + var _fleet_array = fleet_full_ship_array(current_fleet); + var _fleet_marines = collect_role_group("all", ["", 0, _fleet_array]); + + group_selection(_fleet_marines,{ purpose:"Ship Management", purpose_code : "manage", number:0, system:0, + ships : _fleet_array, feature:"none", planet : 0, selections : [] @@ -148,7 +147,7 @@ selection_window.inside_method = function(){ colu++; }*/ - if (posi<=escorts+frigates+capitals) && is_array(ship_type){ + if (posi<=escorts+frigates+capitals) && is_array(ship_type) && current_ship179){ for (var i=0;i<9;i++){ @@ -204,5 +203,5 @@ selection_window.inside_method = function(){ } } } - selection_window.currently_entered = scr_hit([xx,yy, xx+width, yy+selection_window.height]); + selection_window.currently_entered = scr_hit([xx,yy, xx+width, yy+selection_window.height]) || helpful_navigator.entered(); } diff --git a/objects/obj_fleet_select/Draw_0.gml b/objects/obj_fleet_select/Draw_0.gml index 4dfc540e23..325f0c0ba3 100644 --- a/objects/obj_fleet_select/Draw_0.gml +++ b/objects/obj_fleet_select/Draw_0.gml @@ -9,7 +9,7 @@ if __b__ if (obj_controller.diplomacy>0) then exit; -draw_set_color(38144); +draw_set_color(CM_GREEN_COLOR); draw_set_font(fnt_40k_14b); draw_set_halign(fa_center); @@ -32,7 +32,9 @@ switch(owner){ } // var scale = obj_controller.zoomed ? 3.5 : 1; -if (obj_controller.zoomed=0) then draw_text_transformed(x,y-32,ppp,scale,scale,0); +if (!obj_controller.zoomed){ + draw_text_transformed(x,y-32,ppp,scale,scale,0); +} draw_set_halign(fa_left); @@ -54,7 +56,7 @@ if (player_fleet.just_left){ } } -if (owner == eFACTION.Player) and (player_fleet.action==""){ +if (owner == eFACTION.Player && player_fleet.action==""){ var xx = __view_get( e__VW.XView, 0 ); var yy = __view_get( e__VW.YView, 0 ); var free = !(currently_entered); diff --git a/objects/obj_fleet_select/Draw_64.gml b/objects/obj_fleet_select/Draw_64.gml index e60038a76e..47af67f18c 100644 --- a/objects/obj_fleet_select/Draw_64.gml +++ b/objects/obj_fleet_select/Draw_64.gml @@ -28,7 +28,7 @@ try { var center_draw = xx + (selection_window.width / 2); var width = selection_window.width; draw_set_halign(fa_center); - draw_text(center_draw, yy + 50, string_hash_to_newline(string(global.chapter_name) + " Fleet")); + draw_text(center_draw, yy + 50,$"{global.chapter_name} Fleet"); draw_set_halign(fa_left); draw_set_color(c_gray); @@ -52,3 +52,9 @@ try { handle_exception(_exception); instance_destroy(); } + + +helpful_navigator.draw(); + + + diff --git a/objects/obj_fleet_spawner/Draw_0.gml b/objects/obj_fleet_spawner/Draw_0.gml index cb48592d00..66553f6253 100644 --- a/objects/obj_fleet_spawner/Draw_0.gml +++ b/objects/obj_fleet_spawner/Draw_0.gml @@ -6,7 +6,7 @@ var y1,y2; y1=y-(height/2); y2=y+(height/2); -draw_set_color(38144);draw_set_alpha(1); +draw_set_color(CM_GREEN_COLOR);draw_set_alpha(1); if (x<800) then draw_rectangle(-300,y1,300,y2,0); if (x>800) then draw_rectangle((room_width)-300,y1,room_width+300,y2,0); diff --git a/objects/obj_garbage_collector/Step_0.gml b/objects/obj_garbage_collector/Step_0.gml index 88117f46f7..5ef4516a81 100644 --- a/objects/obj_garbage_collector/Step_0.gml +++ b/objects/obj_garbage_collector/Step_0.gml @@ -2,9 +2,10 @@ if (gc_timer > 0) { gc_timer -= 1; // show_debug_message($"obj_garbage_collector: gc_timer = {gc_timer}"); } else { - - - gc_timer = 50; // Default is every frame, so de-facto 1; + gc_timer = 50; + switch (os_type){ + case os_macosx: gc_timer = 10000; break; + } gc_collect(); wait_and_execute(0, function(){ @@ -22,4 +23,4 @@ if (gc_timer > 0) { } log_message(_gc_message); }); -} \ No newline at end of file +} diff --git a/objects/obj_ground_mission/Alarm_0.gml b/objects/obj_ground_mission/Alarm_0.gml index fcf3bbab78..8a5cc06fed 100644 --- a/objects/obj_ground_mission/Alarm_0.gml +++ b/objects/obj_ground_mission/Alarm_0.gml @@ -1,141 +1,13 @@ +if (num > 0) { + // Hmmmmmmm + var stah; + stah = instance_nearest(x, y, obj_star); + obj_controller.menu = 0; - -if (num>0){// Hmmmmmmm - var stah;stah=instance_nearest(x,y,obj_star); - obj_controller.menu=0; - - - if (planet_feature_bool(stah.p_feature[num], P_features.STC_Fragment)==1){// STC is present - if (tch>0) and (mch=0){ - var pop,own; - pop=instance_create(0,0,obj_popup); - pop.image="stc"; - pop.title="STC Fragment Located"; - - - if (stah.p_owner[num]!=3) then pop.text="An STC Fragment has been located upon "+string(stah.name)+" "+string(num)+"; what it might contain is unknown. Your "+string(obj_ini.role[100][16])+"s wish to reclaim, identify, and put it to use immediately. What is thy will?"; - if (stah.p_owner[num]=3) then pop.text="An STC Fragment has been located upon "+string(stah.name)+" "+string(num)+"; what it might contain is unknown. It appears to be located deep within a Mechanicus Vault. Taking it may be seen as an act of war. What is thy will?"; - - - own=stah.p_owner[num]; - pop.option1="Swiftly take the STC Fragment."; - pop.option2="Leave it."; - } - if (tch>0) and (mch>0){ - if (stah.p_owner[num]!=3){ - var pop,own; - pop=instance_create(0,0,obj_popup); - pop.image="stc"; - pop.title="STC Fragment Located"; - // pop.text="An STC Fragment has been located upon "+string(stah.name)+" "+string(num)+". Your "+string(obj_ini.role[100][16])+"s and present Mechanicus Techpriests are bickering over what should be done with it. What is thy will?"; - - pop.text="An STC Fragment has been located upon "+string(stah.name)+" "+string(num)+". Your "+string(obj_ini.role[100][16])+"s wish to reclaim, identify, and put it to use immediately, and the Tech Priests wish to send it to the closest forge world. What is thy will?"; - // if (stah.p_owner[num]=3) then pop.text="An STC Fragment has been located upon "+string(stah.name)+" "+string(num)+". It appears to be located deep within a Mechanicus Vault. The present Tech Priests warn that taking it will be seen as an act of war. What is thy will?"; - - own=stah.p_owner[num]; - pop.option1="Swiftly take the STC Fragment."; - pop.option2="Leave it."; - pop.option3="Send it to the Adeptus Mechanicus."; - } - } - if (tch=0) and (mch>0){ - if (stah.p_owner[num]!=3){ - var pop,own; - pop=instance_create(0,0,obj_popup); - pop.image="stc"; - pop.title="STC Fragment Located"; - pop.text="An STC Fragment has been located upon "+string(stah.name)+" "+string(num)+"; what it might contain is unknown. The present Tech Priests wish to send it to Mars, and refuse to take the device off-world otherwise."; - - own=stah.p_owner[num]; - pop.option1="Leave it."; - pop.option2="Send it to the Adeptus Mechanicus."; - } - } - if (mch>0) and (stah.p_owner[num]=3){ - var pop,own; - pop=instance_create(0,0,obj_popup); - pop.image="stc"; - pop.title="STC Fragment Located"; - pop.text="An STC Fragment has been located upon "+string(stah.name)+" "+string(num)+". It appears to be located deep within a Mechanicus Vault. The present Tech Priests stress they will not condone a mission to steal the STC Fragment."; - - own=stah.p_owner[num]; - - - scr_return_ship(loc,id,num); - var man_size,ship_id,comp,plan,i; - i=0;ship_id=0;man_size=0;comp=0;plan=0; - repeat(30){i+=1;if (obj_ini.ship[i]=loc) then ship_id=i;}i=0; - obj_controller.menu=0;obj_controller.managing=0; - obj_controller.cooldown=10; - instance_destroy();exit; - - // pop.option1="Leave it."; - // get bitched at by the mechanicus - } - - pop.ma_co=tch;pop.ma_id=mch; - pop.target_comp=stah.p_owner[num]; + if (planet_feature_bool(stah.p_feature[num], P_features.STC_Fragment) == 1) { // STC is present } - - - - if (planet_feature_bool(stah.p_feature[num], P_features.Artifact)==1){// Artifact is present - if (stah.p_type[num]="Dead") or (stah.p_owner[num]=1){alarm[4]=1;exit;} - - var pop,own; - pop=instance_create(0,0,obj_popup); - pop.image="artifact"; - pop.title="Artifact Located"; - pop.text="The Artifact has been located upon "+string(stah.name)+" "+string(num)+"; its condition and class are unlikely to be determined until returned to the ship. What is thy will?"; - - own=stah.p_owner[num]; - - // show_message(own); - - if (stah.p_first[num]=3) and (stah.p_owner[num]>5){ - if (stah.p_pdf[num]>0) then own=3; - } - - pop.option1="Request audience with the " - if (own=1){ - pop.option1+="Planetary Governor"; - pop.option3="Gift the Artifact to the Sector Commander."; - } - if (own=2){ - pop.option1+="Planetary Governor"; - pop.option3="Gift the Artifact to the Sector Commander.";} - if (own=3){ - pop.option1+="Mechanicus"; - pop.option3="Let it be. The Mechanicus' wrath is not lightly provoked.";} - if (own=4){ - pop.option1+="Inquisition"; - pop.option3="Let it be. The Inquisition's wrath is not lightly provoked.";} - if (own=5){pop.option1+="Ecclesiarchy";pop.option3="Gift the Artifact to the Ecclesiarchy.";} - if (own=6){pop.option1+="Eldar";pop.option3="Gift the Artifact to the Eldar.";} - if (own=8){pop.option1+="Tau";pop.option3="Gift the Artifact to the Tau Empire.";} - - pop.option1+=" regarding the Artifact."; - pop.option2="Swiftly take the Artifact."; - pop.target_comp=stah.p_owner[num]; - - if (own>=9) or ((own=7) and (stah.p_pdf[num]<=0)){ - pop.option1="Swiftly take the Artifact."; - pop.option2="Let it be."; - pop.option3=""; - } - - // show_message(string(pop.option1)+"/"+string(pop.option2)+"/"+string(pop.option3)); - - /*if (pop.option1=""){ - pop.option1="Swiftly take the Artifact."; - pop.option2="Let it be."; - pop.option3=""; - }*/ + + if (planet_feature_bool(stah.p_feature[num], P_features.Artifact) == 1) { // Artifact is present } - - } - -/* */ -/* */ diff --git a/objects/obj_ground_mission/Alarm_1.gml b/objects/obj_ground_mission/Alarm_1.gml deleted file mode 100644 index 34a9a5d1a0..0000000000 --- a/objects/obj_ground_mission/Alarm_1.gml +++ /dev/null @@ -1,35 +0,0 @@ - - -if (num>0){// Hmmmmmmm - var stah;stah=instance_nearest(x,y,obj_star); - - if (planet_feature_bool(stah.p_feature[num], P_features.Artifact)==1){// Artifact is present - var pop; - pop=instance_create(0,0,obj_popup); - pop.image="artifact2"; - pop.title="Artifact Located"; - pop.text="Trading for the the Artifact on "+string(stah.name)+" "+string(num)+" has not been fruitful. What is thy will?"; - - if (stah.p_owner[num]=2){pop.option2="Gift the Artifact to the Sector Commander.";} - if (stah.p_owner[num]=3){pop.option2="Let it be. The Mechanicus' wrath is not lightly provoked.";} - if (stah.p_owner[num]=4){pop.option2="Let it be. The Inquisition's wrath is not lightly provoked.";} - - if (stah.p_owner[num]>4) then pop.option2="Let it be."; - - if (stah.p_owner[num]=5){pop.option2="Gift the Artifact to the Ecclesiarchy.";} - if (stah.p_owner[num]=6){pop.option2="Gift the Artifact to the Eldar.";} - if (stah.p_owner[num]=8){pop.option2="Gift the Artifact to the Tau Empire.";} - - pop.option1="Swiftly take the Artifact."; - pop.target_comp=stah.p_owner[num]; - - if (stah.p_owner[num]>=9) or (stah.p_owner[num]=7){ - pop.option1="Swiftly take the Artifact."; - pop.option2="Let it be."; - } - - } - - -} - diff --git a/objects/obj_ground_mission/Alarm_2.gml b/objects/obj_ground_mission/Alarm_2.gml deleted file mode 100644 index 05dd140bec..0000000000 --- a/objects/obj_ground_mission/Alarm_2.gml +++ /dev/null @@ -1,29 +0,0 @@ - -scr_return_ship(loc,self,num); - -var man_size,ship_id,comp,plan,i; -i=0;ship_id=0;man_size=0;comp=0;plan=0; -ship_id = get_valid_player_ship("", loc); -plan=instance_nearest(x,y,obj_star); -last_artifact = scr_add_artifact("random","random",4,loc,ship_id+500); - -var pop=instance_create(0,0,obj_popup); -pop.image="artifact_recovered"; -pop.title="Artifact Recovered!"; -pop.text=$"The Artifact has been safely stowed away upon {loc}. It appears to be a {obj_ini.artifact[last_artifact]} but should be brought home and identified posthaste."; -with(obj_star_select){instance_destroy();} -with(obj_fleet_select){instance_destroy();} -delete_features(plan.p_feature[num], P_features.Artifact); -scr_event_log("","Artifact recovered."); - -corrupt_artifact_collectors(last_artifact); - -obj_controller.trading_artifact=0; -var h=0; -repeat(4){ - h+=1; - obj_controller.diplo_option[h]=""; - obj_controller.diplo_goto[h]=""; -} -instance_destroy(); - diff --git a/objects/obj_ground_mission/Alarm_3.gml b/objects/obj_ground_mission/Alarm_3.gml deleted file mode 100644 index 8894266c93..0000000000 --- a/objects/obj_ground_mission/Alarm_3.gml +++ /dev/null @@ -1,38 +0,0 @@ - -scr_return_ship(loc,self,num); - -var man_size,ship_id,comp,plan,i; -i=0; -ship_id=0; -man_size=0; -comp=0; -plan=0; - -ship_id = get_valid_player_ship("", loc); - -i=0; -plan=instance_nearest(x,y,obj_star); -last_artifact = scr_add_artifact("random","random",4,loc,ship_id+500); - - -var pop; -pop=instance_create(0,0,obj_popup); -pop.image="artifact_recovered"; -pop.title="Artifact Recovered!"; -pop.text="The Planetary Governor hands over the Artifact without asking for compensation.##It has been safely stowed away upon "+string(loc)+". It appears to be a "+string(obj_ini.artifact[last_artifact])+" but should be brought home and identified posthaste."; -with(obj_star_select){instance_destroy();} -with(obj_fleet_select){instance_destroy();} -delete_features(plan.p_feature[num], P_features.Artifact); -scr_event_log("","Planetary Governor hands over Artifact."); - -corrupt_artifact_collectors(last_artifact); - -obj_controller.trading_artifact=0; -var h=0; -repeat(4){ - h+=1; - obj_controller.diplo_option[h]=""; - obj_controller.diplo_goto[h]=""; -} -instance_destroy(); - diff --git a/objects/obj_ground_mission/Alarm_4.gml b/objects/obj_ground_mission/Alarm_4.gml deleted file mode 100644 index 8dd5679466..0000000000 --- a/objects/obj_ground_mission/Alarm_4.gml +++ /dev/null @@ -1,115 +0,0 @@ - -scr_return_ship(loc,self,num); - -var man_size,ship_id,comp,planet,i; -i=0;ship_id=0;man_size=0;comp=0;planet=0; -ship_id = get_valid_player_ship("", loc); -planet=instance_nearest(x,y,obj_star); -var last_artifact = scr_add_artifact("random","random",4,loc,ship_id+500); - -var i=0; - - - - - -var mission,mission_roll; -mission="bad";mission_roll=floor(random(100))+1; -if (scr_has_adv("Ambushers")) then mission_roll-=15; -if (mission_roll<=60) then mission="good";// 135 -if (planet.p_type[num]="Dead") then mission="good"; -// mission="bad"; - -var pop; -pop=instance_create(0,0,obj_popup); -pop.image="artifact_recovered"; -pop.title="Artifact Recovered!"; - -if (mission="good"){ - pop.text="Your marines quickly converge upon the Artifact and remove it, before local forces have any idea of what is happening.##"; - pop.text+="It has been stowed away upon "+string(loc)+". It appears to be a "+string(obj_ini.artifact[last_artifact])+" but should be brought home and identified posthaste."; - scr_event_log("","Artifact has been forcibly recovered."); - - if (planet.p_type[num]!="Dead"){ - if (planet.p_owner[num]=2) then obj_controller.disposition[2]-=1; - if (planet.p_owner[num]=3) then obj_controller.disposition[3]-=10;// max(obj_controller.disposition/4,10) - if (planet.p_owner[num]=4) then obj_controller.disposition[4]-=max(obj_controller.disposition[4]/4,10); - if (planet.p_owner[num]=5) then obj_controller.disposition[5]-=3; - if (planet.p_owner[num]=8) then obj_controller.disposition[8]-=3; - } -} -if (mission="bad"){ - pop.text="Your marines converge upon the Artifact; resistance is light and easily dealt with. After a brief firefight the Artifact is retrieved.##"; - pop.text+=$"It has been stowed away upon {loc}. It appears to be a "+string(obj_ini.artifact[last_artifact])+" but should be brought home and identified posthaste."; - scr_event_log("red","Artifact forcibly recovered. Collateral damage is caused."); - - if (planet.p_owner[num]=2) then obj_controller.disposition[2]-=2; - if (planet.p_owner[num]=3) then obj_controller.disposition[3]-=max(obj_controller.disposition[3]/3,20); - if (planet.p_owner[num]=4) then obj_controller.disposition[4]-=max(obj_controller.disposition[4]/3,20); - if (planet.p_owner[num]=5) then obj_controller.disposition[5]-=max(obj_controller.disposition[3]/4,15); - if (planet.p_owner[num]=6) then obj_controller.disposition[6]-=15; - if (planet.p_owner[num]=8) then obj_controller.disposition[8]-=8; - - if (planet.p_owner[num]>=3) and (planet.p_owner[num]<=6){ - obj_controller.audiences+=1; - obj_controller.audien[obj_controller.audiences]=planet.p_owner[num]; - obj_controller.audien_topic[obj_controller.audiences]="artifact_angry"; - } -} - - -if (scr_has_adv("Tech-Scavengers")){ - var ex1,ex1_num,ex2,ex2_num,ex3,ex3_num; - ex1="";ex1_num=0;ex2="";ex2_num=0;ex3="";ex3_num=0; - - var stah=instance_nearest(x,y,obj_star); - - if (stah.p_first[num]=2){ - ex1="Meltagun";ex1_num=choose(2,3,4); - ex2="Flamer"; - ex2_num=choose(2,3,4); - ex3=choose("Power Fist","Chainsword","Bolt Pistol"); - ex3_num=choose(2,3,4,5); - } - if (stah.p_first[num]=3){ - ex1="Plasma Pistol"; - ex1_num=choose(1,2); - ex2="Power Armour"; - ex2_num=choose(2,3,4); - ex3=choose("Servo-arm","Bionics"); - ex3_num=choose(2,3,4); - } - if (stah.p_first[num]=5){ - ex1="Flamer"; - ex1_num=choose(3,4,5,6); - ex2="Heavy Flamer"; - ex2_num=choose(1,2,3); - ex3=choose("Chainsword","Bolt Pistol"); - ex3_num=choose(2,3,4,5); - } - - if (ex1!=""){ - pop.text+="##While they're at it your Battle Brothers also find "; - if (ex1_num>0) then pop.text+=string(ex1_num)+" "+string(ex1); - if (ex2_num>0) then pop.text+=", "+string(ex2_num)+" "+string(ex2); - if (ex3_num>0) then pop.text+=", and "+string(ex3_num)+" "+string(ex3); - pop.text+="."; - scr_add_item(ex1,ex1_num); - scr_add_item(ex2,ex2_num); - scr_add_item(ex3,ex3_num); - } -} - - -with(obj_star_select){instance_destroy();} -with(obj_fleet_select){instance_destroy();} -delete_features(planet.p_feature[num], P_features.Artifact); - - -corrupt_artifact_collectors(last_artifact); - -obj_controller.trading_artifact=0; -var h;h=0;repeat(4){h+=1;obj_controller.diplo_option[h]="";obj_controller.diplo_goto[h]="";} -obj_controller.menu=0; -instance_destroy(); - diff --git a/objects/obj_ground_mission/Alarm_5.gml b/objects/obj_ground_mission/Alarm_5.gml index 4658f51989..c353d62d6e 100644 --- a/objects/obj_ground_mission/Alarm_5.gml +++ b/objects/obj_ground_mission/Alarm_5.gml @@ -53,13 +53,17 @@ if (mission="bad") and (plan.p_first[num]=3) and (plan.p_type[num]="Forge"){ if (plan.p_owner[num]=6) then obj_controller.disposition[6]-=15; if (plan.p_owner[num]=8) then obj_controller.disposition[8]-=8;*/ - if (plan.p_owner[num]>3) and (plan.p_owner[num]<=6){obj_controller.audiences+=1;obj_controller.audien[obj_controller.audiences]=plan.p_owner[num];obj_controller.audien_topic[obj_controller.audiences]="artifact_angry";} - if (plan.p_owner[num]=3) and (obj_controller.faction_status[eFACTION.Mechanicus]!="War"){obj_controller.audiences+=1;obj_controller.audien[obj_controller.audiences]=plan.p_owner[num];obj_controller.audien_topic[obj_controller.audiences]="declare_war";} + if (plan.p_owner[num]>3) and (plan.p_owner[num]<=6){ + scr_audience(plan.p_owner[num], "artifact_angry",); + } + if (plan.p_owner[num]=3) and (obj_controller.faction_status[eFACTION.Mechanicus]!="War"){ + scr_audience(plan.p_owner[num], "declare_war", -20); + } // Start battle pop.battle_special=3.1; obj_controller.trading_artifact=0; - var h;h=0;repeat(4){h+=1;obj_controller.diplo_option[h]="";obj_controller.diplo_goto[h]="";} + clear_diplo_choices(); obj_controller.menu=0; pop.loc=plan.name; @@ -101,13 +105,13 @@ if (scr_has_adv("Tech-Scavengers")){ with(obj_star_select){instance_destroy();} with(obj_fleet_select){instance_destroy();} - delete_features(plan.p_feature[num], P_features.STC_Fragment); +delete_features(plan.p_feature[num], P_features.STC_Fragment); scr_add_stc_fragment();// STC here -obj_controller.trading_artifact=0;obj_controller.diplo_option1=""; -obj_controller.diplo_option2="";obj_controller.diplo_option3=""; +obj_controller.trading_artifact=0; +clear_diplo_choices(); obj_controller.menu=0; instance_destroy(); diff --git a/objects/obj_ground_mission/Alarm_6.gml b/objects/obj_ground_mission/Alarm_6.gml deleted file mode 100644 index 380e9286d8..0000000000 --- a/objects/obj_ground_mission/Alarm_6.gml +++ /dev/null @@ -1,88 +0,0 @@ - -var comp,plan,i;i=0;comp=0;plan=0; -plan=instance_nearest(x,y,obj_star); - delete_features(plan.p_feature[num], P_features.Artifact); - -scr_return_ship(loc,self,num); - -with(obj_star_select){instance_destroy();} -with(obj_fleet_select){instance_destroy();} - -obj_controller.menu=20;obj_controller.diplomacy=3;obj_controller.force_goodbye=5; - -if (obj_controller.disposition[3]<=10) then obj_controller.disposition[3]+=5; -if (obj_controller.disposition[3]>10) and (obj_controller.disposition[3]<=30) then obj_controller.disposition[3]+=7; -if (obj_controller.disposition[3]>30) and (obj_controller.disposition[3]<=50) then obj_controller.disposition[3]+=9; -if (obj_controller.disposition[3]>50) then obj_controller.disposition[3]+=11; - -with(obj_controller){scr_dialogue("stc_thanks");} - -with(obj_temp2){instance_destroy();} -with(obj_temp7){instance_destroy();} - -if (obj_ini.fleet_type=ePlayerBase.home_world) then with(obj_star){ - if (owner = eFACTION.Player) and ((p_owner[1]=1) or (p_owner[2]=1)) then instance_create(x,y,obj_temp2); -} -if (obj_ini.fleet_type != ePlayerBase.home_world) then with(obj_p_fleet){// Get fleet star system - if (capital_number>0) and (action="") then instance_create(instance_nearest(x,y,obj_star).x,instance_nearest(x,y,obj_star).y,obj_temp2); - if (frigate_number>0) and (action="") then instance_create(instance_nearest(x,y,obj_star).x,instance_nearest(x,y,obj_star).y,obj_temp7); -} - - -if (obj_ini.fleet_type != ePlayerBase.home_world){ - with(obj_p_fleet){if (action="") then instance_deactivate_object(instance_nearest(x,y,obj_star));} -} - -var flit, i,chasing;chasing=0;// Set target -var targ -if (instance_exists(obj_temp2)){ - targ = nearest_star_with_ownership(obj_temp2.x, obj_temp2.y,obj_controller.diplomacy ); -} else if (instance_exists(obj_temp7)){ - targ = nearest_star_with_ownership(obj_temp7.x, obj_temp7.y,obj_controller.diplomacy ); -} - - - -// If player fleet is flying about then get their target for new target -else if (!instance_exists(obj_temp2)) and (!instance_exists(obj_temp7)) and (instance_exists(obj_p_fleet)) and (obj_ini.fleet_type = ePlayerBase.home_world){ - chasing=1; - with(obj_p_fleet){var pop; - if (capital_number>0) and (action!=""){ - pop=instance_create(action_x,action_y,obj_temp2); - pop.action_eta=action_eta; - } - if (frigate_number>0) and (action!=""){ - pop=instance_create(action_x,action_y,obj_temp7); - pop.action_eta=action_eta; - } - } -} - - -flit=instance_create(targ.x,targ.y,obj_en_fleet); - -flit.owner=obj_controller.diplomacy; -flit.home_x=targ.x;flit.home_y=targ.y; -flit.sprite_index=spr_fleet_mechanicus; - -flit.image_index=0; -flit.capital_number=1; -flit.trade_goods="Requisition!500!|"; - -if (obj_ini.fleet_type != ePlayerBase.home_world){ - if (instance_exists(obj_temp2)){flit.action_x=obj_temp2.x;flit.action_y=obj_temp2.y;flit.target=instance_nearest(flit.action_x,flit.action_y,obj_p_fleet);} - if (!instance_exists(obj_temp2)) and (instance_exists(obj_temp7)){flit.action_x=obj_temp7.x;flit.action_y=obj_temp7.y;flit.target=instance_nearest(flit.action_x,flit.action_y,obj_p_fleet);} -} -if (obj_ini.fleet_type=ePlayerBase.home_world){ - targ=instance_nearest(flit.x,flit.y,obj_temp2); - flit.action_x=targ.x;flit.action_y=targ.y; -} - -flit.alarm[4]=1; - -instance_activate_all(); -with(obj_temp2){instance_destroy();} -with(obj_temp7){instance_destroy();} -instance_destroy(); - - diff --git a/objects/obj_ground_mission/Create_0.gml b/objects/obj_ground_mission/Create_0.gml index 3dd7833afb..be55b9cbec 100644 --- a/objects/obj_ground_mission/Create_0.gml +++ b/objects/obj_ground_mission/Create_0.gml @@ -8,8 +8,6 @@ battle_threat=0; battle_loc=""; ship_id=0; obj=0; -post_equipments_lost = 0; -post_equipment_lost =0; recoverable_gene_seed = 0; action_eta = 0; diff --git a/objects/obj_ground_mission/obj_ground_mission.yy b/objects/obj_ground_mission/obj_ground_mission.yy index 50d3b6cbf6..a5af40be1c 100644 --- a/objects/obj_ground_mission/obj_ground_mission.yy +++ b/objects/obj_ground_mission/obj_ground_mission.yy @@ -4,12 +4,7 @@ "eventList":[ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":7,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":6,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":5,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":4,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":3,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":2,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], "managed":true, diff --git a/objects/obj_img/Create_0.gml b/objects/obj_img/Create_0.gml index f54fbb9b62..1bc8e0f6a1 100644 --- a/objects/obj_img/Create_0.gml +++ b/objects/obj_img/Create_0.gml @@ -6,7 +6,7 @@ img_cache: { "creation/chapters": [somesprite1, somesprite2, ...]; } */ -show_debug_message("obj_img spawned"); +show_debug_message_adv("obj_img spawned"); image_cache = {}; diff --git a/objects/obj_img/Step_0.gml b/objects/obj_img/Step_0.gml index 9520e4a3ef..089596a41e 100644 --- a/objects/obj_img/Step_0.gml +++ b/objects/obj_img/Step_0.gml @@ -7,8 +7,14 @@ if (!instance_exists(obj_fleet)) and (!instance_exists(obj_ncombat)){ if (instance_exists(obj_controller)){ - if (obj_controller.diplomacy=0) and (obj_controller.menu=20) and (diplomacy_icon_good=false){scr_image("diplomacy_icon",-50,0,0,0,0);scr_image("symbol",-50,0,0,0,0);} - if (obj_controller.menu!=20) and (diplomacy_icon_good=true){scr_image("diplomacy_icon",-666,0,0,0,0);scr_image("symbol",-666,0,0,0,0);} + if (obj_controller.diplomacy=0) and (obj_controller.menu==MENU.Diplomacy) and (diplomacy_icon_good=false){ + scr_image("diplomacy_icon",-50,0,0,0,0); + scr_image("symbol",-50,0,0,0,0); + } + if (obj_controller.menu!=20) and (diplomacy_icon_good=true){ + scr_image("diplomacy_icon",-666,0,0,0,0); + scr_image("symbol",-666,0,0,0,0); + } if (obj_controller.diplomacy>0) and (diplomacy_splash_good=false) then scr_image("diplomacy_splash",-50,0,0,0,0); if (obj_controller.diplomacy=0) and (diplomacy_splash_good=true) then scr_image("diplomacy_splash",-666,0,0,0,0); diff --git a/objects/obj_ingame_menu/Draw_0.gml b/objects/obj_ingame_menu/Draw_0.gml index 159115a884..417ac4efb6 100644 --- a/objects/obj_ingame_menu/Draw_0.gml +++ b/objects/obj_ingame_menu/Draw_0.gml @@ -33,7 +33,7 @@ if (settings=1){ draw_rectangle(xx+710,yy+338,xx+974,yy+368,0); var bar,change_volume;bar=0;change_volume=0; - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); if (master_volume>0) then bar=(master_volume/1.3)*264;if (master_volume>0) then draw_rectangle(xx+710,yy+224,xx+710+bar,yy+254,0); if (effect_volume>0) then bar=(effect_volume/1.3)*264;if (effect_volume>0) then draw_rectangle(xx+710,yy+282,xx+710+bar,yy+312,0); if (music_volume>0) then bar=(music_volume/1.3)*264;if (music_volume>0) then draw_rectangle(xx+710,yy+338,xx+710+bar,yy+368,0); diff --git a/objects/obj_ingame_menu/Step_0.gml b/objects/obj_ingame_menu/Step_0.gml index ca3051f107..bdf8a34299 100644 --- a/objects/obj_ingame_menu/Step_0.gml +++ b/objects/obj_ingame_menu/Step_0.gml @@ -5,11 +5,33 @@ var xx,yy; xx=__view_get( e__VW.XView, 0 )+0; yy=__view_get( e__VW.YView, 0 )+0; -if (effect=11) and (!instance_exists(obj_saveload)){var sav,butt; +if (effect=11) and (!instance_exists(obj_saveload)){ + var sav,butt; with(obj_new_button){x-=2000;y-=2000;} - sav=instance_create(0,0,obj_saveload);sav.menu=1; - butt=instance_create(xx+707,yy+830,obj_new_button);butt.sprite_index=spr_ui_but_1; - butt.depth=-20010;butt.button_text="Back";butt.button_id=1;butt.scaling=1.5;butt.target=18; + + // Force an autosave if none exists the first time someone clicks into the save menu + if(!file_exists(PATH_autosave_file)){ + if(!instance_exists(obj_saveload)){ + instance_create(0,0,obj_saveload); + } + obj_saveload.autosaving = true; + with (obj_controller){ + scr_save(0,0,true); + } + with(obj_saveload){ + instance_destroy(); + } + } + + sav=instance_create(0,0,obj_saveload); + sav.menu=1; + butt=instance_create(xx+707,yy+830,obj_new_button); + butt.sprite_index=spr_ui_but_1; + butt.depth=-20010; + butt.button_text="Back"; + butt.button_id=1; + butt.scaling=1.5; + butt.target=18; } if (effect=12) and (!instance_exists(obj_saveload)){var sav,butt; with(obj_new_button){x-=2000;y-=2000;} diff --git a/objects/obj_ini/Create_0.gml b/objects/obj_ini/Create_0.gml index 36ca47d6cb..826c3d1eb0 100644 --- a/objects/obj_ini/Create_0.gml +++ b/objects/obj_ini/Create_0.gml @@ -1,6 +1,6 @@ // // Global singletons // global.NameGenerator = new NameGenerator(); -show_debug_message("Creating obj_ini"); +show_debug_message_adv("Creating obj_ini"); // // normal stuff specials=0;firsts=0;seconds=0;thirds=0;fourths=0;fifths=0; @@ -31,21 +31,21 @@ artifact_struct = array_create(200); // Equipment- maybe the bikes should go here or something? yes they should equipment = {}; -i=-1; -repeat(200){i+=1; - artifact[i]=""; - artifact_equipped[i]=false; - artifact_tags[i]=[]; - artifact_identified[i]=0; - artifact_condition[i]=100; - artifact_quality[i]="artifact"; - artifact_loc[i]=""; - artifact_sid[i]=0;// Over 500 : ship - // Weapon Unidentified - artifact_struct[i] = new ArtifactStruct(i); + +var _artifact_array_size = 200; +artifact = array_create(_artifact_array_size, ""); +artifact_equipped = array_create(_artifact_array_size, false); +artifact_tags = array_create_advanced(_artifact_array_size, []); +artifact_identified = array_create(_artifact_array_size, 0); +artifact_condition = array_create(_artifact_array_size, 100); +artifact_quality = array_create(_artifact_array_size, "artifact"); +artifact_loc = array_create(_artifact_array_size, ""); +artifact_sid = array_create(_artifact_array_size, 0); +artifact_struct = array_create(_artifact_array_size); +for (var i = 0; i < _artifact_array_size; i++) { + artifact_struct[i] = new ArtifactStruct(i); } -var i=-1; init_player_fleet_arrays(); ship_id = []; @@ -175,11 +175,11 @@ deserialize = function(save_data){ } var loaded_value = struct_get(save_data, var_name); - // show_debug_message($"obj_ini var: {var_name} - val: {loaded_value}"); + // show_debug_message_adv($"obj_ini var: {var_name} - val: {loaded_value}"); try { variable_struct_set(obj_ini, var_name, loaded_value); } catch (e){ - show_debug_message(e); + show_debug_message_adv(e); } } diff --git a/objects/obj_main_menu/Step_0.gml b/objects/obj_main_menu/Step_0.gml index 7bc1274a77..4f66513dfe 100644 --- a/objects/obj_main_menu/Step_0.gml +++ b/objects/obj_main_menu/Step_0.gml @@ -59,23 +59,19 @@ hi=0; exit; // ??? +//if (fade<=20){ - - - -if (fade<=20){ - - if (mouse_x>=369) and (mouse_x<619){ - if (mouse_y>=183) and (mouse_y<200) then hi=1; - if (mouse_y>=213) and (mouse_y<230) then hi=2; - if (mouse_y>=243) and (mouse_y<260) then hi=3; - } +// if (mouse_x>=369) and (mouse_x<619){ +// if (mouse_y>=183) and (mouse_y<200) then hi=1; +// if (mouse_y>=213) and (mouse_y<230) then hi=2; +// if (mouse_y>=243) and (mouse_y<260) then hi=3; +// } - if (mouse_x>=414) and (mouse_y>=273) and (mouse_x<578) and (mouse_y<290) then hi=4; +// if (mouse_x>=414) and (mouse_y>=273) and (mouse_x<578) and (mouse_y<290) then hi=4; - if (instance_exists(obj_saveload)){ - // if (scr_hit(sdfgsdgsdg)=true) then hi=6; - } -} +// if (instance_exists(obj_saveload)){ +// // if (scr_hit(sdfgsdgsdg)=true) then hi=6; +// } +//} -if (mouse_x<552) or (mouse_y<441) or (mouse_x>608) or (mouse_y>457) and (browser=1) then browser=0; +//if (mouse_x<552) or (mouse_y<441) or (mouse_x>608) or (mouse_y>457) and (browser=1) then browser=0; diff --git a/objects/obj_main_menu_buttons/Draw_0.gml b/objects/obj_main_menu_buttons/Draw_0.gml index 271608de9d..98285485f9 100644 --- a/objects/obj_main_menu_buttons/Draw_0.gml +++ b/objects/obj_main_menu_buttons/Draw_0.gml @@ -101,8 +101,8 @@ if (instance_exists(obj_main_menu)) and (!instance_exists(obj_saveload)) and (!i // pop=instance_create(0,0,obj_popup); // pop.size=1;pop.title="Tutorial"; // pop.text="Would you like to play the tutorial? It is strongly advisable for those new to Chapter Master."; - // pop.option1="Play the tutorial."; - // pop.option2="Skip the tutorial.";pop.option3="Skip and never ask again."; + // pop.add_option="Play the tutorial."; + // pop.add_option="Skip the tutorial.";pop.option3="Skip and never ask again."; // } break; case 1: diff --git a/objects/obj_managment_panel/Draw_64.gml b/objects/obj_managment_panel/Draw_64.gml index 30366f7cba..27b5c7b344 100644 --- a/objects/obj_managment_panel/Draw_64.gml +++ b/objects/obj_managment_panel/Draw_64.gml @@ -32,6 +32,7 @@ slate_panel.inside_method = function(){ } if (header=3){ + slate_panel.draw_top_piece = false; draw_sprite_stretched(spr_master_title,0,x,y-2,panel_width+2,4); sprx = x+(panel_width/2)-50; @@ -39,7 +40,9 @@ slate_panel.inside_method = function(){ sprw = 141*0.7; sprh = 141*0.7; - draw_sprite_stretched(global.chapter_icon.sprite, 0, sprx, spry, sprw, sprh); + if (sprite_exists(global.chapter_icon.sprite)){ + draw_sprite_stretched(global.chapter_icon.sprite, 0, sprx, spry, sprw, sprh); + } draw_set_font(fnt_cul_14); draw_text(x+(panel_width/2),y+89,string_hash_to_newline(title)); if (line[1]!=""){ @@ -53,6 +56,7 @@ slate_panel.inside_method = function(){ if (line[l]!="") then draw_text(x+(panel_width/2),y+112+((l-1)*20),string_hash_to_newline(line[l])); } } else if (header=2){ + slate_panel.draw_top_piece = false; draw_sprite_stretched(spr_company_title,company,x+40,y-2,panel_width-80,4); if (title=="ARMOURY"){ draw_sprite_ext(spr_tech_area_pad, 0, x+(panel_width/2)-((0.3*180)/2),y-30,0.3,0.3,0,c_white,1) @@ -107,13 +111,18 @@ slate_panel.inside_method = function(){ var x_scale = (panel_width/850) var y_scale = (panel_height/860) -slate_panel.draw(x, y, x_scale,y_scale); -// draw_text(x+(panel_width/2),y-60,string(manage)+") "+string(line[1])+"#"+string(line[2])+"#"+string(line[3])); +try { + slate_panel.draw(x, y, x_scale,y_scale); + // draw_text(x+(panel_width/2),y-60,string(manage)+") "+string(line[1])+"#"+string(line[2])+"#"+string(line[3])); -if (point_and_click([x, y, x + panel_width, y + panel_height])) { - obj_controller.managing = manage; - var new_manage = manage; - with(obj_controller) { - switch_view_company(new_manage); + if (point_and_click([x, y, x + panel_width, y + panel_height])) { + obj_controller.managing = manage; + var new_manage = manage; + with(obj_controller) { + switch_view_company(new_manage); + } } +} catch(_exception){ + handle_exception(_exception); + scr_toggle_manage(); } diff --git a/objects/obj_mass_equip/Create_0.gml b/objects/obj_mass_equip/Create_0.gml index ef526b2f8f..6d290e7d66 100644 --- a/objects/obj_mass_equip/Create_0.gml +++ b/objects/obj_mass_equip/Create_0.gml @@ -1,5 +1,5 @@ -tab=0; +tab=-1; role=obj_controller.settings; refresh=true; engage=false; diff --git a/objects/obj_mass_equip/Draw_0.gml b/objects/obj_mass_equip/Draw_0.gml index 767a8f5153..239f7dbe21 100644 --- a/objects/obj_mass_equip/Draw_0.gml +++ b/objects/obj_mass_equip/Draw_0.gml @@ -60,7 +60,7 @@ if (total_role_number>0){ -if (total_role_number > 0 && tab > 0) { +if (total_role_number > 0 && tab > -1) { item_name = []; var infanty_roles = [ eROLE.ChapterMaster, @@ -83,12 +83,12 @@ if (total_role_number > 0 && tab > 0) { eROLE.Dreadnought, ]; // hand slots - if ((tab == 1 || tab ==2) && array_get_index(infanty_roles, obj_controller.settings) >= 0) { + if ((tab == 0 || tab ==1) && array_get_index(infanty_roles, obj_controller.settings) >= 0) { // Get all available hand weapons scr_get_item_names( item_name, obj_controller.settings, // eROLE - 1, // slot + 0, // slot eENGAGEMENT.Any, true, // include the company standard false, // do not limit to available items @@ -96,7 +96,7 @@ if (total_role_number > 0 && tab > 0) { scr_get_item_names( item_name, obj_controller.settings, // eROLE - 2, // slot + 1, // slot eENGAGEMENT.Any, false, // include the company standard false, // do not limit to available items @@ -160,19 +160,19 @@ if (total_role_number > 0 && tab > 0) { switch (tab) { // slots - case 1: obj_ini.wep1[100, role] = buh; break; - case 2: obj_ini.wep2[100, role] = buh; break; - case 3: + case 0: obj_ini.wep1[100, role] = buh; break; + case 1: obj_ini.wep2[100, role] = buh; break; + case 2: obj_ini.armour[100, role] = buh; // No bikes or jump packs for Terminators if (array_contains(LIST_TERMINATOR_ARMOUR, buh) || buh == STR_ANY_TERMINATOR_ARMOUR) { obj_ini.mobi[100, role] = ""; } break; - case 4: obj_ini.gear[100, role] = buh; break; - case 5: obj_ini.mobi[100, role] = buh; break; + case 3: obj_ini.gear[100, role] = buh; break; + case 4: obj_ini.mobi[100, role] = buh; break; } - tab = 0; + tab = -1; refresh = true; } } @@ -191,7 +191,7 @@ if (total_role_number > 0 && tab > 0) { draw_rectangle(xx + 1347 - (string_width(string_hash_to_newline("CANCEL")) / 2), yy + 720, xx + 1347 + (string_width(string_hash_to_newline("CANCEL")) / 2), yy + 741, 0); draw_set_alpha(1); if (scr_click_left()) { - tab = 0; + tab = -1; } } draw_set_alpha(1); diff --git a/objects/obj_mass_equip/Step_0.gml b/objects/obj_mass_equip/Step_0.gml index 641abd9526..7b851188b1 100644 --- a/objects/obj_mass_equip/Step_0.gml +++ b/objects/obj_mass_equip/Step_0.gml @@ -76,7 +76,7 @@ try { // ** Start Mobility Items ** if (unit.mobility_item() != req_mobi) { var stop_mobi = false; - if (unit_armour.has_tags(["terminator", "dreadnought"])) { + if (is_struct(unit_armour) && unit_armour.has_tags(["terminator", "dreadnought"])) { unit.update_mobility_item(""); } else { unit.update_mobility_item(req_mobi); @@ -264,9 +264,9 @@ try { refresh = false; - if (tab > 0) { + if (tab > -1) { item_name = []; - var is_hand_slot = tab == 1 || tab == 2; + var is_hand_slot = tab == 0 || tab == 1; scr_get_item_names( item_name, obj_controller.settings, // eROLE diff --git a/objects/obj_ncombat/Alarm_0.gml b/objects/obj_ncombat/Alarm_0.gml index e9eb6c9766..c802268901 100644 --- a/objects/obj_ncombat/Alarm_0.gml +++ b/objects/obj_ncombat/Alarm_0.gml @@ -78,6 +78,26 @@ if (string_count("spyrer", battle_special) > 0) { enemies[1] = 1; u.flank = 1; } + +if (battle_special == "protect_raiders") { + fortified = 0; + threat = 3; + u = instance_create(20, 240, obj_enunit); + u.dudes[1] = "Dire Avenger"; + u.dudes_num[1] = 40; + u.dudes_special[1] = "shimmershield"; + u.dudes[2] = "Dire Avenger Exarch"; + u.dudes_num[2] = 4; + u.dudes_special[2] = "shimmershield"; + u.dudes[3] = "Autarch"; + u.dudes_num[3] = 1; + u.dudes[4] = "Farseer"; + u.dudes_num[4] = 1; + u.dudes_special[4] = "farseer_powers"; + u.dudes[5] = "Night Spinner"; + u.dudes_num[5] = 1; + u.enemy = eFACTION.Eldar; +} // * Small Fallen Group * if (battle_special = "fallen1") { fortified = 0; @@ -2230,7 +2250,7 @@ if (enemy = 10) and(battle_special != "ship_demon") and(battle_special != "falle } // ** Chaos Space Marines Forces ** -if (enemy = 11) and(battle_special != "world_eaters") and(string_count("cs_meeting_battle", battle_special) = 0) { +if (enemy = 11) and(battle_special != "ChaosWarband") and(string_count("cs_meeting_battle", battle_special) = 0) { // Small CSM Group if (threat = 1) { u = instance_nearest(xxx, 240, obj_enunit); @@ -2452,7 +2472,7 @@ if (enemy = 11) and(battle_special != "world_eaters") and(string_count("cs_meeti } // ** World Eaters Forces ** -if (enemy = 11) and(battle_special = "world_eaters") { +if (enemy = 11) and(battle_special = "ChaosWarband") { // Small WE Group if (threat = 1) { u = instance_nearest(xxx, 240, obj_enunit); diff --git a/objects/obj_ncombat/Alarm_1.gml b/objects/obj_ncombat/Alarm_1.gml index cd758f8e86..53186af849 100644 --- a/objects/obj_ncombat/Alarm_1.gml +++ b/objects/obj_ncombat/Alarm_1.gml @@ -54,8 +54,8 @@ if (string_count("mech",battle_special)>0){ } if (battle_special="space_hulk"){ - if (hulk_forces>0) then p1="Your marines manuever through the hull of the Space Hulk, shadows dancing and twisting before their luxcasters. The hallway integrity is nonexistant- twisted metal juts out in hazardous ways or opens into bottomless pits. Still, there is loot and knowledge to be gained. It is not long before your men's sensorium pick up hostile blips. Your own forces are made up of "; - if (hulk_forces=0) then p1="Your marines manuever through the hull of the Space Hulk, shadows dancing and twisting before their luxcasters. The hallway integrity is nonexistant- twisted metal juts out in hazardous ways or opens into bottomless pits. Your forces are made up of "; + if (hulk_forces>0) then p1="Your marines maneuver through the hull of the Space Hulk, shadows dancing and twisting before their luxcasters. The hallway integrity is non-existent – twisted metal juts out in hazardous ways or opens into bottomless pits. Still, there is loot and knowledge to be gained. It is not long before your men's sensorium pick up hostile blips. Your own forces are made up of "; + if (hulk_forces=0) then p1="Your marines maneuver through the hull of the Space Hulk, shadows dancing and twisting before their luxcasters. The hallway integrity is non-existent – twisted metal juts out in hazardous ways or opens into bottomless pits. Your forces are made up of "; } @@ -83,6 +83,9 @@ if (battle_special=""){ if (string_count("spyrer",battle_special)>0){ p1="Your marines search through the alleyways and corridors likely to contain the Spyrer. It does not take long before the lunatic attacks, springing off from a wall to fall among your men. Your ranks are made up of "; } +if (string_count("protect_raiders",battle_special)>0){ + p1="Following responses from scans, Your marine squad deploys and lies in wait on the planets surface. Either the eldar were expecting you or the scope of the raids on the planet had been underplayed by the governor perhaps to hide his incompetence in allowing such foul xenos actions to persist unchecked for so long."; +} if (string_count("fallen",battle_special)>0){ p1="Your marines search through the alleyways and dens likely to contain the Fallen. Several days pass before the search is succesful; the prey is located by Auspex and closed in upon. "; if (battle_climate="Lava") then p1="Your marines search through the broken craggs and spires of the molten planet. Among the bubbling lava, and cracking earth, they search for the Fallen. After several days of searching Auspex detect the prey. "; @@ -492,7 +495,7 @@ if (temp>=100) and (threat>1) and (big_mofo>0) and (big_mofo<10) and (dropping=0 // show_message(string(global.chapter_name)+"|"+string(global.custom)+"|"+string(standard_cry)); - if (global.chapter_name="Iron Warriors") and (global.custom=0){standard_cry=1; + if (global.chapter_name="Iron Warriors") and (global.custom==eCHAPTER_TYPE.PREMADE){standard_cry=1; var rand;rand=choose(1,2,3,4,5); if (rand=1) and (big_mofo!=1){p2="breaks the silence, begining the Chapter Battlecry-";}if (rand=1) and (big_mofo=1){p2="break the silence, begining the Chapter Battlecry-";} if (rand=2) and (big_mofo!=1){p2="roars the first half of the Chapter Battlecry-";}if (rand=2) and (big_mofo=1){p2="roar the first half of the Chapter Battlecry-";} diff --git a/objects/obj_ncombat/Alarm_2.gml b/objects/obj_ncombat/Alarm_2.gml index bf67e79f26..7cf595f3ab 100644 --- a/objects/obj_ncombat/Alarm_2.gml +++ b/objects/obj_ncombat/Alarm_2.gml @@ -67,31 +67,4 @@ if (ally>0) and (ally_forces>0){ -// scr_newtext(); - -/*if (newline!=""){ - var breaks,first_open; - newline=scr_lines(89,newline); - breaks=max(1,string_count("@",newline)); - first_open=liness+1; - - var b,f;b=first_open;f=-1; - explode_script(newline,"@"); - f+=1;lines[b+f]=string("-"+explode[f]); - repeat(breaks-1){f+=1; - lines[b+f]=string(explode[f]); - } - liness+=string_count("@",newline); - - repeat(100){ - if (liness>30){scr_lines_increase(1);liness-=1;} - } -} - -newline="";*/ - - instance_activate_object(obj_enunit); - -/* */ -/* */ diff --git a/objects/obj_ncombat/Alarm_3.gml b/objects/obj_ncombat/Alarm_3.gml index 2fc932d6d9..960ade494f 100644 --- a/objects/obj_ncombat/Alarm_3.gml +++ b/objects/obj_ncombat/Alarm_3.gml @@ -94,7 +94,6 @@ if ((messages>0) and (messages_shown<24)) and (messages_shown<=100){ newline=message[that]; if (message_priority[that]>0) then newline_color="bright"; if (string_count("lost",newline)>0) then newline_color="red"; - if (string_count("critically damaged",newline)>0) then newline_color="red"; if (string_count("^",newline)>0){ newline=string_replace(newline,"^",""); newline_color="white"; diff --git a/objects/obj_ncombat/Alarm_5.gml b/objects/obj_ncombat/Alarm_5.gml index 9013944a67..6052c54523 100644 --- a/objects/obj_ncombat/Alarm_5.gml +++ b/objects/obj_ncombat/Alarm_5.gml @@ -12,6 +12,8 @@ var line_break = "-------------------------------------------------------------- if (turn_count >= 50){ part1 = "Your forces make a fighting retreat \n" } + +p_data = new PlanetData(battle_id, battle_object); // check for wounded marines here to finish off, if defeated defending var roles = obj_ini.role[100]; var ground_mission = (instance_exists(obj_ground_mission)); @@ -75,9 +77,9 @@ if (obj_ncombat.defeat == 0) { if (obj_controller.stc_bonus[3] = 4) { var _survival_roll = 70 + _candidate.priority; - var _dice_roll = roll_dice(1, 100, "high"); + var _dice_roll = roll_dice_chapter(1, 100, "high"); if (_dice_roll >= _survival_roll) && (_column_id.veh_dead[_vehicle_id] != 2) { - _column_id.veh_hp[_vehicle_id] = roll_dice(1, 10, "high"); + _column_id.veh_hp[_vehicle_id] = roll_dice_chapter(1, 10, "high"); _column_id.veh_dead[_vehicle_id] = false; vehicles_saved_count++; @@ -91,7 +93,7 @@ if (obj_ncombat.defeat == 0) { } if (vehicle_recovery_score > 0) { - _column_id.veh_hp[_vehicle_id] = roll_dice(1, 10, "high"); + _column_id.veh_hp[_vehicle_id] = roll_dice_chapter(1, 10, "high"); _column_id.veh_dead[_vehicle_id] = false; vehicle_recovery_score -= _candidate.priority; vehicles_saved_count++; @@ -115,7 +117,6 @@ var _total_deaths = final_marine_deaths + final_command_deaths; var _total_injured = _total_deaths + injured + units_saved_count; if (_total_injured > 0) { newline = $"{string_plural_count("unit", _total_injured)} {smart_verb("was", _total_injured)} critically injured."; - newline_color = "red"; scr_newtext(); if (units_saved_count > 0) { @@ -204,8 +205,7 @@ scr_newtext(); var _total_damaged_count = vehicle_deaths + vehicles_saved_count; if (_total_damaged_count > 0) { - newline = $"{string_plural_count("vehicle", _total_damaged_count)} {smart_verb("was", _total_damaged_count)} critically damaged during battle."; - newline_color="red"; + newline = $"{string_plural_count("vehicle", _total_damaged_count)} {smart_verb("was", _total_damaged_count)} disabled during battle."; scr_newtext(); if (vehicles_saved_count > 0) { @@ -245,12 +245,12 @@ if (_total_damaged_count > 0) { -if (post_equipment_lost[1]!=""){ +if (post_equipment_lost.item_count()){ part6="Equipment Lost: "; - part7 += arrays_to_string_with_counts(post_equipment_lost, post_equipments_lost, true, false); + part7 += post_equipment_lost.item_description_string(); if (ground_mission){ - part7 += " Some may be recoverable." + part7 += " Some may be recoverable."; } newline=part6; scr_newtext(); @@ -260,6 +260,10 @@ if (post_equipment_lost[1]!=""){ scr_newtext(); } +if (post_equipment_recovered.item_count()){ + newline = $"Equipment Recovered: {post_equipment_lost.item_description_string()}"; + scr_newtext(); +} if (total_battle_exp_gain>0){ @@ -287,8 +291,7 @@ if (total_battle_exp_gain>0){ } if (ground_mission){ - obj_ground_mission.post_equipment_lost = post_equipment_lost - obj_ground_mission.post_equipments_lost = post_equipments_lost + obj_ground_mission.post_equipment_lost = post_equipment_lost; } if (slime>0){ @@ -317,13 +320,10 @@ if (battle_special="study2a") then reduce_fortification=false; if (battle_special="study2b") then reduce_fortification=false; if (fortified>0) and (!instance_exists(obj_nfort)) and (reduce_fortification=true){ - part9="Fortification level of "+string(battle_loc); - if (battle_id=1) then part9+=" I"; - if (battle_id=2) then part9+=" II"; - if (battle_id=3) then part9+=" III"; - if (battle_id=4) then part9+=" IV"; - if (battle_id=5) then part9+=" V"; + part9=$"Fortification level of {p_data.name()}"; + part9+=$" has decreased to {fortified-1} ({fortified}-1)"; + newline=part9; scr_newtext(); battle_object.p_fortified[battle_id]-=1; @@ -340,20 +340,14 @@ if (fortified>0) and (!instance_exists(obj_nfort)) and (reduce_fortification=tru -if (defeat=0) and (battle_special="space_hulk"){ - var enemy_power=0,loot=0,dicey=floor(random(100))+1,ex=0; +if (!defeat) and (battle_special == "space_hulk"){ + var enemy_power=0, + loot=0, + dicey=roll_dice_chapter(1, 100, "low"); + ex=0; - if (enemy=7){ - enemy_power=battle_object.p_orks[battle_id]; - battle_object.p_orks[battle_id]-=1; - } - else if (enemy=9){ - enemy_power=battle_object.p_tyranids[battle_id]; - battle_object.p_tyranids[battle_id]-=1; - } - else if (enemy=10){ - enemy_power=battle_object.p_traitors[battle_id]; - battle_object.p_traitors[battle_id]-=1; + if (enemy == eFACTION.Ork || enemy == eFACTION.Tyranids || enemy == eFACTION.Heretics){ + enemy_power=p_data.add_forces(enemy,-1); } part10="Space Hulk Exploration at "; @@ -363,7 +357,6 @@ if (defeat=0) and (battle_special="space_hulk"){ if (ex=100) then newline_color="red"; scr_newtext(); - if (scr_has_disadv("Shitty Luck")) then dicey=dicey*1.5; // show_message("Roll Under: "+string(enemy_power*10)+", Roll: "+string(dicey)); if (dicey<=(enemy_power*10)){ @@ -379,25 +372,41 @@ if (defeat=0) and (battle_special="space_hulk"){ if (string_count("ruins",battle_special)>0){ - if (defeat=0) then newline="Ancient Ruins cleared."; - if (defeat=1) then newline="Failed to clear Ancient Ruins."; + if (defeat == 0) then newline="Ancient Ruins cleared."; + if (defeat == 1) then newline="Failed to clear Ancient Ruins."; newline_color="yellow"; scr_newtext(); } -var reduce_power=true; -if (battle_special="tyranid_org") then reduce_power=false; -if (battle_special="ship_demon") then reduce_power=false; -if (string_count("_attack",battle_special)>0) then reduce_power=false; -if (string_count("ruins",battle_special)>0) then reduce_power=false; -if (battle_special="space_hulk") then reduce_power=false; -if (battle_special="fallen1") then reduce_power=false; -if (battle_special="fallen2") then reduce_power=false; -if (battle_special="study2a") then reduce_power=false; -if (battle_special="study2b") then reduce_power=false; -if (defeat=0) and (reduce_power=true){ - var enemy_power,new_power, power_reduction, final_pow, requisition_reward; - enemy_power=0;new_power=0; power_reduction=0; requisition_reward=0; +var _reduce_power = true; + +// Events that should *not* reduce power +var _non_power_reduce_events = [ + "tyranid_org", + "ship_demon", + "space_hulk", + "fallen1", + "fallen2", + "study2a", + "study2b", + "protect_raiders" +]; + +// Disable power reduction for matching events +if (array_contains(_non_power_reduce_events, battle_special)) { + _reduce_power = false; +} +else if (string_count("_attack", battle_special) > 0) { + _reduce_power = false; +} +else if (string_count("ruins", battle_special) > 0) { + _reduce_power = false; +} + + +if (defeat == 0 && _reduce_power){ + + var enemy_power=0,new_power=0, power_reduction=0, requisition_reward=0; if (enemy=2){ enemy_power=battle_object.p_guardsmen[battle_id]; @@ -427,7 +436,10 @@ if (defeat=0) and (reduce_power=true){ } else if (enemy=10){ enemy_power=battle_object.p_traitors[battle_id]; - part10="Heretic";if (threat=7) then part10="Daemon"; + part10="Heretic"; + if (threat==7){ + part10="Daemon"; + } } else if (enemy=11){ enemy_power=battle_object.p_chaos[battle_id]; @@ -520,22 +532,12 @@ if (defeat=0) and (reduce_power=true){ } } - if (enemy=5){battle_object.p_sisters[battle_id]=new_power;} - else if (enemy=6){battle_object.p_eldar[battle_id]=new_power;} - else if (enemy=7){battle_object.p_orks[battle_id]=new_power;} - else if (enemy=8){battle_object.p_tau[battle_id]=new_power;} - else if (enemy=9){battle_object.p_tyranids[battle_id]=new_power;} - else if (enemy=10){battle_object.p_traitors[battle_id]=new_power;} - else if (enemy=11){battle_object.p_chaos[battle_id]=new_power;} - else if (enemy=13){battle_object.p_necrons[battle_id]=new_power;} + if (enemy >= 5){ + p_data.edit_forces(enemy, new_power) + } if (enemy!=2) and (string_count("cs_meeting_battle",battle_special)=0){ - part10+=" forces on "+string(battle_loc); - if (battle_id=1) then part10+=" I"; - if (battle_id=2) then part10+=" II"; - if (battle_id=3) then part10+=" III"; - if (battle_id=4) then part10+=" IV"; - if (battle_id=5) then part10+=" V"; + part10+=$" forces on {p_data.name()}" if (new_power == 0){ part10+=$" were completely wiped out. Previous power: { enemy_power}. Reduction: {power_reduction}."; @@ -552,14 +554,10 @@ if (defeat=0) and (reduce_power=true){ if (new_power<=0) and (enemy_power>0) then battle_object.p_raided[battle_id]=1; } if (enemy=2){ - part10+=" Imperial Guard Forces on "+string(battle_loc); - if (battle_id=1) then part10+=" I"; - if (battle_id=2) then part10+=" II"; - if (battle_id=3) then part10+=" III"; - if (battle_id=4) then part10+=" IV"; - if (battle_id=5) then part10+=" V"; + part10+=$" Imperial Guard Forces on {p_data.name()}"; part10+=" were reduced to "+string(battle_object.p_guardsmen[battle_id])+" ("+string(enemy_power)+"-"+string(threat)+")"; - newline=part10;scr_newtext(); + newline=part10; + scr_newtext(); } @@ -570,7 +568,7 @@ if (defeat=0) and (reduce_power=true){ scr_newtext(); } - if (enemy=13) and (battle_object.p_necrons[battle_id]<3) and (awake_tomb_world(battle_object.p_feature[battle_id])== 1){ + if (enemy == eFACTION.Necrons && p_data.forces[eFACTION.Necrons]<3 && awake_tomb_world(p_data.features) == 1){ // var bombs;bombs=scr_check_equip("Plasma Bomb",battle_loc,battle_id,0); // var bombs;bombs=scr_check_equip("Plasma Bomb","","",0); @@ -583,12 +581,14 @@ if (defeat=0) and (reduce_power=true){ newline="Plasma Bomb used to seal the Necron Tomb."; newline_color="yellow"; scr_newtext(); - seal_tomb_world(battle_object.p_feature[battle_id]) + seal_tomb_world(p_data.features) } - if (plasma_bomb<=0){ - battle_object.p_necrons[battle_id]=3;// newline_color="yellow"; - if (dropping!=0) then newline="Deep Strike Ineffective; Plasma Bomb required"; + else if (plasma_bomb<=0){ + p_data.edit_forces(enemy, 3) + if (dropping!=0){ + newline="Deep Strike Ineffective; Plasma Bomb required"; + } if (dropping=0) then newline="Attack Ineffective; Plasma Bomb required"; scr_newtext(); } @@ -603,8 +603,8 @@ if (defeat=0) and (reduce_power=true){ pip.cooldown=15; cooldown=15; - pip.option1="Advance!"; - pip.option2="Cancel the attack";*/ + pip.add_option="Advance!"; + pip.add_option="Cancel the attack";*/ @@ -625,14 +625,14 @@ if (defeat=0) and (reduce_power=true){ }*/ } -if (defeat=0) and (enemy=9) and (battle_special="tyranid_org"){ +if (defeat == 0) and (enemy==eFACTION.Tyranids) and (battle_special="tyranid_org"){ // show_message(string(captured_gaunt)); - if (captured_gaunt=1) then newline=captured_gaunt+" Gaunt organism have been captured."; - if (captured_gaunt>1) or (captured_gaunt=0) then newline=captured_gaunt+" Gaunt organisms have been captured."; + + newline = $"{string_plural_count("Gaunt organism", captured_gaunt)} have been captured."; scr_newtext(); if (captured_gaunt>0){ - var why,thatta;why=0;thatta=0; + var why=0,thatta=0; instance_activate_object(obj_star); // with(obj_star){if (name!=obj_ncombat.battle_loc) then instance_deactivate_object(id);} // thatta=obj_star; @@ -645,10 +645,14 @@ if (defeat=0) and (enemy=9) and (battle_special="tyranid_org"){ scr_event_log("","Inquisition Mission Completed: A Gaunt organism has been captured for the Inquisition."); if (captured_gaunt>1){ - if (instance_exists(obj_turn_end)) then scr_popup("Inquisition Mission Completed","You have captured several Gaunt organisms. The Inquisitor is pleased with your work, though she notes that only one is needed- the rest are to be purged. It will be stored until it may be retrieved. The mission is a success.","inquisition",""); + if (instance_exists(obj_turn_end)){ + scr_popup("Inquisition Mission Completed","You have captured several Gaunt organisms. The Inquisitor is pleased with your work, though she notes that only one is needed- the rest are to be purged. It will be stored until it may be retrieved. The mission is a success.","inquisition",""); + } } if (captured_gaunt=1){ - if (instance_exists(obj_turn_end)) then scr_popup("Inquisition Mission Completed","You have captured a Gaunt organism- the Inquisitor is pleased with your work. The Tyranid will be stored until it may be retrieved. The mission is a success.","inquisition",""); + if (instance_exists(obj_turn_end)){ + scr_popup("Inquisition Mission Completed","You have captured a Gaunt organism- the Inquisitor is pleased with your work. The Tyranid will be stored until it may be retrieved. The mission is a success.","inquisition",""); + } } instance_deactivate_object(obj_star); } @@ -659,8 +663,8 @@ scr_newtext(); newline=line_break; scr_newtext(); -if (((leader)) or ((battle_special="world_eaters") and (!obj_controller.faction_defeated[10]))) and (!defeat){ - var nep;nep=false; +if (((leader)) or ((battle_special="ChaosWarband") and (!obj_controller.faction_defeated[10]))) and (!defeat){ + var nep=false; newline="The enemy Leader has been killed!";newline_color="yellow";scr_newtext(); newline=line_break; scr_newtext(); @@ -686,23 +690,27 @@ inq_eated=false; if (obj_ini.omophagea){ - var eatme=floor(random(100))+1; + var eatme=roll_dice_chapter(1, 100, "high"); if (enemy=13) or (enemy=9) or (battle_special="ship_demon") then eatme+=100; if (enemy=10) and (battle_object.p_traitors[battle_id]=7) then eatme+=200; if (red_thirst=3) then thirsty=1;if (red_thirst>3) then thirsty=red_thirst-2; if (thirsty>0) then eatme-=(thirsty*6);if (really_thirsty>0) then eatme-=(really_thirsty*15); - if (scr_has_disadv("Shitty Luck")) then eatme-=10; if (allies>0){ - obj_controller.disposition[2]-=choose(1,0,0); - obj_controller.disposition[4]-=choose(0,0,1); - obj_controller.disposition[5]-=choose(0,0,1); + alter_dispositions([ + [eFACTION.Imperium,-choose(1,0,0)], + [eFACTION.Inquisition, -choose(0,0,1)], + [eFACTION.Ecclesiarchy, -choose(0,0,1)], + ]); + } + if (present_inquisitor>0){ + alter_disposition(eFACTION.Inquisition,-4); } - if (present_inquisitor>0) then obj_controller.disposition[4]-=2; - if (eatme<=25){endline=0; - if (thirsty=0) and (really_thirsty=0){ + if (eatme<=25){ + endline=0; + if (!thirsty && !really_thirsty){ var ran;ran=choose(1,2); newline="One of your marines slowly makes his way towards the fallen enemies, as if in a spell. Once close enough the helmet is removed and he begins shoveling parts of their carcasses into his mouth."; newline="Two marines are sharing a quick discussion, and analysis of the battle, when one of the two suddenly drops down and begins shoveling parts of enemy corpses into his mouth."; @@ -718,13 +726,12 @@ if (obj_ini.omophagea){ newline=$"One of your Death Company {roles[6]} blitzes to the fallen enemy lines. Massive mechanical hands begin to rend and smash at the fallen corpses, trying to squeeze their flesh and blood through the sarcophogi opening."; } - newline+=" Almost at once most of the present "+string(global.chapter_name)+" follow suite, joining in and starting a massive feeding frenzy. The sight is gruesome to behold."; + newline+=$" Almost at once most of the present {global.chapter_name} follow suit, joining in and starting a massive feeding frenzy. The sight is gruesome to behold."; scr_newtext(); // check for pdf/guardsmen - eatme=floor(random(100))+1; - if (scr_has_disadv("Shitty Luck")) then eatme-=10; + eatme=roll_dice_chapter(1, 100, "high"); if (eatme<=10) and (allies>0){ obj_controller.disposition[2]-=2; if (allies=1){ @@ -739,8 +746,7 @@ if (obj_ini.omophagea){ } // check for inquisitor - eatme=floor(random(100))+1; - if (scr_has_disadv("Shitty Luck")) then eatme-=5; + eatme=roll_dice_chapter(1, 100, "high"); if (eatme<=40) and (present_inquisitor=1){ var thatta=0,remove=0,i=0; obj_controller.disposition[4]-=10; @@ -907,7 +913,7 @@ if (endline=0){ } -if (defeat=1){ +if (defeat == 1){ player_forces=0; if (ground_mission){ obj_ground_mission.recoverable_gene_seed = seed_lost; @@ -920,6 +926,6 @@ gene_slaves = []; instance_deactivate_object(obj_star); instance_deactivate_object(obj_ground_mission); -show_debug_message($"{started}"); +show_debug_message_adv($"{started}"); /* */ /* */ diff --git a/objects/obj_ncombat/Alarm_7.gml b/objects/obj_ncombat/Alarm_7.gml index 95c1476f29..a638481a8c 100644 --- a/objects/obj_ncombat/Alarm_7.gml +++ b/objects/obj_ncombat/Alarm_7.gml @@ -1,5 +1,5 @@ try { - // show_debug_message("alarm 7 start"); + // show_debug_message_adv("alarm 7 start"); audio_stop_sound(snd_battle); audio_play_sound(snd_royal,0,true); audio_sound_gain(snd_royal, 0, 0); @@ -71,9 +71,9 @@ try { for (var co=0;co<=10;co++){ for (var i=0;i1){obj_controller.audiences+=1;obj_controller.audien[obj_controller.audiences]=4;obj_controller.audien_topic[obj_controller.audiences]="declare_war";} - obj_controller.audiences+=1;obj_controller.audien[obj_controller.audiences]=2;obj_controller.audien_topic[obj_controller.audiences]="declare_war"; - }else{ - obj_turn_end.audiences+=1;obj_turn_end.audien[obj_turn_end.audiences]=5;obj_turn_end.audien_topic[obj_turn_end.audiences]="declare_war"; - if (obj_turn_end.known[eFACTION.Inquisition]>1){obj_turn_end.audiences+=1;obj_turn_end.audien[obj_turn_end.audiences]=4;obj_turn_end.audien_topic[obj_turn_end.audiences]="declare_war";} - obj_turn_end.audiences+=1;obj_turn_end.audien[obj_turn_end.audiences]=2;obj_turn_end.audien_topic[obj_turn_end.audiences]="declare_war"; - } + obj_controller.loyalty-=50; + obj_controller.loyalty_hidden-=50; + decare_war_on_imperium_audiences(); } @@ -262,11 +252,11 @@ try { if (turn_count < 20){ - if (defeat=0) and (threat>=4) then scr_recent("battle_victory", $"{battle_loc} {scr_roman(battle_id)}",enemy); + if (defeat == 0) and (threat>=4) then scr_recent("battle_victory", $"{battle_loc} {scr_roman(battle_id)}",enemy); - if (defeat=1) and (final_marine_deaths+final_command_deaths>=10) then scr_recent("battle_defeat", $"{enemy}, {final_marine_deaths+final_command_deaths}"); + if (defeat == 1) and (final_marine_deaths+final_command_deaths>=10) then scr_recent("battle_defeat", $"{enemy}, {final_marine_deaths+final_command_deaths}"); } else { scr_recent("battle_defeat",$"{enemy}, {final_marine_deaths+final_command_deaths}"); } @@ -290,7 +280,7 @@ try { _battle_object.p_player[_planet]-=world_size; - if (defeat=1){ + if (defeat == 1){ _battle_object.p_player[_planet]=0; }; } @@ -308,119 +298,8 @@ try { } } - - - if (string_count("_attack",battle_special)>0) and (string_count("mech",battle_special)=0) and (string_count("ruins",battle_special)=0) and (string_count("cs_meeting",battle_special)=0){ - if (string_count("wake",battle_special)>0){ - var pip=instance_create(0,0,obj_popup); - with(pip){ - title="Necron Tomb Awakens"; - image="necron_army"; - if (obj_ncombat.defeat=0) then text="Your marines make a tactical retreat back to the surface, hounded by Necrons all the way. The Inquisition mission is a failure- you were to blow up the Necron Tomb World stealthily, not wake it up. The Inquisition is not pleased with your conduct."; - if (obj_ncombat.defeat=1) then text="Your marines are killed down to the last man. The Inquisition mission is a failure- you were to blow up the Necron Tomb World stealthily, not wake it up. The Inquisition is not pleased with your conduct."; - } - - instance_activate_object(obj_star); - with(obj_star){if (name!=obj_ncombat.battle_loc) then instance_deactivate_object(id);} - with(obj_star){ - var planet = obj_ncombat.battle_id; - if (remove_planet_problem(planet,"necron")){ - p_necrons[planet]=4; - } - if (awake_tomb_world(p_feature[planet])==0) then awaken_tomb_world(p_feature[planet]) - } - with(obj_temp7){instance_destroy();} - instance_activate_object(obj_star); - - pip.number=obj_temp8.popup - pip.loc=obj_temp8.loc; - pip.planet=battle_id; - obj_controller.combat=0; - obj_controller.disposition[4]-=5; - obj_controller.cooldown=10; - with(obj_temp8){instance_destroy();} - // obj_turn_end.alarm[1]=4; - } - - - if (defeat=1) and (string_count("wake",battle_special)=0){ - with(obj_temp8){instance_destroy();} - obj_controller.combat=0; - obj_controller.cooldown=10; - obj_turn_end.alarm[1]=4; - } - - if (defeat=0) and (string_count("wake",battle_special)=0){ - obj_temp8.stage+=1; - obj_controller.combat=0; - var pip=instance_create(0,0,obj_popup); - - with(pip){ - title="Necron Tunnels : "+string(obj_temp8.stage); - if (obj_temp8.stage=2){ - image="necron_tunnels_2"; - text="The energy readings are much stronger, now that your marines are deep inside the tunnels. What was once cramped is now luxuriously large, the tunnel ceiling far overhead decorated by stalactites."; - } - if (obj_temp8.stage=3){ - image="necron_tunnels_3"; - text="After several hours of descent the entrance to the Necron Tomb finally looms ahead- dancing, sickly green light shining free. Your marine confirms that the Plasma Bomb is ready."; - } - if (obj_temp8.stage=4){ - if (obj_temp8.stage>=4){ - instance_activate_object(obj_star); - image=""; - title="Inquisition Mission Completed"; - text="Your marines finally enter the deepest catacombs of the Necron Tomb. There they place the Plasma Bomb and arm it. All around are signs of increasing Necron activity. With half an hour set, your men escape back to the surface. There is a brief rumble as the charge goes off, your mission a success."; - option1="";option2="";option3=""; - - if (obj_controller.demanding=0) then obj_controller.disposition[4]+=1; - if (obj_controller.demanding=1) then obj_controller.disposition[4]+=choose(0,0,1); - - // show_message(string(obj_temp8.loc)+"."+string(obj_temp8.wid)); - // obj_controller.temp[200]=obj_temp8.loc; - with(obj_star){if (name!=obj_temp8.loc) then instance_deactivate_object(id);} - with(obj_star){if (name=obj_temp8.loc) then instance_create(x,y,obj_temp5);} - - var star = star_by_name(obj_temp8.loc) - var planet = obj_temp8.wid - // show_message(you.name); - - // show_message("TEMP5: "+string(instance_number(obj_temp5))+"#Star: "+string(you)); - - var ppp;ppp=0; - remove_planet_problem(planet, "necron", star); - seal_tomb_world(star.p_feature[planet]); - - - pip.option1="";pip.option2="";pip.option3=""; - scr_event_log("","Inquisition Mission Completed: Your Astartes have sealed the Necron Tomb on "+string(star.name)+" "+string(scr_roman(planet))+"."); - scr_gov_disp(star.name,planet,choose(1,2,3,4,5)); - - if (!instance_exists(obj_temp8)){ - pip.loc=battle_loc; - pip.planet=battle_id; - } - if (instance_exists(obj_temp8)){ - pip.number=obj_temp8.popup; - pip.loc=obj_temp8.loc; - pip.planet=obj_temp8.wid; - } - - // show_message("Battle Closing: "+string(pip.loc)+"."+string(pip.planet)); - - with(obj_temp5){instance_destroy();} - instance_activate_object(obj_star); - var have_bomb;have_bomb=scr_check_equip("Plasma Bomb",obj_temp8.loc,obj_temp8.wid,1); - } - } - } - - if (instance_exists(obj_temp8)) and (pip.planet=0){ - pip.number=obj_temp8.popup - pip.loc=obj_temp8.loc; - pip.planet=battle_id; - } - } + if (battle_mission == "necron_tomb_excursion"){ + necron_tomb_raid_post_battle_sequence(); } @@ -431,11 +310,11 @@ try { // title / text / image / speshul var cur_star = obj_turn_end.battle_object[obj_turn_end.current_battle]; var planet = obj_turn_end.battle_world[obj_turn_end.current_battle] - var planet_string = scr_roman_numerals()[planet-1]; + var _planet_string = scr_roman_numerals()[planet-1]; remove_planet_problem(planet ,"spyrer",cur_star) - var tixt=$"The Spyrer on {cur_star.name} {planet_string} has been removed. The citizens and craftsman may sleep more soundly, the Inquisition likely pleased." + var tixt=$"The Spyrer on {cur_star.name} {_planet_string} has been removed. The citizens and craftsman may sleep more soundly, the Inquisition likely pleased." scr_popup("Inquisition Mission Completed",tixt,"spyrer",""); @@ -446,46 +325,34 @@ try { scr_gov_disp(cur_star.name,planet,choose(1,2,3,4)); instance_deactivate_object(obj_star); + } else if (battle_special == "protect_raiders"){ + protect_raiders_battle_aftermath() } - if ((string_count("fallen",battle_special)>0)) and (defeat=0){ - var fallen=0; - with (obj_turn_end){ - remove_planet_problem(battle_world[current_battle], "fallen", battle_object[current_battle]) - var tixt="The Fallen on "+ battle_object[current_battle].name; - tixt+=scr_roman(battle_world[current_battle]); - scr_event_log("",$"Mission Succesful: {tixt} have been captured or purged."); - tixt+=$" have been captured or purged. They shall be brought to the Chapter {obj_ini.role[100][14]}s posthaste, in order to account for their sins. "; - var ran;ran=choose(1,1,2,3); - if (ran=1) then tixt+="Suffering is the beginning to penance."; - if (ran=2) then tixt+="Their screams shall be the harbringer of their contrition."; - if (ran=3) then tixt+="The shame they inflicted upon us shall be written in their flesh."; - scr_popup("Hunt the Fallen Completed",tixt,"fallen",""); - } + else if (string_count("fallen",battle_special)>0){ + hunt_fallen_battle_aftermath(); } - if (defeat=0) and (enemy=9) and (battle_special="tyranid_org"){ + else if (defeat == 0) and (enemy=9) and (battle_special="tyranid_org"){ if (captured_gaunt>1){ - pop=instance_create(0,0,obj_popup); - pop.image="inquisition"; - pop.title="Inquisition Mission Completed"; - pop.text="You have captured several Gaunt organisms. The Inquisitor is pleased with your work, though she notes that only one is needed- the rest are to be purged. It will be stored until it may be retrieved. The mission is a success."; + _pop = instance_create(0,0,obj_popup); + _pop.image = "inquisition"; + _pop.title = "Inquisition Mission Completed"; + _pop.text = "You have captured several Gaunt organisms. The Inquisitor is pleased with your work, though she notes that only one is needed- the rest are to be purged. It will be stored until it may be retrieved. The mission is a success."; } if (captured_gaunt=1){ - pop=instance_create(0,0,obj_popup); - pop.image="inquisition"; - pop.title="Inquisition Mission Completed"; - pop.text="You have captured a Gaunt organism- the Inquisitor is pleased with your work. The Tyranid will be stored until it may be retrieved. The mission is a success."; + _pop = instance_create(0,0,obj_popup); + _pop.image = "inquisition"; + _pop.title = "Inquisition Mission Completed"; + _pop.text = "You have captured a Gaunt organism- the Inquisitor is pleased with your work. The Tyranid will be stored until it may be retrieved. The mission is a success."; } } - if (enemy=1) and (on_ship=true) and (defeat=0){ - var diceh=floor(random(100))+1; - - if(scr_has_disadv("Shitty Luck")) then diceh-=15; - + else if (enemy=1) and (on_ship=true) and (defeat=0){ + var diceh=roll_dice_chapter(1, 100, "high"); + if (diceh<=15){ var ship,ship_hp,i=-1; for (var i=0;i0){ - var shi=0,loc=""; - - var shiyp=instance_nearest(battle_object.x,battle_object.y,obj_p_fleet); - if (shiyp.x == battle_object.x && shiyp.y ==battle_object.y){ - shi = fleet_full_ship_array(shiyp)[0]; - loc = obj_ini.ship[shi]; - } - - if (hulk_treasure=1){// Requisition - var reqi=round(random_range(30,60)+1)*10; - obj_controller.requisition+=reqi; - - var pop;pop=instance_create(0,0,obj_popup); - pop.image="space_hulk_done"; - pop.title="Space Hulk: Resources"; - pop.text="Your battle brothers have located several luxury goods and coginators within the Space Hulk. They are salvaged and returned to the ship, granting "+string(reqi)+" Requisition."; - }else if (hulk_treasure=2){// Artifact - //TODO this will eeroniously put artifacts in the wrong place but will resolve crashes - var last_artifact = scr_add_artifact("random","random",4,loc,shi+500); - var i=0; - - var pop=instance_create(0,0,obj_popup); - pop.image="space_hulk_done"; - pop.title="Space Hulk: Artifact"; - pop.text=$"An Artifact has been retrieved from the Space Hulk and stowed upon {loc}. It appears to be a {obj_ini.artifact[last_artifact]} but should be brought home and identified posthaste."; - scr_event_log("","Artifact recovered from the Space Hulk."); - }else if (hulk_treasure=3){// STC - scr_add_stc_fragment();// STC here - var pop;pop=instance_create(0,0,obj_popup); - pop.image="space_hulk_done"; - pop.title="Space Hulk: STC Fragment"; - pop.text="An STC Fragment has been retrieved from the Space Hulk and safely stowed away. It is ready to be decrypted or gifted at your convenience."; - scr_event_log("","STC Fragment recovered from the Space Hulk."); - }else if (hulk_treasure=4){// Termie Armour - var termi=choose(2,2,2,3); - scr_add_item("Terminator Armour",termi); - var pop;pop=instance_create(0,0,obj_popup); - pop.image="space_hulk_done"; - pop.title="Space Hulk: Terminator Armour"; - pop.text="The fallen heretics wore several suits of Terminator Armour- a handful of them were found to be cleansible and worthy of use. "+string(termi)+" Terminator Armour has been added to the Armamentarium."; - } + if (battle_special="space_hulk"){ + space_hulk_explore_battle_aftermath(); } - if ((leader=1) or (battle_special="world_eaters")) and (obj_controller.faction_defeated[10]=0) and (defeat=0) and (battle_special!="WL10_reveal") and (battle_special!="WL10_later"){ + if ((leader=1) or (battle_special="ChaosWarband")) and (obj_controller.faction_defeated[10]=0) and (defeat=0) and (battle_special!="WL10_reveal") and (battle_special!="WL10_later"){ if (battle_special!="WL10_reveal") and (battle_special!="WL10_later"){ // prolly schedule a popup congratulating obj_controller.faction_defeated[enemy]=1; if (obj_controller.known[enemy]=0) then obj_controller.known[enemy]=1; - if (battle_special!="world_eaters") then with(obj_star){ + if (battle_special!="ChaosWarband") then with(obj_star){ if (string_count("WL"+string(obj_ncombat.enemy),p_feature[obj_ncombat.battle_id])>0){ p_feature[obj_ncombat.battle_id]=string_replace(p_feature[obj_ncombat.battle_id],"WL"+string(obj_ncombat.enemy)+"|",""); } } - if (battle_special="world_eaters"){ + if (battle_special="ChaosWarband"){ obj_controller.faction_defeated[10]=1;// show_message("WL10 defeated"); if (instance_exists(obj_turn_end)){ scr_event_log("","Enemy Leader Assassinated: Chaos Lord"); @@ -666,9 +501,10 @@ try { } if (!instance_exists(obj_turn_end)){ scr_event_log("","Enemy Leader Assassinated: Chaos Lord"); - var pop;pop=instance_create(0,0,obj_popup); - pop.image="";pop.title="Black Crusade Ended"; - pop.text="The Chaos Lord "+string(obj_controller.faction_leader[eFACTION.Chaos])+" has been slain in combat. Without his leadership the Black Crusade is destined to crumble apart and disintegrate from infighting. Sector "+string(obj_ini.sector_name)+" is no longer at threat by the forces of Chaos."; + var _pop = instance_create(0,0,obj_popup); + _pop.image = ""; + _pop.title = "Black Crusade Ended"; + _pop.text=$"The Chaos Lord {obj_controller.faction_leader[eFACTION.Chaos]} has been slain in combat. Without his leadership the Black Crusade is destined to crumble apart and disintegrate from infighting. Sector "+string(obj_ini.sector_name)+" is no longer at threat by the forces of Chaos."; } } }} diff --git a/objects/obj_ncombat/Create_0.gml b/objects/obj_ncombat/Create_0.gml index dca5c78274..cd2e02a435 100644 --- a/objects/obj_ncombat/Create_0.gml +++ b/objects/obj_ncombat/Create_0.gml @@ -54,7 +54,9 @@ battle_loc=""; battle_climate=""; battle_id=0; battle_object=0; +battle_mission = ""; battle_special=""; +battle_data = {}; defeat=0; defeat_message=0; red_thirst=0; @@ -131,13 +133,14 @@ repeat(70){i+=1; dead_ene[i]=""; dead_ene_n[i]=0; - post_equipment_lost[i]=""; - post_equipments_lost[i]=0; - crunch[i]=0; if (i<=10) then mucra[i]=0; } + +post_equipment_lost = new EquipmentTracker(); +post_equipment_recovered = new EquipmentTracker(); + slime=0; unit_recovery_score=0; apothecaries_alive=0; diff --git a/objects/obj_ncombat/Draw_0.gml b/objects/obj_ncombat/Draw_0.gml index 092eef46b4..65d6a5f0a5 100644 --- a/objects/obj_ncombat/Draw_0.gml +++ b/objects/obj_ncombat/Draw_0.gml @@ -5,7 +5,7 @@ draw_set_color(c_black);draw_set_alpha(1); draw_rectangle(0,0,800,900,0); draw_rectangle(818,235,1578,666,0); -draw_set_color(38144); +draw_set_color(CM_GREEN_COLOR); var l;l=0; draw_set_alpha(1);draw_rectangle(0+l,0+l,800-l,900-l,1);l+=1; @@ -38,7 +38,7 @@ draw_set_halign(fa_left); repeat(45){l+=1; // draw_text(x+6,y-10+(l*14),"."+string(lines[31-l])); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); if (lines_color[l]="red") then draw_set_color(c_red); if (lines_color[l]="yellow") then draw_set_color(3055825); if (lines_color[l]="purple") then draw_set_color(16646566); @@ -48,7 +48,7 @@ repeat(45){l+=1; draw_text(x+6,y-10+(l*18),string_hash_to_newline(string(lines[l]))); } -draw_set_color(38144); +draw_set_color(CM_GREEN_COLOR); if (click_stall_timer<=0){ if (fadein<0) and (fadein>-100) and (started=0){ draw_set_alpha((fadein*-1)/30); diff --git a/objects/obj_ncombat/KeyPress_13.gml b/objects/obj_ncombat/KeyPress_13.gml index f91f63f383..2531ccb64a 100644 --- a/objects/obj_ncombat/KeyPress_13.gml +++ b/objects/obj_ncombat/KeyPress_13.gml @@ -82,31 +82,21 @@ if (started>0){// This might be causing problems? if (instance_exists(obj_enunit)) then obj_enunit.alarm[8]=8; } -function reset_combat_message_arrays(){ - for (var i=0;i0) then global_perils-=1; if (global_perils<0) then global_perils=0; turns+=1; - four_show=0;click_stall_timer=15; + four_show=0; + click_stall_timer=15; // if (battle_over!=1) then alarm[8]=15; if (enemy!=6){ if (instance_exists(obj_enunit)){ obj_enunit.alarm[1]=1; } - if (instance_exists(obj_pnunit)){ - obj_pnunit.alarm[3]=2; - obj_pnunit.alarm[1]=3; - turn_count++; - obj_pnunit.alarm[0]=4; - } + set_up_player_blocks_turn(); // alarm[9]=5; } @@ -117,13 +107,12 @@ if (timer_stage=1) or (timer_stage=5){ obj_enunit.alarm[0]=3; } if (instance_exists(obj_pnunit)){ - obj_pnunit.alarm[1]=1; + wait_and_execute(1, scr_player_combat_weapon_stacks); turn_count++; } } - messages=0;messages_to_show = 24;largest=0;random_messages=0;priority=0;messages_shown=0; - reset_combat_message_arrays(); - timer_stage=2;timer=0;done=0;messages_shown=0; + reset_combat_message_arrays(); + timer_stage=2; } @@ -134,7 +123,9 @@ else if (timer_stage=3){ if (enemy!=6){ if (instance_exists(obj_pnunit)){ - obj_pnunit.alarm[1]=1; + with(obj_pnunit){ + wait_and_execute(1, scr_player_combat_weapon_stacks); + } turn_count++; } if (instance_exists(obj_enunit)){ @@ -144,25 +135,16 @@ else if (timer_stage=3){ obj_enunit.alarm[8]=4; turns+=1; } - var messages=0;messages_to_show = 24;largest=0;random_messages=0;priority=0;messages_shown=0; reset_combat_message_arrays(); - timer_stage=4;timer=0;done=0;messages_shown=0; } if (enemy=6){ - if (instance_exists(obj_pnunit)){ - obj_pnunit.alarm[3]=2; - obj_pnunit.alarm[1]=3; - turn_count++; - obj_pnunit.alarm[0]=4; - turns+=1; - } + set_up_player_blocks_turn(); + turns+=1; if (instance_exists(obj_enunit)){ obj_enunit.alarm[1]=1; } // alarm[9]=5; - var i;i=0;messages=0;messages_to_show = 24;largest=0;random_messages=0;priority=0;messages_shown=0; reset_combat_message_arrays(); - timer_stage=4;timer=0;done=0;messages_shown=0; } } diff --git a/objects/obj_p_assra/Draw_0.gml b/objects/obj_p_assra/Draw_0.gml index aa335259c4..7d219198c9 100644 --- a/objects/obj_p_assra/Draw_0.gml +++ b/objects/obj_p_assra/Draw_0.gml @@ -1,6 +1,6 @@ draw_self(); -draw_set_color(38144); +draw_set_color(CM_GREEN_COLOR); draw_set_font(fnt_info); draw_set_halign(fa_center); draw_set_alpha(1); diff --git a/objects/obj_p_assra/Step_0.gml b/objects/obj_p_assra/Step_0.gml index 8175b49f48..17fab4fc2b 100644 --- a/objects/obj_p_assra/Step_0.gml +++ b/objects/obj_p_assra/Step_0.gml @@ -67,8 +67,8 @@ if (boarding=true) and (board_cooldown>=0) and (instance_exists(target)) and (in board_cooldown-=1; if (board_cooldown=0){board_cooldown=60; - var o,challenge,difficulty,roll1,roll2,attack,arp,wep,ac,dr,co,i,hits,hurt,damaged_ship; - o=firstest-1;difficulty=50;challenge=0;roll1=0;roll2=0;attack=0;arp=0;wep="";hits=0;hurt=0;damaged_ship=0; + var o,challenge,boarding_odds,boarding_advantage,boarding_disadvantage,gear_bonus,marine_bonus,outcome_roll,damage_roll,attack,arp,wep,ac,dr,co,i,hits,hurt,damaged_ship,bridge_damage; + o=firstest-1;boarding_odds=0;challenge=0;outcome_roll=0;damage_roll=0;attack=0;arp=0;wep="";hits=0;hurt=0;damaged_ship=0;bridge_damage=1; co=0;i=0;ac=0;dr=1; for (var o=0;o=0) and (instance_exists(target)) and (in co=origin.board_co[o]; i=origin.board_id[o]; - difficulty=50; ac=0; dr=1; unit=fetch_unit([co,i]); + gear_bonus=0; + marine_bonus=0; + boarding_odds=50; + boarding_advantage=0; + boarding_disadvantage=0; if (unit.hp()>0){ // Bonuses - difficulty+=unit.experience/20; - difficulty+=(1-(target.hp/target.maxhp))*33; - //TODO define tag for bording weapons - if (array_contains(["Chainfist","Meltagun","Lascutter","Boarding Shield"], unit.weapon_one())) then difficulty+=3; - if (array_contains(["Chainfist","Meltagun","Lascutter","Boarding Shield"], unit.weapon_two())) then difficulty+=3; + marine_bonus+=unit.experience/20; + marine_bonus+=(1-(target.hp/target.maxhp))*33; // if wounded marine will perform worse - if (scr_has_adv("Boarders")) then difficulty+=7; - if (scr_has_adv("Assault Doctrine")) then difficulty+=3; - if (scr_has_adv("Lightning Warriors")) then difficulty+=3; + var _weapons = [unit.get_weapon_one_data(), unit.get_weapon_two_data()]; + if (!is_struct(_weapons[0]) && !is_struct(_weapons[1])) { + gear_bonus -= 10; + } else { + for (var i = 0; i <= 1; i++) { + var _weapon = _weapons[i]; + if (!is_struct(_weapon)) then continue + + if (_weapon.has_tag("boarding 1")) { + gear_bonus += 2; + bridge_damage = max(bridge_damage, 3); + } else if (_weapon.has_tag("boarding 2")) { + gear_bonus += 4; + bridge_damage = max(bridge_damage, 5); + } else if (_weapon.has_tag("boarding 3")) { + gear_bonus += 6; + bridge_damage = max(bridge_damage, 7); + } + } + } + if (scr_has_adv("Boarders")) then marine_bonus+=7; + if (scr_has_adv("Assault Doctrine")) then marine_bonus+=3; + if (scr_has_adv("Lightning Warriors")) then marine_bonus+=3; + + boarding_advantage+=(gear_bonus+marine_bonus) // Penalties - if (unit.weapon_one()=="")then difficulty-=10; - if (unit.weapon_two()=="")then difficulty-=10; if (unit.base_group == "astartes"){ - if (unit.gene_seed_mutations.occulobe==1) then difficulty-=5; + if (unit.gene_seed_mutations.occulobe==1) then boarding_disadvantage-=5; } - if (target.owner = eFACTION.Imperium) or ((target.owner = eFACTION.Chaos) and (obj_fleet.csm_exp=0)) then difficulty-=0;// Cultists/Pirates/Humans - if (target.owner = eFACTION.Player) or (target.owner = eFACTION.Ecclesiarchy) or (target.owner = eFACTION.Ork) or (target.owner = eFACTION.Eldar) or (target.owner = eFACTION.Necrons) then difficulty-=10; - if (target.owner = eFACTION.Chaos) and (obj_fleet.csm_exp=1) then difficulty-=20;// Veteran marines - if ((target.owner = eFACTION.Chaos) and (obj_fleet.csm_exp=2)) or (target.owner = eFACTION.Tyranids) then difficulty-=30;// Daemons, veteran CSM, tyranids - - roll1=floor(random(100))+1; + if (target.owner = eFACTION.Imperium) or ((target.owner = eFACTION.Chaos) and (obj_fleet.csm_exp=0)) then boarding_disadvantage-=0;// Cultists/Pirates/Humans + if (target.owner = eFACTION.Player) or (target.owner = eFACTION.Ecclesiarchy) or (target.owner = eFACTION.Ork) or (target.owner = eFACTION.Eldar) or (target.owner = eFACTION.Necrons) then boarding_disadvantage-=10; + if (target.owner = eFACTION.Chaos) and (obj_fleet.csm_exp=1) then boarding_disadvantage-=20;// Veteran marines + if ((target.owner = eFACTION.Chaos) and (obj_fleet.csm_exp=2)) or (target.owner = eFACTION.Tyranids) then boarding_disadvantage-=30;// Daemons, veteran CSM, tyranids + + boarding_odds+=boarding_advantage+boarding_disadvantage; + boarding_odds=clamp(boarding_odds,0,100); + outcome_roll=floor(random(100))+1; - if (roll1<=difficulty){// Success + if (outcome_roll<=boarding_odds){// Success if (damage=true) and (steal=false){// Damaging var to_bomb;to_bomb=false; if (plasma_bomb=true) and (obj_ini.gear[co][i]="Plasma Bomb") then to_bomb=true; @@ -124,39 +147,12 @@ if (boarding=true) and (board_cooldown>=0) and (instance_exists(target)) and (in obj_ini.gear[co][i]=""; } } + if (steal=true) and (damage=false){// Stealing - var bridge_damage=0; damaged_ship=max(1,damaged_ship); - - var we,whi,we1,we2;we=""; - we1=unit.weapon_one(); - we2=unit.weapon_two(); - whi=0; - - bridge_damage=3; - //TODO tagging system to slove this - we="Heavy Thunder Hammer"; - if (we1=we) or (we2=we) then bridge_damage=max(bridge_damage,8); - we="Eviscerator"; - if (we1=we) or (we2=we) then bridge_damage=max(bridge_damage,7); - we="Chainfist"; - if (we1=we) or (we2=we) then bridge_damage=max(bridge_damage,7); - we="Lascutter"; - if (we1=we) or (we2=we) then bridge_damage=max(bridge_damage,7); - we="Meltagun"; - if (we1=we) or (we2=we) then bridge_damage=max(bridge_damage,7); - we="Power Fist"; - if (we1=we) or (we2=we) then bridge_damage=max(bridge_damage,6); - we="Thunder Hammer"; - if (we1=we) or (we2=we) then bridge_damage=max(bridge_damage,6); - we="Plasma Gun"; - if (we1=we) or (we2=we) then bridge_damage=max(bridge_damage,5); - we="Relic Blade"; - if (we1=we) or (we2=we) then bridge_damage=max(bridge_damage,4); - if (string_pos("&",string(obj_ini.wep1[co][i])+string(obj_ini.wep2[co][i]))>0) then bridge_damage=9; - target.bridge-=bridge_damage; } + if ((target.hp<=0) or (target.bridge<=0)){ var husk=instance_create(target.x,target.y,obj_en_husk); @@ -196,67 +192,67 @@ if (boarding=true) and (board_cooldown>=0) and (instance_exists(target)) and (in } - if (roll1>difficulty){// FAILURE + if (outcome_roll>boarding_odds){// FAILURE ac=unit.armour_calc() dr = unit.damage_resistance()/100 - roll2=floor(random(100))+1; + damage_roll=floor(random(100))+1; //TODO streamline enemy weapons if (target.owner = eFACTION.Imperium) or (target.owner = eFACTION.Chaos) or (target.owner = eFACTION.Ecclesiarchy){ // Make worse for CSM wep="Lasgun"; hits=1; - if (roll2<=90) then hits=2; - if (roll2<=75) then hits=3; - if (roll2<=50){wep="Bolt Pistol";hits=1;} - if (roll2<=40){wep="Bolter";hits=1;} - if (roll2<=30){wep="Bolter";hits=2;} - if (roll2<=20){wep="Heavy Bolter";hits=1;} - if (roll2<=10){wep="Plasma Pistol";hits=1;} - if (roll2<=5){wep="Meltagun";hits=1;} + if (damage_roll<=90) then hits=2; + if (damage_roll<=75) then hits=3; + if (damage_roll<=50){wep="Bolt Pistol";hits=1;} + if (damage_roll<=40){wep="Bolter";hits=1;} + if (damage_roll<=30){wep="Bolter";hits=2;} + if (damage_roll<=20){wep="Heavy Bolter";hits=1;} + if (damage_roll<=10){wep="Plasma Pistol";hits=1;} + if (damage_roll<=5){wep="Meltagun";hits=1;} } if (target.owner = eFACTION.Eldar){ wep="Shuriken Pistol";hits=1; - if (roll2<=90) then hits=2; - if (roll2<=75) then hits=3; - if (roll2<=60){wep="Shuriken Catapult";hits=2;} - if (roll2<=50){wep="Shuriken Catapult";hits=3;} - if (roll2<=40){wep="Shuriken Catapult";hits=4;} - if (roll2<=30){wep="Wraith Cannon";hits=1;} - if (roll2<=20){wep="Singing Spear";hits=1;} - if (roll2<=10){wep="Meltagun";hits=1;} + if (damage_roll<=90) then hits=2; + if (damage_roll<=75) then hits=3; + if (damage_roll<=60){wep="Shuriken Catapult";hits=2;} + if (damage_roll<=50){wep="Shuriken Catapult";hits=3;} + if (damage_roll<=40){wep="Shuriken Catapult";hits=4;} + if (damage_roll<=30){wep="Wraith Cannon";hits=1;} + if (damage_roll<=20){wep="Singing Spear";hits=1;} + if (damage_roll<=10){wep="Meltagun";hits=1;} } if (target.owner = eFACTION.Ork){ wep="Shoota";hits=1; - if (roll2<=90) then hits=2; - if (roll2<=75) then hits=3; - if (roll2<=60) then hits=4; - if (roll2<=50){wep="Dakkagun";hits=1;} - if (roll2<=40){wep="Big Shoota";hits=1;} - if (roll2<=30){wep="Big Shoota";hits=2;} - if (roll2<=15){wep="Rokkit";hits=1;} + if (damage_roll<=90) then hits=2; + if (damage_roll<=75) then hits=3; + if (damage_roll<=60) then hits=4; + if (damage_roll<=50){wep="Dakkagun";hits=1;} + if (damage_roll<=40){wep="Big Shoota";hits=1;} + if (damage_roll<=30){wep="Big Shoota";hits=2;} + if (damage_roll<=15){wep="Rokkit";hits=1;} } if (target.owner = eFACTION.Tau){ wep="Pulse Rifle";hits=1; - if (roll2<=80) then hits=2; - if (roll2<=65) then hits=3; - if (roll2<=50) then hits=4; - if (roll2<=40){wep="Missile Pod";hits=1;} - if (roll2<=30){wep="Burst Rifle";hits=1;} - if (roll2<=15){wep="Meltagun";hits=1;} + if (damage_roll<=80) then hits=2; + if (damage_roll<=65) then hits=3; + if (damage_roll<=50) then hits=4; + if (damage_roll<=40){wep="Missile Pod";hits=1;} + if (damage_roll<=30){wep="Burst Rifle";hits=1;} + if (damage_roll<=15){wep="Meltagun";hits=1;} } if (target.owner = eFACTION.Tyranids){ wep="Flesh Hooks";hits=1; - if (roll2<=90) then hits=2; - if (roll2<=75) then hits=3; - if (roll2<=60){wep="Devourer";hits=2;} - if (roll2<=50){wep="Devourer";hits=3;} - if (roll2<=40){wep="Devourer";hits=4;} - if (roll2<=30){wep="Venom Cannon";hits=1;} - if (roll2<=20){wep="Lictor Claws";hits=1;} - if (roll2<=10){wep="Zoanthrope Blast";hits=1;} + if (damage_roll<=90) then hits=2; + if (damage_roll<=75) then hits=3; + if (damage_roll<=60){wep="Devourer";hits=2;} + if (damage_roll<=50){wep="Devourer";hits=3;} + if (damage_roll<=40){wep="Devourer";hits=4;} + if (damage_roll<=30){wep="Venom Cannon";hits=1;} + if (damage_roll<=20){wep="Lictor Claws";hits=1;} + if (damage_roll<=10){wep="Zoanthrope Blast";hits=1;} } if (wep="Lasgun"){attack=25;arp=0;} diff --git a/objects/obj_p_fleet/Alarm_1.gml b/objects/obj_p_fleet/Alarm_1.gml index 9ad7ea80eb..064e294e74 100644 --- a/objects/obj_p_fleet/Alarm_1.gml +++ b/objects/obj_p_fleet/Alarm_1.gml @@ -27,7 +27,7 @@ try_and_report_loop("player alarm 1",function(){ } - else if (action="move") or (action="crusade1") or (action="crusade2") or (action="crusade3"){ + else if (array_contains(FLEET_MOVE_OPTIONS, action)){ var i; set_fleet_location("Warp"); @@ -42,8 +42,7 @@ try_and_report_loop("player alarm 1",function(){ y=y+lengthdir_y(spid,dir); action_eta-=1; - just_left=false; - + just_left=false; if (action_eta=0) and (action="crusade1"){ var dr=point_direction(room_width/2,room_height/2,x,y); @@ -58,7 +57,7 @@ try_and_report_loop("player alarm 1",function(){ var enemies = false; for(var i=6;i<13;i++){ if (scr_orbiting_fleet(i)!="none"){ - enemies =true; + enemies = true; break; } } diff --git a/objects/obj_p_fleet/Create_0.gml b/objects/obj_p_fleet/Create_0.gml index e0d27e540d..42eb46b4b4 100644 --- a/objects/obj_p_fleet/Create_0.gml +++ b/objects/obj_p_fleet/Create_0.gml @@ -92,7 +92,7 @@ deserialize = function(save_data){ try { variable_struct_set(self, var_name, loaded_value); } catch (e){ - show_debug_message(e); + show_debug_message_adv(e); } } diff --git a/objects/obj_p_fleet/Draw_0.gml b/objects/obj_p_fleet/Draw_0.gml index 067bee5295..4a06e02fcb 100644 --- a/objects/obj_p_fleet/Draw_0.gml +++ b/objects/obj_p_fleet/Draw_0.gml @@ -98,7 +98,7 @@ if (within=1) or (selected>0){ if (capital_number=0) and (frigate_number=0) and (escort_number=1) then ppp=escort[0]; // ppp=acted; // - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_font(fnt_40k_14b); draw_set_halign(fa_center); if (obj_controller.zoomed) then draw_text_transformed(x,y-48,string_hash_to_newline(ppp),text_size,text_size,0);// was 1.4 diff --git a/objects/obj_p_ship/Draw_0.gml b/objects/obj_p_ship/Draw_0.gml index 0a961c5e51..ca76a0a738 100644 --- a/objects/obj_p_ship/Draw_0.gml +++ b/objects/obj_p_ship/Draw_0.gml @@ -5,7 +5,7 @@ if !__b__ { if (selected=1){ - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_circle(x,y,(sprite_width/2),1); draw_circle(x,y,(sprite_width/2)-1,1); draw_circle(x,y,(sprite_width/2)+1,1); @@ -38,7 +38,7 @@ draw_self(); shader_reset(); -draw_set_color(38144); +draw_set_color(CM_GREEN_COLOR); draw_set_font(fnt_info); draw_set_halign(fa_center); @@ -55,7 +55,7 @@ if (boarders>0){ draw_set_color(c_white); draw_text(x-16,y+12,string_hash_to_newline(string(boarders))); } -draw_set_color(38144); +draw_set_color(CM_GREEN_COLOR); if (maxhp!=0){ diff --git a/objects/obj_pnunit/Alarm_0.gml b/objects/obj_pnunit/Alarm_0.gml index 293a1c15b1..fa9b5895bc 100644 --- a/objects/obj_pnunit/Alarm_0.gml +++ b/objects/obj_pnunit/Alarm_0.gml @@ -19,11 +19,14 @@ try { move_unit_block("east"); } - if (!instance_exists(enemy)) then exit; - if (collision_point(x+10,y,obj_enunit,0,1)) or (collision_point(x-10,y,obj_enunit,0,1)) then engaged=1; - if (!collision_point(x+10,y,obj_enunit,0,1)) and (!collision_point(x-10,y,obj_enunit,0,1)) then engaged=0; + if (!instance_exists(enemy)) { + engaged = false; + exit; + } + + engaged = collision_point(x-14, y, obj_enunit, 0, 1) || collision_point(x+14, y, obj_enunit, 0, 1); - var once_only;once_only=0; + var once_only=0; var range_shoot=""; var dist=point_distance(x,y,enemy.x,enemy.y)/10; @@ -68,26 +71,26 @@ try { enemy2=enemy; } - + if (range[i]>=dist) and (ammo[i]!=0 || range[i]==1){ if (range[i]!=1) and (engaged=0) then range_shoot="ranged"; if ((range[i]!=floor(range[i]) || floor(range[i])=1) && engaged=1) then range_shoot="melee"; } - + if (range_shoot="ranged") and (range[i]>=dist){// Weapon meets preliminary checks var ap=0; if (apa[i]>att[i]) then ap=1;// Determines if it is AP or not if (wep[i]="Missile Launcher") then ap=1; if (string_count("Lascan",wep[i])>0) then ap=1; if (instance_number(obj_enunit)=1) and (obj_enunit.men=0) and (obj_enunit.veh>0) then ap=1; - - + + if (instance_exists(enemy)){ if (obj_enunit.veh>0) and (obj_enunit.men=0) and (apa[i]>10) then ap=1; - + if (ap=1) and (once_only=0){// Check for vehicles var enemy2,g=0,good=0; - + if (enemy.veh>0){ good=scr_target(enemy,"veh");// First target has vehicles, blow it to hell scr_shoot(i,enemy,good,"arp","ranged"); @@ -109,17 +112,17 @@ try { if (good=0) then ap=0;// Fuck it, shoot at infantry } } - - - - - - + + + + + + if (instance_exists(enemy)) and (once_only=0){ if (enemy.medi>0) and (enemy.veh=0){ good=scr_target(enemy,"medi");// First target has vehicles, blow it to hell scr_shoot(i,enemy,good,"medi","ranged"); - + if (good=0) and (instance_number(obj_enunit)>1){// First target does not have vehicles, cycle through objects to find one that has vehicles var x2=enemy.x; repeat(instance_number(obj_enunit)-1){ @@ -136,15 +139,15 @@ try { // Was previously ap=1; } } - - - - - + + + + + if (instance_exists(enemy)){ if (ap=0) and (once_only=0){// Check for men var g,good,enemy2;g=0;good=0; - + if (enemy.men+enemy.medi>0){ good=scr_target(enemy,"men");// First target has vehicles, blow it to hell scr_shoot(i,enemy,good,"att","ranged"); @@ -163,17 +166,17 @@ try { } } } - }else if (range_shoot="melee") and ((range[i]==1) or (range[i]!=floor(range[i]))){// Weapon meets preliminary checks + }else if (range_shoot="melee") and ((range[i]==1) or (range[i]!=floor(range[i]))){// Weapon meets preliminary checks var ap=0; if (apa[i]==1) then ap=1;// Determines if it is AP or not - + if (enemy.men=0) and (apa[i]=0) and (att[i]>=80){ apa[i]=floor(att[i]/2);ap=1; } - + if (apa[i]==1) and (once_only=0){// Check for vehicles var enemy2,g=0,good=0; - + if (enemy.veh>0){ good=scr_target(enemy,"veh");// First target has vehicles, blow it to hell if (range[i]=1) then scr_shoot(i,enemy,good,"arp","melee"); @@ -181,10 +184,10 @@ try { if (good!=0) then once_only=1; if (good=0) and (att[i]>0) then ap=0;// Fuck it, shoot at infantry } - + if (enemy.veh=0) and (enemy.medi>0) and (once_only=0){// Check for vehicles var enemy2,g=0,good=0; - + if (enemy.medi>0){ good=scr_target(enemy,"medi");// First target has vehicles, blow it to hell if (range[i]=1) then scr_shoot(i,enemy,good,"medi","melee"); @@ -192,12 +195,12 @@ try { if (good!=0) then once_only=1; if (good=0) and (att[i]>0) then ap=0;// Fuck it, shoot at infantry } - - - + + + if (ap=0) and (once_only=0){// Check for men var g=0,good=0,enemy2; - + if (enemy.men>0) and (once_only=0){ // show_message(string(wep[i])+" attacking"); good=scr_target(enemy,"men"); @@ -206,9 +209,9 @@ try { if (good!=0) then once_only=1; } } - - - + + + } } @@ -223,11 +226,11 @@ try { } } } catch (_exception) { - // show_debug_message($"known_powers: {known_powers}"); - // show_debug_message($"buff_powers: {buff_powers}"); - // show_debug_message($"buff_cast: {buff_cast}"); - // show_debug_message($"power_index: {power_index}"); - // show_debug_message($"known_attack_powers: {known_attack_powers}"); - // show_debug_message($"known_buff_powers: {known_buff_powers}"); + // show_debug_message_adv($"known_powers: {known_powers}"); + // show_debug_message_adv($"buff_powers: {buff_powers}"); + // show_debug_message_adv($"buff_cast: {buff_cast}"); + // show_debug_message_adv($"power_index: {power_index}"); + // show_debug_message_adv($"known_attack_powers: {known_attack_powers}"); + // show_debug_message_adv($"known_buff_powers: {known_buff_powers}"); handle_exception(_exception); } \ No newline at end of file diff --git a/objects/obj_pnunit/Alarm_1.gml b/objects/obj_pnunit/Alarm_1.gml index e8853cc623..e2c7ef64c0 100644 --- a/objects/obj_pnunit/Alarm_1.gml +++ b/objects/obj_pnunit/Alarm_1.gml @@ -4,4 +4,4 @@ /* */ scr_player_combat_weapon_stacks(); -//show_debug_message("{0},/n{1},/n{2},/n{3},/n{4},/n{5}",wep_num,range,wep,att,wep_solo,wep_title); \ No newline at end of file +//show_debug_message_adv("{0},/n{1},/n{2},/n{3},/n{4},/n{5}",wep_num,range,wep,att,wep_solo,wep_title); \ No newline at end of file diff --git a/objects/obj_pnunit/Alarm_3.gml b/objects/obj_pnunit/Alarm_3.gml index aca70efbea..246faf5909 100644 --- a/objects/obj_pnunit/Alarm_3.gml +++ b/objects/obj_pnunit/Alarm_3.gml @@ -2,7 +2,7 @@ try { if (obj_ncombat.started=0){ if (men+dreads+veh<=0){ - //show_debug_message($"column destroyed {x}") + //show_debug_message_adv($"column destroyed {x}") instance_destroy(); } // if (veh+dreads>0) then instance_destroy(); diff --git a/objects/obj_pnunit/Create_0.gml b/objects/obj_pnunit/Create_0.gml index 9a02730af4..a2fd833d24 100644 --- a/objects/obj_pnunit/Create_0.gml +++ b/objects/obj_pnunit/Create_0.gml @@ -121,8 +121,6 @@ hostile_splash=0; alarm[1]=4; -action_set_alarm(1, 3); - hit = function() { return scr_hit(x1, y1, x2, y2) && obj_ncombat.fadein <= 0; }; diff --git a/objects/obj_popup/Create_0.gml b/objects/obj_popup/Create_0.gml index dc38e87263..a94033deb5 100644 --- a/objects/obj_popup/Create_0.gml +++ b/objects/obj_popup/Create_0.gml @@ -15,10 +15,7 @@ fancy_title=0; text_center=0; text=""; text2=""; -option1=""; -option2=""; -option3=""; -option4=""; +reset_popup_options(); pathway=""; option1enter=false; option2enter=false; @@ -44,10 +41,19 @@ battle_special=0; owner=0; tab=1; woopwoopwoop=0; -press=0; +press=-1; reset=0; demand=0; +options = []; + +add_option = method(self,add_option); +replace_options = method(self,replace_options); + +entered_option = -1; + +subtype = 0; + company=0; target_comp=-1; target_role=0; @@ -63,27 +69,23 @@ new_target=0; if (instance_exists(obj_controller)){obj_controller.cooldown=8000;} number=0; company_promote_data = [ + {exp : 0}, //index 0 = draw x, 1 = draw y, 2 = exp requirement for company - [1030,230,100],//1st company - [1140,230,65], - [1250,230,65], - [1360,230,65], - [1470,230,65], - [1030,250,45], - [1140,250,45], - [1250,250,35], - [1360,250,25], - [1470,250,15],//10th company + {exp :100},//1st company + {exp :65}, + {exp :65}, + {exp :65}, + {exp :65}, + {exp :45}, + {exp :45}, + {exp :35}, + {exp :25}, + {exp :15},//10th company ] for (var i=0;i<=10;i++){i+=1;role_name[i]="";role_exp[i]=0;} -reset_options = function(){ - option1=""; - option2=""; - option3=""; - option4=""; -} + // TODO: connect this logic with the other_manage_data() to reduce verboseness; get_unit_promotion_options = function(){ @@ -108,10 +110,14 @@ get_unit_promotion_options = function(){ role_exp[1]=5; spec=1; } else if (unit_role="Lexicanum"){ - role_name[1]=obj_ini.role[100,17];role_exp[1]=125;spec=1; + role_name[1]=obj_ini.role[100,17]; + role_exp[1]=125; + spec=1; role_name[2]="Codiciery";role_exp[2]=80; - } else if (unit_role=="Codiciery") and (target_comp=0){ - role_name[1]=obj_ini.role[100,17];role_exp[1]=125;spec=1; + } else if (unit_role == "Codiciery" && target_comp == 0){ + role_name[1]=obj_ini.role[100,17]; + role_exp[1]=125; + spec=1; } if (target_comp>0 && target_comp<=10 && spec==0){ if (units=1){ @@ -123,12 +129,12 @@ get_unit_promotion_options = function(){ if (scr_role_count(obj_ini.role[100][11],"1")==0){ //company ancient i+=1; role_name[i]=obj_ini.role[100][11]; - role_exp[i]=company_promote_data[target_comp-1][2]+10; + role_exp[i]=company_promote_data[target_comp].exp+10; } if (scr_role_count(obj_ini.role[100][7],"1")==0){ //company champ i+=1; role_name[i]=obj_ini.role[100][7]; - role_exp[i]=company_promote_data[target_comp-1][2]+10;//may as well have this liniked to weapon skill + role_exp[i]=company_promote_data[target_comp].exp+10;//may as well have this liniked to weapon skill } i+=1; role_name[i]=obj_ini.role[100][6]; //dreadnought @@ -139,7 +145,7 @@ get_unit_promotion_options = function(){ if (array_contains([2, 3, 4, 5, 6, 7], target_comp)){ i+=1; role_name[i]=obj_ini.role[100][8]; //tacts - role_exp[i]=company_promote_data[target_comp-1][2]; + role_exp[i]=company_promote_data[target_comp].exp; if (obj_controller.command_set[2]==0){ role_exp[i]=0; } @@ -148,7 +154,7 @@ get_unit_promotion_options = function(){ if (array_contains([2, 3, 4, 5, 8], target_comp)){ i+=1; role_name[i]=obj_ini.role[100][10]; //assualts - role_exp[i]=company_promote_data[target_comp-1][2]; + role_exp[i]=company_promote_data[target_comp].exp; if (obj_controller.command_set[2]==0){ role_exp[i]=0; } @@ -157,7 +163,7 @@ get_unit_promotion_options = function(){ if (array_contains([2, 3, 4, 5, 9], target_comp)){ i+=1; role_name[i]=obj_ini.role[100][9]; //devs - role_exp[i]=company_promote_data[target_comp-1][2]; + role_exp[i]=company_promote_data[target_comp].exp; if (obj_controller.command_set[2]==0){ role_exp[i]=0; } @@ -172,7 +178,7 @@ get_unit_promotion_options = function(){ if (target_comp == 10){ i+=1; role_name[i]=obj_ini.role[100][12]; //scouts - role_exp[i]=company_promote_data[target_comp-1][2]; + role_exp[i]=company_promote_data[target_comp].exp; if (obj_controller.command_set[2]==0){ role_exp[i]=0; } @@ -238,140 +244,3 @@ move_to_next_stage = function(){ press_exclusive(vk_space) || press_exclusive(vk_enter)); } - - -calculate_equipment_needs = function (){ - var i=0,rall="",all_good=0; - - req_armour=""; - req_armour_num=0; - have_armour_num=0; - req_gear=""; - req_gear_num=0; - have_gear_num=0; - req_mobi=""; - req_mobi_num=0; - have_mobi_num=0; - req_wep1=""; - req_wep1_num=0; - have_wep1_num=0; - req_wep2=""; - req_wep2_num=0; - have_wep2_num=0; - - rall=role_name[target_role]; - - /*if (rall=obj_ini.role[100][14]) and (global.chapter_name!="Space Wolves") and (global.chapter_name!="Iron Hands"){ - req_armour="";req_armour_num=0;req_wep1="";req_wep1_num=0;req_wep2="";req_wep2_num=0;req_mobi="";req_mobi_num=0; - }*/ - if (rall="Codiciery"){ - req_armour="";req_armour_num=0;req_wep1="";req_wep1_num=0;req_wep2="";req_wep2_num=0;req_mobi="";req_mobi_num=0;req_gear=obj_ini.gear[100,17];req_gear_num=units; - } else if (rall="Lexicanum"){ - req_armour=""; - req_armour_num=0; - req_wep1=""; - req_wep1_num=0; - req_wep2=""; - req_wep2_num=0; - req_mobi=""; - req_mobi_num=0; - } else if (rall=obj_ini.role[100][11]){ - req_armour=STR_ANY_POWER_ARMOUR; - req_armour_num=units; - req_wep2="Company Standard"; - req_wep2_num=units; - } else { - for (var i=2;i<20;i++){ - if (obj_ini.role[100][i]==rall){ - req_armour=obj_ini.armour[100][i]; - req_armour_num=units;req_wep1=obj_ini.wep1[100][i]; - req_wep1_num=units; - req_wep2=obj_ini.wep2[100][i]; - req_wep2_num=units; - req_mobi=obj_ini.mobi[100][i]; - req_mobi_num=units; - req_gear=obj_ini.gear[100][i]; - req_gear_num=units; - break; - } - } - } - - if (rall=obj_ini.role[100][6]){req_armour="Dreadnought";req_armour_num=units;req_wep1=obj_ini.wep1[100,6];req_wep1_num=units;req_wep2=obj_ini.wep2[100,6];req_wep2_num=units;} - if (rall=$"Venerable {obj_ini.role[100][6]}"){req_armour="";req_armour_num=0;req_wep1="";req_wep1_num=0;req_wep2="";req_wep2_num=0;} - - - var unit_armour; - var unit_wep_one; - for (var i=0; i=min_exp){ - if (is_struct(unit_armour)) { - if (req_armour == STR_ANY_POWER_ARMOUR) { - if (array_contains(LIST_BASIC_POWER_ARMOUR, unit_armour.name)) { - have_armour_num += 1; - } - } - if (req_armour == STR_ANY_TERMINATOR_ARMOUR) { - if (array_contains(LIST_TERMINATOR_ARMOUR, unit_armour.name)) { - have_armour_num += 1; - } - } - } - - if (obj_controller.ma_wep1[i]=req_wep1) or (obj_controller.ma_wep2[i]=req_wep1) then have_wep1_num+=1; - if (obj_controller.ma_wep2[i]=req_wep2) or (obj_controller.ma_wep1[i]=req_wep2) then have_wep2_num+=1; - - - if (obj_controller.ma_gear[i]=req_gear) then have_gear_num+=1; - if (obj_controller.ma_mobi[i]=req_mobi) then have_mobi_num+=1; - - if (req_wep1=="Heavy Ranged" && is_struct(unit_wep_one)){ - if (unit_wep_one.has_tag("heavy_ranged")) then have_wep1_num+=1; - } - } - - // if (n_wep1=n_wep2) and ((o_wep1!=n_wep1) or (o_wep2!=n_wep2)){have_wep1_num-=1;have_wep2_num-=1;} - - }// End Repeat - - // This checks to see if there is any more in the armoury - if (req_armour==STR_ANY_POWER_ARMOUR){ - var _armour_list = LIST_BASIC_POWER_ARMOUR; - for (i=0;i=req_armour_num) or (req_armour="")) and ((have_wep1_num>=req_wep1_num) or (req_wep1="")) and ((have_wep2_num>=req_wep2_num) or (req_wep2="")) then all_good=0.4; - if (req_gear="") or (req_gear_num<=have_gear_num) then all_good+=0.3; - if (req_mobi="") or (req_mobi_num<=have_mobi_num) then all_good+=0.3; -} diff --git a/objects/obj_popup/Destroy_0.gml b/objects/obj_popup/Destroy_0.gml index 17621f119c..3af0fb3804 100644 --- a/objects/obj_popup/Destroy_0.gml +++ b/objects/obj_popup/Destroy_0.gml @@ -1,5 +1,4 @@ -if (image="debug_banshee") then obj_controller.cooldown=8; if (image="chaos_symbol") and (title="Concealed Heresy") and (instance_exists(obj_drop_select)){ with (obj_drop_select){ obj_controller.cooldown=30; @@ -30,7 +29,7 @@ if (image="chaos_symbol") and (title="Concealed Heresy") and (instance_exists(ob if (instance_exists(obj_controller)){ if (obj_controller.current_eventing="chaos_meeting_1"){ - obj_controller.menu=20; + scr_toggle_diplomacy(); obj_controller.diplomacy=10; obj_controller.cooldown=5000; with(obj_controller){scr_dialogue("cs_meeting1");} @@ -86,7 +85,7 @@ if (instance_exists(obj_controller)){ repeat(obj_temp_meeting.dudes){v+=1; if (obj_temp_meeting.present[v]=1){ var _unit_array = [obj_temp_meeting.co[v],obj_temp_meeting.ide[v]]; - add_unit_to_battle(_unit_array) + add_unit_to_battle(_unit_array, meeting_star, true) } } diff --git a/objects/obj_popup/Draw_0.gml b/objects/obj_popup/Draw_0.gml index 5225f9aa40..8b13789179 100644 --- a/objects/obj_popup/Draw_0.gml +++ b/objects/obj_popup/Draw_0.gml @@ -1,1853 +1 @@ -try { - //TODO refactor this entire turd of a construct - if (hide == true) { - exit; - } - if (image == "debug") { - size = 3; - } - var romanNumerals = scr_roman_numerals(); - var xx, yy; - xx = __view_get(e__VW.XView, 0); - yy = __view_get(e__VW.YView, 0); - - if (instance_exists(obj_fleet)) { - exit; - } - - if (type == 99) { - draw_set_font(fnt_large); - draw_set_halign(fa_center); - draw_set_color(38144); - - if (!obj_controller.zoomed) { - draw_text_transformed(__view_get(e__VW.XView, 0) + 320, __view_get(e__VW.YView, 0) + 60, "SELECT DESTINATION", 0.5, 0.5, 0); - } else { - draw_text_transformed(room_width / 2, 60 * 3, "SELECT DESTINATION", 1.5, 1.5, 0); - } - - draw_set_halign(fa_left); - } else if (type == 10) { - target_comp += 1; - draw_set_color(0); - draw_set_alpha(target_comp / 60); - draw_rectangle(0, 0, room_width, room_height, 0); - draw_set_alpha(1); - exit; - } else if (((type == 9) || (type == 9.1)) && instance_exists(obj_controller)) { - draw_sprite(spr_planet_screen, 0, xx + 231 + 314, yy + 112); - draw_set_font(fnt_40k_14); - draw_set_halign(fa_center); - draw_set_color(c_gray); - - var ch = "", inq_hide = 0; - if (type == 9) { - if (array_contains(obj_ini.artifact_tags[obj_controller.menu_artifact], "inq")) { - if (array_contains(obj_controller.quest, "artifact_loan")) { - inq_hide = 1; - } - if (array_contains(obj_controller.quest, "artifact_return")) { - inq_hide = 2; - } - } - } - var iter = 0, spacer = 0; - for (var i = 2; i <= 8; i++) { - draw_set_font(fnt_40k_14); - draw_set_halign(fa_center); - draw_set_color(c_gray); - draw_set_alpha(0.33); - if (i == 7) { - continue; - } - if (obj_controller.known[i]) { - draw_set_alpha(1); - } - spacer = iter * 40; - ch = obj_controller.disposition[i] > 0 ? "+" : ""; - if (obj_controller.known[i] > 1) { - draw_text(xx + 740, yy + 140 + spacer, $"{scr_faction_string_name(i)} ({ch}{obj_controller.disposition[i]})"); - // draw_text(xx+740,yy+140+spacer,$"{obj_controller.faction_title[i]}"); - iter++; - } else { - continue; - } - draw_line(xx + 239 + 420, yy + 162 + spacer, xx + 398 + 420, yy + 162 + spacer); - if ((mouse_x >= xx + 240 + 420) && (mouse_x <= xx + 387 + 420)) { - if ((mouse_y >= yy + 131 + spacer) && (mouse_y <= yy + 159 + spacer) && (obj_controller.known[i] > 1)) { - if (i == eFACTION.Inquisition) { - if ((inq_hide != 2) && (inq_hide == 1)) { - continue; - } - } - draw_set_alpha(0.33); - draw_set_color(c_gray); - draw_rectangle(xx + 240 + 420, yy + 135 + spacer, xx + 398 + 420, yy + 160 + spacer, 0); - if (mouse_check_button_pressed(mb_left)) { - giveto = i; - } - } - } - } - draw_set_alpha(1); - draw_set_color(38144); - if (point_and_click(draw_unit_buttons([xx + 700, yy + 370], "Cancel", [1, 1], c_red))) { - obj_controller.cooldown = 8000; - instance_destroy(); - exit; - } - if ((giveto > 0) && (type == 9)) { - var arti_index = obj_controller.menu_artifact; - - var artifact_struct = obj_ini.artifact_struct[arti_index]; - var cur_tags = obj_ini.artifact_tags[arti_index]; - - // obj_controller.artifacts-=1; // this is done by delete_artifact() that is run later; - - obj_controller.cooldown = 10; - if (obj_controller.menu_artifact > obj_controller.artifacts) { - obj_controller.menu_artifact = obj_controller.artifacts; - } - - obj_controller.menu = 20; - obj_controller.diplomacy = giveto; - obj_controller.force_goodbye = -1; - var the = ""; - - if ((giveto != 7) && (giveto != 10)) { - the = "the "; - } - - scr_event_log("", $"Artifact gifted to {the} {obj_controller.faction[giveto]}."); - var is_daemon = artifact_struct.has_tag("daemonic"); - var is_chaos = artifact_struct.has_tag("chaos"); - if (inq_hide != 2) { - with (obj_controller) { - if ((!is_daemon) || ((diplomacy != 4) && (diplomacy != 5) && (diplomacy != 2))) { - scr_dialogue("artifact_thanks"); - } - if (is_daemon && ((diplomacy == 4) || (diplomacy == 5) || (diplomacy == 2))) { - scr_dialogue("artifact_daemon"); - } - } - } - if ((inq_hide == 2) && (obj_controller.diplomacy == 4)) { - with (obj_controller) { - scr_dialogue("artifact_returned"); - } - } - - if (artifact_struct.has_tag("MINOR")) { - obj_controller.disposition[giveto] = clamp(obj_controller.disposition[giveto] + 1, -100, 100); - } else { - var daemon_arts = function(faction, is_chaos, is_daemon) { - switch (faction) { - case eFACTION.Imperium: - if (is_daemon) { - var v = 0, ev = 0; - for (var v = 1; v < array_length(obj_controller.event); v++) { - if (obj_controller.event[v] == "") { - ev = v; - break; - } - } - obj_controller.event[ev] = "imperium_daemon"; - obj_controller.event_duration[ev] = 1; - with (obj_star) { - for (var i = 1; i <= planets; i++) { - if (p_owner[i] == 2) { - p_heresy[i] += choose(30, 40, 50, 60); - } - } - } - } - if (is_chaos) { - with (obj_star) { - for (var i = 1; i <= planets; i++) { - if ((p_owner[i] == 2) && (p_heresy[i] > 0)) { - p_heresy[i] += 10; - } - } - } - } - break; - case eFACTION.Tau: - if (is_daemon) { - with (obj_star) { - for (var i = 1; i <= planets; i++) { - if (p_owner[i] == 8) { - p_heresy[i] += 40; - } - } - } - } - break; - } - } - - var specialmod = 0 - switch (giveto) { - case eFACTION.Imperium: - break; - case eFACTION.Mechanicus: - break; - case eFACTION.Inquisition: - if (inq_hide == 2) { - specialmod -= 1; - } - - if (is_chaos) { - specialmod += 2; - } - - if (is_daemon) { - specialmod += 4; - } - break; - case eFACTION.Ecclesiarchy: - if (!is_daemon) { - if (scr_has_adv("Reverent Guardians")) { - specialmod += 2; - } - } else { - specialmod -= 2; - } - break; - case eFACTION.Eldar: - if (scr_has_disadv("Tolerant")) { - specialmod += 1; - } - break; - case eFACTION.Tau: - if (scr_has_disadv("Tolerant")) { - specialmod += 1; - } - break; - } - - daemon_arts(giveto, is_chaos, is_daemon) - var tagmod = artifact_struct.artifact_faction_value(giveto); - obj_controller.disposition[giveto] = clamp(obj_controller.disposition[giveto] + 2 + specialmod + tagmod, -100, 100); - } - - // Need to modify ^^^^ based on if it is chaos or daemonic - - delete_artifact(arti_index); - instance_destroy(); - exit; - } - } - - var zoom = 0; - if (instance_exists(obj_controller)) { - zoom = obj_controller.zoomed; - } - if (((zoom == 0) && (type <= 4)) || (type == 98)) { - var widd, image_bot, y_scale_mod; - image_bot = 0; - y_scale_mod = 1; - - if ((size == 0) || (size == 2)) { - sprite_index = spr_popup_medium; - image_alpha = 0; - widd = sprite_width - 50; - draw_sprite_ext(spr_popup_medium, type, xx + ((1600 - sprite_width) / 2), yy + ((900 - sprite_height) / 2), 1, y_scale, 0, c_white, 1); - if (image != "") { - image_wid = 100; - image_hei = 100; - } - } else if (size == 1) { - sprite_index = spr_popup_small; - image_alpha = 0; - widd = sprite_width - 10; - draw_sprite_ext(spr_popup_small, type, xx + ((1600 - sprite_width) / 2), yy + ((900 - sprite_height) / 2), 1, y_scale, 0, c_white, 1); - if (image != "") { - image_wid = 150; - image_hei = 150; - } - } else if (size == 3) { - var draw_y_scale = y_scale; - sprite_index = spr_popup_large; - image_alpha = 0; - widd = sprite_width - 50; - if (image == "debug") { - y_scale_mod = 1.5; - draw_y_scale = y_scale * y_scale_mod; - } - draw_sprite_ext(spr_popup_large, type, xx + ((1600 - sprite_width) / 2), yy + ((900 - sprite_height * y_scale_mod) / 2), 1, draw_y_scale, 0, c_white, 1); - if (image != "") { - image_wid = 200; - image_hei = 200; - } - } - - if (image_wid > 0) { - widd -= image_wid + 10; - } - - var x1, y1; - x1 = xx + ((1600 - sprite_width) / 2); - y1 = yy + ((900 - sprite_height * y_scale_mod) / 2); - - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_center); - draw_set_color(38144); - - if (fancy_title == 1) { - draw_set_font(fnt_fancy); - if (type == 1) { - draw_set_color(255); - } - } - draw_text_transformed(x1 + (sprite_width / 2), y1 + (sprite_height * 0.07), string_hash_to_newline(string(title)), 1.1, 1.1, 0); - // draw_text(xx+320.5,yy+123.5,string(title)); - - draw_set_font(fnt_40k_14); - draw_set_halign(fa_left); - draw_set_color(38144); - - if (instance_exists(obj_turn_end)) { - if (obj_turn_end.popups > 0) { - draw_text(x1 + 20, y1 + (sprite_height * 0.07), string_hash_to_newline(string(obj_turn_end.current_popup) + "/" + string(obj_turn_end.popups))); - } - } - if (image == "debug") { - draw_text_ext(x1 + 20, y1 + (sprite_height * 0.18), string_hash_to_newline(string(text)), -1, sprite_width - 40); - } else if (image == "") { - if (size == 1) { - draw_text_ext(x1 + 5, y1 + (sprite_height * 0.18), string_hash_to_newline(string(text)), -1, widd); - } - if (size != 1) { - draw_text_ext(x1 + 25, y1 + (sprite_height * 0.18), string_hash_to_newline(string(text)), -1, widd); - } - str_h = string_height_ext(string_hash_to_newline(string(text)), -1, widd) + (sprite_height * 0.18); - } else if (image != "") { - if (size == 1) { - draw_text_ext(x1 + 15 + image_wid, y1 + (sprite_height * 0.18), string_hash_to_newline(string(text)), -1, widd); - } - if (size != 1) { - draw_text_ext(x1 + 35 + image_wid, y1 + (sprite_height * 0.18), string_hash_to_newline(string(text)), -1, widd); - } - str_h = string_height_ext(string_hash_to_newline(string(text)), -1, widd) + (sprite_height * 0.18); - } - - // if (image!="") then draw_text_ext(x1+126+150,y1+152,string(text),-1,384-150); - // if (text2!="") then draw_text_ext(x1+126,y1+309,string(text2),-1,384); - // TODO change this into an array in a function (like romanNumerals does in here) - var img = -1; - if (image == "") { - img = -1; - } - if (image == "orks") { - img = 0; - } - if (image == "tau") { - img = 1; - } - if (image == "chaos") { - img = 2; - } - if (image == "shadow") { - img = 3; - } - if (image == "distinguished") { - img = 4; - } - if (image == "tech_build") { - img = 5; - } - if (image == "sororitas") { - img = 6; - } - if (image == "angry") { - img = 7; - } - if (image == "gene_bad") { - img = 8; - } - if (image == "lost_warp") { - img = 10; - } - if (image == "Warp") { - img = 11; - } - if (image == "crusade") { - img = 12; - } - if (image == "fuklaw") { - img = 13; - } - if ((image == "artifact") || (image == "artifact2")) { - img = 14; - } - if (image == "artifact_recovered") { - img = 15; - } - if (image == "artifact_given") { - img = 15; - } - if (image == "waaagh") { - img = 16; - } - if (image == "shipyard") { - img = 17; - } - if (image == "inquisition") { - img = 18; - } - if (image == "succession") { - img = 19; - } - if (image == "rogue_trader") { - img = 20; - } - if (image == "necron_tomb") { - img = 21; - } - if (image == "webber") { - img = 22; - } - if (image == "spyrer") { - img = 23; - } - if (image == "fortress") { - img = 24; - } - if (image == "fortress_hive") { - img = 25; - } - if (image == "fortress_death") { - img = 26; - } - if (image == "fortress_ice") { - img = 27; - } - if (image == "fortress_lava") { - img = 28; - } - if (image == "fortress_dorf") { - img = 29; - } - if (image == "exploding_ship") { - img = 30; - } - if (image == "necron_cave") { - img = 31; - } - if (image == "exterminatus_new") { - img = 32; - } - if (image == "necron_tunnels_1") { - img = 33; - } - if (image == "necron_tunnels_2") { - img = 34; - } - if (image == "necron_tunnels_3") { - img = 35; - } - if (image == "necron_army") { - img = 36; - } - if (image == "harlequin") { - img = 37; - } - if (image == "black_rage") { - img = 39; - } - if (image == "exterminatus") { - img = 40; - } - if (image == "stc") { - img = 41; - } - if (image == "thallax") { - img = 42; - } - if (image == "space_hulk_done") { - img = 44; - } - if (image == "ancient_ruins") { - img = 45; - } - if (image == "geneseed_lab") { - img = 47; - } - if (image == "ruins_bunker") { - img = 48; - } - if (image == "ruins_fort") { - img = 49; - } - if (image == "ruins_ship") { - img = 50; - } - if (image == "fallen") { - img = 51; - } - if (image == "debug_banshee") { - img = 52; - } - if (image == "mechanicus") { - img = 53; - } - if (image == "chaos_cultist") { - img = 54; - } - if (image == "chaos_symbol") { - img = 55; - } - if (image == "chaos_messenger") { - img = 56; - } - if (image == "event_feast") { - img = 57; - } - if (image == "event_tournament") { - img = 58; - } - if (image == "event_deathmatch") { - img = 59; - } - if (image == "event_mass") { - img = 60; - } - if (image == "event_ccult") { - img = 61; - } - if (image == "event_crelic") { - img = 62; - } - if (image == "event_march") { - img = 63; - } - - if ((img != -1) && (image != "") && (image_wid > 0)) { - var sh = 999; - if (size == 1) { - sh = 24; - scr_image("popup", img, x1 + 5, y1 + sh + 24, image_wid, image_hei); - } - if (size >= 2) { - sh = 24; - scr_image("popup", img, x1 + 25, y1 + sh + 24, image_wid, image_hei); - } - - image_bot = (sprite_height * 0.07) + image_hei + 5; - } - - if ((option1 != "") && (string_count("Servitors and Skitarii", option1) == 0)) { - var tox = "1. " + string(option1); - if (option2 != "") { - tox += "#2. " + string(option2); - } - if (option3 != "") { - tox += "#3. " + string(option3); - } - - var top = y1 + 0.5 + (sprite_height * 0.6); - if (str_h != 0) { - top = y1 + str_h + 20; - } - if (image != "") { - top = max(top, y1 + image_bot); - } - - draw_text_ext(x1 + 25.5, top, string_hash_to_newline(" Choices:"), -1, widd); - draw_text_ext(x1 + 25, top + 0.5, string_hash_to_newline(" Choices:"), -1, widd); - - var sz = 0, sz2 = 0, oy = y1, t8 = 0; - if (str_h != 0) { - y1 += str_h + 20; - y1 -= sprite_height * 0.6; - } - - y1 = top; - - if (option1 != "") { - draw_text_ext(x1 + 25.5, y1 + 20, string_hash_to_newline("1. " + string(option1)), -1, widd); - } - - sz = string_height_ext(string_hash_to_newline("1. " + string(option1)), -1, widd); - if (option2 != "") { - draw_text_ext(x1 + 25.5, y1 + 20 + sz, string_hash_to_newline("2. " + string(option2)), -1, widd); - } - - sz2 = string_height_ext(string_hash_to_newline("1. " + string(option1)), -1, widd); - sz2 += string_height_ext(string_hash_to_newline("2. " + string(option2)), -1, widd); - if (option3 != "") { - draw_text_ext(x1 + 25.5, y1 + 20 + sz2, string_hash_to_newline("3. " + string(option3)), -1, widd); - } - - if (option1 != "") { - t8 = (y1 + 20) + 5; - } - if (option2 != "") { - t8 = (y1 + 20 + sz) + 5; - } - if (option3 == "") { - t8 = (y1 + 20 + sz2 + string_height_ext(string_hash_to_newline("3. " + string(option3)), -1, widd)) + 5; - } - - if ((option1 != "") && (mouse_x >= x1) && (mouse_y >= y1 + 21) && (mouse_x <= x1 + 30 + string_width_ext(string_hash_to_newline("1. " + string(option1)), -1, widd)) && (mouse_y < y1 + 39)) { - option1enter = true; - draw_sprite(spr_popup_select, 0, x1 + 8.5, y1 + 21); - if (mouse_check_button(mb_left)) { - press = 1; - } - } else { - option1enter = false; - } - if ((option2 != "") && (mouse_x >= x1) && (mouse_y >= y1 + 21 + sz) && (mouse_x <= x1 + 30 + string_width_ext(string_hash_to_newline("2. " + string(option2)), -1, widd)) && (mouse_y < y1 + 39 + sz)) { - option2enter = true; - draw_sprite(spr_popup_select, 0, x1 + 8.5, y1 + 21 + sz); - if (mouse_check_button(mb_left)) { - press = 2; - } - } else { - option2enter = false; - } - if ((option3 != "") && (mouse_x >= x1) && (mouse_y >= y1 + 21 + sz2) && (mouse_x <= x1 + 30 + string_width_ext(string_hash_to_newline("3. " + string(option3)), -1, widd)) && (mouse_y < y1 + 39 + sz2)) { - option3enter = true; - draw_sprite(spr_popup_select, 0, x1 + 8.5, y1 + 21 + sz2); - if (mouse_check_button(mb_left)) { - press = 3; - } - } else { - option3enter = false; - } - if (image == "new_forge_master") { - var new_master_image = false; - if (pathway == "selection_options") { - if (option1enter) { - new_master_image = techs[charisma_pick].draw_unit_image(); - techs[charisma_pick].stat_display(); - } else if (option2enter) { - new_master_image = techs[talent_pick].draw_unit_image(); - techs[talent_pick].stat_display(); - } else if (option3enter) { - new_master_image = techs[experience_pick].draw_unit_image(); - techs[experience_pick].stat_display(); - } - if (is_struct(new_master_image)) { - new_master_image.draw(xx + 1208, yy + 210, true); - } - } - } - if (t8 < (oy + sprite_height)) { - y_scale = t8 / (oy + sprite_height); - } - if (t8 > (oy + sprite_height)) { - y_scale = t8 / (oy + sprite_height); - } - } - } - - // ** Equip Artifact ** - if ((type == 8) && instance_exists(obj_controller)) { - var x2 = xx + 951; - var y2 = yy + 48; - var before = target_comp; - var temp_alpha = 1; - arti = obj_ini.artifact_struct[obj_controller.menu_artifact]; - - // draw_sprite(spr_popup_large,0,x2,y2); - - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_center); - draw_set_color(c_gray); - - draw_text(x2 + 312, y2 + 26, $"Equip Artifact ({obj_ini.artifact[obj_controller.menu_artifact]})"); - // draw_text(x2+320.5,yy+123.5,"Equip Artifact ("+string(obj_ini.artifact[obj_controller.menu_artifact])+")"); - - draw_set_font(fnt_40k_12); - draw_set_halign(fa_left); - draw_text(x2 + 31, y2 + 35, "Select Company:"); - - // Draw HQ button - temp_alpha = (target_comp == 0) ? 1 : 0.5; - var hq_text = $"HQ"; - var hq_button = draw_unit_buttons([x2 + 60, y2 + 75, x2 + 60 + 60, y2 + 75 + 20], hq_text, [1, 1], , , fnt_40k_12, temp_alpha); // Position for HQ - if (point_and_click(hq_button)) { - target_comp = 0; - } - - // Draw other company buttons - for (var i = 1; i < 11; i++) { - temp_alpha = (target_comp == i) ? 1 : 0.5; - var item_text = $"{romanNumerals[i - 1]}"; - var x_offset = x2 + 141 + (81 * (i - (i < 6 ? 1 : 6))); - var y_offset = y2 + (i < 6 ? 60 : 90); - var company_button = draw_unit_buttons([x_offset, y_offset, x_offset + 60, y_offset + 20], item_text, [1, 1], , , fnt_40k_12, temp_alpha); - if (point_and_click(company_button)) { - target_comp = i; - } - } - - if (before != target_comp) { - units = 0; - with (obj_controller) { - if (obj_popup.target_comp > 0) { - scr_company_view(obj_popup.target_comp); - } - if (obj_popup.target_comp == 0) { - scr_special_view(0); - } - } - var i; - i = -1; - repeat (array_length(obj_controller.display_unit)) { - i += 1; - obj_controller.man_sel[i] = 0; - } - i = -1; - } - - // Weapon slot buttons - if (arti.determine_base_type() == "weapon") { - draw_text(x2 + 30, y2 + 128, "Replace:"); - - temp_alpha = (target_role == 1) ? 1 : 0.5; - if (point_and_click(draw_unit_buttons([x2 + 150, y2 + 120, x2 + 150 + 120, y2 + 120 + 20], $"1st Weapon", [1, 1], , , fnt_40k_12, temp_alpha))) { - target_role = 1; - } - - temp_alpha = (target_role == 2) ? 1 : 0.5; - if (point_and_click(draw_unit_buttons([x2 + 300, y2 + 120, x2 + 300 + 120, y2 + 120 + 20], $"2nd Weapon", [1, 1], , , fnt_40k_12, temp_alpha))) { - target_role = 2; - } - } else { - target_role = 3; - } - - // Soldier list - draw_set_font(fnt_40k_12); - draw_rectangle(x2 + 29, y2 + 160, x2 + 569, y2 + 363 + 356, 1); // Main rectangle? - scr_scrollbar(1520, 220, 1543, 761, 23, obj_controller.man_max, obj_controller.man_current); - draw_rectangle(x2 + 569, y2 + 171, x2 + 592, y2 + 357 + 356, 1); // Inside of scroll - draw_rectangle(x2 + 569, y2 + 150, x2 + 592, y2 + 378 + 356, 1); // Outside of scroll - draw_sprite_stretched(spr_arrow, 2, x2 + 569, y2 + 150, 23, 22); - draw_sprite_stretched(spr_arrow, 3, x2 + 569, y2 + 357 + 356, 23, 22); - - if (target_comp != -1) { - var top, sel, temp1, temp2, temp3, temp4, temp5; - temp1 = ""; - temp2 = ""; - temp3 = ""; - temp4 = ""; - temp5 = ""; - top = obj_controller.man_current; - sel = top; - var unit_x = x2; - var unit_y = y2; - var ma_ar, ma_we1, ma_we2, ma_ge, ma_mb, ttt; - ma_ar = ""; - ma_we1 = ""; - ma_we2 = ""; - ma_ge = ""; - ma_mb = ""; - ttt = 0; - - repeat (min(obj_controller.man_max, 23)) { - if (sel >= array_length(obj_controller.man)) { - break; - } - if (obj_controller.man[sel] == "man") { - var unit = obj_controller.display_unit[sel]; - temp1 = unit.name_role(); - temp2 = obj_controller.ma_loc[sel]; - if (obj_controller.ma_wid[sel] != 0) { - temp2 += scr_roman_numerals()[obj_controller.ma_wid[sel] - 1]; - } - if (obj_controller.ma_health[sel] >= 100) { - temp3 = "Unwounded"; - } - if ((obj_controller.ma_health[sel] >= 70) && (obj_controller.ma_health[sel] < 100)) { - temp3 = "Lightly Wounded"; - } - if ((obj_controller.ma_health[sel] >= 40) && (obj_controller.ma_health[sel] < 70)) { - temp3 = "Wounded"; - } - if ((obj_controller.ma_health[sel] >= 8) && (obj_controller.ma_health[sel] < 40)) { - temp3 = "Badly Wounded"; - } - if (obj_controller.ma_health[sel] < 8) { - temp3 = "CRITICAL"; - } - temp4 = string(obj_controller.ma_exp[sel]) + " exp"; - - ma_ar = unit.armour(); - ma_we1 = unit.weapon_two(); - ma_we2 = unit.weapon_one(); - ma_ge = unit.gear(); - ma_mb = unit.mobility_item(); - ttt = 0; - - if (obj_controller.ma_gear[sel] != "") { - temp5 = "((" + string(ma_ar) + " + " + string(ma_mb) + ")) | " + string(ma_we1) + " | " + string(ma_we2) + " + (" + string(ma_ge) + ")"; - } - if (obj_controller.ma_gear[sel] == "") { - temp5 = "((" + string(ma_ar) + " + " + string(ma_mb) + ")) | " + string(ma_we1) + " | " + string(ma_we2) + ""; - } - } - if (obj_controller.man[sel] == "vehicle") { - temp1 = string(obj_controller.ma_role[sel]); - temp2 = string(obj_controller.ma_loc[sel]); - if (obj_controller.ma_wid[sel] != 0) { - temp2 += scr_roman_numerals()[obj_controller.ma_wid[sel] - 1]; - } - temp3 = "Undamaged"; - temp4 = ""; - temp5 = "(" + string(obj_controller.ma_wep1[sel]) + " | " + string(obj_controller.ma_wep2[sel]) + " | " + string(obj_controller.ma_gear[sel]) + ")"; - } - - if (obj_controller.man_sel[sel] == 0) { - draw_set_color(c_black); - } - if (obj_controller.man_sel[sel] != 0) { - draw_set_color(6052956); - } - draw_rectangle(unit_x + 29, unit_y + 150, unit_x + 569, unit_y + 175.4, 0); - draw_set_color(c_gray); - draw_rectangle(unit_x + 29, unit_y + 150, unit_x + 569, unit_y + 175.4, 1); - - // if (obj_controller.man[sel]="man") and (obj_controller.ma_promote[sel]>0) then draw_set_color(c_yellow); - if (ma_ar == "") { - draw_set_alpha(0.5); - } - draw_text_transformed(unit_x + 32, unit_y + 151, string_hash_to_newline(string(temp1)), 1, 1, 0); - draw_text_transformed(unit_x + 32.5, unit_y + 151.5, string_hash_to_newline(string(temp1)), 1, 1, 0); - draw_set_color(c_gray); - draw_set_alpha(1); - - draw_text_transformed(unit_x + 271, unit_y + 151, string_hash_to_newline(string(temp2)), 1, 1, 0); - if ((obj_controller.man[sel] == "man") && (obj_controller.ma_lid[sel] == -1)) { - draw_text_transformed(unit_x + 271, unit_y + 151, string_hash_to_newline(string(temp2)), 1, 1, 0); - } - if ((obj_controller.man[sel] == "vehicle") && (obj_controller.ma_lid[sel] == -1)) { - draw_text_transformed(unit_x + 271, unit_y + 151, string_hash_to_newline(string(temp2)), 1, 1, 0); - } - - if (temp3 == "CRITICAL") { - draw_set_color(c_red); - } - draw_text_transformed(unit_x + 400, unit_y + 151, string_hash_to_newline(string(temp3)), 1, 1, 0); - draw_set_color(c_gray); - - draw_text_transformed(unit_x + 506, unit_y + 151, string_hash_to_newline(string(temp4)), 1, 1, 0); - - draw_set_color(c_gray); - if (string_count("Artifact", temp5) > 0) { - draw_set_color(881503); - } - draw_text_transformed(unit_x + 38, unit_y + 164, string_hash_to_newline(string(temp5)), 1, 1, 0); - draw_set_color(38144); - - if (point_and_click([unit_x + 29, unit_y + 150, unit_x + 569, unit_y + 175.4])) { - if (obj_controller.man_sel[sel] == 0) { - units = 1; - if (prev_selected != 0) { - obj_controller.man_sel[prev_selected] = 0; - } - obj_controller.man_sel[sel] = 1; - prev_selected = sel; - } else if (obj_controller.man_sel[sel] == 1) { - units = 0; - obj_controller.man_sel[sel] = 0; - } - } - unit_y += 25.4; - sel += 1; - } - } - - if ((target_role > 0) && (target_comp != -1) && (units == 1)) { - all_good = 1; - } else { - all_good = 0; - } - if (arti.determine_base_type() == "weapon" && target_role > 2) { - all_good = 0; - } - - // Screen bottom buttons and shit - // - var screen_bottom_x = x2; - var screen_bottom_y = y2 + 350; - draw_set_alpha(1); - draw_set_font(fnt_small); - draw_set_color(c_gray); - draw_rectangle(screen_bottom_x + 121, screen_bottom_y + 393, screen_bottom_x + 231, screen_bottom_y + 414, 1); - draw_set_alpha(0.5); - draw_rectangle(screen_bottom_x + 122, screen_bottom_y + 394, screen_bottom_x + 230, screen_bottom_y + 413, 1); - - if (all_good == 1) { - draw_set_alpha(1); - draw_rectangle(screen_bottom_x + 408, screen_bottom_y + 393, screen_bottom_x + 518, screen_bottom_y + 414, 1); - draw_set_alpha(0.5); - draw_rectangle(screen_bottom_x + 409, screen_bottom_y + 394, screen_bottom_x + 517, screen_bottom_y + 413, 1); - } - if (all_good != 1) { - draw_set_alpha(0.25); - draw_rectangle(screen_bottom_x + 408, screen_bottom_y + 393, screen_bottom_x + 518, screen_bottom_y + 414, 1); - draw_rectangle(screen_bottom_x + 409, screen_bottom_y + 394, screen_bottom_x + 517, screen_bottom_y + 413, 1); - } - - draw_set_alpha(1); - - draw_set_halign(fa_center); - draw_text(screen_bottom_x + 173, screen_bottom_y + 397, string_hash_to_newline("Cancel")); - draw_text(screen_bottom_x + 173.5, screen_bottom_y + 397.5, string_hash_to_newline("Cancel")); - - if (all_good == 1) { - draw_text(screen_bottom_x + 464, screen_bottom_y + 397, string_hash_to_newline("Equip!")); - draw_text(screen_bottom_x + 464.5, screen_bottom_y + 397.5, string_hash_to_newline("Equip!")); - if (point_and_click([screen_bottom_x + 430, screen_bottom_y + 393, screen_bottom_x + 518, screen_bottom_y + 414])) { - obj_controller.cooldown = 8000; - - var i = -1, this = 0, dwarn = false, unit; - var arti_index = obj_controller.menu_artifact; - var arti = obj_ini.artifact_struct[arti_index]; - var arti_base = arti.type(); - repeat (min(obj_controller.man_max, 23)) { - i += 1; - if ((this == 0) && (obj_controller.man_sel[i] == 1)) { - this = i; - } - } - i = this; - - if ((obj_controller.man[i] != "") && obj_controller.man_sel[i]) { - var replace = ""; - - if (target_role == 1) { - replace = "weapon1"; - } - if (target_role == 2) { - replace = "weapon2"; - } - if (target_role > 2) { - if (gear_weapon_data("armour", arti_base) != false) { - replace = "armour"; - } else if (gear_weapon_data("gear", arti_base) != false) { - replace = "gear"; - } else if (gear_weapon_data("mobility", arti_base) != false) { - replace = "mobility"; - } - } - if ((replace == "armour") && (obj_controller.ma_race[i] > 5)) { - cooldown = 8; - obj_controller.cooldown = 8; - exit; - } - - if (target_comp > 10) { - target_comp = 0; - } - - unit = obj_ini.TTRPG[target_comp][obj_controller.ide[i]]; - if (arti.has_tag("daemonic") || arti.has_tag("chaos")) { - unit.corruption += irandom(10 + 2); - if (unit.role() == obj_ini.role[100][eROLE.ChapterMaster]) { - dwarn = true; - } - } - - if (replace == "armour") { - unit.update_armour(arti_index); - } else if (replace == "gear") { - unit.update_gear(arti_index); - } - if (replace == "mobility") { - unit.update_mobility_item(arti_index); - } - if (replace == "weapon1") { - unit.update_weapon_one(arti_index); - } - if (replace == "weapon2") { - unit.update_weapon_two(arti_index); - } - var g = arti_index; - obj_controller.cooldown = 10; - - //if (obj_controller.menu_artifact>obj_controller.artifacts) then obj_controller.menu_artifact=obj_controller.artifacts; - if (dwarn == true) { - var pip = instance_create(0, 0, obj_popup); - pip.title = "Daemon Artifacts"; - pip.text = "Some artifacts, like the one you now wield, are a blasphemous union of the Materium's matter and the Immaterium's spirit, containing the essence of a bound daemon. While they may offer great power, and enhanced perception, they are known to whisper poisonous lies to the wielder. The path to damnation begins with good intentions, and many times artifacts such as these have been the cause."; - pip.image = ""; - pip.cooldown = 8; - obj_controller.cooldown = 8; - } - - instance_destroy(); - exit; - } - } - } - if (all_good != 1) { - draw_set_alpha(0.25); - draw_text(screen_bottom_x + 464, screen_bottom_y + 397, "Equip!"); - draw_text(screen_bottom_x + 464.5, screen_bottom_y + 397.5, "Equip!"); - } - draw_set_alpha(1); - } - - var xx, yy; - xx = __view_get(e__VW.XView, 0); - yy = __view_get(e__VW.YView, 0); - - // Changing Equipment - if ((zoom == 0) && (type == 6) && instance_exists(obj_controller)) { - draw_set_color(0); - draw_rectangle(xx + 1006, yy + 143, xx + 1577, yy + 518, 0); - - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_center); - draw_set_color(c_gray); - - draw_text(xx + 1292, yy + 145, "Change Equipment"); - - draw_set_font(fnt_40k_12); - var comp = ""; - if (company <= 10 && company > 0) { - comp = romanNumerals[company - 1]; - } else if (company > 10) { - comp = "HQ"; - } - - if (vehicle_equipment == 0) { - draw_text(xx + 1292, yy + 170, $"{comp} Company, {units} Marines"); - } - if (vehicle_equipment == 1) { - draw_text(xx + 1292, yy + 170, $"{comp} Company, {units} Vehicles"); - } - - draw_set_halign(fa_left); - draw_set_color(c_gray); - - draw_rectangle(xx + 1010, yy + 215, xx + 1288, yy + 315, 1); - draw_rectangle(xx + 1574, yy + 215, xx + 1296, yy + 315, 1); - - var show_name = ""; - // Need to not show the artifact tags here somehow - - draw_text(xx + 1010, yy + 195, "Before"); - draw_text(xx + 1010.5, yy + 195.5, "Before"); - - show_name = o_wep1; - if (a_wep1 != "") { - show_name = a_wep1; - } - if (o_wep1 != "") { - draw_text(xx + 1014, yy + 215, string_hash_to_newline(show_name)); - } else { - draw_text(xx + 1014, yy + 215, ITEM_NAME_NONE); - } - - show_name = o_wep2; - if (a_wep2 != "") { - show_name = a_wep2; - } - if (o_wep2 != "") { - draw_text(xx + 1014, yy + 235, string_hash_to_newline(string(show_name))); - } else { - draw_text(xx + 1014, yy + 235, ITEM_NAME_NONE); - } - - show_name = o_armour; - if (a_armour != "") { - show_name = a_armour; - } - if (o_armour != "") { - draw_text(xx + 1014, yy + 255, string_hash_to_newline(string(show_name))); - } else { - draw_text(xx + 1014, yy + 255, ITEM_NAME_NONE); - } - - show_name = o_gear; - if (a_gear != "") { - show_name = a_gear; - } - if (o_gear != "") { - draw_text(xx + 1014, yy + 275, string_hash_to_newline(string(show_name))); - } else { - draw_text(xx + 1014, yy + 275, ITEM_NAME_NONE); - } - - show_name = o_mobi; - if (a_mobi != "") { - show_name = a_mobi; - } - if (o_mobi != "") { - draw_text(xx + 1014, yy + 295, string_hash_to_newline(string(show_name))); - } else { - draw_text(xx + 1014, yy + 295, ITEM_NAME_NONE); - } - - draw_text(xx + 1296, yy + 195, string_hash_to_newline("After")); - draw_text(xx + 1296.5, yy + 195.5, "After"); - - draw_set_color(c_gray); - if (n_good1 == 0) { - draw_set_color(255); - } - show_name = n_wep1; - if ((a_wep1 != "") && (n_wep1 == o_wep1)) { - show_name = a_wep1; - } - if (n_wep1 != "") { - draw_text(xx + 1300, yy + 215, string_hash_to_newline(string(show_name))); - } else { - draw_text(xx + 1300, yy + 215, string_hash_to_newline(ITEM_NAME_NONE)); - } - - draw_set_color(c_gray); - if (n_good2 == 0) { - draw_set_color(255); - } - show_name = n_wep2; - if ((a_wep2 != "") && (n_wep2 == o_wep2)) { - show_name = a_wep2; - } - if (n_wep2 != "") { - draw_text(xx + 1300, yy + 235, string_hash_to_newline(string(show_name))); - } else { - draw_text(xx + 1300, yy + 235, string_hash_to_newline(ITEM_NAME_NONE)); - } - - draw_set_color(c_gray); - if (n_good3 == 0) { - draw_set_color(255); - } - show_name = n_armour; - if ((a_armour != "") && (n_armour == o_armour)) { - show_name = a_armour; - } - if (n_armour != "") { - draw_text(xx + 1300, yy + 255, string_hash_to_newline(string(show_name))); - } else { - draw_text(xx + 1300, yy + 255, string_hash_to_newline(ITEM_NAME_NONE)); - } - - draw_set_color(c_gray); - if (n_good4 == 0) { - draw_set_color(255); - } - show_name = n_gear; - if ((a_gear != "") && (n_gear == o_gear)) { - show_name = a_gear; - } - if (n_gear != "") { - draw_text(xx + 1300, yy + 275, string_hash_to_newline(string(show_name))); - } else { - draw_text(xx + 1300, yy + 275, string_hash_to_newline(ITEM_NAME_NONE)); - } - - draw_set_color(c_gray); - if (n_good5 == 0) { - draw_set_color(255); - } - show_name = n_mobi; - if ((a_mobi != "") && (n_mobi == o_mobi)) { - show_name = a_mobi; - } - if (n_mobi != "") { - draw_text(xx + 1300, yy + 295, string_hash_to_newline(string(show_name))); - } else { - draw_text(xx + 1300, yy + 295, string_hash_to_newline(ITEM_NAME_NONE)); - } - - draw_set_color(c_gray); - - for (var i = 1; i <= 5; i++) { - if (target_comp == i) { - draw_text(xx + 1292, yy + 195 + (20 * i), "->"); - break; - } - } - - if ((mouse_x >= xx + 1296) && (mouse_x < xx + 1574)) { - if ((mouse_y >= yy + 215) && (mouse_y < yy + 235)) { - draw_set_alpha(0.5); - draw_line(xx + 1296, yy + 230, xx + 1574, yy + 230); - } - if ((mouse_y >= yy + 235) && (mouse_y < yy + 255)) { - draw_set_alpha(0.5); - draw_line(xx + 1296, yy + 250, xx + 1574, yy + 250); - } - if ((mouse_y >= yy + 255) && (mouse_y < yy + 275)) { - draw_set_alpha(0.5); - draw_line(xx + 1296, yy + 270, xx + 1574, yy + 270); - } - if ((mouse_y >= yy + 275) && (mouse_y < yy + 295)) { - draw_set_alpha(0.5); - draw_line(xx + 1296, yy + 290, xx + 1574, yy + 290); - } - if ((mouse_y >= yy + 295) && (mouse_y < yy + 315)) { - draw_set_alpha(0.5); - draw_line(xx + 1296, yy + 310, xx + 1574, yy + 310); - } - } - draw_set_alpha(1); - - if (target_comp != -1) { - var check = " "; - var mct = master_crafted == 1 ? 0.7 : 1; - var column = 0; - var row = 0; - var item_string; - var box = []; - var box_x; - var box_y; - var top = -1; - - var selected_item_name = [n_wep1, n_wep2, n_armour, n_gear, n_mobi]; - selected_item_name = selected_item_name[target_comp - 1]; - - for (var o = 0; o < array_length(item_name); o++) { - box_x = xx + 1016 + (row * 154); - box_y = yy + 355 + (column * 20); - box = [box_x, box_y, box_x + 144, box_y + 20]; - check = selected_item_name == item_name[o] ? "x" : " "; - item_string = $"[{check}] {item_name[o]}"; - draw_text_transformed(box_x, box_y, item_string, mct, 1, 0); - - if (point_and_click(box)) { - top = o; - } - column++; - if (column > 6) { - column = 0; - row++; - } - } - - if (top != -1) { - warning = ""; - switch (target_comp) { - case 1: - n_wep1 = item_name[top]; - sel1 = top; - break; - case 2: - n_wep2 = item_name[top]; - sel2 = top; - break; - case 3: - n_armour = item_name[top]; - sel3 = top; - break; - case 4: - n_gear = item_name[top]; - sel4 = top; - break; - case 5: - n_mobi = item_name[top]; - sel5 = top; - break; - } - } - - if (target_comp == 1 && (n_wep1 == ITEM_NAME_NONE || n_wep1 == "")) { - n_good1 = 1; - } - if (target_comp == 2 && (n_wep2 == ITEM_NAME_NONE || n_wep2 == "")) { - n_good2 = 1; - } - if (target_comp == 3 && (n_armour == ITEM_NAME_NONE || n_armour == "")) { - n_good3 = 1; - } - if (target_comp == 4 && (n_gear == ITEM_NAME_NONE || n_gear == "")) { - n_good4 = 1; - } - if (target_comp == 5 && (n_mobi == ITEM_NAME_NONE || n_mobi == "")) { - n_good5 = 1; - } - - var weapon_one_data = gear_weapon_data("weapon", n_wep1); - var weapon_two_data = gear_weapon_data("weapon", n_wep2); - var armour_data = gear_weapon_data("armour", n_armour); - - if ((target_comp == 1) && is_struct(weapon_one_data)) { - // Check numbers - req_wep1_num = units; - have_wep1_num = 0; - var i = -1; - repeat (array_length(obj_controller.display_unit)) { - i += 1; - if ((vehicle_equipment != -1) && (obj_controller.ma_wep1[i] == n_wep1)) { - have_wep1_num += 1; - } - } - have_wep1_num += scr_item_count(n_wep1); - if (have_wep1_num >= req_wep1_num || n_wep1 == ITEM_NAME_NONE) { - n_good1 = 1; - } - if (have_wep1_num < req_wep1_num && (n_wep1 != ITEM_NAME_ANY && n_wep1 != ITEM_NAME_NONE)) { - n_good1 = 0; - warning = "Not enough " + string(n_wep1) + "; " + string(req_wep1_num - have_wep1_num) + " more are required."; - } - - //TODO wrap this up in a function - if (weapon_one_data.req_exp > 0) { - var g = -1, exp_check = 0; - for (var g = 0; g < array_length(obj_controller.display_unit); g++) { - if (obj_controller.man_sel[g] == 1 && is_struct(obj_controller.display_unit[g])) { - if (obj_controller.display_unit[g].experience < weapon_one_data.req_exp) { - exp_check = 1; - n_good1 = 0; - warning = $"A unit must have {weapon_one_data.req_exp}+ EXP to use a {weapon_one_data.name}."; - break; - } - } - } - } - if (is_struct(armour_data)) { - if (((!array_contains(armour_data.tags, "terminator")) && (!array_contains(armour_data.tags, "dreadnought"))) && (n_wep1 == "Assault Cannon")) { - n_good1 = 0; - warning = "Cannot use Assault Cannons without Terminator/Dreadnought Armour."; - } - if ((!array_contains(armour_data.tags, "dreadnought")) && (n_wep1 == "Close Combat Weapon")) { - n_good1 = 0; - warning = "Only " + string(obj_ini.role[100][6]) + " can use Close Combat Weapons."; - } - } - } - if ((target_comp == 2) && is_struct(weapon_two_data)) { - // Check numbers - req_wep2_num = units; - have_wep2_num = 0; - var i = -1; - repeat (array_length(obj_controller.display_unit)) { - i += 1; - if ((vehicle_equipment != -1) && (obj_controller.ma_wep2[i] == n_wep2)) { - have_wep2_num += 1; - } - } - // req_wep2_num+=scr_item_count(n_wep2); - have_wep2_num += scr_item_count(n_wep2); - // req_wep2_num=units; - - if (have_wep2_num >= req_wep2_num || n_wep2 == ITEM_NAME_NONE) { - n_good2 = 1; - } - if (have_wep2_num < req_wep2_num && (n_wep2 != ITEM_NAME_ANY && n_wep2 != ITEM_NAME_NONE)) { - n_good2 = 0; - warning = $"Not enough {n_wep2}; {req_wep2_num - have_wep2_num} more are required."; - } - //TODO standardise exp check - if (weapon_two_data.req_exp > 0) { - var g, exp_check; - g = -1; - exp_check = 0; - for (var g = 0; g < array_length(obj_controller.display_unit); g++) { - if (obj_controller.man_sel[g] == 1 && is_struct(obj_controller.display_unit[g])) { - if (obj_controller.display_unit[g].experience < weapon_two_data.req_exp) { - exp_check = 1; - n_good1 = 0; - warning = $"A unit must have {weapon_two_data.req_exp}+ EXP to use a {weapon_two_data.name}."; - break; - } - } - } - } - if (is_struct(armour_data)) { - if (((!array_contains(armour_data.tags, "terminator")) && (!array_contains(armour_data.tags, "dreadnought"))) && (n_wep2 == "Assault Cannon")) { - n_good2 = 0; - warning = "Cannot use Assault Cannons without Terminator/Dreadnought Armour."; - } - if ((!array_contains(armour_data.tags, "dreadnought")) && (n_wep2 == "Close Combat Weapon")) { - n_good2 = 0; - warning = "Only " + string(obj_ini.role[100][6]) + " can use Close Combat Weapons."; - } - if (((string_count("Terminator", n_armour) > 0) || (string_count("Tartaros", n_armour) > 0) || (string_count("Dreadnought", n_armour) > 0)) && (n_mobi != "")) { - n_good2 = 0; - } - if (((string_count("Terminator", o_armour) > 0) || (string_count("Tartaros", o_armour) > 0) || (string_count("Dreadnought", o_armour) > 0)) && (n_mobi != "")) { - n_good2 = 0; - } - } - } - if ((target_comp == 3) && is_struct(armour_data)) { - // Check numbers - req_armour_num = units; - have_armour_num = 0; - var i; - i = -1; - repeat (array_length(obj_controller.display_unit)) { - i += 1; - if ((vehicle_equipment != -1) && (obj_controller.man_sel[i] == 1) && (obj_controller.ma_armour[i] == n_armour)) { - have_armour_num += 1; - } - } - have_armour_num += scr_item_count(n_armour); - - if (have_armour_num >= req_armour_num || n_armour == ITEM_NAME_NONE) { - n_good3 = 1; - } - if (have_armour_num < req_armour_num && (n_armour != ITEM_NAME_ANY && n_armour != ITEM_NAME_NONE)) { - n_good3 = 0; - warning = $"Not enough {n_armour} : {units - have_armour_num} more are required."; - } - - var g = -1, exp_check = 0; - if (armour_data.has_tag("terminator")) { - if (armour_data.req_exp > 0) { - var g, exp_check; - g = -1; - exp_check = 0; - for (var g = 0; g < array_length(obj_controller.display_unit); g++) { - if (obj_controller.man_sel[g] == 1 && is_struct(obj_controller.display_unit[g])) { - if (obj_controller.display_unit[g].experience < armour_data.req_exp) { - exp_check = 1; - n_good1 = 0; - warning = $"A unit must have {armour_data.req_exp}+ EXP to use a {armour_data.name}."; - break; - } - } - } - } - } - - if ((string_count("Dread", o_armour) > 0) && (string_count("Dread", n_armour) == 0)) { - n_good4 = 0; - warning = "Marines may not exit Dreadnoughts."; - } - } - if ((target_comp == 4) && (n_gear != "Assortment") && (n_gear != ITEM_NAME_NONE)) { - // Check numbers - req_gear_num = units; - have_gear_num = 0; - var i; - i = -1; - repeat (array_length(obj_controller.display_unit)) { - i += 1; - if ((vehicle_equipment != -1) && (obj_controller.man_sel[i] == 1) && (obj_controller.ma_gear[i] == n_gear)) { - have_gear_num += 1; - } - } - have_gear_num += scr_item_count(n_gear); - - if (have_gear_num >= req_gear_num || n_gear == ITEM_NAME_NONE) { - n_good4 = 1; - } - if (have_gear_num < req_gear_num && (n_gear != ITEM_NAME_ANY && n_gear != ITEM_NAME_NONE)) { - n_good4 = 0; - warning = "Not enough " + string(n_gear) + "; " + string(units - req_gear_num) + " more are required."; - } - - if ((n_gear != ITEM_NAME_NONE) && (n_gear != "") && (string_count("Dreadnought", n_armour) > 0)) { - n_good4 = 0; - warning = "Dreadnoughts may not use infantry equipment."; - } - } - if ((target_comp == 5) && (n_mobi != "Assortment") && (n_mobi != ITEM_NAME_NONE)) { - // Check numbers - req_mobi_num = units; - have_mobi_num = 0; - var i; - i = -1; - repeat (array_length(obj_controller.display_unit)) { - i += 1; - if ((vehicle_equipment != -1) && (obj_controller.man_sel[i] == 1) && (obj_controller.ma_mobi[i] == n_mobi)) { - have_mobi_num += 1; - } - } - have_mobi_num += scr_item_count(n_mobi); - - if (have_mobi_num >= req_mobi_num || n_mobi == ITEM_NAME_NONE) { - n_good5 = 1; - } - if (have_mobi_num < req_mobi_num && (n_mobi != ITEM_NAME_ANY && n_mobi != ITEM_NAME_NONE)) { - n_good5 = 0; - warning = "Not enough " + string(n_mobi) + "; " + string(units - req_mobi_num) + " more are required."; - } - - var terminator_mobi = ["", "Servo-arm", "Servo-harness", "Conversion Beamer Pack"]; - if ((!array_contains(terminator_mobi, n_mobi)) && ((n_armour == "Terminator Armour") || (n_armour == "Tartaros"))) { - n_good5 = 0; - warning = "Cannot use this gear with Terminator Armour."; - } - - if ((n_mobi != ITEM_NAME_NONE) && (n_mobi != "") && (n_armour == "Dreadnought")) { - n_good5 = 0; - warning = string(obj_ini.role[100][6]) + "s may not use mobility gear."; - } - } - } - - draw_set_halign(fa_center); - if ((target_comp == 1) || (target_comp == 2)) { - var msc = " "; - if (master_crafted == 1) { - msc = "x"; - } - if (tab == 1) { - draw_text(xx + 1292, yy + 318, string_hash_to_newline("Tab 1 [x] Tab 2 [ ] Master-Crafted [" + string(msc) + "]")); - } - if (tab == 2) { - draw_text(xx + 1292, yy + 318, string_hash_to_newline("Tab 1 [ ] Tab 2 [x] Master-Crafted [" + string(msc) + "]")); - } - } - - draw_set_color(255); - draw_set_halign(fa_center); - draw_text(xx + 1292, yy + 476, string_hash_to_newline(warning)); - - draw_set_color(c_gray); - draw_set_halign(fa_left); - draw_rectangle(xx + 1006, yy + 499, xx + 1115, yy + 518, 1); - draw_set_alpha(0.5); - draw_rectangle(xx + 1007, yy + 500, xx + 1114, yy + 517, 1); - - if (n_good1 + n_good2 + n_good3 + n_good4 + n_good5 == 5) { - draw_set_alpha(1); - draw_rectangle(xx + 1465, yy + 499, xx + 1576, yy + 518, 1); - draw_set_alpha(0.5); - draw_rectangle(xx + 1466, yy + 500, xx + 1575, yy + 517, 1); - } - if (n_good1 + n_good2 + n_good3 + n_good4 + n_good5 != 5) { - draw_set_alpha(0.25); - draw_rectangle(xx + 1465, yy + 499, xx + 1576, yy + 518, 1); - draw_rectangle(xx + 1466, yy + 500, xx + 1575, yy + 517, 1); - } - - draw_set_alpha(1); - draw_set_halign(fa_center); - draw_text(xx + 1061, yy + 501, string_hash_to_newline("Cancel")); - draw_text(xx + 1061.5, yy + 501.5, string_hash_to_newline("Cancel")); - - if (n_good1 + n_good2 + n_good3 + n_good4 == 4) { - draw_text(xx + 1521, yy + 501, string_hash_to_newline("Equip!")); - draw_text(xx + 1521.5, yy + 501.5, string_hash_to_newline("Equip!")); - } - if (n_good1 + n_good2 + n_good3 + n_good4 != 4) { - draw_set_alpha(0.25); - draw_text(xx + 1521, yy + 501, string_hash_to_newline("Equip!")); - draw_text(xx + 1521.5, yy + 501.5, string_hash_to_newline("Equip!")); - } - draw_set_alpha(1); - } - - // ** Promoting ** - if ((zoom == 0) && (type == 5) && instance_exists(obj_controller)) { - draw_set_color(0); - draw_rectangle(xx + 1006, yy + 143, xx + 1577, yy + 518, 0); - - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_center); - draw_set_color(c_gray); - draw_text(xx + 1292, yy + 145, string_hash_to_newline("Promoting")); - - draw_set_font(fnt_40k_12); - var comp = ""; - if (company <= 10 && company > 0) { - comp = romanNumerals[company - 1]; - } else if (company > 10) { - comp = "HQ"; - } - draw_text(xx + 1292, yy + 170, string_hash_to_newline(string(comp) + " Company " + string(unit_role))); - - draw_set_halign(fa_left); - draw_set_color(c_gray); - draw_text(xx + 1014, yy + 210, string_hash_to_newline("Target Company:")); - - var check = " "; - draw_set_alpha(1); - - // HQ Company - if ((target_comp == 0) || (target_comp > 10)) { - check = "x"; - } - draw_text(xx + 1470, yy + 210, string_hash_to_newline("HQ [" + string(check) + "]")); - check = " "; - // if (obj_controller.command_set[1]!=0 && !is_specialist(unit_role, SPECIALISTS_LIBRARIANS)){ - for (i = 1; i <= 10; i++) { - var comp_data = company_promote_data[i - 1]; - if (obj_controller.command_set[2] == 1) { - //cecks if exp requirements are activated - if (min_exp < comp_data[2]) { - draw_set_alpha(0.6); - } - } - check = " "; - if (target_comp == i) { - check = "x"; - } - var select_text = $"{romanNumerals[i - 1]} [{check}]"; - draw_text(xx + comp_data[0], yy + comp_data[1], select_text); - if (point_and_click([xx + comp_data[0], yy + comp_data[1], xx + comp_data[0] + 90, yy + comp_data[1] + 20])) { - target_comp = i; - target_role = 0; - get_unit_promotion_options(); - cooldown = 8000; - } - } - // } - - draw_text(xx + 1014, yy + 290, string_hash_to_newline("Target Role:")); //choose new role - var role_x = 0; - role_y = 0; - if (target_comp != -1) { - for (var r = 1; r <= 11; r++) { - if (role_name[r] != "") { - draw_set_alpha(1); - check = " "; - if (target_role == r) { - check = "x"; - } - if (min_exp < role_exp[r]) { - draw_set_alpha(0.25); - } - draw_text(xx + 1030 + role_x, yy + 310 + role_y, string_hash_to_newline(string(role_name[r]) + " [" + string(check) + "]")); - if (point_and_click([xx + 1030 + role_x, yy + 310 + role_y, xx + 1180 + role_x, yy + 330 + role_y])) { - if (min_exp >= role_exp[r]) { - target_role = r; - calculate_equipment_needs(); - all_good = 1; - cooldown = 8; - } - } - if (r % 3 == 0) { - role_y += 20; - role_x = 0; - } else { - role_x += 170; - } - } - } - } - - draw_set_alpha(1); - - draw_text(xx + 1014, yy + 370, string_hash_to_newline("Required Gear:")); - var gr = 0, tox = ""; - - if (target_role > 0) { - if (req_armour != "") { - gr = req_armour_num - have_armour_num; - tox = ""; - if (gr > 0) { - draw_set_color(c_red); - } else { - draw_set_color(c_gray); - } - draw_text(xx + 1030, yy + 390, $"{req_armour_num} {req_armour} (Have {have_armour_num})"); - } - if (req_gear != "") { - gr = req_gear_num - have_gear_num; - tox = ""; - if (gr > 0) { - draw_set_color(c_red); - } else { - draw_set_color(c_gray); - } - draw_text(xx + 1030, yy + 410, $"{req_gear_num} {req_gear} (Have {have_gear_num})"); - } - if (req_mobi != "") { - gr = req_mobi_num - have_mobi_num; - tox = ""; - if (gr > 0) { - draw_set_color(c_red); - } else { - draw_set_color(c_gray); - } - draw_text(xx + 1030, yy + 430, $"{req_mobi_num} {req_mobi} (Have {have_mobi_num})"); - } - if (req_wep1 != "") { - gr = req_wep1_num - have_wep1_num; - tox = ""; - if (gr > 0) { - draw_set_color(c_red); - } else { - draw_set_color(c_gray); - } - draw_text(xx + 1260, yy + 390, $"{req_wep1_num} {req_wep1} (Have {have_wep1_num})"); - } - if (req_wep2 != "") { - gr = req_wep2_num - have_wep2_num; - tox = ""; - if (gr > 0) { - draw_set_color(c_red); - } else { - draw_set_color(c_gray); - } - draw_text(xx + 1260, yy + 410, $"{req_wep2_num} {req_wep2} (Have {have_wep2_num})"); - } - } - - draw_set_alpha(1); - - draw_set_color(c_gray); - draw_set_halign(fa_left); - draw_rectangle(xx + 1006, yy + 499, xx + 1115, yy + 518, 1); - draw_set_alpha(0.5); - draw_rectangle(xx + 1007, yy + 500, xx + 1114, yy + 517, 1); - - if (all_good == 1) { - draw_set_alpha(1); - draw_rectangle(xx + 1465, yy + 499, xx + 1576, yy + 518, 1); - draw_set_alpha(0.5); - draw_rectangle(xx + 1466, yy + 500, xx + 1575, yy + 517, 1); - } - if (all_good != 1) { - draw_set_alpha(0.25); - draw_rectangle(xx + 1465, yy + 499, xx + 1576, yy + 518, 1); - draw_rectangle(xx + 1466, yy + 500, xx + 1575, yy + 517, 1); - } - - draw_set_alpha(1); - draw_set_halign(fa_center); - draw_text(xx + 1061, yy + 501, string_hash_to_newline("Cancel")); - draw_text(xx + 1061.5, yy + 501.5, string_hash_to_newline("Cancel")); - - if (all_good == 1) { - draw_text(xx + 1521, yy + 501, string_hash_to_newline("Promote!")); - draw_text(xx + 1521.5, yy + 501.5, string_hash_to_newline("Promote!")); - } - if (all_good != 1) { - draw_set_alpha(0.25); - draw_text(xx + 1521, yy + 501, string_hash_to_newline("Promote!")); - draw_text(xx + 1521.5, yy + 501.5, string_hash_to_newline("Promote!")); - } - draw_set_alpha(1); - } - - // ** Transfering ** - if ((zoom == 0) && (type == 5.1) && instance_exists(obj_controller)) { - draw_set_color(0); - draw_rectangle(xx + 1006, yy + 143, xx + 1577, yy + 518, 0); - - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_center); - draw_set_color(c_gray); - draw_text(xx + 1292, yy + 145, string_hash_to_newline("Transfering")); - - draw_set_font(fnt_40k_12); - var comp = ""; - if (company <= 10 && company > 0) { - comp = romanNumerals[company - 1]; - } else if (company > 10) { - comp = "HQ"; - } - draw_text(xx + 1292, yy + 170, string_hash_to_newline(string(comp) + " Company " + string(unit_role))); - - draw_set_halign(fa_left); - draw_set_color(c_gray); - draw_text(xx + 1014, yy + 210, string_hash_to_newline("Target Company:")); - - var check = " "; - // HQ Company - if ((target_comp == 0) || (target_comp > 10)) { - check = "x"; - } - draw_text(xx + 1470, yy + 210, string_hash_to_newline("HQ [" + string(check) + "]")); - check = " "; - - if (((unit_role != obj_ini.role[100, 17]) || (obj_controller.command_set[1] != 0)) && (unit_role != "Lexicanum") && (unit_role != "Codiciery")) { - // I Company - if (target_comp == 1) { - check = "x"; - } - draw_text(xx + 1030, yy + 230, string_hash_to_newline(romanNumerals[0] + " [" + string(check) + "]")); - check = " "; - // II Company - if (target_comp == 2) { - check = "x"; - } - draw_text(xx + 1140, yy + 230, string_hash_to_newline(romanNumerals[1] + " [" + string(check) + "]")); - check = " "; - // III Company - if (target_comp == 3) { - check = "x"; - } - draw_text(xx + 1250, yy + 230, string_hash_to_newline(romanNumerals[2] + " [" + string(check) + "]")); - check = " "; - // IV Company - if (target_comp == 4) { - check = "x"; - } - draw_text(xx + 1360, yy + 230, string_hash_to_newline(romanNumerals[3] + " [" + string(check) + "]")); - check = " "; - // V Company - if (target_comp == 5) { - check = "x"; - } - draw_text(xx + 1470, yy + 230, string_hash_to_newline(romanNumerals[4] + " [" + string(check) + "]")); - check = " "; - // VI Company - if (target_comp == 6) { - check = "x"; - } - draw_text(xx + 1030, yy + 250, string_hash_to_newline(romanNumerals[5] + " [" + string(check) + "]")); - check = " "; - // VII Company - if (target_comp == 7) { - check = "x"; - } - draw_text(xx + 1140, yy + 250, string_hash_to_newline(romanNumerals[6] + " [" + string(check) + "]")); - check = " "; - // VIII Company - if (target_comp == 8) { - check = "x"; - } - draw_text(xx + 1250, yy + 250, string_hash_to_newline(romanNumerals[7] + " [" + string(check) + "]")); - check = " "; - // IX Company - if (target_comp == 9) { - check = "x"; - } - draw_text(xx + 1360, yy + 250, string_hash_to_newline(romanNumerals[8] + " [" + string(check) + "]")); - check = " "; - // X Company - if (target_comp == 10) { - check = "x"; - } - draw_text(xx + 1470, yy + 250, string_hash_to_newline(romanNumerals[9] + " [" + string(check) + "]")); - check = " "; - } - - draw_set_alpha(1); - - draw_set_color(c_gray); - draw_set_halign(fa_left); - draw_rectangle(xx + 1006, yy + 499, xx + 1115, yy + 518, 1); - draw_set_alpha(0.5); - draw_rectangle(xx + 1007, yy + 500, xx + 1114, yy + 517, 1); - - if ((company != target_comp) && (target_comp >= 0)) { - draw_set_alpha(1); - draw_rectangle(xx + 1465, yy + 499, xx + 1576, yy + 518, 1); - draw_set_alpha(0.5); - draw_rectangle(xx + 1466, yy + 500, xx + 1575, yy + 517, 1); - } - if ((company == target_comp) || (target_comp < 0)) { - draw_set_alpha(0.25); - draw_rectangle(xx + 1465, yy + 499, xx + 1576, yy + 518, 1); - draw_rectangle(xx + 1466, yy + 500, xx + 1575, yy + 517, 1); - } - - draw_set_alpha(1); - draw_set_halign(fa_center); - draw_text(xx + 1061, yy + 501, "Cancel"); - draw_text(xx + 1061.5, yy + 501.5, "Cancel"); - - if ((company != target_comp) && (target_comp >= 0)) { - draw_text(xx + 1521, yy + 501, "Transfer!"); - draw_text(xx + 1521.5, yy + 501.5, "Transfer!"); - } - if ((company == target_comp) || (target_comp < 0)) { - draw_set_alpha(0.25); - draw_text(xx + 1521, yy + 501, "Transfer!"); - draw_text(xx + 1521.5, yy + 501.5, "Transfer!"); - } - draw_set_alpha(1); - } - - if (type == "duel") {} -} catch (_exception) { - handle_exception(_exception); - instance_destroy(); -} diff --git a/objects/obj_popup/Draw_64.gml b/objects/obj_popup/Draw_64.gml new file mode 100644 index 0000000000..abb454c313 --- /dev/null +++ b/objects/obj_popup/Draw_64.gml @@ -0,0 +1,141 @@ + // ** Promoting ** +try{ + if (type == POPUP_TYPE.PROMOTION) { + draw_popup_promotion(); + } else if (type == 5.1){ + draw_popup_transfer(); + } else if (type == POPUP_TYPE.EQUIP){ + draw_popup_equip(); + }else if (type == POPUP_TYPE.ITEM_GIFT) { + draw_gift_items_popup(); + } else if (type == POPUP_TYPE.ARTIFACT_EQUIP){ + equip_artifact_popup_draw(); + } else if (type == POPUP_TYPE.ADD_TAGS){ + draw_tag_manager(); + } else { + if (hide == true) { + exit; + } + if (image == "debug") { + size = 3; + } + + if (instance_exists(obj_fleet)) { + exit; + } + + if (type == POPUP_TYPE.FLEET_MOVE) { + draw_set_font(fnt_large); + draw_set_halign(fa_center); + draw_set_color(CM_GREEN_COLOR); + + if (!obj_controller.zoomed) { + draw_text_transformed(__view_get(e__VW.XView, 0) + 320, __view_get(e__VW.YView, 0) + 60, "SELECT DESTINATION", 0.5, 0.5, 0); + } else { + draw_text_transformed(room_width / 2, 60 * 3, "SELECT DESTINATION", 1.5, 1.5, 0); + } + + draw_set_halign(fa_left); + } else if (type == 10) { + target_comp += 1; + draw_set_color(0); + draw_set_alpha(target_comp / 60); + draw_rectangle(0, 0, room_width, room_height, 0); + draw_set_alpha(1); + exit; + } + + var zoom = 0; + if (instance_exists(obj_controller)) { + zoom = obj_controller.zoomed; + } + if (((zoom == 0) && (type <= 4)) || (type == 98)) { + image_bot = 0; + y_scale_mod = 1; + + popup_window_draw() + + if (image_wid > 0) { + width -= image_wid + 10; + } + + x1 = ((1600 - sprite_width) / 2); + y1 = ((900 - sprite_height * y_scale_mod) / 2); + + draw_set_font(fnt_40k_14b); + draw_set_halign(fa_center); + draw_set_color(CM_GREEN_COLOR); + + if (fancy_title == 1) { + draw_set_font(fnt_fancy); + if (type == 1) { + draw_set_color(255); + } + } + draw_text_transformed(x1 + (sprite_width / 2), y1 + (sprite_height * 0.07), string_hash_to_newline(string(title)), 1.1, 1.1, 0); + // draw_text(xx+320.5,yy+123.5,string(title)); + + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + draw_set_color(CM_GREEN_COLOR); + + if (instance_exists(obj_turn_end)) { + if (obj_turn_end.popups > 0) { + draw_text(x1 + 20, y1 + (sprite_height * 0.07), $"{obj_turn_end.current_popup}/{obj_turn_end.popups}" ) + } + } + if (image == "debug") { + draw_text_ext(x1 + 20, y1 + (sprite_height * 0.18), string_hash_to_newline(string(text)), -1, sprite_width - 40); + } else if (image == "") { + if (size == 1) { + draw_text_ext(x1 + 5, y1 + (sprite_height * 0.18), string_hash_to_newline(string(text)), -1, width); + } + if (size != 1) { + draw_text_ext(x1 + 25, y1 + (sprite_height * 0.18), string_hash_to_newline(string(text)), -1, width); + } + str_h = string_height_ext(string_hash_to_newline(string(text)), -1, width) + (sprite_height * 0.18); + } else if (image != "") { + if (size == 1) { + draw_text_ext(x1 + 15 + image_wid, y1 + (sprite_height * 0.18), string_hash_to_newline(string(text)), -1, width); + } + if (size != 1) { + draw_text_ext(x1 + 35 + image_wid, y1 + (sprite_height * 0.18), string_hash_to_newline(string(text)), -1, width); + } + str_h = string_height_ext(string_hash_to_newline(string(text)), -1, width) + (sprite_height * 0.18); + } + + // if (image!="") then draw_text_ext(x1+126+150,y1+152,string(text),-1,384-150); + // if (text2!="") then draw_text_ext(x1+126,y1+309,string(text2),-1,384); + // TODO change this into an array in a function (like romanNumerals does in here) + var img = default_popup_image_index(); + + + if ((img != -1) && (image != "") && (image_wid > 0)) { + var sh = 999; + if (size == 1) { + sh = 24; + scr_image("popup", img, x1 + 5, y1 + sh + 24, image_wid, image_hei); + } + if (size >= 2) { + sh = 24; + scr_image("popup", img, x1 + 25, y1 + sh + 24, image_wid, image_hei); + } + + image_bot = (sprite_height * 0.07) + image_hei + 5; + } + + try{ + draw_popup_options(); + } catch(_exception){ + handle_exception(_exception); + popup_default_close(); + } + } + + if (type == "duel") {} + } +} catch(_exception){ + instance_destroy(); + handle_exception(_exception); +} + \ No newline at end of file diff --git a/objects/obj_popup/Keyboard_13.gml b/objects/obj_popup/Keyboard_13.gml index f17f36d816..f8c09b1a10 100644 --- a/objects/obj_popup/Keyboard_13.gml +++ b/objects/obj_popup/Keyboard_13.gml @@ -13,7 +13,7 @@ if (battle_special>0){ cooldown=10;exit; } -if (option1="" && type<5){ +if (array_length(options == 0) && type<5){ obj_controller.cooldown=10; if (number!=0) and (obj_controller.complex_event=false){ if (instance_exists(obj_turn_end)){ @@ -23,7 +23,7 @@ if (option1="" && type<5){ instance_destroy(); } -if (type=98){ +if (type=POPUP_TYPE.BATTLE_OPTIONS){ obj_controller.cooldown=10; obj_turn_end.current_battle+=1; obj_turn_end.alarm[0]=1; diff --git a/objects/obj_popup/Keyboard_32.gml b/objects/obj_popup/Keyboard_32.gml index b00451b19c..058a40765d 100644 --- a/objects/obj_popup/Keyboard_32.gml +++ b/objects/obj_popup/Keyboard_32.gml @@ -13,13 +13,13 @@ if (battle_special>0){ cooldown=10;exit; } -if (option1="") and (type<5){ -obj_controller.cooldown=10; -if (number!=0) and (obj_controller.complex_event=false) then obj_turn_end.alarm[1]=4; -instance_destroy(); +if (array_length(options) == 0) and (type<5){ + obj_controller.cooldown=10; + if (number!=0) and (obj_controller.complex_event=false) then obj_turn_end.alarm[1]=4; + instance_destroy(); } -if (type=98){ +if (type=POPUP_TYPE.BATTLE_OPTIONS){ obj_controller.cooldown=10; obj_turn_end.current_battle+=1; obj_turn_end.alarm[0]=1; diff --git a/objects/obj_popup/Mouse_50.gml b/objects/obj_popup/Mouse_50.gml deleted file mode 100644 index 876c23571e..0000000000 --- a/objects/obj_popup/Mouse_50.gml +++ /dev/null @@ -1,636 +0,0 @@ -var __b__; -__b__ = action_if_variable(cooldown, 0, 2); -if !__b__ -{ -{ - -if (hide=true) then exit; -if (!instance_exists(obj_controller)) then exit; -if (instance_exists(obj_fleet)) then exit; -if (obj_controller.scrollbar_engaged!=0) then exit; -if (cooldown>0) then exit; - -if (battle_special>0){ - alarm[0]=1; - cooldown=10;exit; -} - -if (type=98){ - obj_controller.cooldown=10; - if (instance_exists(obj_turn_end)){ - obj_turn_end.current_battle+=1; - obj_turn_end.alarm[0]=1; - } - obj_controller.force_scroll=0; - instance_destroy();exit; -} - - - - -if (option1=="") and (type<5){ - obj_controller.cooldown=10; - if (instance_exists(obj_turn_end)) and (obj_controller.complex_event==false){if (number!=0) then obj_turn_end.alarm[1]=4;} - instance_destroy(); -} - -if (type>4) and (type!=9) and (cooldown<=0){ - var xx,yy;xx=__view_get( e__VW.XView, 0 );yy=__view_get( e__VW.YView, 0 ); - - if (mouse_x>=xx+1006) and (mouse_y>=yy+499) and (mouse_x<=xx+1116) and (mouse_y=yy+210) and (mouse_y=xx+1468) and (mouse_x<=xx+1515){target_comp=0;cooldown=8000;} - } - if (mouse_y>=yy+230) and (mouse_y=xx+1030) and (mouse_x<=xx+1120){target_comp=1;cooldown=8000;} - if (mouse_x>=xx+1140) and (mouse_x<=xx+1230){target_comp=2;cooldown=8000;} - if (mouse_x>=xx+1250) and (mouse_x<=xx+1340){target_comp=3;cooldown=8000;} - if (mouse_x>=xx+1360) and (mouse_x<=xx+1450){target_comp=4;cooldown=8000;} - if (mouse_x>=xx+1470) and (mouse_x<=xx+1560){target_comp=5;cooldown=8000;} - } - if (mouse_y>=yy+250) and (mouse_y=xx+1030) and (mouse_x<=xx+1120){target_comp=6;cooldown=8000;} - if (mouse_x>=xx+1140) and (mouse_x<=xx+1230){target_comp=7;cooldown=8000;} - if (mouse_x>=xx+1250) and (mouse_x<=xx+1340){target_comp=8;cooldown=8000;} - if (mouse_x>=xx+1360) and (mouse_x<=xx+1450){target_comp=9;cooldown=8000;} - if (mouse_x>=xx+1470) and (mouse_x<=xx+1560){target_comp=10;cooldown=8000;} - } -} - -if (type=5) and (cooldown<=0){ - var xx,yy,before,before2; - xx=__view_get( e__VW.XView, 0 );yy=__view_get( e__VW.YView, 0 ); - before=target_comp; - before2=target_role; - - if (unit_role!=obj_ini.role[100,17]) or (obj_controller.command_set[1]!=0){ - if (mouse_y>=yy+210) and (mouse_y=xx+1468) and (mouse_x<=xx+1515) and (min_exp>=0){ - target_comp=0; - get_unit_promotion_options(); - cooldown=8000; - } - } - } -} - -/* */ - -var xx,yy,change_tab; -xx=__view_get( e__VW.XView, 0 ); -yy=__view_get( e__VW.YView, 0 ); -change_tab=0; - - -if (mouse_x>=xx+1465) and (mouse_y>=yy+499) and (mouse_x10) then target_comp=0; - manag=obj_controller.managing; - if (manag>10) then manag=0; - company=manag - } - if (type=5.1) and (cooldown<=0) and (company!=target_comp) and (target_comp!=-1){ - cooldown=999; - obj_controller.cooldown=8000; - - var mahreens=0,w=0,god=0,vehi=0,god2=0; - - for (w=1;w<500;w++){ // Gets the number of marines in the target company - if (obj_ini.name[target_comp,w]=="" && obj_ini.name[target_comp,w+1]==""){ - mahreens=w; - break; - } - } - - for (w=1;w<101;w++){// Gets the number of vehicles in the target company - if (god2=0 and obj_ini.veh_role[target_comp,w]=""){god2=1;vehi=w;break;} - } - - // The MAHREENS and TARGET/FROM seems to check out - var unit, move_squad, move_members, moveable, squad; - for (w=0;w= 1) and (target_comp <= 10) { - obj_ini.veh_race[target_comp][vehi]=obj_ini.veh_race[veh_data[0]][veh_data[1]]; - obj_ini.veh_loc[target_comp][vehi]=obj_ini.veh_loc[veh_data[0]][veh_data[1]]; - obj_ini.veh_role[target_comp][vehi]=obj_ini.veh_role[veh_data[0]][veh_data[1]]; - obj_ini.veh_wep1[target_comp][vehi]=obj_ini.veh_wep1[veh_data[0]][veh_data[1]]; - obj_ini.veh_wep2[target_comp][vehi]=obj_ini.veh_wep2[veh_data[0]][veh_data[1]]; - obj_ini.veh_wep3[target_comp][vehi]=obj_ini.veh_wep3[veh_data[0]][veh_data[1]]; - obj_ini.veh_upgrade[target_comp][vehi]=obj_ini.veh_upgrade[veh_data[0]][veh_data[1]]; - obj_ini.veh_acc[target_comp][vehi]=obj_ini.veh_acc[veh_data[0]][veh_data[1]]; - obj_ini.veh_hp[target_comp][vehi]=obj_ini.veh_hp[veh_data[0]][veh_data[1]]; - obj_ini.veh_chaos[target_comp][vehi]=obj_ini.veh_chaos[veh_data[0]][veh_data[1]]; - obj_ini.veh_pilots[target_comp][vehi]=0; - obj_ini.veh_lid[target_comp][vehi]=obj_ini.veh_lid[veh_data[0]][veh_data[1]]; - obj_ini.veh_wid[target_comp][vehi]=obj_ini.veh_wid[veh_data[0]][veh_data[1]]; - - destroy_vehicle(veh_data[0],veh_data[1]); - - vehi++; - } - - } - } - - } - - // Check this - - if (obj_controller.managing>0){ - with(obj_controller){scr_management(1);} - } - obj_ini.selected_company=company; - obj_ini.temp_target_company=target_comp; - with(obj_ini){ - for (var co=0;co<11;co++){ - scr_company_order(co); - scr_vehicle_order(co); - } - } - - with(obj_controller){ - // man_current=0; - var i=-1; - man_size=0; - selecting_location=""; - selecting_types=""; - selecting_ship=-1; - - if (obj_controller.managing>0){ - reset_manage_arrays(); - alll=0; - update_general_manage_view(); - } - } - - with(obj_managment_panel){instance_destroy();} - - obj_controller.cooldown=10; - instance_destroy(); - } -} - -/* */ - -var xx,yy,change_tab,do_not_change; -xx=__view_get( e__VW.XView, 0 ); -yy=__view_get( e__VW.YView, 0 ); -change_tab=0; -do_not_change=false; - -if (type=6) and (cooldown<=0){// Actually changing equipment right here - if (target_comp=1) or (target_comp=2){ - if (mouse_y>=yy+318) and (mouse_y=xx+1190) and (mouse_x=yy+318) and (mouse_y=xx+1263) and (mouse_x=yy+318) and (mouse_y=xx+1409) and (mouse_x=xx+1296) and (mouse_x=yy+215) and (mouse_y=yy+235) and (mouse_y=yy+255) and (mouse_y=yy+275) and (mouse_y=yy+295) and (mouse_y=0) and (role_name[target_role]!=""){ - cooldown=999; - obj_controller.cooldown=8000; - - var mahreens=0;i=-1; - - if (target_comp>10) then target_comp=0; - manag=obj_controller.managing; - if (manag>10) then manag=0; - var company=manag; - - for(i=0;i<498;i++){ - if (obj_ini.name[target_comp][i]=="" and obj_ini.name[target_comp][i+1]=="") { - mahreens=i; - break; - } - } - // Gets the number of marines in the target company - var unit, squad_mover,moveable; - var role_squad_equivilances = {};//this is the only way to set variables as keys in gml - variable_struct_set(role_squad_equivilances,obj_ini.role[100][8],"tactical_squad"); - variable_struct_set(role_squad_equivilances,obj_ini.role[100][9],"devastator_squad"); - variable_struct_set(role_squad_equivilances,obj_ini.role[100][10],"assault_squad"); - variable_struct_set(role_squad_equivilances,obj_ini.role[100][12],"scout_squad"); - variable_struct_set(role_squad_equivilances,obj_ini.role[100][3],"sternguard_veteran_squad"); - variable_struct_set(role_squad_equivilances,obj_ini.role[100][4],"terminator_squad"); - - for(i=0;i=min_exp){ - moveable=true; - unit = obj_controller.display_unit[i]; - if (unit.squad != "none"){ // this evaluates if you are trying promote a whole squad - move_squad = unit.squad; - squad = obj_ini.squads[move_squad]; - squad.update_fulfilment(); - move_members = squad.members; - if (array_length(move_members)==1){ - unit.squad = "none"; - moveable = false; - } - for (var mem = 0;mem=xx+1465) and (mouse_y>=yy+499) and (mouse_x=xx+240) and (mouse_x<=xx+387) and (type!=88)) or (((type=9) or (type=9.1)) and (mouse_x>=xx+240+420) and (mouse_x=xx+240+420) and (mouse_x=yy+325) and (mouse_y0) { - var r1,r2,cn;r2=0;cn=obj_controller; - r1=floor(random(cn.stc_wargear_un+cn.stc_vehicles_un+cn.stc_ships_un))+1; - - if (r10) then r2=1; - if (r1>cn.stc_wargear_un) and (r1<=cn.stc_wargear_un+cn.stc_vehicles_un) and (cn.stc_vehicles_un>0) then r2=2; - if (r1>cn.stc_wargear_un+cn.stc_vehicles_un) and (r2<=cn.stc_wargear_un+cn.stc_vehicles_un+cn.stc_ships_un) and (cn.stc_ships_un>0) then r2=3; - - if (cn.stc_wargear_un>0) and (cn.stc_vehicles_un+cn.stc_ships_un=0) then r2=1; - if (cn.stc_vehicles_un>0) and (cn.stc_wargear_un+cn.stc_ships_un=0) then r2=2; - if (cn.stc_ships_un>0) and (cn.stc_vehicles_un+cn.stc_wargear_un=0) then r2=3; - - cn.stc_un_total-=1; - if (r2=1) then cn.stc_wargear_un-=1; - if (r2=2) then cn.stc_vehicles_un-=1; - if (r2=3) then cn.stc_ships_un-=1; - - // Modify disposition here - if (giveto = eFACTION.Imperium){ - obj_controller.disposition[giveto]+=3; - } - else if (giveto = eFACTION.Mechanicus){ - obj_controller.disposition[giveto]+=choose(5,6,7,8); - } - else if (giveto = eFACTION.Inquisition){ - obj_controller.disposition[giveto]+=3; - } - else if (giveto = eFACTION.Ecclesiarchy) { - obj_controller.disposition[giveto]+=3; - if (scr_has_adv("Reverent Guardians")){ - obj_controller.disposition[giveto]+=2; - } - } - - if (giveto=eFACTION.Eldar) - obj_controller.disposition[giveto] +=2; - if (giveto=eFACTION.Tau) { - obj_controller.disposition[giveto]+=15; - }// 137 ; chance for mechanicus to get very pissed - // End disposition - obj_controller.cooldown=7000; - obj_controller.menu=20; - obj_controller.diplomacy=giveto; - obj_controller.force_goodbye=-1; - var the; - the=""; - if (giveto!=eFACTION.Ork) and (giveto!=eFACTION.Chaos) then the="the "; - - scr_event_log("",$"STC Fragment gifted to {the}{obj_controller.faction[giveto]}."); - - with(obj_controller ) { - scr_dialogue("stc_thanks"); - } - instance_destroy(); - exit; - } -} - - - -xx=__view_get( e__VW.XView, 0 )+951;yy=__view_get( e__VW.YView, 0 )+398; -if (mouse_x>=xx+121) and (mouse_y>=yy+393) and (mouse_x= 0) && (cooldown <= 40)) { - cooldown -= 1; - } if (instance_exists(obj_controller)) { if (obj_controller.zoomed == 1) { with (obj_controller) { @@ -14,41 +10,18 @@ try { } } - if (keyboard_check_pressed(ord("1")) && (cooldown <= 0)) { - press = 1; - } - if (keyboard_check_pressed(ord("2")) && (cooldown <= 0)) { - press = 2; - } - if (keyboard_check_pressed(ord("3")) && (cooldown <= 0)) { - press = 3; - } - if ((press == 1) && (option1 == "")) { - press = 0; - } - if ((press == 2) && (option2 == "")) { - press = 0; - } - if ((press == 3) && (option3 == "")) { - press = 0; - } - if ((press != 0) && (cooldown > 0)) { - press = 0; - exit; + for (var i=0;i 0)) { - if (press == 1) { + if (press == 0) { var del = obj_saveload.save[save]; var _save_file = string(PATH_save_files, del); if (file_exists(_save_file)) { @@ -67,27 +40,27 @@ try { instance_destroy(); } } - if (press == 2) { + if (press == 1) { instance_destroy(); } exit; } if ((room_get_name(room) == "Main_Menu") && (title == "Tutorial")) { - if (press == 2) { + if (press == 1) { // 1: yes, 2: no (without disabling) obj_main_menu_buttons.fading = 1; obj_main_menu_buttons.crap = 3; obj_main_menu_buttons.cooldown = 9999; instance_destroy(); } - if (press == 3) { + if (press == 2) { ini_open("saves.ini"); ini_write_real("Data", "tutorial", 1); ini_close(); } - if (press >= 2) { + if (press >= 1) { obj_main_menu_buttons.fading = 1; obj_main_menu_buttons.crap = self.press; obj_main_menu_buttons.cooldown = 9999; @@ -95,204 +68,22 @@ try { } exit; } - - if ((image == "debug_banshee") && (cooldown <= 0)) { - if (planet == 2) { - if ((press == 1) || (press == 3)) { - if (press == 1) { - amount = 7; - } - if (press == 3) { - amount = 9; - } - with (obj_star) { - if ((choose(0, 1, 1) == 1) && (owner != eFACTION.Eldar) && (owner != 1)) { - var fleet; - fleet = instance_create(x, y, obj_en_fleet); - fleet.owner = obj_popup.amount; - if (obj_popup.amount == 7) { - fleet.sprite_index = spr_fleet_ork; - fleet.capital_number = 3; - present_fleet[7] += 1; - } - if (obj_popup.amount == 9) { - if (present_fleet[1] == 0) { - vision = 0; - } - fleet.sprite_index = spr_fleet_tyranid; - fleet.capital_number = 3; - fleet.frigate_number = 6; - fleet.escort_number = 16; - present_fleet[9] += 1; - } - fleet.image_index = 4; - fleet.orbiting = id; - } - } - instance_destroy(); - } - if (press == 2) { - with (obj_star) { - if ((choose(0, 1, 1) == 1) && (owner != eFACTION.Eldar) && (owner != 1)) { - var h; - h = 0; - repeat (4) { - h += 1; - if ((p_type[h] != "Dead") && (p_type[h] != "")) { - p_traitors[h] = 5; - p_chaos[h] = 4; - } - } - } - } - instance_destroy(); - } - } - if (planet == 5) { - if (press == 1) { - var fleet, tar; - tar = instance_nearest(x, y, obj_star); - fleet = instance_create(tar.x, tar.y, obj_en_fleet); - fleet.owner = eFACTION.Ork; - fleet.sprite_index = spr_fleet_ork; - fleet.capital_number = 2; - fleet.frigate_number = 5; - tar.present_fleet[7] += 1; - fleet.image_index = 4; - fleet.orbiting = id; - instance_destroy(); - } - if (press == 2) { - var fleet, tar; - tar = instance_nearest(x, y, obj_star); - fleet = instance_create(tar.x, tar.y, obj_en_fleet); - fleet.owner = eFACTION.Tau; - fleet.sprite_index = spr_fleet_tau; - fleet.capital_number = 2; - fleet.frigate_number = 5; - tar.present_fleet[8] += 1; - fleet.image_index = 4; - fleet.orbiting = id; - instance_destroy(); - } - if (press == 3) { - instance_destroy(); - } - } - if (planet == 3) { - if (press == 1) { - var fleet, tar; - tar = instance_nearest(x, y, obj_star); - fleet = instance_create(tar.x, tar.y, obj_en_fleet); - fleet.owner = eFACTION.Imperium; - fleet.sprite_index = spr_fleet_imperial; - fleet.capital_number = 2; - fleet.frigate_number = 5; - tar.present_fleet[2] += 1; - fleet.image_index = 4; - fleet.orbiting = id; - instance_destroy(); - } - if (press == 2) { - var fleet, tar; - tar = instance_nearest(x, y, obj_star); - fleet = instance_create(tar.x, tar.y, obj_en_fleet); - fleet.owner = eFACTION.Chaos; - fleet.sprite_index = spr_fleet_chaos; - fleet.capital_number = 2; - fleet.frigate_number = 5; - tar.present_fleet[10] += 1; - fleet.image_index = 4; - fleet.orbiting = id; - instance_destroy(); - } - if (press == 3) { - planet = 5; - cooldown = 30; - text = "Ork, Tau, Cancel?"; - option1 = "Ork"; - option2 = "Tau"; - option3 = "Cancel"; - press = 0; - exit; - } - } - if (planet == 1) { - if (press == 1) { - planet = 2; - cooldown = 30; - text = "Select a faction"; - option1 = "Orks"; - option2 = "Chaos"; - option3 = "Tyranids"; - press = 0; - exit; - } - if (press == 2) { - planet = 3; - cooldown = 30; - text = "Imperium, Heretic, or Xeno?"; - option1 = "Imperium"; - option2 = "Heretic"; - option3 = "Xeno"; - press = 0; - exit; - } - if (press == 3) { - var flit1, flit2, onceh; - onceh = 0; - flit1 = instance_nearest(x, y, obj_p_fleet); - flit2 = instance_nearest(x, y, obj_en_fleet); - - if (instance_exists(flit1) && instance_exists(flit2)) { - if (point_distance(x, y, flit1.x, flit1.y) > point_distance(x, y, flit2.x, flit2.y)) { - with (flit2) { - instance_destroy(); - } - } else { - with (flit1) { - instance_destroy(); - } - } - onceh = 1; - } - if ((onceh == 0) && (!instance_exists(flit1)) && instance_exists(flit2)) { - if (point_distance(x, y, flit2.x, flit2.y) <= 40) { - with (flit2) { - instance_destroy(); - } - } - onceh = 1; - } - if ((onceh == 0) && instance_exists(flit1) && (!instance_exists(flit2))) { - if (point_distance(x, y, flit1.x, flit1.y) <= 40) { - with (flit1) { - instance_destroy(); - } - } - onceh = 1; - } - - instance_destroy(); - } - } - exit; - } - if (((title == "Inquisition Mission") || (title == "Inquisition Recon")) && (title != "Artifact Located") && (obj_controller.demanding == 1)) { demand = 1; } if ((image == "chaos_messenger") && (title == "Chaos Meeting")) { if ((mission == "meeting_1") || (mission == "meeting_1t")) { - if (option1 == "") { - option1 = "Die, heretic!"; - option2 = "Very well. Lead the way."; - option3 = "I must take care of an urgent matter first. (Exit)"; + if (array_length(options) == 0) { + add_option([ + "Die, heretic!", + "Very well. Lead the way.", + "I must take care of an urgent matter first. (Exit)" + ]); exit; } - if (option1 != "") { - if (press == 1) { + if (array_length(options)) { + if (press == 0) { with (obj_star) { var i = 0; repeat (planets) { @@ -302,9 +93,7 @@ try { } obj_controller.disposition[10] -= 10; text = "The heretic is killed in a most violent fashion. With a lack of go-between the meeting cannot proceed."; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); mission = ""; // image=""; if (obj_controller.blood_debt == 1) { obj_controller.penitent_current += 1; @@ -316,13 +105,11 @@ try { } cooldown = 20; exit; - } else if ((press == 2) && (mission == "meeting_1")) { + } else if ((press == 1) && (mission == "meeting_1")) { obj_controller.complex_event = true; obj_controller.current_eventing = "chaos_meeting_1"; text = $"{global.chapter_name} signal your readiness to the heretic. Nearly twenty minutes of following the man passes before {global.chapter_name} all enter an ordinary-looking structure. Down, within the basement, {global.chapter_name} then pass into the entrance of a tunnel. As the trek downward continues more and more heretics appear- cultists, renegades that appear to be from the local garrison, and occasionally even the fallen of your kind. Overall the heretics seem well supplied and equip. This observation is interrupted as your group enters into a larger chamber, revealing a network of tunnels and what appears to be ancient catacombs. Bones of the ancient dead, the forgotten, litter the walls and floor. And the chamber seems to open up wider, and wider, until {global.chapter_name} find yourself within a hall. Within this hall, waiting for {global.chapter_name}, are several dozen Chaos Terminators, a Greater Daemon of Tzeentch and Slaanesh, and Chaos Lord " + string(obj_controller.faction_leader[eFACTION.Chaos]) + "."; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); mission = "cslord1"; image = ""; img = 0; @@ -330,7 +117,7 @@ try { size = 3; cooldown = 20; exit; - } else if ((press == 2) && (mission == "meeting_1t")) { + } else if ((press == 1) && (mission == "meeting_1t")) { with (obj_star) { remove_star_problem("meeting"); remove_star_problem("meeting_trap"); @@ -338,9 +125,7 @@ try { obj_controller.complex_event = true; obj_controller.current_eventing = "chaos_trap"; text = $"{global.chapter_name} signal your readiness to the heretic. Nearly twenty minutes of following the man passes before {global.chapter_name} all enter an ordinary-looking structure. Down, within the basement, {global.chapter_name} then pass into the entrance of a tunnel. As the trek downward continues more and more heretics appear- cultists, renegades that appear to be from the local garrison, and occasionally even the fallen of your kind. Overall the heretics seem well supplied and equip. This observation is interrupted as your group enters into a larger chamber, revealing a network of tunnels and what appears to be ancient catacombs. Bones of the ancient dead, the forgotten, litter the walls and floor. And the chamber seems to open up wider, and wider, until {global.chapter_name} find yourself within a hall. Within this hall, waiting for {global.chapter_name}, are several dozen Chaos Terminators, a handful of Helbrute, and many more Chaos Space Marines. The Chaos Lord is nowhere to be seen. It is a trap."; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); mission = "cslord1t"; image = ""; img = 0; @@ -349,7 +134,7 @@ try { cooldown = 20; exit; } - if ((press == 3) && instance_exists(obj_turn_end)) { + if ((press == 2) && instance_exists(obj_turn_end)) { if (number != 0) { obj_turn_end.alarm[1] = 4; } @@ -363,13 +148,12 @@ try { } if (title == "Scheduled Event") { - if (option1 == "") { - option1 = "Yes!"; - option2 = "No."; + if (array_length(options) == 0) { + add_option(["Yes", "No"]); exit; } - if ((press == 1) && (!instance_exists(obj_event))) { + if ((press == 0) && (!instance_exists(obj_event))) { instance_create(0, 0, obj_event); if (obj_controller.fest_planet == 0) { obj_controller.fest_attend = scr_event_dudes(1, 0, "", obj_controller.fest_sid); @@ -382,7 +166,7 @@ try { title = "Scheduled Event:2"; exit; } - if (press == 2) { + if (press == 1) { obj_controller.fest_repeats -= 1; if (obj_controller.fest_repeats <= 0) { obj_controller.fest_scheduled = 0; @@ -440,779 +224,12 @@ try { exit; } - if ((image == "inquisition") && (loc == "contraband")) { - demand = 0; - option1 = "Hand over all Chaos and Daemonic Artifacts"; - option2 = "Over your dead body"; - var arti; - if (press == 1) { - var contraband = []; - for (var i = 0; i < array_length(obj_ini.artifact_struct); i++) { - if (obj_ini.artifact != "") { - arti = obj_ini.artifact_struct[i]; - if (arti.inquisition_disaprove()) { - array_push(contraband, i); - } - } - } - for (i = 0; i < array_length(contraband); i++) { - delete_artifact(contraband[i]); - } - obj_controller.cooldown = 10; - option1 = ""; - option2 = ""; - loc = ""; - text = $"All Chaos and Daemonic Artifacts present have been handed over to the Inquisitor. They remain seething, but your destruction has been stalled. Or so {global.chapter_name} imagine."; - exit; - } - - if (press == 2) { - obj_controller.cooldown = 10; - if (number != 0 && instance_exists(obj_turn_end)) { - obj_turn_end.alarm[1] = 4; - } - instance_destroy(); - } - } - - if ((title == "Planetary Governor Assassinated") && (option1 != "") && (cooldown <= 0)) { - if ((new_target == 0) && instance_exists(obj_temp6)) { - new_target = instance_nearest(obj_temp6.x, obj_temp6.y, obj_star); - with (obj_temp6) { - instance_destroy(); - } - } - - if (press > 0) { - var randa, randa2; - randa = roll_dice(1, 100, "high"); - randa2 = roll_dice(1, 100); - } - - if (press == 1) { - new_target.dispo[planet] = min(obj_ini.imperium_disposition, obj_controller.disposition[2]) + choose(-1, -2, -3, -4, 0, 1, 2, 3, 4); - if (randa <= 3) { - new_target.dispo[planet] = min(new_target.dispo[planet], choose(1, 2, 3, 4, 5, 6) * 3); - } - if (randa >= 95) { - new_target.dispo[planet] = max(new_target.dispo[planet], 60 + choose(1, 2, 3, 4, 5, 6) * 3); - } - scr_event_log("", "Planetary Governor of " + string(new_target.name) + " " + scr_roman(planet) + " assassinated. The next in line takes over.", new_target.name); - text = "The next in line for rule of " + string(new_target.name) + " " + scr_roman(planet) + " has taken over their rightful position of Planetary Governor."; - option1 = ""; - option2 = ""; - option3 = ""; - with (obj_ground_mission) { - instance_destroy(); - } - cooldown = 30; - exit; - } - if (press == 2) { - new_target.dispo[planet] = 70 + floor(random_range(5, 15)) + 1; - scr_event_log("", "Planetary Governor of " + string(new_target.name) + " " + scr_roman(planet) + " assassinated. A more suitable Governor is installed."); - if (randa2 <= (10 * estimate)) { - for (var i = 0; i < array_length(obj_controller.event); i++) { - if (obj_controller.event[i] == "") { - var ev = i; - break; - } - } - obj_controller.event[ev] = "governor_assassination_1|" + string(new_target.name) + "|" + string(planet) + "|"; - obj_controller.event_duration[ev] = ((choose(1, 2, 3, 4, 5, 6) + choose(1, 2, 3, 4, 5, 6)) * 6) + choose(-3, -2, -1, 0, 1, 2, 3); - } - text = "Many of the successors for " + string(new_target.name) + " " + scr_roman(planet) + " are removed or otherwise made indisposed. Your chapter ensures that the new Planetary Governor is sympathetic to your plight and more than willing to heed your advice. A powerful new ally may be in the making."; - option1 = ""; - option2 = ""; - option3 = ""; - with (obj_ground_mission) { - instance_destroy(); - } - cooldown = 30; - exit; - } - if (press == 3) { - new_target.dispo[planet] = 101; - scr_event_log("", "Planetary Governor of " + string(new_target.name) + " " + scr_roman(planet) + " assassinated. One of your Chapter Serfs take their position."); - if (randa2 <= (25 * estimate)) { - for (var i = 0; i < array_length(obj_controller.event); i++) { - if (obj_controller.event[i] == "") { - var ev = i; - break; - } - } - obj_controller.event[ev] = "governor_assassination_2|" + string(new_target.name) + "|" + string(planet) + "|"; - obj_controller.event_duration[ev] = (choose(1, 2) * 6) + choose(-3, -2, -1, 0, 1, 2, 3); - } - text = $"All of the successors for {planet_numeral_name(planet, new_target)} are removed or otherwise made indisposed. Paperwork is slightly altered. Rather than any sort of offical one of your Chapter Serfs is installed as the Planetary Governor. The planet is effectively under your control."; - if (new_target.p_first[planet] != 3) { - new_target.p_owner[planet] = 1; - } - option1 = ""; - option2 = ""; - option3 = ""; - with (obj_ground_mission) { - instance_destroy(); - } - cooldown = 30; - exit; - } - } - /* - var he;he=instance_create(argument0.x,argument0.y,obj_temp6); - var pip;pip=instance_create(0,0,obj_popup); - pip.title="Planetary Governor Assassinated"; - pip.text=txt; - - pip.option1="Allow the official successor to become Planetary Governor."; - pip.option2="Ensure that a sympathetic successor will be the one to rule."; - pip.option3="Remove all successors and install a loyal Chapter Serf."; - - // Result- this is the multiplier for the chance of discovery with the inquisition, can also be used to determine - // the new Governor disposition if they are the official successor - if (aroll<=chance){// Discovered - pip.estimate=2; - } - if (aroll>chance){// Success - pip.estimate=1; - } - */ - - if (image == "ruins_fort") { - if ((press == 1) && (obj_controller.requisition >= 1000)) { - obj_controller.requisition -= 1000; - text = "Resources have been spent on the planet to restore the fortress. The planet's defense rating has increased to 5 ("; - option1 = ""; - option2 = ""; - option3 = ""; - text += string(star_system.p_fortified[planet]) + "+"; - text += string(5 - star_system.p_fortified[planet]) + ")"; - star_system.p_fortified[planet] = max(star_system.p_fortified[planet], 5); - cooldown = 15; - exit; - } - if (press == 2) { - var req = floor(random_range(200, 500)) + 1; - image = ""; - text = "Much of the fortress is demolished in order to salvage adamantium and raw materials. The opration has yielded " + string(req) + " requisition."; - option1 = ""; - option2 = ""; - option3 = ""; - obj_controller.requisition += req; - cooldown = 15; - exit; - } - - /* - if (loot="fortress"){// Fortress - var gene,pop;gene=floor(random_range(20,40))+1;pop=instance_create(0,0,obj_popup); - pop.image="ruins_fort";pop.title="Ancient Ruins: Fortress"; - pop.text="Your battle brothers have found a massive, ancient fortress that has fallen into disrepair. Gun batteries rusted, and walls covered in moss and undergrowth, it is a pale shadow of its former glory. It is possible to repair the structure. What is thy will?"; - pop.option1="Repair the fortress to boost planet defenses. (1000 Req)"; - pop.option2="Salvage raw materials from the fortress."; - } - */ - } - - if (image == "mechanicus" && (title == "Mechanicus Mission" || title == "Mechanicus Mission Accepted")){ - mechanicus_mission_procedures(); - } - - if (image == "geneseed_lab") { - if (press == 1) { - image = ""; - text = string(estimate) + " gene-seed has been added to the chapter vaults."; - option1 = ""; - option2 = ""; - option3 = ""; - obj_controller.gene_seed += estimate; - with (obj_ground_mission) { - instance_destroy(); - } - cooldown = 15; - exit; - } - if (press == 2) { - var req; - req = floor(random_range(200, 500)) + 1; - image = ""; - text = "Technological components have been salvaged, granting " + string(req) + " requisition."; - option1 = ""; - option2 = ""; - option3 = ""; - obj_controller.requisition += req; - with (obj_ground_mission) { - instance_destroy(); - } - cooldown = 15; - exit; - } - if (press == 3) { - with (obj_ground_mission) { - instance_destroy(); - } - obj_controller.cooldown = 15; - cooldown = 15; - instance_destroy(); - exit; - } - } - - if (image == "ancient_ruins" && woopwoopwoop && move_to_next_stage()) { - instance_deactivate_all(true); - instance_activate_object(obj_ground_mission); - instance_activate_object(obj_popup); - var _explore_feature = obj_ground_mission.explore_feature; - _explore_feature.suprise_attack(); - woopwoopwoop = 0; - instance_destroy(self.id); - instance_destroy(); - exit; - } else if (image == "ancient_ruins" && option1 != "" && instance_exists(obj_ground_mission)) { - if (press == 1) { - // Begin - var _ruins = obj_ground_mission.explore_feature; - var ruins_battle = 0, ruins_fact = 0, ruins_disp = 0, ruins_reward = 0, dice, battle_threat = 0; - - _ruins.determine_race(); - - dice = roll_dice(1, 100, "high"); - ruins_battle = dice <= 50; - - // ruins_battle=1; - - if (ruins_battle == 1) { - dice = roll_dice(1, 100, "low"); - - if (dice >= 0 && dice <= 60) { - battle_threat = 1; - } else if (dice > 60 && dice <= 90) { - battle_threat = 2; - } else if (dice < 99) { - battle_threat = 3; - } else { - battle_threat = 4; - } - - switch (_ruins.ruins_race) { - case eFACTION.Player: - case eFACTION.Imperium: - case eFACTION.Chaos: - ruins_battle = choose(10, 10, 10, 10, 11, 11, 12); - break; - case eFACTION.Ecclesiarchy: - ruins_battle = 10; - break; - case eFACTION.Eldar: - ruins_battle = choose(6, 6, 10, 10, 10, 12); - break; - default: - ruins_battle = choose(6, 10, 12); - break; - } - - obj_ground_mission.ruins_race = _ruins.ruins_race; - obj_ground_mission.ruins_battle = ruins_battle; - obj_ground_mission.battle_threat = battle_threat; - - option1 = ""; - option2 = ""; - option3 = ""; - text = "Your marines descended into the ancient ruins, mapping them out as they go. They quickly determine the ruins were once "; - switch (_ruins.ruins_race) { - case eFACTION.Player: - text += "a Space Marine fortification from earlier times."; - break; - case eFACTION.Imperium: - text += "golden-age Imperial ruins, lost to time."; - break; - case eFACTION.Ecclesiarchy: - text += "a magnificent temple of the Imperial Cult."; - break; - case eFACTION.Eldar: - text += "Eldar colonization structures from an unknown time."; - break; - case eFACTION.Chaos: - text += "golden-age Imperial ruins, since decorated with spikes and bones."; - break; - } - - if (_ruins.failed_exploration == 1) { - text += $"{global.chapter_name} see the scarring in the walls and round impacts where your brothers died to clense this place of it's foul inhabitants"; - } - text += " Unfortunantly, it's too late before your Battle Brothers discern the ruins are still inhabited. Shapes begin to descend upon them from all directions, masked in the shadows."; - - cooldown = 15; - woopwoopwoop = 1; - exit; - } else { - var obj = obj_ground_mission.obj; - instance_activate_object(obj_star); - scr_ruins_reward(star_by_name(obj_ground_mission.battle_loc), obj_ground_mission.num, obj_ground_mission.explore_feature); - instance_destroy(); - exit; - } - } - if (press == 2) { - // Nothing - obj_controller.cooldown = 10; - obj_controller.menu = 1; - // obj_controller.managing=manag; - with (obj_controller) { - scr_ui_refresh() - update_general_manage_view(); - } - with (obj_ground_mission) { - instance_destroy(); - } - instance_destroy(); - exit; - } - if (press == 3) { - // Return to ship, exit - scr_return_ship(obj_ini.ship[obj_ground_mission.ship_id], obj_ground_mission, obj_ground_mission.num); - var man_size, ship_id, comp, plan, i; - ship_id = 0; - man_size = 0; - comp = 0; - plan = 0; - ship_id = obj_ground_mission.ship_id; - obj_controller.menu = 0; - obj_controller.managing = 0; - obj_controller.cooldown = 10; - with (obj_ground_mission) { - instance_destroy(); - } - instance_destroy(); - exit; - } - } - - if (image == "stc") { - if ((ma_co > 0) && (ma_id == 0)) { - if (press == 1) { - obj_ground_mission.alarm[5] = 1; - obj_controller.cooldown = 10; - instance_destroy(); - } - if (press == 2) { - scr_return_ship(obj_ground_mission.loc, obj_ground_mission, obj_ground_mission.num); - var man_size, ship_id, comp, plan, i; - ship_id = 0; - man_size = 0; - comp = 0; - plan = 0; - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); - obj_controller.menu = 0; - obj_controller.managing = 0; - obj_controller.cooldown = 10; - with (obj_ground_mission) { - instance_destroy(); - } - instance_destroy(); - exit; - } - if (press == 3) { - exit; - } - } else if ((ma_co > 0) && (ma_id > 0)) { - if (press == 1) { - obj_ground_mission.alarm[5] = 1; - obj_controller.cooldown = 10; - instance_destroy(); - } - if (press == 2) { - scr_return_ship(obj_ground_mission.loc, obj_ground_mission, obj_ground_mission.num); - var man_size, ship_id, comp, plan, i; - i = 0; - ship_id = 0; - man_size = 0; - comp = 0; - plan = 0; - - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); - - obj_controller.menu = 0; - obj_controller.managing = 0; - obj_controller.cooldown = 10; - with (obj_ground_mission) { - instance_destroy(); - } - instance_destroy(); - exit; - } - if (press == 3) { - obj_ground_mission.alarm[6] = 1; - obj_controller.cooldown = 10; - instance_destroy(); - } - } else if ((ma_co == 0) && (ma_id > 0) && (target_comp != 3)) { - if (press == 1) { - scr_return_ship(obj_ground_mission.loc, obj_ground_mission, obj_ground_mission.num); - var man_size, ship_id, comp, plan, i; - i = 0; - ship_id = 0; - man_size = 0; - comp = 0; - plan = 0; - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); - obj_controller.menu = 0; - obj_controller.managing = 0; - obj_controller.cooldown = 10; - with (obj_ground_mission) { - instance_destroy(); - } - instance_destroy(); - exit; - } - if (press == 2) { - obj_ground_mission.alarm[6] = 1; - obj_controller.cooldown = 10; - instance_destroy(); - } - if (press == 3) { - exit; - } - } - if ((ma_id > 0) && (target_comp == 3)) { - if (press == 1) { - scr_return_ship(obj_ground_mission.loc, obj_ground_mission, obj_ground_mission.num); - var man_size, ship_id, comp, plan, i; - i = 0; - ship_id = 0; - man_size = 0; - comp = 0; - plan = 0; - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); - obj_controller.menu = 0; - obj_controller.managing = 0; - obj_controller.cooldown = 10; - with (obj_ground_mission) { - instance_destroy(); - } - instance_destroy(); - exit; - } - if (press == 2) { - exit; - } - if (press == 3) { - exit; - } - } - } - - if (type == 6) { - // Equipment - if (target_comp == 1) { - target_role = sel1; - } - if (target_comp == 2) { - target_role = sel2; - } - if (target_comp == 3) { - target_role = sel3; - } - if (target_comp == 4) { - target_role = sel4; - } - if (target_comp == 5) { - target_role = sel5; - } - } - - if (image == "gene_bad") { - option1 = "Dispose of "; - if (obj_controller.gene_seed <= 30) { - option1 += "100% of the gene-seed."; - } - if ((obj_controller.gene_seed > 30) && (obj_controller.gene_seed < 60)) { - option1 += "50% of all gene-seed."; - } - if (obj_controller.gene_seed >= 60) { - option1 += "33% of all gene-seed."; - } - option2 = "Tell the apothecaries to let it be."; - option3 = ""; - } - - if (((title == "Inquisition Mission") || (title == "Inquisition Recon")) && (option1 == "")) { - option1 = "Accept"; - option2 = "Refuse"; + else if (((title == "Inquisition Mission") || (title == "Inquisition Recon")) && (array_length(options) == 0)) { + add_option(["Accept", "Refuse"], true); } - if (title == "Inquisitor Located") { - option1 = "Destroy their vessel"; - option2 = "Hear them out"; - } - if (title == "Necron Tomb Excursion") { - option1 = "Begin the Mission"; - option2 = "Not Yet"; - } - if (title == "Necron Tunnels : 1") { - option1 = "Continue"; - option2 = "Return to the surface"; - } - if (title == "Necron Tunnels : 2") { - option1 = "Continue"; - option2 = "Return to the surface"; - } - if (title == "Necron Tunnels : 3") { - option1 = "Continue"; - option2 = "Return to the surface"; - } - - if ((title == "He Built It") && (option1 == "") && (string_count("submerged", text) == 0)) { - option1 = "Execute the heretic"; - option2 = "Move him to the Penitorium"; - option3 = "I see no problem"; - } - - if ((press == 1) && (option1 != "") || ((demand == 1) && (mission != "") && (string_count("Inquisition", title) > 0)) || ((demand == 1) && (title == "Inquisition Recon"))) { - if (image == "gene_bad") { - var onceh; - onceh = 0; - if ((obj_controller.gene_seed <= 30) && (onceh == 0)) { - obj_controller.gene_seed = 0; - } - if ((obj_controller.gene_seed > 30) && (obj_controller.gene_seed < 60) && (onceh == 0)) { - obj_controller.gene_seed = round(obj_controller.gene_seed * 0.5); - } - if ((obj_controller.gene_seed >= 60) && (onceh == 0)) { - obj_controller.gene_seed = round(obj_controller.gene_seed * 0.66); - } - } - if ((title == "Inquisitor Located") || (title == "Artifact Offered") || (title == "Mercy Plea")) { - with (obj_en_fleet) { - if ((trade_goods == "male_her") || (trade_goods == "female_her")) { - instance_destroy(); - } - } - - if (obj_controller.demanding == 0) { - obj_controller.disposition[4] += 1; - } - if (obj_controller.demanding == 1) { - obj_controller.disposition[4] += choose(0, 0, 1); - } - - if ((title == "Artifact Offered") || (title == "Mercy Plea")) { - obj_controller.disposition[4] -= choose(0, 1); - } - - title = "Inquisition Mission Completed"; - image = "exploding_ship"; - text = "The Inquisitor's ship begans to bank and turn, to flee, but is immediately fired upon by your fleet. The ship explodes, taking the Inquisitor with it. The mission has been accomplished."; - option1 = ""; - option2 = ""; - option3 = ""; - - scr_event_log("", "Inquisition Mission Completed: The radical Inquisitor has been purged."); - - exit; - } - if (title == "He Built It") { - scr_kill_unit(ma_co, ma_id); - var company_to_order = ma_co; - with (obj_ini) { - scr_company_order(company_to_order); - } - } - - if (title == "Necron Tomb Excursion") { - instance_activate_all(); - var player_forces, penalty, roll; - player_forces = 0; - penalty = 0; - roll = floor(random(100)) + 1; - with (obj_star) { - if (name != obj_popup.loc) { - instance_deactivate_object(id); - } - } - if (!instance_exists(obj_temp8)) { - instance_create(obj_star.x, obj_star.y, obj_temp8); - } - player_forces = obj_star.p_player[planet]; - instance_activate_object(obj_star); - cooldown = 30; - - obj_temp8.stage += 1; - obj_temp8.loc = loc; - obj_temp8.wid = planet; - - title = $"Necron Tunnels : {obj_temp8.stage}"; - if (obj_temp8.stage == 1) { - image = "necron_tunnels_1"; - text = "Your marines enter the massive tunnel complex, following the energy readings. At first the walls are cramped and tiny, closing about them, but the tunnels widen at a rapid pace."; - option1 = "Continue"; - option2 = "Return to the surface"; - } - exit; - } - - if (string_count("Necron Tunnels", title) > 0 && instance_exists(obj_temp8)) { - var player_forces, penalty, roll, battle; - player_forces = 0; - penalty = 0; - roll = floor(random(100)) + 1; - battle = 0; - instance_activate_all(); - var mission_star = star_by_name(obj_temp8.loc); - - player_forces = obj_star.p_player[obj_temp8.wid]; - - obj_temp8.popup = obj_turn_end.current_popup; - - // SMALL TEAM OF MARINES - if (player_forces > 6) { - penalty = 10; - } - if (player_forces > 10) { - penalty = 20; - } - if (player_forces >= 20) { - penalty = 30; - } - if (player_forces >= 40) { - penalty = 50; - } - if (player_forces >= 60) { - penalty = 100; - } - roll += penalty; - - // roll=30;if (string_count("3",title)>0) then roll=70; - - // Result - if (roll <= 60) { - obj_temp8.stage += 1; - title = $"Necron Tunnels : {obj_temp8.stage}"; - - if (obj_temp8.stage == 2) { - image = "necron_tunnels_2"; - text = "The energy readings are much stronger, now that your marines are deep inside the tunnels. What was once cramped is now luxuriously large, the tunnel ceiling far overhead decorated by stalactites."; - } else if (obj_temp8.stage == 3) { - image = "necron_tunnels_3"; - text = "After several hours of descent the entrance to the Necron Tomb finally looms ahead- dancing, sickly green light shining free. Your marine confirms that the Plasma Bomb is ready."; - } else if (obj_temp8.stage >= 4) { - image = ""; - title = "Inquisition Mission Completed"; - text = "Your marines finally enter the deepest catacombs of the Necron Tomb. There they place the Plasma Bomb and arm it. All around are signs of increasing Necron activity. With half an hour set, your men escape back to the surface. There is a brief rumble as the charge goes off, your mission a success."; - option1 = ""; - option2 = ""; - option3 = ""; - - if (obj_controller.demanding == 0) { - obj_controller.disposition[4] += 1; - } - if (obj_controller.demanding == 1) { - obj_controller.disposition[4] += choose(0, 0, 1); - } - - instance_activate_object(obj_star); - mission_star = star_by_name(obj_temp8.loc); - var ppp = 0; - remove_planet_problem(planet, "necron", mission_star); - seal_tomb_world(mission_star.p_feature[planet]); - // mission_star.p_feature[planet][search_planet_features(mission_star.p_feature[planet], P_features.Necron_Tomb)[0]].sealed = 1; - with (obj_temp8) { - instance_destroy(); - } - instance_activate_object(obj_star); - - scr_event_log("", $"Inquisition Mission Completed: Your Astartes have sealed the Necron Tomb on {mission_star.name} {scr_roman(planet)}.", mission_star.name); - scr_gov_disp(mission_star.name, planet, choose(3, 4, 5, 6, 7)); - var have_bomb = scr_check_equip("Plasma Bomb", self.loc, self.planet, 1); - exit; - } - } - if ((roll > 60) && (roll <= 82)) { - // Necron Wraith attack - battle = 1; - } - if ((roll > 82) && (roll <= 92)) { - // Tomb Spyder attack - battle = 2; - } - if ((roll > 92) && (roll <= 97)) { - // Tomb Stalker - battle = 3; - } - if (roll > 97) { - // Tomb World wakes up - if (player_forces <= 30) { - battle = 4; - } - if (player_forces > 30) { - battle = 5; - } - if (player_forces > 100) { - battle = 6; - } - } - - if (battle > 0) { - var that_one; - instance_deactivate_all(true); - instance_activate_object(obj_controller); - instance_activate_object(obj_ini); - instance_activate_object(obj_temp8); - - instance_create(0, 0, obj_ncombat); - _roster = new Roster(); - with (_roster){ - roster_location = obj_temp8.loc; - roster_planet = obj_temp8.wid; - determine_full_roster(); - only_locals(); - update_roster(); - if (array_length(selected_units)){ - setup_battle_formations(); - add_to_battle(); - } - } - delete _roster - - - instance_activate_object(obj_star); - with (obj_star) { - if (name != obj_temp8.loc) { - instance_deactivate_object(id); - } - } - - that_one = instance_nearest(0, 0, obj_star); - instance_activate_object(obj_star); - obj_ncombat.battle_object = that_one; - instance_deactivate_object(obj_star); - obj_ncombat.battle_loc = loc; - obj_ncombat.battle_id = planet; - obj_ncombat.dropping = 0; - obj_ncombat.attacking = 0; - obj_ncombat.enemy = 13; - obj_ncombat.threat = 1; - obj_ncombat.formation_set = 1; - - if (battle == 1) { - obj_ncombat.battle_special = "wraith_attack"; - } else if (battle == 2) { - obj_ncombat.battle_special = "spyder_attack"; - } else if (battle == 3) { - obj_ncombat.battle_special = "stalker_attack"; - } else if (battle == 4) { - obj_ncombat.battle_special = "wake1_attack"; - } else if (battle == 5) { - obj_ncombat.battle_special = "wake2_attack"; - } else if (battle == 6) { - obj_ncombat.battle_special = "wake2_attack"; - } - instance_destroy(); - } - - exit; - } + if ((press == 0) && (array_length(options)) || ((demand == 1) && (mission != "") && (string_count("Inquisition", title) > 0)) || ((demand == 1) && (title == "Inquisition Recon"))) { if (title == "Inquisition Recon") { var mission_star, onceh; @@ -1236,7 +253,7 @@ try { onceh = 0; var mission_star = star_by_name(obj_controller.temp[200]); var mission_is_go = false; - if (mission_star != "none") { + if (mission_star != "none" && planet > 0) { var _estimate = estimate; var _planet = planet; var _mission = mission; @@ -1263,40 +280,13 @@ try { if (demand) { text = $"The Inquisition demands that your Chapter demonstrate its loyalty to the Imperium of Mankind and the Emperor. {global.chapter_name} are to cleanse by fire the mutants in Hive {planet_numeral_name(planet, mission_star)} within {estimate} months."; } - } else if (mission == "inquisitor") { - scr_event_log("", $"Inquisition Mission Accepted: A radical Inquisitor enroute to {mission_star.name} must be removed. Estimated arrival in {estimate} months.", mission_star.name); - if (demand) { - text = $"The Inquisition demands that your Chapter demonstrate its loyalty to the Imperium of Mankind and the Emperor. A radical inquisitor is enroute to {mission_star.name}, expected within {estimate} months. They are to be silenced and removed."; - } } - if (mission == "spyrer") { scr_event_log("", $"Inquisition Mission Accepted: The Spyrer on {mission_star.name} {scr_roman(planet)} must be killed within {estimate} months.", mission_star.name); if (demand) { text = $"The Inquisition demands that your Chapter demonstrate its loyalty to the Imperium of Mankind and the Emperor. An out of control Spyrer on Hive {mission_star.name} {scr_roman(onceh)} must be removed within {estimate} months."; } - } else if (mission == "necron") { - scr_event_log("", $"Inquisition Mission Accepted: {global.chapter_name} have been given a Bomb to seal the Necron Tomb on {mission_star.name} {scr_roman(planet)}.", mission_star.name); - - image = "necron_cave"; - title = "New Equipment"; - fancy_title = 0; - text_center = 0; - text = $"{global.chapter_name} have been provided with 1x Plasma Bomb in order to complete the mission."; - - if (demand) { - text = $"The Inquisition demands that your Chapter demonstrate its loyalty. {global.chapter_name} have been given a Plasma Bomb to seal the Necron Tomb on {mission_star.name} {scr_roman(onceh)}. It is expected to be completed within {estimate} months."; - } - option1 = ""; - option2 = ""; - option3 = ""; - scr_add_item("Plasma Bomb", 1); - obj_controller.cooldown = 10; - if (demand) { - demand = 0; - } - exit; - } else if (mission == "tyranid_org") { + } else if (mission == "tyranid_org") { image = "webber"; title = "New Equipment"; fancy_title = 0; @@ -1307,9 +297,7 @@ try { text = $"The Inquisition demands that your Chapter demonstrate its loyalty to the Imperium of Mankind and the Emperor. {global.chapter_name} are to capture a Gaunt organism and return it, unharmed- 4x Webbers have been provided for this purpose."; } - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); scr_add_item("Webber", 4); obj_controller.cooldown = 10; scr_event_log("", $"Inquisition Mission Accepted: The Inquisition wishes for the capture of a particular strain Gaunt noticed on {mission_star.name} {scr_roman(planet)} is advisable.", mission_star.name); @@ -1379,9 +367,7 @@ try { scr_event_log("", "Inquisition Mission Accepted: The Inquisition has left an Artifact in your care."); text += $" It is some form of {obj_ini.artifact[last_artifact]}."; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); obj_controller.cooldown = 10; exit; } @@ -1389,9 +375,7 @@ try { if (demand) { demand = 0; - option1 = ""; - option2 = ""; - option3 = ""; + reset_popup_options(); exit; } // Remove multi-choices } @@ -1401,29 +385,8 @@ try { instance_destroy(); } - if (image == "artifact") { - if (target_comp == 2) { - obj_ground_mission.alarm[3] = 1; - } - if ((target_comp > 2) && (target_comp != 7) && (target_comp < 9)) { - obj_controller.menu = 20; - obj_controller.cooldown = 10; - obj_controller.diplomacy = target_comp; - obj_controller.trading_artifact = 1; - with (obj_controller) { - scr_dialogue("artifact"); - } - instance_destroy(); - } - if ((target_comp == 7) || (target_comp >= 9)) { - obj_ground_mission.alarm[4] = 1; - obj_controller.cooldown = 10; - instance_destroy(); - } - } - if (image == "artifact2") { - obj_ground_mission.alarm[4] = 1; + ground_forces_collect_artifact(); obj_controller.cooldown = 10; instance_destroy(); } @@ -1437,10 +400,7 @@ try { } } - if ((press == 2) && (option2 != "")) { - if (image == "gene_bad") { - scr_loyalty("Mutant Gene-Seed", "+"); - } + if ((press == 1) && (option2 != "")) { if (mission == "spyrer") { obj_controller.disposition[4] -= 2; @@ -1455,40 +415,6 @@ try { instance_destroy(); } - if (title == "Artifact Offered") { - with (obj_en_fleet) { - if ((trade_goods == "male_her") || (trade_goods == "female_her")) { - instance_destroy(); - } - } - if (obj_ini.fleet_type != ePlayerBase.home_world) { - var last_artifact = scr_add_artifact("random", "", 4, obj_ini.ship[0], 501); - } - if (obj_ini.fleet_type == ePlayerBase.home_world) { - var last_artifact = scr_add_artifact("random", "", 4, obj_ini.home_name, 2); - } - option1 = ""; - option2 = ""; - option3 = ""; - title = "Inquisition Mission Completed"; - text = "Your ship sends over a boarding party, who retrieve the offered artifact- "; - text += $" some form of {obj_ini.artifact[last_artifact]}. Once it is safely stowed away your ship is then ordered to fire. The Inquisitor's own seems to hesitate an instant before banking away, but is quickly destroyed."; - image = "exploding_ship"; - option1 = ""; - option2 = ""; - option3 = ""; - scr_event_log("", "Artifact recovered from radical Inquisitor."); - scr_event_log("", "Inquisition Mission Completed: The radical Inquisitor has been purged."); - exit; - } - - if (title == "He Built It") { - obj_ini.god[ma_co, ma_id] += 10; - option1 = ""; - option2 = ""; - option3 = ""; - } - if (title == "Mercy Plea") { // If have any marines within the fleet on the ships @@ -1502,101 +428,6 @@ try { exit; } - if (title == "Inquisitor Located") { - var offer, gender, gender2; - offer = choose(1, 1, 2, 2, 3); - if (planet == 1) { - gender = "he"; - } - if (planet == 2) { - gender = "she"; - } - if (planet == 1) { - gender2 = "his"; - } - if (planet == 2) { - gender2 = "her"; - } - - if (offer == 1) { - title = "Artifact Offered"; - text = "The Inquisitor claims that this is a massive misunderstanding, and " + string(gender) + " wishes to prove " + string(gender2) + $" innocence. If {global.chapter_name} allow their ship to leave " + string(gender) + $" will give {global.chapter_name} an artifact."; - option1 = "Destroy their vessel"; - option2 = "Take the artifact and then destroy them"; - option3 = "Take the artifact and spare them"; - exit; - } - - if (offer == 2) { - title = "Mercy Plea"; - text = "The Inquisitor claims that " + string(gender) + $" has key knowledge that would grant the Imperium vital power over the forces of Chaos. If {global.chapter_name} allow " + string(gender2) + " ship to leave the forces of Chaos within this sector will be weakened."; - option1 = "Destroy their vessel"; - option2 = "Search their ship"; - option3 = "Spare them"; - exit; - } - - if (offer == 3) { - var gender2; - if (planet == 1) { - gender2 = "his"; - } - if (planet == 2) { - gender2 = "her"; - } - with (obj_en_fleet) { - if ((trade_goods == "male_her") || (trade_goods == "female_her")) { - with (obj_p_fleet) { - if (action != "") { - instance_deactivate_object(id); - } - } - with (instance_nearest(x, y, obj_p_fleet)) { - scr_add_corruption(true, "1d3"); - } - instance_activate_object(obj_p_fleet); - instance_destroy(); - } - } - title = "Inquisition Mission Completed"; - image = "exploding_ship"; - text = $"{global.chapter_name} allow communications. As soon as the vox turns on {global.chapter_name} hear a sickly, hateful voice. They begin to speak of the inevitable death of your marines, the fall of all that is and ever shall be, and " + string(gender2) + " Lord of Decay. Their ship is fired upon and destroyed without hesitation."; - option1 = ""; - option2 = ""; - option3 = ""; - scr_event_log("", "Inquisition Mission Completed: The radical Inquisitor has been purged."); - exit; - } - exit; - } - - if (image == "artifact") { - if ((target_comp != 7) && (target_comp < 9)) { - obj_ground_mission.alarm[4] = 1; - obj_controller.cooldown = 10; - instance_destroy(); - } - if ((target_comp >= 9) || (target_comp == 7)) { - // NOPE - scr_return_ship(obj_ground_mission.loc, obj_ground_mission, obj_ground_mission.num); - var man_size, ship_id, comp, plan, i; - i = 0; - ship_id = 0; - man_size = 0; - comp = 0; - plan = 0; - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); - obj_controller.menu = 0; - obj_controller.managing = 0; - obj_controller.cooldown = 10; - with (obj_ground_mission) { - instance_destroy(); - } - instance_destroy(); - exit; - } - } - if (image == "artifact2") { scr_return_ship(obj_ground_mission.loc, obj_ground_mission, obj_ground_mission.num); var man_size, ship_id, comp, plan, i; @@ -1625,385 +456,13 @@ try { instance_destroy(); } } - - if ((press == 3) && (option3 != "")) { - if (title == "Artifact Offered") { - with (obj_en_fleet) { - if ((trade_goods == "male_her") || (trade_goods == "female_her")) { - action_x = choose(room_width * -1, room_width * 2); - action_y = choose(room_height * -1, room_height * 2); - alarm[4] = 1; - trade_goods = "|DELETE|"; - action_spd = 256; - action = ""; - } - } - if (obj_ini.fleet_type != ePlayerBase.home_world) { - var last_artifact = scr_add_artifact("random", "", 4, obj_ini.ship[0], 501); - } - if (obj_ini.fleet_type == ePlayerBase.home_world) { - var last_artifact = scr_add_artifact("random", "", 4, obj_ini.home_name, 2); - } - option1 = ""; - option2 = ""; - option3 = ""; - title = "Inquisition Mission Completed"; - text = "Your ship sends over a boarding party, who retrieve the offered artifact- "; - text += $" some form of {obj_ini.artifact[last_artifact]}. As promised {global.chapter_name} allow the Inquisitor to leave, hoping for the best. What's the worst that could happen?"; - image = "artifact_recovered"; - option1 = ""; - option2 = ""; - option3 = ""; - scr_event_log("", "Artifact Recovered from radical Inquisitor."); - scr_event_log("", "Inquisition Mission Completed: The radical Inquisitor has been purged."); - - for (var i = 0; i < array_length(obj_controller.event); i++) { - if (obj_controller.event[i] == "") { - var ev = i; - break; - } - } - obj_controller.event[ev] = "inquisitor_spared1"; - obj_controller.event_duration[ev] = floor(random_range(6, 18)) + 1; - - exit; - } - if (title == "Mercy Plea") { - with (obj_en_fleet) { - if ((trade_goods == "male_her") || (trade_goods == "female_her")) { - action_x = choose(room_width * -1, room_width * 2); - action_y = choose(room_height * -1, room_height * 2); - trade_goods = "|DELETE|"; - alarm[4] = 1; - action_spd = 256; - action = ""; - } - } - title = "Inquisition Mission Completed"; - text = $"{global.chapter_name} allow the Inquisitor to leave, trusting in their words. If they truly do have key information it is a risk {global.chapter_name} are willing to take. What's the worst that could happen?"; - image = "artifact_recovered"; - option1 = ""; - option2 = ""; - option3 = ""; - - scr_event_log("", "Inquisition Mission Completed?: The radical Inquisitor has been allowed to flee in order to weaken the forces of Chaos, as they promised."); - - for (var i = 0; i < array_length(obj_controller.event); i++) { - if (obj_controller.event[i] == "") { - var ev = i; - break; - } - } - obj_controller.event[ev] = "inquisitor_spared2"; - obj_controller.event_duration[ev] = floor(random_range(6, 18)) + 1; - - exit; - } else if (image == "artifact") { - if ((target_comp < 9) && (target_comp != 7)) { - // This returns the marines to the ship - scr_return_ship(obj_ground_mission.loc, obj_ground_mission, obj_ground_mission.num); - var man_size, ship_id, comp, plan, i; - i = 0; - ship_id = 0; - man_size = 0; - comp = 0; - plan = 0; - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); - } - - if ((target_comp != 3) && (target_comp != 4)) { - // Here, have this gift - var plan = instance_nearest(obj_ground_mission.x, obj_ground_mission.y, obj_star); - var planet_arti = search_planet_features(plan.p_feature[obj_ground_mission.num], P_features.Artifact); - if (array_length(planet_arti) > 0) { - array_delete(plan.p_feature[obj_ground_mission.num], planet_arti[0], 1); - } - - scr_return_ship(obj_ground_mission.loc, obj_ground_mission, obj_ground_mission.num); - var man_size, ship_id, comp, plan, i; - i = 0; - ship_id = 0; - man_size = 0; - comp = 0; - plan = 0; - ship_id = array_get_index(obj_ini.ship, obj_ground_mission.loc); - obj_controller.menu = 0; - obj_controller.managing = 0; - obj_controller.cooldown = 10; - - // Set disposition - // 135 - - obj_controller.menu = 20; - obj_controller.cooldown = 10; - obj_controller.diplomacy = target_comp; - with (obj_controller) { - scr_dialogue("artifact_thanks"); - } - obj_controller.force_goodbye = 2; - obj_controller.exit_all = 1; - - // 135 - /*there should be a chance for things to go terribly wrong when mission_star give a gift - - Imperium: if chaos, increase the global corruption of imperial planets a bit? - Imperium: if daemonic, the commander goes chaos after a few turns? - Mechanicus: if daemonic vastly increases corruption on forge worlds? - Ecclesiarchy: if daemonic they get really pissed at mission_star? - Eldar: if daemonic they get really pissed at mission_star? - Tau: if daemonic all their worlds get big corruption boosts?*/ - - with (obj_ground_mission) { - instance_destroy(); - } - instance_destroy(); - exit; - } - - if ((target_comp == 3) || (target_comp == 4)) { - // Not worth it, mang - obj_controller.menu = 0; - obj_controller.managing = 0; - obj_controller.cooldown = 10; - with (obj_ground_mission) { - instance_destroy(); - } - instance_destroy(); - } - } - - obj_controller.cooldown = 10; - if (obj_controller.complex_event == false) { - if (number != 0 && instance_exists(obj_turn_end)) { - obj_turn_end.alarm[1] = 4; - } - instance_destroy(); - } - } - if (image == "new_forge_master") { - if (pathway == "") { - obj_controller.complex_event = true; - techs = collect_role_group(SPECIALISTS_TECHS); - charisma_pick = 0; - experience_pick = 0; - talent_pick = 0; - for (i = 1; i < array_length(techs); i++) { - if (techs[charisma_pick].charisma < techs[i].charisma) { - charisma_pick = i; - } - if (techs[experience_pick].experience < techs[i].experience) { - experience_pick = i; - } - if (techs[talent_pick].technology < techs[i].technology) { - talent_pick = i; - } - } - pathway = "selection_options"; - option1 = "Popular Pick"; - option2 = "Talent Pick"; - option3 = "Experience Pick"; - } else if (pathway == "selection_options") { - if (press > 0) { - var cur_tech; - var skill_lack = 0; - var exp_lack = 0; - var dislike = 0; - var popularity_lack = 0; - var pick = "none"; - var charisma_test = 0; - if (press > 0 && press < 4) { - if (press == 1) { - pick = techs[charisma_pick]; - } else if (press == 2) { - pick = techs[talent_pick]; - } else if (press == 3) { - pick = techs[experience_pick]; - } - for (i = 0; i < array_length(techs); i++) { - if (i == charisma_pick) { - continue; - } - cur_tech = techs[i]; - charisma_test = global.character_tester.oppposed_test(pick, cur_tech, "charisma", 10); - if (charisma_test[0] != 1) { - if (pick.technology < cur_tech.technology) { - skill_lack++; - cur_tech.loyalty -= cur_tech.technology - pick.technology; - } - if (pick.experience < cur_tech.experience) { - exp_lack++; - cur_tech.loyalty -= floor((cur_tech.experience - pick.experience) / 200); - } - if (charisma_test[0] == 2) { - dislike++; - cur_tech.loyalty -= charisma_test[1]; - } - } - } - } - if (pick != "none") { - pick.update_role("Forge Master"); - - var likability; - if (dislike <= 5) { - likability = "He is generally well liked"; - } - if (dislike > 5) { - likability = "He is not generally well liked"; - } - if (dislike > 10) { - likability = "He mostly disliked"; - } - if (dislike == 0) { - likability = "He is like by all of his tech brothers"; - } - text = $"{pick.name()} is selected as the new {pick.role()} {likability}."; - if (skill_lack > 0 && skill_lack < 6) { - text += "There are some questions about his ability."; - } else if (skill_lack > 6) { - text += "Many Question his Technical Talents."; - } - if (exp_lack > 0 && exp_lack < 6) { - text += "A few have raised questions over his experience."; - } else if (exp_lack >= 6) { - text += "There have been Many concerns over his experience."; - } - if (popularity_lack > 1 && popularity_lack < 6) { - text += "He is not unanimously liked."; - } else if (popularity_lack >= 6) { - text += "He is disliked by many."; - } - var lacks = skill_lack + exp_lack + popularity_lack; - if (lacks < ((array_length(techs) - 1) / 10)) { - text += "Your choice Is almost unanimously respected"; - } else if (lacks < ((array_length(techs) - 1) / 4)) { - text += "While a few may have preferred another there are no serious concerns"; - } else if (lacks < ((array_length(techs) - 1) / 2)) { - text += "Your supporters are more than our detractors but many are unhappy"; - } else if (lacks < ((array_length(techs) - 1) * 0.65)) { - text += "Most are unhappy with the decision but your word is final"; - } - reset_options(); - press = 0; - pathway = "end_splash"; - if (pick.company > 0) { - for (var i = 1; i < 500; i++) { - if (obj_ini.name[0][i] == "") { - break; - } - } - scr_move_unit_info(pick.company, 0, pick.marine_number, i); - } - } - } - } - } else if (image == "tech_uprising") { - if (pathway == "") { - obj_controller.complex_event = true; - pathway = "heretic_choice"; - option1 = "Do Nothing"; - option2 = "Support the heretics"; - option3 = "Support the Cult mechanicus faithfuls"; - } else if (pathway == "heretic_choice") { - if (press > 0) { - pathway = "tech_aftermath"; - } - } - if (pathway == "tech_aftermath") { - var tech, t, i, check_tech, location_techs, location_heretics, delete_positions, heretic_data = [0, 0, 0], loyal_data = [0, 0, 0]; - techs = collect_role_group(SPECIALISTS_TECHS); - var tech_count = array_length(techs); - for (i = 0; i < tech_count; i++) { - delete_positions = []; - location_techs = []; - location_heretics = []; - tech = techs[i]; - if (tech.has_trait("tech_heretic")) { - array_push(location_heretics, tech); - } else { - array_push(location_techs, tech); - } - //loop techs to fins out which techs are in the same location - for (t = i + 1; t < tech_count; t++) { - check_tech = techs[t].marine_location(); - if (same_locations(tech.marine_location(), check_tech)) { - if (techs[t].has_trait("tech_heretic")) { - array_push(location_heretics, techs[t]); - heretic_data[0] += techs[t].weapon_skill; - heretic_data[1] += techs[t].wisdom; - heretic_data[2] += techs[t].ballistic_skill; - } else { - array_push(location_techs, techs[t]); - loyal_data[0] += techs[t].weapon_skill; - loyal_data[1] += techs[t].wisdom; - loyal_data[2] += techs[t].ballistic_skill; - } - array_push(delete_positions, t); - } - } - if (array_length(location_heretics) > 0 && array_length(location_techs) > 0) { - var purge_target = "none"; - if (press == 1) { - var tal; - var heretic_tally = 0; - var loyal_tally = 0; - for (tal = 0; tal < 3; tal++) { - if (heretic_data[tal] > loyal_data[0]) { - heretic_tally++; - } else if (heretic_data[tal] < loyal_data[0]) { - loyal_tally++; - } - } - if (heretic_tally > loyal_tally) { - purge_target = location_techs; - } else if (loyal_tally < heretic_tally) { - purge_target = location_heretics; - } - if (purge_target == "none") { - purge_target = choose(location_heretics, location_techs); - } - } else if (press == 2) { - purge_target = location_techs; - } else if (press == 3) { - purge_target = location_heretics; - } - if (purge_target != "none") { - for (tal = 0; tal < array_length(purge_target); tal++) { - kill_and_recover(purge_target[tal].company, purge_target[tal].marine_number); - } - } - } - if (array_length(delete_positions) > 0) { - for (t = 0; t < array_length(delete_positions); t++) { - array_delete(techs, delete_positions[t], 1); - tech_count--; - } - } - } - if (press == 1) { - text = "With neither faction receiving your favor it is not long until the BloodLetting begins. Within a month a brutal civil war engulfs the Tech ranks with losses suffered on both sides"; - } else if (press == 2) { - text = "With your full support the so called 'heretics' who have seen through the lies of the bureaucracy of Mars eliminate those who will not be swayed to see the truth."; - obj_controller.tech_status = "heretics"; - } else if (press == 3) { - text = "The extremists and heretics that have been allowed to grow like a cancer in the Armentarium are rooted out and disposed of."; - } - reset_options(); - press = 0; - pathway = "end_splash"; - } - } + if (pathway == "end_splash") { - option1 = "Continue"; - if (press == 1) { - obj_controller.complex_event = false; - if (instance_exists(obj_turn_end)) { - if (number != 0) { - obj_turn_end.alarm[1] = 4; - } - instance_destroy(); - } - instance_destroy(); + if (!array_length(options)){ + add_option(["Continue"]); + } + if (press == 0) { + popup_default_close(); } } } catch (_exception) { diff --git a/objects/obj_popup/obj_popup.yy b/objects/obj_popup/obj_popup.yy index bb8d2a37ae..9d2b72337b 100644 --- a/objects/obj_popup/obj_popup.yy +++ b/objects/obj_popup/obj_popup.yy @@ -11,11 +11,10 @@ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":13,"eventType":5,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":61,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":60,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":56,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":51,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":50,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":32,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], "managed":true, "name":"obj_popup", diff --git a/objects/obj_popup_dialogue/CleanUp_0.gml b/objects/obj_popup_dialogue/CleanUp_0.gml new file mode 100644 index 0000000000..e254457844 --- /dev/null +++ b/objects/obj_popup_dialogue/CleanUp_0.gml @@ -0,0 +1 @@ +global.ui_click_lock = false; \ No newline at end of file diff --git a/objects/obj_popup_dialogue/Draw_0.gml b/objects/obj_popup_dialogue/Draw_0.gml deleted file mode 100644 index 0ce795a17c..0000000000 --- a/objects/obj_popup_dialogue/Draw_0.gml +++ /dev/null @@ -1,82 +0,0 @@ -xx = __view_get(e__VW.XView, 0) + x; -yy = __view_get(e__VW.YView, 0) + y; - -cancel_button={ - x1: xx + 26, - y1: yy + 103, - x2: xx + 126, - y2: yy + 123, -} - -accept_button={ - x1: xx + 175, - y1: yy + 103, - x2: xx + 275, - y2: yy + 123, -} - -draw_sprite(spr_popup_dialogue, 0, xx, yy); - -draw_set_font(fnt_40k_14b); -draw_set_color(c_gray); -draw_set_halign(fa_center); - -draw_text_ext(xx + 150, yy + 7, string_hash_to_newline(question), 18, 260); - -if (scr_hit(xx + 19, yy + 46, xx + 280, yy + 70)) { - if (instance_exists(obj_cursor)) obj_cursor.image_index = 2; -} else { - if (instance_exists(obj_cursor)) obj_cursor.image_index = 0; -} - -draw_set_font(fnt_40k_14); -draw_set_color(c_gray); -if (blink >= 1) { - draw_text(xx + 152, yy + 50, string_hash_to_newline(string(inputting) + "|")); -} else { - draw_text(xx + 150, yy + 50, string_hash_to_newline(string(inputting))); -} - -// Button 1 -draw_set_alpha(0.25); -draw_set_color(c_black); -draw_rectangle(xx + 26, yy + 103, xx + 126, yy + 123, 0); -draw_set_color(c_gray); -draw_set_alpha(0.5); -draw_rectangle(xx + 26, yy + 103, xx + 126, yy + 123, 1); -draw_set_alpha(0.25); -draw_rectangle(xx + 27, yy + 104, xx + 125, yy + 122, 1); -draw_set_alpha(1); -draw_text(xx + 76, yy + 105, string_hash_to_newline("Cancel")); -if (scr_hit(cancel_button.x1, cancel_button.y1, cancel_button.x2, cancel_button.y2)) { - draw_set_alpha(0.1); - draw_set_color(c_white); - draw_rectangle(xx + 26, yy + 103, xx + 126, yy + 123, 0); - if (instance_exists(obj_cursor)) obj_cursor.image_index = 1; - if (mouse_check_button_pressed(mb_left) && obj_controller.cooldown <= 0) { - instance_destroy(); - } -} - -// Button 2 -draw_set_alpha(0.25); -draw_set_color(c_black); -draw_rectangle(xx + 175, yy + 103, xx + 275, yy + 123, 0); -draw_set_color(c_gray); -draw_set_alpha(0.5); -draw_rectangle(xx + 175, yy + 103, xx + 275, yy + 123, 1); -draw_set_alpha(0.25); -draw_rectangle(xx + 176, yy + 104, xx + 274, yy + 122, 1); -draw_set_alpha(1); -draw_text(xx + 225, yy + 105, string_hash_to_newline("Accept")); -if (scr_hit(accept_button.x1, accept_button.y1, accept_button.x2, accept_button.y2)) { - draw_set_alpha(0.1); - draw_set_color(c_white); - draw_rectangle(xx + 175, yy + 103, xx + 275, yy + 123, 0); - if (instance_exists(obj_cursor)) obj_cursor.image_index = 1; - if (mouse_check_button_pressed(mb_left) && obj_controller.cooldown <= 0) { - execute = true; - } -} - -draw_set_alpha(1); \ No newline at end of file diff --git a/objects/obj_popup_dialogue/Draw_64.gml b/objects/obj_popup_dialogue/Draw_64.gml new file mode 100644 index 0000000000..fdd1ea73e7 --- /dev/null +++ b/objects/obj_popup_dialogue/Draw_64.gml @@ -0,0 +1,87 @@ +global.ui_click_lock = true; +cancel_button={ + x1: x + 26, + y1: y + 103, + x2: x + 126, + y2: y + 123, +} + +accept_button={ + x1: x + 175, + y1: y + 103, + x2: x + 275, + y2: y + 123, +} + +draw_sprite(spr_popup_dialogue, 0, x, y); + +draw_set_font(fnt_40k_14b); +draw_set_color(c_gray); +draw_set_halign(fa_center); + +draw_text_ext(x + 150, y + 7, question, 18, 260); + +if (scr_hit(x + 19, y + 46, x + 280, y + 70)) { + if (instance_exists(obj_cursor)) obj_cursor.image_index = 2; +} else { + if (instance_exists(obj_cursor)) obj_cursor.image_index = 0; +} + +draw_set_font(fnt_40k_14); +draw_set_color(c_gray); + +draw_text(x + 150 + (blink?2:0), y + 50, $"{inputting}{blink?"|":""}"); + +// Button 1s +draw_set_alpha(0.25); +draw_set_color(c_black); +draw_rectangle(x + 26, y + 103, x + 126, y + 123, 0); +draw_set_color(c_gray); +draw_set_alpha(0.5); +draw_rectangle(x + 26, y + 103, x + 126, y + 123, 1); +draw_set_alpha(0.25); +draw_rectangle(x + 27, y + 104, x + 125, y + 122, 1); +draw_set_alpha(1); +draw_text(x + 76, y + 105, "Cancel"); +if (scr_hit(cancel_button.x1, cancel_button.y1, cancel_button.x2, cancel_button.y2)) { + draw_set_alpha(0.1); + draw_set_color(c_white); + draw_rectangle(x + 26, y + 103, x + 126, y + 123, 0); + if (instance_exists(obj_cursor)){ + obj_cursor.image_index = 1; + } + if (mouse_check_button_pressed(mb_left) && obj_controller.cooldown <= 0) { + global.ui_click_lock = false; + instance_destroy(); + } +} + +// Button 2 +draw_set_alpha(0.25); +draw_set_color(c_black); +draw_rectangle(x + 175, y + 103, x + 275, y + 123, 0); +draw_set_color(c_gray); +draw_set_alpha(0.5); +draw_rectangle(x + 175, y + 103, x + 275, y + 123, 1); +draw_set_alpha(0.25); +draw_rectangle(x + 176, y + 104, x + 274, y + 122, 1); +draw_set_alpha(1); +draw_text(x + 225, y + 105, "Accept"); +if (scr_hit(accept_button.x1, accept_button.y1, accept_button.x2, accept_button.y2)) { + draw_set_alpha(0.1); + draw_set_color(c_white); + draw_rectangle(x + 175, y + 103, x + 275, y + 123, 0); + if (instance_exists(obj_cursor)) obj_cursor.image_index = 1; + if (mouse_check_button_pressed(mb_left) && obj_controller.cooldown <= 0) { + if (is_struct(target)){ + if (inputting != 0){ + target.number = inputting; + } + global.ui_click_lock = false; + instance_destroy(); + } + execute = true; + } +} + +draw_set_alpha(1); \ No newline at end of file diff --git a/objects/obj_popup_dialogue/Step_0.gml b/objects/obj_popup_dialogue/Step_0.gml index 7bd04e8c97..21707a638c 100644 --- a/objects/obj_popup_dialogue/Step_0.gml +++ b/objects/obj_popup_dialogue/Step_0.gml @@ -50,72 +50,7 @@ if (input_type = 2) { } if (execute = true) { - if (inputting != 0) { // All checks out captain - if (target = "t1") { - obj_controller.trade_tnum[1] = inputting; - obj_controller.trade_take[1] = target2; - with(obj_controller) { - scr_trade(false); - } - } - if (target = "t2") { - obj_controller.trade_tnum[2] = inputting; - obj_controller.trade_take[2] = target2; - with(obj_controller) { - scr_trade(false); - } - } - if (target = "t3") { - obj_controller.trade_tnum[3] = inputting; - obj_controller.trade_take[3] = target2; - with(obj_controller) { - scr_trade(false); - } - } - if (target = "t4") { - obj_controller.trade_tnum[4] = inputting; - obj_controller.trade_take[4] = target2; - with(obj_controller) { - scr_trade(false); - } - } - - if (target = "m1") { - obj_controller.trade_mnum[1] = inputting; - obj_controller.trade_give[1] = target2; - with(obj_controller) { - scr_trade(false); - } - } - if (target = "m2") { - obj_controller.trade_mnum[2] = inputting; - obj_controller.trade_give[2] = target2; - with(obj_controller) { - scr_trade(false); - } - } - if (target = "m3") { - obj_controller.trade_mnum[3] = inputting; - obj_controller.trade_give[3] = target2; - with(obj_controller) { - scr_trade(false); - } - } - if (target = "m4") { - obj_controller.trade_mnum[4] = inputting; - obj_controller.trade_give[4] = target2; - with(obj_controller) { - scr_trade(false); - } - } - - if (string_count("m", target) > 0) { - if (target2 = "Requisition") then obj_controller.trade_req -= inputting; - if (target2 = "Gene-Seed") then obj_controller.trade_gene -= inputting; - if (target2 = "STC Fragment") then obj_controller.trade_chip -= inputting; - if (target2 = "Info Chip") then obj_controller.trade_info -= inputting; - } - } - instance_destroy(); + } -} \ No newline at end of file +} + diff --git a/objects/obj_popup_dialogue/obj_popup_dialogue.yy b/objects/obj_popup_dialogue/obj_popup_dialogue.yy index 9ea10959a7..c81f66dedc 100644 --- a/objects/obj_popup_dialogue/obj_popup_dialogue.yy +++ b/objects/obj_popup_dialogue/obj_popup_dialogue.yy @@ -7,10 +7,11 @@ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":56,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":53,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":27,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":13,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":1,"eventType":9,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":12,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], "managed":true, "name":"obj_popup_dialogue", diff --git a/objects/obj_saveload/Alarm_0.gml b/objects/obj_saveload/Alarm_0.gml index 1cb513237c..7cb376fb6a 100644 --- a/objects/obj_saveload/Alarm_0.gml +++ b/objects/obj_saveload/Alarm_0.gml @@ -61,7 +61,7 @@ if (load_part==6){ txt="Praise to the Machine God"; if (global.restart>0) then txt="Praise be to the Emperor"; with(obj_controller){ - // show_debug_message($"load section 5"); + // show_debug_message_adv($"load section 5"); scr_load(5,global.load); } @@ -78,7 +78,7 @@ if (load_part == 5) { } with (obj_controller) { - // show_debug_message($"load section 4"); + // show_debug_message_adv($"load section 4"); scr_load(4, global.load); } trickle = 2; @@ -91,7 +91,7 @@ if (load_part == 4) { txt = "Donning Power Armour"; } with (obj_controller) { - // show_debug_message($"load section 3"); + // show_debug_message_adv($"load section 3"); scr_load(3, global.load); } trickle = 2; @@ -104,7 +104,7 @@ if (load_part == 3) { txt = "Rousing the Machine Spirit"; } with (obj_controller) { - // show_debug_message($"load section 2"); + // show_debug_message_adv($"load section 2"); scr_load(2, global.load); } trickle = 2; @@ -117,7 +117,7 @@ if (load_part == 2) { txt = "Turtle Waxing Scalp"; } with (obj_controller) { - // show_debug_message($"load section 1"); + // show_debug_message_adv($"load section 1"); scr_load(1, global.load); } trickle = 2; diff --git a/objects/obj_saveload/Create_0.gml b/objects/obj_saveload/Create_0.gml index 6287bd8a18..2ce7683417 100644 --- a/objects/obj_saveload/Create_0.gml +++ b/objects/obj_saveload/Create_0.gml @@ -40,7 +40,7 @@ if (instance_exists(obj_controller)) { } } -save = array_create(201, 0); +save = array_create(201, -1); save_turn = array_create(201, 0); save_chapter = array_create(201, ""); save_master = array_create(201, ""); @@ -57,10 +57,9 @@ saves = 0; var i = 0; repeat (100) { - i += 1; if (file_exists(string(PATH_save_files, i))) { - saves += 1; save[saves] = i; + saves += 1; } if ((!file_exists(string(PATH_save_files, i))) && (i > 0) && (max_ini == 0)) { max_ini = i; @@ -68,17 +67,17 @@ repeat (100) { if (file_exists(string(PATH_save_files, i + 1)) && (max_ini > 0)) { max_ini = 0; } + i += 1; } -first_open=saves+1; +first_open=saves; if (file_exists("saves.ini")){ ini_open("saves.ini"); - i=-1; - repeat(200){i+=1; + for(var i = 0; i <= 200; i++){ if (save[i]>=0){ if (ini_section_exists(string(save[i]))){ save_turn[save[i]]=ini_read_real(string(save[i]),"turn",0); @@ -105,3 +104,11 @@ if (file_exists("saves.ini")){ ini_close(); } +var view = new DebugView("Save Debug", self); +view.add_section("Save Vars") +.add_watch("menu") +.add_watch("first_open") +.add_watch("top") +.add_watch("debug") +.dump_props() +.hide(); \ No newline at end of file diff --git a/objects/obj_saveload/Draw_0.gml b/objects/obj_saveload/Draw_0.gml index 1092f63650..f939fff667 100644 --- a/objects/obj_saveload/Draw_0.gml +++ b/objects/obj_saveload/Draw_0.gml @@ -41,13 +41,7 @@ if (menu=1) or (menu=2){// This is the other one if (room_get_name(room)="Main_Menu") then draw_rectangle(0,0,room_width,707,0); draw_set_alpha(1); - draw_set_color(c_red); - draw_set_font(fnt_40k_14); - draw_set_halign(fa_left); - // draw_text(xx+40,yy+730,"Menu: "+string(menu)+", First Open: "+string(first_open)+", Top Save: "+string(top)); - // draw_text(xx+40,yy+730,string(debug)); draw_set_halign(fa_center); - draw_set_color(0); draw_sprite(spr_save_header,0,xx+0,yy+27); @@ -57,7 +51,8 @@ if (menu=1) or (menu=2){// This is the other one var o,x2,y2,s;o=top;x2=__view_get( e__VW.XView, 0 )+32;y2=__view_get( e__VW.YView, 0 )+166;s=0; repeat(4){ - if ((save[o]>=0) or ((first_open=o) and (menu=1)) or (global.load=o) or (save_number=o)) and (save_number=0){s=save[o]; + if ((save[o]>=0) or ((first_open=o) and (menu=1)) or (global.load=o) or (save_number=o)) and (save_number=0){ + s=save[o]; draw_set_font(fnt_40k_30b); draw_set_halign(fa_left); draw_set_color(0); @@ -73,7 +68,7 @@ if (menu=1) or (menu=2){// This is the other one draw_sprite(spr_save_data,0,x2,y2); if(o == 0){ //autosave - draw_text_transformed(x2+23,y2+62,string_hash_to_newline("A"),1.1,1.1,0); + draw_text_transformed(x2+21,y2+62,string_hash_to_newline("A"),1.1,1.1,0); } else { draw_text_transformed(x2+23,y2+62,string_hash_to_newline(o),1.1,1.1,0); } @@ -117,7 +112,7 @@ if (menu=1) or (menu=2){// This is the other one draw_set_font(fnt_40k_30b);draw_set_halign(fa_center); - if (save[o] >= 0) { + if (save[o] > 0) { //intentionally not allowed to delete the autosave file // Delete Data draw_set_alpha(1); draw_set_color(c_gray); @@ -137,8 +132,7 @@ if (menu=1) or (menu=2){// This is the other one com.image = "fuklaw"; com.title = "Delete Save Game?"; com.text = "Are you sure you wish to delete Save " + string(save[o]) + "- " + string(save_chapter[save[o]]) + "?"; - com.option1 = "Yes"; - com.option2 = "No"; + com.add_option(["Yes", "No"]); com.save = o; com.woopwoopwoop = menu; com.owner = top; @@ -146,9 +140,10 @@ if (menu=1) or (menu=2){// This is the other one } } - - if (menu=2) and (save[o]>=0){// Restart - draw_set_alpha(1); + if (menu=2) and (save[o]>=0){ + // Restart + //! Doesn't work properly, commented out until repaired; + /* draw_set_alpha(1); draw_set_color(c_gray);draw_rectangle(x2+977,y2+113,x2+1121,y2+146,0); draw_set_color(c_black);draw_rectangle(x2+977,y2+113,x2+1121,y2+146,1); draw_text_transformed(x2+1050,y2+117,string_hash_to_newline("Restart Game"),0.7,0.7,0); @@ -177,8 +172,9 @@ if (menu=1) or (menu=2){// This is the other one room_goto(Game); } } - } + } */ + // Load draw_set_alpha(1); draw_set_color(c_gray);draw_rectangle(x2+1317,y2+113,x2+1461,y2+146,0); draw_set_color(c_black);draw_rectangle(x2+1317,y2+113,x2+1461,y2+146,1); @@ -210,7 +206,8 @@ if (menu=1) or (menu=2){// This is the other one } } - if (menu=1) and ((save[o]>0) or (first_open=o)){// Save + if (menu=1) and ((save[o]>0) or (first_open=o)){ // intentionally not allowed to saveover the autosave slot manually + // Save draw_set_alpha(1); draw_set_color(c_gray);draw_rectangle(x2+1317,y2+113,x2+1461,y2+146,0); draw_set_color(c_black);draw_rectangle(x2+1317,y2+113,x2+1461,y2+146,1); diff --git a/objects/obj_saveload/Mouse_60.gml b/objects/obj_saveload/Mouse_60.gml index 980c3b9a89..62188dfc13 100644 --- a/objects/obj_saveload/Mouse_60.gml +++ b/objects/obj_saveload/Mouse_60.gml @@ -3,7 +3,7 @@ if (slow<0) then slow=0; slow+=1; if (slow >= 3) { - if (top > 1) { + if (top > 0) { top -= 1; } } diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index 40b1e5ff4e..72d6cd59e7 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -1,1666 +1,1874 @@ -hover = 0; -shop = ""; -click = 0; -click2 = 0; -discount = 0; -construction_started = 0; -eta = 0; -target_comp = obj_controller.new_vehicles; - -slate_panel = new DataSlate(); -scroll_point=0; -tooltip_show = 0; -tooltip = ""; -tooltip_stat1 = 0; -tooltip_stat2 = 0; -tooltip_stat3 = 0; -tooltip_stat4 = 0; -tooltip_other = ""; -last_item = ""; -forge_master = scr_role_count("Forge Master", "", "units"); -if (array_length(forge_master)>0){ - forge_master=forge_master[0]; -} else { - forge_master="none"; -} -mechanicus_modifier = (((obj_controller.disposition[eFACTION.Mechanicus]-50)/200)*-1)+1 -var research = obj_controller.production_research; -shop = "equipment"; -/*if (obj_controller.menu=55) then shop="equipment"; -if (obj_controller.menu=56) then shop="vehicles"; -if (obj_controller.menu=57) then shop="warships"; -if (obj_controller.menu=58) then shop="equipment2";*/ -if (instance_number(obj_shop) > 1) { - var war; - war = instance_nearest(0, 0, obj_shop); - shop = war.shop; - with(war) { - instance_destroy(); - } - x = 0; - y = 0; -} - -var research = obj_controller.production_research; -var research_pathways = obj_controller.production_research_pathways; -var i, rene; -i = -1; -rene = 0; -repeat(80) { - i += 1; - item[i] = ""; - x_mod[i] = 0; - item_stocked[i] = 0; - mc_stocked[i] = 0; - item_cost[i] = 0; - nobuy[i] = 0; - forge_cost[i]=0; - tooltip_overide[i]=0; -} -if (obj_controller.faction_status[eFACTION.Imperium] = "War") { - rene = 1; - with(obj_temp6) { - instance_destroy(); - } - with(obj_star) { - var u; - u = 0; - repeat(4) { - u += 1; - if (p_type[u] = "Forge") and(p_owner[u] = 1) then instance_create(x, y, obj_temp6); - } - } - if (instance_exists(obj_temp6)) then rene = 0; - with(obj_temp6) { - instance_destroy(); - } -} - -tab_buttons = { - "equipment":new MainMenuButton(spr_ui_but_3, spr_ui_hov_3), - "armour":new MainMenuButton(spr_ui_but_3, spr_ui_hov_3), - "vehicles":new MainMenuButton(spr_ui_but_3, spr_ui_hov_3), - "ships":new MainMenuButton(spr_ui_but_3, spr_ui_hov_3), -} -var require_tool_tip = "requires: #" -if (shop = "equipment") { - i = 0; - i += 1; - item[i] = "Combat Knife"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 1; - forge_cost[i] = 10; - i += 1; - item[i] = "Chainsword"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 4; - forge_cost[i] = 40; - i += 1; - x_mod[i] = 9; - item[i] = "Eviscerator"; - if (research.chain[0]>0){ - forge_cost[i] = 150; - } else { - tooltip_overide[i] = $"{require_tool_tip} {research_pathways.chain[0][0]}" - } - item_stocked[i] = scr_item_count(item[i]); - nobuy[i] = 1; - i += 1; - item[i] = "Chainaxe"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 10; - forge_cost[i] = 40; - i += 1; - item[i] = "Power Axe"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 40; - if (research.power_fields[0]>1){ - forge_cost[i] = 100; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Power Sword"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 25; - if (research.power_fields[0]>1){ - forge_cost[i] = 100; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Power Spear"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 40; - if (research.power_fields[0]>1){ - forge_cost[i] = 100; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Crozius Arcanum"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 75; - if (research.power_fields[0]>1){ - forge_cost[i] = 150; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Power Fist"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 60; - if (research.power_fields[0]>1){ - forge_cost[i] = 150; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Boltstorm Gauntlet"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 90; - if (research.power_fields[0]>1&& research.bolt[0]>=2){ - forge_cost[i] = 300; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - /*i += 1; - item[i] = "Executioner Power Axe"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 100; - if (research.power_fields[0]>1){ - forge_cost[i] = 300; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - forge_cost[i] = 0; - }*/ - i += 1; - item[i] = "Power Mace"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 50; - if (research.power_fields[0]>1){ - forge_cost[i] = 140; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - if (global.chapter_name == "Dark Angels"){ - i += 1; - item[i] = "Mace of Absolution"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 70; - if (research.power_fields[0]>1){ - forge_cost[i] = 160; - } - } - i += 1; - item[i] = "Lightning Claw"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 90; - if (research.power_fields[0]>1){ - forge_cost[i] = 150; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Chainfist"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 75; - if (research.power_fields[0]>1 && research.chain[0]>0){ - forge_cost[i] = 150; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Force Staff"; - item_stocked[i] = scr_item_count(item[i]); - if (research.psi[0]>0){ - forge_cost[i] = 500; - } - item_cost[i] = 70; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Force Sword"; - item_stocked[i] = scr_item_count(item[i]); - if (research.psi[0]>0){ - forge_cost[i] = 400; - } - item_cost[i] = 55; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Force Axe"; - item_stocked[i] = scr_item_count(item[i]); - if (research.psi[0]>0){ - forge_cost[i] = 450; - } - item_cost[i] = 60; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Thunder Hammer"; - if (research.power_fields[0]>1){ - forge_cost[i] = 500; - } - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 90; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Heavy Thunder Hammer"; - if (research.power_fields[0]>1){ - forge_cost[i] = 750; - } - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 135; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Lascutter"; - forge_cost[i] = 500; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 15; - i += 1; - x_mod[i] = 9; - item[i] = "Boarding Shield"; - forge_cost[i] = 100; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 20; - i += 1; - x_mod[i] = 9; - item[i] = "Storm Shield"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 50; - if (research.power_fields[0]>1){ - forge_cost[i] = 500; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Company Standard"; - forge_cost[i] = 2000; - nobuy[i] = 1; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 0; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - - - i += 1; - item[i] = "Bolt Pistol"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 5; - forge_cost[i] = 50; - i += 1; - item[i] = "Bolter"; - forge_cost[i] = 100; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 10; - i += 1; - item[i] = "Stalker Pattern Bolter"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 80; - forge_cost[i] = 230; - i += 1; - x_mod[i] = 9; - item[i] = "Combiflamer"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 200; - if (research.bolt[0]<1 || research.flame[0]<1) then forge_cost[i] = 0; - item_cost[i] = 35; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Combiplasma"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 450; - if (research.bolt[0]<1 || research.plasma[0]<1) then forge_cost[i] = 0; - item_cost[i] = 110; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Combimelta"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 350; - if (research.bolt[0]<1 || research.melta[0]<1) then forge_cost[i] = 0; - item_cost[i] = 40; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Combigrav"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 450; - if (research.bolt[0]<1 || research.grav[0]<1) then forge_cost[i] = 0; - item_cost[i] = 110; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Heavy Bolter"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 50; - if (research.bolt[0]>=2) then forge_cost[i] = 300; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Storm Bolter"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 50; - if (research.bolt[0]>=2) then forge_cost[i] = 300; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Infernus Pistol"; - forge_cost[i] = 100; - if (research.flame[0]<1) then forge_cost[i] = 0; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 12; - i += 1; - item[i] = "Hand Flamer"; - forge_cost[i] = 75; - if (research.flame[0]<1) then forge_cost[i] = 0; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 12; - i += 1; - item[i] = "Flamer"; - forge_cost[i] = 150; - if (research.flame[0]<1) then forge_cost[i] = 0; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 25; - i += 1; - item[i] = "Heavy Flamer"; - forge_cost[i] = 350; - if (research.flame[0]<1) then forge_cost[i] = 0; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 40; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - - i += 1; - item[i] = "Incinerator"; - item_stocked[i] = scr_item_count(item[i]); - nobuy[i] = 1; - forge_cost[i] = 350; - if (research.flame[0]<1) then forge_cost[i] = 0; - // i += 1; - // item[i] = "Integrated Bolter"; - // item_stocked[i] = scr_item_count(item[i]); - // item_cost[i] = 120; - i += 1; - item[i] = "Meltagun"; - forge_cost[i] = 250; - if (research.melta[0]<1) then forge_cost[i] = 0; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 30; - i += 1; - item[i] = "Multi-Melta"; - forge_cost[i] = 350; - if (research.melta[0]<1) then forge_cost[i] = 0; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 60; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Plasma Pistol"; - forge_cost[i] = 250; - if (research.plasma[0]<1) then forge_cost[i] = 0; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 60; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Plasma Gun"; - forge_cost[i] = 350; - if (research.plasma[0]<1) then forge_cost[i] = 0; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 100; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Plasma Cannon"; - forge_cost[i] = 600; - if (research.plasma[0]<1) then forge_cost[i] = 0; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 300; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Grav-Pistol"; - forge_cost[i] = 250; - if (research.grav[0]<1) then forge_cost[i] = 0; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 60; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Grav-Gun"; - forge_cost[i] = 350; - if (research.grav[0]<1) then forge_cost[i] = 0; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 100; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Grav-Cannon"; - forge_cost[i] = 600; - if (research.grav[0]<1) then forge_cost[i] = 0; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 300; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Archeotech Laspistol"; - item_stocked[i] = scr_item_count(item[i]); - nobuy[i] = 1; - i += 1; - x_mod[i] = 9; - item[i] = "Hellrifle"; - item_stocked[i] = scr_item_count(item[i]); - nobuy[i] = 1; - i += 1; - item[i] = "Sniper Rifle"; - forge_cost[i] = 200; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 10; - - i += 1; - item[i] = "Missile Launcher"; - forge_cost[i] = 300; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 70; - i += 1; - item[i] = "Lascannon"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 500; - if (research.las[0]<1) then forge_cost[i] = 0; - item_cost[i] = 70; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - var mc = 0; - repeat(i) { - mc++; - if (item[mc] != ""){ - mc_stocked[mc] = scr_item_count(item[mc], "master_crafted"); - } - } -} -if (shop = "equipment2") { - i = 0; - i += 1; - item[i] = "MK3 Iron Armour"; - item_stocked[i] = scr_item_count("MK3 Iron Armour"); - nobuy[i] = 1; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - if (obj_controller.in_forge){ - if (research.armour[1].armour[0]>2){ - forge_cost[i] = 1250; - } else { - tooltip_overide[i] = "requires : #"; - for (var r = research.armour[1].armour[0]; r < 3;r++){ - tooltip_overide[i] += $" {research_pathways.armour[1].armour[0][r]}#"; - } - } - } - - i += 1; - var mk_4_able = false; - var mk_4_tool_tip = "" - item[i] = "MK4 Maximus"; - item_stocked[i] = scr_item_count("MK4 Maximus"); - if (obj_controller.in_forge){ - if (research.armour[1].stealth[0] >0 && research.armour[1].armour[0] >1){ - forge_cost[i] = 1250; - mk_4_able=true; - } else { - tooltip_overide[i] = "requires : #"; - if (research.armour[1].stealth[0] < 1){ - tooltip_overide[i] += $" {research_pathways.armour[1].stealth[0][0]}#"; - for (var r = research.armour[1].armour[0]; r < 2;r++){ - tooltip_overide[i] += $" {research_pathways.armour[1].armour[0][r]}#"; - } - } - mk_4_tool_tip = tooltip_overide[i]; - } - - } - nobuy[i] = 1; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "MK5 Heresy"; - item_stocked[i] = scr_item_count("MK5 Heresy"); - item_cost[i] = 45; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "MK6 Corvus"; - item_stocked[i] = scr_item_count("MK6 Corvus"); - item_cost[i] = 35; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - if (obj_controller.in_forge){ - if (research.armour[1].stealth[0] > 0){ - forge_cost[i] = 1400; - } else { - tooltip_overide[i] = "requires : #"; - if (research.armour[1].stealth[0] < 1){ - tooltip_overide[i] += $" {research_pathways.armour[1].stealth[0][0]}#"; - } - } - } - - i += 1; - item[i] = "MK7 Aquila"; - item_stocked[i] = scr_item_count("MK7 Aquila"); - item_cost[i] = 20; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - if (obj_controller.in_forge){ - if (research.armour[0] > 0){ - forge_cost[i] = 1000; - } else { - tooltip_overide[i] = "requires : #"; - if (research.armour[0] < 1){ - tooltip_overide[i] += $" {research_pathways.armour[0][0]}#"; - } - } - } - - i += 1; - item[i] = "MK8 Errant"; - item_stocked[i] = scr_item_count("MK8 Errant"); - nobuy[i] = 1; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - if (obj_controller.in_forge){ - if (research.armour[0] > 1){ - forge_cost[i] = 1000; - } else { - tooltip_overide[i] = "requires : #"; - if (research.armour[0] < 2 && mk_4_able){ - tooltip_overide[i] += $" {research_pathways.armour[0][1]}#"; - } else { - tooltip_overide[i] = mk_4_tool_tip; - } - } - } - i += 1; - item[i] = "Scout Armour"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 200; - item_cost[i] = 5; - i += 1; - item[i] = "Artificer Armour"; - item_stocked[i] = scr_item_count("Artificer Armour"); - nobuy[i] = 1; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } -if (research.armour[1].stealth[0] > 0 && research.armour[1].armour[0] > 1) { - forge_cost[i] = 1500; -} else { - tooltip_overide[i] = "requires : \n"; - if (research.armour[1].stealth[0] < 1) { - tooltip_overide[i] += $" {research_pathways.armour[1].stealth[0][0]}\n"; - for (var r = research.armour[1].armour[0]; r < 2; r++) { - tooltip_overide[i] += $" {research_pathways.armour[1].armour[0][r]}\n"; - } - } - mk_4_tool_tip = tooltip_overide[i]; - -} - i += 1; - item[i] = "Terminator Armour"; - item_stocked[i] = scr_item_count("Terminator Armour"); - nobuy[i] = 1; -if (research.armour[1].stealth[0] > 0 && research.armour[1].armour[0] > 1 && obj_controller.stc_wargear >= 6) { - forge_cost[i] = 2000; -} else { - tooltip_overide[i] = "requires : \n"; - if (research.armour[1].stealth[0] < 1) { - tooltip_overide[i] += $" {research_pathways.armour[1].stealth[0][0]}\n"; - for (var r = research.armour[1].armour[0]; r < 2; r++) { - tooltip_overide[i] += $" {research_pathways.armour[1].armour[0][r]}\n"; - } - } - mk_4_tool_tip = tooltip_overide[i]; - tooltip_overide[i] += $"STC wargear component 6"; -} - // if (rene=1){nobuy[i]=1;item_cost[i]=0;} -i += 1; -item[i] = "Tartaros"; -item_stocked[i] = scr_item_count("Tartaros"); -nobuy[i] = 1; -if (research.armour[1].stealth[0] > 0 && research.armour[1].armour[0] > 1 && obj_controller.stc_wargear >= 6) { - forge_cost[i] = 2500; -} else { - tooltip_overide[i] = "requires : \n"; - if (research.armour[1].stealth[0] < 1) { - tooltip_overide[i] += $" {research_pathways.armour[1].stealth[0][0]}\n"; - for (var r = research.armour[1].armour[0]; r < 2; r++) { - tooltip_overide[i] += $" {research_pathways.armour[1].armour[0][r]}\n"; - } - } - mk_4_tool_tip = tooltip_overide[i]; - tooltip_overide[i] += $"STC wargear component 6"; -} - - - i += 1; - x_mod[i] = 9; - item[i] = "Jump Pack"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 250; - item_cost[i] = 20; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - - i += 1; - x_mod[i] = 9; - item[i] = "Heavy Weapons Pack"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 250; - item_cost[i] = 25; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - - i += 1; - x_mod[i] = 9; - item[i] = "Servo-harness"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 1500; - item_cost[i] = 150; - if (obj_controller.stc_wargear >= 6) { - forge_cost[i] = 400; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - - i += 1; - x_mod[i] = 9; - item[i] = "Conversion Beamer Pack"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 180; - if (research.grav[0]>=1 && research.flame[0]>=1 && research.las[0]>=1 && research.plasma[0]>=1 ) then forge_cost[i] = 450; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - - i += 1; - x_mod[i] = 9; - item[i] = "Servo-arm"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 750; - item_cost[i] = 30; - forge_cost[i] = 150; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - - i += 1; - x_mod[i] = 9; - item[i] = "Bionics"; - forge_cost[i] = 20; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 5; - i += 1; - x_mod[i] = 9; - item[i] = "Narthecium"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 500; - item_cost[i] = 10; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Psychic Hood"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 1000; - item_cost[i] = 100; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Combat Shield"; - forge_cost[i] = 75; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 15; - i += 1; - x_mod[i] = 9; - item[i] = "Rosarius"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 1500; - item_cost[i] = 100; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Iron Halo"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 2000; - item_cost[i] = 300; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Plasma Bomb"; - forge_cost[i] = 1500; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 175; - - i += 1; - x_mod[i] = 9; - item[i] = "Exterminatus"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 2500; - - i += 1; - x_mod[i] = 9; - item[i] = "Gene Pod Incubator"; - item_stocked[i] = scr_item_count(item[i]); - nobuy[i] = 1; - item_cost[i] = 0; - forge_cost[i] = 80; - - mc=0; - repeat(i) { - mc += 1; - if (item[mc] != ""){ - mc_stocked[i] = scr_item_count(item[mc], "master_crafted"); - } - } - -} - -var player_hanger = min(array_length(obj_controller.player_forge_data.vehicle_hanger),1); -if (shop = "vehicles") { - i = 0; - i += 1; - item[i] = "Rhino"; - item_stocked[i] = scr_vehicle_count(item[i], ""); - forge_cost[i] = 1500*player_hanger; - item_cost[i] = 120; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Predator"; - item_stocked[i] = scr_vehicle_count(item[i], ""); - forge_cost[i] = 3000*player_hanger; - item_cost[i] = 240; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Autocannon Turret"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 30; - if (research.bolt[0]> 2) then forge_cost[i] = 150*player_hanger; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Twin Linked Lascannon Turret"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 60; - if (research.las[0]>1) then forge_cost[i] = 400*player_hanger; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Heavy Bolter Sponsons"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 38; - forge_cost[i] = 100*player_hanger; - if (research.bolt[0]> 2) then forge_cost[i] = 100*player_hanger; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Heavy Flamer Sponsons"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 50; - forge_cost[i] = 150*player_hanger; - if (research.flame[0]<1) then forge_cost[i] = 0; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Lascannon Sponsons"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 60; - if (research.las[0]>1) then forge_cost[i] = 300; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Land Raider"; - item_stocked[i] = scr_vehicle_count(item[i], ""); - nobuy[i] = 1; - if (obj_controller.stc_vehicles >= 6) { - nobuy[i] = 0; - item_cost[i] = 500; - forge_cost[i] = 4500*player_hanger; - } - if (rene=1) { - nobuy[i]=1; - item_cost[i]=0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Twin Linked Heavy Bolter Mount"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 28; - if (research.bolt[0]> 2) then forge_cost[i] = 250*player_hanger; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Quad Linked Heavy Bolter Sponsons"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 60; - if (research.bolt[0]> 3) then forge_cost[i] = 350*player_hanger; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Twin Linked Assault Cannon Mount"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 60; - if (research.bolt[0]> 3) then forge_cost[i] = 400*player_hanger; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Flamestorm Cannon Sponsons"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 100; - forge_cost[i] = 300*player_hanger; - if (research.flame[0]<1) then forge_cost[i] = 0; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Hurricane Bolter Sponsons"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 70; - if (research.bolt[0]> 3) then forge_cost[i] = 300*player_hanger; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Twin Linked Lascannon Sponsons"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 120; - if (research.las[0]>1) then forge_cost[i] = 250*player_hanger; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Whirlwind"; - item_stocked[i] = scr_vehicle_count(item[i], ""); - item_cost[i] = 180; - forge_cost[i] = 2000*player_hanger; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "HK Missile"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 10; - forge_cost[i] = 250*player_hanger; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Land Speeder"; - item_stocked[i] = scr_vehicle_count(item[i], ""); - nobuy[i] = 1; - if (obj_controller.stc_vehicles >= 6) { - nobuy[i] = 0; - item_cost[i] = 120; - forge_cost[i] = 700*player_hanger; - } - i += 1; - x_mod[i] = 9; - item[i] = "Twin Linked Bolters"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 8; - if (research.bolt[0]>= 2) then forge_cost[i] = 150*player_hanger; - i += 1; - item[i] = "Bike"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 35; - forge_cost[i] = 150*player_hanger; - i += 1; - item[i] = "Dreadnought"; - item_stocked[i] = scr_item_count(item[i]); - nobuy[i] = 1; // if (rene=1){nobuy[i]=1;item_cost[i]=0;} -if (research.armour[1].stealth[0] > 0 && research.armour[1].armour[0] > 1 && obj_controller.stc_wargear >= 6) { - forge_cost[i] = 3000; -} else { - tooltip_overide[i] = "requires : \n"; - if (research.armour[1].stealth[0] < 1) { - tooltip_overide[i] += $" {research_pathways.armour[1].stealth[0][0]}\n"; - for (var r = research.armour[1].armour[0]; r < 2; r++) { - tooltip_overide[i] += $" {research_pathways.armour[1].armour[0][r]}\n"; - } - } - mk_4_tool_tip = tooltip_overide[i]; - tooltip_overide[i] += $"STC wargear component 6"; -} - i += 1; - x_mod[i] = 9; - item[i] = "Close Combat Weapon"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 45; - forge_cost[i] = 200*player_hanger; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Twin Linked Heavy Bolter"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 110; - if (research.bolt[0]> 2) then forge_cost[i] = 150*player_hanger; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Twin Linked Lascannon"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 110; - if (research.las[0]>1) then forge_cost[i] = 150*player_hanger; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Autocannon"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 80; - if (research.bolt[0]> 2) then forge_cost[i] = 150; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Inferno Cannon"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 115; - forge_cost[i] = 250*player_hanger; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Dreadnought Lightning Claw"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 185; - forge_cost[i] = 250*player_hanger; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Assault Cannon"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 75; - if (research.bolt[0]> 2) then forge_cost[i] = 350; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Dreadnought Power Claw"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 150; - forge_cost[i] = 200*player_hanger; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Whirlwind Missiles"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 90; - forge_cost[i] = 250*player_hanger; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Heavy Conversion Beam Projector"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 350*player_hanger; - nobuy[i] = 1; - if (rene = 1) { - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Plasma Destroyer Turret"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 400*player_hanger; - nobuy[i] = 1; - if (rene = 1) { - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Flamestorm Cannon Turret"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 400*player_hanger; - nobuy[i] = 1; - if (rene = 1) { - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Magna-Melta Turret"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 400*player_hanger; - nobuy[i] = 1; - if (rene = 1) { - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Neutron Blaster Turret"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 450*player_hanger; - nobuy[i] = 1; - if (rene = 1) { - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Volkite Saker Turret"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 400*player_hanger; - nobuy[i] = 1; - if (rene = 1) { - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Volkite Culverin Sponsons"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 350*player_hanger; - nobuy[i] = 1; - if (rene = 1) { - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Twin Linked Volkite Culverin Sponsons"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 400*player_hanger; - nobuy[i] = 1; - if (rene = 1) { - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Twin Linked Multi-Melta Sponsons"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 200; - forge_cost[i] = 200*player_hanger; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Twin Linked Heavy Flamer Sponsons"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 200*player_hanger; - item_cost[i] = 150; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Reaper Autocannon Mount"; - item_stocked[i] = scr_item_count(item[i]); - forge_cost[i] = 250*player_hanger; - nobuy[i] = 1; - if (rene = 1) { - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Void Shield"; - item_stocked[i] = scr_item_count(item[i]); - nobuy[i] = 1; - if (obj_controller.stc_vehicles >= 6) { - nobuy[i] = 0; - item_cost[i] = 500; - forge_cost[i] = 2000*player_hanger; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Lucifer Pattern Engine"; - item_stocked[i] = scr_item_count(item[i]); - nobuy[i] = 1; - if (obj_controller.stc_vehicles >= 6) { - nobuy[i] = 0; - item_cost[i] = 90; - forge_cost[i] = 1250*player_hanger; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Artificer Hull"; - item_stocked[i] = scr_item_count(item[i]); - nobuy[i] = 1; - if (obj_controller.stc_vehicles >= 3) { - nobuy[i] = 0; - item_cost[i] = 200; - forge_cost[i] = 1000*player_hanger; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Armoured Ceramite"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 120; - if (obj_controller.stc_vehicles >= 3) { - item_cost[i] = 200; - forge_cost[i] = 500*player_hanger; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Heavy Armour"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 50; - if (obj_controller.stc_vehicles >= 3) { - item_cost[i] = 200; - forge_cost[i] = 250*player_hanger; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Smoke Launchers"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 10; - if (obj_controller.stc_vehicles >= 3) { - item_cost[i] = 200; - forge_cost[i] = 250*player_hanger; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Dozer Blades"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 10; - if (obj_controller.stc_vehicles >= 3) { - item_cost[i] = 200; - forge_cost[i] = 200*player_hanger; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Searchlight"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 15; - if (obj_controller.stc_vehicles >= 3) { - item_cost[i] = 200; - forge_cost[i] = 250*player_hanger; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Frag Assault Launchers"; - item_stocked[i] = scr_item_count(item[i]); - item_cost[i] = 30; - if (obj_controller.stc_vehicles >= 3) { - item_cost[i] = 200; - forge_cost[i] = 250*player_hanger; - } - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } -} -if (shop = "warships") { - i = 0; - i += 1; - item[i] = "Battle Barge"; - item_stocked[i] = scr_ship_count(item[i]); - item_cost[i] = 20000; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Strike Cruiser"; - item_stocked[i] = scr_ship_count(item[i]); - item_cost[i] = 8000; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Gladius"; - item_stocked[i] = scr_ship_count(item[i]); - item_cost[i] = 2250; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - item[i] = "Hunter"; - item_stocked[i] = scr_ship_count(item[i]); - item_cost[i] = 3000; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } - i += 1; - x_mod[i] = 9; - item[i] = "Cyclonic Torpedo"; - item_stocked[i] = scr_item_count(item[i]); - nobuy[i] = 1; - if (rene = 1) { - nobuy[i] = 1; - item_cost[i] = 0; - } -} - - - -with(obj_p_fleet) { - if (capital_number > 0) and(action = "") { - var you; - you = instance_nearest(x, y, obj_star); - if (you.trader > 0) then obj_shop.discount = 1; - } -} -with(obj_star) { - if (array_contains(p_owner, 1)) and(trader > 0) then obj_shop.discount = 1; -} - - -if (shop = "equipment") or(shop = "equipment2") { - var disc; - disc = 1; - if (obj_controller.stc_wargear >= 1) then disc = 0.92; - if (obj_controller.stc_wargear >= 3) then disc = 0.86; - if (obj_controller.stc_wargear >= 5) then disc = 0.75; - var mc = 0; - repeat(i) { - mc++; - if (forge_cost[mc] > 1) then forge_cost[mc] = round(forge_cost[mc] * disc); - } -} -if (shop = "vehicles") { - var disc; - disc = 1; - if (obj_controller.stc_vehicles >= 1) then disc = 0.92; - if (obj_controller.stc_vehicles >= 3) then disc = 0.86; - if (obj_controller.stc_vehicles >= 5) then disc = 0.75; - var mc = 0; - repeat(31) { - mc += 1; - var ahuh; - ahuh = 1; - if (mc >= 7) and(mc <= 12) then ahuh = 0; - if (ahuh = 1) { - if (forge_cost[mc] > 1) then forge_cost[mc] = round(forge_cost[mc] * disc); - } - } -} -if (shop == "production"){ - i = 0; - var research_item; - if (research.flame[0] == 0){ - i++; - item[i] = ["research", research_pathways.flame[0][research.flame[0]], ["flame"]]; - item_stocked[i] = 0; - forge_cost[i] = 3000; - tooltip_overide[i] = "This research grants the ability to fabricate and harness Promethium Tanks, allowing for the construction of flame-based weaponry. This technology taps into the potent destructive potential of Promethium, turning it into a terrifying tool of war, capable of reducing enemies to ash.\nUnlocks: Flamers, Heavy Flamers, Incinerator.\nRequired for: Heavy Flamer Sponsons, Flamestorm Cannon Sponsons, Inferno Cannon, Servo-harness, Combi-flamer."; - - } - if (research.psi[0] == 0){ - i++; - item[i] = ["research", research_pathways.psi[0][research.psi[0]], ["psi"]]; - item_stocked[i] = 0; - forge_cost[i] = 3000; - tooltip_overide[i] = "This research unlocks the arcane art of crafting Force Weapons, allowing our trained psykers to channel the raw, untamed power of the Warp into tangible forms. It transforms ordinary melee implements into conduits of psychic fury, each blow imbued with devastating energy This grants our psykers the ability to strike down the mightiest foes, turning the tide of battle with the very power of the immaterium.\n\nUnlocks: Force Staff, Force Sword, Force Axe."; - } - if (research.las[0] == 0){ - i++; - item[i] = ["research", research_pathways.las[0][research.las[0]], ["las"]]; - item_stocked[i] = 0; - forge_cost[i] = 3000; - tooltip_overide[i] = "This research unveils the secrets of advanced Las Weaponry, a testament to the Imperium's mastery of directed energy. It allows the construction of more potent and reliable las weapons, each pulse of light capable of searing through armor and flesh alike. This empowers our forces with vastly enhanced range, penetration, and damage, ensuring the Emperor's light shines brighter against the encroaching darkness.\n\nUnlocks: Lascannon.\nRequired for: Twin Linked Lascannon Turret, Twin Linked Lascannon Sponsons, Twin Linked Lascannon."; - } - if (research.chain[0] == 0){ - i++; - item[i] = ["research", research_pathways.chain[0][research.chain[0]], ["chain"]]; - item_stocked[i] = 0; - forge_cost[i] = 3000; - tooltip_overide[i] = "This research unleashes the technology for Advanced Chain Weaponry, allowing us to produce tools of brutal, unrelenting destruction. It allows for the creation of weapons that tear and rend, leaving nothing but bloody ruin in their wake. Our warriors wield these instruments of carnage to devastating effect, carving through the ranks of our enemies with unstoppable fury. \n\nUnlocks: Eviscerator, Chainfist."; - } - if (research.plasma[0] == 0){ - i++; - item[i] = ["research", research_pathways.plasma[0][research.plasma[0]], ["plasma"]]; - item_stocked[i] = 0; - forge_cost[i] = 3000; - tooltip_overide[i] = "This research delves into the dangerous art of Plasma Weaponry, granting us the means to unleash the raw power of superheated plasma upon the enemy. This volatile technology produces weapons that can inflict devastating wounds, but its very nature demands a careful hand, lest its power consume the wielder. These weapons provide a high damage potential, capable of obliterating even heavily armored foes.\n\nUnlocks: Plasma Pistol, Plasma Gun, Plasma Cannon.\nRequired for: Combiplasma."; - } - if (research.bolt[0] == 1){ - i++; - item[i] = ["research",research_pathways.bolt[0][research.bolt[0]], ["bolt"]]; - item_stocked[i] = 0; - forge_cost[i] = 3000; - tooltip_overide[i] = "This research reveals the secrets of Advanced Bolt Weapons, an expansion of the Emperor's favored projectile weapons into more specialized and lethal forms. It is the pinnacle of projectile technology, combining explosive force with devastating impact. This provides our forces with a significant increase in firepower, ensuring that each shot finds its mark and shatters the foe. \n\nUnlocks: Stalker Pattern Bolter, Heavy Bolter, Heavy bolter Sponsons.\nRequired for: Combiflamer, Combiplasma, Combimelta, Combigrav, Assault Cannon, Autocannon Turret, Hurricane Bolter, Quad Linked Heavy Bolter Sponsons, Twin Linked Bolters, Twin Linked Heavy Bolter mount, Twin Linked assault cannon."; - } - if (research.bolt[0] == 2){ - i++; - item[i] = ["research","Advanced Weapon Integration and Targeting", ["bolt"]]; - item_stocked[i] = 0; - forge_cost[i] = 3000; - tooltip_overide[i] = "This research unlocks the divine secrets of Advanced Weapon Integration and Targeting, allowing for the creation of systems that connect the chapter’s weaponry with the Astartes in perfect harmony, enhancing their coordination and tactical prowess upon the Emperor's battlefields. It also allows for the construction of the devastating Assault Cannon and the mighty Autocannon for Predator tanks, making them instruments of divine vengeance, ensuring that the enemies of Mankind tremble before their might. This knowledge shall improve the efficiency of standard bolter weaponry, while also unleashing newer and more devastating tools of annihilation. \nUnlocks: Assault Cannon, Autocannon Turret, Twin Linked Heavy Bolter mount, Twin Linked bolter.\nRequired for: Hurricane Bolter, Quad Linked Heavy Bolter Sponsons, Twin linked assault cannon."; - } - if (research.bolt[0] == 3){ - i++; - item[i] = ["research","Integrated Weapon Stabilization and Rate of Fire Enhancements", ["bolt"]]; - item_stocked[i] = 0; - forge_cost[i] = 3000; - tooltip_overide[i] = "This research unlocks the sacred technology of Integrated Weapon Stabilization and Rate of Fire Enhancements, allowing our warriors to unleash bolter fire with unprecedented might, creating a maelstrom of righteous destruction upon the heretic and the alien. This divine advancement focuses on the inner workings of the weaponry, turning them into the Emperor's own instruments of divine wrath, rivaled only by the most sacred creations of the Machine God. Their might shall tear down the very fortresses of our foes, and their righteous fury shall cleanse the battlefield from all that would oppose the Imperium. \nUnlocks: Hurricane Bolter, Quad Linked Heavy Bolter Sponsons, Twin linked assault cannon."; - } - if (research.power_fields[0] < 2){ - i++; - item[i] = ["research",research_pathways.power_fields[0][research.power_fields[0]], ["power_fields"]]; - item_stocked[i] = 0; - forge_cost[i] = 3000; - tooltip_overide[i] = "This research unlocks the ancient science of Advanced Power Weapons, enhancing melee armaments with potent energy fields that disrupt the very bonds of matter. It is a testament to the power of technology, transforming ordinary weapons into instruments of righteous fury. This allows our warriors to devastate the most armored foes, cleaving through enemy ranks with the raw energy of the machine god.\n\nUnlocks: Power Axe, Power Sword, Power Spear, Crozius Arcanum, Power Fist, Power Mace, Lightning Claw, Chainfist, Thunder Hammer, Heavy Thunder Hammer, Storm Shield."; - } - if (research.melta[0] == 0){ - i++; - item[i] = ["research",research_pathways.melta[0][research.melta[0]], ["melta"]]; - item_stocked[i] = 0; - forge_cost[i] = 3000; - tooltip_overide[i] = "This research unlocks the terrifying potential of Basic Melta Weaponry, granting us the ability to unleash the searing heat of miniature suns upon the enemy. These weapons melt through armor and fortifications with unparalleled ease. This enhances our anti-tank capabilities, allowing our forces to shatter enemy vehicles and fortifications, leaving only molten slag in their wake.\n\nUnlocks: Meltagun, Multi-Melta.\nRequired for: Combimelta"; - } - if (research.grav[0] == 0){ - i++; - item[i] = ["research", research_pathways.grav[0][research.grav[0]], ["grav"]]; - item_stocked[i] = 0; - forge_cost[i] = 3000; - tooltip_overide[i] = "This research unravels the enigmatic science of Grav Weapons, allowing us to manipulate the very fabric of gravity for destructive purposes. These weapons crush and pulverize their targets with the force of collapsing worlds. They become the bane of armored units, allowing our forces to annihilate heavy infantry and vehicles with the very force of celestial bodies. \n\nUnlocks: Grav-Pistol, Grav-Gun, Grav-Cannon.\nRequired for: Combigrav"; - } - if (research.armour[0]>0){ - if (research.armour[1].stealth[0] == 0){ - i++; - item[i] = ["research","Advanced Servo Motors", ["armour", "stealth"]]; - item_stocked[i] = 0; - forge_cost[i] = 3000; - tooltip_overide[i] = "This research unlocks the secrets of Advanced Servo Motors, allowing the fabrication of enhanced movement systems, greatly boosting the speed and agility of our warriors. The speed and maneuverability increase will provide our troops with a significant advantage. It also unlocks the construction of specialized armors and advanced items.\n\nUnlocks: Mk6 Corvus.\nRequired for: Artificer Armour, Terminator Armour, Tartaros."; - } - if (research.armour[1].armour[0] == 0){ - i++; - item[i] = ["research","Advanced Ceramite Bonding", ["armour", "armour"]]; - item_stocked[i] = 0; - forge_cost[i] = 3000; - tooltip_overide[i] = "This research uncovers the lost techniques of Advanced Ceramite Bonding, allowing us to create superior armors. It fortifies our war plate, offering unparalleled protection against enemy fire. This dramatically enhances the survivability of our units as well as unlocking new armor capabilities.\n\nUnlocks: MK3 Iron Armour.\nRequired for: MK8 Errant, Artificer Armour, Terminator Armour, Tartaros."; - } else if (research.armour[1].armour[0] == 2){ - i++; - item[i] = ["research","Ceremite Void Hardening", ["armour", "armour"]]; - item_stocked[i] = 0; - forge_cost[i] = 3000; - tooltip_overide[i] = "This research grants the secrets of Ceramite Void Hardening techniques, reinforcing our armors to withstand the harshest conditions of the void. It is essential for warriors who brave the vacuum of space, ensuring they can perform their duties where others would falter. It increases the unit's resilience in harsh environments as well as providing a superior armor plating. \n\nUnlocks: MK3 Iron Armour.\nRequired for: MK8 Errant, Artificer Armour."; - } - if (research.armour[0]==1){ - i++; - item[i] = ["research",research_pathways.armour[0][1], ["armour"]]; - item_stocked[i] = 0; - forge_cost[i] = 3000; - tooltip_overide[i] = "This research unlocks the knowledge to fabricate the Mk VIII 'Errant' pattern Power Armour, a refinement of the ubiquitous Aquila armour, often favored by veteran Astartes and officers due to its unparalleled protection. It features improved plating around the torso and neck, enhancing its resilience against both ranged and melee attacks. This technology marks the pinnacle of power armour technology and a significant step in the path to becoming a battle-hardened Astartes.\n\nUnlocks: MK8 Errant.\nRequired for: Artificer Armour."; - } - if (research.armour[1].stealth[0] == 1 && research.armour[1].armour[0] == 1){ - i++; - item[i] = ["research","Enhanced Nerve Interfacing", ["armour", "armour"]]; - item_stocked[i] = 0; - forge_cost[i] = 3000; - tooltip_overide[i] = "This research allows the creation of Enhanced Nerve Interfacing systems, binding unit and armor in perfect harmony. It augments the link between warrior and war plate, unlocking new levels of effectiveness. This provides the user with better accuracy, damage output, and mobility, unlocking new levels of tactical potential. \n\nUnlocks: MK4 Maximus."; - } - } else if (research.armour[0]==0){ - i++; - item[i] = ["research",research_pathways.armour[0][0], ["armour"]]; - item_stocked[i] = 0; - forge_cost[i] = 3000; - tooltip_overide[i] = "This research unlocks the knowledge to fabricate Mk VII 'Aquila' pattern Power Armour, the standard armour pattern for the Adeptus Astartes. It is a reliable and ubiquitous armour used by many Chapters that is also easy to construct and maintain, making it a stable base for the might of the Imperium's warriors.\n\nUnlocks: MK7 Aquila.\nRequired for: MK8 Errant, Artificer Armour, Terminator Armour, Tartaros."; - } - -} -legitimate_items = i; -if (shop = "warships") { - var disc; - disc = 1; - if (obj_controller.stc_ships >= 1) then disc = 0.92; - if (obj_controller.stc_ships >= 3) then disc = 0.86; - if (obj_controller.stc_ships >= 5) then disc = 0.75; - i = 0; - repeat(31) { - i += 1; - if (item_cost[i] > 1) then item_cost[i] = round(item_cost[i] * disc); - } -} -if (discount = 1) { - discount = 2; - i = 0; - repeat(31) { - i += 1; - if (item_cost[i] >= 5) then item_cost[i] = round(item_cost[i] * 0.8); - if (item_cost[i] > 1) and(item_cost[i] < 5) then item_cost[i] -= 1; - } -} - -if (rene = 1) { - i = 0; - repeat(31) { - i += 1; - item_cost[i] *= 2; - } -} -forge_master_modifier=0; -if (forge_master!="none"){ - forge_master_modifier = 2500/((forge_master.charisma+10)*forge_master.technology); - if (forge_master.has_trait("flesh_is_weak") && forge_master_modifier>0.75){ - forge_master_modifier-=0.1; - }; -} else { - forge_master_modifier=1.7; -} -var tech_heretic_modifier =1 - i = 0; - repeat(array_length(item_cost)-2){ - i += 1; - if (shop != "warships"){ - item_cost[i] *= 2; - } - if (rene != 1){ - item_cost[i]*=mechanicus_modifier; - if (obj_controller.tech_status=="heretics"){ - tech_heretic_modifier = 1.05; - item_cost[i]*=tech_heretic_modifier - } - } - item_cost[i] *= forge_master_modifier; - item_cost[i] = ceil(item_cost[i]); -} - -item_cost_tooltip_info = ""; -item_cost_tooltip_info += $"Modifier from forge Master : X{forge_master_modifier}/n" -item_cost_tooltip_info += $"Mechanicus Relations : X{mechanicus_modifier}/n" -item_cost_tooltip_info += $"Chapter tech approach (obj_controller.tech_status) : X{tech_heretic_modifier}/n" - - -/* */ -/* */ +hover = 0; +shop = ""; +click = 0; +click2 = 0; +discount = 0; +construction_started = 0; +eta = 0; +target_comp = obj_controller.new_vehicles; + +slate_panel = new DataSlate(); +scroll_point=0; +tooltip_show = 0; +tooltip = ""; +tooltip_stat1 = 0; +tooltip_stat2 = 0; +tooltip_stat3 = 0; +tooltip_stat4 = 0; +tooltip_other = ""; +last_item = ""; +forge_master = scr_role_count("Forge Master", "", "units"); +if (array_length(forge_master)>0){ + forge_master=forge_master[0]; +} else { + forge_master="none"; +} +mechanicus_modifier = (((obj_controller.disposition[eFACTION.Mechanicus]-50)/200)*-1)+1 +var research = obj_controller.production_research; +shop = "equipment"; +/*if (obj_controller.menu=55) then shop="equipment"; +if (obj_controller.menu=56) then shop="vehicles"; +if (obj_controller.menu=57) then shop="warships"; +if (obj_controller.menu=58) then shop="equipment2";*/ +if (instance_number(obj_shop) > 1) { + var war; + war = instance_nearest(0, 0, obj_shop); + shop = war.shop; + with(war) { + instance_destroy(); + } + x = 0; + y = 0; +} + +var research = obj_controller.production_research; +var research_pathways = obj_controller.production_research_pathways; +var i, rene; +i = -1; +rene = 0; +repeat(80) { + i += 1; + item[i] = ""; + x_mod[i] = 0; + item_stocked[i] = 0; + mc_stocked[i] = 0; + item_cost[i] = 0; + nobuy[i] = 0; + forge_cost[i]=0; + tooltip_overide[i]=0; +} +if (obj_controller.faction_status[eFACTION.Imperium] = "War") { + rene = 1; + with(obj_temp6) { + instance_destroy(); + } + with(obj_star) { + var u; + u = 0; + repeat(4) { + u += 1; + if (p_type[u] = "Forge") and(p_owner[u] = 1) then instance_create(x, y, obj_temp6); + } + } + if (instance_exists(obj_temp6)) then rene = 0; + with(obj_temp6) { + instance_destroy(); + } +} + +tab_buttons = { + "equipment":new MainMenuButton(spr_ui_but_3, spr_ui_hov_3), + "armour":new MainMenuButton(spr_ui_but_3, spr_ui_hov_3), + "vehicles":new MainMenuButton(spr_ui_but_3, spr_ui_hov_3), + "ships":new MainMenuButton(spr_ui_but_3, spr_ui_hov_3), +} +var require_tool_tip = "requires: #" +if (shop = "equipment") { + i = 0; + i += 1; + item[i] = "Combat Knife"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 1; + forge_cost[i] = 10; + i += 1; + item[i] = "Chainsword"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 4; + forge_cost[i] = 40; + i += 1; + x_mod[i] = 9; + item[i] = "Eviscerator"; + if (research.chain[0]>0){ + forge_cost[i] = 150; + } else { + tooltip_overide[i] = $"{require_tool_tip} {research_pathways.chain[0][0]}" + } + item_stocked[i] = scr_item_count(item[i]); + nobuy[i] = 1; + i += 1; + item[i] = "Chainaxe"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 10; + forge_cost[i] = 40; + i += 1; + + + item[i] = "Power Axe"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 40; + if (research.power_fields[0]>1){ + forge_cost[i] = 100; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Power Sword"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 25; + if (research.power_fields[0]>1){ + forge_cost[i] = 100; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Power Spear"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 40; + if (research.power_fields[0]>1){ + forge_cost[i] = 100; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Crozius Arcanum"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 75; + if (research.power_fields[0]>1){ + forge_cost[i] = 150; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Power Fist"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 60; + if (research.power_fields[0]>1){ + forge_cost[i] = 150; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Boltstorm Gauntlet"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 90; + if (research.power_fields[0]>1&& research.bolt[0]>=2){ + forge_cost[i] = 300; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + /*i += 1; + item[i] = "Executioner Power Axe"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 100; + if (research.power_fields[0]>1){ + forge_cost[i] = 300; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + forge_cost[i] = 0; + }*/ + i += 1; + item[i] = "Power Mace"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 50; + if (research.power_fields[0]>1){ + forge_cost[i] = 140; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + if (global.chapter_name == "Dark Angels"){ + i += 1; + item[i] = "Mace of Absolution"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 70; + if (research.power_fields[0]>1){ + forge_cost[i] = 160; + } + } + i += 1; + item[i] = "Lightning Claw"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 90; + if (research.power_fields[0]>1){ + forge_cost[i] = 150; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Chainfist"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 75; + if (research.power_fields[0]>1 && research.chain[0]>0){ + forge_cost[i] = 150; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Force Staff"; + item_stocked[i] = scr_item_count(item[i]); + if (research.psi[0]>0){ + forge_cost[i] = 500; + } + item_cost[i] = 70; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Force Sword"; + item_stocked[i] = scr_item_count(item[i]); + if (research.psi[0]>0){ + forge_cost[i] = 400; + } + item_cost[i] = 55; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Force Axe"; + item_stocked[i] = scr_item_count(item[i]); + if (research.psi[0]>0){ + forge_cost[i] = 450; + } + item_cost[i] = 60; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Thunder Hammer"; + if (research.power_fields[0]>1){ + forge_cost[i] = 500; + } + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 90; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Heavy Thunder Hammer"; + if (research.power_fields[0]>1){ + forge_cost[i] = 750; + } + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 135; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Lascutter"; + forge_cost[i] = 500; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 15; + i += 1; + x_mod[i] = 9; + item[i] = "Boarding Shield"; + forge_cost[i] = 100; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 20; + i += 1; + x_mod[i] = 9; + item[i] = "Storm Shield"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 50; + if (research.power_fields[0]>1){ + forge_cost[i] = 500; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Company Standard"; + forge_cost[i] = 2000; + nobuy[i] = 1; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + + + i += 1; + item[i] = "Bolt Pistol"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 5; + forge_cost[i] = 50; + i += 1; + item[i] = "Bolter"; + forge_cost[i] = 100; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 10; + i += 1; + item[i] = "Stalker Pattern Bolter"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 80; + forge_cost[i] = 230; + i += 1; + item[i] = "Shotgun"; + forge_cost[i] = 100; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 10; + i += 1; + x_mod[i] = 9; + item[i] = "Combiflamer"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 200; + if (research.bolt[0]<1 || research.flame[0]<1) then forge_cost[i] = 0; + item_cost[i] = 35; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Combiplasma"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 450; + if (research.bolt[0]<1 || research.plasma[0]<1) then forge_cost[i] = 0; + item_cost[i] = 110; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Combimelta"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 350; + if (research.bolt[0]<1 || research.melta[0]<1) then forge_cost[i] = 0; + item_cost[i] = 40; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Combigrav"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 450; + if (research.bolt[0]<1 || research.grav[0]<1) then forge_cost[i] = 0; + item_cost[i] = 110; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Heavy Bolter"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 50; + if (research.bolt[0]>=2) then forge_cost[i] = 300; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Storm Bolter"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 50; + if (research.bolt[0]>=2) then forge_cost[i] = 300; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Infernus Pistol"; + forge_cost[i] = 100; + if (research.flame[0]<1) then forge_cost[i] = 0; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 12; + i += 1; + item[i] = "Wrist-Mounted Storm Bolter"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 80; + forge_cost[i] = 300; + if (research.bolt[0]<2) then forge_cost[i] = 0; + nobuy[i] = 1; + i += 1; + item[i] = "Hand Flamer"; + forge_cost[i] = 75; + if (research.flame[0]<1) then forge_cost[i] = 0; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 12; + i += 1; + item[i] = "Flamer"; + forge_cost[i] = 150; + if (research.flame[0]<1) then forge_cost[i] = 0; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 25; + i += 1; + item[i] = "Heavy Flamer"; + forge_cost[i] = 350; + if (research.flame[0]<1) then forge_cost[i] = 0; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 40; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + + i += 1; + item[i] = "Incinerator"; + item_stocked[i] = scr_item_count(item[i]); + nobuy[i] = 1; + forge_cost[i] = 350; + if (research.flame[0]<1) then forge_cost[i] = 0; + // i += 1; + // item[i] = "Integrated Bolter"; + // item_stocked[i] = scr_item_count(item[i]); + // item_cost[i] = 120; + i += 1; + item[i] = "Meltagun"; + forge_cost[i] = 250; + if (research.melta[0]<1) then forge_cost[i] = 0; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 30; + i += 1; + item[i] = "Multi-Melta"; + forge_cost[i] = 350; + if (research.melta[0]<1) then forge_cost[i] = 0; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 60; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Plasma Pistol"; + forge_cost[i] = 250; + if (research.plasma[0]<1) then forge_cost[i] = 0; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 60; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Plasma Gun"; + forge_cost[i] = 350; + if (research.plasma[0]<1) then forge_cost[i] = 0; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 100; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Plasma Cannon"; + forge_cost[i] = 600; + if (research.plasma[0]<1) then forge_cost[i] = 0; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 300; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Grav-Pistol"; + forge_cost[i] = 250; + if (research.grav[0]<1) then forge_cost[i] = 0; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 60; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Grav-Gun"; + forge_cost[i] = 350; + if (research.grav[0]<1) then forge_cost[i] = 0; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 100; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Grav-Cannon"; + forge_cost[i] = 600; + if (research.grav[0]<1) then forge_cost[i] = 0; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 300; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Archeotech Laspistol"; + item_stocked[i] = scr_item_count(item[i]); + nobuy[i] = 1; + i += 1; + x_mod[i] = 9; + item[i] = "Hellrifle"; + item_stocked[i] = scr_item_count(item[i]); + nobuy[i] = 1; + i += 1; + x_mod[i] = 9; + item[i] = "Webber"; + item_stocked[i] = scr_item_count(item[i]); + nobuy[i] = 1; + i += 1; + item[i] = "Sniper Rifle"; + forge_cost[i] = 200; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 10; + if (global.chapter_name == "Deathwatch"){ + i += 1; + item[i] = "Deathwatch Sniper Rifle"; + forge_cost[i] = 500; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 200; + } + i += 1; + item[i] = "Missile Launcher"; + forge_cost[i] = 300; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 70; + i += 1; + item[i] = "Lascannon"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 500; + if (research.las[0]<1) then forge_cost[i] = 0; + item_cost[i] = 70; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + //Debug space for 30k weapons + //Volkite Pack + item[i] = "Volkite Serpenta"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + nobuy[i] = 1; + i += 1; + nobuy[i] = 1; + item[i] = "Volkite Charger"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Volkite Caliver"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] ="Volkite Culverin"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + //Bolt Pack + item[i] = "Phobos Bolt Pistol"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Phobos Bolter"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Mars Heavy Bolter"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Tigris Combi Bolter"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + //Plasma Pack + item[i] = "Ryza Plasma Gun"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Ryza Plasma Pistol"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Mars Plasma Cannon"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Primus Melta Gun"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Proteus Multi-Melta"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Phaestos Flamer"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Power Scythe"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Ryza Lascannon"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i] = 1; + item[i] = "Cthon Autocannon"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + item[i] = "Contemptor Dreadnought"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + nobuy[i]=1 + i += 1; + nobuy[i]=1; + item[i] = "Twin-linked Volkite Culverins"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + nobuy[i]=1; + item[i] = "Contemptor CCW"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + nobuy[i]=1; + i += 1; + item[i] = "Heavy Conversion Beamer"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + nobuy[i]=1; + i += 1; + item[i] = "Kheres Assault Cannon"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + nobuy[i]=1; + i += 1; + + + var mc = 0; + repeat(i) { + mc++; + if (item[mc] != ""){ + mc_stocked[mc] = scr_item_count(item[mc], "master_crafted"); + } + } +} +if (shop = "equipment2") { + i = 0; + i += 1; + item[i] = "MK3 Iron Armour"; + item_stocked[i] = scr_item_count("MK3 Iron Armour"); + nobuy[i] = 1; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + if (obj_controller.in_forge){ + if (research.armour[1].armour[0]>2){ + forge_cost[i] = 1250; + } else { + tooltip_overide[i] = "requires : #"; + for (var r = research.armour[1].armour[0]; r < 3;r++){ + tooltip_overide[i] += $" {research_pathways.armour[1].armour[0][r]}#"; + } + } + } + + i += 1; + var mk_4_able = false; + var mk_4_tool_tip = "" + item[i] = "MK4 Maximus"; + item_stocked[i] = scr_item_count("MK4 Maximus"); + if (obj_controller.in_forge){ + if (research.armour[1].stealth[0] >0 && research.armour[1].armour[0] >1){ + forge_cost[i] = 1250; + mk_4_able=true; + } else { + tooltip_overide[i] = "requires : #"; + if (research.armour[1].stealth[0] < 1){ + tooltip_overide[i] += $" {research_pathways.armour[1].stealth[0][0]}#"; + for (var r = research.armour[1].armour[0]; r < 2;r++){ + tooltip_overide[i] += $" {research_pathways.armour[1].armour[0][r]}#"; + } + } + mk_4_tool_tip = tooltip_overide[i]; + } + + } + nobuy[i] = 1; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "MK5 Heresy"; + item_stocked[i] = scr_item_count("MK5 Heresy"); + item_cost[i] = 45; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "MK6 Corvus"; + item_stocked[i] = scr_item_count("MK6 Corvus"); + item_cost[i] = 35; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + if (obj_controller.in_forge){ + if (research.armour[1].stealth[0] > 0){ + forge_cost[i] = 1400; + } else { + tooltip_overide[i] = "requires : #"; + if (research.armour[1].stealth[0] < 1){ + tooltip_overide[i] += $" {research_pathways.armour[1].stealth[0][0]}#"; + } + } + } + + i += 1; + item[i] = "MK7 Aquila"; + item_stocked[i] = scr_item_count("MK7 Aquila"); + item_cost[i] = 20; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + if (obj_controller.in_forge){ + if (research.armour[0] > 0){ + forge_cost[i] = 1000; + } else { + tooltip_overide[i] = "requires : #"; + if (research.armour[0] < 1){ + tooltip_overide[i] += $" {research_pathways.armour[0][0]}#"; + } + } + } + + i += 1; + item[i] = "MK8 Errant"; + item_stocked[i] = scr_item_count("MK8 Errant"); + nobuy[i] = 1; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + if (obj_controller.in_forge){ + if (research.armour[0] > 1){ + forge_cost[i] = 1000; + } else { + tooltip_overide[i] = "requires : #"; + if (research.armour[0] < 2 && mk_4_able){ + tooltip_overide[i] += $" {research_pathways.armour[0][1]}#"; + } else { + tooltip_overide[i] = mk_4_tool_tip; + } + } + } + i += 1; + item[i] = "Scout Armour"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 200; + item_cost[i] = 5; + i += 1; + item[i] = "Artificer Armour"; + item_stocked[i] = scr_item_count("Artificer Armour"); + nobuy[i] = 1; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } +if (research.armour[1].stealth[0] > 0 && research.armour[1].armour[0] > 1) { + forge_cost[i] = 1500; +} else { + tooltip_overide[i] = "requires : \n"; + if (research.armour[1].stealth[0] < 1) { + tooltip_overide[i] += $" {research_pathways.armour[1].stealth[0][0]}\n"; + for (var r = research.armour[1].armour[0]; r < 2; r++) { + tooltip_overide[i] += $" {research_pathways.armour[1].armour[0][r]}\n"; + } + } + mk_4_tool_tip = tooltip_overide[i]; + +} + i += 1; + item[i] = "Terminator Armour"; + item_stocked[i] = scr_item_count("Terminator Armour"); + nobuy[i] = 1; +if (research.armour[1].stealth[0] > 0 && research.armour[1].armour[0] > 1 && obj_controller.stc_wargear >= 6) { + forge_cost[i] = 2000; +} else { + tooltip_overide[i] = "requires : \n"; + if (research.armour[1].stealth[0] < 1) { + tooltip_overide[i] += $" {research_pathways.armour[1].stealth[0][0]}\n"; + for (var r = research.armour[1].armour[0]; r < 2; r++) { + tooltip_overide[i] += $" {research_pathways.armour[1].armour[0][r]}\n"; + } + } + mk_4_tool_tip = tooltip_overide[i]; + tooltip_overide[i] += $"STC wargear component 6"; +} + // if (rene=1){nobuy[i]=1;item_cost[i]=0;} +i += 1; +item[i] = "Tartaros"; +item_stocked[i] = scr_item_count("Tartaros"); +nobuy[i] = 1; +if (research.armour[1].stealth[0] > 0 && research.armour[1].armour[0] > 1 && obj_controller.stc_wargear >= 6) { + forge_cost[i] = 2500; +} else { + tooltip_overide[i] = "requires : \n"; + if (research.armour[1].stealth[0] < 1) { + tooltip_overide[i] += $" {research_pathways.armour[1].stealth[0][0]}\n"; + for (var r = research.armour[1].armour[0]; r < 2; r++) { + tooltip_overide[i] += $" {research_pathways.armour[1].armour[0][r]}\n"; + } + } + mk_4_tool_tip = tooltip_overide[i]; + tooltip_overide[i] += $"STC wargear component 6"; +} + i += 1; + item[i] = "Cataphractii"; + item_stocked[i] = scr_item_count("Cataphractii"); + nobuy[i] = 1; + + i += 1; + x_mod[i] = 9; + item[i] = "Jump Pack"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 250; + item_cost[i] = 20; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + + i += 1; + x_mod[i] = 9; + nobuy[i] = 1; + item[i] = "Serpha Jump Pack"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + + i += 1; + x_mod[i] = 9; + item[i] = "Heavy Weapons Pack"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 250; + item_cost[i] = 25; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + + i += 1; + x_mod[i] = 9; + item[i] = "Servo-harness"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 1500; + item_cost[i] = 150; + if (obj_controller.stc_wargear >= 6) { + forge_cost[i] = 400; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + + i += 1; + x_mod[i] = 9; + item[i] = "Conversion Beamer Pack"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 180; + if (research.grav[0]>=1 && research.flame[0]>=1 && research.las[0]>=1 && research.plasma[0]>=1 ) then forge_cost[i] = 450; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + + i += 1; + x_mod[i] = 9; + item[i] = "Cyclone Missile System"; + forge_cost[i] = 350; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 150; + + i += 1; + x_mod[i] = 9; + item[i] = "Servo-arm"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 750; + item_cost[i] = 30; + forge_cost[i] = 150; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + + i += 1; + x_mod[i] = 9; + item[i] = "Bionics"; + forge_cost[i] = 20; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 5; + i += 1; + x_mod[i] = 9; + item[i] = "Narthecium"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 500; + item_cost[i] = 10; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Psychic Hood"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 1000; + item_cost[i] = 100; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Combat Shield"; + forge_cost[i] = 75; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 15; + i += 1; + x_mod[i] = 9; + item[i] = "Rosarius"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 1500; + item_cost[i] = 100; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Iron Halo"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 2000; + item_cost[i] = 300; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Plasma Bomb"; + forge_cost[i] = 1500; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 175; + + i += 1; + x_mod[i] = 9; + item[i] = "Exterminatus"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 2500; + + i += 1; + x_mod[i] = 9; + item[i] = "Gene Pod Incubator"; + item_stocked[i] = scr_item_count(item[i]); + nobuy[i] = 1; + item_cost[i] = 0; + forge_cost[i] = 80; + + mc=0; + repeat(i) { + mc += 1; + if (item[mc] != ""){ + mc_stocked[i] = scr_item_count(item[mc], "master_crafted"); + } + } + +} + +var player_hanger = min(array_length(obj_controller.player_forge_data.vehicle_hanger),1); +if (shop = "vehicles") { + i = 0; + i += 1; + item[i] = "Rhino"; + item_stocked[i] = scr_vehicle_count(item[i], ""); + forge_cost[i] = 1500*player_hanger; + item_cost[i] = 120; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Predator"; + item_stocked[i] = scr_vehicle_count(item[i], ""); + forge_cost[i] = 3000*player_hanger; + item_cost[i] = 240; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Autocannon Turret"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 30; + if (research.bolt[0]> 2) then forge_cost[i] = 150*player_hanger; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Twin Linked Lascannon Turret"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 60; + if (research.las[0]>1) then forge_cost[i] = 400*player_hanger; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Heavy Bolter Sponsons"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 38; + forge_cost[i] = 100*player_hanger; + if (research.bolt[0]> 2) then forge_cost[i] = 100*player_hanger; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Heavy Flamer Sponsons"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 50; + forge_cost[i] = 150*player_hanger; + if (research.flame[0]<1) then forge_cost[i] = 0; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Lascannon Sponsons"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 60; + if (research.las[0]>1) then forge_cost[i] = 300; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Land Raider"; + item_stocked[i] = scr_vehicle_count(item[i], ""); + nobuy[i] = 1; + if (obj_controller.stc_vehicles >= 6) { + nobuy[i] = 0; + item_cost[i] = 500; + forge_cost[i] = 4500*player_hanger; + } + if (rene=1) { + nobuy[i]=1; + item_cost[i]=0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Twin Linked Heavy Bolter Mount"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 28; + if (research.bolt[0]> 2) then forge_cost[i] = 250*player_hanger; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Quad Linked Heavy Bolter Sponsons"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 60; + if (research.bolt[0]> 3) then forge_cost[i] = 350*player_hanger; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Twin Linked Assault Cannon Mount"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 60; + if (research.bolt[0]> 3) then forge_cost[i] = 400*player_hanger; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Flamestorm Cannon Sponsons"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 100; + forge_cost[i] = 300*player_hanger; + if (research.flame[0]<1) then forge_cost[i] = 0; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Hurricane Bolter Sponsons"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 70; + if (research.bolt[0]> 3) then forge_cost[i] = 300*player_hanger; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Twin Linked Lascannon Sponsons"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 120; + if (research.las[0]>1) then forge_cost[i] = 250*player_hanger; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Whirlwind"; + item_stocked[i] = scr_vehicle_count(item[i], ""); + item_cost[i] = 180; + forge_cost[i] = 2000*player_hanger; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "HK Missile"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 10; + forge_cost[i] = 250*player_hanger; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Land Speeder"; + item_stocked[i] = scr_vehicle_count(item[i], ""); + nobuy[i] = 1; + if (obj_controller.stc_vehicles >= 6) { + nobuy[i] = 0; + item_cost[i] = 120; + forge_cost[i] = 700*player_hanger; + } + i += 1; + x_mod[i] = 9; + item[i] = "Twin Linked Bolters"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 8; + if (research.bolt[0]>= 2) then forge_cost[i] = 150*player_hanger; + i += 1; + item[i] = "Bike"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 35; + forge_cost[i] = 150*player_hanger; + i += 1; + item[i] = "Dreadnought"; + item_stocked[i] = scr_item_count(item[i]); + nobuy[i] = 1; // if (rene=1){nobuy[i]=1;item_cost[i]=0;} +if (research.armour[1].stealth[0] > 0 && research.armour[1].armour[0] > 1 && obj_controller.stc_wargear >= 6) { + forge_cost[i] = 3000; +} else { + tooltip_overide[i] = "requires : \n"; + if (research.armour[1].stealth[0] < 1) { + tooltip_overide[i] += $" {research_pathways.armour[1].stealth[0][0]}\n"; + for (var r = research.armour[1].armour[0]; r < 2; r++) { + tooltip_overide[i] += $" {research_pathways.armour[1].armour[0][r]}\n"; + } + } + mk_4_tool_tip = tooltip_overide[i]; + tooltip_overide[i] += $"STC wargear component 6"; +} + i += 1; + x_mod[i] = 9; + item[i] = "Close Combat Weapon"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 45; + forge_cost[i] = 200*player_hanger; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Twin Linked Heavy Bolter"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 110; + if (research.bolt[0]> 2) then forge_cost[i] = 150*player_hanger; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Twin Linked Lascannon"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 110; + if (research.las[0]>1) then forge_cost[i] = 150*player_hanger; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Autocannon"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 80; + if (research.bolt[0]> 2) then forge_cost[i] = 150; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Inferno Cannon"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 115; + forge_cost[i] = 250*player_hanger; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Dreadnought Lightning Claw"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 185; + forge_cost[i] = 250*player_hanger; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Assault Cannon"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 75; + if (research.bolt[0]> 2) then forge_cost[i] = 350; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Dreadnought Power Claw"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 150; + forge_cost[i] = 200*player_hanger; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Whirlwind Missiles"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 90; + forge_cost[i] = 250*player_hanger; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Heavy Conversion Beam Projector"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 350*player_hanger; + nobuy[i] = 1; + if (rene = 1) { + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Plasma Destroyer Turret"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 400*player_hanger; + nobuy[i] = 1; + if (rene = 1) { + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Flamestorm Cannon Turret"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 400*player_hanger; + nobuy[i] = 1; + if (rene = 1) { + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Magna-Melta Turret"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 400*player_hanger; + nobuy[i] = 1; + if (rene = 1) { + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Neutron Blaster Turret"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 450*player_hanger; + nobuy[i] = 1; + if (rene = 1) { + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Volkite Saker Turret"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 400*player_hanger; + nobuy[i] = 1; + if (rene = 1) { + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Volkite Culverin Sponsons"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 350*player_hanger; + nobuy[i] = 1; + if (rene = 1) { + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Twin Linked Volkite Culverin Sponsons"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 400*player_hanger; + nobuy[i] = 1; + if (rene = 1) { + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Twin Linked Multi-Melta Sponsons"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 200; + forge_cost[i] = 200*player_hanger; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Twin Linked Heavy Flamer Sponsons"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 200*player_hanger; + item_cost[i] = 150; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Reaper Autocannon Mount"; + item_stocked[i] = scr_item_count(item[i]); + forge_cost[i] = 250*player_hanger; + nobuy[i] = 1; + if (rene = 1) { + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Void Shield"; + item_stocked[i] = scr_item_count(item[i]); + nobuy[i] = 1; + if (obj_controller.stc_vehicles >= 6) { + nobuy[i] = 0; + item_cost[i] = 500; + forge_cost[i] = 2000*player_hanger; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Lucifer Pattern Engine"; + item_stocked[i] = scr_item_count(item[i]); + nobuy[i] = 1; + if (obj_controller.stc_vehicles >= 6) { + nobuy[i] = 0; + item_cost[i] = 90; + forge_cost[i] = 1250*player_hanger; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Artificer Hull"; + item_stocked[i] = scr_item_count(item[i]); + nobuy[i] = 1; + if (obj_controller.stc_vehicles >= 3) { + nobuy[i] = 0; + item_cost[i] = 200; + forge_cost[i] = 1000*player_hanger; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Armoured Ceramite"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 120; + if (obj_controller.stc_vehicles >= 3) { + item_cost[i] = 200; + forge_cost[i] = 500*player_hanger; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Heavy Armour"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 50; + if (obj_controller.stc_vehicles >= 3) { + item_cost[i] = 200; + forge_cost[i] = 250*player_hanger; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Smoke Launchers"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 10; + if (obj_controller.stc_vehicles >= 3) { + item_cost[i] = 200; + forge_cost[i] = 250*player_hanger; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Dozer Blades"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 10; + if (obj_controller.stc_vehicles >= 3) { + item_cost[i] = 200; + forge_cost[i] = 200*player_hanger; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Searchlight"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 15; + if (obj_controller.stc_vehicles >= 3) { + item_cost[i] = 200; + forge_cost[i] = 250*player_hanger; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Frag Assault Launchers"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 30; + if (obj_controller.stc_vehicles >= 3) { + item_cost[i] = 200; + forge_cost[i] = 250*player_hanger; + } + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } +} +if (shop = "warships") { + i = 0; + i += 1; + item[i] = "Battle Barge"; + item_stocked[i] = scr_ship_count(item[i]); + item_cost[i] = 20000; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Strike Cruiser"; + item_stocked[i] = scr_ship_count(item[i]); + item_cost[i] = 8000; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Gladius"; + item_stocked[i] = scr_ship_count(item[i]); + item_cost[i] = 2250; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + item[i] = "Hunter"; + item_stocked[i] = scr_ship_count(item[i]); + item_cost[i] = 3000; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } + i += 1; + x_mod[i] = 9; + item[i] = "Cyclonic Torpedo"; + item_stocked[i] = scr_item_count(item[i]); + nobuy[i] = 1; + if (rene = 1) { + nobuy[i] = 1; + item_cost[i] = 0; + } +} + + + +with(obj_p_fleet) { + if (capital_number > 0) and(action = "") { + var you; + you = instance_nearest(x, y, obj_star); + if (you.trader > 0) then obj_shop.discount = 1; + } +} +with(obj_star) { + if (array_contains(p_owner, 1)) and(trader > 0) then obj_shop.discount = 1; +} + + +if (shop = "equipment") or(shop = "equipment2") { + var disc; + disc = 1; + if (obj_controller.stc_wargear >= 1) then disc = 0.92; + if (obj_controller.stc_wargear >= 3) then disc = 0.86; + if (obj_controller.stc_wargear >= 5) then disc = 0.75; + var mc = 0; + repeat(i) { + mc++; + if (forge_cost[mc] > 1) then forge_cost[mc] = round(forge_cost[mc] * disc); + } +} +if (shop = "vehicles") { + var disc; + disc = 1; + if (obj_controller.stc_vehicles >= 1) then disc = 0.92; + if (obj_controller.stc_vehicles >= 3) then disc = 0.86; + if (obj_controller.stc_vehicles >= 5) then disc = 0.75; + var mc = 0; + repeat(31) { + mc += 1; + var ahuh; + ahuh = 1; + if (mc >= 7) and(mc <= 12) then ahuh = 0; + if (ahuh = 1) { + if (forge_cost[mc] > 1) then forge_cost[mc] = round(forge_cost[mc] * disc); + } + } +} +if (shop == "production"){ + i = 0; + var research_item; + if (research.flame[0] == 0){ + i++; + item[i] = ["research", research_pathways.flame[0][research.flame[0]], ["flame"]]; + item_stocked[i] = 0; + forge_cost[i] = 3000; + tooltip_overide[i] = "This research grants the ability to fabricate and harness Promethium Tanks, allowing for the construction of flame-based weaponry. This technology taps into the potent destructive potential of Promethium, turning it into a terrifying tool of war, capable of reducing enemies to ash.\nUnlocks: Flamers, Heavy Flamers, Incinerator.\nRequired for: Heavy Flamer Sponsons, Flamestorm Cannon Sponsons, Inferno Cannon, Servo-harness, Combi-flamer."; + + } + if (research.psi[0] == 0){ + i++; + item[i] = ["research", research_pathways.psi[0][research.psi[0]], ["psi"]]; + item_stocked[i] = 0; + forge_cost[i] = 3000; + tooltip_overide[i] = "This research unlocks the arcane art of crafting Force Weapons, allowing our trained psykers to channel the raw, untamed power of the Warp into tangible forms. It transforms ordinary melee implements into conduits of psychic fury, each blow imbued with devastating energy This grants our psykers the ability to strike down the mightiest foes, turning the tide of battle with the very power of the immaterium.\n\nUnlocks: Force Staff, Force Sword, Force Axe."; + } + if (research.las[0] == 0){ + i++; + item[i] = ["research", research_pathways.las[0][research.las[0]], ["las"]]; + item_stocked[i] = 0; + forge_cost[i] = 3000; + tooltip_overide[i] = "This research unveils the secrets of advanced Las Weaponry, a testament to the Imperium's mastery of directed energy. It allows the construction of more potent and reliable las weapons, each pulse of light capable of searing through armor and flesh alike. This empowers our forces with vastly enhanced range, penetration, and damage, ensuring the Emperor's light shines brighter against the encroaching darkness.\n\nUnlocks: Lascannon.\nRequired for: Twin Linked Lascannon Turret, Twin Linked Lascannon Sponsons, Twin Linked Lascannon."; + } + if (research.chain[0] == 0){ + i++; + item[i] = ["research", research_pathways.chain[0][research.chain[0]], ["chain"]]; + item_stocked[i] = 0; + forge_cost[i] = 3000; + tooltip_overide[i] = "This research unleashes the technology for Advanced Chain Weaponry, allowing us to produce tools of brutal, unrelenting destruction. It allows for the creation of weapons that tear and rend, leaving nothing but bloody ruin in their wake. Our warriors wield these instruments of carnage to devastating effect, carving through the ranks of our enemies with unstoppable fury. \n\nUnlocks: Eviscerator, Chainfist."; + } + if (research.plasma[0] == 0){ + i++; + item[i] = ["research", research_pathways.plasma[0][research.plasma[0]], ["plasma"]]; + item_stocked[i] = 0; + forge_cost[i] = 3000; + tooltip_overide[i] = "This research delves into the dangerous art of Plasma Weaponry, granting us the means to unleash the raw power of superheated plasma upon the enemy. This volatile technology produces weapons that can inflict devastating wounds, but its very nature demands a careful hand, lest its power consume the wielder. These weapons provide a high damage potential, capable of obliterating even heavily armored foes.\n\nUnlocks: Plasma Pistol, Plasma Gun, Plasma Cannon.\nRequired for: Combiplasma."; + } + if (research.bolt[0] == 1){ + i++; + item[i] = ["research",research_pathways.bolt[0][research.bolt[0]], ["bolt"]]; + item_stocked[i] = 0; + forge_cost[i] = 3000; + tooltip_overide[i] = "This research reveals the secrets of Advanced Bolt Weapons, an expansion of the Emperor's favored projectile weapons into more specialized and lethal forms. It is the pinnacle of projectile technology, combining explosive force with devastating impact. This provides our forces with a significant increase in firepower, ensuring that each shot finds its mark and shatters the foe. \n\nUnlocks: Stalker Pattern Bolter, Heavy Bolter, Heavy bolter Sponsons.\nRequired for: Combiflamer, Combiplasma, Combimelta, Combigrav, Assault Cannon, Autocannon Turret, Hurricane Bolter, Quad Linked Heavy Bolter Sponsons, Twin Linked Bolters, Twin Linked Heavy Bolter mount, Twin Linked assault cannon."; + } + if (research.bolt[0] == 2){ + i++; + item[i] = ["research","Advanced Weapon Integration and Targeting", ["bolt"]]; + item_stocked[i] = 0; + forge_cost[i] = 3000; + tooltip_overide[i] = "This research unlocks the divine secrets of Advanced Weapon Integration and Targeting, allowing for the creation of systems that connect the chapter’s weaponry with the Astartes in perfect harmony, enhancing their coordination and tactical prowess upon the Emperor's battlefields. It also allows for the construction of the devastating Assault Cannon and the mighty Autocannon for Predator tanks, making them instruments of divine vengeance, ensuring that the enemies of Mankind tremble before their might. This knowledge shall improve the efficiency of standard bolter weaponry, while also unleashing newer and more devastating tools of annihilation. \nUnlocks: Assault Cannon, Autocannon Turret, Twin Linked Heavy Bolter mount, Twin Linked bolter.\nRequired for: Hurricane Bolter, Quad Linked Heavy Bolter Sponsons, Twin linked assault cannon."; + } + if (research.bolt[0] == 3){ + i++; + item[i] = ["research","Integrated Weapon Stabilization and Rate of Fire Enhancements", ["bolt"]]; + item_stocked[i] = 0; + forge_cost[i] = 3000; + tooltip_overide[i] = "This research unlocks the sacred technology of Integrated Weapon Stabilization and Rate of Fire Enhancements, allowing our warriors to unleash bolter fire with unprecedented might, creating a maelstrom of righteous destruction upon the heretic and the alien. This divine advancement focuses on the inner workings of the weaponry, turning them into the Emperor's own instruments of divine wrath, rivaled only by the most sacred creations of the Machine God. Their might shall tear down the very fortresses of our foes, and their righteous fury shall cleanse the battlefield from all that would oppose the Imperium. \nUnlocks: Hurricane Bolter, Quad Linked Heavy Bolter Sponsons, Twin linked assault cannon."; + } + if (research.power_fields[0] < 2){ + i++; + item[i] = ["research",research_pathways.power_fields[0][research.power_fields[0]], ["power_fields"]]; + item_stocked[i] = 0; + forge_cost[i] = 3000; + tooltip_overide[i] = "This research unlocks the ancient science of Advanced Power Weapons, enhancing melee armaments with potent energy fields that disrupt the very bonds of matter. It is a testament to the power of technology, transforming ordinary weapons into instruments of righteous fury. This allows our warriors to devastate the most armored foes, cleaving through enemy ranks with the raw energy of the machine god.\n\nUnlocks: Power Axe, Power Sword, Power Spear, Crozius Arcanum, Power Fist, Power Mace, Lightning Claw, Chainfist, Thunder Hammer, Heavy Thunder Hammer, Storm Shield."; + } + if (research.melta[0] == 0){ + i++; + item[i] = ["research",research_pathways.melta[0][research.melta[0]], ["melta"]]; + item_stocked[i] = 0; + forge_cost[i] = 3000; + tooltip_overide[i] = "This research unlocks the terrifying potential of Basic Melta Weaponry, granting us the ability to unleash the searing heat of miniature suns upon the enemy. These weapons melt through armor and fortifications with unparalleled ease. This enhances our anti-tank capabilities, allowing our forces to shatter enemy vehicles and fortifications, leaving only molten slag in their wake.\n\nUnlocks: Meltagun, Multi-Melta.\nRequired for: Combimelta"; + } + if (research.grav[0] == 0){ + i++; + item[i] = ["research", research_pathways.grav[0][research.grav[0]], ["grav"]]; + item_stocked[i] = 0; + forge_cost[i] = 3000; + tooltip_overide[i] = "This research unravels the enigmatic science of Grav Weapons, allowing us to manipulate the very fabric of gravity for destructive purposes. These weapons crush and pulverize their targets with the force of collapsing worlds. They become the bane of armored units, allowing our forces to annihilate heavy infantry and vehicles with the very force of celestial bodies. \n\nUnlocks: Grav-Pistol, Grav-Gun, Grav-Cannon.\nRequired for: Combigrav"; + } + if (research.armour[0]>0){ + if (research.armour[1].stealth[0] == 0){ + i++; + item[i] = ["research","Advanced Servo Motors", ["armour", "stealth"]]; + item_stocked[i] = 0; + forge_cost[i] = 3000; + tooltip_overide[i] = "This research unlocks the secrets of Advanced Servo Motors, allowing the fabrication of enhanced movement systems, greatly boosting the speed and agility of our warriors. The speed and maneuverability increase will provide our troops with a significant advantage. It also unlocks the construction of specialized armors and advanced items.\n\nUnlocks: Mk6 Corvus.\nRequired for: Artificer Armour, Terminator Armour, Tartaros."; + } + if (research.armour[1].armour[0] == 0){ + i++; + item[i] = ["research","Advanced Ceramite Bonding", ["armour", "armour"]]; + item_stocked[i] = 0; + forge_cost[i] = 3000; + tooltip_overide[i] = "This research uncovers the lost techniques of Advanced Ceramite Bonding, allowing us to create superior armors. It fortifies our war plate, offering unparalleled protection against enemy fire. This dramatically enhances the survivability of our units as well as unlocking new armor capabilities.\n\nUnlocks: MK3 Iron Armour.\nRequired for: MK8 Errant, Artificer Armour, Terminator Armour, Tartaros."; + } else if (research.armour[1].armour[0] == 2){ + i++; + item[i] = ["research","Ceremite Void Hardening", ["armour", "armour"]]; + item_stocked[i] = 0; + forge_cost[i] = 3000; + tooltip_overide[i] = "This research grants the secrets of Ceramite Void Hardening techniques, reinforcing our armors to withstand the harshest conditions of the void. It is essential for warriors who brave the vacuum of space, ensuring they can perform their duties where others would falter. It increases the unit's resilience in harsh environments as well as providing a superior armor plating. \n\nUnlocks: MK3 Iron Armour.\nRequired for: MK8 Errant, Artificer Armour."; + } + if (research.armour[0]==1){ + i++; + item[i] = ["research",research_pathways.armour[0][1], ["armour"]]; + item_stocked[i] = 0; + forge_cost[i] = 3000; + tooltip_overide[i] = "This research unlocks the knowledge to fabricate the Mk VIII 'Errant' pattern Power Armour, a refinement of the ubiquitous Aquila armour, often favored by veteran Astartes and officers due to its unparalleled protection. It features improved plating around the torso and neck, enhancing its resilience against both ranged and melee attacks. This technology marks the pinnacle of power armour technology and a significant step in the path to becoming a battle-hardened Astartes.\n\nUnlocks: MK8 Errant.\nRequired for: Artificer Armour."; + } + if (research.armour[1].stealth[0] == 1 && research.armour[1].armour[0] == 1){ + i++; + item[i] = ["research","Enhanced Nerve Interfacing", ["armour", "armour"]]; + item_stocked[i] = 0; + forge_cost[i] = 3000; + tooltip_overide[i] = "This research allows the creation of Enhanced Nerve Interfacing systems, binding unit and armor in perfect harmony. It augments the link between warrior and war plate, unlocking new levels of effectiveness. This provides the user with better accuracy, damage output, and mobility, unlocking new levels of tactical potential. \n\nUnlocks: MK4 Maximus."; + } + } else if (research.armour[0]==0){ + i++; + item[i] = ["research",research_pathways.armour[0][0], ["armour"]]; + item_stocked[i] = 0; + forge_cost[i] = 3000; + tooltip_overide[i] = "This research unlocks the knowledge to fabricate Mk VII 'Aquila' pattern Power Armour, the standard armour pattern for the Adeptus Astartes. It is a reliable and ubiquitous armour used by many Chapters that is also easy to construct and maintain, making it a stable base for the might of the Imperium's warriors.\n\nUnlocks: MK7 Aquila.\nRequired for: MK8 Errant, Artificer Armour, Terminator Armour, Tartaros."; + } + +} +legitimate_items = i; +if (shop = "warships") { + var disc; + disc = 1; + if (obj_controller.stc_ships >= 1) then disc = 0.92; + if (obj_controller.stc_ships >= 3) then disc = 0.86; + if (obj_controller.stc_ships >= 5) then disc = 0.75; + i = 0; + repeat(31) { + i += 1; + if (item_cost[i] > 1) then item_cost[i] = round(item_cost[i] * disc); + } +} +if (discount = 1) { + discount = 2; + i = 0; + repeat(31) { + i += 1; + if (item_cost[i] >= 5) then item_cost[i] = round(item_cost[i] * 0.8); + if (item_cost[i] > 1) and(item_cost[i] < 5) then item_cost[i] -= 1; + } +} + +if (rene = 1) { + i = 0; + repeat(31) { + i += 1; + item_cost[i] *= 2; + } +} +forge_master_modifier=0; +if (forge_master!="none"){ + forge_master_modifier = 2500/((forge_master.charisma+10)*forge_master.technology); + if (forge_master.has_trait("flesh_is_weak") && forge_master_modifier>0.75){ + forge_master_modifier-=0.1; + }; +} else { + forge_master_modifier=1.7; +} +var tech_heretic_modifier =1 + i = 0; + repeat(array_length(item_cost)-2){ + i += 1; + if (shop != "warships"){ + item_cost[i] *= 2; + } + if (rene != 1){ + item_cost[i]*=mechanicus_modifier; + if (obj_controller.tech_status=="heretics"){ + tech_heretic_modifier = 1.05; + item_cost[i]*=tech_heretic_modifier + } + } + item_cost[i] *= forge_master_modifier; + item_cost[i] = ceil(item_cost[i]); +} + +if (global.cheat_debug) { + var i_count = array_length(item_cost); + var empty_array = array_create(i_count, 0); + item_cost = empty_array; + forge_cost = array_create(i_count, 1); + nobuy = empty_array; +} + +item_cost_tooltip_info = ""; +item_cost_tooltip_info += $"Modifier from forge Master : X{forge_master_modifier}/n" +item_cost_tooltip_info += $"Mechanicus Relations : X{mechanicus_modifier}/n" +item_cost_tooltip_info += $"Chapter tech approach (obj_controller.tech_status) : X{tech_heretic_modifier}/n" + + +/* */ +/* */ + +/// @description Sells an item and adds resources to the player +/// @param {Real} item_index The index of the item in the global array +/// @param {Real} sell_count The quantity to sell +/// @param {Real} sell_modifier The value modifier (0.0-1.0) +/// @returns {Boolean} Whether the sale was successful +sell_item = function (item_index, sell_count, sell_modifier) { + if (item_stocked[item_index] >= sell_count) { + scr_add_item(item[item_index], (-sell_count), "standard"); + item_stocked[item_index] -= (sell_count); + var sell_price = (item_cost[item_index] * sell_modifier) * sell_count; + obj_controller.requisition += sell_price; + + return true; + } + return false; +} diff --git a/objects/obj_shop/Draw_0.gml b/objects/obj_shop/Draw_0.gml index fa355c09f8..1bbcee0d9e 100644 --- a/objects/obj_shop/Draw_0.gml +++ b/objects/obj_shop/Draw_0.gml @@ -1,4 +1,4 @@ - +add_draw_return_values(); var xx,yy,x2,y2; var romanNumerals=scr_roman_numerals(); xx=__view_get( e__VW.XView, 0 )+0; @@ -14,25 +14,27 @@ slate_panel.inside_method = function(){ draw_text(xx+962,yy+159,"Name"); draw_text(xx+962.5,yy+159.5,"Name"); if (shop!="production"){ - draw_text(xx+1280,yy+159,string_hash_to_newline("Stocked")); - draw_text(xx+1280.5,yy+159.5,string_hash_to_newline("Stocked")); + draw_text(xx+1280,yy+159,"Stocked"); + draw_text(xx+1280.5,yy+159.5,"Stocked"); if (shop="equipment" or shop="equipment2"){ - draw_text(xx+1280+10+string_width("Stocked"),yy+159.5,string_hash_to_newline("MC")); - draw_text(xx+1280+10.5+string_width("Stocked"),yy+159.5,string_hash_to_newline("MC")); + draw_text(xx+1280+10+string_width("Stocked"),yy+159.5,"MC"); + draw_text(xx+1280+10.5+string_width("Stocked"),yy+159.5,"MC"); } } - draw_text(xx+1430.5,yy+159.5,string_hash_to_newline("Cost")); + draw_text(xx+1410,yy+159,("Cost")); + draw_text(xx+1410.5,yy+159.5,("Cost")); draw_set_color(c_gray); if (shop="warships"){ if (construction_started>0){ - var apa=construction_started/30;draw_set_alpha(apa); + var apa=construction_started/30; + draw_set_alpha(apa); draw_set_color(c_yellow); draw_set_halign(fa_center); - draw_text_transformed(__view_get( e__VW.XView, 0 )+420,yy+370,string_hash_to_newline("CONSTRUCTION STARTED!#ETA: "+string(eta)+" months"),1.5,1.5,0); + draw_text_transformed(__view_get( e__VW.XView, 0 )+420,yy+370,$"CONSTRUCTION STARTED!\nETA: {eta} months",1.5,1.5,0); draw_set_halign(fa_left); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_alpha(1); } } @@ -49,7 +51,7 @@ slate_panel.inside_method = function(){ final=i; if (!obj_controller.in_forge && nobuy[i]=0) || (obj_controller.in_forge && forge_cost[i]>0){ draw_set_color(c_gray); - if (point_in_rectangle(mouse_x, mouse_y, xx+962, yy+y2+2, xx+1580, yy+y2+18)){ + if (scr_hit(xx+962, yy+y2+2, xx+1580, yy+y2+18)){ draw_set_color(c_gray); entered = true; draw_rectangle(xx+960, yy+y2+1, xx+1582, yy+y2+18, 0); @@ -57,8 +59,8 @@ slate_panel.inside_method = function(){ } if (shop!="production"){ - if (!keyboard_check(vk_shift)) or (shop="warships") then draw_text(xx+x2+x_mod[i],yy+y2,string_hash_to_newline(item[i]));// Name - if (keyboard_check(vk_shift)) and (shop!="warships") then draw_text(xx+x2+x_mod[i],yy+y2,string_hash_to_newline(string(item[i])+" x5"));// Name + if (!keyboard_check(vk_shift) || shop == "warships") then draw_text(xx+x2+x_mod[i], yy+y2, item[i]); // Name + if (keyboard_check(vk_shift) && shop != "warships") then draw_text(xx+x2+x_mod[i], yy+y2, string(item[i] + " x5")); // Name } else { draw_text(xx+x2+x_mod[i],yy+y2,string_hash_to_newline(item[i][1]));// Name } @@ -70,7 +72,7 @@ slate_panel.inside_method = function(){ if (obj_controller.in_forge){ draw_sprite_ext( spr_forge_points_icon,0, - xx+1430, + xx+1410, yy+y2+3, 0.3, 0.3, @@ -78,7 +80,7 @@ slate_panel.inside_method = function(){ c_white, 1); } else{ - draw_sprite_ext(spr_requisition,0,xx+1430,yy+y2+6,1,1,0,c_white,1); + draw_sprite_ext(spr_requisition,0,xx+1410,yy+y2+6,1,1,0,c_white,1); } draw_set_color(16291875) if (obj_controller.in_forge){ @@ -94,16 +96,38 @@ slate_panel.inside_method = function(){ if (keyboard_check(vk_shift)) then cost*=5; } - draw_text(xx+1447,yy+y2,cost);// Requisition + draw_text(xx+1427,yy+y2,cost);// Requisition + if (!obj_controller.in_forge ){ - if (obj_controller.requisition< cost) then draw_set_alpha(0.25); - } + if (!obj_controller.in_forge ){ + if (obj_controller.requisition < cost){ + draw_set_alpha(0.25); + } + draw_set_alpha(obj_controller.requisition < cost ? 0.25 : 1); + draw_sprite(spr_buy_tiny, 0, xx+1530, yy+y2+2); + // Restore for subsequent UI regardless of whether sell is drawn + draw_set_alpha(1); - draw_sprite(spr_build_tiny2,0,xx+1530,yy+y2+2); + if (shop != "warships" && shop != "vehicles" && item_stocked[i] > 0){ + draw_set_alpha(1); - draw_set_alpha(1); - var clicked =(point_in_rectangle(mouse_x, mouse_y, xx+1520, yy+y2+2, xx+1580, yy+y2+18)&& mouse_check_button_pressed(mb_left)); + var _button = draw_sprite_as_button([xx+1480,yy+y2+2], spr_sell_tiny); + if (scr_hit(_button)) { + var _sell_mod = SHOP_SELL_MOD; + tooltip = $"Send items back for {_sell_mod * 100}% of the requisition cost."; + tooltip_show=1; + if (scr_click_left()) { + var sell_mult_count = keyboard_check(vk_shift) ? 5 : 1; + sell_item(i, sell_mult_count, _sell_mod) + } + } + } + } + } + + var clicked = (point_and_click([xx+1520, yy+y2+2, xx+1570, yy+y2+14])); if (obj_controller.in_forge){ + draw_sprite(spr_build_tiny,0,xx+1530,yy+y2+2); if (clicked){ if (array_length(obj_controller.specialist_point_handler.forge_queue)<20){ var new_queue_item = { @@ -121,61 +145,72 @@ slate_panel.inside_method = function(){ array_push(obj_controller.specialist_point_handler.forge_queue, new_queue_item); } } - }else if (nobuy[i]=0) && clicked && (!obj_controller.in_forge){ + } else if (nobuy[i]=0 && clicked && !obj_controller.in_forge){ cost=item_cost[i]; - if (keyboard_check(vk_shift)) and (shop!="warships") then cost=item_cost[i]*5; + var _mult_count = keyboard_check(vk_shift) ?5 : 1; + if (shop!="warships"){ + cost *= _mult_count; + } + if (obj_controller.requisition>=cost) and (shop!="warships"){ - if (item[i]!="Rhino") and (item[i]!="Predator") and (item[i]!="Land Raider") and (item[i]!="Whirlwind") and (item[i]!="Land Speeder"){ - if (keyboard_check(vk_shift)){scr_add_item(item[i],5);item_stocked[i]+=5;click2=1;} - if (!keyboard_check(vk_shift)){scr_add_item(item[i],1);item_stocked[i]+=1;click2=1;} + + var _vehics = ["Rhino", "Predator", "Land Raider", "Whirlwind", "Land Speeder"]; + + if (!array_contains(_vehics, item[i])){ + scr_add_item(item[i],_mult_count); + item_stocked[i] += _mult_count; + click2 = true; } - if (item[i]="Rhino") or (item[i]="Predator") or (item[i]="Land Raider") or (item[i]="Whirlwind") or (item[i]="Land Speeder"){ - if (keyboard_check(vk_shift)){repeat(5){scr_add_vehicle(item[i],target_comp,"standard","standard","standard","standard","standard");}item_stocked[i]+=5;click2=1;} - if (!keyboard_check(vk_shift)){ - scr_add_vehicle(item[i],target_comp,"standard","standard","standard","standard","standard"); - item_stocked[i]+=1; - click2=1; + else{ + + repeat (_mult_count) { + scr_add_vehicle(item[i], target_comp, {}); + } + item_stocked[i] += _mult_count; + click2 = 1; + with (obj_ini) { + scr_vehicle_order(obj_shop.target_comp); } } - with(obj_ini){scr_vehicle_order(obj_shop.target_comp);} obj_controller.requisition-=cost; } - if (obj_controller.requisition>=cost) and (shop="warships"){ - var v=0,ev=0; - repeat(99){v+=1;if (ev=0) and (obj_controller.event[v]="") then ev=v;} - obj_controller.event[ev]="new_"+string(item[i]); + if (obj_controller.requisition>=cost) and (shop=="warships"){ - if (item[i]="Battle Barge") then obj_controller.event_duration[ev]=12; - if (item[i]="Strike Cruiser") then obj_controller.event_duration[ev]=4; - if (item[i]="Gladius") then obj_controller.event_duration[ev]=1; - if (item[i]="Hunter") then obj_controller.event_duration[ev]=1; - obj_controller.event_duration[ev]+=choose(0,0,1); - eta=obj_controller.event_duration[ev]; + var _duration = 4; + if (item[i]="Battle Barge"){ + _duration=30; + } + else if (item[i]="Strike Cruiser"){ + _duration=10; + } - construction_started=120;obj_controller.requisition-=cost; - } + eta = _duration; - obj_controller.cooldown=8000; - } + construction_started=120; + obj_controller.requisition -= cost; + add_event({ + e_id : "ship_construction", + ship_class : item[i], + duration : _duration, + }); + } + } } if (!obj_controller.in_forge && nobuy[i]=1) || (obj_controller.in_forge && forge_cost[i]=0){ draw_set_alpha(1); draw_set_color(881503); - draw_text(xx+x2+x_mod[i],yy+y2,string_hash_to_newline(item[i]));// Name + draw_text(xx+x2+x_mod[i],yy+y2,item[i]);// Name if (item_stocked[i]=0) then draw_set_alpha(0.5); - draw_text(xx+1300,yy+y2,string_hash_to_newline(item_stocked[i]));// Stocked + draw_text(xx+1300,yy+y2,item_stocked[i]);// Stocked draw_set_alpha(1); } - if (mouse_x>=xx+962) and (mouse_y>=yy+y2) and (mouse_x0) then construction_started-=1; +if (construction_started>0){ + construction_started-=1; +} /* */ diff --git a/objects/obj_star/Alarm_1.gml b/objects/obj_star/Alarm_1.gml index 36728dbecc..360fc6d552 100644 --- a/objects/obj_star/Alarm_1.gml +++ b/objects/obj_star/Alarm_1.gml @@ -179,13 +179,13 @@ if (owner == eFACTION.Ork){ if (p_population[4]>0) then p_orks[4]=1; if (p_orks[1]>0){p_orks[1]=choose(1,2,3,3,4,5); - if (p_type[1]="Forge") or (p_type[1]="Hive") then p_orks[1]=choose(5);} + if (p_type[1]="Forge") or (p_type[1]="Hive") then p_orks[1]=choose(4,5);} if (p_orks[2]>0){p_orks[2]=choose(1,2,3,3,4,5); - if (p_type[2]="Forge") or (p_type[2]="Hive") then p_orks[2]=choose(5);} + if (p_type[2]="Forge") or (p_type[2]="Hive") then p_orks[2]=choose(4,5);} if (p_orks[3]>0){p_orks[3]=choose(1,2,3,3,4,5); - if (p_type[3]="Forge") or (p_type[3]="Hive") then p_orks[3]=choose(5);} + if (p_type[3]="Forge") or (p_type[3]="Hive") then p_orks[3]=choose(4,5);} if (p_orks[4]>0){p_orks[4]=choose(1,2,3,3,4,5); - if (p_type[4]="Forge") or (p_type[4]="Hive") then p_orks[4]=choose(5);} + if (p_type[4]="Forge") or (p_type[4]="Hive") then p_orks[4]=choose(4,5);} } system_fleet=1; @@ -479,7 +479,6 @@ if (p_owner[2]=1){ } -obj_controller.alarm[9]=2; if (obj_controller.is_test_map!=true) and (p_owner[2]!=1){ for(var i=1; i<=4; i++){p_guardsmen[i]=0;} } diff --git a/objects/obj_star/Alarm_3.gml b/objects/obj_star/Alarm_3.gml index f55dfccb75..b9ba935667 100644 --- a/objects/obj_star/Alarm_3.gml +++ b/objects/obj_star/Alarm_3.gml @@ -51,11 +51,13 @@ try{ } } } - obj_controller.selecting_planet = _data.planet; - obj_controller.selection_data=false; - if (obj_controller.selecting_planet >0 && obj_controller.selecting_planet<5){ - obj_star_select.garrison = new GarrisonForce(p_operatives[obj_controller.selecting_planet]); + if (struct_exists(_data, "planet")){ + obj_controller.selecting_planet = _data.planet; + if (obj_controller.selecting_planet >0 && obj_controller.selecting_planet<5){ + obj_star_select.garrison = new GarrisonForce(p_operatives[obj_controller.selecting_planet]); + } } + obj_controller.selection_data=false; } } obj_controller.selection_data = false; diff --git a/objects/obj_star/Alarm_4.gml b/objects/obj_star/Alarm_4.gml index 9da8704d28..e69de29bb2 100644 --- a/objects/obj_star/Alarm_4.gml +++ b/objects/obj_star/Alarm_4.gml @@ -1,7 +0,0 @@ - -// Checks if the planet has industrial facilities to create an ork fleet -var rando=0,contin=0; - -for(var i=1; i<=planets; i++){ - ork_ship_production(i); -} diff --git a/objects/obj_star/Create_0.gml b/objects/obj_star/Create_0.gml index c3485ed9e3..a3200bd6ad 100644 --- a/objects/obj_star/Create_0.gml +++ b/objects/obj_star/Create_0.gml @@ -28,54 +28,47 @@ stored_owner = -1; star_surface = 0; // sets up default planet variables -for(run=1; run<=8; run++){ - planet[run]=0; - dispo[run]=-50; - p_type[run]=""; - p_operatives[run]=[]; - p_feature[run]=[]; - p_owner[run]=0; - p_first[run]=0; - p_population[run]=0; - p_max_population[run]=0; - p_large[run]=0; - p_pop[run]=""; - p_guardsmen[run]=0; - p_pdf[run]=0; - p_fortified[run]=0; - p_station[run]=0; - //warlord=0; uneeded i think - // Whether or not player forces are on the planet - p_player[run]=0; - p_lasers[run]=0; - p_silo[run]=0; - p_defenses[run]=0; - p_upgrades[run]=[]; - // v how much of a problem they are from 1-6 - p_orks[run]=0; - p_tau[run]=0; - p_eldar[run]=0; - p_tyranids[run]=0; - p_traitors[run]=0; - p_chaos[run]=0; - p_demons[run]=0; - p_sisters[run]=0; - p_necrons[run]=0; - p_halp[run]=0; - // current planet heresy - p_heresy[run]=0; - p_hurssy[run]=0; - p_hurssy_time[run]=0; - p_heresy_secret[run]=0; - p_influence[run] = array_create(15, 0); - - p_raided[run]=0; - // - p_governor[run] = ""; - p_problem[run] = array_create(8,""); - p_problem_other_data[run] = array_create(8,{}); - p_timer[run] = array_create(8,-1); -} +var _planet_array_size = 9; +planet = array_create(_planet_array_size, 0); +dispo = array_create(_planet_array_size, -50); +p_type = array_create(_planet_array_size, ""); +p_owner = array_create(_planet_array_size, 0); +p_first = array_create(_planet_array_size, 0); +p_population = array_create(_planet_array_size, 0); +p_max_population = array_create(_planet_array_size, 0); +p_large = array_create(_planet_array_size, 0); +p_pop = array_create(_planet_array_size, ""); +p_guardsmen = array_create(_planet_array_size, 0); +p_pdf = array_create(_planet_array_size, 0); +p_fortified = array_create(_planet_array_size, 0); +p_station = array_create(_planet_array_size, 0); +p_player = array_create(_planet_array_size, 0); +p_lasers = array_create(_planet_array_size, 0); +p_silo = array_create(_planet_array_size, 0); +p_defenses = array_create(_planet_array_size, 0); +p_orks = array_create(_planet_array_size, 0); +p_tau = array_create(_planet_array_size, 0); +p_eldar = array_create(_planet_array_size, 0); +p_tyranids = array_create(_planet_array_size, 0); +p_traitors = array_create(_planet_array_size, 0); +p_chaos = array_create(_planet_array_size, 0); +p_demons = array_create(_planet_array_size, 0); +p_sisters = array_create(_planet_array_size, 0); +p_necrons = array_create(_planet_array_size, 0); +p_halp = array_create(_planet_array_size, 0); +p_heresy = array_create(_planet_array_size, 0); +p_hurssy = array_create(_planet_array_size, 0); +p_hurssy_time = array_create(_planet_array_size, 0); +p_heresy_secret = array_create(_planet_array_size, 0); +p_raided = array_create(_planet_array_size, 0); +p_governor = array_create(_planet_array_size, ""); +p_operatives = array_create_advanced(_planet_array_size, []); +p_feature = array_create_advanced(_planet_array_size, []); +p_upgrades = array_create_advanced(_planet_array_size, []); +p_influence = array_create_advanced(_planet_array_size, array_create(15, 0)); +p_problem = array_create_advanced(_planet_array_size, array_create(8, "")); +p_problem_other_data = array_create_advanced(_planet_array_size, array_create_advanced(8, {})); +p_timer = array_create_advanced(_planet_array_size, array_create(8, -1)); system_player_ground_forces = 0; garrison = false; @@ -94,18 +87,18 @@ ai_d=-1; ai_e=-1; global.star_name_colors = [ - 38144, + c_gray, c_white, //player c_gray, //imperium c_red, // toaster fuckers - 38144, //nothing for inquisition + CM_GREEN_COLOR, //nothing for inquisition c_white, //ecclesiarchy #FF8000, //Hi, I'm Elfo #009500, // waagh #FECB01, // the greater good #AD5272,// bug boys c_dkgray, // chaos - 38144, //nothing for heretics either + CM_GREEN_COLOR, //nothing for heretics either #AD5272, //why 12 is skipped in general, we will never know #80FF00 // Sleepy robots ] diff --git a/objects/obj_star/Draw_0.gml b/objects/obj_star/Draw_0.gml index d26394473c..cf103abbff 100644 --- a/objects/obj_star/Draw_0.gml +++ b/objects/obj_star/Draw_0.gml @@ -43,8 +43,8 @@ if (global.load == -1 && (obj_controller.zoomed || in_camera_view(star_box_shape _reset = true; } - if (ds_map_exists(obj_controller.star_sprites, name)){ - var _old_sprite = ds_map_find_value(obj_controller.star_sprites, name); + if (ds_map_exists(global.star_sprites, name)){ + var _old_sprite = ds_map_find_value(global.star_sprites, name); if (sprite_exists(_old_sprite)){ if (_reset){ sprite_delete(_old_sprite); @@ -53,7 +53,7 @@ if (global.load == -1 && (obj_controller.zoomed || in_camera_view(star_box_shape _reset = true; } if (_reset){ - ds_map_delete(obj_controller.star_sprites, name); + ds_map_delete(global.star_sprites, name); } } else { _reset = true; @@ -84,16 +84,12 @@ if (global.load == -1 && (obj_controller.zoomed || in_camera_view(star_box_shape surface_reset_target(); stored_owner = owner; var _new_sprite = sprite_create_from_surface(star_tag_surface, 0, 0, surface_get_width(star_tag_surface), surface_get_height(star_tag_surface), false, false, 0, 0); - ds_map_set(obj_controller.star_sprites, name, _new_sprite); + ds_map_set(global.star_sprites, name, _new_sprite); surface_clear_and_free(star_tag_surface) } - var _sprite = ds_map_find_value(obj_controller.star_sprites, name) + var _sprite = ds_map_find_value(global.star_sprites, name) draw_sprite_ext(_sprite, 0, x-(64*scale), y, scale, scale, 1, c_white, 1); } draw_set_valign(fa_top) - - - - diff --git a/objects/obj_star/Mouse_50.gml b/objects/obj_star/Mouse_50.gml index 76cc360422..6b72c6513d 100644 --- a/objects/obj_star/Mouse_50.gml +++ b/objects/obj_star/Mouse_50.gml @@ -1,21 +1,27 @@ // Checks which systems you can see the planets -if (!instance_exists(obj_saveload) && !instance_exists(obj_drop_select) && !instance_exists(obj_bomb_select) && !global.ui_click_lock) { - var m_dist=point_distance(x,y,mouse_x,mouse_y); - var allow_click_distance = 20*scale; +if (obj_controller.menu != MENU.Default){ + exit; +} +if (instances_exist_any([obj_drop_select,obj_saveload,obj_bomb_select])){ + exit; +} +if (!global.ui_click_lock) { + var m_dist=point_distance(x,y,mouse_x,mouse_y); + var allow_click_distance = 20*scale; - if (obj_controller.location_viewer.is_entered) then exit; - // if ((obj_controller.zoomed==0) and (mouse_y <__view_get( e__VW.YView, 0 )+62)) or (obj_controller.menu!=0) then exit; - // if ((obj_controller.zoomed==0) and (mouse_y>__view_get( e__VW.YView, 0 )+830)) or (obj_controller.menu!=0) then exit; - if (p_type[1]=="Craftworld") and (obj_controller.known[eFACTION.Eldar]==0) then exit; - if (vision==0) then exit; - if (!scr_void_click()) then exit; + if (obj_controller.location_viewer.is_entered) then exit; + // if ((obj_controller.zoomed==0) and (mouse_y <__view_get( e__VW.YView, 0 )+62)) or (obj_controller.menu!=0) then exit; + // if ((obj_controller.zoomed==0) and (mouse_y>__view_get( e__VW.YView, 0 )+830)) or (obj_controller.menu!=0) then exit; + if (p_type[1]=="Craftworld") and (obj_controller.known[eFACTION.Eldar]==0) then exit; + if (vision==0) then exit; + if (!scr_void_click()) then exit; - if ((obj_controller.zoomed==0) and (m_disttarget.planets){ obj_controller.selecting_planet = 0; } var click_accepted = (!obj_controller.menu) and (!obj_controller.zoomed) and (!instance_exists(obj_bomb_select)) and (!instance_exists(obj_drop_select)); -if (click_accepted) { +if (click_accepted && (!debug || !debug_slate.entered())) { if (scr_click_left(0)) { var closes=0,sta1=0,sta2=0; var mouse_consts = return_mouse_consts(); @@ -74,7 +75,7 @@ if (click_accepted) { var shutters = [shutter_1, shutter_2, shutter_3, shutter_4]; for (var i=0; i<4;i++){ shutter_button = shutters[i]; - if (scr_hit(shutter_button.XX,shutter_button.YY,shutter_button.XX+shutter_button.width,shutter_button.YY+shutter_button.height)){ + if (shutter_button.hit()){ closes=false; break; } @@ -96,7 +97,14 @@ if (target.craftworld=1) then draw_sprite(spr_star_screen,5,27,165); if (target.space_hulk=1) then draw_sprite(spr_star_screen,6,27,165); if (target.craftworld=0) and (target.space_hulk=0) then draw_sprite_ext(target.sprite_index,target.image_index,77,287,1.25,1.25,0,c_white,1); -var system_string = target.name+" System" +var _screen_height = sprite_get_height(spr_star_screen); +var _screen_width = sprite_get_width(spr_star_screen); + +draw_sprite_ext(spr_servo_left_arm, 0,27+_screen_width,165+_screen_height/3, 2, 2, 0, c_white, 1); +draw_sprite_ext(spr_servo_right_arm, 0,27,165+_screen_height/3, 2, 2, 0, c_white, 1); +draw_sprite_ext(spr_servo_skull_head, 0,27+_screen_width/2,165, 2, 2, 0, c_white, 1); + +var system_string = target.name+" System"; if (target.owner!=1) then draw_set_color(0); if (target.owner = eFACTION.Player) then draw_set_color(c_blue); if (target.craftworld=0) and (target.space_hulk=0){ @@ -109,25 +117,13 @@ if (target.craftworld=0) and (target.space_hulk=0){ } -if (global.cheat_debug && obj_controller.selecting_planet && !loading) - { - draw_set_color(c_gray); - var rect = [(( 184) - 123), ( 200), (( 184) + 123), ( 226)]; - draw_rectangle(rect[0],rect[1],rect[2],rect[3], false); - draw_set_color(c_black); - draw_text(( 184), ( 204), "Debug"); - draw_set_color(c_white); - draw_set_alpha(0.2); - if (point_and_click(rect)){ - debug = true; - } - if (scr_hit(rect)){ - draw_rectangle((( 184) - 123), ( 200), (( 184) + 123), ( 226), false); - } - } +if (global.cheat_debug && obj_controller.selecting_planet && !loading){ + draw_planet_debug_options(); +} + -if (obj_controller.menu == 0) { - if (has_player_forces && point_and_click(draw_unit_buttons([125, 200], "Manage Units",[1,1],c_blue))) { +if (obj_controller.menu == 0 && !debug){ + if (manage_units_button.draw(has_player_forces)){ var _viewer = obj_controller.location_viewer _viewer.update_garrison_log(); var _unit_dispersement = _viewer.garrison_log; @@ -142,20 +138,26 @@ if (obj_controller.menu == 0) { planet : 0, selections : [] }); + instance_destroy(); + pop_draw_return_values(); + exit; } } } + if (loading!=0){ draw_set_font(fnt_40k_14); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_text(184,202, string_hash_to_newline("Select Destination")); } //the draw and click on planets logic -planet_selection_action(); +if (!debug){ + planet_selection_action(); +} draw_set_font(fnt_40k_14b); @@ -255,6 +257,7 @@ if (obj_controller.selecting_planet!=0){ }else if (feature.destroy){ feature = ""; instance_destroy(); + pop_draw_return_values(); exit; } } @@ -367,10 +370,12 @@ if (obj_controller.selecting_planet!=0){ var current_button=""; var shutter_x = main_data_slate.XX-165; var shutter_y = 296+165; - if (shutter_1.draw_shutter(shutter_x, shutter_y, button1, 0.5, true)) then current_button=button1; - if (shutter_2.draw_shutter(shutter_x, shutter_y+47, button2,0.5, true))then current_button=button2; - if (shutter_3.draw_shutter(shutter_x, shutter_y+(47*2), button3,0.5, true))then current_button=button3; - if (shutter_4.draw_shutter(shutter_x, shutter_y+(47*3), button4,0.5, true))then current_button=button4; + if (!debug){ + if (shutter_1.draw_shutter(shutter_x, shutter_y, button1, 0.5, true)) then current_button=button1; + if (shutter_2.draw_shutter(shutter_x, shutter_y+47, button2,0.5, true))then current_button=button2; + if (shutter_3.draw_shutter(shutter_x, shutter_y+(47*2), button3,0.5, true))then current_button=button3; + if (shutter_4.draw_shutter(shutter_x, shutter_y+(47*3), button4,0.5, true))then current_button=button4; + } if (current_button!=""){ if (array_contains(["Build","Base","Arsenal","Gene-Vault"],current_button)){ var building=instance_create(x,y,obj_temp_build); @@ -479,7 +484,7 @@ if (target!=0){ draw_rectangle(37,413,270,452,0); draw_set_alpha(1); - /*draw_set_color(38144);draw_rectangle(40,247,253,273,1);*/ + /*draw_set_color(CM_GREEN_COLOR);draw_rectangle(40,247,253,273,1);*/ draw_set_halign(fa_left); @@ -489,7 +494,7 @@ if (target!=0){ draw_set_font(fnt_40k_14b); draw_text(37,413,"Select Fleet Combat"); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_font(fnt_40k_14b); draw_text(37.5,413.5,"Select Fleet Combat"); @@ -509,87 +514,9 @@ if (target!=0){ } } - - - - - -if (debug){ - var current_planet; - - if (!scr_hit([36,174,337,455]) && scr_click_left()) { - debug=0; - exit; - } - - current_planet = obj_controller.selecting_planet; - - draw_set_color(c_black); - draw_rectangle(36, 174, 337, 455, 0); - draw_set_font(fnt_40k_14b); - draw_set_color(c_gray); - draw_set_halign(fa_left); - - draw_text(38, 176, ("Orks: " + string(target.p_orks[current_planet]))); - draw_text(38, 196, ("Tau: " + string(target.p_tau[current_planet]))); - draw_text(38, 216, ("Tyranids: " + string(target.p_tyranids[current_planet]))); - draw_text(38, 236, ("Traitors: " + string(target.p_traitors[current_planet]))); - draw_text(38, 256, ("CSM: " + string(target.p_chaos[current_planet]))); - draw_text(38, 276, ("Daemons: " + string(target.p_demons[current_planet]))); - draw_text(38, 296, ("Necrons: " + string(target.p_necrons[current_planet]))); - draw_text(38, 316, ("Sisters: " + string(target.p_sisters[current_planet]))); - - draw_text(147, 176, string_hash_to_newline("[-] [+]")); - draw_text(147, 196, string_hash_to_newline("[-] [+]")); - draw_text(147, 216, string_hash_to_newline("[-] [+]")); - draw_text(147, 236, string_hash_to_newline("[-] [+]")); - draw_text(147, 256, string_hash_to_newline("[-] [+]")); - draw_text(147, 276, string_hash_to_newline("[-] [+]")); - draw_text(147, 296, string_hash_to_newline("[-] [+]")); - draw_text(147, 316, string_hash_to_newline("[-] [+]")); - - if (point_and_click([147, 176, 167, 196])) { - target.p_orks[current_planet] = clamp(target.p_orks[current_planet] - 1, 0, 6); - } else if (point_and_click([147, 196, 167, 216])) { - target.p_tau[current_planet] = clamp(target.p_tau[current_planet] - 1, 0, 6); - } else if (point_and_click([147, 216, 167, 236])) { - target.p_tyranids[current_planet] = clamp(target.p_tyranids[current_planet] - 1, 0, 6); - } else if (point_and_click([147, 236, 167, 256])) { - target.p_traitors[current_planet] = clamp(target.p_traitors[current_planet] - 1, 0, 6); - } else if (point_and_click([147, 256, 167, 276])) { - target.p_chaos[current_planet] = clamp(target.p_chaos[current_planet] - 1, 0, 6); - } else if (point_and_click([147, 276, 167, 296])) { - target.p_demons[current_planet] = clamp(target.p_demons[current_planet] - 1, 0, 6); - } else if (point_and_click([147, 296, 167, 316])) { - target.p_necrons[current_planet] = clamp(target.p_necrons[current_planet] - 1, 0, 6); - } else if (point_and_click([147, 316, 167, 336])) { - target.p_sisters[current_planet] = clamp(target.p_sisters[current_planet] - 1, 0, 6); - } - - else if (point_and_click([177, 176, 197, 196])) { - target.p_orks[current_planet] = clamp(target.p_orks[current_planet] + 1, 0, 6); - } else if (point_and_click([177, 196, 197, 216])) { - target.p_tau[current_planet] = clamp(target.p_tau[current_planet] + 1, 0, 6); - } else if (point_and_click([177, 216, 197, 236])) { - target.p_tyranids[current_planet] = clamp(target.p_tyranids[current_planet] + 1, 0, 6); - } else if (point_and_click([177, 236, 197, 256])) { - target.p_traitors[current_planet] = clamp(target.p_traitors[current_planet] + 1, 0, 6); - } else if (point_and_click([177, 256, 197, 276])) { - target.p_chaos[current_planet] = clamp(target.p_chaos[current_planet] + 1, 0, 6); - } else if (point_and_click([177, 276, 197, 296])) { - target.p_demons[current_planet] = clamp(target.p_demons[current_planet] + 1, 0, 6); - } else if (point_and_click([177, 296, 197, 316])) { - target.p_necrons[current_planet] = clamp(target.p_necrons[current_planet] + 1, 0, 6); - } else if (point_and_click([177, 316, 197, 336])) { - target.p_sisters[current_planet] = clamp(target.p_sisters[current_planet] + 1, 0, 6); - } - -} +pop_draw_return_values(); /* */ -} -} -} /* */ diff --git a/objects/obj_star_select/Mouse_50.gml b/objects/obj_star_select/Mouse_50.gml index 6de0dd6a32..c015c64398 100644 --- a/objects/obj_star_select/Mouse_50.gml +++ b/objects/obj_star_select/Mouse_50.gml @@ -137,8 +137,10 @@ if (player_fleet>0) and (imperial_fleet+mechanicus_fleet+inquisitor_fleet+eldar_ en_capitals+=capital_number; en_frigates+=frigate_number; en_escorts+=escort_number; - if (string_count("BLOOD",trade_goods)>0) then khorne_count++; - if (string_lower(trade_goods)="csm") then chaos_space_marine_count++; + if (fleet_has_cargo("warband")) then khorne_count++; + if (fleet_has_cargo("csm")){ + chaos_space_marine_count++; + } } } diff --git a/objects/obj_temp7/Alarm_0.gml b/objects/obj_temp7/Alarm_0.gml index 0c32f5ee9c..7c50f83afc 100644 --- a/objects/obj_temp7/Alarm_0.gml +++ b/objects/obj_temp7/Alarm_0.gml @@ -11,12 +11,11 @@ if (num>0){// Hmmmmmmm pop.title="Investigation Completed"; pop.text="Your marines have scouted out "+string(stah.name)+" "+string(scr_roman(num))+" and satisfied the mission requirements."; - pop.option1="Reload Marines"; - pop.option2="Do Nothing"; + pop.add_option("Reload Marines"); + pop.add_option("Do Nothing"); scr_event_log("","Inquisition Mission Completed: Your Astartes have succesfully scouted "+string(stah.name)+" "+scr_roman(num)+"."); remove_planet_problem(num, "recon", stah); } -} - +} \ No newline at end of file diff --git a/objects/obj_timer/Create_0.gml b/objects/obj_timer/Create_0.gml index c7bccb95c0..427fb04363 100644 --- a/objects/obj_timer/Create_0.gml +++ b/objects/obj_timer/Create_0.gml @@ -5,9 +5,9 @@ end_function_args = []; execute_end_function = function() { if (is_method(end_function)) { - // show_debug_message("Executing Method!"); + // show_debug_message_adv("Executing Method!"); method_call(end_function, end_function_args); } - // show_debug_message("Killing Myself!"); + // show_debug_message_adv("Killing Myself!"); instance_destroy(self); } diff --git a/objects/obj_timer/Step_0.gml b/objects/obj_timer/Step_0.gml index 6262502906..b83dfef292 100644 --- a/objects/obj_timer/Step_0.gml +++ b/objects/obj_timer/Step_0.gml @@ -1,7 +1,7 @@ if (time_set > 0) { if (time_passed < time_set) { time_passed++; - // show_debug_message(time_passed); + // show_debug_message_adv(time_passed); } else { execute_end_function(); } diff --git a/objects/obj_tooltip/Draw_75.gml b/objects/obj_tooltip/Draw_75.gml index 868e2e9a1e..4931710062 100644 --- a/objects/obj_tooltip/Draw_75.gml +++ b/objects/obj_tooltip/Draw_75.gml @@ -7,6 +7,7 @@ for (var i=0;i 0){ + var current_audience = audience_stack[0]; + _is_audience = true; +} + -if (audien[current_audience]!=0){ - with(obj_controller){if (zoomed=1) then scr_zoom();} +if (_is_audience){ + with(obj_controller){ + if (zoomed=1){ + scr_zoom(); + } + } - obj_controller.audience=self.audien[self.current_audience]; - obj_controller.menu=20; - obj_controller.diplomacy=obj_controller.audience; + show_debug_message_adv(current_audience); + + if (obj_controller.menu != MENU.Diplomacy){ + scr_toggle_diplomacy(); + } + obj_controller.audience=current_audience.faction; + obj_controller.diplomacy=current_audience.faction; + obj_controller.audience_data = current_audience.audience_data; - if (obj_controller.diplomacy=10) and (obj_controller.faction_gender[10]=2) then scr_music("blood",60); + if (obj_controller.diplomacy=10) and (obj_controller.faction_gender[10]=2){ + scr_music("blood",60); + } - if (string_count("intro",audien_topic[current_audience])>0){ + if (string_count("intro",current_audience.topic)>0){ obj_controller.known[obj_controller.diplomacy]=2; obj_controller.faction_justmet=1; - if (obj_controller.diplomacy=6) then with(obj_controller){scr_dialogue("intro1");} - if (obj_controller.diplomacy!=6) then with(obj_controller){scr_dialogue("intro");} - } - - if (audien_topic[current_audience]!="intro"){ - with(obj_controller){scr_dialogue(obj_turn_end.audien_topic[obj_turn_end.current_audience]);} - - // "mission1" + if (obj_controller.diplomacy=6){ + + scr_dialogue("intro1"); + + } + if (obj_controller.diplomacy!=6){ + //show_debug_message_adv("new_intro"); + scr_dialogue("intro"); + + } + }else { + scr_dialogue(current_audience.topic); } + array_delete(audience_stack, 0, 1); exit; } @@ -37,7 +58,7 @@ if (audien[current_audience]!=0){ // if (current_audience<=audiences) then alarm[1]=5; -if (audien[1]=0) or (current_audience>audiences){ +if (!_is_audience){ current_popup+=1; @@ -49,8 +70,11 @@ if (audien[1]=0) or (current_audience>audiences){ pip.image=popup_image[current_popup]; if (is_struct(popup_special[current_popup])){ pip.pop_data = popup_special[current_popup]; + if (struct_exists(pip.pop_data , "options")){ + pip.add_option(pip.pop_data.options); + } } else { - if (popup_special[current_popup]!="") and ((pip.image="inquisition") or (pip.image="necron_cave")) and (popup_special[current_popup]!="1") and (popup_special[current_popup]!="2") and (pip.image!="tech_build") and (popup_special[current_popup]!="contraband") and (string_count("mech_",popup_special[current_popup])=0) and (string_count("meeting",popup_special[current_popup])=0){ + if (popup_special[current_popup]!="") and ((pip.image="inquisition")) and (popup_special[current_popup]!="1") and (popup_special[current_popup]!="2") and (pip.image!="tech_build") and (popup_special[current_popup]!="contraband") and (string_count("mech_",popup_special[current_popup])=0) and (string_count("meeting",popup_special[current_popup])=0){ explode_script(popup_special[current_popup],"|"); pip.mission=string(explode[0]); pip.loc=string(explode[1]); diff --git a/objects/obj_turn_end/Alarm_2.gml b/objects/obj_turn_end/Alarm_2.gml index 53638fb70f..4fb43bdb8b 100644 --- a/objects/obj_turn_end/Alarm_2.gml +++ b/objects/obj_turn_end/Alarm_2.gml @@ -24,5 +24,7 @@ if (fast>=alerts){ alarm[3]=min(alarm[3],360); } -if (alerts=0) then instance_destroy(); +if (alerts=0){ + instance_destroy(); +} diff --git a/objects/obj_turn_end/Create_0.gml b/objects/obj_turn_end/Create_0.gml index 8d8e1d6aa7..77a0406cb6 100644 --- a/objects/obj_turn_end/Create_0.gml +++ b/objects/obj_turn_end/Create_0.gml @@ -15,7 +15,6 @@ fadeout=0; popups_end=0; current_battle=1; -current_audience=0; current_popup=0; fast=0;// This is increased, once the alert[i]=1 and >=fast then it begins to fade in and get letters @@ -59,110 +58,38 @@ repeat(91){ battle_special[i]=""; - if (i<16) then strin[i]=""; - if (i<16){ - audien[i]=0; - audien_topic[i]=""; - } - - - - + if (i<16) then strin[i]=""; } -audiences=0; -audien[0]=0;audien[1]=0;audien[2]=0;audien[3]=0;audien[4]=0;audien[5]=0; -audien[6]=0;audien[7]=0;audien[8]=0;audien[9]=0;audien[10]=0;audien[11]=0; -audien_topic[0]="";audien_topic[1]="";audien_topic[2]="";audien_topic[3]="";audien_topic[4]="";audien_topic[5]=""; -audien_topic[6]="";audien_topic[7]="";audien_topic[8]="";audien_topic[9]="";audien_topic[10]="";audien_topic[11]=""; - - - - +audiences = 0; +audience = 0; +audience_stack = []; alert_alpha[1]=0.2; alert_char[1]=1; +i=-1 -var i;i=0; -repeat(11){i+=1; - if (obj_controller.audien[i]!=0){audiences+=1;audien[audiences]=obj_controller.audien[i];audien_topic[audiences]=obj_controller.audien_topic[i];} -}i=0;// LOLOLOLOLOL - - -repeat(99){i+=1; - if (obj_controller.event[i]!="") and (obj_controller.event_duration[i]=1) and (obj_controller.faction_status[eFACTION.Imperium]!="War"){ - if (obj_controller.event[i]="governor_assassination_1"){ - with(obj_star){var o;o=0;repeat(4){o+=1;if (dispo[o]>0) and (dispo[o]<90) then dispo[o]=max(dispo[o]-2,0);}} - obj_controller.disposition[2]-=7;obj_controller.disposition[4]-=10;obj_controller.disposition[5]-=4; - if (obj_controller.disposition[4]<=0) or (obj_controller.disposition[2]<=0) then obj_controller.alarm[8]=1; - if (obj_controller.disposition[4]>0) and (obj_controller.disposition[2]>0){ - var top;top=string_replace(obj_controller.event[i],"governor_assassination_1","assassination_angryish"); - scr_audience(4,top,0,"",0,0); - } - } - if (string_count("governor_assassination_2",obj_controller.event[i])>0) and (obj_controller.faction_status[eFACTION.Inquisition]!="War"){ - with(obj_star){var o;o=0;repeat(4){o+=1;if (dispo[o]>0) and (dispo[o]<90) then dispo[o]=max(dispo[o]-4,0);}} - obj_controller.disposition[2]-=15;obj_controller.disposition[4]-=30;obj_controller.disposition[5]-=10; - if (obj_controller.disposition[4]<=0) or (obj_controller.disposition[2]<=0) then obj_controller.alarm[8]=1; - if (obj_controller.disposition[4]>0) and (obj_controller.disposition[2]>0){ - var top;top=string_replace(obj_controller.event[i],"governor_assassination_2","assassination_angry"); - scr_audience(4,top,0,"",0,0); - } - } - } -}i=0; - - - - +handle_discovered_governor_assasinations() if (audiences>0){// This is a one-off change all messages to declare war - var i;i=0; - var war;repeat(11){i+=1;war[i]=0;} - - i=0; - repeat(10){i+=1; - if (audien_topic[i]!="declare_war") and (audien_topic[i]!="gene_xeno") and (audien_topic[i]!="") and (war[audien[i]]=1) and (audien[i]!=10){ - audien[i]=obj_controller.audien[i+1]; - audien_topic[i]=obj_controller.audien_topic[i+1]; - audien[i+1]=0; - audien_topic[i+1]=""; - audiences-=1; - } - - // show_message(string(audien_topic[i])+"|"+string(war[audien[i]])+"|"+string(obj_controller.faction_status[self.audien[i]])); - - if (audien_topic[i]!="declare_war") and (audien_topic[i]!="gene_xeno") and (audien_topic[i]!="") and (war[audien[i]]=0) and (obj_controller.faction_status[self.audien[i]]!="War") and (audien[i]!=10){ - if (obj_controller.disposition[self.audien[i]]<=0) and (audien[i]<6){ - /*obj_controller.audien[i]=obj_controller.audien[i+1]; - obj_controller.audien_topic[i]=obj_controller.audien_topic[i+1]; - obj_controller.audien[i+1]=0; - obj_controller.audien_topic[i+1]=""; - audiences-=1;*/ - audien_topic[i]="declare_war"; - war[audien[i]]=1; - } - } - - /*if (obj_controller.audien_topic[i]!="declare_war") and (obj_controller.disposition[obj_controller.audien[i]]<=0) and (war[i]=0) and (obj_controller.faction_status[obj_controller.audien[i]]!="War"){ - war[i]=1;obj_controller.audien_topic[i]="declare_war"; - }*/ + var i=0; + var war; + repeat(15){ + i+=1; + war[i]=0; } -} -var i;i=0; -if (audiences>0){ - repeat(10){i+=1; - if (audien_topic[i]="") and (audien_topic[i+1]!=""){ - audien_topic[i]=audien_topic[i+1]; - } + for (var i=0;i0) and (current_battle<=battles){ if (battle_world[i]>0) then draw_sprite(spr_attacked,0,xxx+90,yyy+101); if (battle_world[i]=-50) then draw_sprite(spr_attacked,1,xxx+90,yyy+101); - draw_set_font(fnt_info);draw_set_halign(fa_left);draw_set_color(38144); + draw_set_font(fnt_info);draw_set_halign(fa_left);draw_set_color(CM_GREEN_COLOR); draw_text(xxx+103,yyy+115,string(i)+"/"+string(battles)); draw_set_halign(fa_center); diff --git a/objects/obj_turn_end/Draw_64.gml b/objects/obj_turn_end/Draw_64.gml index 6748fd8ad7..15c5c40f25 100644 --- a/objects/obj_turn_end/Draw_64.gml +++ b/objects/obj_turn_end/Draw_64.gml @@ -8,7 +8,7 @@ var i=0; draw_set_font(fnt_40k_14b); draw_set_halign(fa_left); -draw_set_color(38144); +draw_set_color(CM_GREEN_COLOR); if (alerts>0) and (popups_end=1){ @@ -33,5 +33,4 @@ if (alerts>0) and (popups_end=1){ } } -draw_set_alpha(1); diff --git a/options/mac/options_mac.yy b/options/mac/options_mac.yy index b94080f074..25bf1f933a 100644 --- a/options/mac/options_mac.yy +++ b/options/mac/options_mac.yy @@ -25,7 +25,7 @@ "option_mac_output_dir":"~/gamemakerstudio2", "option_mac_resize_window":true, "option_mac_scale":0, - "option_mac_signing_identity":"", + "option_mac_signing_identity":"DD 43 55 BA D2 D6 29 A4 A2 2E 7A 9B 34 E7 E4 02 1A 8F 19 95 5B FF 94 CC 26 E8 EB 58 FF 20 60 61", "option_mac_splash_png":"${options_dir}/mac/splash/splash.png", "option_mac_start_fullscreen":false, "option_mac_team_id":"", diff --git a/options/main/options_main.yy b/options/main/options_main.yy index 4288a81cd8..d143532e2c 100644 --- a/options/main/options_main.yy +++ b/options/main/options_main.yy @@ -1,18 +1,20 @@ { - "$GMMainOptions":"v3", + "$GMMainOptions":"v5", "%Name":"Main", "name":"Main", - "option_audio_error_behaviour":true, + "option_allow_instance_change":true, + "option_audio_error_behaviour":false, "option_author":"", - "option_collision_compatibility":true, + "option_collision_compatibility":false, "option_copy_on_write_enabled":true, "option_draw_colour":4294967295, "option_gameguid":"60d8bf5e-3804-4d8f-93f8-fe72952db6af", "option_gameid":"0", "option_game_speed":30, - "option_legacy_json_parsing":true, - "option_legacy_number_conversion":true, - "option_legacy_other_behaviour":true, + "option_legacy_json_parsing":false, + "option_legacy_number_conversion":false, + "option_legacy_other_behaviour":false, + "option_legacy_primitive_drawing":true, "option_mips_for_3d_textures":false, "option_remove_unused_assets":false, "option_sci_usesci":false, diff --git a/options/operagx/options_operagx.yy b/options/operagx/options_operagx.yy index 92ae9c298c..2b49fa3ac3 100644 --- a/options/operagx/options_operagx.yy +++ b/options/operagx/options_operagx.yy @@ -1,5 +1,5 @@ { - "$GMOperaGXOptions":"", + "$GMOperaGXOptions":"v1", "%Name":"operagx", "name":"operagx", "option_operagx_display_cursor":true, @@ -23,6 +23,7 @@ "option_operagx_team_id":"473feff6-8a4c-48fb-8940-4d123455fe5a", "option_operagx_team_name":"ZAB1019 studio", "option_operagx_texture_page":"2048x2048", + "option_operagx_transparent_background":false, "option_operagx_version":"1.0.0.6", "resourceType":"GMOperaGXOptions", "resourceVersion":"2.0", diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index 0e2b5a2837..521c201958 100644 --- a/options/windows/options_windows.yy +++ b/options/windows/options_windows.yy @@ -1,5 +1,5 @@ { - "$GMWindowsOptions":"", + "$GMWindowsOptions":"v1", "%Name":"Windows", "name":"Windows", "option_windows_allow_fullscreen_switching":true, @@ -7,6 +7,7 @@ "option_windows_company_info":"", "option_windows_copyright_info":"", "option_windows_copy_exe_to_dest":false, + "option_windows_d3dswapeffectdiscard":false, "option_windows_description_info":"Become the 40,000th warhammer", "option_windows_disable_sandbox":false, "option_windows_display_cursor":false, diff --git a/prefabs/io.gamemaker.sdfshaders-1.0.0/io.gamemaker.sdfshaders-1.0.0.resource_order b/prefabs/io.gamemaker.sdfshaders-1.0.0/io.gamemaker.sdfshaders-1.0.0.resource_order new file mode 100644 index 0000000000..81303c0c31 --- /dev/null +++ b/prefabs/io.gamemaker.sdfshaders-1.0.0/io.gamemaker.sdfshaders-1.0.0.resource_order @@ -0,0 +1,7 @@ +{ + "FolderOrderSettings":[], + "ResourceOrderSettings":[ + {"name":"__yy_sdf_blur_shader","order":2,"path":"shaders/__yy_sdf_blur_shader/__yy_sdf_blur_shader.yy",}, + {"name":"__yy_sdf_effect_shader","order":1,"path":"shaders/__yy_sdf_effect_shader/__yy_sdf_effect_shader.yy",}, + ], +} \ No newline at end of file diff --git a/prefabs/io.gamemaker.sdfshaders-1.0.0/io.gamemaker.sdfshaders-1.0.0.yyp b/prefabs/io.gamemaker.sdfshaders-1.0.0/io.gamemaker.sdfshaders-1.0.0.yyp new file mode 100644 index 0000000000..b3a9810301 --- /dev/null +++ b/prefabs/io.gamemaker.sdfshaders-1.0.0/io.gamemaker.sdfshaders-1.0.0.yyp @@ -0,0 +1,35 @@ +{ + "$GMProject":"v1", + "%Name":"io.gamemaker.sdfshaders-1.0.0", + "AudioGroups":[ + {"$GMAudioGroup":"v1","%Name":"audiogroup_default","exportDir":"","name":"audiogroup_default","resourceType":"GMAudioGroup","resourceVersion":"2.0","targets":-1,}, + ], + "configs":{ + "children":[], + "name":"Default", + }, + "defaultScriptType":0, + "Folders":[ + {"$GMFolder":"","%Name":"Shaders","folderPath":"folders/Shaders.yy","name":"Shaders","resourceType":"GMFolder","resourceVersion":"2.0",}, + ], + "ForcedPrefabProjectReferences":[], + "IncludedFiles":[], + "isEcma":false, + "LibraryEmitters":[], + "MetaData":{ + "IDEVersion":"2024.1400.0.880", + }, + "name":"io.gamemaker.sdfshaders-1.0.0", + "resources":[ + {"id":{"name":"__yy_sdf_blur_shader","path":"shaders/__yy_sdf_blur_shader/__yy_sdf_blur_shader.yy",},}, + {"id":{"name":"__yy_sdf_effect_shader","path":"shaders/__yy_sdf_effect_shader/__yy_sdf_effect_shader.yy",},}, + {"id":{"name":"__yy_sdf_shader","path":"shaders/__yy_sdf_shader/__yy_sdf_shader.yy",},}, + ], + "resourceType":"GMProject", + "resourceVersion":"2.0", + "RoomOrderNodes":[], + "templateType":null, + "TextureGroups":[ + {"$GMTextureGroup":"","%Name":"Default","autocrop":true,"border":2,"compressFormat":"bz2","customOptions":"","directory":"","groupParent":null,"isScaled":true,"loadType":"default","mipsToGenerate":0,"name":"Default","resourceType":"GMTextureGroup","resourceVersion":"2.0","targets":-1,}, + ], +} \ No newline at end of file diff --git a/prefabs/io.gamemaker.sdfshaders-1.0.0/prefab.json b/prefabs/io.gamemaker.sdfshaders-1.0.0/prefab.json new file mode 100644 index 0000000000..df08dd8bcf --- /dev/null +++ b/prefabs/io.gamemaker.sdfshaders-1.0.0/prefab.json @@ -0,0 +1,13 @@ +{ + "$PrefabMetadata":"v2", + "Author":"GameMaker", + "Description":"Signed Distance Field (SDF) Shaders", + "DisplayName":"SDF Shaders", + "Exports":[ + {"$PrefabExportMetadata":"v3","AssetName":"__yy_sdf_blur_shader","Description":"SDF Shader with Blur","DisplayName":"SDF Blur Shader","FolderPath":"","ResourceType":"GMShader","ResourceVersion":0,}, + {"$PrefabExportMetadata":"v3","AssetName":"__yy_sdf_effect_shader","Description":"SDF Shader with Effects","DisplayName":"SDF Effect Shader","FolderPath":"","ResourceType":"GMShader","ResourceVersion":0,}, + {"$PrefabExportMetadata":"v3","AssetName":"__yy_sdf_shader","Description":"SDF Shader","DisplayName":"SDF Shader","FolderPath":"","ResourceType":"GMShader","ResourceVersion":0,}, + ], + "PackageId":"io.gamemaker.sdfshaders", + "Version":"1.0.0", +} \ No newline at end of file diff --git a/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_blur_shader/__yy_sdf_blur_shader.fsh b/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_blur_shader/__yy_sdf_blur_shader.fsh new file mode 100644 index 0000000000..e124b2730b --- /dev/null +++ b/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_blur_shader/__yy_sdf_blur_shader.fsh @@ -0,0 +1,22 @@ +// +// SDF (with blur) fragment shader +// +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +// SDF values are measured from 0 (at the outer edge) to 1 which is the innermost point that can be represented +uniform vec2 gm_SDF_Blur_MinMax; // the range across which to filter the SDF +uniform vec4 gm_SDF_Blur_Col; // the colour tint of the blurred text + +void main() +{ + vec4 texcol = texture2D( gm_BaseTexture, v_vTexcoord ); + vec4 currcol = gm_SDF_Blur_Col; + + currcol.a *= smoothstep(gm_SDF_Blur_MinMax.x, gm_SDF_Blur_MinMax.y, texcol.a); + + vec4 combinedcol = v_vColour * currcol; + DoAlphaTest(combinedcol); + + gl_FragColor = combinedcol; +} diff --git a/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_blur_shader/__yy_sdf_blur_shader.vsh b/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_blur_shader/__yy_sdf_blur_shader.vsh new file mode 100644 index 0000000000..3900c20f40 --- /dev/null +++ b/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_blur_shader/__yy_sdf_blur_shader.vsh @@ -0,0 +1,19 @@ +// +// Simple passthrough vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_blur_shader/__yy_sdf_blur_shader.yy b/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_blur_shader/__yy_sdf_blur_shader.yy new file mode 100644 index 0000000000..8d86b48ae7 --- /dev/null +++ b/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_blur_shader/__yy_sdf_blur_shader.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"__yy_sdf_blur_shader", + "name":"__yy_sdf_blur_shader", + "parent":{ + "name":"Shaders", + "path":"folders/Shaders.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_effect_shader/__yy_sdf_effect_shader.fsh b/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_effect_shader/__yy_sdf_effect_shader.fsh new file mode 100644 index 0000000000..ec259832e8 --- /dev/null +++ b/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_effect_shader/__yy_sdf_effect_shader.fsh @@ -0,0 +1,78 @@ +// +// SDF (with effects) fragment shader +// +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +uniform vec2 gm_SDF_Dist_UV; // the SDF distance value of half a pixel in UV space (takes account of texture size) + +// SDF values are measured from 0 (at the outer edge) to 1 which is the innermost point that can be represented +uniform bool gm_SDF_DrawGlow; // whether the glow effect is enabled +uniform vec2 gm_SDF_Glow_MinMax; // the SDF range across which the glow fades +uniform vec4 gm_SDF_Glow_Col; // the colour of the glow + +uniform bool gm_SDF_DrawOutline; // whether the outline effect is enabled +uniform float gm_SDF_Outline_Thresh; // the SDF distance which represents the outer edge of the outline +uniform vec4 gm_SDF_Outline_Col; // the colour of the outline + +uniform float gm_SDF_Core_Thresh; // the SDF distance which represents the outer edge the shape +uniform vec4 gm_SDF_Core_Col; // the colour of the core part of the shape + +void main() +{ + vec4 texcol = texture2D( gm_BaseTexture, v_vTexcoord ); + + vec2 coordDiffX = dFdx(v_vTexcoord); + vec2 coordDiffY = dFdy(v_vTexcoord); + vec2 scaledCoordDiffX = coordDiffX * gm_SDF_Dist_UV; + vec2 scaledCoordDiffY = coordDiffY * gm_SDF_Dist_UV; + float diffXLength = length(scaledCoordDiffX); + float diffYLength = length(scaledCoordDiffY); + float pixelspread = (diffXLength + diffYLength) * 0.5; // get average + + //float pixelspread = fwidth(texcol.a); + //pixelspread = max(pixelspread * 0.75, 0.001); + + float blendfactor; + vec4 currcol = vec4(0.0, 0.0, 0.0, -1.0); + + // Handle glow effect + if (gm_SDF_DrawGlow) + { + if (texcol.a > gm_SDF_Glow_MinMax.x) + { + currcol = gm_SDF_Glow_Col; + currcol.a *= smoothstep(gm_SDF_Glow_MinMax.x, gm_SDF_Glow_MinMax.y, texcol.a); + } + } + + // Handle outline effect + if (gm_SDF_DrawOutline) + { + float outlinespread = min(pixelspread, gm_SDF_Outline_Thresh); // make sure (gm_SDF_Outline_Thresh - pixelspread) can't be negative + if (texcol.a > (gm_SDF_Outline_Thresh - outlinespread)) + { + blendfactor = smoothstep(gm_SDF_Outline_Thresh - outlinespread, gm_SDF_Outline_Thresh + outlinespread, texcol.a); + if (currcol.a < 0.0) + { + currcol = vec4(gm_SDF_Outline_Col.r,gm_SDF_Outline_Col.g,gm_SDF_Outline_Col.b, 0.0); + } + currcol = mix(currcol, gm_SDF_Outline_Col, blendfactor); + } + } + + // Handle inner core + pixelspread = min(pixelspread, gm_SDF_Core_Thresh); // make sure (gm_SDF_Core_Thresh - pixelspread) can't be negative + blendfactor = smoothstep(gm_SDF_Core_Thresh - pixelspread, gm_SDF_Core_Thresh + pixelspread, texcol.a); + + if (currcol.a < 0.0) + { + currcol = vec4(gm_SDF_Core_Col.r,gm_SDF_Core_Col.g,gm_SDF_Core_Col.b, 0.0); + } + texcol = mix(currcol, gm_SDF_Core_Col, blendfactor); + + vec4 combinedcol = v_vColour * texcol; + DoAlphaTest(combinedcol); + + gl_FragColor = combinedcol; +} diff --git a/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_effect_shader/__yy_sdf_effect_shader.vsh b/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_effect_shader/__yy_sdf_effect_shader.vsh new file mode 100644 index 0000000000..3900c20f40 --- /dev/null +++ b/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_effect_shader/__yy_sdf_effect_shader.vsh @@ -0,0 +1,19 @@ +// +// Simple passthrough vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_effect_shader/__yy_sdf_effect_shader.yy b/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_effect_shader/__yy_sdf_effect_shader.yy new file mode 100644 index 0000000000..c8a4f02e9b --- /dev/null +++ b/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_effect_shader/__yy_sdf_effect_shader.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"__yy_sdf_effect_shader", + "name":"__yy_sdf_effect_shader", + "parent":{ + "name":"Shaders", + "path":"folders/Shaders.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_shader/__yy_sdf_shader.fsh b/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_shader/__yy_sdf_shader.fsh new file mode 100644 index 0000000000..cda255c82f --- /dev/null +++ b/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_shader/__yy_sdf_shader.fsh @@ -0,0 +1,31 @@ +// +// SDF fragment shader +// +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +uniform vec2 gm_SDF_Dist_UV; // the SDF distance value of half a pixel in UV space (takes account of texture size) + +void main() +{ + vec4 texcol = texture2D( gm_BaseTexture, v_vTexcoord ); + + vec2 coordDiffX = dFdx(v_vTexcoord); + vec2 coordDiffY = dFdy(v_vTexcoord); + vec2 scaledCoordDiffX = coordDiffX * gm_SDF_Dist_UV; + vec2 scaledCoordDiffY = coordDiffY * gm_SDF_Dist_UV; + float diffXLength = length(scaledCoordDiffX); + float diffYLength = length(scaledCoordDiffY); + float spread = (diffXLength + diffYLength) * 0.5; // get average + spread = min(spread, 0.5); // make sure (0.5 - spread) can't be negative + + //float spread = fwidth(texcol.a); + //spread = max(spread * 0.75, 0.001); + + texcol.a = smoothstep(0.5 - spread, 0.5 + spread, texcol.a); + + vec4 combinedcol = v_vColour * texcol; + DoAlphaTest(combinedcol); + + gl_FragColor = combinedcol; +} \ No newline at end of file diff --git a/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_shader/__yy_sdf_shader.vsh b/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_shader/__yy_sdf_shader.vsh new file mode 100644 index 0000000000..7be2debedf --- /dev/null +++ b/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_shader/__yy_sdf_shader.vsh @@ -0,0 +1,19 @@ +// +// SDF vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_shader/__yy_sdf_shader.yy b/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_shader/__yy_sdf_shader.yy new file mode 100644 index 0000000000..f7f314d86d --- /dev/null +++ b/prefabs/io.gamemaker.sdfshaders-1.0.0/shaders/__yy_sdf_shader/__yy_sdf_shader.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"__yy_sdf_shader", + "name":"__yy_sdf_shader", + "parent":{ + "name":"Shaders", + "path":"folders/Shaders.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/prefabs/io.gamemaker.sdfshaders-1.0.0/yymanifest.xml b/prefabs/io.gamemaker.sdfshaders-1.0.0/yymanifest.xml new file mode 100644 index 0000000000..d2b3d46b39 --- /dev/null +++ b/prefabs/io.gamemaker.sdfshaders-1.0.0/yymanifest.xml @@ -0,0 +1,15 @@ + + + io.gamemaker.sdfshaders-1.0.0.resource_order + io.gamemaker.sdfshaders-1.0.0.yyp + prefab.json + shaders\__yy_sdf_blur_shader\__yy_sdf_blur_shader.fsh + shaders\__yy_sdf_blur_shader\__yy_sdf_blur_shader.vsh + shaders\__yy_sdf_blur_shader\__yy_sdf_blur_shader.yy + shaders\__yy_sdf_effect_shader\__yy_sdf_effect_shader.fsh + shaders\__yy_sdf_effect_shader\__yy_sdf_effect_shader.vsh + shaders\__yy_sdf_effect_shader\__yy_sdf_effect_shader.yy + shaders\__yy_sdf_shader\__yy_sdf_shader.fsh + shaders\__yy_sdf_shader\__yy_sdf_shader.vsh + shaders\__yy_sdf_shader\__yy_sdf_shader.yy + \ No newline at end of file diff --git a/rooms/Creation/Creation.yy b/rooms/Creation/Creation.yy index 83552c37ca..81ffc714c0 100644 --- a/rooms/Creation/Creation.yy +++ b/rooms/Creation/Creation.yy @@ -13,13 +13,13 @@ "isDnd":false, "layers":[ {"$GMRInstanceLayer":"","%Name":"Compatibility_Instances_Depth_-60000","depth":-60000,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"v2","%Name":"inst_4A5D2999","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4A5D2999","objectId":{"name":"obj_cursor","path":"objects/obj_cursor/obj_cursor.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":800.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_4A5D2999","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4A5D2999","objectId":{"name":"obj_cursor","path":"objects/obj_cursor/obj_cursor.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":800.0,"y":416.0,}, ],"layers":[],"name":"Compatibility_Instances_Depth_-60000","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRInstanceLayer":"","%Name":"Compatibility_Instances_Depth_-50","depth":-50,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"v2","%Name":"inst_6B7174EB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6B7174EB","objectId":{"name":"obj_main_menu_buttons","path":"objects/obj_main_menu_buttons/obj_main_menu_buttons.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_6B7174EB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6B7174EB","objectId":{"name":"obj_main_menu_buttons","path":"objects/obj_main_menu_buttons/obj_main_menu_buttons.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":832.0,}, ],"layers":[],"name":"Compatibility_Instances_Depth_-50","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRInstanceLayer":"","%Name":"Compatibility_Instances_Depth_-49","depth":-49,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"v2","%Name":"inst_9E6CD6FB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9E6CD6FB","objectId":{"name":"obj_creation","path":"objects/obj_creation/obj_creation.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, + {"$GMRInstance":"v4","%Name":"inst_9E6CD6FB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9E6CD6FB","objectId":{"name":"obj_creation","path":"objects/obj_creation/obj_creation.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, ],"layers":[],"name":"Compatibility_Instances_Depth_-49","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRBackgroundLayer":"","%Name":"Compatibility_Colour","animationFPS":15.0,"animationSpeedType":0,"colour":4278190080,"depth":2147483600,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Compatibility_Colour","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":true,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, ], diff --git a/rooms/Defeat/Defeat.yy b/rooms/Defeat/Defeat.yy index 52549415e4..926f767fba 100644 --- a/rooms/Defeat/Defeat.yy +++ b/rooms/Defeat/Defeat.yy @@ -1,7 +1,7 @@ { "$GMRoom":"v1", "%Name":"Defeat", - "creationCodeFile":"", + "creationCodeFile":"rooms/Defeat/RoomCreationCode.gml", "inheritCode":false, "inheritCreationOrder":false, "inheritLayers":false, @@ -11,7 +11,7 @@ "isDnd":false, "layers":[ {"$GMRInstanceLayer":"","%Name":"Compatibility_Instances_Depth_-5","depth":-5,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"v2","%Name":"inst_5DF03373","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5DF03373","objectId":{"name":"obj_defeat","path":"objects/obj_defeat/obj_defeat.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, + {"$GMRInstance":"v4","%Name":"inst_5DF03373","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5DF03373","objectId":{"name":"obj_defeat","path":"objects/obj_defeat/obj_defeat.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, ],"layers":[],"name":"Compatibility_Instances_Depth_-5","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRBackgroundLayer":"","%Name":"Compatibility_Background_0","animationFPS":15.0,"animationSpeedType":0,"colour":0,"depth":2147483500,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":true,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Compatibility_Background_0","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":true,"visible":true,"vspeed":0.0,"vtiled":true,"x":0,"y":0,}, {"$GMRBackgroundLayer":"","%Name":"Compatibility_Colour","animationFPS":15.0,"animationSpeedType":0,"colour":4278190080,"depth":2147483600,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Compatibility_Colour","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":true,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, diff --git a/rooms/Game/Game.yy b/rooms/Game/Game.yy index 67f0eec4fc..e5528f85ca 100644 --- a/rooms/Game/Game.yy +++ b/rooms/Game/Game.yy @@ -12,11 +12,11 @@ "isDnd":false, "layers":[ {"$GMRInstanceLayer":"","%Name":"Compatibility_Instances_Depth_-60000","depth":-60000,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"v2","%Name":"inst_794579B3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_794579B3","objectId":{"name":"obj_cursor","path":"objects/obj_cursor/obj_cursor.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":32.0,}, + {"$GMRInstance":"v4","%Name":"inst_794579B3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_794579B3","objectId":{"name":"obj_cursor","path":"objects/obj_cursor/obj_cursor.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":32.0,}, ],"layers":[],"name":"Compatibility_Instances_Depth_-60000","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRInstanceLayer":"","%Name":"Instances_1","depth":-59900,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[],"layers":[],"name":"Instances_1","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":false,}, {"$GMRInstanceLayer":"","%Name":"Compatibility_Instances_Depth_-1000","depth":-1000,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"v2","%Name":"inst_8494E946","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8494E946","objectId":{"name":"obj_controller","path":"objects/obj_controller/obj_controller.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, + {"$GMRInstance":"v4","%Name":"inst_8494E946","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8494E946","objectId":{"name":"obj_controller","path":"objects/obj_controller/obj_controller.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, ],"layers":[],"name":"Compatibility_Instances_Depth_-1000","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRBackgroundLayer":"","%Name":"Compatibility_Background_0_bg_space","animationFPS":1.0,"animationSpeedType":1,"colour":4294967295,"depth":2147483500,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":true,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Compatibility_Background_0_bg_space","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":{"name":"bg_space","path":"sprites/bg_space/bg_space.yy",},"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":true,"visible":true,"vspeed":0.0,"vtiled":true,"x":0,"y":0,}, {"$GMRBackgroundLayer":"","%Name":"Compatibility_Colour","animationFPS":15.0,"animationSpeedType":0,"colour":4290822336,"depth":2147483600,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Compatibility_Colour","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":true,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, diff --git a/rooms/Main_Menu/Main_Menu.yy b/rooms/Main_Menu/Main_Menu.yy index 09c550dac9..8533984512 100644 --- a/rooms/Main_Menu/Main_Menu.yy +++ b/rooms/Main_Menu/Main_Menu.yy @@ -16,18 +16,18 @@ "isDnd":false, "layers":[ {"$GMRInstanceLayer":"","%Name":"Compatibility_Instances_Depth_-999999","depth":-999999,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"v2","%Name":"inst_53077F74","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_53077F74","objectId":{"name":"obj_lol_version","path":"objects/obj_lol_version/obj_lol_version.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":0.0,}, + {"$GMRInstance":"v4","%Name":"inst_53077F74","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_53077F74","objectId":{"name":"obj_lol_version","path":"objects/obj_lol_version/obj_lol_version.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":0.0,}, ],"layers":[],"name":"Compatibility_Instances_Depth_-999999","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRInstanceLayer":"","%Name":"Compatibility_Instances_Depth_-60000","depth":-60000,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"v2","%Name":"inst_DDD7EDA2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_DDD7EDA2","objectId":{"name":"obj_cursor","path":"objects/obj_cursor/obj_cursor.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":0.0,}, + {"$GMRInstance":"v4","%Name":"inst_DDD7EDA2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_DDD7EDA2","objectId":{"name":"obj_cursor","path":"objects/obj_cursor/obj_cursor.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":0.0,}, ],"layers":[],"name":"Compatibility_Instances_Depth_-60000","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRInstanceLayer":"","%Name":"Compatibility_Instances_Depth_-50","depth":-50,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"v2","%Name":"inst_455A7BC8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_455A7BC8","objectId":{"name":"obj_main_menu_buttons","path":"objects/obj_main_menu_buttons/obj_main_menu_buttons.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":0.0,}, + {"$GMRInstance":"v4","%Name":"inst_455A7BC8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_455A7BC8","objectId":{"name":"obj_main_menu_buttons","path":"objects/obj_main_menu_buttons/obj_main_menu_buttons.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":0.0,}, ],"layers":[],"name":"Compatibility_Instances_Depth_-50","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRInstanceLayer":"","%Name":"Compatibility_Instances_Depth_0","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"v2","%Name":"inst_2E7D4C9E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2E7D4C9E","objectId":{"name":"obj_main_menu","path":"objects/obj_main_menu/obj_main_menu.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, - {"$GMRInstance":"v2","%Name":"inst_5B0F9E0B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5B0F9E0B","objectId":{"name":"obj_garbage_collector","path":"objects/obj_garbage_collector/obj_garbage_collector.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, - {"$GMRInstance":"v2","%Name":"inst_3F965F11","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3F965F11","objectId":{"name":"obj_persistent","path":"objects/obj_persistent/obj_persistent.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":32.0,}, + {"$GMRInstance":"v4","%Name":"inst_2E7D4C9E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2E7D4C9E","objectId":{"name":"obj_main_menu","path":"objects/obj_main_menu/obj_main_menu.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, + {"$GMRInstance":"v4","%Name":"inst_5B0F9E0B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5B0F9E0B","objectId":{"name":"obj_garbage_collector","path":"objects/obj_garbage_collector/obj_garbage_collector.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, + {"$GMRInstance":"v4","%Name":"inst_3F965F11","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3F965F11","objectId":{"name":"obj_persistent","path":"objects/obj_persistent/obj_persistent.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":32.0,}, ],"layers":[],"name":"Compatibility_Instances_Depth_0","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRBackgroundLayer":"","%Name":"Compatibility_Background_0","animationFPS":15.0,"animationSpeedType":0,"colour":0,"depth":2147483500,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":true,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Compatibility_Background_0","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":true,"visible":true,"vspeed":0.0,"vtiled":true,"x":0,"y":0,}, {"$GMRBackgroundLayer":"","%Name":"Compatibility_Colour","animationFPS":15.0,"animationSpeedType":0,"colour":4278190080,"depth":2147483600,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Compatibility_Colour","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":true,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, diff --git a/rooms/Testing_newnew/Testing_newnew.yy b/rooms/Testing_newnew/Testing_newnew.yy index 9a0761a35b..05bb78f1fa 100644 --- a/rooms/Testing_newnew/Testing_newnew.yy +++ b/rooms/Testing_newnew/Testing_newnew.yy @@ -380,376 +380,376 @@ "isDnd":false, "layers":[ {"$GMRInstanceLayer":"","%Name":"Compatibility_Instances_Depth_0","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"v2","%Name":"inst_388035F1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_388035F1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":336.0,}, - {"$GMRInstance":"v2","%Name":"inst_D5E41057","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D5E41057","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_BB1D114A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BB1D114A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":496.0,}, - {"$GMRInstance":"v2","%Name":"inst_09923952","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_09923952","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":176.0,}, - {"$GMRInstance":"v2","%Name":"inst_DF446DDF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_DF446DDF","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_34FEE099","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_34FEE099","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":176.0,}, - {"$GMRInstance":"v2","%Name":"inst_2C87EFF8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2C87EFF8","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":240.0,}, - {"$GMRInstance":"v2","%Name":"inst_E02A4953","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E02A4953","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_F8CF0E15","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F8CF0E15","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":528.0,}, - {"$GMRInstance":"v2","%Name":"inst_758D500A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_758D500A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_5509A666","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5509A666","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":288.0,}, - {"$GMRInstance":"v2","%Name":"inst_272EA924","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_272EA924","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":304.0,}, - {"$GMRInstance":"v2","%Name":"inst_688E87F2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_688E87F2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_FB07B8CC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FB07B8CC","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":208.0,}, - {"$GMRInstance":"v2","%Name":"inst_E150D3CB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E150D3CB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_B6347843","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B6347843","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_055C23CA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_055C23CA","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_3FF12B84","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3FF12B84","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":400.0,}, - {"$GMRInstance":"v2","%Name":"inst_9C0C3419","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9C0C3419","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_7853AEB1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7853AEB1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_A8EDEDEF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A8EDEDEF","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_6EBD3C1C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6EBD3C1C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_773884FA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_773884FA","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_36A1F822","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_36A1F822","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_8559002F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8559002F","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":768.0,}, - {"$GMRInstance":"v2","%Name":"inst_9F102D8B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9F102D8B","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":768.0,}, - {"$GMRInstance":"v2","%Name":"inst_257B03D5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_257B03D5","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_BDFA2E0F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BDFA2E0F","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_EB544B1E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EB544B1E","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_B42FF6B3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B42FF6B3","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_366D8B6F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_366D8B6F","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_47294749","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_47294749","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_BDE0ECC5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BDE0ECC5","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_1DD400FB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1DD400FB","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_20DF1E0B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_20DF1E0B","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":576.0,}, - {"$GMRInstance":"v2","%Name":"inst_38E46998","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_38E46998","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":576.0,}, - {"$GMRInstance":"v2","%Name":"inst_6697D0EC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6697D0EC","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_422015A7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_422015A7","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_D91A343C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D91A343C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":512.0,}, - {"$GMRInstance":"v2","%Name":"inst_A2C31987","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A2C31987","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":512.0,}, - {"$GMRInstance":"v2","%Name":"inst_4D125B1C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4D125B1C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_CE4AA7DE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CE4AA7DE","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_5CDFA987","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5CDFA987","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_4D386697","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4D386697","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_6A11A170","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6A11A170","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_E58708C6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E58708C6","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_1E3BD983","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1E3BD983","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_059F747C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_059F747C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_09FA2609","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_09FA2609","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_1B91E8FA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1B91E8FA","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_AB6FE04B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AB6FE04B","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_D598AD85","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D598AD85","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_FA0BA6CF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FA0BA6CF","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":224.0,}, - {"$GMRInstance":"v2","%Name":"inst_AD3D1A06","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AD3D1A06","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":224.0,}, - {"$GMRInstance":"v2","%Name":"inst_0EBA49F9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0EBA49F9","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_3B94C5D4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3B94C5D4","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_1576BC5E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1576BC5E","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":160.0,}, - {"$GMRInstance":"v2","%Name":"inst_09E5CF4A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_09E5CF4A","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":160.0,}, - {"$GMRInstance":"v2","%Name":"inst_2A15F823","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2A15F823","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_876FFD18","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_876FFD18","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_E3417EC1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E3417EC1","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_454C3707","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_454C3707","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":160.0,}, - {"$GMRInstance":"v2","%Name":"inst_3A23E3C8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3A23E3C8","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_9A73FB61","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9A73FB61","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":224.0,}, - {"$GMRInstance":"v2","%Name":"inst_C91C6FA0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C91C6FA0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_A1FE1A2D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A1FE1A2D","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_D213BA1C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D213BA1C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":224.0,}, - {"$GMRInstance":"v2","%Name":"inst_55AF4196","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_55AF4196","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_7C8100DE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7C8100DE","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":160.0,}, - {"$GMRInstance":"v2","%Name":"inst_02D1525A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_02D1525A","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_553EEFDD","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_553EEFDD","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_8DF39DBA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8DF39DBA","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_0A63F7E8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0A63F7E8","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_387CDFBD","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_387CDFBD","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_55B41B69","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_55B41B69","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_2A6DA71F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2A6DA71F","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_A3C90E04","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A3C90E04","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_69DB5D30","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_69DB5D30","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_53DE12EB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_53DE12EB","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_E7A49E65","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E7A49E65","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_CEB29A8E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CEB29A8E","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":512.0,}, - {"$GMRInstance":"v2","%Name":"inst_8DDD2EA7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8DDD2EA7","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":512.0,}, - {"$GMRInstance":"v2","%Name":"inst_E0CCE0B8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E0CCE0B8","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_3B0C87A8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3B0C87A8","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_74157AE9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_74157AE9","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":576.0,}, - {"$GMRInstance":"v2","%Name":"inst_F8AF8DB6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F8AF8DB6","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":576.0,}, - {"$GMRInstance":"v2","%Name":"inst_16B3E5F0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_16B3E5F0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_C33643AE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C33643AE","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_1F53EF6B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1F53EF6B","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_46D965EA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_46D965EA","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_AF21A2C9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AF21A2C9","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_47A36C68","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_47A36C68","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_CA7A3670","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CA7A3670","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_258A0CBC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_258A0CBC","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_2FBE854A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2FBE854A","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":768.0,}, - {"$GMRInstance":"v2","%Name":"inst_D59943CF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D59943CF","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":768.0,}, - {"$GMRInstance":"v2","%Name":"inst_27A10AB4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_27A10AB4","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_6569A1F2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6569A1F2","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_23D6570E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_23D6570E","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_20903E71","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_20903E71","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_3B7F594A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3B7F594A","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_8953EFE0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8953EFE0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_0FCAC0BE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0FCAC0BE","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_D6166379","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D6166379","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_15ACEC8C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_15ACEC8C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_AD03219D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AD03219D","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_9FB4C563","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9FB4C563","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":512.0,}, - {"$GMRInstance":"v2","%Name":"inst_00AF5EF0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_00AF5EF0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":512.0,}, - {"$GMRInstance":"v2","%Name":"inst_96F2BEA0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_96F2BEA0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_BDEB7D5C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BDEB7D5C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_074026D3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_074026D3","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_EAE2CAF0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EAE2CAF0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_92AB3DF0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_92AB3DF0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_449E9A2B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_449E9A2B","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_2442E6BE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2442E6BE","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":288.0,}, - {"$GMRInstance":"v2","%Name":"inst_99FC132E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_99FC132E","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":288.0,}, - {"$GMRInstance":"v2","%Name":"inst_0D3D06EC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0D3D06EC","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_3E162286","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3E162286","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_09DD0B98","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_09DD0B98","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":224.0,}, - {"$GMRInstance":"v2","%Name":"inst_5B65D7D8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5B65D7D8","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":224.0,}, - {"$GMRInstance":"v2","%Name":"inst_B6CFA351","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B6CFA351","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_1609728A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1609728A","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_72BD1C47","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_72BD1C47","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_75DA04D0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_75DA04D0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_72612F45","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_72612F45","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_3A719755","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3A719755","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_3DC3B334","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3DC3B334","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_F2A3E647","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F2A3E647","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_8B51DEA0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8B51DEA0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_9E808E37","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9E808E37","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_1C7152BB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1C7152BB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_E18BAFD9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E18BAFD9","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":576.0,}, - {"$GMRInstance":"v2","%Name":"inst_A94B0BD3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A94B0BD3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_50511EB7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_50511EB7","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_00FF3F46","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_00FF3F46","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_CE974969","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CE974969","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_21204F1F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_21204F1F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_357D736B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_357D736B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_E33204DA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E33204DA","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_0875E5D6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0875E5D6","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_1A3362DD","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1A3362DD","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_BE4FE50E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BE4FE50E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_63F741EE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_63F741EE","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":768.0,}, - {"$GMRInstance":"v2","%Name":"inst_80ED5D9F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_80ED5D9F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":768.0,}, - {"$GMRInstance":"v2","%Name":"inst_B1C6E50D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B1C6E50D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_12C4B857","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_12C4B857","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_AF92DE37","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AF92DE37","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_D30FA4FB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D30FA4FB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_6CE0B413","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6CE0B413","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_BECDE02E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BECDE02E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":224.0,}, - {"$GMRInstance":"v2","%Name":"inst_80372912","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_80372912","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_F0034B9C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F0034B9C","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_97E19425","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_97E19425","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_48ED570A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_48ED570A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":576.0,}, - {"$GMRInstance":"v2","%Name":"inst_EA0A23C0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EA0A23C0","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":512.0,}, - {"$GMRInstance":"v2","%Name":"inst_55533EF5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_55533EF5","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_F5E4A9E2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F5E4A9E2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1056.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_9DE5021D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9DE5021D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_294B9A40","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_294B9A40","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1568.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_C6F1A0C2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C6F1A0C2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":768.0,}, - {"$GMRInstance":"v2","%Name":"inst_95E7C107","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_95E7C107","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_10852472","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_10852472","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_80F6E1D8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_80F6E1D8","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1056.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_8224F4CC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8224F4CC","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":512.0,}, - {"$GMRInstance":"v2","%Name":"inst_F238AB87","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F238AB87","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_E223EB40","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E223EB40","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_EE76140C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EE76140C","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_78F308E8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_78F308E8","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_B9D13756","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B9D13756","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1056.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_ECB34A19","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_ECB34A19","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1152.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_548EF074","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_548EF074","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_6DA07E97","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6DA07E97","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_C3A5B2E4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C3A5B2E4","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_5105EE58","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5105EE58","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_69D4CCEF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_69D4CCEF","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_D3700BC1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D3700BC1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_3673D84E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3673D84E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1568.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_C7706CDF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C7706CDF","objectId":{"name":"obj_enemy_leftest","path":"objects/obj_enemy_leftest/obj_enemy_leftest.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1504.0,"y":0.0,}, - {"$GMRInstance":"v2","%Name":"inst_9AE2394D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9AE2394D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1216.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_0DB4551D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0DB4551D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":224.0,}, - {"$GMRInstance":"v2","%Name":"inst_93F8F9D1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_93F8F9D1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1248.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_F62CDA04","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F62CDA04","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_BC1D4DD0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BC1D4DD0","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1248.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_E8FB9DFB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E8FB9DFB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1184.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_F7F12BC3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F7F12BC3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1312.0,"y":288.0,}, - {"$GMRInstance":"v2","%Name":"inst_07A0A63F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_07A0A63F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1216.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_AE132D74","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AE132D74","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1312.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_27CF4E5F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_27CF4E5F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1152.0,"y":512.0,}, - {"$GMRInstance":"v2","%Name":"inst_81F7B93F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_81F7B93F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1312.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_5E26086D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5E26086D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1216.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_BAEAB96E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BAEAB96E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1248.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_A126FBB2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A126FBB2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1312.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_CD5F8840","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CD5F8840","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1184.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_5A3D4E87","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5A3D4E87","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1152.0,"y":576.0,}, - {"$GMRInstance":"v2","%Name":"inst_44C2FCE4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_44C2FCE4","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1216.0,"y":768.0,}, - {"$GMRInstance":"v2","%Name":"inst_BEEE1AAF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BEEE1AAF","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1280.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_621FE1EA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_621FE1EA","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1184.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_262F9D6C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_262F9D6C","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1344.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_F16A14DB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F16A14DB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1216.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_10ACBA49","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_10ACBA49","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1312.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_FBD00D1E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FBD00D1E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1216.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_59474C1E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_59474C1E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_18F2D01C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_18F2D01C","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1312.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_AE939C59","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AE939C59","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1568.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_1B5CC0D8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1B5CC0D8","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1280.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_320DE7DE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_320DE7DE","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1216.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_A1A947A7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A1A947A7","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1312.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_62CB369D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_62CB369D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1216.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_6C4E2003","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6C4E2003","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1408.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_7E6E13B4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7E6E13B4","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1184.0,"y":288.0,}, - {"$GMRInstance":"v2","%Name":"inst_4380605B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4380605B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1248.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_498365F0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_498365F0","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1184.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_4AE5CF42","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4AE5CF42","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1408.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_1A21A3F0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1A21A3F0","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1280.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_EBD07193","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EBD07193","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1344.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_83510139","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_83510139","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1376.0,"y":288.0,}, - {"$GMRInstance":"v2","%Name":"inst_DE41F6CC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_DE41F6CC","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1376.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_D8E4D02A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D8E4D02A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1440.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_F2F466F6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F2F466F6","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1344.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_95BBF53D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_95BBF53D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1440.0,"y":512.0,}, - {"$GMRInstance":"v2","%Name":"inst_A7A11173","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A7A11173","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1376.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_8EECC032","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8EECC032","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1440.0,"y":768.0,}, - {"$GMRInstance":"v2","%Name":"inst_1A5C1E88","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1A5C1E88","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1440.0,"y":576.0,}, - {"$GMRInstance":"v2","%Name":"inst_8BE37967","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8BE37967","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1344.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_7832DC16","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7832DC16","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1056.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_4A1DA0D0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4A1DA0D0","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_80E584A2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_80E584A2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1440.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_686C20E6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_686C20E6","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1408.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_8F68253E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8F68253E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1472.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_4E6920FB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4E6920FB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1408.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_C20E4C65","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C20E4C65","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1504.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_B50A32A3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B50A32A3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1568.0,"y":224.0,}, - {"$GMRInstance":"v2","%Name":"inst_10642C17","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_10642C17","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1440.0,"y":224.0,}, - {"$GMRInstance":"v2","%Name":"inst_A3FC4DB0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A3FC4DB0","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1536.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_495136A1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_495136A1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1472.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_9DE3581A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9DE3581A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1536.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_D11BA48C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D11BA48C","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1504.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_A161BBBB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A161BBBB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1568.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_81B3C107","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_81B3C107","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1504.0,"y":576.0,}, - {"$GMRInstance":"v2","%Name":"inst_BEDDD4C3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BEDDD4C3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1536.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_4CD726A0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4CD726A0","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1440.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_B2BEF198","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B2BEF198","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1504.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_A37F6A79","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A37F6A79","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1536.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_60374050","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_60374050","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1568.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_167E625E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_167E625E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1504.0,"y":768.0,}, - {"$GMRInstance":"v2","%Name":"inst_1B54F3C5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1B54F3C5","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1472.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_394A6756","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_394A6756","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1184.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_93B6BABC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_93B6BABC","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1344.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_3954542D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3954542D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1408.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_347F206B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_347F206B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1344.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_FE311E3D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FE311E3D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1376.0,"y":512.0,}, - {"$GMRInstance":"v2","%Name":"inst_9AF09151","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9AF09151","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1248.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_95B49484","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_95B49484","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_FDCBC1D1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FDCBC1D1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_DE472767","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_DE472767","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_57FF5F83","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_57FF5F83","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":160.0,}, - {"$GMRInstance":"v2","%Name":"inst_8309A915","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8309A915","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_D5EA3E02","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D5EA3E02","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1056.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_5BAB987E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5BAB987E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1184.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_3DDFB15B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3DDFB15B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":288.0,}, - {"$GMRInstance":"v2","%Name":"inst_C76749B3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C76749B3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1344.0,"y":224.0,}, - {"$GMRInstance":"v2","%Name":"inst_05D7BA4A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_05D7BA4A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1280.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_640BD834","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_640BD834","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1440.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_0ADF5D22","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0ADF5D22","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1504.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_23E780B5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_23E780B5","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1568.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_BAA3A7CE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BAA3A7CE","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1312.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_4342BBC3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4342BBC3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1376.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_9D8344B3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9D8344B3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1248.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_2E6AFF62","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2E6AFF62","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1568.0,"y":160.0,}, - {"$GMRInstance":"v2","%Name":"inst_347F4EB1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_347F4EB1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_18B3786A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_18B3786A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_1E558424","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1E558424","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1728.0,"y":160.0,}, - {"$GMRInstance":"v2","%Name":"inst_088F0628","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_088F0628","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1664.0,"y":224.0,}, - {"$GMRInstance":"v2","%Name":"inst_6A935031","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6A935031","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1760.0,"y":224.0,}, - {"$GMRInstance":"v2","%Name":"inst_C5389FF3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C5389FF3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1728.0,"y":288.0,}, - {"$GMRInstance":"v2","%Name":"inst_7ABDE645","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7ABDE645","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_6CFF83E1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6CFF83E1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1760.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_250DA1E4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_250DA1E4","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":288.0,}, - {"$GMRInstance":"v2","%Name":"inst_35BDDB56","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_35BDDB56","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_808D0D05","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_808D0D05","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1920.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_49C7CF9A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_49C7CF9A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_EB89405D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EB89405D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1984.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_6615F3DA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6615F3DA","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1920.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_C6D8CE37","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C6D8CE37","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2048.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_6A54B063","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6A54B063","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1984.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_5C28250A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5C28250A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":512.0,}, - {"$GMRInstance":"v2","%Name":"inst_B6E07888","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B6E07888","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1952.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_60AFBAA0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_60AFBAA0","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1664.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_486C806D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_486C806D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":576.0,}, - {"$GMRInstance":"v2","%Name":"inst_F472B89D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F472B89D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_CAAF0390","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CAAF0390","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1760.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_CFFA423D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CFFA423D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1760.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_66114EEF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_66114EEF","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_6D716C3D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6D716C3D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_CBEAD4CF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CBEAD4CF","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_273D6FF1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_273D6FF1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_573E9FB8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_573E9FB8","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1760.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_6C0A2F06","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6C0A2F06","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":768.0,}, - {"$GMRInstance":"v2","%Name":"inst_EDFB0625","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EDFB0625","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_7709446B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7709446B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1984.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_880DB048","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_880DB048","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1728.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_0CB3D0B6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0CB3D0B6","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_B6FFEF76","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B6FFEF76","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_2E90CDC2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2E90CDC2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":576.0,}, - {"$GMRInstance":"v2","%Name":"inst_065A560D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_065A560D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1728.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_6E321360","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6E321360","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_B0258217","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B0258217","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":288.0,}, - {"$GMRInstance":"v2","%Name":"inst_B93B6C1A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B93B6C1A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1600.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_82CBF21E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_82CBF21E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_41CF7EA7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_41CF7EA7","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_B19699B1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B19699B1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1760.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_AF0AF791","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AF0AF791","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_21715F1C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_21715F1C","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1760.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_E8DC446F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E8DC446F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_1AC4BC97","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1AC4BC97","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1920.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_BAD0240B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BAD0240B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_398A2EE5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_398A2EE5","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1728.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_5B5914C2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5B5914C2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1600.0,"y":576.0,}, - {"$GMRInstance":"v2","%Name":"inst_9C8C1C19","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9C8C1C19","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_9FB4C666","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9FB4C666","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1664.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_31B6BFA2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_31B6BFA2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1600.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_99AEC12D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_99AEC12D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1600.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_CE659175","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CE659175","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1664.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_28E908D9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_28E908D9","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_73F6E1D3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_73F6E1D3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1728.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_454D2360","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_454D2360","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1664.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_8B58BBCD","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8B58BBCD","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":768.0,}, - {"$GMRInstance":"v2","%Name":"inst_5327609F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5327609F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_555EADDB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_555EADDB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1664.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_5D3AE2F7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5D3AE2F7","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1760.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_7887F6C7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7887F6C7","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_9579B27E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9579B27E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_328C3604","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_328C3604","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1952.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_471B0F57","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_471B0F57","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1920.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_610AA61E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_610AA61E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1952.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_5705FF86","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5705FF86","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1952.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_E9B7FA95","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E9B7FA95","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1984.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_BA6C786A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BA6C786A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_7E6E61A3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7E6E61A3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_D0FDB51F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D0FDB51F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_CA6E259B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CA6E259B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_79B66B59","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_79B66B59","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_06C49427","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_06C49427","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_94641A7D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_94641A7D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":288.0,}, - {"$GMRInstance":"v2","%Name":"inst_8CCEBC61","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8CCEBC61","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_9969588E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9969588E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_FA2025A1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FA2025A1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":160.0,}, - {"$GMRInstance":"v2","%Name":"inst_55AEBA55","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_55AEBA55","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1504.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_3EECDDD1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3EECDDD1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_0E6FA459","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0E6FA459","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1952.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_A3BF88B6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A3BF88B6","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_73F9FC32","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_73F9FC32","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1984.0,"y":224.0,}, - {"$GMRInstance":"v2","%Name":"inst_9113A661","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9113A661","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1920.0,"y":288.0,}, - {"$GMRInstance":"v2","%Name":"inst_FF9E47F9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FF9E47F9","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1984.0,"y":288.0,}, - {"$GMRInstance":"v2","%Name":"inst_990D1F3D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_990D1F3D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1984.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_9CC8B76B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9CC8B76B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2016.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_74D4C1DC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_74D4C1DC","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2016.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_195CA91B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_195CA91B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2016.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_9BBC48C3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9BBC48C3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_D2C50DD9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D2C50DD9","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_E9838623","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E9838623","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1952.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_E1F1977A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E1F1977A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1984.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_7C23CB80","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7C23CB80","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2016.0,"y":160.0,}, - {"$GMRInstance":"v2","%Name":"inst_C9C94E86","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C9C94E86","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1952.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_1213068B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1213068B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2016.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_0E355180","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0E355180","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_B36BD9FA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B36BD9FA","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":160.0,}, - {"$GMRInstance":"v2","%Name":"inst_32543C97","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_32543C97","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_D59F519D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D59F519D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_14FA416B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_14FA416B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_388035F1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_388035F1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":336.0,}, + {"$GMRInstance":"v4","%Name":"inst_D5E41057","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D5E41057","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_BB1D114A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BB1D114A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":496.0,}, + {"$GMRInstance":"v4","%Name":"inst_09923952","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_09923952","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":176.0,}, + {"$GMRInstance":"v4","%Name":"inst_DF446DDF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_DF446DDF","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_34FEE099","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_34FEE099","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":176.0,}, + {"$GMRInstance":"v4","%Name":"inst_2C87EFF8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2C87EFF8","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":240.0,}, + {"$GMRInstance":"v4","%Name":"inst_E02A4953","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E02A4953","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_F8CF0E15","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F8CF0E15","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":528.0,}, + {"$GMRInstance":"v4","%Name":"inst_758D500A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_758D500A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_5509A666","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5509A666","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":288.0,}, + {"$GMRInstance":"v4","%Name":"inst_272EA924","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_272EA924","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":304.0,}, + {"$GMRInstance":"v4","%Name":"inst_688E87F2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_688E87F2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_FB07B8CC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FB07B8CC","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":208.0,}, + {"$GMRInstance":"v4","%Name":"inst_E150D3CB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E150D3CB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_B6347843","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B6347843","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_055C23CA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_055C23CA","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_3FF12B84","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3FF12B84","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":400.0,}, + {"$GMRInstance":"v4","%Name":"inst_9C0C3419","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9C0C3419","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_7853AEB1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7853AEB1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_A8EDEDEF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A8EDEDEF","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_6EBD3C1C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6EBD3C1C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_773884FA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_773884FA","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_36A1F822","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_36A1F822","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_8559002F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8559002F","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":768.0,}, + {"$GMRInstance":"v4","%Name":"inst_9F102D8B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9F102D8B","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":768.0,}, + {"$GMRInstance":"v4","%Name":"inst_257B03D5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_257B03D5","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_BDFA2E0F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BDFA2E0F","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_EB544B1E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EB544B1E","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_B42FF6B3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B42FF6B3","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_366D8B6F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_366D8B6F","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_47294749","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_47294749","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_BDE0ECC5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BDE0ECC5","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_1DD400FB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1DD400FB","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_20DF1E0B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_20DF1E0B","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":576.0,}, + {"$GMRInstance":"v4","%Name":"inst_38E46998","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_38E46998","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":576.0,}, + {"$GMRInstance":"v4","%Name":"inst_6697D0EC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6697D0EC","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_422015A7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_422015A7","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_D91A343C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D91A343C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":512.0,}, + {"$GMRInstance":"v4","%Name":"inst_A2C31987","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A2C31987","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":512.0,}, + {"$GMRInstance":"v4","%Name":"inst_4D125B1C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4D125B1C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_CE4AA7DE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CE4AA7DE","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_5CDFA987","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5CDFA987","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_4D386697","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4D386697","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_6A11A170","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6A11A170","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_E58708C6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E58708C6","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_1E3BD983","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1E3BD983","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_059F747C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_059F747C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_09FA2609","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_09FA2609","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_1B91E8FA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1B91E8FA","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_AB6FE04B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AB6FE04B","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_D598AD85","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D598AD85","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_FA0BA6CF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FA0BA6CF","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":224.0,}, + {"$GMRInstance":"v4","%Name":"inst_AD3D1A06","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AD3D1A06","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":224.0,}, + {"$GMRInstance":"v4","%Name":"inst_0EBA49F9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0EBA49F9","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_3B94C5D4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3B94C5D4","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_1576BC5E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1576BC5E","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":160.0,}, + {"$GMRInstance":"v4","%Name":"inst_09E5CF4A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_09E5CF4A","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":160.0,}, + {"$GMRInstance":"v4","%Name":"inst_2A15F823","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2A15F823","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_876FFD18","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_876FFD18","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_E3417EC1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E3417EC1","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_454C3707","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_454C3707","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":160.0,}, + {"$GMRInstance":"v4","%Name":"inst_3A23E3C8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3A23E3C8","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_9A73FB61","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9A73FB61","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":224.0,}, + {"$GMRInstance":"v4","%Name":"inst_C91C6FA0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C91C6FA0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_A1FE1A2D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A1FE1A2D","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_D213BA1C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D213BA1C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":224.0,}, + {"$GMRInstance":"v4","%Name":"inst_55AF4196","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_55AF4196","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_7C8100DE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7C8100DE","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":160.0,}, + {"$GMRInstance":"v4","%Name":"inst_02D1525A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_02D1525A","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_553EEFDD","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_553EEFDD","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_8DF39DBA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8DF39DBA","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_0A63F7E8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0A63F7E8","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_387CDFBD","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_387CDFBD","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_55B41B69","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_55B41B69","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_2A6DA71F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2A6DA71F","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_A3C90E04","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A3C90E04","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_69DB5D30","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_69DB5D30","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_53DE12EB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_53DE12EB","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_E7A49E65","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E7A49E65","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_CEB29A8E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CEB29A8E","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":512.0,}, + {"$GMRInstance":"v4","%Name":"inst_8DDD2EA7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8DDD2EA7","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":512.0,}, + {"$GMRInstance":"v4","%Name":"inst_E0CCE0B8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E0CCE0B8","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_3B0C87A8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3B0C87A8","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_74157AE9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_74157AE9","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":576.0,}, + {"$GMRInstance":"v4","%Name":"inst_F8AF8DB6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F8AF8DB6","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":576.0,}, + {"$GMRInstance":"v4","%Name":"inst_16B3E5F0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_16B3E5F0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_C33643AE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C33643AE","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_1F53EF6B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1F53EF6B","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_46D965EA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_46D965EA","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_AF21A2C9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AF21A2C9","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_47A36C68","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_47A36C68","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_CA7A3670","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CA7A3670","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_258A0CBC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_258A0CBC","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_2FBE854A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2FBE854A","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":768.0,}, + {"$GMRInstance":"v4","%Name":"inst_D59943CF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D59943CF","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":768.0,}, + {"$GMRInstance":"v4","%Name":"inst_27A10AB4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_27A10AB4","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_6569A1F2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6569A1F2","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_23D6570E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_23D6570E","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":128.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_20903E71","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_20903E71","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_3B7F594A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3B7F594A","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_8953EFE0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8953EFE0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_0FCAC0BE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0FCAC0BE","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_D6166379","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D6166379","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_15ACEC8C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_15ACEC8C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_AD03219D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AD03219D","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_9FB4C563","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9FB4C563","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":512.0,}, + {"$GMRInstance":"v4","%Name":"inst_00AF5EF0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_00AF5EF0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":512.0,}, + {"$GMRInstance":"v4","%Name":"inst_96F2BEA0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_96F2BEA0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_BDEB7D5C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BDEB7D5C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_074026D3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_074026D3","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_EAE2CAF0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EAE2CAF0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_92AB3DF0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_92AB3DF0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_449E9A2B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_449E9A2B","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_2442E6BE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2442E6BE","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":288.0,}, + {"$GMRInstance":"v4","%Name":"inst_99FC132E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_99FC132E","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":288.0,}, + {"$GMRInstance":"v4","%Name":"inst_0D3D06EC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0D3D06EC","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_3E162286","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3E162286","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_09DD0B98","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_09DD0B98","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":224.0,}, + {"$GMRInstance":"v4","%Name":"inst_5B65D7D8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5B65D7D8","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":224.0,}, + {"$GMRInstance":"v4","%Name":"inst_B6CFA351","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B6CFA351","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_1609728A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1609728A","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_72BD1C47","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_72BD1C47","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_75DA04D0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_75DA04D0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_72612F45","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_72612F45","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_3A719755","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3A719755","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_3DC3B334","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3DC3B334","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_F2A3E647","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F2A3E647","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_8B51DEA0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8B51DEA0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":224.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_9E808E37","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9E808E37","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":256.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_1C7152BB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1C7152BB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_E18BAFD9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E18BAFD9","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":576.0,}, + {"$GMRInstance":"v4","%Name":"inst_A94B0BD3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A94B0BD3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_50511EB7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_50511EB7","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_00FF3F46","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_00FF3F46","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_CE974969","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CE974969","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_21204F1F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_21204F1F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_357D736B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_357D736B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_E33204DA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E33204DA","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_0875E5D6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0875E5D6","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_1A3362DD","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1A3362DD","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_BE4FE50E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BE4FE50E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_63F741EE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_63F741EE","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":768.0,}, + {"$GMRInstance":"v4","%Name":"inst_80ED5D9F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_80ED5D9F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":768.0,}, + {"$GMRInstance":"v4","%Name":"inst_B1C6E50D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B1C6E50D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_12C4B857","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_12C4B857","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_AF92DE37","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AF92DE37","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_D30FA4FB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D30FA4FB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_6CE0B413","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6CE0B413","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_BECDE02E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BECDE02E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":224.0,}, + {"$GMRInstance":"v4","%Name":"inst_80372912","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_80372912","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_F0034B9C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F0034B9C","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_97E19425","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_97E19425","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_48ED570A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_48ED570A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":576.0,}, + {"$GMRInstance":"v4","%Name":"inst_EA0A23C0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EA0A23C0","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":512.0,}, + {"$GMRInstance":"v4","%Name":"inst_55533EF5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_55533EF5","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_F5E4A9E2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F5E4A9E2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1056.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_9DE5021D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9DE5021D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_294B9A40","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_294B9A40","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1568.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_C6F1A0C2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C6F1A0C2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":768.0,}, + {"$GMRInstance":"v4","%Name":"inst_95E7C107","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_95E7C107","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_10852472","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_10852472","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_80F6E1D8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_80F6E1D8","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1056.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_8224F4CC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8224F4CC","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":512.0,}, + {"$GMRInstance":"v4","%Name":"inst_F238AB87","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F238AB87","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_E223EB40","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E223EB40","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_EE76140C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EE76140C","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_78F308E8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_78F308E8","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_B9D13756","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B9D13756","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1056.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_ECB34A19","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_ECB34A19","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1152.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_548EF074","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_548EF074","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_6DA07E97","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6DA07E97","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_C3A5B2E4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C3A5B2E4","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_5105EE58","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5105EE58","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_69D4CCEF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_69D4CCEF","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_D3700BC1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D3700BC1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_3673D84E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3673D84E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1568.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_C7706CDF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C7706CDF","objectId":{"name":"obj_enemy_leftest","path":"objects/obj_enemy_leftest/obj_enemy_leftest.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1504.0,"y":0.0,}, + {"$GMRInstance":"v4","%Name":"inst_9AE2394D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9AE2394D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1216.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_0DB4551D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0DB4551D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":224.0,}, + {"$GMRInstance":"v4","%Name":"inst_93F8F9D1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_93F8F9D1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1248.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_F62CDA04","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F62CDA04","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_BC1D4DD0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BC1D4DD0","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1248.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_E8FB9DFB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E8FB9DFB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1184.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_F7F12BC3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F7F12BC3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1312.0,"y":288.0,}, + {"$GMRInstance":"v4","%Name":"inst_07A0A63F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_07A0A63F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1216.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_AE132D74","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AE132D74","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1312.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_27CF4E5F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_27CF4E5F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1152.0,"y":512.0,}, + {"$GMRInstance":"v4","%Name":"inst_81F7B93F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_81F7B93F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1312.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_5E26086D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5E26086D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1216.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_BAEAB96E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BAEAB96E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1248.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_A126FBB2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A126FBB2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1312.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_CD5F8840","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CD5F8840","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1184.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_5A3D4E87","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5A3D4E87","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1152.0,"y":576.0,}, + {"$GMRInstance":"v4","%Name":"inst_44C2FCE4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_44C2FCE4","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1216.0,"y":768.0,}, + {"$GMRInstance":"v4","%Name":"inst_BEEE1AAF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BEEE1AAF","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1280.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_621FE1EA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_621FE1EA","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1184.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_262F9D6C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_262F9D6C","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1344.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_F16A14DB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F16A14DB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1216.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_10ACBA49","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_10ACBA49","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1312.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_FBD00D1E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FBD00D1E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1216.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_59474C1E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_59474C1E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_18F2D01C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_18F2D01C","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1312.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_AE939C59","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AE939C59","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1568.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_1B5CC0D8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1B5CC0D8","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1280.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_320DE7DE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_320DE7DE","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1216.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_A1A947A7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A1A947A7","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1312.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_62CB369D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_62CB369D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1216.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_6C4E2003","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6C4E2003","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1408.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_7E6E13B4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7E6E13B4","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1184.0,"y":288.0,}, + {"$GMRInstance":"v4","%Name":"inst_4380605B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4380605B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1248.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_498365F0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_498365F0","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1184.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_4AE5CF42","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4AE5CF42","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1408.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_1A21A3F0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1A21A3F0","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1280.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_EBD07193","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EBD07193","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1344.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_83510139","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_83510139","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1376.0,"y":288.0,}, + {"$GMRInstance":"v4","%Name":"inst_DE41F6CC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_DE41F6CC","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1376.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_D8E4D02A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D8E4D02A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1440.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_F2F466F6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F2F466F6","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1344.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_95BBF53D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_95BBF53D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1440.0,"y":512.0,}, + {"$GMRInstance":"v4","%Name":"inst_A7A11173","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A7A11173","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1376.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_8EECC032","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8EECC032","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1440.0,"y":768.0,}, + {"$GMRInstance":"v4","%Name":"inst_1A5C1E88","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1A5C1E88","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1440.0,"y":576.0,}, + {"$GMRInstance":"v4","%Name":"inst_8BE37967","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8BE37967","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1344.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_7832DC16","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7832DC16","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1056.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_4A1DA0D0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4A1DA0D0","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_80E584A2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_80E584A2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1440.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_686C20E6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_686C20E6","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1408.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_8F68253E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8F68253E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1472.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_4E6920FB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4E6920FB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1408.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_C20E4C65","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C20E4C65","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1504.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_B50A32A3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B50A32A3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1568.0,"y":224.0,}, + {"$GMRInstance":"v4","%Name":"inst_10642C17","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_10642C17","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1440.0,"y":224.0,}, + {"$GMRInstance":"v4","%Name":"inst_A3FC4DB0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A3FC4DB0","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1536.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_495136A1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_495136A1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1472.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_9DE3581A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9DE3581A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1536.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_D11BA48C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D11BA48C","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1504.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_A161BBBB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A161BBBB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1568.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_81B3C107","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_81B3C107","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1504.0,"y":576.0,}, + {"$GMRInstance":"v4","%Name":"inst_BEDDD4C3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BEDDD4C3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1536.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_4CD726A0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4CD726A0","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1440.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_B2BEF198","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B2BEF198","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1504.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_A37F6A79","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A37F6A79","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1536.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_60374050","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_60374050","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1568.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_167E625E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_167E625E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1504.0,"y":768.0,}, + {"$GMRInstance":"v4","%Name":"inst_1B54F3C5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1B54F3C5","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1472.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_394A6756","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_394A6756","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1184.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_93B6BABC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_93B6BABC","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1344.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_3954542D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3954542D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1408.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_347F206B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_347F206B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1344.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_FE311E3D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FE311E3D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1376.0,"y":512.0,}, + {"$GMRInstance":"v4","%Name":"inst_9AF09151","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9AF09151","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1248.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_95B49484","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_95B49484","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_FDCBC1D1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FDCBC1D1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_DE472767","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_DE472767","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_57FF5F83","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_57FF5F83","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":160.0,}, + {"$GMRInstance":"v4","%Name":"inst_8309A915","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8309A915","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_D5EA3E02","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D5EA3E02","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1056.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_5BAB987E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5BAB987E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1184.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_3DDFB15B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3DDFB15B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":288.0,}, + {"$GMRInstance":"v4","%Name":"inst_C76749B3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C76749B3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1344.0,"y":224.0,}, + {"$GMRInstance":"v4","%Name":"inst_05D7BA4A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_05D7BA4A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1280.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_640BD834","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_640BD834","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1440.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_0ADF5D22","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0ADF5D22","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1504.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_23E780B5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_23E780B5","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1568.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_BAA3A7CE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BAA3A7CE","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1312.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_4342BBC3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4342BBC3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1376.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_9D8344B3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9D8344B3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1248.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_2E6AFF62","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2E6AFF62","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1568.0,"y":160.0,}, + {"$GMRInstance":"v4","%Name":"inst_347F4EB1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_347F4EB1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_18B3786A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_18B3786A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_1E558424","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1E558424","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1728.0,"y":160.0,}, + {"$GMRInstance":"v4","%Name":"inst_088F0628","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_088F0628","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1664.0,"y":224.0,}, + {"$GMRInstance":"v4","%Name":"inst_6A935031","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6A935031","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1760.0,"y":224.0,}, + {"$GMRInstance":"v4","%Name":"inst_C5389FF3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C5389FF3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1728.0,"y":288.0,}, + {"$GMRInstance":"v4","%Name":"inst_7ABDE645","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7ABDE645","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_6CFF83E1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6CFF83E1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1760.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_250DA1E4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_250DA1E4","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":288.0,}, + {"$GMRInstance":"v4","%Name":"inst_35BDDB56","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_35BDDB56","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_808D0D05","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_808D0D05","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1920.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_49C7CF9A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_49C7CF9A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_EB89405D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EB89405D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1984.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_6615F3DA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6615F3DA","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1920.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_C6D8CE37","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C6D8CE37","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2048.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_6A54B063","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6A54B063","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1984.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_5C28250A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5C28250A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":512.0,}, + {"$GMRInstance":"v4","%Name":"inst_B6E07888","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B6E07888","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1952.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_60AFBAA0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_60AFBAA0","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1664.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_486C806D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_486C806D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":576.0,}, + {"$GMRInstance":"v4","%Name":"inst_F472B89D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F472B89D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_CAAF0390","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CAAF0390","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1760.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_CFFA423D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CFFA423D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1760.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_66114EEF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_66114EEF","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_6D716C3D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6D716C3D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_CBEAD4CF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CBEAD4CF","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_273D6FF1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_273D6FF1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_573E9FB8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_573E9FB8","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1760.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_6C0A2F06","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6C0A2F06","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":768.0,}, + {"$GMRInstance":"v4","%Name":"inst_EDFB0625","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EDFB0625","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_7709446B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7709446B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1984.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_880DB048","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_880DB048","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1728.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_0CB3D0B6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0CB3D0B6","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_B6FFEF76","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B6FFEF76","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_2E90CDC2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2E90CDC2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":576.0,}, + {"$GMRInstance":"v4","%Name":"inst_065A560D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_065A560D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1728.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_6E321360","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6E321360","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_B0258217","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B0258217","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":288.0,}, + {"$GMRInstance":"v4","%Name":"inst_B93B6C1A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B93B6C1A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1600.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_82CBF21E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_82CBF21E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_41CF7EA7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_41CF7EA7","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_B19699B1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B19699B1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1760.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_AF0AF791","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AF0AF791","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_21715F1C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_21715F1C","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1760.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_E8DC446F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E8DC446F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_1AC4BC97","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1AC4BC97","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1920.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_BAD0240B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BAD0240B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_398A2EE5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_398A2EE5","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1728.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_5B5914C2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5B5914C2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1600.0,"y":576.0,}, + {"$GMRInstance":"v4","%Name":"inst_9C8C1C19","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9C8C1C19","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_9FB4C666","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9FB4C666","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1664.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_31B6BFA2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_31B6BFA2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1600.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_99AEC12D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_99AEC12D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1600.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_CE659175","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CE659175","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1664.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_28E908D9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_28E908D9","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_73F6E1D3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_73F6E1D3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1728.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_454D2360","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_454D2360","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1664.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_8B58BBCD","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8B58BBCD","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":768.0,}, + {"$GMRInstance":"v4","%Name":"inst_5327609F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5327609F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_555EADDB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_555EADDB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1664.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_5D3AE2F7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5D3AE2F7","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1760.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_7887F6C7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7887F6C7","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_9579B27E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9579B27E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_328C3604","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_328C3604","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1952.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_471B0F57","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_471B0F57","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1920.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_610AA61E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_610AA61E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1952.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_5705FF86","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5705FF86","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1952.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_E9B7FA95","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E9B7FA95","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1984.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_BA6C786A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BA6C786A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_7E6E61A3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7E6E61A3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_D0FDB51F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D0FDB51F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_CA6E259B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CA6E259B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_79B66B59","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_79B66B59","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_06C49427","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_06C49427","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_94641A7D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_94641A7D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":288.0,}, + {"$GMRInstance":"v4","%Name":"inst_8CCEBC61","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8CCEBC61","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_9969588E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9969588E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_FA2025A1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FA2025A1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":160.0,}, + {"$GMRInstance":"v4","%Name":"inst_55AEBA55","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_55AEBA55","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1504.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_3EECDDD1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3EECDDD1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_0E6FA459","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0E6FA459","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1952.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_A3BF88B6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A3BF88B6","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_73F9FC32","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_73F9FC32","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1984.0,"y":224.0,}, + {"$GMRInstance":"v4","%Name":"inst_9113A661","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9113A661","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1920.0,"y":288.0,}, + {"$GMRInstance":"v4","%Name":"inst_FF9E47F9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FF9E47F9","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1984.0,"y":288.0,}, + {"$GMRInstance":"v4","%Name":"inst_990D1F3D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_990D1F3D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1984.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_9CC8B76B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9CC8B76B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2016.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_74D4C1DC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_74D4C1DC","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2016.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_195CA91B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_195CA91B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2016.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_9BBC48C3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9BBC48C3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_D2C50DD9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D2C50DD9","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1856.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_E9838623","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E9838623","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1952.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_E1F1977A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E1F1977A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1984.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_7C23CB80","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7C23CB80","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2016.0,"y":160.0,}, + {"$GMRInstance":"v4","%Name":"inst_C9C94E86","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C9C94E86","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1952.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_1213068B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1213068B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":2016.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_0E355180","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0E355180","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1888.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_B36BD9FA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B36BD9FA","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1792.0,"y":160.0,}, + {"$GMRInstance":"v4","%Name":"inst_32543C97","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_32543C97","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1824.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_D59F519D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D59F519D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1696.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_14FA416B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_14FA416B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1632.0,"y":352.0,}, ],"layers":[],"name":"Compatibility_Instances_Depth_0","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRBackgroundLayer":"","%Name":"Compatibility_Colour","animationFPS":15.0,"animationSpeedType":0,"colour":4278222848,"depth":2147483600,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Compatibility_Colour","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":true,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, ], diff --git a/rooms/Tutorial/Tutorial.yy b/rooms/Tutorial/Tutorial.yy index 3a29dd09f0..c160bae2ec 100644 --- a/rooms/Tutorial/Tutorial.yy +++ b/rooms/Tutorial/Tutorial.yy @@ -13,13 +13,13 @@ "isDnd":false, "layers":[ {"$GMRInstanceLayer":"","%Name":"Compatibility_Instances_Depth_-60000","depth":-60000,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"v2","%Name":"inst_794579B3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_794579B3","objectId":{"name":"obj_cursor","path":"objects/obj_cursor/obj_cursor.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":32.0,}, + {"$GMRInstance":"v4","%Name":"inst_794579B3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_794579B3","objectId":{"name":"obj_cursor","path":"objects/obj_cursor/obj_cursor.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":32.0,}, ],"layers":[],"name":"Compatibility_Instances_Depth_-60000","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRInstanceLayer":"","%Name":"Compatibility_Instances_Depth_-1000","depth":-1000,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"v2","%Name":"inst_8494E946","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8494E946","objectId":{"name":"obj_controller","path":"objects/obj_controller/obj_controller.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, + {"$GMRInstance":"v4","%Name":"inst_8494E946","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8494E946","objectId":{"name":"obj_controller","path":"objects/obj_controller/obj_controller.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, ],"layers":[],"name":"Compatibility_Instances_Depth_-1000","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRInstanceLayer":"","%Name":"Compatibility_Instances_Depth_0","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"v2","%Name":"inst_402D3A30","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_402D3A30","objectId":{"name":"obj_star","path":"objects/obj_star/obj_star.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1216.0,"y":64.0,}, + {"$GMRInstance":"v4","%Name":"inst_402D3A30","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_402D3A30","objectId":{"name":"obj_star","path":"objects/obj_star/obj_star.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1216.0,"y":64.0,}, ],"layers":[],"name":"Compatibility_Instances_Depth_0","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRBackgroundLayer":"","%Name":"Compatibility_Background_0_bg_space","animationFPS":1.0,"animationSpeedType":1,"colour":4294967295,"depth":2147483500,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":true,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Compatibility_Background_0_bg_space","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":{"name":"bg_space","path":"sprites/bg_space/bg_space.yy",},"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":true,"visible":true,"vspeed":0.0,"vtiled":true,"x":0,"y":0,}, {"$GMRBackgroundLayer":"","%Name":"Compatibility_Colour","animationFPS":15.0,"animationSpeedType":0,"colour":4290822336,"depth":2147483600,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Compatibility_Colour","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":true,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, diff --git a/rooms/combat_testing/combat_testing.yy b/rooms/combat_testing/combat_testing.yy index 61e3ea9a18..2bbae2a1a0 100644 --- a/rooms/combat_testing/combat_testing.yy +++ b/rooms/combat_testing/combat_testing.yy @@ -12,10 +12,10 @@ "isDnd":false, "layers":[ {"$GMRInstanceLayer":"","%Name":"Compatibility_Instances_Depth_-25000","depth":-25000,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"v2","%Name":"inst_8D38B641","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8D38B641","objectId":{"name":"obj_ncombat","path":"objects/obj_ncombat/obj_ncombat.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":0.0,}, + {"$GMRInstance":"v4","%Name":"inst_8D38B641","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8D38B641","objectId":{"name":"obj_ncombat","path":"objects/obj_ncombat/obj_ncombat.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":0.0,}, ],"layers":[],"name":"Compatibility_Instances_Depth_-25000","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRInstanceLayer":"","%Name":"Compatibility_Instances_Depth_0","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"v2","%Name":"inst_F0CE7FB4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F0CE7FB4","objectId":{"name":"obj_ini","path":"objects/obj_ini/obj_ini.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, + {"$GMRInstance":"v4","%Name":"inst_F0CE7FB4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F0CE7FB4","objectId":{"name":"obj_ini","path":"objects/obj_ini/obj_ini.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, ],"layers":[],"name":"Compatibility_Instances_Depth_0","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRBackgroundLayer":"","%Name":"Compatibility_Colour","animationFPS":15.0,"animationSpeedType":0,"colour":4278190080,"depth":2147483600,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Compatibility_Colour","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":true,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, ], diff --git a/rooms/testing_half/testing_half.yy b/rooms/testing_half/testing_half.yy index 4bd7c6b7c4..3612366217 100644 --- a/rooms/testing_half/testing_half.yy +++ b/rooms/testing_half/testing_half.yy @@ -133,129 +133,129 @@ "isDnd":false, "layers":[ {"$GMRInstanceLayer":"","%Name":"Compatibility_Instances_Depth_0","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"v2","%Name":"inst_388035F1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_388035F1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":336.0,}, - {"$GMRInstance":"v2","%Name":"inst_D5E41057","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D5E41057","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_BB1D114A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BB1D114A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":496.0,}, - {"$GMRInstance":"v2","%Name":"inst_09923952","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_09923952","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":176.0,}, - {"$GMRInstance":"v2","%Name":"inst_DF446DDF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_DF446DDF","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_34FEE099","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_34FEE099","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":176.0,}, - {"$GMRInstance":"v2","%Name":"inst_2C87EFF8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2C87EFF8","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":240.0,}, - {"$GMRInstance":"v2","%Name":"inst_E02A4953","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E02A4953","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_F8CF0E15","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F8CF0E15","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":528.0,}, - {"$GMRInstance":"v2","%Name":"inst_758D500A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_758D500A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_5509A666","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5509A666","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":288.0,}, - {"$GMRInstance":"v2","%Name":"inst_272EA924","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_272EA924","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":304.0,}, - {"$GMRInstance":"v2","%Name":"inst_688E87F2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_688E87F2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_FB07B8CC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FB07B8CC","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":208.0,}, - {"$GMRInstance":"v2","%Name":"inst_E150D3CB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E150D3CB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_B6347843","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B6347843","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_055C23CA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_055C23CA","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_3FF12B84","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3FF12B84","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":400.0,}, - {"$GMRInstance":"v2","%Name":"inst_9C0C3419","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9C0C3419","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_7853AEB1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7853AEB1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_A8EDEDEF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A8EDEDEF","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_9DE5021D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9DE5021D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_773884FA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_773884FA","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_6F23121B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6F23121B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1056.0,"y":864.0,}, - {"$GMRInstance":"v2","%Name":"inst_8559002F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8559002F","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":768.0,}, - {"$GMRInstance":"v2","%Name":"inst_C6F1A0C2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C6F1A0C2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":768.0,}, - {"$GMRInstance":"v2","%Name":"inst_257B03D5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_257B03D5","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_95E7C107","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_95E7C107","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_EB544B1E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EB544B1E","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_10852472","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_10852472","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_366D8B6F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_366D8B6F","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_80F6E1D8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_80F6E1D8","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1056.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_BDE0ECC5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BDE0ECC5","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_8224F4CC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8224F4CC","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":512.0,}, - {"$GMRInstance":"v2","%Name":"inst_20DF1E0B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_20DF1E0B","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":576.0,}, - {"$GMRInstance":"v2","%Name":"inst_F238AB87","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F238AB87","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_6697D0EC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6697D0EC","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_E223EB40","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E223EB40","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_D91A343C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D91A343C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":512.0,}, - {"$GMRInstance":"v2","%Name":"inst_EE76140C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EE76140C","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_4D125B1C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4D125B1C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_78F308E8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_78F308E8","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_5CDFA987","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5CDFA987","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_B9D13756","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B9D13756","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1056.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_6A11A170","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6A11A170","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_ECB34A19","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_ECB34A19","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1152.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_1E3BD983","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1E3BD983","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_548EF074","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_548EF074","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_09FA2609","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_09FA2609","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_6DA07E97","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6DA07E97","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_AB6FE04B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AB6FE04B","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_C3A5B2E4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C3A5B2E4","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_FA0BA6CF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FA0BA6CF","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":224.0,}, - {"$GMRInstance":"v2","%Name":"inst_5105EE58","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5105EE58","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_0EBA49F9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0EBA49F9","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_69D4CCEF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_69D4CCEF","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_1576BC5E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1576BC5E","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":160.0,}, - {"$GMRInstance":"v2","%Name":"inst_D3700BC1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D3700BC1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_2A15F823","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2A15F823","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_E1BDC14D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E1BDC14D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":864.0,}, - {"$GMRInstance":"v2","%Name":"inst_E3417EC1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E3417EC1","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_454C3707","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_454C3707","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":160.0,}, - {"$GMRInstance":"v2","%Name":"inst_3A23E3C8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3A23E3C8","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":192.0,}, - {"$GMRInstance":"v2","%Name":"inst_9A73FB61","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9A73FB61","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":224.0,}, - {"$GMRInstance":"v2","%Name":"inst_C91C6FA0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C91C6FA0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_BE4FE50E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BE4FE50E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_1A3362DD","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1A3362DD","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_0875E5D6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0875E5D6","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_E33204DA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E33204DA","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_357D736B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_357D736B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_553EEFDD","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_553EEFDD","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_63F741EE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_63F741EE","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":768.0,}, - {"$GMRInstance":"v2","%Name":"inst_0A63F7E8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0A63F7E8","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_80ED5D9F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_80ED5D9F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":768.0,}, - {"$GMRInstance":"v2","%Name":"inst_55B41B69","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_55B41B69","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":384.0,}, - {"$GMRInstance":"v2","%Name":"inst_B1C6E50D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B1C6E50D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_A3C90E04","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A3C90E04","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_12C4B857","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_12C4B857","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_53DE12EB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_53DE12EB","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_AF92DE37","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AF92DE37","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_CEB29A8E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CEB29A8E","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":512.0,}, - {"$GMRInstance":"v2","%Name":"inst_D30FA4FB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D30FA4FB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_E0CCE0B8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E0CCE0B8","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_6CE0B413","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6CE0B413","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_74157AE9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_74157AE9","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":576.0,}, - {"$GMRInstance":"v2","%Name":"inst_BECDE02E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BECDE02E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":224.0,}, - {"$GMRInstance":"v2","%Name":"inst_16B3E5F0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_16B3E5F0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_80372912","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_80372912","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":128.0,}, - {"$GMRInstance":"v2","%Name":"inst_1F53EF6B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1F53EF6B","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_F0034B9C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F0034B9C","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_AF21A2C9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AF21A2C9","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_97E19425","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_97E19425","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_CA7A3670","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CA7A3670","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_48ED570A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_48ED570A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":576.0,}, - {"$GMRInstance":"v2","%Name":"inst_2FBE854A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2FBE854A","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":768.0,}, - {"$GMRInstance":"v2","%Name":"inst_EA0A23C0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EA0A23C0","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":512.0,}, - {"$GMRInstance":"v2","%Name":"inst_27A10AB4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_27A10AB4","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":800.0,}, - {"$GMRInstance":"v2","%Name":"inst_55533EF5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_55533EF5","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_23D6570E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_23D6570E","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":832.0,}, - {"$GMRInstance":"v2","%Name":"inst_F5E4A9E2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F5E4A9E2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1056.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_3B7F594A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3B7F594A","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":416.0,}, - {"$GMRInstance":"v2","%Name":"inst_E18BAFD9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E18BAFD9","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":576.0,}, - {"$GMRInstance":"v2","%Name":"inst_0FCAC0BE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0FCAC0BE","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":448.0,}, - {"$GMRInstance":"v2","%Name":"inst_1C7152BB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1C7152BB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_15ACEC8C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_15ACEC8C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":480.0,}, - {"$GMRInstance":"v2","%Name":"inst_72BD1C47","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_72BD1C47","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":640.0,}, - {"$GMRInstance":"v2","%Name":"inst_9FB4C563","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9FB4C563","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":512.0,}, - {"$GMRInstance":"v2","%Name":"inst_8B51DEA0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8B51DEA0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_96F2BEA0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_96F2BEA0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_72612F45","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_72612F45","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_074026D3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_074026D3","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":352.0,}, - {"$GMRInstance":"v2","%Name":"inst_A94B0BD3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A94B0BD3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_92AB3DF0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_92AB3DF0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":320.0,}, - {"$GMRInstance":"v2","%Name":"inst_50511EB7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_50511EB7","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_2442E6BE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2442E6BE","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":288.0,}, - {"$GMRInstance":"v2","%Name":"inst_00FF3F46","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_00FF3F46","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":672.0,}, - {"$GMRInstance":"v2","%Name":"inst_0D3D06EC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0D3D06EC","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":256.0,}, - {"$GMRInstance":"v2","%Name":"inst_CE974969","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CE974969","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":544.0,}, - {"$GMRInstance":"v2","%Name":"inst_09DD0B98","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_09DD0B98","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":224.0,}, - {"$GMRInstance":"v2","%Name":"inst_21204F1F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_21204F1F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":736.0,}, - {"$GMRInstance":"v2","%Name":"inst_B6CFA351","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B6CFA351","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":608.0,}, - {"$GMRInstance":"v2","%Name":"inst_3DC3B334","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3DC3B334","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":704.0,}, - {"$GMRInstance":"v2","%Name":"inst_79E7CBAB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_79E7CBAB","objectId":{"name":"obj_enemy_leftest","path":"objects/obj_enemy_leftest/obj_enemy_leftest.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":64.0,}, + {"$GMRInstance":"v4","%Name":"inst_388035F1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_388035F1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":336.0,}, + {"$GMRInstance":"v4","%Name":"inst_D5E41057","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D5E41057","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_BB1D114A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BB1D114A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":496.0,}, + {"$GMRInstance":"v4","%Name":"inst_09923952","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_09923952","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":176.0,}, + {"$GMRInstance":"v4","%Name":"inst_DF446DDF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_DF446DDF","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_34FEE099","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_34FEE099","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":176.0,}, + {"$GMRInstance":"v4","%Name":"inst_2C87EFF8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2C87EFF8","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":240.0,}, + {"$GMRInstance":"v4","%Name":"inst_E02A4953","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E02A4953","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_F8CF0E15","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F8CF0E15","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":528.0,}, + {"$GMRInstance":"v4","%Name":"inst_758D500A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_758D500A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_5509A666","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5509A666","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":288.0,}, + {"$GMRInstance":"v4","%Name":"inst_272EA924","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_272EA924","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":304.0,}, + {"$GMRInstance":"v4","%Name":"inst_688E87F2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_688E87F2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_FB07B8CC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FB07B8CC","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":208.0,}, + {"$GMRInstance":"v4","%Name":"inst_E150D3CB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E150D3CB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_B6347843","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B6347843","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_055C23CA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_055C23CA","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_3FF12B84","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3FF12B84","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":400.0,}, + {"$GMRInstance":"v4","%Name":"inst_9C0C3419","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9C0C3419","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_7853AEB1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7853AEB1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_A8EDEDEF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A8EDEDEF","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_9DE5021D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9DE5021D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_773884FA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_773884FA","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_6F23121B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6F23121B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1056.0,"y":864.0,}, + {"$GMRInstance":"v4","%Name":"inst_8559002F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8559002F","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":768.0,}, + {"$GMRInstance":"v4","%Name":"inst_C6F1A0C2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C6F1A0C2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":768.0,}, + {"$GMRInstance":"v4","%Name":"inst_257B03D5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_257B03D5","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_95E7C107","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_95E7C107","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_EB544B1E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EB544B1E","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_10852472","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_10852472","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_366D8B6F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_366D8B6F","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_80F6E1D8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_80F6E1D8","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1056.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_BDE0ECC5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BDE0ECC5","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_8224F4CC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8224F4CC","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":512.0,}, + {"$GMRInstance":"v4","%Name":"inst_20DF1E0B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_20DF1E0B","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":576.0,}, + {"$GMRInstance":"v4","%Name":"inst_F238AB87","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F238AB87","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_6697D0EC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6697D0EC","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_E223EB40","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E223EB40","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_D91A343C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D91A343C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":512.0,}, + {"$GMRInstance":"v4","%Name":"inst_EE76140C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EE76140C","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_4D125B1C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_4D125B1C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_78F308E8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_78F308E8","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_5CDFA987","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5CDFA987","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_B9D13756","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B9D13756","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1056.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_6A11A170","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6A11A170","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_ECB34A19","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_ECB34A19","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1152.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_1E3BD983","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1E3BD983","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_548EF074","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_548EF074","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_09FA2609","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_09FA2609","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_6DA07E97","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6DA07E97","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_AB6FE04B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AB6FE04B","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_C3A5B2E4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C3A5B2E4","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_FA0BA6CF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_FA0BA6CF","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":224.0,}, + {"$GMRInstance":"v4","%Name":"inst_5105EE58","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5105EE58","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1088.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_0EBA49F9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0EBA49F9","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_69D4CCEF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_69D4CCEF","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_1576BC5E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1576BC5E","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":160.0,}, + {"$GMRInstance":"v4","%Name":"inst_D3700BC1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D3700BC1","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_2A15F823","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2A15F823","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_E1BDC14D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E1BDC14D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":864.0,}, + {"$GMRInstance":"v4","%Name":"inst_E3417EC1","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E3417EC1","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_454C3707","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_454C3707","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":160.0,}, + {"$GMRInstance":"v4","%Name":"inst_3A23E3C8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3A23E3C8","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":192.0,}, + {"$GMRInstance":"v4","%Name":"inst_9A73FB61","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9A73FB61","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":224.0,}, + {"$GMRInstance":"v4","%Name":"inst_C91C6FA0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_C91C6FA0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_BE4FE50E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BE4FE50E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_1A3362DD","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1A3362DD","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":832.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_0875E5D6","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0875E5D6","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_E33204DA","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E33204DA","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_357D736B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_357D736B","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_553EEFDD","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_553EEFDD","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_63F741EE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_63F741EE","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":768.0,}, + {"$GMRInstance":"v4","%Name":"inst_0A63F7E8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0A63F7E8","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_80ED5D9F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_80ED5D9F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":768.0,}, + {"$GMRInstance":"v4","%Name":"inst_55B41B69","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_55B41B69","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":384.0,}, + {"$GMRInstance":"v4","%Name":"inst_B1C6E50D","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B1C6E50D","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_A3C90E04","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A3C90E04","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_12C4B857","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_12C4B857","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_53DE12EB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_53DE12EB","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_AF92DE37","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AF92DE37","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_CEB29A8E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CEB29A8E","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":512.0,}, + {"$GMRInstance":"v4","%Name":"inst_D30FA4FB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_D30FA4FB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_E0CCE0B8","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E0CCE0B8","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_6CE0B413","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6CE0B413","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_74157AE9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_74157AE9","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":576.0,}, + {"$GMRInstance":"v4","%Name":"inst_BECDE02E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_BECDE02E","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":224.0,}, + {"$GMRInstance":"v4","%Name":"inst_16B3E5F0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_16B3E5F0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_80372912","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_80372912","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":128.0,}, + {"$GMRInstance":"v4","%Name":"inst_1F53EF6B","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1F53EF6B","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_F0034B9C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F0034B9C","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_AF21A2C9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_AF21A2C9","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_97E19425","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_97E19425","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_CA7A3670","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CA7A3670","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_48ED570A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_48ED570A","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":576.0,}, + {"$GMRInstance":"v4","%Name":"inst_2FBE854A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2FBE854A","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":768.0,}, + {"$GMRInstance":"v4","%Name":"inst_EA0A23C0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_EA0A23C0","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":512.0,}, + {"$GMRInstance":"v4","%Name":"inst_27A10AB4","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_27A10AB4","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":800.0,}, + {"$GMRInstance":"v4","%Name":"inst_55533EF5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_55533EF5","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1024.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_23D6570E","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_23D6570E","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":832.0,}, + {"$GMRInstance":"v4","%Name":"inst_F5E4A9E2","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_F5E4A9E2","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1056.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_3B7F594A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3B7F594A","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":416.0,}, + {"$GMRInstance":"v4","%Name":"inst_E18BAFD9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_E18BAFD9","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":896.0,"y":576.0,}, + {"$GMRInstance":"v4","%Name":"inst_0FCAC0BE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0FCAC0BE","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":448.0,}, + {"$GMRInstance":"v4","%Name":"inst_1C7152BB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_1C7152BB","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_15ACEC8C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_15ACEC8C","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":480.0,}, + {"$GMRInstance":"v4","%Name":"inst_72BD1C47","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_72BD1C47","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":640.0,}, + {"$GMRInstance":"v4","%Name":"inst_9FB4C563","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_9FB4C563","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":512.0,}, + {"$GMRInstance":"v4","%Name":"inst_8B51DEA0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_8B51DEA0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_96F2BEA0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_96F2BEA0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_72612F45","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_72612F45","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_074026D3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_074026D3","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":352.0,}, + {"$GMRInstance":"v4","%Name":"inst_A94B0BD3","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_A94B0BD3","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_92AB3DF0","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_92AB3DF0","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":320.0,}, + {"$GMRInstance":"v4","%Name":"inst_50511EB7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_50511EB7","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":928.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_2442E6BE","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_2442E6BE","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":288.0,}, + {"$GMRInstance":"v4","%Name":"inst_00FF3F46","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_00FF3F46","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":672.0,}, + {"$GMRInstance":"v4","%Name":"inst_0D3D06EC","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_0D3D06EC","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":256.0,}, + {"$GMRInstance":"v4","%Name":"inst_CE974969","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_CE974969","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":960.0,"y":544.0,}, + {"$GMRInstance":"v4","%Name":"inst_09DD0B98","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_09DD0B98","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":224.0,}, + {"$GMRInstance":"v4","%Name":"inst_21204F1F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_21204F1F","objectId":{"name":"obj_ork","path":"objects/obj_ork/obj_ork.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":864.0,"y":736.0,}, + {"$GMRInstance":"v4","%Name":"inst_B6CFA351","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_B6CFA351","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":608.0,}, + {"$GMRInstance":"v4","%Name":"inst_3DC3B334","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_3DC3B334","objectId":{"name":"obj_marine","path":"objects/obj_marine/obj_marine.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":704.0,}, + {"$GMRInstance":"v4","%Name":"inst_79E7CBAB","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_79E7CBAB","objectId":{"name":"obj_enemy_leftest","path":"objects/obj_enemy_leftest/obj_enemy_leftest.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":64.0,}, ],"layers":[],"name":"Compatibility_Instances_Depth_0","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":true,"visible":true,}, {"$GMRBackgroundLayer":"","%Name":"Compatibility_Colour","animationFPS":15.0,"animationSpeedType":0,"colour":4278222848,"depth":2147483600,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Compatibility_Colour","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":true,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, ], diff --git a/scripts/DebugView/DebugView.gml b/scripts/DebugView/DebugView.gml new file mode 100644 index 0000000000..588445a1e5 --- /dev/null +++ b/scripts/DebugView/DebugView.gml @@ -0,0 +1,105 @@ + +/// Slightly nicer syntax for working with dbg_views. +/// Functions can be chained for simpler construction. +/// Parameters passed into the "add_" functions should always match instance variable names. Local variables don't work with dbg_views. +/// Creating a debug view opens the overlay automatically, finish construction with .hide() to prevent it from open automatically during regular play. +/// @param {String} view_name the title of the view +/// @param {Id.Instance|Struct} obj The object being debugged. Can be a regular struct, an instance or a full object +function DebugView(view_name, obj) constructor { + + + + + + obj_ref = obj; + /// should stop adding duplicate controls if the view already exists + update = false; + + if(struct_exists(obj_ref, view_name)){ + if(dbg_view_exists(obj_ref[$view_name])){ + view_ptr = obj_ref[$view_name]; + update = true; + } + } else { + view_ptr = dbg_view(view_name, false); // calling dbg_view opens the overlay automatically + variable_struct_set(obj_ref, view_name, view_ptr); + } + + + + name = view_name; + + static add_watch = function (_name, _label = _name){ + if(update) return self; + dbg_watch(ref_create(self.obj_ref, _name), _label); + return self; + } + + static add_slider_int = function(_name, min, max, label = _name, step = 1){ + if(update) return self; + dbg_slider_int(ref_create(self.obj_ref, _name), min, max, label, step); + return self; + } + + static add_slider = function(_name, min, max, label = _name, step = 0.01){ + if(update) return self; + dbg_slider(ref_create(self.obj_ref, _name), min, max, label = name, step); + return self; + } + + static add_checkbox = function(_name, _label = _name){ + if(update) return self; + dbg_checkbox(ref_create(self.obj_ref, _name), _label); + return self; + } + + static add_button = function(_label, fn){ + if(update) return self; + dbg_button(_label, fn); + return self; + } + + static add_section = function(_name, _open = true) { + if(update) return self; + dbg_section(_name, true); + return self; + } + + static show = function(){ + if(update) return self; + show_debug_overlay(true); + if(struct_exists(self, "view_ptr")){ + dbg_set_view(self.view_ptr) + } + return self; + } + + static hide = function(){ + if(update) return self; + show_debug_overlay(false); + return self; + } + + static delete_view = function(){ + dbg_view_delete(self.view_ptr); + return self; + } + + static add_text = function(input, label){ + + dbg_text($"{label}: {input}"); + return self; + } + + /// quick and dirty way to display all variables of the given obj in a dbg section + static dump_props = function(){ + if(update) return self; + dbg_section("Dump Props"); + var names = struct_get_names(self.obj_ref); + for(var i = 0; i < array_length(names); i++){ + dbg_watch(ref_create(self.obj_ref, names[i])); + } + + return self; + } +} \ No newline at end of file diff --git a/scripts/scr_trade_add/scr_trade_add.yy b/scripts/DebugView/DebugView.yy similarity index 54% rename from scripts/scr_trade_add/scr_trade_add.yy rename to scripts/DebugView/DebugView.yy index fd93a3a02a..92da1986c4 100644 --- a/scripts/scr_trade_add/scr_trade_add.yy +++ b/scripts/DebugView/DebugView.yy @@ -1,12 +1,12 @@ { "$GMScript":"v1", - "%Name":"scr_trade_add", + "%Name":"DebugView", "isCompatibility":false, "isDnD":false, - "name":"scr_trade_add", + "name":"DebugView", "parent":{ - "name":"Diplomacy", - "path":"folders/Scripts/Diplomacy.yy", + "name":"Helpers", + "path":"folders/Scripts/Helpers.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/NameGenerator/NameGenerator.gml b/scripts/NameGenerator/NameGenerator.gml index 46046b640d..b883747918 100644 --- a/scripts/NameGenerator/NameGenerator.gml +++ b/scripts/NameGenerator/NameGenerator.gml @@ -28,10 +28,14 @@ function NameGenerator() constructor { var result = {}; for (var i = 0; i < array_length(json_names_property_names); i++) { - if (load_result.is_success) { - result[$ json_names_property_names[i]] = load_result.values[$ json_names_property_names[i]]; + var _property_name = json_names_property_names[i]; + if (!is_string(_property_name)){ + continue; + } + if (load_result.is_success && struct_exists(load_result.values, _property_name)) { + result[$ _property_name] = load_result.values[$ _property_name]; } else { - result[$ json_names_property_names[i]] = array_create(1, $"{json_names_property_names[i]} 1"); + result[$ _property_name] = array_create(1, $"{_property_name} 1"); } } @@ -39,37 +43,37 @@ function NameGenerator() constructor { }; // vars // TODO put these into a struct or dict or something - static sector_names = LoadSimpleNames("sector", "Sector 1"); - static sector_used_names = []; + sector_names = LoadSimpleNames("sector", "Sector 1"); + sector_used_names = []; - static star_names = LoadSimpleNames("star", "Star 1"); - static star_used_names = []; - static star_names_generic_counter = 0; // TODO once we migrate Star data to proper structs and jsons, this can probably be removed + star_names = LoadSimpleNames("star", "Star 1"); + star_used_names = []; + star_names_generic_counter = 0; // TODO once we migrate Star data to proper structs and jsons, this can probably be removed - static space_marines_names = LoadSimpleNames("space_marine", "Space Marine 1"); - static space_marines_used_names = []; + space_marines_names = LoadSimpleNames("space_marine", "Space Marine 1"); + space_marines_used_names = []; - static imperial_names = LoadSimpleNames("imperial", "Imperial 1"); - static imperial_used_names = []; + imperial_names = LoadSimpleNames("imperial", "Imperial 1"); + imperial_used_names = []; - static chaos_names = LoadSimpleNames("chaos", "Chaos 1"); - static chaos_used_names = []; + chaos_names = LoadSimpleNames("chaos", "Chaos 1"); + chaos_used_names = []; - static eldar_syllables = LoadCompositeNames("eldar", ["first_syllables", "second_syllables", "third_syllables"]); + eldar_syllables = LoadCompositeNames("eldar", ["first_syllables", "second_syllables", "third_syllables"]); - static ork_name_composites = LoadCompositeNames("ork", ["prefixes", "suffixes", "special"]); + ork_name_composites = LoadCompositeNames("ork", ["prefixes", "suffixes", "special"]); - static imperial_ship_names = LoadSimpleNames("imperial_ship", "Imperial Ship 1"); - static imperial_ship_used_names = []; + imperial_ship_names = LoadSimpleNames("imperial_ship", "Imperial Ship 1"); + imperial_ship_used_names = []; - static ork_ship_names = LoadSimpleNames("ork_ship", "Ork Ship 1"); - static ork_ship_used_names = []; + ork_ship_names = LoadSimpleNames("ork_ship", "Ork Ship 1"); + ork_ship_used_names = []; - static hulk_name_composites = LoadCompositeNames("hulk", ["prefixes", "suffixes"]); + hulk_name_composites = LoadCompositeNames("hulk", ["prefixes", "suffixes"]); - static tau_name_composites = LoadCompositeNames("tau", ["prefixes", "suffixes"]); + tau_name_composites = LoadCompositeNames("tau", ["prefixes", "suffixes"]); - static genestealer_cult_names = LoadCompositeNames("genestealercult", ["main", "embelishment", "title"]); + genestealer_cult_names = LoadCompositeNames("genestealercult", ["main", "embelishment", "title"]); // init @@ -83,8 +87,9 @@ function NameGenerator() constructor { array_copy(names, 0, used_names, 0, used_names_length); array_delete(used_names, 0, used_names_length); } else { - log_message($"Used up all {entity_name} names, generating generic name"); - return $"{entity_name} {used_names_length + ++star_names_generic_counter}"; + log_error($"Used up all {entity_name} names. Generating a generic name. used_names_length = {used_names_length}; star_names_generic_counter = {star_names_generic_counter}."); + star_names_generic_counter++; + return $"{entity_name} {used_names_length + star_names_generic_counter}"; } } @@ -225,6 +230,3 @@ function NameGenerator() constructor { return CompositeNameGeneration(tau_name_composites, true); }; } - -// Init -global.name_generator = new NameGenerator(); diff --git a/scripts/UIComponents/UIComponents.gml b/scripts/UIComponents/UIComponents.gml index fcb8a9dcaa..13dce31947 100644 --- a/scripts/UIComponents/UIComponents.gml +++ b/scripts/UIComponents/UIComponents.gml @@ -320,7 +320,7 @@ function UINodeDebugComponent(owner, name ="") : UIComponent(owner, name) constr } str += string(" UIWARNING: {0} caused by node: {1} against node: {2} in function: {3}\n", code, ref1, ref2, func) } - show_debug_message(str + "}") + show_debug_message_adv(str + "}") } static toString = function() { @@ -392,66 +392,7 @@ function star_ui_name_node(){ .finalize() } -function MainMenuButton(sprite=spr_ui_but_1, sprite_hover=spr_ui_hov_1, xx=0, yy=0, Hot_key=-1, Click_function=false) constructor{ - mouse_enter=0; - base_sprite = sprite; - hover_sprite = sprite_hover; - ossilate = 24; - ossilate_down = true; - hover_alpha=0; - XX=xx; - YY=yy; - hot_key = Hot_key; - clicked=false; - click_function = Click_function; - static draw = function(xx=XX,yy=YY,text="", x_scale=1, y_scale=1, width=108, height=42){ - clicked=false; - height *=y_scale - width *=x_scale; - if (scr_hit(xx, yy, xx+width, yy+height)){ - if (ossilate>0) then ossilate-=1; - if (ossilate<0) then ossilate=0; - if (hover_alpha<1) then hover_alpha+=0.42 - draw_set_blend_mode(bm_add); - draw_set_alpha(hover_alpha); - draw_sprite(hover_sprite,0,xx,yy); - draw_set_blend_mode(bm_normal); - ossilate_down = true; - clicked = device_mouse_check_button_pressed(0,mb_left); - } else { - if (ossilate_down){ - if (ossilate<24)then ossilate+=0.2; - if (ossilate==24) then ossilate_down=false; - } else { - if (ossilate>8) then ossilate-=0.2; - if(ossilate==8) then ossilate_down=true; - } - if (hover_alpha>0){ - hover_alpha-=0.04 - draw_set_blend_mode(bm_add); - draw_set_alpha(hover_alpha); - draw_sprite(hover_sprite,0,xx,yy); - draw_set_blend_mode(bm_normal); - } - } - if (hot_key!=-1 && !clicked){ - clicked = press_with_held(hot_key,vk_alt); - //show_debug_message($"{clicked}"); - } - draw_set_alpha(1); - draw_sprite(base_sprite,floor(ossilate),xx,yy); - draw_set_color(c_white); - draw_set_halign(fa_center); - draw_set_font(fnt_cul_14); - draw_text_ext(xx+(width/2),yy+4, text, 18*y_scale, width-(15*x_scale)); - if (clicked){ - if (click_function){ - click_function(); - } - } - return clicked; - } -} + diff --git a/scripts/__init_global/__init_global.gml b/scripts/__init_global/__init_global.gml index e1afd62310..5ffa35cd09 100644 --- a/scripts/__init_global/__init_global.gml +++ b/scripts/__init_global/__init_global.gml @@ -8,7 +8,39 @@ function __init_global() { initialize_marine_traits(); + initialize_dialogue(); + + global.culture_styles = [ + "Greek", + "Roman", + "Knightly", + "Gladiator", + "Mongol", + "Feral", + "Flame Cult", + "Mechanical Cult", + "Prussian", + "Cthonian", + "Alpha", + "Ultra", + "Renaissance", + "Blood", + "Angelic", + "Crusader", + "Gothic", + "Wolf Cult", + "Runic" + ]; + + try{ + load_visual_sets(); + } catch(_exception){ + handle_exception(_exception); + } global.chapter_name = "None"; global.game_seed = 0; global.ui_click_lock = false; + global.name_generator = new NameGenerator(); + global.star_sprites = ds_map_create(); + global.base_component_surface = -1; } diff --git a/scripts/__view_get/__view_get.gml b/scripts/__view_get/__view_get.gml index 5329cdeef3..665cc414d6 100644 --- a/scripts/__view_get/__view_get.gml +++ b/scripts/__view_get/__view_get.gml @@ -1,21 +1,22 @@ function __view_get(argument0, argument1) { var __prop = argument0; var __index = argument1; + var __cam = view_get_camera(__index); var __res = -1; switch(__prop) { - case e__VW.XView: var __cam = view_get_camera(__index); __res = camera_get_view_x(__cam); break; - case e__VW.YView: var __cam = view_get_camera(__index); __res = camera_get_view_y(__cam); break; - case e__VW.WView: var __cam = view_get_camera(__index); __res = camera_get_view_width(__cam); break; - case e__VW.HView: var __cam = view_get_camera(__index); __res = camera_get_view_height(__cam); break; - case e__VW.Angle: var __cam = view_get_camera(__index); __res = camera_get_view_angle(__cam); break; - case e__VW.HBorder: var __cam = view_get_camera(__index); __res = camera_get_view_border_x(__cam); break; - case e__VW.VBorder: var __cam = view_get_camera(__index); __res = camera_get_view_border_y(__cam); break; - case e__VW.HSpeed: var __cam = view_get_camera(__index); __res = camera_get_view_speed_x(__cam); break; - case e__VW.VSpeed: var __cam = view_get_camera(__index); __res = camera_get_view_speed_y(__cam); break; - case e__VW.Object: var __cam = view_get_camera(__index); __res = camera_get_view_target(__cam); break; + case e__VW.XView: __cam = view_get_camera(__index); __res = camera_get_view_x(__cam); break; + case e__VW.YView: __cam = view_get_camera(__index); __res = camera_get_view_y(__cam); break; + case e__VW.WView: __cam = view_get_camera(__index); __res = camera_get_view_width(__cam); break; + case e__VW.HView: __cam = view_get_camera(__index); __res = camera_get_view_height(__cam); break; + case e__VW.Angle: __cam = view_get_camera(__index); __res = camera_get_view_angle(__cam); break; + case e__VW.HBorder: __cam = view_get_camera(__index); __res = camera_get_view_border_x(__cam); break; + case e__VW.VBorder: __cam = view_get_camera(__index); __res = camera_get_view_border_y(__cam); break; + case e__VW.HSpeed: __cam = view_get_camera(__index); __res = camera_get_view_speed_x(__cam); break; + case e__VW.VSpeed: __cam = view_get_camera(__index); __res = camera_get_view_speed_y(__cam); break; + case e__VW.Object: __cam = view_get_camera(__index); __res = camera_get_view_target(__cam); break; case e__VW.Visible: __res = view_get_visible(__index); break; case e__VW.XPort: __res = view_get_xport(__index); break; case e__VW.YPort: __res = view_get_yport(__index); break; diff --git a/scripts/__view_set_internal/__view_set_internal.gml b/scripts/__view_set_internal/__view_set_internal.gml index 9df86e7e04..b8211faabc 100644 --- a/scripts/__view_set_internal/__view_set_internal.gml +++ b/scripts/__view_set_internal/__view_set_internal.gml @@ -2,19 +2,20 @@ function __view_set_internal(argument0, argument1, argument2) { var __prop = argument0; var __index = argument1; var __val = argument2; + var __cam = view_get_camera(__index) switch(__prop) { - case e__VW.XView: var __cam = view_get_camera(__index); camera_set_view_pos(__cam, __val, camera_get_view_y(__cam)); break; - case e__VW.YView: var __cam = view_get_camera(__index); camera_set_view_pos(__cam, camera_get_view_x(__cam), __val); break; - case e__VW.WView: var __cam = view_get_camera(__index); camera_set_view_size(__cam, __val, camera_get_view_height(__cam)); break; - case e__VW.HView: var __cam = view_get_camera(__index); camera_set_view_size(__cam, camera_get_view_width(__cam), __val); break; - case e__VW.Angle: var __cam = view_get_camera(__index); camera_set_view_angle(__cam, __val); break; - case e__VW.HBorder: var __cam = view_get_camera(__index); camera_set_view_border(__cam, __val, camera_get_view_border_y(__cam)); break; - case e__VW.VBorder: var __cam = view_get_camera(__index); camera_set_view_border(__cam, camera_get_view_border_x(__cam), __val); break; - case e__VW.HSpeed: var __cam = view_get_camera(__index); camera_set_view_speed(__cam, __val, camera_get_view_speed_y(__cam)); break; - case e__VW.VSpeed: var __cam = view_get_camera(__index); camera_set_view_speed(__cam, camera_get_view_speed_x(__cam), __val); break; - case e__VW.Object: var __cam = view_get_camera(__index); camera_set_view_target(__cam, __val); break; + case e__VW.XView: camera_set_view_pos(__cam, __val, camera_get_view_y(__cam)); break; + case e__VW.YView: camera_set_view_pos(__cam, camera_get_view_x(__cam), __val); break; + case e__VW.WView: camera_set_view_size(__cam, __val, camera_get_view_height(__cam)); break; + case e__VW.HView: camera_set_view_size(__cam, camera_get_view_width(__cam), __val); break; + case e__VW.Angle: camera_set_view_angle(__cam, __val); break; + case e__VW.HBorder: camera_set_view_border(__cam, __val, camera_get_view_border_y(__cam)); break; + case e__VW.VBorder: camera_set_view_border(__cam, camera_get_view_border_x(__cam), __val); break; + case e__VW.HSpeed: camera_set_view_speed(__cam, __val, camera_get_view_speed_y(__cam)); break; + case e__VW.VSpeed: camera_set_view_speed(__cam, camera_get_view_speed_x(__cam), __val); break; + case e__VW.Object: camera_set_view_target(__cam, __val); break; case e__VW.Visible: __res = view_set_visible(__index, __val); break; case e__VW.XPort: __res = view_set_xport(__index, __val); break; case e__VW.YPort: __res = view_set_yport(__index, __val); break; diff --git a/scripts/action_if_variable/action_if_variable.gml b/scripts/action_if_variable/action_if_variable.gml index 879b131e3b..0dd8d84bcd 100644 --- a/scripts/action_if_variable/action_if_variable.gml +++ b/scripts/action_if_variable/action_if_variable.gml @@ -2,15 +2,15 @@ /// @param val1 value to check against /// @param val2 value2 to check against /// @param type type of check (1=='<', 2=='>', 3=='<=', 4=='>='anything else is ==) -function action_if_variable(argument0, argument1, argument2) { +function action_if_variable(check_variable, compare_variable, check_type) { var ret = false; - switch( argument2 ) + switch( check_type ) { - case 1: ret = (argument0 < argument1); break; - case 2: ret = (argument0 > argument1); break; - case 3: ret = (argument0 <= argument1); break; - case 4: ret = (argument0 >= argument1); break; - default:ret = (argument0 == argument1); break; + case 1: ret = (check_variable < compare_variable); break; + case 2: ret = (check_variable > compare_variable); break; + case 3: ret = (check_variable <= compare_variable); break; + case 4: ret = (check_variable >= compare_variable); break; + default:ret = (check_variable == compare_variable); break; } return ret; diff --git a/scripts/debugl/debugl.gml b/scripts/debugl/debugl.gml index 9f437039cc..91cbd17c1b 100644 --- a/scripts/debugl/debugl.gml +++ b/scripts/debugl/debugl.gml @@ -23,7 +23,7 @@ function log_warning(_text) { } function show_debug_message_time(_text) { - show_debug_message($"[{TIME_1}] {_text}"); + show_debug_message_adv($"[{TIME_1}] {_text}"); } function debug_get_current_call(_depth = 1) { diff --git a/scripts/exp_and_exp_growth/exp_and_exp_growth.gml b/scripts/exp_and_exp_growth/exp_and_exp_growth.gml index 032ec081a8..6f37f2a6b1 100644 --- a/scripts/exp_and_exp_growth/exp_and_exp_growth.gml +++ b/scripts/exp_and_exp_growth/exp_and_exp_growth.gml @@ -243,7 +243,7 @@ function unit_stat_growth(grow_stat=false){ return undefined; } } else { - // show_debug_message($"{total_traited}") + // show_debug_message_adv($"{total_traited}") return stat_gain_chances; } diff --git a/scripts/exp_and_exp_growth/exp_and_exp_growth.yy b/scripts/exp_and_exp_growth/exp_and_exp_growth.yy index 7f23783f38..66e3f0aeb7 100644 --- a/scripts/exp_and_exp_growth/exp_and_exp_growth.yy +++ b/scripts/exp_and_exp_growth/exp_and_exp_growth.yy @@ -5,8 +5,8 @@ "isDnD":false, "name":"exp_and_exp_growth", "parent":{ - "name":"Scripts", - "path":"folders/Scripts.yy", + "name":"marines_and_profiles", + "path":"folders/Scripts/marines_and_profiles.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/instance_create/instance_create.gml b/scripts/instance_create/instance_create.gml index a29eb8eea3..c56ccf1310 100644 --- a/scripts/instance_create/instance_create.gml +++ b/scripts/instance_create/instance_create.gml @@ -8,3 +8,18 @@ function instance_create(_x, _y, _obj) { var myDepth = object_get_depth(_obj); return instance_create_depth(_x, _y, myDepth, _obj); } + +/// @function instances_exist_any +/// @description Checks if any of the provided instances exist +/// @param {array} instance_set Array of instances to check for existence +/// @returns {bool} +function instances_exist_any(instance_set = []){ + var _exists = false; + for (var i=0;i obj_creation.maxpoints){ + is_disabled = true; + } + return is_disabled; + } + +} +function Disadvantage(_id, _name, _description, _points_cost) : ChapterTrait(_id, _name, _description, _points_cost) constructor { + + static add = function(slot){ + show_debug_message_adv($"Adding disadv {name} to slot {slot} for points {points}"); + obj_creation.dis[slot] = name; + obj_creation.dis_num[slot] = id; + obj_creation.points-=points; + add_meta(); + } + + static remove = function(slot){ + show_debug_message_adv($"Removing disadv {name} from slot {slot} for points {points}"); + obj_creation.dis[slot] = ""; + obj_creation.points+=points; + obj_creation.dis_num[slot]=0; + remove_meta(); + } + + static disable = function(){ + var is_disabled= false; + for (var i=0;i= _m_exp) { + spawn_chance = _mod.max_saturation; + } else { + var calc_exp = max(0, _mar_exp - _min); + var _inc_point = floor(calc_exp / _increments); + _max_sat = clamp(_inc_point * 5, 0, _mod.max_saturation); } - if (struct_exists(_mod, "exp")) { - var _exp_data = _mod.exp; - var _min = 0; - if (struct_exists(_exp_data, "min")) { - _min = _exp_data.min; - if (unit.experience < _exp_data.min) { - if (!check_exception("min_exp")) { - continue; - } - } - } - if (struct_exists(_exp_data, "scale")) { - var _m_exp = _exp_data.exp_scale_max; - var _increment_count = _mod.max_saturation / 5; - var _increments = (_m_exp - _min) / _increment_count; - var _sat_roof = _mod.max_saturation; - var _mar_exp = unit.experience; - - if (_mar_exp >= _m_exp) { - spawn_chance = _mod.max_saturation; - } else { - var calc_exp = _mar_exp - _min; - var _inc_point = floor(_mar_exp / _increments); - _max_sat = _inc_point * 5; - } + } + } + if (struct_exists(_mod, "max_saturation")) { + if (struct_exists(variation_map, _mod.position)) { + if (variation_map[$ _mod.position] >= _max_sat) { + if (!check_exception("max_saturation")) { + return false; } } - if (struct_exists(_mod, "max_saturation")) { - if (struct_exists(variation_map, _mod.position)) { - if (variation_map[$ _mod.position] >= _max_sat) { - if (!check_exception("max_saturation")) { - continue; - } - } - } + } + } + if (!struct_exists(_mod, "body_types")) { + _mod.body_types = [0, 1, 2]; + } + + if (!array_contains(_mod.body_types, armour_type)) { + if (!check_exception("body_types")) { + return false; + } + } + + if (struct_exists(_mod, "role_type")) { + var _viable = false; + for (var a = 0; a < array_length(_mod.role_type); a++) { + var _r_t = _mod.role_type[a]; + _viable = unit.IsSpecialist(_r_t); + if (_viable) { + break; } - if (!struct_exists(_mod, "body_types")) { - _mod.body_types = [0, 1, 2]; + } + if (!_viable) { + if (!check_exception("role_type")) { + return false; } - - if (!array_contains(_mod.body_types, armour_type)) { - if (!check_exception("body_types")) { - continue; - } + } + } + if (struct_exists(_mod, "roles")) { + if (!array_contains(_mod.roles, unit.role())) { + if (!check_exception("roles")) { + return false; } - - if (struct_exists(_mod, "role_type")) { - var _viable = false; - for (var a = 0; a < array_length(_mod.role_type); a++) { - var _r_t = _mod.role_type[a]; - _viable = unit.IsSpecialist(_r_t); - if (_viable) { - break; - } - } - if (!_viable) { - if (!check_exception("chapter_adv")) { - continue; - } - if (!check_exception("chapter_disadv")) { - continue; - } - } + } + } + if (struct_exists(_mod, "cultures")) { + if (!scr_has_style(_mod.cultures)) { + if (!check_exception("cultures")) { + return false; } - if (struct_exists(_mod, "roles")) { - if (!array_contains(_mod.roles, unit.role())) { - if (!check_exception("roles")) { - continue; - } - } + } + } + if (struct_exists(_mod, "company")) { + if (!array_contains(_mod.company, unit.company)) { + if (!check_exception("company")) { + return false; } - if (struct_exists(_mod, "cultures")) { - if (!scr_has_style(_mod.cultures)) { - if (!check_exception("cultures")) { - continue; - } - } + } + } + if (struct_exists(_mod, "armours")) { + if (!array_contains(_mod.armours, unit_armour)) { + if (!check_exception("armours")) { + return false; } - if (struct_exists(_mod, "company")) { - if (!array_contains(_mod.company, unit.company)) { - if (!check_exception("company")) { - continue; - } - } + } + } + if (struct_exists(_mod, "armours_exclude")) { + if (array_contains(_mod.armours_exclude, unit_armour)) { + if (!check_exception("armours_exclude")) { + return false; } - if (struct_exists(_mod, "armours")) { - if (!array_contains(_mod.armours, unit_armour)) { - if (!check_exception("armours")) { - continue; - } - } + } + } + if (struct_exists(_mod, "chapter_adv")) { + var _viable = false; + for (var a = 0; a < array_length(_mod.chapter_adv); a++) { + var _adv = _mod.chapter_adv[a]; + _viable = scr_has_adv(_adv); + if (_viable) { + break; } - if (struct_exists(_mod, "armours_exclude")) { - if (array_contains(_mod.armours_exclude, unit_armour)) { - if (!check_exception("armours_exclude")) { - continue; - } - } + } + if (!_viable) { + if (!check_exception("chapter_adv")) { + return false; } - if (struct_exists(_mod, "chapter_adv")) { - var _viable = false; - for (var a = 0; a < array_length(_mod.chapter_adv); a++) { - var _adv = _mod.chapter_adv[a]; - _viable = scr_has_adv(_adv); - if (_viable) { - break; - } - } - if (!_viable) { - if (!check_exception("chapter_adv")) { - continue; - } - } + } + } + if (struct_exists(_mod, "chapter_disadv")) { + var _viable = false; + for (var a = 0; a < array_length(_mod.chapter_disadv); a++) { + var _disadv = _mod.chapter_disadv[a]; + _viable = scr_has_disadv(_disadv); + if (_viable) { + break; } - if (struct_exists(_mod, "chapter_disadv")) { - var _viable = false; - for (var a = 0; a < array_length(_mod.chapter_disadv); a++) { - var _disadv = _mod.chapter_disadv[a]; - _viable = scr_has_disadv(_disadv); - if (_viable) { - break; - } - } - if (!_viable) { - if (!check_exception("chapter_disadv")) { - continue; - } - } + } + if (!_viable) { + if (!check_exception("chapter_disadv")) { + return false; } - if (struct_exists(_mod, "stats")) { - if (!stat_valuator(_mod.stats, unit)) { - if (!check_exception("stats")) { - continue; - } - } + } + } + if (struct_exists(_mod, "stats")) { + if (!stat_valuator(_mod.stats, unit)) { + if (!check_exception("stats")) { + return false; } - if (struct_exists(_mod, "equipped")) { - if (!unit.has_equipped(_mod.equipped)) { - if (!check_exception("equipped")) { - continue; - } - } + } + } + if (struct_exists(_mod, "equipped")) { + if (!unit.has_equipped(_mod.equipped)) { + if (!check_exception("equipped")) { + return false; } + } + } - if (struct_exists(_mod, "traits")) { - var _viable = false; - for (var a = 0; a < array_length(_mod.traits); a++) { - var _trait = _mod.traits[a]; - _viable = unit.has_trait(_trait); - if (_viable) { - break; - } - } - if (!_viable) { - if (!check_exception("traits")) { - continue; - } - } + if (struct_exists(_mod, "traits")) { + var _viable = false; + for (var a = 0; a < array_length(_mod.traits); a++) { + var _trait = _mod.traits[a]; + _viable = unit.has_trait(_trait); + if (_viable) { + break; } - if (struct_exists(_mod, "chapter")) { - var chap_name = instance_exists(obj_creation) ? obj_creation.chapter_name : global.chapter_name; - if (chap_name != _mod.chapter) { - if (!check_exception("chapter")) { - continue; - } - } + } + if (!_viable) { + if (!check_exception("traits")) { + return false; } + } + } - var _overides = "none"; - if (struct_exists(_mod, "overides")) { - _overides = _mod.overides; + if (struct_exists(_mod, "equipment_has_tag")) { + var _viable = false; + var _tag_check_areas = struct_get_names(_mod.equipment_has_tag); + for (var i=0; i= _status_level) { - var variation_tier = (_unit_tier - _status_level) + 1; - if (variation_map[$ _area] % variation_tier != 0) { - continue; - } + } + } + + return false; + } + if (struct_exists(_mod, "assign_by_rank")) { + var _area = _mod.position; + var _status_level = _mod.assign_by_rank; + var _roles = active_roles(); + var tiers = [ + ["Chapter Master"], + ["Forge Master", "Master of Sanctity", "Master of the Apothecarion", $"Chief {_roles[eROLE.Librarian]}"], + [_roles[eROLE.Captain], _roles[eROLE.HonourGuard]], + [_roles[eROLE.Champion]], + [_roles[eROLE.Ancient], _roles[eROLE.VeteranSergeant]], + [_roles[eROLE.Terminator]], + [_roles[eROLE.Veteran], _roles[eROLE.Sergeant], _roles[eROLE.Chaplain], _roles[eROLE.Apothecary], _roles[eROLE.Techmarine], _roles[eROLE.Librarian]], + ["Codiciery", "Lexicanum", _roles[eROLE.Tactical], _roles[eROLE.Assault], _roles[eROLE.Devastator]], + [_roles[eROLE.Scout]] + ]; + + var _unit_tier = 8; + if (_unit_tier == 8) { + for (var t = 0; t < array_length(tiers); t++){ + var tier = tiers[t]; + if (array_contains(tier, unit.role())) { + _unit_tier = t; } } + } + if (_unit_tier >= _status_level) { + var variation_tier = (_unit_tier - _status_level) + 1; + if (!struct_exists(variation_map, _area) || variation_map[$ _area] % variation_tier != 0) { + return false; + } + } + } + + return true; + } + static assign_modulars = function(modulars = global.modular_drawing_items, position = false) { + var _mod = {}; + try { + for (var i = 0; i < array_length(modulars); i++) { + _sub_comps = "none"; + _shadows = "none"; + _mod = modulars[i]; + var _allowed = base_modulars_checks(_mod); + + if (!_allowed){ + continue; + } if (position != false) { if (position == "weapon") { var _weapon_map = _mod.weapon_map; @@ -382,12 +455,24 @@ function ComplexSet(_unit) constructor { } } } else { - add_to_area(_mod.position, _mod.sprite, _overides); + add_to_area(_mod.position, _mod.sprite, _overides, _sub_comps, _shadows); } + if (struct_exists(_mod, "prevent_others")) { + replace_area(_mod.position, _mod.sprite, _overides, _sub_comps, _shadows); + array_push(blocked, _mod.position); + if (struct_exists(_mod, "ban")) { + for (var b = 0; b < array_length(_mod.ban); b++) { + if (!array_contains(banned, _mod.ban[b])) { + array_push(banned, _mod.ban[b]); + } + } + } + } } + } catch(_exception){ + handle_exception(_exception); } }; - blocked = []; banned = []; variation_map = { @@ -436,90 +521,248 @@ function ComplexSet(_unit) constructor { backpack_augment: unit.get_body_data("backpack_augment_variation", "torso"), chest_fastening: unit.get_body_data("chest_fastening", "torso"), left_weapon: unit.get_body_data("weapon_variation", "left_arm"), - right_weapon: unit.get_body_data("weapon_variation", "right_arm") + right_weapon: unit.get_body_data("weapon_variation", "right_arm"), + necklace : unit.get_body_data("hanging_variant", "throat"), + foreground_item : unit.get_body_data("variant", "throat"), }; - static draw_component = function(component_name, texture_draws = {}) { - if (array_contains(banned, component_name)) { - return "banned component"; + + + + component_final_draw_x = 0; + component_final_draw_y = 0 + shadow_enabled = false; + component_map_choice = 0; + + + use_shadow_uniform = shader_get_uniform(full_livery_shader, "use_shadow"); + shadow_transform_uniform = shader_get_uniform(full_livery_shader, "In_Shadow_Transform"); + + shadow_sampler = shader_get_sampler_index(full_livery_shader, "shadow_texture"); + armour_shadow_sampler = shader_get_sampler_index(armour_texture, "shadow_texture"); + armour_texture_sampler = shader_get_sampler_index(armour_texture, "armour_texture"); + + texture_blend_uniform = shader_get_uniform(armour_texture, "blend"); + texture_blend_colour_uniform = shader_get_uniform(armour_texture, "blend_colour"); + static texture_replace_col_uniform = shader_get_uniform(armour_texture, "replace_colour"); + + texture_use_shadow_uniform = shader_get_uniform(armour_texture, "use_shadow"); + texture_shadow_transform_uniform = shader_get_uniform(armour_texture, "In_Shadow_Transform"); + texture_mask_transform = shader_get_uniform(armour_texture, "mask_transform"); + + if (!surface_exists(global.base_component_surface)) { + global.base_component_surface = surface_create(600,600); + } + + static check_component_overides = function(component_name, choice){ + if (struct_exists(overides, component_name)) { + var _overide_set = overides[$ component_name]; + for (var i = 0; i < array_length(_overide_set); i++) { + var _spec_over = _overide_set[i]; + if (_spec_over[0] <= choice && _spec_over[1] > choice) { + var _override_data = _spec_over[2]; + if (struct_exists(_override_data, "overides")){ + _override_areas = struct_get_names(_override_data.overides); + var _overs = _override_data.overides; + for (var j = 0; j < array_length(_override_areas); j++) { + replace_area(_override_areas[j], _overs[$ _override_areas[j]]); + } + } + if (struct_exists(_override_data, "offsets")){ + var _offsets = _override_data.offsets; + component_final_draw_x += _offsets[0]; + component_final_draw_y += _offsets[1]; + } + break; + } + } } - if (struct_exists(self, component_name)) { - var _sprite = self[$ component_name]; - if (sprite_exists(_sprite)) { - var choice = 0; - if (struct_exists(variation_map, component_name)) { - var choice = variation_map[$ component_name] % sprite_get_number(_sprite); + } + + static set_component_shadow_packs = function(component_name, choice){ + if (struct_exists(shadow_set, component_name)) { + var _shadow_set = shadow_set[$ component_name]; + for (var i = 0; i < array_length(_shadow_set); i++) { + var _spec_shadow = _shadow_set[i]; + if (_spec_shadow[0] <= choice && _spec_shadow[1] > choice) { + var _shadow_item = _spec_shadow[2]; + var _final_shadow_index = choice - _spec_shadow[0]; + //show_debug_message_adv($"final_index {_final_shadow_index}, {_spec_shadow[0]}, {_spec_shadow[1]}, {choice},{_shadow_item}"); + + var _sprite = self[$ component_name]; + // Compute UV transform for this shadow texture + if (!sprite_exists(_sprite) || !sprite_exists(_shadow_item)){ + exit; + } + var _shadow_transform_data = sprite_get_uvs_transformed(_sprite, choice , _shadow_item, _final_shadow_index); + + if (valid_sprite_transform_data(_shadow_transform_data)){ + shader_set_uniform_f_array(shadow_transform_uniform, _shadow_transform_data); + + shader_set_uniform_f_array(texture_shadow_transform_uniform, _shadow_transform_data); + } + + // Bind shadow texture + var _shadow_tex = sprite_get_texture(_shadow_item, _final_shadow_index); + texture_set_stage(shadow_sampler, _shadow_tex); + texture_set_stage(armour_shadow_sampler, _shadow_tex); + + // Trigger the draw to apply shadow (shader mixes it) + //draw_sprite(_sprite, _choice ?? 0, component_final_draw_x, component_final_draw_y); + + shadow_enabled = 1; + break; + } + } + } + } + + static handle_component_subcomponents = function(component_name, choice){ + if (struct_exists(subcomponents, component_name)) { + var _component_set + var _subcomponents_found = false; + var _component_bulk_set = subcomponents[$ component_name]; + for (var i = 0; i < array_length(_component_bulk_set); i++) { + var _spec_over = _component_bulk_set[i]; + if (_spec_over[0] <= choice && _spec_over[1] > choice) { + _subcomponents_found = true; + _component_set = _spec_over[2]; } - if (struct_exists(overides, component_name)) { - var _overide_set = overides[$ component_name]; - for (var i = 0; i < array_length(_overide_set); i++) { - var _spec_over = _overide_set[i]; - if (_spec_over[0] <= choice && _spec_over[1] > choice) { - var _override_areas = struct_get_names(_spec_over[2]); - for (var j = 0; j < array_length(_override_areas); j++) { - replace_area(_override_areas[j], _spec_over[2][$ _override_areas[j]]); + } + + if (_subcomponents_found){ + for (var i = 0; i < array_length(_component_set); i++) { + var _subcomponents = _component_set[i]; + var _sub_choice = (component_map_choice * 1315423911) & $7FFFFFFF; + + var _total_options = 0; + for (var s=0;s 0){ + _sub_choice_final = _total_options == 1 ? 0 : _sub_choice % (_total_options+1); + + _choice_count = 0; + for (var s=0; s= _choice_count && _sub_choice_final < _choice_count+sprite_get_number(_subcomponents[s])){ + draw_sprite(_subcomponents[s], _sub_choice_final-_choice_count ?? 0, component_final_draw_x, component_final_draw_y); + break; + } else { + _choice_count += sprite_get_number(_subcomponents[s]); } } } } - var _tex_names = struct_get_names(texture_draws); - if (array_length(_tex_names)) { - var _return_surface = surface_get_target(); - surface_reset_target(); - shader_reset(); - - var base_component_surface = surface_create(600, 600); - surface_set_target(base_component_surface); - shader_set(armour_texture); - for (var i = 0; i < array_length(_tex_names); i++) { - var _tex_data = texture_draws[$ _tex_names[i]]; - - tex_frame = 0; - if (component_name == "left_pauldron_base") { - tex_frame = 1; - } + } + //sprite_delete(_sprite); + } + } - var mask_transform_data = sprite_get_uvs_transformed(_sprite, choice, _tex_data.texture, tex_frame); + static draw_component_with_textures = function(_sprite, _choice, _tex_names, texture_draws, component_name) { + var _return_surface = surface_get_target(); + surface_reset_target(); + shader_reset(); - var mask_transform = shader_get_uniform(armour_texture, "mask_transform"); - shader_set_uniform_f_array(mask_transform, mask_transform_data); + surface_set_target(global.base_component_surface); + draw_clear_alpha(c_white, 0); + + shader_set(armour_texture); + shader_set_uniform_i(texture_use_shadow_uniform, shadow_enabled); + set_component_shadow_packs(component_name, _choice); - var tex_texture = sprite_get_texture(_tex_data.texture, tex_frame); - if (struct_exists(_tex_data, "blend")) { - var _blend = 1; - } else { - _blend = 0; - } - shader_set_uniform_i(shader_get_uniform(armour_texture, "blend"), _blend); - if (_blend) { - shader_set_uniform_f_array(shader_get_uniform(armour_texture, "blend_colour"), _tex_data.blend); - } - for (var t = 0; t < array_length(_tex_data.areas); t++) { - var armour_sampler = shader_get_sampler_index(armour_texture, "armour_texture"); - texture_set_stage(armour_sampler, tex_texture); - // show_debug_message($"{_tex_data.areas[t]}"); - var _replace_col = shader_get_uniform(armour_texture, "replace_colour"); - shader_set_uniform_f_array(_replace_col, _tex_data.areas[t]); - draw_sprite(_sprite, choice ?? 0, x_surface_offset, y_surface_offset); - } - } - surface_reset_target(); - surface_set_target(_return_surface); - shader_set(full_livery_shader); - draw_sprite(_sprite, choice ?? 0, x_surface_offset, y_surface_offset); - draw_surface(base_component_surface, 0, 0); - surface_reset_target(); - surface_clear_and_free(base_component_surface); - - surface_set_target(_return_surface); - } else { - draw_sprite(_sprite, choice ?? 0, x_surface_offset, y_surface_offset); + for (var i = 0; i < array_length(_tex_names); i++) { + var _tex_data = texture_draws[$ _tex_names[i]]; + + var tex_frame = 0; + if (component_name == "left_pauldron_base") { + tex_frame = 1; + } + + var tex_texture = sprite_get_texture(_tex_data.texture, tex_frame); + + //TODO fix texture colour blending + /*var _blend = 0; + if (struct_exists(_tex_data, "blend")) { + _blend = 1; + } + + + shader_set_uniform_i(texture_blend_uniform, _blend); + + if (_blend) { + shader_set_uniform_f_array(texture_blend_colour_uniform, _tex_data.blend); + } + */ + + for (var t = 0; t < array_length(_tex_data.areas); t++) { + var _mask_transform_data = sprite_get_uvs_transformed(_sprite, _choice, _tex_data.texture, tex_frame); + if (!valid_sprite_transform_data(_mask_transform_data)){ + continue; } - //sprite_delete(_sprite); + shader_set_uniform_f_array(texture_mask_transform, _mask_transform_data); + texture_set_stage(armour_texture_sampler, tex_texture); + shader_set_uniform_f_array(texture_replace_col_uniform, _tex_data.areas[t]); + + draw_sprite(_sprite, _choice ?? 0, component_final_draw_x, component_final_draw_y); + } + } + + surface_reset_target(); + surface_set_target(_return_surface); + shader_reset(); + + shader_set(full_livery_shader); + set_component_shadow_packs(component_name, _choice); + + draw_sprite(_sprite, _choice ?? 0, component_final_draw_x, component_final_draw_y); + draw_surface(global.base_component_surface, 0, 0); + }; + + + // Main function + static draw_component = function(component_name, texture_draws = {}, choice_lock = -1) { + if (array_contains(banned, component_name)) { + return "banned component"; + } + if (struct_exists(self, component_name)) { + shadow_enabled = 0; + var _sprite = self[$ component_name]; + if (!sprite_exists(_sprite)) { + return "error failed no sprite found" } + + component_final_draw_x = x_surface_offset; + component_final_draw_y = y_surface_offset; + + var _choice = 0; + var component_map_choice = 3; + if (struct_exists(variation_map, component_name) && choice_lock == -1) { + component_map_choice = variation_map[$ component_name]; + _choice = component_map_choice % sprite_get_number(_sprite); + } + else if (choice_lock > -1){ + _choice = choice_lock + } + + check_component_overides(component_name, _choice); + set_component_shadow_packs(component_name, _choice); + + shader_set_uniform_i(use_shadow_uniform, shadow_enabled); + + var _tex_names = struct_get_names(texture_draws); + + if (array_length(_tex_names) > 0) { + draw_component_with_textures(_sprite, _choice, _tex_names, texture_draws, component_name); + } else { + draw_sprite(_sprite, _choice ?? 0, component_final_draw_x, component_final_draw_y); + } + + handle_component_subcomponents(component_name, _choice); } }; + static draw_unit_arms = function() { var _bionic_options = []; if (array_contains([ArmourType.Normal, ArmourType.Terminator, ArmourType.Scout], armour_type)) { @@ -539,7 +782,11 @@ function ComplexSet(_unit) constructor { } else if (_variant == 3) { _bio = [spr_terminator_complex_arm_hidden_right, spr_terminator_complex_arm_hidden_left]; } - } + } else { + if (_variant == 2 || _variant == 3){ + continue; + } + } if (_bionic_arm && !array_length(_bio)) { if (armour_type == ArmourType.Normal) { var _bio = [spr_bionic_right_arm, spr_bionic_left_arm]; @@ -603,6 +850,15 @@ function ComplexSet(_unit) constructor { }; static draw_weapon_and_hands = function() { + if (armour_type == ArmourType.Dreadnought){ + if ((weapon_right.sprite != 0) && sprite_exists(weapon_right.sprite)) { + draw_sprite(weapon_right.sprite, 0, x_surface_offset + weapon_right.ui_xmod, y_surface_offset + weapon_right.ui_ymod); + } + if ((weapon_left.sprite != 0) && sprite_exists(weapon_left.sprite)) { + draw_sprite(weapon_left.sprite, 1, x_surface_offset + weapon_left.ui_xmod, y_surface_offset + weapon_left.ui_ymod); + } + exit; + } // Draw hands bellow the weapon sprite; if (!weapon_right.ui_twoh && !weapon_left.ui_twoh) { for (var i = 0; i <= 1; i++) { @@ -617,33 +873,25 @@ function ComplexSet(_unit) constructor { if (!weapon_right.new_weapon_draw) { if ((weapon_right.sprite != 0) && sprite_exists(weapon_right.sprite)) { - if (weapon_right.ui_twoh == false && weapon_left.ui_twoh == false) { - draw_sprite(weapon_right.sprite, 0, x_surface_offset + weapon_right.ui_xmod, y_surface_offset + weapon_right.ui_ymod); - } - if (weapon_right.ui_twoh == true) { - draw_sprite(weapon_right.sprite, 0, x_surface_offset + weapon_right.ui_xmod, y_surface_offset + weapon_right.ui_ymod); - /*if (ui_force_both == true) { - draw_sprite(weapon_right.sprite, 0, x_surface_offset + weapon_right.ui_xmod, y_surface_offset + weapon_right.ui_ymod); - }*/ + if ((weapon_right.ui_twoh == false && weapon_left.ui_twoh == false) || weapon_right.ui_twoh == true) { + draw_weapon(weapon_right,"right_weapon", 0); } } } else { if ((weapon_right.sprite != 0) && sprite_exists(weapon_right.sprite)) { - draw_sprite(weapon_right.sprite, 0, x_surface_offset + weapon_right.ui_xmod, y_surface_offset + weapon_right.ui_ymod); + draw_weapon(weapon_right,"right_weapon"); } } if (!weapon_left.new_weapon_draw) { if ((weapon_left.sprite != 0) && sprite_exists(weapon_left.sprite) && (weapon_right.ui_twoh == false)) { - if (weapon_left.ui_spec == false) { - draw_sprite(weapon_left.sprite, 1, x_surface_offset + weapon_left.ui_xmod, y_surface_offset + weapon_left.ui_ymod); - } else if (weapon_left.ui_spec == true) { - draw_sprite(weapon_left.sprite, 1, x_surface_offset + weapon_left.ui_xmod, y_surface_offset + weapon_left.ui_ymod); - } + draw_weapon(weapon_left,"left_weapon", 1); } } else { if ((weapon_left.sprite != 0) && sprite_exists(weapon_left.sprite) && (weapon_right.ui_twoh == false)) { - draw_sprite_flipped(weapon_left.sprite, 0, x_surface_offset + weapon_left.ui_xmod, y_surface_offset + weapon_left.ui_ymod); + weapon_left.sprite = return_sprite_mirrored(weapon_left.sprite); + draw_weapon(weapon_left, "left_weapon") + } } if (!weapon_right.ui_twoh && !weapon_left.ui_twoh) { @@ -656,8 +904,36 @@ function ComplexSet(_unit) constructor { } // Draw hands above the weapon sprite; + if ((weapon_right.sprite != 0) && sprite_exists(weapon_right.sprite)) { + + sprite_delete(weapon_right.sprite) + } + if ((weapon_left.sprite != 0) && sprite_exists(weapon_left.sprite)) { + sprite_delete(weapon_left.sprite); + + } }; + static draw_weapon = function(weapon, position, choice_lock=-1){ + + x_surface_offset += weapon.ui_xmod; + y_surface_offset += weapon.ui_ymod; + + var _subs = struct_exists(weapon, "subcomponents") ? weapon.subcomponents : "none"; + + var _shadows = struct_exists(weapon, "shadows") ? weapon.shadows : "none"; + + //show_debug_message_adv($" shadows {_shadows}"); + + add_to_area(position, weapon.sprite, "none", _subs, _shadows); + + draw_component(position, {}, choice_lock); + + x_surface_offset -= weapon.ui_xmod; + y_surface_offset -= weapon.ui_ymod; + } + + static weapon_preset_data = { "shield": { arm_type: 2, @@ -695,17 +971,21 @@ function ComplexSet(_unit) constructor { var prep_surface = surface_create(600, 600); surface_set_target(prep_surface); - var texture_draws = setup_complex_livery_shader(unit.role(), unit); + var _texture_draws = setup_complex_livery_shader(unit.role(), unit); + + show_debug_message_adv(_texture_draws); draw_cloaks(); //draw_unit_arms(x_surface_offset, y_surface_offset, armour_type, specialist_colours, hide_bionics, complex_set); if (array_length(left_arm_data)) { weapon_left = variable_clone(left_arm_data[variation_map.left_weapon % array_length(left_arm_data)]); + weapon_left.sprite = sprite_duplicate(weapon_left.sprite) } else { weapon_left = {}; } if (array_length(right_arm_data)) { weapon_right = variable_clone(right_arm_data[variation_map.right_weapon % array_length(right_arm_data)]); + weapon_right.sprite = sprite_duplicate(weapon_right.sprite) } else { weapon_right = {}; } @@ -724,7 +1004,7 @@ function ComplexSet(_unit) constructor { } } } - var _defualts = [ + var _defaults = [ "hand_on_top", "ui_xmod", "ui_ymod", @@ -737,9 +1017,9 @@ function ComplexSet(_unit) constructor { "sprite", "display_type" ]; - for (var s = 0; s < array_length(_defualts); s++) { - if (!struct_exists(_arm, _defualts[s])) { - _arm[$ _defualts[s]] = 0; + for (var s = 0; s < array_length(_defaults); s++) { + if (!struct_exists(_arm, _defaults[s])) { + _arm[$ _defaults[s]] = 0; } } if (armour_type == ArmourType.Terminator && !array_contains(["terminator_ranged", "terminator_melee", "terminator_fist"], _arm.display_type)) { @@ -752,9 +1032,11 @@ function ComplexSet(_unit) constructor { } _arm.ui_ymod += 24; } - if (_arm.display_type == "melee_onehand" && (_wep != "Company Standard")) { - _arm.arm_type = 2; - _arm.hand_type = 2; + if (_arm.display_type == "melee_onehand" && _wep != "Company Standard" ) { + if (!_arm.hand_type){ + _arm.arm_type = 2; + _arm.hand_type = 2; + } _arm.ui_xmod -= 14; _arm.ui_ymod += 23; } @@ -774,11 +1056,6 @@ function ComplexSet(_unit) constructor { weapon_left.hand_type = 0; _arm.ui_ymod += 15; } - - if (array_contains(["Chainaxe", "Power Axe", "Crozius Arcanum", "Power Mace", "Mace of Absolution", "Relic Blade"], _wep)) { - _arm.hand_type = 3; - _arm.arm_type = 3; - } } else if (armour_type == ArmourType.Scout) { _arm.ui_xmod += 4; _arm.ui_ymod += 11; @@ -797,6 +1074,9 @@ function ComplexSet(_unit) constructor { _complex_helm = _comp_helms.captain; } else if (unit_role == _role[eROLE.Veteran] || (unit_role == _role[eROLE.Terminator] && unit.company == 1)) { _complex_helm = _comp_helms.veteran; + } else if (struct_exists(_comp_helms, "all_others")){ + // there's probably room to improve this but consecrators demand the stripe + _complex_helm = _comp_helms.all_others; } if (is_struct(_complex_helm) && struct_exists(self, "head") && draw_helms) { complex_helms(_complex_helm); @@ -823,6 +1103,7 @@ function ComplexSet(_unit) constructor { "chest_fastening", "head", "gorget", + "necklace", "left_pauldron_base", "right_pauldron_base", "left_trim", @@ -833,7 +1114,8 @@ function ComplexSet(_unit) constructor { "left_pauldron_embeleshments", "right_pauldron_hangings", "left_pauldron_hangings", - "left_personal_livery" + "left_personal_livery", + "foreground_item", ]; } else { _draw_order = [ @@ -854,6 +1136,7 @@ function ComplexSet(_unit) constructor { "right_knee", "head", "gorget", + "necklace", "left_pauldron_base", "right_pauldron_base", "left_trim", @@ -867,21 +1150,20 @@ function ComplexSet(_unit) constructor { "tabbard", "robe", "belt", - "left_personal_livery" + "left_personal_livery", + "foreground_item", ]; } for (var i = 0; i < array_length(_draw_order); i++) { if (_draw_order[i] == "head") { - draw_head(texture_draws); + draw_head(_texture_draws); } else { - draw_component(_draw_order[i], texture_draws); + draw_component(_draw_order[i], _texture_draws); } } purity_seals_and_hangings(); draw_weapon_and_hands(); - delete texture_draws; - shader_reset(); surface_reset_target(); if (!surface_exists(prep_surface) || !surface_exists(_final_surface)) { @@ -993,8 +1275,6 @@ function ComplexSet(_unit) constructor { add_group({ armour: spr_mk6_complex, backpack: spr_mk6_complex_backpack, - left_arm: spr_mk6_left_arm, - right_arm: spr_mk6_right_arm, left_trim: spr_mk7_left_trim, right_trim: spr_mk7_right_trim, mouth_variants: spr_mk6_mouth_variants, @@ -1006,8 +1286,6 @@ function ComplexSet(_unit) constructor { add_group({ armour: spr_mk5_complex, backpack: spr_mk5_complex_backpack, - left_arm: spr_mk5_left_arm, - right_arm: spr_mk5_right_arm, left_trim: spr_mk7_left_trim, right_trim: spr_mk7_right_trim, head: spr_mk5_head_variants, @@ -1024,9 +1302,7 @@ function ComplexSet(_unit) constructor { chest_variants: spr_mk4_chest_variants, armour: spr_mk4_complex, backpack: spr_mk4_complex_backpack, - left_arm: spr_mk4_left_arm, leg_variants: spr_mk4_leg_variants, - right_arm: spr_mk4_right_arm, left_trim: spr_mk4_left_trim, right_trim: spr_mk4_right_trim, mouth_variants: spr_mk4_mouth_variants, @@ -1038,11 +1314,9 @@ function ComplexSet(_unit) constructor { add_group({ armour: spr_mk3_complex, backpack: spr_mk3_complex_backpack, - left_arm: spr_mk3_left_arm, - right_arm: spr_mk3_right_arm, head: spr_mk3_head_variants, - left_leg: spr_mk3_left_leg_variants, - right_leg: spr_mk3_right_leg_variants, + left_knee: spr_mk3_left_knee, + right_knee: spr_mk3_right_knee, mouth_variants: spr_mk3_mouth, forehead: spr_mk3_forehead_variants, belt: spr_mk3_belt @@ -1051,35 +1325,27 @@ function ComplexSet(_unit) constructor { break; case "MK8 Errant": add_group(mk7_bits); - add_to_area("gorget", spr_mk8_gorget); armour_type = ArmourType.Normal; break; case "Terminator Armour": add_group({ - armour: spr_indomitus_complex, - left_arm: spr_indomitus_left_arm, - right_arm: spr_indomitus_right_arm, backpack: spr_indomitus_backpack_variants, chest_variants: spr_indomitus_chest_variants, - leg_variants: spr_indomitus_leg_variants, - head: spr_indomitus_head_variants, belt: spr_indomitus_belt }); armour_type = ArmourType.Terminator; break; case "Tartaros": add_group({ - armour: spr_tartaros_complex, - left_arm: spr_tartaros_left_arm, - right_arm: spr_tartaros_right_arm, - right_leg: spr_tartaros_right_leg, - left_leg: spr_tartaros_left_leg, - chest_variants: spr_tartaros_chest, - gorget: spr_tartaros_gorget, mouth_variants: spr_tartaros_faceplate, - head: spr_tartaros_head_variants, - left_trim: spr_tartaros_left_trim, - right_trim: spr_tartaros_right_trim + }); + armour_type = ArmourType.Terminator; + break; + case "Cataphractii": + add_group({ + head: spr_cata_head, + belt : spr_cata_belt, + gorget : spr_cata_gorget, }); armour_type = ArmourType.Terminator; break; @@ -1089,6 +1355,13 @@ function ComplexSet(_unit) constructor { }); armour_type = ArmourType.Dreadnought; break; + case "Contemptor Dreadnought": + add_group({ + armour: spr_contemptor_chasis_colors, + head: spr_contemptor_head_colors, + }); + armour_type = ArmourType.Dreadnought; + break; case "Scout Armour": add_group({ armour: spr_scout_complex, @@ -1134,11 +1407,6 @@ function ComplexSet(_unit) constructor { "armour": spr_techmarine_complex, "right_trim": spr_techmarine_right_trim, "left_trim": spr_techmarine_left_trim, - "leg_variants": spr_techmarine_left_leg, - "leg_variants": spr_techmarine_right_leg, - "head": spr_techmarine_head, - "chest_variants": spr_techmarine_chest, - "mouth_variants": spr_tech_face_plate }); } } @@ -1160,7 +1428,7 @@ function ComplexSet(_unit) constructor { shader_set(full_livery_shader); }; - static add_to_area = function(area, add_sprite, overide_data = "none") { + static add_to_area = function(area, add_sprite, overide_data = "none", sub_components = "none", shadow = "none") { if (sprite_exists(add_sprite)) { var _add_sprite_length = sprite_get_number(add_sprite); if (!struct_exists(self, area)) { @@ -1173,9 +1441,20 @@ function ComplexSet(_unit) constructor { if (overide_data != "none") { add_overide(area, _overide_start, _add_sprite_length, overide_data); } + if (sub_components != "none") { + add_sub_components(area, _overide_start, _add_sprite_length, sub_components); + } + if (shadow != "none" && sprite_exists(shadow)) { + add_shadow_set(area, _overide_start, _add_sprite_length, shadow); + } } }; + offsets=[]; + static add_offsets = function(area, _offset_start, sprite_length, overide_data){ + + } + static add_overide = function(area, _overide_start, sprite_length, overide_data) { if (!struct_exists(overides, area)) { overides[$ area] = []; @@ -1183,17 +1462,44 @@ function ComplexSet(_unit) constructor { array_push(overides[$ area], [_overide_start, _overide_start + sprite_length, overide_data]); }; - static replace_area = function(area, add_sprite, overide_data = "none") { - if (struct_exists(self, area)) { - sprite_delete(self[$ area]); - if (struct_exists(overides, area)) { - struct_remove(overides, area); - } + shadow_set = {}; + + static add_shadow_set = function(area, _shadow_set_start, sprite_length, shadow_data) { + if (!struct_exists(shadow_set, area)) { + shadow_set[$ area] = []; + } + array_push(shadow_set[$ area], [_shadow_set_start, _shadow_set_start + sprite_length, shadow_data]); + }; + + static add_sub_components = function(area, _overide_start, sprite_length, sub_components) { + if (!struct_exists(subcomponents, area)) { + subcomponents[$ area] = []; } - self[$ area] = sprite_duplicate(add_sprite); - if (overide_data != "none") { - add_overide(area, 0, sprite_get_number(self[$ area]), overide_data); + var _accepted_subs = []; + for (var i=0;i10) then draw_set_alpha(1-((static_line-10)/10)); + draw_set_color(5998382); + var line_move = YY+(70*scale_y)+((36*scale_y)*static_line); + draw_line(XX+(30*scale_x),line_move,XX+(820*scale_x),line_move); + draw_set_alpha(1); + if (irandom(75)=0 && static_line>1){static_line--;} + else{ + static_line+=0.1; + } + if (static_line>20) then static_line=1; + draw_set_color(c_gray); + draw_set_halign(fa_center); + var draw_height = 5; + if (title!=""){ + draw_text_transformed(XX+(0.5*width), YY+(50*scale_y), title, 3*scale_x, 3*scale_y, 0); + draw_height += (string_height(title)*3)*scale_y; + } + if (sub_title!=""){ + draw_text_transformed(XX+(0.5*width), YY+(50*scale_y)+draw_height, sub_title, 2*scale_x, 2*scale_y, 0); + draw_height+=(25*scale_y) +(string_height(sub_title)*2)*scale_y; + } + if (body_text!=""){ + draw_text_ext(XX+(0.5*width), YY+(50*scale_y)+draw_height, string_hash_to_newline(body_text), -1, width-60); + } + switch (style){ + case "decorated": + var _slate_scalex = width/sprite_get_width(spr_slate_side); + var _slate_scaley = height/sprite_get_height(spr_slate_side); + draw_sprite(spr_data_slate_corner_decoration, 0,XX+width - (70*_slate_scalex), YY + (7*_slate_scaley)); + break; + case "default": + if (draw_top_piece){ + if (top_piece_style == "aquila"){ + draw_sprite_ext(spr_slate_top,1, XX+(top_anchor[0]*scale_x),YY + (top_anchor[1] * scale_y ), decoration_scale, decoration_scale, 0, c_white, 1); + } + + } + break; + + } + x2 = XX+width; + y2 = YY+height; + } + + static draw_cut = function(xx,yy, scale_x=1, scale_y=1, middle_percent=percent_cut){ + XX=xx; + YY=yy; + draw_sprite_part_ext(spr_data_slate,1, 0, 0, 850, 69, XX, YY, scale_x, scale_y, c_white, 1); + draw_sprite_part_ext(spr_data_slate,1, 0, 69, 850, 683*(middle_percent/100), XX, YY+(69*scale_y), scale_x, scale_y, c_white, 1); + draw_sprite_part_ext(spr_data_slate,1, 0, 752, 850, 98, XX, YY+(69+683*((middle_percent/100)))*scale_y, scale_x, scale_y, c_white, 1); + width = 860*scale_x; + height = (69+(683*(middle_percent/100))+98 )*scale_y; + if (is_callable(inside_method)){ + inside_method(); + } + } + + static percent_mod_draw_cut = function(xx,yy, scale_x=1, scale_y=1, mod_edit=1){ + percent_cut = min(percent_cut+mod_edit, 100); + if (!percent_cut) then percent_cut=0; + draw_cut(xx,yy, scale_x, scale_y); + } +} + + + + + +function draw_building_builder(xx, yy, req_require, building_sprite){ + var clicked =false; + draw_sprite_ext(building_sprite, 0, xx, yy, 0.5, 0.5, 0, c_white, 1); + var image_bottom = yy+50; + var image_middle = xx-15; + if (obj_controller.requisition>=req_require){ + if (scr_hit(image_middle+30, image_bottom+28, image_middle+78, image_bottom+44)){ + draw_sprite_ext(spr_slate_2, 5, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); + if (scr_click_left()){ + clicked=true; + } + } else { + draw_sprite_ext(spr_slate_2, 3, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); + } + } else { + draw_sprite_ext(spr_slate_2, 7, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); + } + draw_sprite_ext(spr_requisition,0,image_middle+65,image_bottom+30,1,1,0,c_white,1); + draw_set_halign(fa_left); + draw_text(image_middle+32, image_bottom+30, req_require); + return clicked; +} + +function DataSlateMKTwo()constructor{ + height=0; + width=0; + XX=0; + YY=0; + static entered = function(){ + return scr_hit(XX, YY, XX+width, YY+height); + } + static draw = function(xx,yy,x_scale=1, y_scale=1){ + XX=xx; + YY=yy; + height = 250*y_scale; + width=365*x_scale; + draw_sprite_ext(spr_slate_2, 1, xx, yy, x_scale, y_scale, 0, c_white, 1); + draw_sprite_ext(spr_slate_2, 0, xx, yy, x_scale, y_scale, 0, c_white, 1); + draw_sprite_ext(spr_slate_2, 2, xx, yy, x_scale, y_scale, 0, c_white, 1); + //draw_sprite_ext(spr_slate_2, 0, xx, yy, 1, 1, 0, c_white, 1) + } +} + +function RackAndPinion(Type="forward", scale = 1) constructor{ + reverse =false; + rack_y=0; + rotation = 360; + type=Type + if (type="forward"){ + draw = function(x, y, freeze=false, Reverse=""){ + x+=19; + if (!freeze){ + if (Reverse != ""){ + if (Reverse){ + reverse=true; + } else { + reverse=false; + } + } + draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) + if (!reverse){ + rotation-=4; + } else { + rotation+=4; + } + rack_y = (75.3982236862/360)*(360-rotation); + if (rack_y > 70){ + reverse = true; + } else if (rack_y < 2){ + reverse = false; + } + draw_sprite_ext(spr_rack, 0, x-13, y-rack_y, 1, 1, 0, c_white, 1) + } else { + draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) + draw_sprite_ext(spr_rack, 0, x-13, y-rack_y, 1, 1, 0, c_white, 1) + } + } + } else if (type="backward"){ + draw = function(x, y, freeze=false, Reverse=""){ + x-=19; + if (!freeze){ + if (Reverse != ""){ + if (Reverse){ + reverse=true; + } else { + reverse=false; + } + } + draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) + if (!reverse){ + rotation+=4; + } else { + rotation-=4; + } + rack_y = (75.3982236862/360)*(360-rotation) + if (rack_y > 70){ + reverse = true; + } else if (rack_y < 2){ + reverse = false; + } + draw_sprite_ext(spr_rack, 0, x+13, y+rack_y, -1, 1, 0, c_white, 1) + } else { + draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) + draw_sprite_ext(spr_rack, 0, x+13, y+rack_y, -1, 1, 0, c_white, 1) + } + } + } +} +function SpeedingDot(XX,YY, limit) constructor{ + bottom_limit = limit; + stack = 0; + yyy=YY; + xxx=XX; + draw = function(xx,yy){ + if (bottom_limit+(48*0.7)0 ? 36-stack :0; + var bottom_cut = bottom_limit 1*flash_modifier){ + flash_size-=flash_modifier; + }else { + flash_size+=flash_modifier; + flash = 0; + } + } + draw_set_alpha(1); + } + draw_one_flash = function(xx, yy){ + if (one_flash_finished) then exit; + draw_set_color(c_green); + for (var i=0; i<=flash_size;i++){ + draw_set_alpha(1 - ((1/40)*i)) + draw_circle(xx, yy, (i/3), 1); + } + if (flash==0){ + if (flash_size<40){ + flash_size++; + } else { + flash = 1; + flash_size--; + } + } else { + if (flash_size > 1){ + flash_size--; + }else { + flash_size++; + flash = 0; + one_flash_finished = true; + } + } + } +} + +function ShutterButton() constructor{ + time_open = 0; + click_timer = 0; + Width = 315; + Height = 90; + XX=0; + YY=0; + width=0; + height=0; + cover_text = ""; + tooltip = ""; + + /*cover_sprite = spr_shutter_button_cover; + static make_custom_cover(){ + + }*/ + right_rack = new RackAndPinion(); + left_rack = new RackAndPinion("backward"); + background = new DataSlate(); + + static hit = function(){ + return scr_hit(XX, YY, XX+width, YY+height); + } + background.inside_method = function(){ + var yy = YY; + var xx = XX; + var text_draw = xx+(width/2)-(string_width(text)*(3*scale)/2); + if (hit()){ + draw_rectangle_color_simple(xx, yy, xx+width, yy+height, false, CM_GREEN_COLOR, 0.35) + } + draw_set_halign(fa_left); + draw_set_color(c_red); + if (click_timer>0){ + draw_text_transformed(text_draw, yy+(24*scale), text, 3*scale, 3*scale, 0); + } else { + draw_text_transformed(text_draw, yy+(20*scale), text, 3*scale, 3*scale, 0); + } + } + + background.style = "plain"; + style = "plain"; + + /*draw_with_dimensions = function(xx,yy, ,width, entered){ + draw_shutter(); + }*/ + inside_method = function(){ + var yy = YY; + var xx = XX; + var text_draw = xx+(width/2)-(string_width(text)*(3*scale)/2); + if (point_and_click([XX, YY, XX+width, YY+height]) || click_timer>0 ){ + shutter_backdrop = 7; + click_timer++; + } else { + shutter_backdrop = 6; + } + draw_sprite_ext(spr_shutter_button, shutter_backdrop, XX, YY, scale, scale, 0, c_white, 1); + draw_set_halign(fa_left); + draw_set_color(c_red); + if (click_timer>0){ + draw_text_transformed(text_draw, yy+(24*scale), text, 3*scale, 3*scale, 0); + } else { + draw_text_transformed(text_draw, yy+(20*scale), text, 3*scale, 3*scale, 0); + } + } + + draw_shutter = function(xx=-1,yy=-1,text, scale=1, entered = ""){ + add_draw_return_values(); + if (xx != -1){ + XX=xx; + } + if (yy != -1){ + YY=yy; + } + draw_set_alpha(1); + self.scale = scale; + self.text = text; + draw_set_font(fnt_40k_12); + draw_set_halign(fa_left); + draw_set_color(c_gray); + width = Width *scale; + height = Height *scale; + if (text=="") then entered = false; + + if (entered==""){ + entered = scr_hit(xx, yy, xx+width, yy+height); + } else { + entered=entered; + } + + if (tooltip!= "" && scr_hit(xx, yy, xx+width, yy+height)){ + tooltip_draw(tooltip); + } + var shutter_backdrop = 6; + if (entered || click_timer>0){ + if (time_open<24){ + time_open++; + right_rack.draw(xx+width, yy, false, false); + left_rack.draw(xx, yy, false, false); + } else { + right_rack.draw(xx+width, yy, true); + left_rack.draw(xx, yy, true); + } + } else if (time_open>0){ + time_open--; + right_rack.draw(xx+width, yy, false, true); + left_rack.draw(xx, yy, false, true); + } else { + right_rack.draw(xx+width, yy, true); + left_rack.draw(xx, yy, true); + } + + var main_sprite = 0; + if (time_open<2){ + draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1); + if (cover_text != ""){ + draw_set_valign(fa_top); + draw_set_font(fnt_Embossed_metal); + var _cover_scale = 3*scale; + while (string_width(cover_text) * _cover_scale > width-(5*scale)){ + _cover_scale -= 0.1; + } + var text_draw = xx+(width/2)-((string_width(cover_text)*(_cover_scale))/2); + draw_set_color(c_black); + draw_text_transformed(text_draw, yy+(_cover_scale*1), cover_text, _cover_scale, _cover_scale, 0); + } + } else if (time_open>=2){ + + main_sprite=floor(time_open/6) + 1; + + if (style == "plain"){ + inside_method(); + } else if (style == "slate"){ + background.draw_with_dimensions(xx, yy, width, height); + } + draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1); + } + draw_set_color(c_grey); + if (click_timer>7){ + click_timer = 0; + return true; + } else { + return false; + } + pop_draw_return_values(); + } +} + + + diff --git a/scripts/scr_DataSlate/scr_DataSlate.yy b/scripts/scr_DataSlate/scr_DataSlate.yy new file mode 100644 index 0000000000..706bff707b --- /dev/null +++ b/scripts/scr_DataSlate/scr_DataSlate.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_DataSlate", + "isCompatibility":false, + "isDnD":false, + "name":"scr_DataSlate", + "parent":{ + "name":"User Interface", + "path":"folders/Scripts/User Interface.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_PlanetData/scr_PlanetData.gml b/scripts/scr_PlanetData/scr_PlanetData.gml index eb106d13aa..96dc83e039 100644 --- a/scripts/scr_PlanetData/scr_PlanetData.gml +++ b/scripts/scr_PlanetData/scr_PlanetData.gml @@ -16,10 +16,17 @@ function PlanetData(planet, system) constructor{ self.planet = planet; self.system = system; + x = system.x; + y = system.y; player_disposition = system.dispo[planet]; planet_type = system.p_type[planet]; operatives = system.p_operatives[planet]; - features =system.p_feature[planet]; + + function add_operatives(new_ops){ + array_push(system.p_operatives[planet], new_ops); + operatives = system.p_operatives[planet]; + } + features = system.p_feature[planet]; current_owner = system.p_owner[planet]; origional_owner = system.p_first[planet]; population = system.p_population[planet]; @@ -34,6 +41,10 @@ function PlanetData(planet, system) constructor{ system.dispo[planet] = player_disposition; } + static owner_faction_disposition = function(){ + return obj_controller.disposition[current_owner]; + } + static set_population = function(new_population){ population = new_population; system.p_population[planet] = population; @@ -45,20 +56,33 @@ function PlanetData(planet, system) constructor{ } //assumes a large pop figure and changes down if small pop planet - static population_small_conversion= function(pop_value){ + static population_small_conversion = function(pop_value){ if (!large_population){ pop_value *= large_pop_conversion; } return pop_value; } + static population_large_conversion = function(pop_value){ + if (large_population){ + pop_value /= large_pop_conversion; + } + return pop_value; + } + + static send_colony_ship = function(target, targ_planet, type){ + new_colony_fleet(system, planet, target, targ_planet, type); + } + static set_new_owner = function(new_owner){ + system.p_owner[planet] = new_owner; + current_owner = new_owner; + } static return_to_first_owner = function(allow_player = false){ if (!allow_player && origional_owner == eFACTION.Player){ - system.p_owner[planet]= eFACTION.Imperium; + set_new_owner(eFACTION.Imperium); } else { - system.p_owner[planet] = origional_owner; + set_new_owner(origional_owner); } - current_owner = origional_owner; } static add_disposition = function(alteration){ @@ -97,6 +121,12 @@ function PlanetData(planet, system) constructor{ } guardsmen = system.p_guardsmen[planet]; + + static edit_guardsmen = function(edit_val){ + system.p_guardsmen[planet] = max(0, system.p_guardsmen[planet] + edit_val); + guardsmen = system.p_guardsmen[planet]; + } + pdf = system.p_pdf[planet]; fortification_level = system.p_fortified[planet]; static alter_fortification = function(alteration){ @@ -119,6 +149,11 @@ function PlanetData(planet, system) constructor{ // Whether or not player forces are on the planet player_forces = system.p_player[planet]; + + static edit_player_forces = function(val){ + system.p_player[planet]+=val; + player_forces = system.p_player[planet]; + } defence_lasers = system.p_lasers[planet]; defence_silos = system.p_silo[planet]; ground_defences = system.p_defenses[planet]; @@ -144,6 +179,290 @@ function PlanetData(planet, system) constructor{ handle_exception(_exception); } + static add_forces = function(faction, val){ + var _new_val = planet_forces[faction]+val; + return edit_forces(faction,_new_val); + } + + static edit_forces = function(faction, val){ + planet_forces[faction] = clamp(val,0,12); + var _new_val = planet_forces[faction]; + switch (faction){ + case eFACTION.Ork: + system.p_orks[planet] = _new_val; + break; + case eFACTION.Tau: + system.p_tau[planet] = _new_val; + break; + case eFACTION.Tyranids: + system.p_tyranids[planet] = _new_val; + break; + case eFACTION.Necrons: + system.p_necrons[planet] = _new_val; + break; + case eFACTION.Eldar: + system.p_eldar[planet] = _new_val; + break; + case eFACTION.Chaos: + system.p_chaos[planet] = _new_val; + break; + case eFACTION.Heretics: + system.p_traitors[planet] = _new_val; + break; + case eFACTION.Ecclesiarchy: + system.p_sisters[planet] = _new_val; + break; + } + + return _new_val + + } + + + + static assasinate_governor = function(assaination_type, discovery_modifier){ + var randa = roll_dice_chapter(1, 100, "high"); + var randa2 = roll_dice(1, 100); + + //type 1 is install a sympathectic else it's a straight serf installation + if (assaination_type == 1){ + var _discovery_rate = 10; + set_player_disposition(70 + floor(random_range(5, 15)) + 1); + var _text = $"Many of the successors for {name()} are removed or otherwise made indisposed. Your chapter ensures that the new Planetary Governor is sympathetic to your plight and more than willing to heed your advice. A powerful new ally may be in the making."; + scr_event_log("", $"Planetary Governor of {name()} assassinated. A more suitable Governor is installed."); + } else { + var _discovery_rate = 25; + if (origional_owner != 3) { + set_new_owner(eFACTION.Player); + } + set_player_disposition(101); + scr_event_log("", $"Planetary Governor of {name()} assassinated. One of your Chapter Serfs take their position."); + var _text = $"All of the successors for {name()} are removed or otherwise made indisposed. Paperwork is slightly altered. Rather than any sort of offical one of your Chapter Serfs is installed as the Planetary Governor. The planet is effectively under your control."; + } + + if (randa2 <= (_discovery_rate * discovery_modifier)) { + if (assaination_type == 1){ + var _duration = ((choose(1, 2, 3, 4, 5, 6) + choose(1, 2, 3, 4, 5, 6)) * 6) + choose(-3, -2, -1, 0, 1, 2, 3); + } else { + var _duration = (choose(1, 2) * 6) + choose(-3, -2, -1, 0, 1, 2, 3); + } + add_event({ + duration : _duration, + e_id : "governor_assassination", + variant : assaination_type, + system : system.name, + planet : planet, + }); + } + return _text; + } + static grow_ork_forces = function(){ + var contin=0; + var rando=roll_dice(1,100);// This part handles the spreading + // if (rando<30){ + var _non_deads = planets_without_type("dead", system); + + var _has_warboss = has_feature(P_features.OrkWarboss); + var _has_stronghold = has_feature(P_features.OrkStronghold); + var _build_ships = false; + if (_has_stronghold){ + var _stronghold = get_features(P_features.OrkStronghold)[0]; + } + + if (_has_warboss){ + var _warboss = get_features(P_features.OrkWarboss)[0]; + _warboss.turns_static++; + } + if (array_length(_non_deads)>0 && rando>40){ + var _ork_spread_planet = array_random_element(_non_deads); + var _orks = planet_forces[eFACTION.Ork] + var _ork_target = system.p_orks[_ork_spread_planet]; + var _spread_orks = (current_owner==eFACTION.Ork && ((pdf + guardsmen + planet_forces[8] + planet_forces[10]+planet_forces[1]) == 0 )); + if (_spread_orks){ + // determine maximum Ork presence on the source planet + var _ork_max = planet_forces[eFACTION.Ork]; + + if (_ork_max<5 && _ork_target<2) then system.p_orks[_ork_spread_planet]++; + if (_orks>4 && _ork_target<3){ + system.p_orks[_ork_spread_planet]++; + if (_ork_target<3){ + system.p_orks[_ork_spread_planet]++; + add_forces(eFACTION.Ork, -1); + } + } + + } + } + contin=0; + rando=roll_dice(1,100);// This part handles the ship building + if (population>0 && pdf==0 && guardsmen==0 && planet_forces[10]==0) and (planet_forces[eFACTION.Tau]==0){ + if (!large_population){ + set_population(population*0.97); + }else { + edit_population(-0.01); + } + + }; + + var enemies_present=false; + with (system){ + for (var n=0;n=1) and ((p_pdf[plan]>0) or (p_guardsmen[plan]>0) or (p_traitors[plan]>0) or (p_tau[plan]>0)){ + enemies_present=true; + } + } + } + + if (_has_warboss && !_has_stronghold){ + rando=roll_dice_chapter(1,100, "low"); + if (rando<30){ + add_feature(P_features.OrkStronghold); + } + } else { + if (_has_stronghold){ + growth = 0.01; + if (_has_warboss){ + growth *= 2; + } + if (_stronghold.tier0) then rando-=10;// Empire bonus, was 15 before + + // Check for industrial facilities + var fleet_buildable = ((planet_type!="Dead" && planet_type!="Lava") || _has_warboss || _has_stronghold); + if (fleet_buildable && planet_forces[eFACTION.Ork]>=4){// Used to not have Ice either + + if (instance_exists(obj_p_fleet)){ + var ppp=instance_nearest(x,y,obj_p_fleet); + if (point_distance(x,y,ppp.x,ppp.y)<50) and (ppp.action=""){ + exit; + }; + } + if (planet_type == "Forge"){ + rando-=80; + } else if (planet_type == "Hive" || planet_type == "Temperate"){ + rando-=30; + }else if (planet_type == "Agri"){ + rando-=10; + } + var _ork_fleet = scr_orbiting_fleet(eFACTION.Ork, system); + if (_ork_fleet=="none"){ + if (rando<=20){ + new_ork_fleet(x,y); + } + } else { + + _build_ships = true; + + } + } + } + if (_build_ships){ + var _pdata = self; + with (_ork_fleet){ + // Increase ship number for this object? + var rando=irandom(101); + if (obj_controller.known[eFACTION.Ork]>0) then rando-=10; + var _planet_type = _pdata.planet_type; + if (_planet_type=="Forge"){ + rando-=20; + } else if (_planet_type=="Hive"){ + rando-=10; + }else if (_planet_type=="Shrine" || _planet_type=="Temperate"){ + rando-=5; + } + if (rando<=15){// was 25 + rando=choose(1,1,1,1,1,1,1,2,2,2); + var _big_stronghold = false + if (_has_stronghold){ + if (_stronghold.tier>=2){ + _big_stronghold = true; + } + } + if (_planet_type=="Forge" || _big_stronghold || _has_warboss){ + if (!irandom(10)){ + rando = 3; + } + }else if (_has_stronghold || _planet_type=="Hive"){ + if (!irandom(30)){ + rando = 3; + } + } + if (capital_number<=0){ + rando = 3; + } + switch(rando){ + case 3: + capital_number+=1; + break; + case 2: + frigate_number+=1; + break; + case 1: + escort_number+=1; + break; + + } + } + var ii=0; + ii+=capital_number; + ii+=round((frigate_number/2)); + ii+=round((escort_number/4)); + if (ii<=1) then ii=1; + image_index=ii; + //if big enough flee bugger off to new star + if (image_index>=5){ + instance_deactivate_object(_pdata.system); + with(obj_star){ + if (is_dead_star()){ + instance_deactivate_object(id); + } else { + if (owner == eFACTION.Ork || array_contains(p_owner, eFACTION.Ork)){ + instance_deactivate_object(id); + } + } + } + var new_wagh_star = instance_nearest(x,y,obj_star); + if (instance_exists(new_wagh_star)){ + action_x=new_wagh_star.x; + action_y=new_wagh_star.y; + action = ""; + set_fleet_movement(); + } + + } + instance_activate_object(obj_star); + } + } + if (_has_warboss){ + rando=roll_dice(1,100)+10; + var _ork_fleet = scr_orbiting_fleet(eFACTION.Ork, system); + if (_ork_fleet!="none" && rando < _warboss.turns_static){ + _warboss.turns_static = 0; + _ork_fleet.cargo_data.ork_warboss = _warboss; + delete_feature(P_features.OrkWarboss); + if (!_warboss.player_hidden || !irandom(5)){ + scr_alert("red","ork",$"{_warboss.name} departs {name()} as his waaagh gains momentum",0,0); + } + } + } + + } + deamons = system.p_demons[planet]; chaos_forces = system.p_chaos[planet]; @@ -186,6 +505,9 @@ function PlanetData(planet, system) constructor{ has_problem_planet(planet, problem, system); } + static remove_problem = function(problem){ + remove_planet_problem(planet ,problem,system) + } static find_problem = function(problem){ return find_problem_planet(planet, problem, system); } @@ -194,6 +516,7 @@ function PlanetData(planet, system) constructor{ return add_new_problem(planet, problem, timer,system, other_data); } + static name = function(){ var _name=""; @@ -215,7 +538,9 @@ function PlanetData(planet, system) constructor{ } static add_feature = function(feature_type){ - array_push(system.p_feature[planet], new NewPlanetFeature(feature_type)); + var new_feature = new NewPlanetFeature(feature_type); + array_push(system.p_feature[planet], new_feature); + return new_feature; } static has_upgrade = function(feature){ @@ -235,6 +560,8 @@ function PlanetData(planet, system) constructor{ delete_features(system.p_feature[planet], feature); } + static bombard = scr_bomb_world; + static get_local_apothecary_points = function() { var _system_point_use = obj_controller.specialist_point_handler.point_breakdown.systems; var _spare_apoth_points = 0; @@ -413,14 +740,20 @@ function PlanetData(planet, system) constructor{ // if (p_tyranids[planet]>0) and (guard_attack="") then guard_attack="tyranids"; if (planet_forces[eFACTION.Tyranids]>=4){ guard_attack="tyranids"; - }else if (planet_forces[eFACTION.Tyranids]<4 && planet_forces[eFACTION.Tyranids]>0){ - if (has_feature(P_features.Gene_Stealer_Cult)){ + }else if (planet_forces[eFACTION.Tyranids]>0){ + if (has_feature(P_features.Gene_Stealer_Cult)){ var _hidden_cult = get_features(P_features.Gene_Stealer_Cult)[0].hiding; if (!_hidden_cult){ guard_attack="tyranids"; - } - } - } + }else if (population_influences[eFACTION.Tyranids]>=50){ + guard_attack="pdf"; + } + } else { + guard_attack="tyranids"; + } + } else if (population_influences[eFACTION.Tyranids]>=50){ + guard_attack="pdf"; + } return guard_attack; } @@ -447,7 +780,9 @@ function PlanetData(planet, system) constructor{ } } else if (current_owner == eFACTION.Tau){ _pdf_attack="guard"; - } + }else if (has_feature(P_features.Gene_Stealer_Cult) && population_influences[eFACTION.Tyranids]>=50){ + _pdf_attack="guard"; + } } if (_pdf_attack==""){ @@ -495,12 +830,16 @@ function PlanetData(planet, system) constructor{ static planet_info_screen = function(){ + if (!instance_exists(obj_star_select)){ + exit; + } var improve=0 var xx=15; var yy=25; - var current_planet=obj_controller.selecting_planet; + var current_planet=planet; var nm=scr_roman(current_planet), temp1=0; draw_set_halign(fa_center); + draw_set_valign(fa_top); draw_set_font(fnt_40k_14); var _xenos_and_heretics = xenos_and_heretics(); @@ -526,7 +865,9 @@ function PlanetData(planet, system) constructor{ if (!_succession){ - if (player_disposition>=0) and (origional_owner<=5) and (current_owner<=5) and (population>0) then draw_text(xx+534,yy+176,"Disposition: "+string(min(100,player_disposition))+"/100"); + if (player_disposition>=0) and (origional_owner<=5) and (current_owner<=5) and (population>0){ + draw_text(xx+534,yy+176,"Disposition: "+string(min(100,player_disposition))+"/100"); + } if (player_disposition>-30) and (player_disposition<0) and (current_owner<=5) and (population>0){ draw_text(xx+534,yy+176,"Disposition: ???/100"); } @@ -535,7 +876,9 @@ function PlanetData(planet, system) constructor{ } if (player_disposition<=-3000) then draw_text(xx+534,yy+176,"Disposition: N/A"); - } else if (_succession=1) then draw_text(xx+534,yy+176,"War of _Succession"); + } else if (_succession){ + draw_text(xx+534,yy+176,"War of _Succession"); + } draw_set_color(c_gray); // End draw disposition draw_set_color(c_gray); @@ -580,25 +923,25 @@ function PlanetData(planet, system) constructor{ var pop_string = $"Population: {display_population()}"; - if (instance_exists(obj_star_select)){ - var _button_manager = obj_star_select.button_manager; - _button_manager.update({ - label:pop_string, - tooltip : "population data toggle with 'P'", - keystroke : press_exclusive(ord("P")), - x1 : xx+480, - y1 : yy+217, - w : 200, - h : 22 - }); - _button_manager.update_loc(); - if (_button_manager.draw()){ - obj_star_select.population = !obj_star_select.population; - if (obj_star_select.population){ - obj_star_select.potential_doners = find_population_doners(system.id); - } + + var _button_manager = obj_star_select.button_manager; + _button_manager.update({ + label:pop_string, + tooltip : "population data toggle with 'P'", + keystroke : press_exclusive(ord("P")), + x1 : xx+480, + y1 : yy+217, + w : 200, + h : 22 + }); + _button_manager.update_loc(); + if (_button_manager.draw()){ + obj_star_select.population = !obj_star_select.population; + if (obj_star_select.population){ + obj_star_select.potential_doners = find_population_doners(system.id); } } + if (is_craftworld=0) and (is_hulk=0){ var y7=240,temp3=string(scr_display_number(guardsmen)); @@ -799,13 +1142,13 @@ function PlanetData(planet, system) constructor{ } } } - if (obj_controller.selecting_planet>0){ - var current_planet=obj_controller.selecting_planet; + if (planet>0){ + var current_planet=planet; draw_set_color(c_black); draw_set_halign(fa_center); - /*if (obj_controller.recruiting_worlds_bought>0) and (system.p_owner[obj_controller.selecting_planet]<=5) and (obj_controller.faction_status[system.p_owner[obj_controller.selecting_planet]]!="War"){ - if (string_count("Recr",system.p_feature[obj_controller.selecting_planet])=0){ + /*if (obj_controller.recruiting_worlds_bought>0) and (system.p_owner[planet]<=5) and (obj_controller.faction_status[system.p_owner[planet]]!="War"){ + if (string_count("Recr",system.p_feature[planet])=0){ button4="+Recruiting"; } }*/ @@ -818,7 +1161,7 @@ function PlanetData(planet, system) constructor{ hei=string_height_ext(tex,-1,200)+4;wid=string_width_ext(tex,-1,200)+4; draw_set_color(c_black); draw_rectangle(xx+363,yy+210,xx+363+wid,yy+210+hei,0); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_rectangle(xx+363,yy+210,xx+363+wid,yy+210+hei,1); draw_text_ext(xx+365,yy+212,tex,-1,200); } @@ -847,8 +1190,8 @@ function PlanetData(planet, system) constructor{ kill = large_population ? strength*0.15 : strength*15000000 } else if (current_owner=8) and (pdf>0){ - wob=strength*(irandom_range(49, 51) * 100000); - system.p_pdf[planet]-=wob; + + system.p_pdf[planet]-= strength*(irandom_range(49, 51) * 100000); if (pdf<0){ system.p_pdf[planet]=0; } @@ -867,15 +1210,123 @@ function PlanetData(planet, system) constructor{ kill = strength * population_small_conversion(0.15); if (system.p_heresy[planet]>0) then system.p_heresy[planet]=max(0,system.p_heresy[planet]-5); } + + var _pop_percentage_kill = population > 0 ? (kill / population) * 100 : 0; + edit_population(kill*-1); if (system.p_pdf[planet]<0) then system.p_pdf[planet]=0; + if (population_influences[eFACTION.Tyranids] > 3){ + var _max_influence_reduction = min(_pop_percentage_kill,population_influences[eFACTION.Tyranids]-3); + adjust_influence(eFACTION.Tyranids,-_max_influence_reduction,planet,system); + if (has_feature(P_features.Gene_Stealer_Cult)){ + if (population_influences[eFACTION.Tyranids]<20){ + delete_feature(P_features.Gene_Stealer_Cult); + } + } + } if (population+pdf<=0) and (current_owner=1) and (obj_controller.faction_status[eFACTION.Imperium]="War"){ - if (planet_feature_bool(system.p_feature[planet],P_features.Monastery)==0){ + if (!has_feature(P_features.Monastery)){ current_owner=2; add_disposition(-50); } } } + static create_planet_garrison = function(){ + var company_data = obj_controller.company_data; + var squad_index = company_data.company_squads[company_data.cur_squad]; + var current_squad=obj_ini.squads[squad_index]; + current_squad.set_location(system.name,0,planet); + var _mission = obj_star_select.mission; + current_squad.assignment={ + type:_mission, + location:system.name, + ident:planet, + }; + var operation_data = { + type:"squad", + reference:squad_index, + job:_mission, + task_time : 0 + }; + add_operatives(operation_data) + system.garrison = true; + + //if there was an outstanding mission to provide the given garrison + var garrison_request = find_problem("provide_garrison"); + if (garrison_request>-1){ + init_garrison_mission(planet, system, garrison_request); + } + instance_destroy(obj_star_select); + } + + + static planet_selection_logic = function(){ + var planet_is_allies = scr_is_planet_owned_by_allies(system, planet); + var garrison_issue = (!planet_is_allies || pdf<=0); + var _mission = variable_instance_exists(obj_star_select,"mission") ? obj_star_select.mission : ""; + + var _loading = obj_star_select.loading; + var garrison_assignment = obj_controller.view_squad && _loading; + if (garrison_assignment && (garrison_issue && _mission=="garrison")){ + planet_draw = c_red; + tooltip_draw("Can't garrison on non-friendly planet or planet with no friendly PDF", 150); + } + if (mouse_check_button_pressed(mb_left)){ + if (garrison_assignment){ + if (!(garrison_issue && _mission=="garrison")){ + create_planet_garrison(); + exit; + } + } else if (!_loading){ + garrison = new GarrisonForce(operatives); + system.garrison = garrison.garrison_force; + feature=""; + buttons_selected=false; + } else if (_loading && planet >0){ + + obj_controller.unload=planet; + obj_controller.return_object=system; + obj_controller.return_size=obj_controller.man_size; + edit_player_forces(obj_controller.man_size) + + // 135 ; SPECIAL PLANET CRAP HERE + + // Recon Stuff + + if (has_problem("recon")){ + var arti=instance_create(system.x,system.y,obj_temp7);// Unloading / artifact crap + + arti.num=planet; + arti.alarm[0]=1; + arti.loc=obj_controller.selecting_location; + arti.managing=obj_controller.managing; + arti.type="recon"; + + with (arti){ + setup_planet_mission_group() + } + } + if (!instance_exists(obj_ground_mission)){ + check_for_artifact_grab_mission(); + } + if (!instance_exists(obj_ground_mission)){ + check_for_stc_grab_mission(); + } + // Ancient Ruins + if (!instance_exists(obj_ground_mission)){ + scr_check_for_ruins_exploration(); + } + instance_destroy(obj_star_select); + exit; + } + + } + } + } + + + + diff --git a/scripts/scr_Table/scr_Table.gml b/scripts/scr_Table/scr_Table.gml new file mode 100644 index 0000000000..6ab632df88 --- /dev/null +++ b/scripts/scr_Table/scr_Table.gml @@ -0,0 +1,114 @@ +function Table(data) constructor{ + headings = []; + row_data = []; + standard_loc_data(); + row_h = 12; + + column_widths = []; + + set_column_widths = []; + + row_key_draw = []; + + halign = fa_center; + + header_h = 0; + + col_spacing = 5; + + move_data_to_current_scope(data); + + update(); + + static update = function(data){ + move_data_to_current_scope(data); + w = 0; + column_widths = []; + header_h = 0; + for (var i=0; i0){ + array_push(column_widths, set_column_widths[i]); + } else{ + if (array_length(column_widths) <= i){ + array_push(column_widths, _heading.w) + } + if (column_widths[i] == 0){ + column_widths[i] = _heading.w; + } + } + + + _heading.update({ + max_width : column_widths[i], + x1 : x1+w +(column_widths[i]/2), + y1 : y1, + halign : halign + }); + + if (_heading.h > header_h){ + header_h = _heading.h; + } + + w += column_widths[i] + col_spacing; + } + } + + static draw = function(){ + add_draw_return_values(); + + draw_set_halign(halign); + draw_set_valign(fa_top); + + var _col_draw_x = x1; + for (var i=0;i y2 - row_h){ + break; + } + _col_draw_x = x1; + var _row = row_data[i]; + var _row_entered = scr_hit_dimensions(_col_draw_x,_row_level,w,row_h); + if (is_array(row_data[i])){ + for (var d=0;d= array_length(obj_ini.ship_location)){ + obj_ini.artifact_sid[index] = 500 + array_length(obj_ini.ship_location) -1; + } return obj_ini.artifact_sid[index] - 500; }; @@ -377,7 +378,7 @@ function ArtifactStruct(Index) constructor { return false; }; - static inquisition_disprove = function() { + static inquisition_disaprove = function() { var inquis_tags = ["daemonic", "chaos_gift", "chaos"]; if (has_tag("inq")) { return false; @@ -422,7 +423,7 @@ function ArtifactStruct(Index) constructor { if (has_tag("daemonic")) { var _ship_id = ship_id(); if (_ship_id > 0) { - var demonSummonChance = roll_dice(1, 100, "high"); + var demonSummonChance = roll_dice_chapter(1, 100, "high"); if ((demonSummonChance <= 60) && (obj_ini.ship_carrying[_ship_id] > 0)) { instance_create(0, 0, obj_ncombat); @@ -549,6 +550,38 @@ function ArtifactStruct(Index) constructor { obj_ini.artifact_equipped[index] = false; }; + static equip_on_unit = function(unit, slot=-1){ + var _item = determine_base_type(); + if (_item == "mobility"){ + unit.update_mobility_item(index); + } else if (_item == "gear"){ + unit.update_gear(index); + } else if (_item == "armour"){ + unit.update_armour(index); + } else if (_item == "weapon"){ + if (slot == -1 || slot == 0){ + unit.update_weapon_one(index); + } else { + unit.update_weapon_two(index); + } + } + var _dwarn = false; + if (has_tag("daemonic") || has_tag("chaos")) { + unit.corruption += irandom(10 + 2); + if (unit.role() == obj_ini.role[100][eROLE.ChapterMaster]) { + _dwarn = true; + } + } + if (_dwarn == true) { + var pip = instance_create(0, 0, obj_popup); + pip.title = "Daemon Artifacts"; + pip.text = "Some artifacts, like the one you now wield, are a blasphemous union of the Materium's matter and the Immaterium's spirit, containing the essence of a bound daemon. While they may offer great power, and enhanced perception, they are known to whisper poisonous lies to the wielder. The path to damnation begins with good intentions, and many times artifacts such as these have been the cause."; + pip.image = ""; + pip.cooldown = 8; + obj_controller.cooldown = 8; + } + } + custom_data = {}; name = ""; custom_description = ""; @@ -559,16 +592,19 @@ function ArtifactStruct(Index) constructor { function corrupt_artifact_collectors(last_artifact) { try { - var arti = obj_ini.artifact_struct[last_artifact]; - if (arti.inquisition_disprove()) { + var arti = fetch_artifact(last_artifact); + if (arti.inquisition_disaprove()) { for (var i = 0; i < array_length(obj_controller.display_unit); i++) { + var _unit = obj_controller.display_unit[i]; if (obj_controller.man_sel[i] == 1) { if (obj_controller.man[i] == "man") { - if (is_struct(obj_controller.display_unit[i])) { - obj_controller.display_unit[i].edit_corruption(choose(0, 2, 4, 6, 8)); + if (is_struct(_unit)) { + _unit.edit_corruption(choose(0, 2, 4, 6, 8)); } - } else if (obj_controller.man[i] == "vehicle" && is_array(obj_controller.display_unit[i])) { - obj_ini.veh_chaos[obj_controller.display_unit[i][0]][obj_controller.display_unit[i][1]] += choose(0, 2, 4, 6, 8); + } else if (obj_controller.man[i] == "vehicle" && is_array(_unit)) { + var _val = get_deep_array(obj_ini.veh_chaos,_unit) + _val += choose(0, 2, 4, 6, 8); + alter_deep_array(obj_ini.veh_chaos,_unit, _val) } } } @@ -578,6 +614,12 @@ function corrupt_artifact_collectors(last_artifact) { } } +function fetch_artifact(index){ + if (index < 0 || index >= array_length(obj_ini.artifact_struct)) { + return undefined; + } + return obj_ini.artifact_struct[index]; +} function delete_artifact(index) { if (index < array_length(obj_ini.artifact)) { with(obj_ini) { @@ -591,9 +633,90 @@ function delete_artifact(index) { artifact_equipped[index] = false; artifact_struct[index] = new ArtifactStruct(index); } + /*for (var i=index;i= 2) { + _string = string_copy(_string, 1, string_length(_string) - 2); + } + return _string; + } + + static has_item = function(item){ + return struct_exists(item_types, item) ? item_types[$item] : 0; + } + + items = []; + item_types = {}; } \ No newline at end of file diff --git a/scripts/scr_add_man/scr_add_man.yy b/scripts/scr_add_man/scr_add_man.yy index ec7fdabeff..ab3c5987ae 100644 --- a/scripts/scr_add_man/scr_add_man.yy +++ b/scripts/scr_add_man/scr_add_man.yy @@ -5,8 +5,8 @@ "isDnD":false, "name":"scr_add_man", "parent":{ - "name":"Scripts", - "path":"folders/Scripts.yy", + "name":"marines_and_profiles", + "path":"folders/Scripts/marines_and_profiles.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/scr_add_vehicle/scr_add_vehicle.gml b/scripts/scr_add_vehicle/scr_add_vehicle.gml index 0affcd9b9b..63e3cf7d7d 100644 --- a/scripts/scr_add_vehicle/scr_add_vehicle.gml +++ b/scripts/scr_add_vehicle/scr_add_vehicle.gml @@ -1,15 +1,15 @@ -function scr_add_vehicle(vehicle_type, target_company, weapon1, weapon2, weapon3, upgrade, accessory) { +function scr_add_vehicle(vehicle_type, target_company,otherdata={} ,weapon1 = "standard", weapon2 = "standard", weapon3 = "standard", upgrade = "standard", accessory = "standard") { try { // That should be sufficient to add stuff in a highly modifiable fashion var i = 0; - e = 0; - good = 0; - wep1 = ""; - wep2 = ""; - gear = ""; - arm = ""; - missing = 0; + var e = 0; + var good = 0; + var wep1 = ""; + var wep2 = ""; + var gear = ""; + var arm = ""; + var missing = 0; for (var i = 1; i < array_length(obj_ini.veh_role[target_company]); i++) { if (good == 0) { @@ -23,39 +23,49 @@ function scr_add_vehicle(vehicle_type, target_company, weapon1, weapon2, weapon3 if (good != 0) { obj_ini.veh_race[target_company][good] = 1; - if (obj_ini.fleet_type == ePlayerBase.home_world) { - obj_ini.veh_loc[target_company][good] = obj_ini.home_name; - obj_ini.veh_wid[target_company][good] = 2; - obj_ini.veh_lid[target_company][good] = -1; - } + if (!struct_exists(otherdata,"loc")){ + if (obj_ini.fleet_type == ePlayerBase.home_world) { + obj_ini.veh_loc[target_company][good] = obj_ini.home_name; + obj_ini.veh_wid[target_company][good] = obj_ini.home_planet; + obj_ini.veh_lid[target_company][good] = -1; + } - if (obj_ini.fleet_type != ePlayerBase.home_world) { - // Need a more elaborate ship_carrying += here for the different types of units - var first = 0, backup = 0, i = 0; - for (var i = 0; i < array_length(obj_ini.ship_class); i++) { - if ((obj_ini.ship_class[i] == "Battle Barge") && (first == 0) && (obj_ini.ship_capacity[i] > obj_ini.ship_carrying[i])) { - first = i; + if (obj_ini.fleet_type != ePlayerBase.home_world) { + // Need a more elaborate ship_carrying += here for the different types of units + var first = -1, backup = -1, i = 0; + for (var i = 0; i < array_length(obj_ini.ship_class); i++) { + if ((obj_ini.ship_class[i] == "Battle Barge") && (first == -1) && (obj_ini.ship_capacity[i] > obj_ini.ship_carrying[i])) { + first = i; + } + if ((obj_ini.ship_class[i] == "Strike Cruiser") && (backup == -1) && (obj_ini.ship_capacity[i] > obj_ini.ship_carrying[i])) { + backup = i; + } } - if ((obj_ini.ship_class[i] == "Strike Cruiser") && (backup == 0) && (obj_ini.ship_capacity[i] > obj_ini.ship_carrying[i])) { - backup = i; + if (first != -1) { + obj_ini.veh_lid[target_company][good] = first; + obj_ini.veh_loc[target_company][good] = obj_ini.ship_location[first]; + obj_ini.veh_wid[target_company][good] = 0; + obj_ini.ship_carrying[first] += 1; + } else if ((first == -1) && (backup != -1)) { + obj_ini.veh_lid[target_company][good] = backup; + obj_ini.veh_loc[target_company][good] = obj_ini.ship_location[backup]; + obj_ini.veh_wid[target_company][good] = 0; + obj_ini.ship_carrying[backup] += 1; + } else if ((first == -1) && (backup == -1)) { + obj_ini.veh_lid[target_company][good] = -1; + obj_ini.veh_loc[target_company][good] = ""; + obj_ini.veh_wid[target_company][good] = 0; + exit; } } - if (first != 0) { - obj_ini.veh_lid[target_company][good] = first; - obj_ini.veh_loc[target_company][good] = obj_ini.ship_location[first]; - obj_ini.veh_wid[target_company][good] = 0; - obj_ini.ship_carrying[first] += 1; - } else if ((first == 0) && (backup != 0)) { - obj_ini.veh_lid[target_company][good] = backup; - obj_ini.veh_loc[target_company][good] = obj_ini.ship_location[backup]; - obj_ini.veh_wid[target_company][good] = 0; - obj_ini.ship_carrying[backup] += 1; - } else if ((first == 0) && (backup == 0)) { - obj_ini.veh_lid[target_company][good] = -1; - obj_ini.veh_loc[target_company][good] = ""; - obj_ini.veh_wid[target_company][good] = 0; - exit; + } else { + obj_ini.veh_loc[target_company][good] = otherdata.loc; + if (struct_exists(otherdata,"wid")){ + obj_ini.veh_wid[target_company][good] = otherdata.wid; } + if (struct_exists(otherdata,"lid")){ + obj_ini.veh_lid[target_company][good] = otherdata.lid; + } } obj_ini.veh_role[target_company][good] = vehicle_type; diff --git a/scripts/scr_add_vehicle/scr_add_vehicle.yy b/scripts/scr_add_vehicle/scr_add_vehicle.yy index 1feca1131a..95c2fe27ef 100644 --- a/scripts/scr_add_vehicle/scr_add_vehicle.yy +++ b/scripts/scr_add_vehicle/scr_add_vehicle.yy @@ -5,8 +5,8 @@ "isDnD":false, "name":"scr_add_vehicle", "parent":{ - "name":"Scripts", - "path":"folders/Scripts.yy", + "name":"marines_and_profiles", + "path":"folders/Scripts/marines_and_profiles.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/scr_after_combat/scr_after_combat.gml b/scripts/scr_after_combat/scr_after_combat.gml index 80ad4551d8..c43c57d238 100644 --- a/scripts/scr_after_combat/scr_after_combat.gml +++ b/scripts/scr_after_combat/scr_after_combat.gml @@ -105,17 +105,19 @@ function assemble_alive_units() { } } -function distribute_experience(_units, _exp_amount) { - var _eligible_units_count = array_length(_units); - var _average_exp = 0; - - if (_eligible_units_count > 0 && _exp_amount > 0) { - var _individual_exp = _exp_amount / _eligible_units_count; - _average_exp = _individual_exp; - for (var i = 0; i < _eligible_units_count; i++) { +function distribute_experience(_units, _total_exp) { + var _unit_count = array_length(_units); + var _exp_reward = 0; + var _exp_reward_max = 5; + var _unit_exp_ceiling = 200; + var _exp_mod_min = 0.1; + + if (_unit_count > 0 && _total_exp > 0) { + _exp_reward = min(_total_exp / _unit_count, _exp_reward_max); + for (var i = 0; i < _unit_count; i++) { var _unit = _units[i]; - var _exp_mod = max(1 - (_unit.experience / 200), 0.1); - var _exp_update_data = _unit.add_exp(_individual_exp*_exp_mod); + var _exp_mod = max(1 - (_unit.experience / _unit_exp_ceiling), _exp_mod_min); + var _exp_update_data = _unit.add_exp(_exp_reward * _exp_mod); var _powers_learned = _exp_update_data[1]; if (_powers_learned > 0) { @@ -125,270 +127,73 @@ function distribute_experience(_units, _exp_amount) { } } - return _average_exp; + return _exp_reward; } +function after_battle_slime_and_equipment_maintenance(unit){ + if (unit.base_group=="astartes"){ + if (unit.gene_seed_mutations.mucranoid==1) { + var muck=roll_dice_unit(1,100,"high",unit); + if (muck==1){ //slime armour damaged due to mucranoid + if (unit.armour != ""){ + obj_controller.specialist_point_handler.add_to_armoury_repair(unit.armour()); + obj_ncombat.mucra[unit.company]=1; + obj_ncombat.slime+=unit.get_armour_data("maintenance"); + } + } + } + } +} + +function check_for_plasma_bomb_and_tomb(unit){ + if (obj_ncombat.plasma_bomb || obj_ncombat.defeat){ + return; + } + var _star = obj_ncombat.battle_object; + var _planet = obj_ncombat.battle_id; + var _necron_strength = _star.p_necrons[_planet]; + if (unit.gear() == "Plasma Bomb" && !string_count("mech_tomb2",obj_ncombat.battle_special)){ + if (obj_ncombat.enemy == eFACTION.Necrons && awake_tomb_world(_star.p_feature[_planet])){ + if (((_necron_strength-2)<3 && dropping) || (_necron_strength-1)<3){ + obj_ncombat.plasma_bomb+=1; + unit.update_gear("",false,false); + } + } + } +} /// @mixin function after_battle_part2() { var _unit; for (var i=0;i0) or (obj_ncombat.defeat!=0)) and (marine_type[i]!="") and (ally[i]=false){ - var comm=false; - if (_unit.IsSpecialist(SPECIALISTS_STANDARD,true)){ - obj_ncombat.final_command_deaths+=1; - var recent=true; - if (is_specialist(_unit.role, SPECIALISTS_TRAINEES)){ - recent=false - } else if (array_contains([string("Venerable {0}",obj_ini.role[100][6]), "Codiciery", "Lexicanum"], _unit.role())){ - recent=false - } - if (recent=true) then scr_recent("death_"+string(marine_type[i]),string(obj_ini.name[marine_co[i],marine_id[i]]),marine_co[i]); - } else { - obj_ncombat.final_marine_deaths+=1; + // _unit.gear()=""; } - // obj_ncombat.final_marine_deaths+=1; - - // show_message("ded; increase final deaths"); - - if (obj_controller.blood_debt=1){ - if (_unit.role()==obj_ini.role[100][12]){ - obj_controller.penitent_current+=2 - } else {obj_controller.penitent_current+=4;} - obj_controller.penitent_turn=0; - obj_controller.penitent_turnly=0; - } - - if (obj_ini.race[marine_co[i], marine_id[i]] == 1) { - var _birthday = obj_ini.age[marine_co[i], marine_id[i]]; - var _current_year = (obj_controller.millenium * 1000) + obj_controller.year; - var _seed_harvestable = 0; - var _seed_lost = 0; - - if (_birthday <= (_current_year - 10) && obj_ini.zygote == 0) { - _seed_lost++; - if (irandom_range(1, 10) > 1) { - _seed_harvestable++; - } - } - if (_birthday <= (_current_year - 5)) { - _seed_lost++; - if (irandom_range(1, 10) > 1) { - _seed_harvestable++; - } - } - - obj_ncombat.seed_harvestable += _seed_harvestable; - obj_ncombat.seed_lost += _seed_lost; - } - - var last=0; - - var _unit_role = _unit.role(); - if (!struct_exists(obj_ncombat.units_lost_counts, _unit_role)) { - obj_ncombat.units_lost_counts[$ _unit_role] = 1; - } else { - obj_ncombat.units_lost_counts[$ _unit_role]++; - } - - // Determine which companies to crunch - obj_ncombat.crunch[marine_co[i]]=1; - destroy=1; } - if (marine_armour[i]="") and (marine_wep1[i]="") and (marine_wep2[i]="") and (marine_gear[i]="") and (marine_mobi[i]="") and (marine_type[i]!="") then destroy=2; - - if (destroy>0) and (marine_type[i]!="") and (ally[i]=false){// 135 - var wah=0,artif=false; - repeat(5){ - wah+=1; - artif=false; - var eqp_chance, dece; - eqp_chance=50; - dece=floor(random(100))+1; - if (obj_ncombat.defending=false) then eqp_chance-=10; - if (obj_ncombat.dropping=1) then eqp_chance-=20; - if (obj_ncombat.dropping=1) and (obj_ncombat.defeat=1) then dece=9999; - if (marine_dead[i]=2) or (destroy=2) then dece=9999; - if (obj_ini.race[marine_co[i],marine_id[i]]!=1) then dece=9999; - - // if (wah=1){show_message(obj_ini.armour[marine_co[i],marine_id[i]]);} - arti=!is_string(_unit.armour(true)); - var arm_data = _unit.get_armour_data(); - if (wah=1) and (is_struct(arm_data)){ - if (arm_data.has_tag("terminator")) then eqp_chance+=30; - if (string_count("&",marine_armour[i])>0){ - eqp_chance=90; - artif=true; - } - if (dece>eqp_chance){ - var last=0;o=0; - repeat(50){ - if (last=0){ - o+=1;artif=false; - if (obj_ncombat.post_equipment_lost[o]=marine_armour[i]){ - last=1; - obj_ncombat.post_equipments_lost[o]+=1; - artif=true; - } - if (obj_ncombat.post_equipment_lost[o]="") and (last=0){last=o; - obj_ncombat.post_equipment_lost[o]=marine_armour[i]; - obj_ncombat.post_equipments_lost[o]=1; - artif=true; - } - if (artif=true) then obj_ncombat.post_equipment_lost[o]=clean_tags(obj_ncombat.post_equipment_lost[o]); - - obj_ini.armour[marine_co[i],marine_id[i]]=""; - // wep2[0,i]="";armour[0,i]="";gear[0,i]="";mobi[0,i]=""; - } - } - } - if (dece<=eqp_chance) then scr_add_item(marine_armour[i],1); - } - if (wah=2) and (obj_ini.wep1[marine_co[i],marine_id[i]]!=""){ - if (string_count("&",marine_wep1[i])>0){eqp_chance=90;artif=true;} - if (marine_wep1[i]="Company Standard") then eqp_chance=99; - if (marine_dead[i]=2) or (destroy=2) then dece=9999; - if (obj_ini.race[marine_co[i],marine_id[i]]!=1) then dece=9999; - - if (dece>eqp_chance){ - var last,o;last=0;o=0; - repeat(50){ - if (last=0){ - o+=1;artif=false; - - // show_message(string(o)+"]"+string(obj_ncombat.post_equipment_lost[o])+" "+string(i)+"]"+string(marine_wep1[i])); - - if (string(obj_ncombat.post_equipment_lost[o])=marine_wep1[i]){last=1;obj_ncombat.post_equipments_lost[o]+=1;artif=true;} - if (string(obj_ncombat.post_equipment_lost[o])="") and (last=0){last=o;obj_ncombat.post_equipment_lost[o]=marine_wep1[i];obj_ncombat.post_equipments_lost[o]=1;artif=true;} - if (artif=true) then obj_ncombat.post_equipment_lost[o]=clean_tags(obj_ncombat.post_equipment_lost[o]); - obj_ini.wep1[marine_co[i],marine_id[i]]=""; - // wep2[0,i]="";armour[0,i]="";gear[0,i]="";mobi[0,i]=""; - } - } - } - if (dece<=eqp_chance) then scr_add_item(marine_wep1[i],1); - } - if (wah=3) and (obj_ini.wep2[marine_co[i],marine_id[i]]!=""){ - if (string_count("&",marine_wep2[i])>0){eqp_chance=90;artif=true;} - if (marine_wep2[i]="Company Standard") then eqp_chance=99; - if (marine_dead[i]=2) or (destroy=2) then dece=9999; - if (obj_ini.race[marine_co[i],marine_id[i]]!=1) then dece=9999; - - if (dece>eqp_chance){ - var last,o;last=0;o=0; - repeat(50){ - if (last=0){ - o+=1;artif=false; - if (string(obj_ncombat.post_equipment_lost[o])=marine_wep2[i]){last=1;obj_ncombat.post_equipments_lost[o]+=1;artif=true;} - if (string(obj_ncombat.post_equipment_lost[o])="") and (last=0){last=o;obj_ncombat.post_equipment_lost[o]=marine_wep2[i];obj_ncombat.post_equipments_lost[o]=1;artif=true;} - if (artif=true) then obj_ncombat.post_equipment_lost[o]=clean_tags(obj_ncombat.post_equipment_lost[o]); - obj_ini.wep2[marine_co[i],marine_id[i]]=""; - // wep2[0,i]="";armour[0,i]="";gear[0,i]="";mobi[0,i]=""; - } - } - } - if (dece<=eqp_chance) then scr_add_item(marine_wep2[i],1); - } - if (wah=4) and (obj_ini.gear[marine_co[i],marine_id[i]]!=""){ - if (string_count("&",marine_gear[i])>0){eqp_chance=90;artif=true;} - if (marine_dead[i]=2) or (destroy=2) then dece=9999; - if (obj_ini.race[marine_co[i],marine_id[i]]!=1) then dece=9999; - - if (obj_ini.gear[marine_co[i],marine_id[i]]="Exterminatus"){ - if (obj_ncombat.defeat=0){ - dece=0; - if (obj_ncombat.dropping!=0) then obj_ncombat.exterminatus+=1; - } - if (obj_ncombat.defeat!=0) then dece=9999; - } - - if (dece>eqp_chance){ - var last,o;last=0;o=0; - repeat(50){ - if (last=0){ - o+=1;artif=false; - if (obj_ncombat.post_equipment_lost[o]=marine_gear[i]){last=1;obj_ncombat.post_equipments_lost[o]+=1;artif=true;} - if (obj_ncombat.post_equipment_lost[o]="") and (last=0){last=o;obj_ncombat.post_equipment_lost[o]=marine_gear[i];obj_ncombat.post_equipments_lost[o]=1;artif=true;} - if (artif=true) then obj_ncombat.post_equipment_lost[o]=clean_tags(obj_ncombat.post_equipment_lost[o]); - obj_ini.gear[marine_co[i],marine_id[i]]=""; - // wep2[0,i]="";armour[0,i]="";gear[0,i]="";mobi[0,i]=""; - } - } - } - if (dece<=eqp_chance) then scr_add_item(marine_gear[i],1); - } - if (wah=5) and (obj_ini.mobi[marine_co[i],marine_id[i]]!=""){ - if (string_count("&",marine_mobi[i])>0){ - eqp_chance=90; - artif=true; - } - if (marine_dead[i]=2) or (destroy=2) then dece=9999; - if (obj_ini.race[marine_co[i],marine_id[i]]!=1) then dece=9999; - - if (dece>eqp_chance){ - var last,o;last=0;o=0; - repeat(50){ - if (last=0){ - o+=1; - artif=false; - if (obj_ncombat.post_equipment_lost[o]=marine_mobi[i]){ - last=1; - obj_ncombat.post_equipments_lost[o]+=1; - artif=true; - } - if (obj_ncombat.post_equipment_lost[o]="") and (last=0){last=o;obj_ncombat.post_equipment_lost[o]=marine_mobi[i];obj_ncombat.post_equipments_lost[o]=1;artif=true;} - if (artif=true) then obj_ncombat.post_equipment_lost[o]=clean_tags(obj_ncombat.post_equipment_lost[o]); - obj_ini.mobi[marine_co[i],marine_id[i]]=""; - // wep2[0,i]="";armour[0,i]="";gear[0,i]="";mobi[0,i]=""; - } - } - } - if (dece<=eqp_chance) then scr_add_item(marine_mobi[i],1); - } - } - - + var destroy=0; + if ((marine_dead[i] || obj_ncombat.defeat!=0) && !ally[i]){ + after_combat_recover_marine_gene_seed(_unit); + after_combat_dead_marine_equipment_recovered(_unit); } } @@ -454,13 +259,9 @@ function after_battle_part1() { // Techmarines for saving vehicles; if (unit.IsSpecialist(SPECIALISTS_TECHS, true)) { skill_level = unit.technology / 10; - if (marine_mobi[i]=="Servo-arm") { - skill_level *= 1.5; - } else if (marine_mobi[i]=="Servo-harness") { - skill_level *= 2; - } - skill_level += random(unit.luck / 2); - obj_ncombat.vehicle_recovery_score += skill_level; + skill_level += random(unit.luck / 2); + skill_level += unit.gear_special_value("combi_tool"); + obj_ncombat.vehicle_recovery_score += round(skill_level); obj_ncombat.techmarines_alive++; } } @@ -468,3 +269,148 @@ function after_battle_part1() { } } + +function after_combat_recover_marine_gene_seed(unit){ + var comm=false; + if (unit.IsSpecialist(SPECIALISTS_STANDARD,true)){ + obj_ncombat.final_command_deaths+=1; + var recent=true; + if (is_specialist(unit.role, SPECIALISTS_TRAINEES)){ + recent=false + } else if (array_contains([string("Venerable {0}",obj_ini.role[100][6]), "Codiciery", "Lexicanum"], unit.role())){ + recent=false + } + if (recent=true) then scr_recent($"death_{unit.name_role()}"); + } else { + obj_ncombat.final_marine_deaths+=1; + } + // obj_ncombat.final_marine_deaths+=1; + + // show_message("ded; increase final deaths"); + + if (obj_controller.blood_debt=1){ + if (unit.role()==obj_ini.role[100][eROLE.Scout]){ + obj_controller.penitent_current+=2 + } else {obj_controller.penitent_current+=4;} + obj_controller.penitent_turn=0; + obj_controller.penitent_turnly=0; + } + + if (unit.base_group == "astartes") { + var _birthday = unit.age(); + var _current_year = (obj_controller.millenium * 1000) + obj_controller.year; + var _seed_harvestable = 0; + var _seed_lost = 0; + + if (_birthday <= (_current_year - 10) && unit.gene_seed_mutations.zygote == 0) { + _seed_lost++; + if (irandom_range(1, 10) > 1) { + _seed_harvestable++; + } + } + if (_birthday <= (_current_year - 5)) { + _seed_lost++; + if (irandom_range(1, 10) > 1) { + _seed_harvestable++; + } + } + + obj_ncombat.seed_harvestable += _seed_harvestable; + obj_ncombat.seed_lost += _seed_lost; + } + + var last=0; + + var _unit_role = unit.role(); + if (!struct_exists(obj_ncombat.units_lost_counts, _unit_role)) { + obj_ncombat.units_lost_counts[$ _unit_role] = 1; + } else { + obj_ncombat.units_lost_counts[$ _unit_role]++; + } + + // Determine which companies to crunch + obj_ncombat.crunch[unit.company]=1; +} + +function after_combat_dead_marine_equipment_recovered(unit){ + var _equipment = unit.unit_equipment_data(); + + var _equip_slots = struct_get_names(_equipment); + + var basic_recover_chance = 40; + + if (scr_has_adv("Scavangers")){ + basic_recover_chance += 10; + } + if (!obj_ncombat.defending){ + basic_recover_chance-=10; + } + if (obj_ncombat.dropping=1){ + if (scr_has_adv("Lightning Warriors")){ + basic_recover_chance-=10; + } else { + basic_recover_chance-=25; + } + + } + + for (var i=0; i _specific_type_recovery){ + _recover = false; + if (!_item.is_artifact){ + obj_ncombat.post_equipment_lost.add_item(_item.name, _item.quality, unit.uid); + } + } else { + if (!_item.is_artifact){ + obj_ncombat.post_equipment_recovered.add_item(_item.name, _item.quality, unit.uid); + } + } + + switch(_slot){ + case "armour_data": + unit.update_armour("", false,_recover); + case "weapon_one_data": + unit.weapon_one("", false,_recover); + case "weapon_two_data": + unit.update_weapon_two("", false,_recover); + case "gear_data": + unit.update_gear("", false,_recover); + case "mobility_item_data": + unit.update_mobility_item("", false,_recover); + } + } +} diff --git a/scripts/scr_alert/scr_alert.gml b/scripts/scr_alert/scr_alert.gml index bf5fad366e..26faa10d9e 100644 --- a/scripts/scr_alert/scr_alert.gml +++ b/scripts/scr_alert/scr_alert.gml @@ -1,6 +1,6 @@ function set_alert_draw_colour(alert_colour) { - static default_colour = 38144; - static colour_map = {"red": c_red, "yellow": 57586, "purple": c_purple, "green": 38144}; //TODO set constants for colours + static default_colour = CM_GREEN_COLOR; + static colour_map = {"red": c_red, "yellow": 57586, "purple": c_purple, "green": CM_GREEN_COLOR}; //TODO set constants for colours if (alert_colour != "") { if (struct_exists(colour_map, alert_colour)) { draw_set_color(colour_map[$ alert_colour]); diff --git a/scripts/scr_ancient_ruins/scr_ancient_ruins.gml b/scripts/scr_ancient_ruins/scr_ancient_ruins.gml index 9d379214ca..543821a348 100644 --- a/scripts/scr_ancient_ruins/scr_ancient_ruins.gml +++ b/scripts/scr_ancient_ruins/scr_ancient_ruins.gml @@ -94,32 +94,40 @@ function scr_ruins_player_forces_defeated(){ //revcover equipment of fallen marines from ruins function scr_ruins_recover_from_dead(){ - var pop=instance_create(0,0,obj_popup);var route = random(5); + var pop=instance_create(0,0,obj_popup); + var route = random(5); pop.image="ancient_ruins"; pop.title="Ancient Ruins: Recovery"; if (route < 4){ - var weapon_text = "" - - //calculate equipment degredation - var equipment_deg = floor((obj_controller.turn - failiure_turn)/7) + var _weapon_text = ""; + var some_recoverable = false; - if (array_length(recoverables)>0){ - for (var item =0;item 0){ - some_recoverable = true; - scr_add_item(i_set[0],i_set[1]) - weapon_text += $", {i_set[0]} x {i_set[1]}" - } - } - if (some_recoverable == true){ - pop.text=$"Your strike team locates the site where the previous expedition made their last stand. They airlift whatever equipment and vehicles remain, disposing of anything beyond saving;.{ weapon_text}is repaired and restored to the armamentarium"; - }else{ - pop.text=$"our strike team locates the site where the previous expedition made their last stand. They cannot find any intact equipment, and are forced to burn the derelicts to prevent capture; no equipment is added to the armamentarium" + //calculate equipment degredation + var equipment_deg = (obj_controller.turn - failiure_turn)/ 120; + if (equipment_deg < 1 && array_length(recoverables)){ + var _recovered = new EquipmentTracker(); + var _recover_picks = ceil((1 - equipment_deg) * array_length(recoverables)); + recoverables = array_shuffle(recoverables); + if (_recover_picks < array_length(recoverables) ){ + array_delete(recoverables, _recover_picks, array_length(recoverables) - _recover_picks) } + _recovered.items = recoverables; + _recovered.collate_types(); + _weapon_text = _recovered.item_description_string(); + + some_recoverable = array_length(recoverables) > 0; + } else { + some_recoverable = false; + + } + + + if (some_recoverable){ + pop.text=$"Your strike team locates the site where the previous expedition made their last stand. They airlift whatever equipment and vehicles remain, disposing of anything beyond saving;. {_weapon_text} is repaired and restored to the armamentarium"; + }else{ + pop.text=$"our strike team locates the site where the previous expedition made their last stand. They cannot find any intact equipment, and are forced to burn the derelicts to prevent capture; no equipment is added to the armamentarium" } - + //calculate geneseed degredation if (obj_controller.turn - failiure_turn > 2){ recoverable_gene_seed -= obj_controller.turn - failiure_turn @@ -205,37 +213,169 @@ function scr_explore_ruins() { pip.text += ". What is thy will?"; } - pip.option1 = "Explore the ruins."; - pip.option2 = "Do nothing."; - pip.option3 = "Return your marines to the ship."; + pip.add_option([ + { + str1: "Explore the ruins.", + choice_func:ruins_exploration_main_sequence + }, + { + str1:"Do nothing.", + choice_func : function(){ + // Nothing + scr_toggle_manage(); + with (obj_ground_mission) { + instance_destroy(); + } + instance_destroy(); + exit; + }, + }, + { + str1 : "Return your marines to the ship.", + choice_func : function(){ + // Return to ship, exit + scr_return_ship(obj_ini.ship[obj_ground_mission.ship_id], obj_ground_mission, obj_ground_mission.num); + var man_size, ship_id, comp, plan, i; + ship_id = 0; + man_size = 0; + comp = 0; + plan = 0; + ship_id = obj_ground_mission.ship_id; + obj_controller.menu = 0; + obj_controller.managing = 0; + obj_controller.cooldown = 10; + with (obj_ground_mission) { + instance_destroy(); + } + instance_destroy(); + exit; + } + } + ] + ); pip.image = "ancient_ruins"; } catch (_exception) { handle_exception(_exception); } } -function scr_check_for_ruins_exploration(select_planet, star){ - var _planet_features = star.p_feature[select_planet] - var _ruins_list = search_planet_features( _planet_features, P_features.Ancient_Ruins) + +///@mixin obj_popup +function ruins_exploration_main_sequence(){ + // Begin + var _ruins = obj_ground_mission.explore_feature; + var ruins_battle = 0, ruins_fact = 0, ruins_disp = 0, ruins_reward = 0, dice, battle_threat = 0; + + _ruins.determine_race(); + + dice = roll_dice_chapter(1, 100, "high"); + ruins_battle = dice <= 50; + + // ruins_battle=1; + + if (ruins_battle == 1) { + dice = roll_dice_chapter(1, 100, "low"); + + if (dice >= 0 && dice <= 60) { + battle_threat = 1; + } else if (dice > 60 && dice <= 90) { + battle_threat = 2; + } else if (dice < 99) { + battle_threat = 3; + } else { + battle_threat = 4; + } + + switch (_ruins.ruins_race) { + case eFACTION.Player: + case eFACTION.Imperium: + case eFACTION.Chaos: + ruins_battle = choose(10, 10, 10, 10, 11, 11, 12); + break; + case eFACTION.Ecclesiarchy: + ruins_battle = 10; + break; + case eFACTION.Eldar: + ruins_battle = choose(6, 6, 10, 10, 10, 12); + break; + default: + ruins_battle = choose(6, 10, 12); + break; + } + + obj_ground_mission.ruins_race = _ruins.ruins_race; + obj_ground_mission.ruins_battle = ruins_battle; + obj_ground_mission.battle_threat = battle_threat; + + reset_popup_options(); + text = "Your marines descended into the ancient ruins, mapping them out as they go. They quickly determine the ruins were once "; + switch (_ruins.ruins_race) { + case eFACTION.Player: + text += "a Space Marine fortification from earlier times."; + break; + case eFACTION.Imperium: + text += "golden-age Imperial ruins, lost to time."; + break; + case eFACTION.Ecclesiarchy: + text += "a magnificent temple of the Imperial Cult."; + break; + case eFACTION.Eldar: + text += "Eldar colonization structures from an unknown time."; + break; + case eFACTION.Chaos: + text += "golden-age Imperial ruins, since decorated with spikes and bones."; + break; + } + + if (_ruins.failed_exploration == 1) { + text += $"{global.chapter_name} see the scarring in the walls and round impacts where your brothers died to clense this place of it's foul inhabitants"; + } + text += " Unfortunantly, it's too late before your Battle Brothers discern the ruins are still inhabited. Shapes begin to descend upon them from all directions, masked in the shadows."; + + cooldown = 15; + add_option({ + str1:"To Battle", + choice_func : function(){ + instance_deactivate_all(true); + instance_activate_object(obj_ground_mission); + instance_activate_object(obj_popup); + var _explore_feature = obj_ground_mission.explore_feature; + _explore_feature.suprise_attack(); + instance_destroy(self.id); + instance_destroy(); + } + }) + exit; + } else { + var obj = obj_ground_mission.obj; + instance_activate_object(obj_star); + scr_ruins_reward(star_by_name(obj_ground_mission.battle_loc), obj_ground_mission.num, obj_ground_mission.explore_feature); + instance_destroy(); + exit; + } +} + + +/// @mixin PlanetData +function scr_check_for_ruins_exploration(){ + var _ruins_list = get_features(P_features.Ancient_Ruins); var _explore_ruins=0; if (array_length(_ruins_list) > 0){ for (var _ruin = 0; _ruin < array_length(_ruins_list); _ruin++){ - var _specific_ruins = _ruins_list[_ruin]; - var _cur_ruins = _planet_features[_specific_ruins]; + var _cur_ruins = _ruins_list[_ruin]; if ( _cur_ruins.exploration_complete == false){ - _explore_ruins = _planet_features[_specific_ruins]; + _explore_ruins = _cur_ruins; break; }else{ _explore_ruins=0; } } if (_explore_ruins!=0){ - _explore_ruins.star = star; - _explore_ruins.planet = select_planet; + _explore_ruins.star = system; + _explore_ruins.planet = planet; _explore_ruins.explore(); } } - } @@ -249,7 +389,7 @@ function scr_ruins_combat_end() { var planet = obj_ground_mission.num; var _battle_threat = obj_ground_mission.battle_threat; if (obj_ground_mission.defeat == 0){ - var dice=roll_dice(1, 100, "low"); + var dice=roll_dice_chapter(1, 100, "low"); if (dice < (_battle_threat*10)){ if (ruins_race == eFACTION.Ecclesiarchy){ @@ -290,7 +430,7 @@ function scr_ruins_combat_end() { scr_ruins_reward(_star,planet,self); } else if (obj_ground_mission.defeat == 1) { - var dice=roll_dice(1, 100, "low"); + var dice=roll_dice_chapter(1, 100, "low"); if (dice < (_battle_threat*10)){ if (ruins_race == eFACTION.Ecclesiarchy) { @@ -339,25 +479,18 @@ function scr_ruins_combat_end() { pop.text+="Now that they have been discovered, the Eldar seem to have vanished without a trace. Scans reveal nothing."; } forces_defeated(); - var equip_lost = obj_ground_mission.post_equipment_lost; - var equip_count_lost = obj_ground_mission.post_equipments_lost; - if (equip_lost[1]!=""){ - for (var i = 0; i < array_length(equip_lost); i++) { // glorified repeat loop, fix later - if (equip_lost[i]!="") and (equip_count_lost[i]>0) { - var _new_equip = floor(equip_count_lost[i]/2); - if (_new_equip == 0) { - _new_equip++; - } - array_push(recoverables, [equip_lost[i],_new_equip]) - } - } - recoverable_gene_seed = obj_ground_mission.recoverable_gene_seed; - if (recoverable_gene_seed > 1) { - recoverable_gene_seed = floor(recoverable_gene_seed/2); - } - if (array_length(recoverables) > 0) { - unrecovered_items=true; - } + var _equip_lost = obj_ground_mission.post_equipment_lost; + + recoverable_gene_seed = obj_ground_mission.recoverable_gene_seed; + + if (array_length(_equip_lost.items)){ + _equip_lost.items = array_shuffle(_equip_lost.items); + array_delete(_equip_lost.items, 0, floor(array_length(_equip_lost.items)/2)); + } + + if (array_length(_equip_lost.items) > 0) { + recoverables = _equip_lost.items; + unrecovered_items=true; } } } diff --git a/scripts/scr_apothecary_ground/scr_apothecary_ground.gml b/scripts/scr_apothecary_ground/scr_apothecary_ground.gml index 1b6b871564..68d035ac5f 100644 --- a/scripts/scr_apothecary_ground/scr_apothecary_ground.gml +++ b/scripts/scr_apothecary_ground/scr_apothecary_ground.gml @@ -1,4 +1,3 @@ - enum eSystemLoc { orbit, planet1, @@ -14,65 +13,73 @@ function calculate_full_chapter_spread(){ var _apoth_spread = {}; var _unit_spread = {}; for(var company=0;company<11;company++){ - var _company_length = (array_length(obj_ini.name[company])); + + var _marine_len = array_length(obj_ini.name[company]); + var _veh_len = array_length(obj_ini.veh_hp[company]); + var _company_length = max(_marine_len, _veh_len); + for (var v=0; v < _company_length; v++) { key_val = ""; - if (obj_ini.name[company][v]=="") then continue; - _unit = fetch_unit([company, v]); - _mar_loc = _unit.marine_location(); - if (_unit.base_group=="astartes"){ - if (_unit.IsSpecialist()){ - obj_controller.command++; - } else { - obj_controller.marines++; - } - } - tech_points_used += _unit.equipment_maintenance_burden(); - _is_tech = (_unit.IsSpecialist(SPECIALISTS_TECHS)); - if (_is_tech){ - add_forge_points_to_stack(_unit); - } - is_healer = (((_unit.IsSpecialist(SPECIALISTS_APOTHECARIES,true) && _unit.gear()=="Narthecium") || (_unit.role()=="Sister Hospitaler")) && _unit.hp()>=10); - if (is_healer){ - add_apoth_points_to_stack(_unit); - } - if (_mar_loc[2]!="Warp" && _mar_loc[2]!="Lost"){ - if (_mar_loc[0]=location_types.planet){ - array_slot = _mar_loc[1]; - } else if (_mar_loc[0] == location_types.ship){ - array_slot=eSystemLoc.orbit; - } - key_val = _mar_loc[2]; - } else if (_mar_loc[0] == location_types.ship){ - if instance_exists(obj_p_fleet){ - with (obj_p_fleet){ - if (array_contains(capital_num, _mar_loc[1]) || - array_contains(frigate_num, _mar_loc[1])|| - array_contains(escort_num, _mar_loc[1]) - ){ - key_val=$"{id}"; - array_slot=eSystemLoc.orbit; - break; - } - } - } - } - if (key_val!=""){ - if (! struct_exists(_unit_spread, key_val)){ - _unit_spread[$key_val] = [[],[],[],[],[]]; - _tech_spread[$key_val] = [[],[],[],[],[]]; - _apoth_spread[$key_val] = [[],[],[],[],[]]; - } - array_push(_unit_spread[$key_val][array_slot] ,_unit); - if (_is_tech){ - array_push(_tech_spread[$key_val][array_slot] ,_unit); + if (v < _marine_len){ + if (obj_ini.name[company][v]!=""){ + _unit = fetch_unit([company, v]); + _mar_loc = _unit.marine_location(); + if (_unit.base_group=="astartes"){ + if (_unit.IsSpecialist()){ + obj_controller.command++; + } else { + obj_controller.marines++; + } + } + tech_points_used += _unit.equipment_maintenance_burden(); + _is_tech = (_unit.IsSpecialist(SPECIALISTS_TECHS)); + if (_is_tech){ + add_forge_points_to_stack(_unit); + } + is_healer = (((_unit.IsSpecialist(SPECIALISTS_APOTHECARIES,true) && _unit.gear()=="Narthecium") || (_unit.role()=="Sister Hospitaler")) && _unit.hp()>=10); + if (is_healer){ + add_apoth_points_to_stack(_unit); + } + if (_mar_loc[2]!="Warp" && _mar_loc[2]!="Lost"){ + if (_mar_loc[0]=location_types.planet){ + array_slot = _mar_loc[1]; + } else if (_mar_loc[0] == location_types.ship){ + array_slot=eSystemLoc.orbit; + } + key_val = _mar_loc[2]; + } else if (_mar_loc[0] == location_types.ship){ + if instance_exists(obj_p_fleet){ + with (obj_p_fleet){ + if (array_contains(capital_num, _mar_loc[1]) || + array_contains(frigate_num, _mar_loc[1])|| + array_contains(escort_num, _mar_loc[1]) + ){ + key_val=$"{id}"; + array_slot=eSystemLoc.orbit; + break; + } + } + } + } + if (key_val!=""){ + if (! struct_exists(_unit_spread, key_val)){ + _unit_spread[$key_val] = [[],[],[],[],[]]; + _tech_spread[$key_val] = [[],[],[],[],[]]; + _apoth_spread[$key_val] = [[],[],[],[],[]]; + } + array_push(_unit_spread[$key_val][array_slot] ,_unit); + if (_is_tech){ + array_push(_tech_spread[$key_val][array_slot] ,_unit); + } + if (is_healer) { + array_push(_apoth_spread[$key_val][array_slot] ,_unit); + } + } } - if (is_healer) { - array_push(_apoth_spread[$key_val][array_slot] ,_unit); - } } + key_val=""; - if (v0){ + if (company>0 && v < _veh_len){ if (obj_ini.veh_race[company][v]!=0){ if(obj_ini.veh_lid[company][v]>-1){ veh_location = obj_ini.veh_lid[company][v]; @@ -233,7 +240,7 @@ function apothecary_simple(){ } else if (is_struct(_unit)){ _loc_forge_points -= _unit.equipment_maintenance_burden(); if (_unit.hp() < _unit.max_health()){ - if (_unit.armour() != "Dreadnought"){ + if (!_unit.is_dreadnought()){ if (_unit.hp()>0){ if (_loc_heal_points >0){ if (turn_end){ @@ -296,6 +303,3 @@ function apothecary_simple(){ } } } - - - diff --git a/scripts/scr_array_functions/scr_array_functions.gml b/scripts/scr_array_functions/scr_array_functions.gml index 688a5b848b..a922b336ea 100644 --- a/scripts/scr_array_functions/scr_array_functions.gml +++ b/scripts/scr_array_functions/scr_array_functions.gml @@ -3,10 +3,10 @@ function array_iter_length(choice_array, offset, length){ if (length == 0){ if (offset==0){ - length = array_length(choice_array); + length = array_length(choice_array)-1; } else if (offset){ - length = array_length(choice_array) - offset; + length = array_length(choice_array) - offset - 1; } else { length = offset*-1; } @@ -68,6 +68,22 @@ function array_delete_value(choice_array, value){ array_delete(choice_array, i, 1); } } + + return choice_array; +} + +function array_delete_values(choice_array, values){ + for (var i = array_length(choice_array) - 1; i >= 0; i--) { + for (var s=0;s _max){ + _max = _arr_len; + } + } + return _max; +} diff --git a/scripts/scr_array_functions/scr_array_functions.yy b/scripts/scr_array_functions/scr_array_functions.yy index f6362ecd64..a0b99b336d 100644 --- a/scripts/scr_array_functions/scr_array_functions.yy +++ b/scripts/scr_array_functions/scr_array_functions.yy @@ -5,8 +5,8 @@ "isDnD":false, "name":"scr_array_functions", "parent":{ - "name":"Scripts", - "path":"folders/Scripts.yy", + "name":"Sys", + "path":"folders/Scripts/Sys.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/scr_audience/scr_audience.gml b/scripts/scr_audience/scr_audience.gml index 0e4ad48824..e8b455c4cc 100644 --- a/scripts/scr_audience/scr_audience.gml +++ b/scripts/scr_audience/scr_audience.gml @@ -1,21 +1,31 @@ -function scr_audience(argument0, argument1, argument2, argument3, argument4, argument5) { +function scr_audience(faction_enum, topic, new_disposition = 0, new_status = "", turns_ignored = 0, new_known_value = 0, audience_data = {}) { - // argument0: faction - // argument1: topic - // argument2: new disposition - // argument3: new status - // argument4: turns ignored - // argument5: new known + var _audience_instance = instance_exists(obj_turn_end) ? obj_turn_end : obj_controller; - var witch;witch=obj_controller; - if (instance_exists(obj_turn_end)) then witch=obj_turn_end; - - witch.audiences+=1;witch.audien[witch.audiences]=argument0; - witch.audien_topic[witch.audiences]=argument1; - if (argument2!=0) then obj_controller.disposition[argument0]+=argument2; - if (argument3!="") then obj_controller.faction_status[argument0]=argument3; - if (argument4!=0) then obj_controller.turns_ignored[argument0]+=argument4; - if (argument5!=0) then obj_controller.known[argument0]+=argument5; + with (_audience_instance){ + audiences+=1; + array_push(audience_stack,{ + faction : faction_enum, + topic : topic, + audience_data : audience_data + }); + } + obj_controller.disposition[faction_enum]+=new_disposition; + if (new_status!="") then obj_controller.faction_status[faction_enum]=new_status; + if (turns_ignored!=0) then obj_controller.turns_ignored[faction_enum]+=turns_ignored; + if (new_known_value!=0) then obj_controller.known[faction_enum]+=new_known_value; } + + +function decare_war_on_imperium_audiences(){ + var _topic = obj_controller.gene_xeno>99995 ? "gene_xeno" : "declare_war"; + scr_audience(eFACTION.Inquisition, _topic, -50, "War", 9999, 4); + + scr_audience(eFACTION.Imperium, "declare_war", -40, "War", 9999, 2); + + scr_audience(eFACTION.Mechanicus, "declare_war", -30, "War", 9999, 2); + + scr_audience(eFACTION.Ecclesiarchy, "declare_war", -40, "War", 9999, 2); +} \ No newline at end of file diff --git a/scripts/scr_battle_roster/scr_battle_roster.gml b/scripts/scr_battle_roster/scr_battle_roster.gml deleted file mode 100644 index 84a04f220b..0000000000 --- a/scripts/scr_battle_roster/scr_battle_roster.gml +++ /dev/null @@ -1,142 +0,0 @@ -function scr_battle_roster(required_location, _target_location, _is_planet, overide_list) { - - // Determines who all will be present for the battle - - // argument 0 : planet or ship name - // argument 1 : world number (wid) - // argument 2 : is it a planet? boolean - - //-------------------------------------------------------------------------------------------------------------------- - // Global objects used. - //-------------------------------------------------------------------------------------------------------------------- - var func = function(required_location, _target_location, _is_planet){ - new_combat = obj_ncombat; - //???=obj_drop_select; - //???=obj_controller - //-------------------------------------------------------------------------------------------------------------------- - - // show_message("Container:"+string(_battle_loci)+", number:"+string(_loci_specific)+", planet?:"+string(_is_planet)); - - var stop, okay , unit, unit_location, _u_role,column_decided,squad; - stop = 0; - okay = 0; - var _spyrer_mission = string_count("spyrer", new_combat.battle_special); - - - // Formation here - setup_battle_formations(); - - var v = 0; - var _meeting = false; - - instance_activate_object(obj_pnunit); - - //For each company and the HQ - for (var company=0;company<=10;company++){ - if (new_combat.man_limit_reached) { - break; - } - for (v=0;v 0) or(new_combat.battle_special == "space_hulk") or(string_count("chaos_meeting", new_combat.battle_special) > 0); - if (_not_dread_advised) { - var _u_armour = unit.get_armour_data(); - if (is_struct(_u_armour)){ - if (_u_armour.has_tag("dreadnought")){ - okay = -1; - } - } - } - if (_spyrer_mission > 0) { - if (okay == 1) and(array_length(new_combat.unit_struct)) then okay = -1; - } - - //Normal and other battle cases checks go here - else if (okay >= 0) { - if (instance_exists(obj_ground_mission)) { //Exploring ruins ambush case - if (obj_ini.loc[company][v] == required_location) and(unit.planet_location == _target_location) { - okay = 1; - } else { - continue; - } - } else if (!instance_exists(obj_drop_select)) { // Only when attacked, normal battle - if (_is_planet) and(obj_ini.loc[company][v] == required_location) and(unit.planet_location == _target_location) then okay = 1; - else if (!_is_planet) and(unit.ship_location == _target_location) then okay = 1; - - if (instance_exists(obj_temp_meeting)) { - _meeting = true; - if (company == 0) and(v <= obj_temp_meeting.dudes) and(obj_temp_meeting.present[v] == 1) then okay = 1; - else if (company > 0) or(v > obj_temp_meeting.dudes) then okay = 0; - } - } else if (instance_exists(obj_drop_select)) { // When attacking, normal battle - //If not fighting (obj_drop_select pre-check), we skip the unit - - if (obj_drop_select.attack == 1) { - if (_is_planet) and(obj_ini.loc[company][v] == required_location) and(unit.planet_location == _target_location) then okay = 1; - else if (!_is_planet) and(unit.ship_location == _target_location) then okay = 1; - } else if (obj_drop_select.attack != 1) { - //Related to defensive battles (¿?). Without the above check, it duplicates marines on offensive ones. - if (obj_drop_select.fighting[company][v] == 1) and(unit.ship_location == _target_location) then okay = 1; - } - } - } - - // Start adding unit to battle - if (okay >= 1) { - - add_unit_to_battle(unit, _meeting); - // Vehicle checks - } - } - for (v=0;v 0) then vokay = 1; - - if (instance_exists(obj_drop_select)) { - if (obj_drop_select.attack = 0) then vokay = 0; - } - - - // if (obj_ncombat.veh_fighting[company,v]=1) then vokay=2;// Fuck on me, AI - - if (vokay >= 1) and(new_combat.dropping = 0) { - add_vehicle_to_battle(company, v) - } - } - - } - } - } - - try_and_report_loop("battle roster collection",func, false,[required_location, _target_location, _is_planet]); -} \ No newline at end of file diff --git a/scripts/scr_bionics_count/scr_bionics_count.gml b/scripts/scr_bionics_count/scr_bionics_count.gml index 89eff6d1ee..14ecf68777 100644 --- a/scripts/scr_bionics_count/scr_bionics_count.gml +++ b/scripts/scr_bionics_count/scr_bionics_count.gml @@ -13,10 +13,11 @@ function scr_bionics_count(argument0, argument1, argument2, argument3) { repeat(11){i=0; repeat(300){i+=1; + var _unit = fetch_unit([com, i]); if (argument0="star"){ - if (obj_ini.race[com,i]=1) and (obj_ini.loc[com][i]=argument1) and (obj_ini.TTRPG[com][i].planet_location=argument2){ - if (argument3="total") then count+=obj_ini.TTRPG[com][i].bionics; - if (argument3="number") and (obj_ini.TTRPG[com][i].bionics>0) then count+=1; + if (obj_ini.race[com,i]=1) and (_unit.location_string=argument1) and (_unit.planet_location=argument2){ + if (argument3="total") then count+=_unit.bionics; + if (argument3="number") and (_unit.bionics>0) then count+=1; } } } diff --git a/scripts/scr_bomb_world/scr_bomb_world.gml b/scripts/scr_bomb_world/scr_bomb_world.gml index b6576a4958..70662fab14 100644 --- a/scripts/scr_bomb_world/scr_bomb_world.gml +++ b/scripts/scr_bomb_world/scr_bomb_world.gml @@ -1,37 +1,34 @@ -function scr_bomb_world(star_system, planet_number, bombard_target_faction, bombard_ment_power, target_strength) { +function scr_bomb_world(bombard_target_faction, bombard_ment_power, target_strength) { - var pop_before=0,pop_after=0,reduced_bombard_score=0,strength_reduction=0,txt2="",txt3="",txt4="",max_kill,overkill,roll,kill; - var score_before=star_system.p_population[planet_number]; + var pop_after=0,reduced_bombard_score=0,strength_reduction=0,txt2="",txt3="",txt4="",max_kill,overkill,roll,kill; + + var score_before=population; // TODO - update descriptions below, once we get Surface to Orbit weaponry into the game var txt1=choose("Your cruiser and larger ship", "The heavens rumble and thunder as your ship"); // TODO - add more variation, for different planets, perhaps different ships, CMs positioning, planetary features and other factors - if (ships_selected>1) then txt1+="s"; + if (obj_bomb_select.ships_selected>1) then txt1+="s"; txt1+=choose(" position themselves over the target in close orbit, and unleash", " unload"); - if (ships_selected=1) then txt1+="s"; - txt1+= $" annihilation upon {planet_numeral_name(planet_number, star_system)}. Even from space the explosions can be seen, {choose("tearing ground", "hammering", "battering", "thundering")} across the planet's surface."; + if (obj_bomb_select.ships_selected=1) then txt1+="s"; + txt1+= $" annihilation upon {name()}. Even from space the explosions can be seen, {choose("tearing ground", "hammering", "battering", "thundering")} across the planet's surface."; - if (star_system.p_large[planet_number]=0){ - kill=bombard_ment_power*15000000;// Population if normal, TODO consider making loses to be more percentage-wise, rather than flat, also in scr_purge_world - }else if (star_system.p_large[planet_number]=1){ - kill=bombard_ment_power*0.15;// Population if large - } + kill = population_small_conversion(0.15); - pop_before=star_system.p_population[planet_number]; + var pop_before=population; // Minimum kills pop_after=max(0,pop_before-kill); if (pop_after<=0) and (pop_before>0) then heres_after=0; // Code bits copied from scr_purge_world - if (star_system.p_population[planet_number] > 0) { - heres_before = max(star_system.p_heresy[planet_number] + star_system.p_heresy_secret[planet_number], star_system.p_influence[planet_number][eFACTION.Tau]); + if (population > 0) { + heres_before = max(corruption + secret_corruption, population_influences[eFACTION.Tau]); sci1 = 0; sci1 = (pop_after / pop_before) * irandom_range(1, 3); // Make bombard corruption reduction random to encourage other forms of purging // TODO MEDIUM BOMBARD_CORRUPTION // Tweak numbers heres_after = heres_before - sci1; } - if (star_system.p_type[planet_number]!="Space Hulk"){ + if (planet_type!="Space Hulk"){ var bombard_protection=1; switch(bombard_target_faction){ // case 1: @@ -43,10 +40,10 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb bombard_protection=2; break; // I'm not sure about IG, maybe they should be left at 2, or, maybe they should be at 1, like the PDF case 2.5: - if (star_system.p_owner[planet_number]<=5){ + if (current_owner<=5){ txt2="##The PDF forces are poorly fortified; "; bombard_protection=1; - } else if (star_system.p_owner[planet_number]>5){ + } else if (current_owner>5){ txt2="##The renegade forces are poorly fortified; "; bombard_protection=1; } @@ -69,7 +66,20 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb break; case 7: txt2="##The Ork forces, for brutal savages, are well dug in; "; // TODO spice up descriptions with variable levels of protection - bombard_protection=2; // TODO Make protection variable depending on leaders present + bombard_protection=2; + if (has_feature(P_features.OrkStronghold)){ + var _stronghold = get_features(P_features.OrkStronghold)[0]; + var _protection = floor(_stronghold.tier); + bombard_protection += _protection; + if (_protection){ + if (bombard_protection == 3){ + txt2 = "The Ork Stronghold on this planet is sizeable and provides the Orks with heavy protection" + } else { + txt2 = "The Ork Stronghold Provides near absolute protection for the greenskins within the vast shielding is impressivly effective despite it's seemingly primitive designs"; + } + } + } + // TODO Make protection variable depending on leaders present break; case 8: txt2="##The Tau forces are well fortified; "; @@ -80,7 +90,7 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb bombard_protection=0; // TODO add considerations when it is a cult, and when it is bioforms out in the open break; case 10: - if (star_system.p_type[planet_number]="Daemon"){ + if (planet_type="Daemon"){ bombard_protection=3; // Kind of irrelevant if the bombardment will be nulled later either way txt2="##Reality warps and twists within the planet; "; } else { @@ -107,12 +117,14 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb var i=reduced_bombard_score; roll=0; - - if (bombard_protection==0){i=i*4;} // No protection, Nids out in the open use this - else if (bombard_protection==1){i=i*0.9;} // Poor protection, PDF/Renegades and Ecclesiarchy use it, - else if (bombard_protection==2){i=i*0.75;} // Competent protection - IG, standard chaos forces and Orks - else if (bombard_protection==3){i=i*0.5;} // Hi-tech, Admech, Tau and Daemons kind of - else if (bombard_protection==4){i=i*0.34;} // Figured I add a level 4 to this, Ultra hi-tech, Necrons and Eldar + var bombard_protect_scores = [4, 0.9, 0.75, 0.5, 0.34]; + bombard_protection = clamp(bombard_protection, 0, 4); + i *= bombard_protect_scores[bombard_protection]; + // 0 No protection, Nids out in the open use this + //1: Poor protection, PDF/Renegades and Ecclesiarchy use it, + // 2: Competent protection - IG, standard chaos forces and Orks + // 3: Hi-tech, Admech, Tau and Daemons kind of + // 4: Figured I add a level 4 to this, Ultra hi-tech, Necrons and Eldar for(var r=0;r<100;r++){ if (i < 1) then break; @@ -128,7 +140,7 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb strength_reduction=round(strength_reduction); txt2+="they suffer"; - if (bombard_target_faction==10) and (star_system.p_type[planet_number]=="Daemon") then strength_reduction=0; + if (bombard_target_faction==10) and (planet_type=="Daemon") then strength_reduction=0; var rel=0; if (strength_reduction!=0) and (target_strength!=0){ @@ -167,73 +179,73 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb if (strength_reduction>0){ // Faction 2.5 being renegades, interesting - if (bombard_target_faction=2.5) and (star_system.p_owner[planet_number]=8){ + if (bombard_target_faction=2.5) and (current_owner=8){ var wib="",wob=0; txt2="##The renegade forces are poorly fortified; "; wob=bombard_ment_power*5000000+choose(floor(random(100000)),floor(random(100000))*-1); - if (wob>star_system.p_pdf[planet_number]) then wob=star_system.p_pdf[planet_number]; - rel=(star_system.p_pdf[planet_number]/wob)*100; - star_system.p_pdf[planet_number]-=wob; + if (wob>system.p_pdf[planet]) then wob=system.p_pdf[planet]; + rel=(system.p_pdf[planet]/wob)*100; + system.p_pdf[planet]-=wob; if (rel>0) and (rel<=20) then txt2+=" they suffer minor losses from the bombardment, "+string(scr_display_number(wob))+" purged."; if (rel>20) and (rel<=40) then txt2+=" they suffer moderate losses from the bombardment, "+string(scr_display_number(wob))+" purged."; if (rel>40) and (rel<=60) then txt2+=" they suffer heavy losses from the bombardment, "+string(scr_display_number(wob))+" purged."; - if (rel>60) and (star_system.p_pdf[planet_number]>0) then txt2+=" they suffer devastating losses from the bombardment, "+string(scr_display_number(wob))+" purged."; - if (wob>0) and (star_system.p_pdf[planet_number]=0) then txt2+=" they suffer total annihilation from the bombardment and are wiped clean from the planet."; + if (rel>60) and (system.p_pdf[planet]>0) then txt2+=" they suffer devastating losses from the bombardment, "+string(scr_display_number(wob))+" purged."; + if (wob>0) and (system.p_pdf[planet]=0) then txt2+=" they suffer total annihilation from the bombardment and are wiped clean from the planet."; } switch(bombard_target_faction){ // case 1: - // star_system.p_marines[planet_number]-=strength_reduction; + // system.p_marines[planet]-=strength_reduction; // break; // case 2: - // star_system.p_ig[planet_number]-=strength_reduction; + // system.p_ig[planet]-=strength_reduction; // break; // case 3: - // star_system.p_mechanicus[planet_number]-=strength_reduction; + // system.p_mechanicus[planet]-=strength_reduction; // break; // case 4: - // star_system.p_inquisition[planet_number]-=strength_reduction; + // system.p_inquisition[planet]-=strength_reduction; // break; case 5: - star_system.p_sisters[planet_number]-=strength_reduction; + system.p_sisters[planet]-=strength_reduction; break; case 6: - star_system.p_eldar[planet_number]-=strength_reduction; + system.p_eldar[planet]-=strength_reduction; break; case 7: - star_system.p_orks[planet_number]-=strength_reduction; + system.p_orks[planet]-=strength_reduction; break; case 8: - star_system.p_tau[planet_number]-=strength_reduction; + system.p_tau[planet]-=strength_reduction; break; case 9: - star_system.p_tyranids[planet_number]-=strength_reduction; + system.p_tyranids[planet]-=strength_reduction; break; case 10: - star_system.p_traitors[planet_number]-=strength_reduction; + system.p_traitors[planet]-=strength_reduction; break; // case 11: - // star_system.p_csm[planet_number]-=strength_reduction; + // system.p_csm[planet]-=strength_reduction; // break; // case 12: - // star_system.p_demons[planet_number]-=strength_reduction; + // system.p_demons[planet]-=strength_reduction; // break; case 13: - star_system.p_necrons[planet_number]-=strength_reduction; + system.p_necrons[planet]-=strength_reduction; break; } } - if (kill>0) then kill=min(star_system.p_population[planet_number],kill); + if (kill>0) then kill=min(system.p_population[planet],kill); txt3=""; // Life is the Emperor's currency. Spend it well - if (pop_before > 0 && star_system.p_type[planet_number] != "Daemon") { - var _displayed_population = star_system.p_large[planet_number] == 1 ? $"{pop_before} billion" : scr_display_number(floor(pop_before)); - var _displayed_killed = star_system.p_large[planet_number] == 1 ? $"{kill} billion" : scr_display_number(floor(kill)); + if (pop_before > 0 && planet_type != "Daemon") { + var _displayed_population = system.p_large[planet] == 1 ? $"{pop_before} billion" : scr_display_number(floor(pop_before)); + var _displayed_killed = system.p_large[planet] == 1 ? $"{kill} billion" : scr_display_number(floor(kill)); if (pop_after == 0) { heres_after = 0; } @@ -242,14 +254,14 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb // DO EET if (pop_before > 0) { - star_system.p_population[planet_number] = pop_before - kill; - star_system.p_heresy[planet_number] -= sci1; - star_system.p_influence[planet_number][eFACTION.Tau] -= sci1; // TODO LOW PURGE_INFLUENCE // Make this affect all influences - if (star_system.p_heresy[planet_number] < 0) { - star_system.p_heresy[planet_number] = 0; + system.p_population[planet] = pop_before - kill; + system.p_heresy[planet] -= sci1; + system.p_influence[planet][eFACTION.Tau] -= sci1; // TODO LOW PURGE_INFLUENCE // Make this affect all influences + if (system.p_heresy[planet] < 0) { + system.p_heresy[planet] = 0; } - if (star_system.p_influence[planet_number][eFACTION.Tau] < 0) { - star_system.p_influence[planet_number][eFACTION.Tau] = 0; + if (system.p_influence[planet][eFACTION.Tau] < 0) { + system.p_influence[planet][eFACTION.Tau] = 0; } } @@ -260,40 +272,37 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb if (pop_after==0 && pop_before>0){ - if (star_system.p_owner[planet_number]=2) and (obj_controller.faction_status[eFACTION.Imperium]!="War"){ - if (star_system.p_type[planet_number]="Temperate") or (star_system.p_type[planet_number]="Hive") or (star_system.p_type[planet_number]="Desert"){ - obj_controller.audiences+=1;obj_controller.audien[obj_controller.audiences]=2; - obj_controller.audien_topic[obj_controller.audiences]="bombard_angry"; + if (current_owner=2) and (obj_controller.faction_status[eFACTION.Imperium]!="War"){ + if (planet_type="Temperate" || planet_type="Hive" || planet_type="Desert"){ + var _disp_neg = 0; + if (planet_type="Temperate"){ + _disp_neg-=5; + }else if (planet_type="Desert"){ + _disp_neg-=3; + }else if (planet_type="Hive"){ + _disp_neg-=10; + } + scr_audience(eFACTION.Imperium, "bombard_angry", _disp_neg,); } - if (star_system.p_type[planet_number]="Temperate"){ - obj_controller.disposition[2]-=5; - }else if (star_system.p_type[planet_number]="Desert"){ - obj_controller.disposition[2]-=3; - }else if (star_system.p_type[planet_number]="Hive"){ - obj_controller.disposition[2]-=10; - } - }else if (star_system.p_owner[planet_number]=3) and (obj_controller.faction_status[eFACTION.Mechanicus]!="War"){ - obj_controller.audiences+=1;obj_controller.audien[obj_controller.audiences]=3; - obj_controller.audien_topic[obj_controller.audiences]="bombard_angry"; - if (star_system.p_type[planet_number]="Forge"){ - obj_controller.disposition[3]-=15; - }else if (star_system.p_type[planet_number]="Ice"){ - obj_controller.disposition[3]-=7; + }else if (current_owner=3) and (obj_controller.faction_status[eFACTION.Mechanicus]!="War"){ + var _disp_neg = 0; + if (planet_type="Forge"){ + _disp_neg-=15; + }else if (planet_type="Ice"){ + _disp_neg-=7; } + scr_audience(eFACTION.Mechanicus, "bombard_angry", _disp_neg,); } - if (planet_feature_bool(star_system.p_feature[planet_number], P_features.Gene_Stealer_Cult)) { - delete_features(star_system.p_feature[planet_number], P_features.Gene_Stealer_Cult); - adjust_influence(eFACTION.Tyranids, -100, planet_number, star_system); + if (planet_feature_bool(system.p_feature[planet], P_features.Gene_Stealer_Cult)) { + delete_features(system.p_feature[planet], P_features.Gene_Stealer_Cult); + adjust_influence(eFACTION.Tyranids, -100, planet, system); pip.text += " The xeno taint of the tyranids that was infesting the population has been completely eradicated with the planets cleansing"; } else { pip.text += " Any xeno taint that was infesting the population has been completely eradicated with the planets cleansing"; } } if (bombard_target_faction=8) and (obj_controller.faction_status[eFACTION.Tau]!="War"){ - obj_controller.audiences+=1; - obj_controller.audien[obj_controller.audiences]=8; - obj_controller.audien_topic[obj_controller.audiences]=choose("declare_war","bombard_angry"); - obj_controller.disposition[8]-=15; + scr_audience(eFACTION.Tau, choose("declare_war","bombard_angry"), -15,); } @@ -305,7 +314,7 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb - if (star_system.p_type[planet_number]="Space Hulk"){ + if (planet_type="Space Hulk"){ var bombard_protection=1; txt1="Torpedoes and Bombardment Cannons rain hell upon the space hulk; "; @@ -314,20 +323,20 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb var rel=0; - if (reduced_bombard_score!=0) then rel=((star_system.p_fortified[planet_number]-reduced_bombard_score)/star_system.p_fortified[planet_number])*100; + if (reduced_bombard_score!=0) then rel=((system.p_fortified[planet]-reduced_bombard_score)/system.p_fortified[planet])*100; if (strength_reduction==0) then txt2="it suffers minimal damage from the bombardment."; if (rel>0) and (rel<=20) then txt2="it suffers minor damage from the bombardment, its integrity reduced by "+string(100-rel)+"%"; if (rel>20) and (rel<=40) then txt2="it suffers moderate damage from the bombardment, its integrity reduced by "+string(100-rel)+"%"; if (rel>40) and (rel<=60) then txt2="it suffers heavy damage from the bombardment, its integrity reduced by "+string(100-rel)+"%"; - if (rel>60) and ((star_system.p_fortified[planet_number]-reduced_bombard_score)>0) then txt2="it suffers extensive damage from the bombardment, its integrity reduced by "+string(100-rel)+"%"; - if ((star_system.p_fortified[planet_number]-reduced_bombard_score)<=0) then txt2="it crumbles apart from the onslaught. It is no more."; // Potential TODO Consider adding salvage from the bombed wreckage + if (rel>60) and ((system.p_fortified[planet]-reduced_bombard_score)>0) then txt2="it suffers extensive damage from the bombardment, its integrity reduced by "+string(100-rel)+"%"; + if ((system.p_fortified[planet]-reduced_bombard_score)<=0) then txt2="it crumbles apart from the onslaught. It is no more."; // Potential TODO Consider adding salvage from the bombed wreckage // DO EET - if (reduced_bombard_score>0) then star_system.p_fortified[planet_number]-=reduced_bombard_score; + if (reduced_bombard_score>0) then system.p_fortified[planet]-=reduced_bombard_score; - if (star_system.p_fortified[planet_number]<=0){ - with(star_system){instance_destroy();} + if (system.p_fortified[planet]<=0){ + with(system){instance_destroy();} instance_activate_object(obj_star_select); with(obj_star_select){instance_destroy();} obj_controller.sel_system_x=0; @@ -344,10 +353,10 @@ function scr_bomb_world(star_system, planet_number, bombard_target_faction, bomb - sh_target.acted=5; - with(obj_bomb_select){instance_destroy();} - instance_destroy(); - + obj_bomb_select.sh_target.acted=5; + with(obj_bomb_select){ + instance_destroy(); + } // show_message("Pop: "+string(pop_before)+" -> "+string(pop_after)+"#killed: "+string(kill)+"#Heresy: "+string(heres_before)+" -> "+string(heres_after)); diff --git a/scripts/scr_buttons/scr_buttons.gml b/scripts/scr_buttons/scr_buttons.gml index a9c2910ddc..52732b6db2 100644 --- a/scripts/scr_buttons/scr_buttons.gml +++ b/scripts/scr_buttons/scr_buttons.gml @@ -1,499 +1,965 @@ -function draw_unit_buttons(position, text, size_mod=[1.5,1.5],colour=c_gray,_halign=fa_center, font=fnt_40k_14b, alpha_mult=1, bg=false, bg_color=c_black){ - // TODO: fix halign usage - // Store current state of all global vars - var cur_alpha = draw_get_alpha(); - var cur_font = draw_get_font(); - var cur_color = draw_get_color(); - var cur_halign = draw_get_halign(); - var cur_valign = draw_get_valign(); - - draw_set_font(font); - draw_set_halign(fa_center); - draw_set_valign(fa_middle); - - var x2; - var y2; - var _text = string_hash_to_newline(text); - if (array_length(position)>2){ - var x2 = position[2]; - var y2 = position[3]; - } else { - var text_width = string_width(_text)*size_mod[0]; - var text_height = string_height(_text)*size_mod[1]; - var x2 = position[0]+text_width+(6*size_mod[0]); - var y2 = position[1]+text_height+(6*size_mod[1]); - } - draw_set_alpha(1*alpha_mult); - if (bg) { - draw_set_color(bg_color); - draw_rectangle(position[0], position[1], x2, y2, 0); - } - draw_set_color(colour); - draw_text_transformed((position[0] + x2)/2, (position[1] + y2)/2, _text, size_mod[0], size_mod[1], 0); - draw_rectangle(position[0],position[1], x2,y2,1) - draw_set_alpha(0.5*alpha_mult); - draw_rectangle(position[0]+1,position[1]+1, x2-1,y2-1,1) - draw_set_alpha(0.25*alpha_mult); - var mouse_consts = return_mouse_consts(); - if (point_in_rectangle(mouse_consts[0],mouse_consts[1], position[0],position[1], x2,y2)){ - draw_rectangle(position[0],position[1], x2,y2,0); - } - - // Reset all global vars to their previous state - draw_set_alpha(cur_alpha); - draw_set_font(cur_font); - draw_set_color(cur_color); - draw_set_halign(cur_halign); - draw_set_valign(cur_valign); - - return [position[0],position[1], x2,y2]; +// -------------------- +// 🟦 DRAW STATE HELPERS +// -------------------- + +global.draw_return_stack = []; +#macro UI_CURSOR_BLINK_RATE 500 + +/// @function add_draw_return_values() +/// @description Saves the current draw state (alpha, font, color, halign, valign) to a global stack. +/// @returns {undefined} +/// @category Draw Helpers +function add_draw_return_values() { + var _vals = { + cur_alpha: draw_get_alpha(), + cur_font: draw_get_font(), + cur_color: draw_get_color(), + cur_halign: draw_get_halign(), + cur_valign: draw_get_valign(), + }; + array_push(global.draw_return_stack, _vals); +} + +/// @function pop_draw_return_values() +/// @description Restores the most recent draw state from the global stack and removes it. +/// @returns {undefined} +/// @category Draw Helpers +function pop_draw_return_values() { + var _array_length = array_length(global.draw_return_stack); + if (_array_length > 0) { + var _index = _array_length - 1; + var _values = global.draw_return_stack[_index]; + draw_set_alpha(_values.cur_alpha); + draw_set_font(_values.cur_font); + draw_set_color(_values.cur_color); + draw_set_halign(_values.cur_halign); + draw_set_valign(_values.cur_valign); + array_delete(global.draw_return_stack, _index, 1); + } } +// -------------------- +// 🟩 UI ELEMENTS +// -------------------- + +/// @function ReactiveString(text, x1, y1, data) +/// @constructor +/// @category UI +/// @description Represents a reactive text element that can update, draw itself, and respond to hits. +/// @param {string} text The text to display. +/// @param {real} [x1=0] The X position. +/// @param {real} [y1=0] The Y position. +/// @param {struct|bool} [data=false] Optional struct of properties to apply. +/// @returns {ReactiveString} +/// +/// @example +/// var rs = new ReactiveString("Hello", 100, 200); +/// rs.draw(); +function ReactiveString(text, x1 = 0, y1 = 0, data = false) constructor { + self.x1 = x1; + self.y1 = y1; + x2 = 0; + y2 = 0; + halign = fa_left; + valign = fa_top; + + self.text = text; + text_max_width = -1; + font = fnt_40k_14; + colour = CM_GREEN_COLOR; + tooltip = ""; + max_width = -1; + h = 0; + w = 0; + scale_text=false; + + move_data_to_current_scope(data); + + static update = function(data = {}) { + move_data_to_current_scope(data); + add_draw_return_values(); + draw_set_font(font); + draw_set_halign(halign); + draw_set_valign(valign); + + if (max_width > -1) { + if (!scale_text){ + w = string_width_ext(text, -1, max_width); + h = string_height_ext(text, -1, max_width); + x2 = x1 + w; + y2 = y1 + h; + } else{ + w = max_width; + scale = calc_text_scale_confines(text,max_width); + h = string_height(text) * scale; + } + } else { + w = string_width(text); + } + + pop_draw_return_values(); + }; + + update(); + + static hit = function() { + return scr_hit(x1, y1, x2, y2); + }; + + static draw = function() { + add_draw_return_values(); + draw_set_font(font); + draw_set_halign(halign); + draw_set_valign(valign); + draw_set_color(colour); + + if (max_width > -1) { + if (!scale_text){ + draw_text_ext_outline(x1, y1, text, -1, max_width, c_black, colour); + }else{ + draw_text_transformed(x1, y1, text, scale, scale, 0) + } + } else { + draw_text_outline(x1, y1, text, c_black, colour); + } + if (hit()) { + tooltip_draw(tooltip); + } + pop_draw_return_values(); + }; +} + +/// @function LabeledIcon(icon, text, x1, y1, data) +/// @constructor +/// @category UI +/// @description UI element combining a sprite and text with optional tooltip. +/// @param {sprite} icon The sprite asset. +/// @param {string} text The text label. +/// @param {real} [x1=0] X position. +/// @param {real} [y1=0] Y position. +/// @param {struct|bool} [data=false] Optional struct of properties to apply. +/// @returns {LabeledIcon} +function LabeledIcon(icon, text, x1 = 0, y1 = 0, data = false) constructor { + self.x1 = x1; + self.y1 = y1; + x2 = 0; + y2 = 0; + + self.text = text; + text_max_width = -1; + font = fnt_40k_14; + colour = CM_GREEN_COLOR; + text_position = "right"; + tooltip = ""; + self.icon = sprite_exists(icon) ? icon : spr_none; + icon_width = sprite_get_width(self.icon); + icon_height = sprite_get_height(self.icon); + w = icon_width; + h = icon_height; + + move_data_to_current_scope(data); + + static update = function(data = {}) { + move_data_to_current_scope(data); + add_draw_return_values(); + draw_set_font(font); + if (text_position == "right") { + w = icon_width + 2 + string_width(text); + x2 = x1 + w; + h = icon_height; + y2 = y1 + icon_height; + } + pop_draw_return_values(); + }; + + update(); + + static hit = function() { + return scr_hit(x1, y1, x2, y2); + }; + + static draw = function() { + add_draw_return_values(); + draw_set_font(font); + draw_set_halign(fa_left); + draw_set_valign(fa_top); + draw_set_color(colour); + draw_sprite_stretched(icon, 0, x1, y1, icon_width, icon_height); + if (text_position == "right") { + var _string_x = x1 + icon_width + 2; + draw_text_outline(_string_x, y1 + 4, text); + if (tooltip != "") { + if (hit()) { + tooltip_draw(tooltip); + } + } + } + pop_draw_return_values(); + }; +} + +/// @function draw_sprite_as_button(position, choice_sprite, scale, hover_sprite) +/// @description Draws a sprite as a clickable button, returning its bounding box. +/// @param {array} position [x, y] top-left corner. +/// @param {sprite} choice_sprite Sprite to draw. +/// @param {array} [scale=[1,1]] Scale factors [x,y]. +/// @param {sprite} [hover_sprite=-1] Optional hover sprite. +/// @returns {array} [x1, y1, x2, y2] bounding box. +function draw_sprite_as_button(position, choice_sprite, scale = [1, 1], hover_sprite = -1) { + var _pos = [position[0], position[1], position[0] + (sprite_get_width(choice_sprite) * scale[0]), position[1] + (sprite_get_height(choice_sprite) * scale[1])]; + draw_sprite_ext(choice_sprite, 0, position[0], position[1], scale[0], scale[1], 0, c_white, scr_hit(_pos) ? 1 : 0.9); + return _pos; +} + +/// @function draw_unit_buttons(position, text, size_mod, colour, halign, font, alpha_mult, bg, bg_color) +/// @description Draws a styled button with text, optional background and hover effects. +/// @param {array} position Either [x, y] or [x1, y1, x2, y2]. +/// @param {string} text Text to display. +/// @param {array} [size_mod=[1.5,1.5]] Text scaling. +/// @param {color} [colour=c_gray] Text color. +/// @param {real} [_halign=fa_center] Text horizontal alignment. +/// @param {font} [font=fnt_40k_14b] Font resource. +/// @param {real} [alpha_mult=1] Alpha multiplier. +/// @param {bool} [bg=false] Draw background rectangle. +/// @param {color} [bg_color=c_black] Background color. +/// @returns {array} [x1, y1, x2, y2] bounding box. +function draw_unit_buttons(position, text, size_mod = [1.5, 1.5], colour = c_gray, _halign = fa_center, font = fnt_40k_14b, alpha_mult = 1, bg = false, bg_color = c_black) { + // TODO: fix halign usage + // Store current state of all global vars + add_draw_return_values(); + + draw_set_font(font); + draw_set_halign(fa_center); + draw_set_valign(fa_middle); + + var x2; + var y2; + var _text = string_hash_to_newline(text); + if (array_length(position) > 2) { + var x2 = position[2]; + var y2 = position[3]; + } else { + var text_width = string_width(_text) * size_mod[0]; + var text_height = string_height(_text) * size_mod[1]; + var x2 = position[0] + text_width + (6 * size_mod[0]); + var y2 = position[1] + text_height + (6 * size_mod[1]); + } + draw_set_alpha(1 * alpha_mult); + if (bg) { + draw_set_color(bg_color); + draw_rectangle(position[0], position[1], x2, y2, 0); + } + draw_set_color(colour); + draw_text_transformed((position[0] + x2) / 2, (position[1] + y2) / 2, _text, size_mod[0], size_mod[1], 0); + draw_rectangle(position[0], position[1], x2, y2, 1); + draw_set_alpha(0.5 * alpha_mult); + draw_rectangle(position[0] + 1, position[1] + 1, x2 - 1, y2 - 1, 1); + draw_set_alpha(0.25 * alpha_mult); + var mouse_consts = return_mouse_consts(); + if (point_in_rectangle(mouse_consts[0], mouse_consts[1], position[0], position[1], x2, y2)) { + draw_rectangle(position[0], position[1], x2, y2, 0); + } + + // Reset all global vars to their previous state + pop_draw_return_values(); + + return [position[0], position[1], x2, y2]; +} + +function standard_loc_data(){ + x1 = 0; + y1 = 0; + y2 = 0; + x2 = 0; + w = 0; + h = 0; +} + +/// @function UnitButtonObject(data) +/// @constructor +/// @category UI +/// @description Represents an interactive UI button with styles, tooltips, and binding support. +/// @param {struct|bool} [data=false] Initial property overrides. +/// @returns {UnitButtonObject} +function UnitButtonObject(data = false) constructor { + x1 = 0; + y1 = 0; + w = 102; + h = 30; + h_gap = 4; + v_gap = 4; + text_scale = 1; + label = ""; + alpha = 1; + color = #50a076; + inactive_col = c_gray; + keystroke = false; + active = true; + tooltip = ""; + bind_method = ""; + bind_scope = false; + set_width = false; + style = "standard"; + font = fnt_40k_14b; + set_height_width = false; + + static update_loc = function() { + add_draw_return_values(); + draw_set_font(font); + if (label != "") { + if (!set_width) { + w = string_width(label) + 10; + h = string_height(label) + 4; + } else { + text_scale = calc_text_scale_confines(label, w, 10); + } + h = string_height(label) + 4; + } + x2 = x1 + w; + y2 = y1 + h; + pop_draw_return_values(); + }; + + static update = function(data) { + var _updaters = struct_get_names(data); + var i = 0; + for (i = 0; i < array_length(_updaters); i++) { + self[$ _updaters[i]] = data[$ _updaters[i]]; + } + if (!set_height_width) { + update_loc(); + } + }; + + if (data != false) { + update(data); + } + + update_loc(); + + static move = function(m_direction, with_gap = false, multiplier = 1) { + switch (m_direction) { + case "right": + x1 += (w + (with_gap * v_gap)) * multiplier; + x2 += (w + (with_gap * v_gap)) * multiplier; + break; + case "left": + x1 -= (w + (with_gap * v_gap)) * multiplier; + x2 -= (w + (with_gap * v_gap)) * multiplier; + break; + case "down": + y1 += (h + (with_gap * h_gap)) * multiplier; + y2 += (h + (with_gap * h_gap)) * multiplier; + break; + case "up": + y1 -= (h + (with_gap * h_gap)) * multiplier; + y2 -= (h + (with_gap * h_gap)) * multiplier; + break; + } + }; + + static disabled = false; -//object containing draw_unit_buttons -function UnitButtonObject(data = false) constructor{ - x1 = 0; - y1 = 0; - w = 102; - h = 30; - h_gap= 4; - v_gap= 4; - label= ""; - alpha= 1; - color = #50a076; - keystroke = false; - tooltip = ""; - bind_method = ""; - style = "standard"; - font=fnt_40k_14b - - - static update_loc = function(){ - if (label != ""){ - w = string_width(label) + 10; - }; - x2 = x1 + w; - y2 = y1 + h; - } - static update = function(data){ - var _updaters = struct_get_names(data); - var i=0; - for (i=0;i 0 ? [x1, y1, x2, y2] : [x1, y1] , label, [1,1],color,,font,alpha); - } else if (style = "pixel"){ - - var _widths = [sprite_get_width(spr_pixel_button_left), sprite_get_width(spr_pixel_button_middle), sprite_get_width(spr_pixel_button_right)] - - var height_scale = h/sprite_get_height(spr_pixel_button_left); - _widths[0]*=height_scale; - _widths[2]*=height_scale; - draw_sprite_ext(spr_pixel_button_left, 0, x1, y1, height_scale, height_scale, 0, c_white, 1); - var _width_scale = w/_widths[1]; - _widths[1] *= _width_scale; - draw_sprite_ext(spr_pixel_button_middle, 0, x1 + _widths[0], y1, _width_scale, height_scale, 0, c_white, 1); - draw_sprite_ext(spr_pixel_button_right, 0, x1 + _widths[0] + _widths[1] ,y1, height_scale, height_scale, 0, c_white, 1); - var _text_position_x = x1 + ((_widths[0] + 2) * height_scale); - _text_position_x += (_widths[1]) / 2; - draw_set_font(font); - draw_set_halign(fa_center); - draw_set_valign(fa_middle); - draw_set_color(color); - draw_text_transformed(_text_position_x, y1 + ( (h * height_scale)/2), label, 1, 1, 0); - - x2 = x1 + array_sum(_widths); - y2 = y1 + h; - var _button_click_area = [x1, y1, x2, y2]; - } - draw_set_alpha(cur_alpha); - draw_set_font(cur_font); - draw_set_color(cur_color); - draw_set_halign(cur_halign); - draw_set_valign(cur_valign); - - if (scr_hit(x1, y1, x2, y2) && tooltip!=""){ - tooltip_draw(tooltip); - } - - if (allow_click){ - var clicked = point_and_click(_button_click_area) || keystroke; - if (clicked){ - if (is_callable(bind_method)){ - bind_method(); - } - } - return clicked - } else { - return false; - } - } + static draw = function(allow_click = true) { + add_draw_return_values(); + var _button_click_area; + if (style == "standard") { + var _temp_alpha = alpha; + if (disabled) { + _temp_alpha = 0.5; + allow_click = false; + } + _button_click_area = draw_unit_buttons(w > 0 ? [x1, y1, x2, y2] : [x1, y1], label, [text_scale, text_scale], active ? color : inactive_col,, font, _temp_alpha); + } else if (style == "pixel") { + var _widths = [sprite_get_width(spr_pixel_button_left), sprite_get_width(spr_pixel_button_middle), sprite_get_width(spr_pixel_button_right)]; + + var height_scale = h / sprite_get_height(spr_pixel_button_left); + _widths[0] *= height_scale; + _widths[2] *= height_scale; + draw_sprite_ext(spr_pixel_button_left, 0, x1, y1, height_scale, height_scale, 0, c_white, 1); + var _width_scale = w / _widths[1]; + _widths[1] *= _width_scale; + draw_sprite_ext(spr_pixel_button_middle, 0, x1 + _widths[0], y1, _width_scale, height_scale, 0, c_white, 1); + draw_sprite_ext(spr_pixel_button_right, allow_click, x1 + _widths[0] + _widths[1], y1, height_scale, height_scale, 0, c_white, 1); + var _text_position_x = x1 + ((_widths[0] + 2) * height_scale); + _text_position_x += _widths[1] / 2; + draw_set_font(font); + draw_set_halign(fa_center); + draw_set_valign(fa_middle); + draw_set_color(color); + + draw_text_transformed(_text_position_x, y1 + ((h * height_scale) / 2), label, text_scale, text_scale, 0); + + x2 = x1 + array_sum(_widths); + y2 = y1 + h; + _button_click_area = [x1, y1, x2, y2]; + } + + if (scr_hit(x1, y1, x2, y2) && tooltip != "") { + tooltip_draw(tooltip); + } + + if (allow_click && active) { + var clicked = point_and_click(_button_click_area) || keystroke; + if (clicked) { + if (is_callable(bind_method)) { + if (bind_scope != false) { + var _method = bind_method; + with (bind_scope) { + _method(); + } + } else { + bind_method(); + } + } + } + pop_draw_return_values(); + return clicked; + } else { + pop_draw_return_values(); + return false; + } + }; } -function PurchaseButton(req) : UnitButtonObject() constructor{ - req_value = req; - static draw = function(allow_click=true){ - - var _but = draw_unit_buttons([x1, y1, x2, y2], label, [1,1],color,,,alpha); - var _sh = sprite_get_height(spr_requisition); - var _scale = (y2 - y1) / _sh; - draw_sprite_ext(spr_requisition,0,x1,y2,_scale,_scale,0,c_white,1); - var _allow_click = obj_controller.requisition >= req_value; - if (scr_hit(x1, y1, x2, y2) && tooltip!=""){ - tooltip_draw(tooltip); - } - if (allow_click && _allow_click){ - var clicked = point_and_click(_but) || keystroke; - if (clicked){ - if (is_callable(bind_method)){ - bind_method(); - } - obj_controller.requisition -= req_value; - } - return clicked - } else { - return false; - } - } +/// @function PurchaseButton(req) +/// @constructor +/// @category UI +/// @description Specialized UnitButtonObject requiring requisition points to click. +/// @param {real} req Required requisition cost. +/// @returns {PurchaseButton} +function PurchaseButton(req) : UnitButtonObject() constructor { + req_value = req; + + static draw = function(allow_click = true) { + add_draw_return_values(); + + var _but = draw_unit_buttons([x1, y1, x2, y2], label, [1, 1], color,,, alpha); + var _sh = sprite_get_height(spr_requisition); + var _scale = (y2 - y1) / _sh; + draw_sprite_ext(spr_requisition, 0, x1, y2, _scale, _scale, 0, c_white, 1); + var _allow_click = obj_controller.requisition >= req_value; + if (scr_hit(x1, y1, x2, y2) && tooltip != "") { + tooltip_draw(tooltip); + } + if (allow_click && _allow_click) { + var clicked = point_and_click(_but) || keystroke; + if (clicked) { + if (is_callable(bind_method)) { + bind_method(); + } + obj_controller.requisition -= req_value; + } + pop_draw_return_values(); + return clicked; + } else { + pop_draw_return_values(); + return false; + } + pop_draw_return_values(); + }; } +/// @function SliderBar(_x, _y, _w, _h, _limits, _inc) +/// @description A functional slider bar for numerical input. +/// @param {real} _x Starting X position. +/// @param {real} _y Starting Y position. +/// @param {real} _w Width of the bar. +/// @param {real} _h Height of the bar. +/// @param {array} _limits Array [min, max]. +/// @param {real} _inc Increment step value. +function SliderBar(_x = 0, _y = 0, _w = 100, _h = 16, _limits = [0, 100], _inc = 1) constructor { + xx = _x; + yy = _y; + width = _w; + height = _h; + value_limits = _limits; + value_increments = _inc; + value = _limits[0]; + + dragging = false; -function slider_bar() constructor{ - x1 = 0; - y1 = 0; - w = 102; - h = 15 - value_limits = [0,0]; - value_increments = 1; - value = 0; - dragging = false; - slider_pos = 0; - static update = function(data){ - var _data_presets = struct_get_names(data); - for (var i=0;iincrements){ - if (mouse_check_button(mb_left)){ - dragging = true - } - } - } - if (dragging){ - if (_mouse_pos[0]>(_rect[2])){ - value = value_limits[1]; - } else if (_mouse_pos[0]<(_rect[0])){ - value = value_limits[0]; - } else { - var mouse_rel = _mouse_pos[0] - x1; - var increment_count = (mouse_rel/width_increments); - value = value_limits[0] + (increment_count * value_increments); - } - } - } + /// @param {struct} _data Struct containing keys to override. + static update_data = function(_data) { + var _names = struct_get_names(_data); + var _count = array_length(_names); + var _i = 0; + repeat (_count) { + var _key = _names[_i]; + self[$ _key] = _data[$ _key]; + _i++; + } + }; + + /// @description Returns the current value of the slider. + /// @returns {real} + static draw = function() { + add_draw_return_values(); + + var _mouse_vars = return_mouse_consts(); + var _mx = _mouse_vars[0]; + var _my = _mouse_vars[1]; + var _rect = [xx, yy, xx + width, yy + height]; + + if (point_and_click([_rect[0], _rect[1], _rect[2], _rect[3]])) { + dragging = true; + } + + if (dragging) { + if (!mouse_button_held(mb_left)) { + dragging = false; + } else { + var _rel_x = clamp(_mx - xx, 0, width); + var _percentage = _rel_x / width; + var _total_range = value_limits[1] - value_limits[0]; + + var _raw_val = value_limits[0] + (_percentage * _total_range); + value = round(_raw_val / value_increments) * value_increments; + } + } + + value = clamp(value, value_limits[0], value_limits[1]); + + draw_set_alpha(1.0); + draw_set_color(c_dkgray); + draw_rectangle_array(_rect, true); + + var _knob_pos = ((value - value_limits[0]) / (value_limits[1] - value_limits[0])) * width; + draw_set_color(dragging ? c_white : c_gray); + draw_rectangle(xx, yy, xx + _knob_pos, yy + height, false); + + pop_draw_return_values(); + return value; + }; } -function TextBarArea(XX,YY,Max_width = 400, requires_input = false) constructor{ - allow_input=false; - self.requires_input = requires_input; - xx=XX; - yy=YY - max_width = Max_width; - draw_col = c_gray; - cooloff=0 - // Draw BG - static draw = function(string_area){ - var old_font = draw_get_font(); - var old_halign = draw_get_halign(); - - if (cooloff>0) then cooloff--; - if (allow_input){ - string_area=keyboard_string; - } - draw_set_alpha(1); - //draw_sprite(spr_rock_bg,0,xx,yy); - draw_set_font(fnt_40k_30b); - draw_set_halign(fa_center); - draw_set_color(draw_col);// 38144 - var bar_wid=max_width,click_check, string_h; - draw_set_alpha(0.25); - if (string_area!=""){ - bar_wid=max(max_width,string_width(string_hash_to_newline(string_area))); - } else { - if (requires_input){ - draw_set_color(c_red); - } - } - string_h = string_height("LOL"); - var rect = [xx-(bar_wid/2),yy,xx+(bar_wid/2),yy-8+string_h] - draw_rectangle(rect[0],rect[1],rect[2],rect[3],1); - click_check = point_and_click(rect); - obj_cursor.image_index=0; - if (cooloff==0){ - if (allow_input && mouse_check_button(mb_left) && !click_check){ - allow_input=false; - cooloff=5; - }else if (!allow_input && click_check){ - obj_cursor.image_index=2; - allow_input=true; - keyboard_string = string_area; - cooloff=5; - } - } - - draw_set_alpha(1); - - draw_set_font(fnt_fancy); - if (!allow_input) then draw_text(xx,yy+2,string_hash_to_newline("''"+string(string_area)+"'' ")); - if (allow_input){ - obj_cursor.image_index=2; - draw_text(xx,yy+2,$"''{string_area}|''") - }; - - draw_set_font(old_font); - draw_set_halign(old_halign); - - return string_area; - } + +/// @function TextBarArea(_x, _y, _max_width, _requires_input) +/// @constructor +/// @category UI +/// @description Input text area with background and cursor handling. +/// @param {real} _x X position. +/// @param {real} _y Y position. +/// @param {real} [_max_width=400] Max width of text bar. +/// @param {bool} [_requires_input=false] If true, input is required. +/// @returns {TextBarArea} +function TextBarArea(_x, _y, _max_width = 400, _requires_input = false) constructor { + xx = _x; + yy = _y; + max_width = _max_width; + requires_input = _requires_input; + + allow_input = false; + draw_col = c_gray; + cooloff = 0; + current_text = ""; + + background = new DataSlate(); + background.draw_top_piece = false; + + static render_logic = function() { + draw_set_valign(fa_top); + draw_set_halign(fa_center); + draw_set_alpha(1); + draw_set_font(fnt_fancy); + + var _display_string = $"{current_text}"; + var _text_w = string_width(_display_string); + + draw_text(xx, yy + 2, _display_string); + + if (allow_input) { + obj_cursor.image_index = 2; + + var _is_blink_on = (current_time div UI_CURSOR_BLINK_RATE) % 2 == 0; + if (_is_blink_on) { + var _cursor_x = xx + (_text_w / 2); + + draw_text(_cursor_x, yy + 2, "|"); + } + } + }; + + render_content = method(self, render_logic); + + static draw = function(_string_area) { + add_draw_return_values(); + + current_text = _string_area; + + if (cooloff > 0) { + cooloff--; + } + + if (allow_input) { + current_text = keyboard_string; + } + + var _cursor_padding = string_width("|"); + var _bar_wid = max_width; + var _string_h = string_height("M"); + + if (current_text != "") { + _bar_wid = max(max_width, string_width($"' {current_text} '") + _cursor_padding + 20); + draw_set_color(draw_col); + } else { + draw_set_color(requires_input ? CM_RED_COLOR : CM_GREEN_COLOR); + } + + var _x1 = xx - (_bar_wid / 2); + var _y1 = yy; + var _x2 = xx + (_bar_wid / 2); + var _y2 = yy + _string_h; + + var _mouse_hover = scr_hit(_x1, _y1, _x2, _y2); + var _mouse_click = scr_click_left(); + var _enter_pressed = press_exclusive(vk_enter); + + if (cooloff == 0) { + // Deactivate on Enter or Clicking Away + if (allow_input && (_enter_pressed || (_mouse_click && !_mouse_hover))) { + allow_input = false; + cooloff = 5; + } else if (!allow_input && _mouse_click && _mouse_hover) { + // Activate on Clicking Inside + allow_input = true; + keyboard_string = current_text; + cooloff = 5; + } + } + + if (_mouse_hover || allow_input) { + obj_cursor.image_index = 2; + } else { + obj_cursor.image_index = 0; + } + + background.XX = _x1; + background.YY = _y1; + background.width = _x2 - _x1; + background.height = _y2 - _y1; + background.inside_method = render_content; + + background.draw_with_dimensions(); + + pop_draw_return_values(); + + return current_text; + }; } +/// @function drop_down(selection, draw_x, draw_y, options, open_marker) +/// @description Renders a drop-down selection list and updates choice. +/// @param {string} selection Current selected option. +/// @param {real} draw_x X position. +/// @param {real} draw_y Y position. +/// @param {array} options List of string options. +/// @param {bool} open_marker Whether dropdown is currently open. +/// @returns {array} [new_selection, open_marker] +function drop_down(selection, draw_x, draw_y, options, open_marker) { + add_draw_return_values(); + if (selection != "") { + var drop_down_area = draw_unit_buttons([draw_x, draw_y], selection, [1, 1], c_green); + draw_set_color(c_red); + if (array_length(options) > 1) { + if (scr_hit(drop_down_area)) { + obj_controller.current_target = true; + var roll_down_offset = 4 + string_height(selection); + for (var col = 0; col < array_length(options); col++) { + if (options[col] == selection) { + continue; + } + var cur_option = draw_unit_buttons([draw_x, draw_y + roll_down_offset], options[col], [1, 1], c_red,,,, true); + if (point_and_click(cur_option)) { + selection = options[col]; + open_marker = false; + } + roll_down_offset += string_height(options[col]) + 4; + } + if (!scr_hit(draw_x, draw_y, draw_x + 5 + string_width(selection), draw_y + roll_down_offset)) { + open_marker = false; + if (obj_controller.current_target) { + obj_controller.current_target = false; + } + } + } else { + obj_controller.current_target = false; + } + } + } -function drop_down(selection, draw_x, draw_y, options,open_marker){ - if (selection!=""){ - var drop_down_area = draw_unit_buttons([draw_x, draw_y],selection,[1,1],c_green); - draw_set_color(c_red); - if (array_length(options)>1){ - if (scr_hit(drop_down_area)){ - current_target=true; - var roll_down_offset=4+string_height(selection); - for (var col = 0;colx2 ? _prev_x:x2; - y2 = _prev_y + _cur_opt.height; - if (max_width>0){ - if (_prev_x - x1 > max_width){ - _prev_x = x1; - _prev_y += _cur_opt.height+y_gap; - items_on_row = 0; - } - } - } - } - static set = function(set_array){ - for (var s=0;s x2 ? _prev_x : x2; + y2 = _prev_y + _cur_opt.height; + if (max_width > 0) { + if (_prev_x - x1 > max_width) { + _prev_x = x1; + _prev_y += _cur_opt.height + y_gap; + items_on_row = 0; + } + } + } + pop_draw_return_values(); + }; + + static set = function(set_array) { + for (var s = 0; s < array_length(set_array); s++) { + var _setter = set_array[s]; + for (var i = 0; i < array_length(toggles); i++) { + var _cur_opt = toggles[i]; + _cur_opt.active = _cur_opt.str1 == _setter; + if (_cur_opt.str1 == _setter) {} + } + } + }; + + static deselect_all = function() { + for (var i = 0; i < array_length(toggles); i++) { + var _cur_opt = toggles[i]; + _cur_opt.active = false; + } + }; + + static selections = function() { + var _selecs = []; + for (var i = 0; i < array_length(toggles); i++) { + var _cur_opt = toggles[i]; + if (_cur_opt.active) { + array_push(_selecs, _cur_opt.str1); + } + } + return _selecs; + }; } -function item_data_updater(data){ +/// @function item_data_updater(data) +/// @description Utility to copy struct data into `self`. +/// @param {struct} data Data to apply. +/// @returns {undefined} +function item_data_updater(data) { var _data_presets = struct_get_names(data); - for (var i=0;ix2 ? _prev_x:x2; - y2 = _prev_y + _cur_opt.height; - if (max_width>0){ - if (_prev_x - x1 > max_width){ - _prev_x = x1; - _prev_y += _cur_opt.height+y_gap; - items_on_row = 0; - } - } - } - if (_start_current_selection != current_selection){ - changed = true; - } - } + +/// @function RadioSet(options_array, title, data) +/// @constructor +/// @category UI +/// @description Radio button group allowing only one active selection. +/// @param {array} options_array List of option labels. +/// @param {string} [title=""] Title string. +/// @param {struct} [data={}] Optional overrides. +/// @returns {RadioSet} +function RadioSet(options_array, title = "", data = {}) constructor { + toggles = []; + current_selection = 0; + self.title = title; + active_col = CM_GREEN_COLOR; + inactive_col = c_gray; + allow_changes = true; + x_gap = 10; + y_gap = 5; + x1 = 0; + y1 = 0; + title_font = fnt_40k_14b; + draw_title = true; + space_evenly = false; + changed = false; + + if (title == "") { + draw_title = false; + } + max_width = 0; // container width; if 0, use row's natural width + max_height = 0; + center = false; // when true, center each row horizontally in container + + for (var i = 0; i < array_length(options_array); i++) { + array_push(toggles, new ToggleButton(options_array[i])); + } + x2 = 0; + y2 = 0; + + move_data_to_current_scope(data, true); + static update = item_data_updater; + + static draw_option = function(_x, _y, index) { + var _cur_opt = toggles[index]; + _cur_opt.x1 = _x; + _cur_opt.y1 = _y; + _cur_opt.update(); + _cur_opt.active = index == current_selection; + _cur_opt.button_color = _cur_opt.active ? active_col : inactive_col; + return _cur_opt; + }; + + static draw = function() { + add_draw_return_values(); + + draw_set_valign(fa_top); + draw_set_color(active_col); + draw_set_font(title_font); + draw_set_alpha(1); + + var title_h = 0; + if (draw_title) { + if (max_width > 0) { + draw_set_halign(fa_center); + draw_text(x1 + max_width * 0.5, y1, title); + } else { + draw_set_halign(fa_left); + draw_text(x1, y1, title); + } + title_h = string_height(title) + 10; + } + + changed = false; + var _start_current_selection = current_selection; + + var _prev_x = x1; + var _prev_y = y1 + title_h; + + var row_items = []; // holds structs: { btn: , idx: } + var row_width = 0; + var row_height = 0; + + for (var i = 0; i < array_length(toggles); i++) { + var _cur_opt = draw_option(_prev_x, _prev_y, i); + + _prev_x = _cur_opt.x2 + x_gap; + row_width = _prev_x - x1; + row_height = max(row_height, _cur_opt.height); + + var row_full = (max_width > 0) && (row_width > max_width); + var last_item = i == array_length(toggles) - 1; + + array_push(row_items, { + btn: _cur_opt, + idx: i, + }); + + if (row_full || last_item) { + // Calculate final row width and optional centering offset + var _first_btn = row_items[0].btn; + var _last_btn = row_items[array_length(row_items) - 1].btn; + + var _total_row_width = _last_btn.x2 - _first_btn.x1; + var _container_width = (max_width > 0) ? max_width : _total_row_width; + var _offset_x = center ? (_container_width - _total_row_width) * 0.5 : 0; + + // Draw row items at their final positions + for (var j = 0; j < array_length(row_items); j++) { + var btn = row_items[j].btn; + var idx = row_items[j].idx; + btn.x1 += _offset_x; // shift to center + btn.update(); + btn.draw(); + if (btn.clicked() && allow_changes) { + current_selection = idx; // <-- no array_index_of needed + } + } + + // Advance to next row + var row_right_edge = x1 + max(_container_width, _total_row_width); + x2 = max(x2, row_right_edge); + _prev_x = x1; + _prev_y += row_height + y_gap; + y2 = _prev_y; + + // Reset accumulators + row_items = []; + row_width = 0; + row_height = 0; + } + } + + if (_start_current_selection != current_selection) { + changed = true; + } + pop_draw_return_values(); + }; + + static selection_val = function(value) { + if (current_selection == -1) { + return noone; + } + return toggles[current_selection][$ value]; + }; } -function ToggleButton(data={}) constructor { +/// @function ToggleButton(data) +/// @constructor +/// @category UI +/// @description A toggleable button element with hover and active states. +/// @param {struct} [data={}] Initial properties. +/// @returns {ToggleButton} +function ToggleButton(data = {}) constructor { x1 = 0; y1 = 0; - x2 = 0; - y2 = 0; - tooltip = ""; + x2 = 0; + y2 = 0; + tooltip = ""; str1 = ""; width = 0; - height = 0; + height = 0; state_alpha = 1; hover_alpha = 1; active = true; @@ -501,38 +967,52 @@ function ToggleButton(data={}) constructor { text_color = c_gray; button_color = c_gray; font = fnt_40k_12; - var _data_presets = struct_get_names(data); - for (var i=0;i 0.5) state_alpha -= 0.05; - } - else{ - if (state_alpha < 1) state_alpha += 0.05; + if (!active) { + if (state_alpha > 0.5) { + state_alpha -= 0.05; + } + } else { + if (state_alpha < 1) { + state_alpha += 0.05; + } if (hover()) { - if (hover_alpha > 0.8) hover_alpha -= 0.02; // Decrease state_alpha when hovered + if (hover_alpha > 0.8) { + hover_alpha -= 0.02; + } // Decrease state_alpha when hovered } else { - if (hover_alpha < 1) hover_alpha += 0.03; // Increase state_alpha when not hovered + if (hover_alpha < 1) { + hover_alpha += 0.03; + } // Increase state_alpha when not hovered } } - if (tooltip!=""){ - if (hover()){ - tooltip_draw(tooltip); - } + if (tooltip != "") { + if (hover()) { + tooltip_draw(tooltip); + } } total_alpha = state_alpha * hover_alpha; - draw_rectangle_color_simple(x1, y1, x1 + width, y1 + str1_h, 1, button_color, total_alpha); - draw_set_halign(text_halign); - draw_set_valign(fa_top); - draw_text_color_simple(text_x, text_y, str1, text_color, total_alpha); - draw_set_alpha(1); - draw_set_halign(fa_left); + + if (style == "default") { + draw_rectangle_color_simple(x1, y1, x1 + width, y1 + str1_h, 1, button_color, total_alpha); + draw_set_halign(text_halign); + draw_set_valign(fa_top); + draw_text_color_simple(text_x, text_y, str1, text_color, total_alpha); + draw_set_alpha(1); + draw_set_halign(fa_left); + } else if (style == "box") { + // Icon with alpha + draw_set_halign(fa_left); + draw_sprite_ext(spr_creation_check, active, x1 + 2, y1, 1, 1, 0, c_white, total_alpha); + // Label centred below icon + draw_set_alpha(total_alpha); + draw_set_valign(fa_top); + draw_set_halign(fa_center); + var _label_y = y1 + 32 + 2; + draw_text_transformed(x1 + 18, _label_y, str1, 1, 1, 0); + draw_set_alpha(1); + } + + if (clicked_check_default) { + clicked(); + } + pop_draw_return_values(); }; } -function InteractiveButton(data={}) constructor { +/// @function InteractiveButton(data) +/// @constructor +/// @category UI +/// @description A button with separate active/inactive tooltips and click sounds. +/// @param {struct} [data={}] Initial properties. +/// @returns {InteractiveButton} +function InteractiveButton(data = {}) constructor { x1 = 0; y1 = 0; - x2 = 0; - y2 = 0; + x2 = 0; + y2 = 0; str1 = ""; inactive_tooltip = ""; tooltip = ""; width = 0; - height = 0; + height = 0; state_alpha = 1; hover_alpha = 1; active = true; @@ -587,10 +1099,10 @@ function InteractiveButton(data={}) constructor { text_color = c_gray; button_color = c_gray; var _data_presets = struct_get_names(data); - for (var i=0;i 0.5) state_alpha -= 0.05; + if (!active) { + if (state_alpha > 0.5) { + state_alpha -= 0.05; + } if (inactive_tooltip != "" && hover()) { tooltip_draw(inactive_tooltip); } - } else{ - if (state_alpha < 1) state_alpha += 0.05; + } else { + if (state_alpha < 1) { + state_alpha += 0.05; + } if (hover()) { - if (hover_alpha > 0.8) hover_alpha -= 0.02; // Decrease state_alpha when hovered + if (hover_alpha > 0.8) { + hover_alpha -= 0.02; + } // Decrease state_alpha when hovered if (tooltip != "") { tooltip_draw(tooltip); } } else { - if (hover_alpha < 1) hover_alpha += 0.03; // Increase state_alpha when not hovered + if (hover_alpha < 1) { + hover_alpha += 0.03; + } // Increase state_alpha when not hovered } } @@ -657,24 +1177,30 @@ function InteractiveButton(data={}) constructor { }; } -function list_traveler(list, cur_val, move_up_coords, move_down_coords){ - var _new_val = cur_val; +/// @function list_traveler(list, cur_val, move_up_coords, move_down_coords) +/// @description Cycles through values in a list by clicking move-up/down regions. +/// @param {array} list Array of values. +/// @param {any} cur_val Current value. +/// @param {array} move_up_coords Bounding box for up button. +/// @param {array} move_down_coords Bounding box for down button. +/// @returns {any} New value from list. +function list_traveler(list, cur_val, move_up_coords, move_down_coords) { + var _new_val = cur_val; var _found = false; - for (var i=0;i= 24) { + oscillate_down = false; + } + } else { + oscillate -= 0.2; + if (oscillate <= 8) { + oscillate_down = true; + } + } + + if (hover_alpha > 0) { + hover_alpha -= 0.04; + draw_set_blend_mode(bm_add); + draw_set_alpha(hover_alpha); + draw_sprite_ext(hover_sprite, 0, _x, _y, _x_scale, _y_scale, 0, c_white, hover_alpha); + draw_set_blend_mode(bm_normal); + } + } + + if (hot_key != -1 && !is_clicked) { + if (press_with_held(hot_key, vk_alt)) { + is_clicked = true; + } + } + + draw_set_alpha(1.0); + draw_sprite_ext(base_sprite, floor(oscillate), _x, _y, _x_scale, _y_scale, 0, c_white, 1.0); + + draw_set_color(c_white); + draw_set_halign(fa_center); + draw_set_valign(fa_top); + draw_set_font(fnt_cul_14); + + var _text_x = _x + (_final_w / 2); + var _text_y = _y + (4 * _y_scale); + var _sep = 18 * _y_scale; + var _line_w = _final_w - (15 * _x_scale); + + draw_text_ext(_text_x, _text_y, _text, _sep, _line_w); + + if (is_clicked && is_callable(on_click)) { + on_click(); + } + + pop_draw_return_values(); + return is_clicked; + }; +} + diff --git a/scripts/scr_buttons/scr_buttons.yy b/scripts/scr_buttons/scr_buttons.yy index 9592835de0..3f908e029d 100644 --- a/scripts/scr_buttons/scr_buttons.yy +++ b/scripts/scr_buttons/scr_buttons.yy @@ -5,8 +5,8 @@ "isDnD":false, "name":"scr_buttons", "parent":{ - "name":"Scripts", - "path":"folders/Scripts.yy", + "name":"User Interface", + "path":"folders/Scripts/User Interface.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/scr_chaos_alliance_test/scr_chaos_alliance_test.gml b/scripts/scr_chaos_alliance_test/scr_chaos_alliance_test.gml index 1227f09f53..3324212147 100644 --- a/scripts/scr_chaos_alliance_test/scr_chaos_alliance_test.gml +++ b/scripts/scr_chaos_alliance_test/scr_chaos_alliance_test.gml @@ -2,7 +2,7 @@ function scr_chaos_alliance_test() { var accept_chance,o,result,jroll,shittah; - accept_chance=0;o=0;result="";jroll=floor(random(100))+1;shittah=false; + accept_chance=0;o=0;result="";jroll=roll_dice_chapter(1, 100, "high"); accept_chance+=(obj_controller.marines*0.00375); accept_chance+=(obj_controller.command*0.00375); @@ -14,14 +14,12 @@ function scr_chaos_alliance_test() { if (scr_has_adv("Reverent Guardians")) then accept_chance-=2; if (scr_has_disadv("Never Forgive")) then accept_chance-=2; if (scr_has_adv("Enemy: Fallen")){accept_chance-=999;result="fail_fallen";} - if (scr_has_disadv("Shitty Luck")) then shittah=true; if (string_count("|CPF|",obj_controller.useful_info)>0) then result="fail_angry"; if (string_count("CHTRP2|",obj_controller.useful_info)>0) then result="fail"; if (accept_chance<3) and (result="") then result="fail"; if (accept_chance>=3) and (result=""){ accept_chance=round(accept_chance*15); - if (shittah=true) then accept_chance-=20; if (jroll<=accept_chance) then result="success"; if (jroll>accept_chance) then result="success_trap"; diff --git a/scripts/scr_chapter_managent_events/scr_chapter_managent_events.gml b/scripts/scr_chapter_managent_events/scr_chapter_managent_events.gml new file mode 100644 index 0000000000..48ca6fb654 --- /dev/null +++ b/scripts/scr_chapter_managent_events/scr_chapter_managent_events.gml @@ -0,0 +1,288 @@ + + +///@mixin obj_popup +function tech_uprising_event_aftermath(){ + var tech, t, i, check_tech, location_techs, location_heretics, delete_positions; + techs = collect_role_group(SPECIALISTS_TECHS); + var tech_count = array_length(techs); + for (i = 0; i < tech_count; i++) { + var heretic_data = [0, 0, 0] + var loyal_data = [0, 0, 0]; + delete_positions = []; + location_techs = []; + location_heretics = []; + tech = techs[i]; + if (tech.has_trait("tech_heretic")) { + array_push(location_heretics, tech); + heretic_data[0] += tech.weapon_skill; + heretic_data[1] += tech.wisdom; + heretic_data[2] += tech.ballistic_skill; + } else { + array_push(location_techs, tech); + loyal_data[0] += tech.weapon_skill; + loyal_data[1] += tech.wisdom; + loyal_data[2] += tech.ballistic_skill; + } + //loop techs to fins out which techs are in the same location + for (t = i + 1; t < tech_count; t++) { + check_tech = techs[t].marine_location(); + if (same_locations(tech.marine_location(), check_tech)) { + if (techs[t].has_trait("tech_heretic")) { + array_push(location_heretics, techs[t]); + heretic_data[0] += techs[t].weapon_skill; + heretic_data[1] += techs[t].wisdom; + heretic_data[2] += techs[t].ballistic_skill; + } else { + array_push(location_techs, techs[t]); + loyal_data[0] += techs[t].weapon_skill; + loyal_data[1] += techs[t].wisdom; + loyal_data[2] += techs[t].ballistic_skill; + } + array_push(delete_positions, t); + } + } + if (array_length(location_heretics) > 0 && array_length(location_techs) > 0) { + var purge_target = "none"; + if (press == 0) { + var tal; + var heretic_tally = 0; + var loyal_tally = 0; + for (tal = 0; tal < 3; tal++) { + if (heretic_data[tal] > loyal_data[0]) { + heretic_tally++; + } else if (heretic_data[tal] < loyal_data[0]) { + loyal_tally++; + } + } + if (heretic_tally > loyal_tally) { + purge_target = location_techs; + } else if (heretic_tally < loyal_tally) { + purge_target = location_heretics; + } + if (purge_target == "none") { + purge_target = choose(location_heretics, location_techs); + } + } else if (press == 1) { + purge_target = location_techs; + } else if (press == 2) { + purge_target = location_heretics; + } + if (purge_target != "none") { + for (tal = 0; tal < array_length(purge_target); tal++) { + kill_and_recover(purge_target[tal].company, purge_target[tal].marine_number); + } + } + } + if (array_length(delete_positions) > 0) { + for (t = array_length(delete_positions) - 1; t >= 0; t--) { + array_delete(techs, delete_positions[t], 1); + tech_count--; + } + } + } + if (press == 0) { + text = "With neither faction receiving your favor it is not long until the BloodLetting begins. Within a month a brutal civil war engulfs the Tech ranks with losses suffered on both sides"; + } else if (press == 1) { + text = "With your full support the so called 'heretics' who have seen through the lies of the bureaucracy of Mars eliminate those who will not be swayed to see the truth."; + obj_controller.tech_status = "heretics"; + } else if (press == 2) { + text = "The extremists and heretics that have been allowed to grow like a cancer in the Armentarium are rooted out and disposed of."; + } + reset_popup_options(); + press = 0; + pathway = "end_splash"; +} + +function tech_uprising_event(){ + var _pop_data = { + + } + var _options=[ + { + str1 :"Do Nothing", + choice_func:tech_uprising_event_aftermath + }, + { + str1 :"Support the heretics", + choice_func:tech_uprising_event_aftermath + }, + { + str1 :"Support the Cult mechanicus faithfuls", + choice_func:tech_uprising_event_aftermath + } + ] + + _pop_data.options = _options; + scr_popup( + "Technical Differences!", + "You Recive an Urgent Transmision A serious breakdown in culture has coccured causing believers in tech heresy to demand that they are given preseidence and assurance to continue their practises", + "tech_uprising", + _pop_data + ); +} + +function setup_new_forge_master_popup(techs){ + var last_master = obj_ini.previous_forge_masters[array_length(obj_ini.previous_forge_masters)-1]; + var _pop_data = { + techs, + charisma_pick : techs[0], + experience_pick : techs[0], + talent_pick : techs[0], + marine_stat_display_uid:"", + marine_stat_display:0, + marine_display_image :-1, + marine_display_triggered : false, + } + + for (var i=array_length(techs)-1;i >= 0;i--){ + if (techs[i].role() != obj_ini.role[100][16]){ + array_delete(techs,i,1); + } + } + + for (i = 1; i < array_length(techs); i++) { + if (_pop_data.charisma_pick.charisma < techs[i].charisma) { + _pop_data.charisma_pick = techs[i]; + } + if (_pop_data.experience_pick.experience < techs[i].experience) { + _pop_data.experience_pick = techs[i]; + } + if (_pop_data.talent_pick.technology < techs[i].technology) { + _pop_data.talent_pick = techs[i]; + } + } + var _options = [ + { + str1: "Popular Pick", + choice_func:function(){ + new_forge_master_chosen(pop_data.charisma_pick); + }, + hover :function(){ + setup_popup_marine_stat_display(pop_data.charisma_pick) + } + }, + { + str1: "Experience Pick", + choice_func:function(){ + new_forge_master_chosen(pop_data.experience_pick); + }, + hover :function(){ + setup_popup_marine_stat_display(pop_data.experience_pick) + } + }, + { + str1: "Talent Pick", + choice_func:function(){ + new_forge_master_chosen(pop_data.talent_pick); + }, + hover :function(){ + setup_popup_marine_stat_display(pop_data.talent_pick) + } + }, + ] + _pop_data.options = _options; + scr_popup( + "New Forge Master", + $"The Demise of Forge Master {last_master} means a replacement must be chosen. Several Options have already been put forward to you but it is ultimatly your decision.", + "new_forge_master", + _pop_data + ); +} + +function setup_popup_marine_stat_display(unit){ + if (unit.uid != pop_data.marine_stat_display_uid){ + if (is_struct(pop_data.marine_display_image)){ + pop_data.marine_display_image.destroy_image(); + } + pop_data.marine_stat_display_uid = unit.uid; + pop_data.marine_display_image = unit.draw_unit_image(); + pop_data.marine_stat_display = unit; + } + pop_data.marine_display_triggered = true; +} + + +function new_forge_master_chosen(pick){ + var cur_tech; + var skill_lack = 0; + var exp_lack = 0; + var dislike = 0; + var popularity_lack = 0; + var charisma_test = 0; + techs = pop_data.techs; + for (i = 0; i < array_length(techs); i++) { + + cur_tech = techs[i]; + if (cur_tech.uid == pick.uid){ + continue; + } + charisma_test = global.character_tester.oppposed_test(pick, cur_tech, "charisma", 10); + if (charisma_test[0] != 1) { + if (pick.technology < cur_tech.technology) { + skill_lack++; + cur_tech.loyalty -= cur_tech.technology - pick.technology; + } + if (pick.experience < cur_tech.experience) { + exp_lack++; + cur_tech.loyalty -= floor((cur_tech.experience - pick.experience) / 200); + } + if (charisma_test[0] == 2) { + dislike++; + cur_tech.loyalty -= charisma_test[1]; + } + } + } + + if (pick != "none") { + pick.update_role("Forge Master"); + + var likability; + if (dislike <= 5) { + likability = "He is generally well liked"; + } + if (dislike > 5) { + likability = "He is not generally well liked"; + } + if (dislike > 10) { + likability = "He mostly disliked"; + } + if (dislike == 0) { + likability = "He is like by all of his tech brothers"; + } + text = $"{pick.name()} is selected as the new {pick.role()} {likability}."; + if (skill_lack > 0 && skill_lack < 6) { + text += "There are some questions about his ability."; + } else if (skill_lack > 6) { + text += "Many Question his Technical Talents."; + } + if (exp_lack > 0 && exp_lack < 6) { + text += "A few have raised questions over his experience."; + } else if (exp_lack >= 6) { + text += "There have been Many concerns over his experience."; + } + if (popularity_lack > 1 && popularity_lack < 6) { + text += "He is not unanimously liked."; + } else if (popularity_lack >= 6) { + text += "He is disliked by many."; + } + var lacks = skill_lack + exp_lack + popularity_lack; + if (lacks < ((array_length(techs) - 1) / 10)) { + text += "Your choice Is almost unanimously respected"; + } else if (lacks < ((array_length(techs) - 1) / 4)) { + text += "While a few may have preferred another there are no serious concerns"; + } else if (lacks < ((array_length(techs) - 1) / 2)) { + text += "Your supporters are more than our detractors but many are unhappy"; + } else if (lacks < ((array_length(techs) - 1) * 0.65)) { + text += "Most are unhappy with the decision but your word is final"; + } + reset_popup_options(); + if (pick.company > 0) { + for (var i = 1; i < 500; i++) { + if (obj_ini.name[0][i] == "") { + break; + } + } + scr_move_unit_info(pick.company, 0, pick.marine_number, i); + } + } +} \ No newline at end of file diff --git a/scripts/scr_chapter_managent_events/scr_chapter_managent_events.yy b/scripts/scr_chapter_managent_events/scr_chapter_managent_events.yy new file mode 100644 index 0000000000..0a96e9d9aa --- /dev/null +++ b/scripts/scr_chapter_managent_events/scr_chapter_managent_events.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_chapter_managent_events", + "isCompatibility":false, + "isDnD":false, + "name":"scr_chapter_managent_events", + "parent":{ + "name":"events_and_missions", + "path":"folders/Scripts/events_and_missions.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_chapter_master/scr_chapter_master.gml b/scripts/scr_chapter_master/scr_chapter_master.gml new file mode 100644 index 0000000000..02b88b5ad4 --- /dev/null +++ b/scripts/scr_chapter_master/scr_chapter_master.gml @@ -0,0 +1,32 @@ +function scr_chapter_master() constructor{ + favours = { + faction_leaders : array_create(15, 0), + minor_characters : {}, + } + + static get_struct = function(){ + return fetch_unit([0,0]); + } + +} + +function cm_obj(){ + return obj_controller.chapter_master; +} + +function has_faction_favour(diplomacy_faction){ + return (cm_obj().favours.faction_leaders[diplomacy_faction] > 0); +} + +function get_faction_favour(diplomacy_faction){ + + return cm_obj().favours.faction_leaders[diplomacy_faction]; +} + +function edit_faction_favour(diplomacy_faction,edit_val){ + with (cm_obj().favours){ + var _val = faction_leaders[diplomacy_faction]; + faction_leaders[diplomacy_faction] = clamp(_val+edit_val, 0, 100000); + return faction_leaders[diplomacy_faction]; + } +} \ No newline at end of file diff --git a/scripts/scr_chapter_master/scr_chapter_master.yy b/scripts/scr_chapter_master/scr_chapter_master.yy new file mode 100644 index 0000000000..a099b66e20 --- /dev/null +++ b/scripts/scr_chapter_master/scr_chapter_master.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_chapter_master", + "isCompatibility":false, + "isDnD":false, + "name":"scr_chapter_master", + "parent":{ + "name":"marines_and_profiles", + "path":"folders/Scripts/marines_and_profiles.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_chapter_new/scr_chapter_new.gml b/scripts/scr_chapter_new/scr_chapter_new.gml index 39ca5ef319..d3e3d57715 100644 --- a/scripts/scr_chapter_new/scr_chapter_new.gml +++ b/scripts/scr_chapter_new/scr_chapter_new.gml @@ -189,13 +189,12 @@ function ChapterData() constructor { /// @mixin obj_creation /// @description called when a chapter's icon is clicked on the first page after the main menu. /// used to set up initialise the data that is later fed into `scr_initialize_custom` when the game starts -function scr_chapter_new(argument0) { +function scr_chapter_new(chapter_identifier) { full_liveries = ""; // until chapter objects are in full use kicks off livery propogation company_liveries = ""; - // argument0 = chapter obj_creation.use_chapter_object = false; // for the new json testing var chapter_id = eCHAPTERS.UNKNOWN; @@ -216,7 +215,8 @@ function scr_chapter_new(argument0) { world_feature = array_create(20, ""); - points=100;maxpoints=100; + points=100; + maxpoints=100; function load_default_gear(_role_id, _role_name, _wep1, _wep2, _armour, _mobi, _gear){ for(var i = 100; i <=102; i++){ @@ -249,7 +249,7 @@ function scr_chapter_new(argument0) { for(var c = 0; c < array_length(obj_creation.all_chapters); c++){ - if(argument0 == obj_creation.all_chapters[c].name && obj_creation.all_chapters[c].json == true){ + if(chapter_identifier == obj_creation.all_chapters[c].name && obj_creation.all_chapters[c].json == true){ obj_creation.use_chapter_object = true; chapter_id = obj_creation.all_chapters[c].id; } @@ -260,30 +260,32 @@ function scr_chapter_new(argument0) { var chapter_obj = new ChapterData(); var successfully_loaded = chapter_obj.load_from_json(chapter_id); if(!successfully_loaded){ - var issue = $"No json file exists for chapter id {chapter_id} and name {argument0}"; + var issue = $"No json file exists for chapter id {chapter_id} and name {chapter_identifier}"; // log_error(issue); scr_popup("Error Loading Chapter", issue, "debug"); return false; } global.chapter_creation_object = chapter_obj; + maxpoints=150; } #region Custom Chapter //generates custom chapter if it exists - if (is_real(argument0) && argument0 >= eCHAPTERS.CUSTOM_1 && argument0 <= eCHAPTERS.CUSTOM_10){ + if (is_real(chapter_identifier) && chapter_identifier >= eCHAPTERS.CUSTOM_1 && chapter_identifier <= eCHAPTERS.CUSTOM_10){ obj_creation.use_chapter_object = true; var chapter_obj = new ChapterData(); - var successfully_loaded = chapter_obj.load_from_json(argument0, true); + var successfully_loaded = chapter_obj.load_from_json(chapter_identifier, true); if(!successfully_loaded){ - var issue = $"No json file exists for chapter id {argument0} and name {argument0}"; + var issue = $"No json file exists for chapter id {chapter_identifier} and name {chapter_identifier}"; log_error(issue); scr_popup("Error Loading Chapter", issue, "debug"); return false; } global.chapter_creation_object = chapter_obj; + maxpoints=100; } #endregion @@ -301,10 +303,6 @@ function scr_chapter_new(argument0) { global.chapter_icon.name = chapter_object.icon_name; obj_creation.fleet_type = chapter_object.fleet_type; - obj_creation.strength = chapter_object.strength; - obj_creation.purity = chapter_object.purity; - obj_creation.stability = chapter_object.stability; - obj_creation.cooperation = chapter_object.cooperation; obj_creation.homeworld_exists = chapter_object.homeworld_exists; obj_creation.homeworld = chapter_object.homeworld; @@ -321,8 +319,6 @@ function scr_chapter_new(argument0) { obj_creation.buttons.home_planets.current_selection = chapter_object.home_planets ??1; obj_creation.aspirant_trial = trial_map(chapter_object.aspirant_trial); - obj_creation.adv = chapter_object.advantages; - obj_creation.dis = chapter_object.disadvantages; obj_creation.buttons.culture_styles.set(chapter_object.culture_styles); obj_creation.full_liveries = chapter_object.full_liveries; @@ -498,37 +494,41 @@ function scr_chapter_new(argument0) { if(struct_exists(chapter_object, "custom_advisors")){ obj_creation.custom_advisors = chapter_object.custom_advisors; } - - - - - points = chapter_object.points; - maxpoints=chapter_object.points; - - } - - - - - - - for(var a = 0; a < array_length(adv); a++){ - for(var k = 0; k < array_length(obj_creation.all_advantages); k++){ - if(adv[a]!="" && obj_creation.all_advantages[k].name=adv[a]){ - adv_num[a] = k; + // Validate and clamp trait values to sane ranges (defaulting if missing/invalid) + obj_creation.strength = clamp(is_real(chapter_object.strength) ? chapter_object.strength : 5, 0, 10); + obj_creation.purity = clamp(is_real(chapter_object.purity) ? chapter_object.purity : 5, 0, 10); + obj_creation.stability = clamp(is_real(chapter_object.stability) ? chapter_object.stability : 50, 0, 100); + obj_creation.cooperation = clamp(is_real(chapter_object.cooperation) ? chapter_object.cooperation : 5, 0, 10); + points = 0; + + points += (obj_creation.strength-5)*10; + points += (obj_creation.purity-5)*10; + points += (obj_creation.stability-50); + points += (obj_creation.cooperation-5)*10; + + var _open_adv = 0; + for (var i=0;i0){ + show_debug_message_adv("meet forge master"); + obj_controller.menu_lock = false; + instance_destroy(obj_popup_dialogue); + scr_toggle_diplomacy(); + obj_controller.diplomacy = -1; + obj_controller.character_diplomacy = _forge_master[0]; + diplo_txt="Greetings chapter master"; + } else { + show_debug_message_adv("no forge master"); + } + break; } } } catch(_exception) { - show_debug_message(_exception.longMessage); + show_debug_message_adv(_exception.longMessage); + } +} + + +/// @mixin obj_Star_Select +function draw_planet_debug_options(){ + try{ + add_draw_return_values(); + draw_set_halign(fa_left); + draw_set_color(c_white); + draw_set_alpha(1); + if (debug) { + debug_slate.inside_method = function(){ + debug_options.draw() + if (debug_options.current_selection == 0){ + draw_planet_debug_forces(); + } else if (debug_options.current_selection == 1){ + draw_planet_debug_problems(); + } else if (debug_options.current_selection == 2){ + draw_planet_debug_features(); + } + } + debug_slate.draw() + } + if (debug_button.draw()){ + debug = !debug; + //scroll_problems = new ScrollableContainer() + } + pop_draw_return_values(); + }catch(_exception){ + handle_exception(_exception); } -} \ No newline at end of file +} + +function draw_planet_debug_features(){ + static _addable_features = [ + { + e_num : P_features.Gene_Stealer_Cult, + name : "GeneStealer Cult" + }, + { + e_num : P_features.Ancient_Ruins, + name : "Ancient Ruins" + }, + { + e_num : P_features.Artifact, + name : "Artefact" + }, + { + e_num : P_features.STC_Fragment, + name : "STC Fragment" + }, + { + e_num : P_features.Sororitas_Cathedral, + name : "Sororitas Cathedral" + }, + { + e_num : P_features.OrkWarboss, + name : "Ork Warboss" + }, + { + e_num : P_features.OrkStronghold, + name : "Ork stronghold" + }, + { + e_num : P_features.Monastery, + name : "Fortress Monastery" + }, + { + e_num : P_features.Starship, + name : "Ancient Starship" + }, + + ] + + var base_y = 220; + base_y += 2; + + + for (var i=0;i0){ if (unit.is_at_location(system,planet_or_ship_id,-1)){ marine_present=true; diff --git a/scripts/scr_clean/scr_clean.gml b/scripts/scr_clean/scr_clean.gml index 78e64a7c29..09c7fd95b7 100644 --- a/scripts/scr_clean/scr_clean.gml +++ b/scripts/scr_clean/scr_clean.gml @@ -110,7 +110,7 @@ function check_dead_marines(unit_struct, unit_index) { return unit_lost; } -function scr_clean(target_object, target_is_infantry, hostile_shots, hostile_damage, hostile_weapon, hostile_range, hostile_splash) { +function scr_clean(target_object, target_is_infantry, hostile_shots, hostile_damage, hostile_weapon, hostile_range, hostile_splash, weapon_index_position) { // Converts enemy scr_shoot damage into player marine or vehicle casualties. // // Parameters: @@ -128,154 +128,36 @@ function scr_clean(target_object, target_is_infantry, hostile_shots, hostile_dam exit; } - var vehicle_hits = 0; - var man_hits = 0; - var total_hits = hostile_shots; - var unit_type = ""; + var damage_data = { + "units_lost": 0, + "unit_type": "", + "hits": 0 + }; // ### Vehicle Damage Processing ### if (!target_is_infantry && veh > 0) { - var you = -1; - - // Find valid vehicle targets - var valid_vehicles = []; - for (var v = 0; v < veh; v++) { - if (veh_hp[v] > 0 && veh_dead[v] == 0) { - array_push(valid_vehicles, v); - } - } - - // Apply damage for each hostile shot, until we run out of targets - for (var shot = 0; shot < total_hits; shot++) { - if (array_length(valid_vehicles) == 0) { - break; - } - - // Select a random vehicle from the valid list - var random_index = array_random_index(valid_vehicles); - you = random_index; - - // Apply damage - var _modified_damage = hostile_damage - veh_ac[you]; - if (_modified_damage < 0) { - _modified_damage = 0.25; - } - if (enemy == 13 && _modified_damage < 1) { - _modified_damage = 1; - } - veh_hp[you] -= _modified_damage; - unit_type = veh_type[you]; - vehicle_hits++; - - var units_lost = 0; - // Check if the vehicle is destroyed - if (veh_hp[you] <= 0 && veh_dead[you] == 0) { - veh_dead[you] = 1; - units_lost++; - obj_ncombat.player_forces -= 1; - - // Record loss - var existing_index = array_get_index(lost, veh_type[you]); - if (existing_index != -1) { - lost_num[existing_index] += 1; - } else { - array_push(lost, veh_type[you]); - array_push(lost_num, 1); - } - - // Remove dead vehicles from further hits - array_delete(valid_vehicles, you, 1); - } - // Flavor messages - scr_flavor2(units_lost, unit_type, hostile_range, hostile_weapon, vehicle_hits, hostile_splash); - } + damage_vehicles(damage_data, hostile_shots, hostile_damage, weapon_index_position); } // ### Marine + Dreadnought Processing ### if (target_is_infantry && (men + dreads > 0)) { - man_hits = total_hits - vehicle_hits; - - // Find valid infantry targets - var valid_marines = []; - for (var m = 0; m < array_length(unit_struct); m++) { - var unit = unit_struct[m]; - if (is_struct(unit) && unit.hp() > 0 && marine_dead[m] == 0) { - array_push(valid_marines, m); - } + damage_infantry(damage_data, hostile_shots, hostile_damage, weapon_index_position); + } + + if (damage_data.hits < hostile_shots) { + // ### Vehicle Damage Processing ### + if (target_is_infantry && veh > 0) { + damage_vehicles(damage_data, hostile_shots, hostile_damage, weapon_index_position); } - // Apply damage for each shot - for (var shot = 0; shot < man_hits; shot++) { - if (array_length(valid_marines) == 0) { - break; // No valid targets left - } - - // Select a random marine from the valid list - var random_index = array_random_index(valid_marines); - var marine_index = valid_marines[random_index]; - var marine = unit_struct[marine_index]; - unit_type = marine.role(); - var units_lost = 0; - - // Apply damage - var _shot_luck = roll_dice(1, 100, "low"); - var _modified_damage = 0; - if (_shot_luck <= 5) { - _modified_damage = hostile_damage - (2 * marine_ac[marine_index]); - } else if (_shot_luck > 95) { - _modified_damage = hostile_damage; - } else { - _modified_damage = hostile_damage - marine_ac[marine_index]; - } - - if (_modified_damage > 0) { - var damage_resistance = marine.damage_resistance() / 100; - if (marine_mshield[marine_index] > 0) { - damage_resistance += 0.1; - } - if (marine_fiery[marine_index] > 0) { - damage_resistance += 0.15; - } - if (marine_fshield[marine_index] > 0) { - damage_resistance += 0.08; - } - if (marine_quick[marine_index] > 0) { - damage_resistance += 0.2; - } // TODO: only if melee - if (marine_dome[marine_index] > 0) { - damage_resistance += 0.15; - } - if (marine_iron[marine_index] > 0) { - if (damage_resistance <= 0) { - marine.add_or_sub_health(20); - } else { - damage_resistance += marine_iron[marine_index] / 5; - } - } - _modified_damage = round(_modified_damage * (1 - damage_resistance)); - } - if (_modified_damage < 0 && hostile_weapon == "Fleshborer") { - _modified_damage = 1.5; - } - /* if (hostile_weapon == "Web Spinner") { - var webr = floor(random(100)) + 1; - var chunk = max(10, 62 - (marine_ac[marine_index] * 2)); - _modified_damage = (webr <= chunk) ? 5000 : 0; - } */ - marine.add_or_sub_health(-_modified_damage); - - // Check if marine is dead - if (check_dead_marines(marine, marine_index)) { - // Remove dead infantry from further hits - array_delete(valid_marines, marine_index, 1); - units_lost++; - } - - // Flavor messages - scr_flavor2(units_lost, unit_type, hostile_range, hostile_weapon, man_hits, hostile_splash); + // ### Marine + Dreadnought Processing ### + if (!target_is_infantry && (men + dreads > 0)) { + damage_infantry(damage_data, hostile_shots, hostile_damage, weapon_index_position); } } + scr_flavor2(damage_data.units_lost, damage_data.unit_type, hostile_range, hostile_weapon, damage_data.hits, hostile_splash); + // ### Cleanup ### // If the target_object got wiped out, move it off-screen if ((men + veh + dreads) <= 0) { @@ -287,3 +169,183 @@ function scr_clean(target_object, target_is_infantry, hostile_shots, hostile_dam handle_exception(_exception); } } + +/// @mixin +function damage_infantry(_damage_data, _shots, _damage, _weapon_index) { + var _armour_pierce = apa[_weapon_index]; + var _armour_mod = 0; + switch (_armour_pierce) { + case 4: + _armour_mod = 0; + break; + case 3: + _armour_mod = 1.5; + break; + case 2: + _armour_mod = 2; + break; + case 1: + _armour_mod = 3; + break; + default: + _armour_mod = 3; + break; + } + + // Find valid infantry targets + var valid_marines = []; + for (var m = 0, l = array_length(unit_struct); m < l; m++) { + var unit = unit_struct[m]; + if (is_struct(unit) && unit.hp() > 0 && marine_dead[m] == 0) { + array_push(valid_marines, m); + } + } + + // Apply damage for each shot + for (var shot = 0; shot < _shots; shot++) { + if (array_length(valid_marines) == 0) { + break; // No valid targets left + } + + _damage_data.hits++; + + // Select a random marine from the valid list + var marine_index = array_random_element(valid_marines); + var marine = unit_struct[marine_index]; + _damage_data.unit_type = marine.role(); + + // Apply damage + var _shot_luck = roll_dice_chapter(1, 100, "low"); + var _modified_damage = 0; + var _marine_armour = marine_ac[marine_index] * _armour_mod; + if (_shot_luck == 1) { + _modified_damage = _damage - (2 * _marine_armour); + } else if (_shot_luck == 100) { + _modified_damage = _damage; + } else { + _modified_damage = _damage - _marine_armour; + } + + if (_modified_damage > 0) { + var damage_resistance = marine.damage_resistance() / 100; + if (marine_mshield[marine_index] > 0) { + damage_resistance += 0.1; + } + if (marine_fiery[marine_index] > 0) { + damage_resistance += 0.15; + } + if (marine_fshield[marine_index] > 0) { + damage_resistance += 0.08; + } + if (marine_quick[marine_index] > 0) { + damage_resistance += 0.2; + } // TODO: only if melee + if (marine_dome[marine_index] > 0) { + damage_resistance += 0.15; + } + if (marine_iron[marine_index] > 0) { + if (damage_resistance <= 0) { + marine.add_or_sub_health(20); + } else { + damage_resistance += marine_iron[marine_index] / 5; + } + } + _modified_damage = round(_modified_damage * (1 - damage_resistance)); + } + if (_modified_damage < 0 && hostile_weapon == "Fleshborer") { + _modified_damage = 1.5; + } + /* if (hostile_weapon == "Web Spinner") { + var webr = floor(random(100)) + 1; + var chunk = max(10, 62 - (marine_ac[marine_index] * 2)); + _modified_damage = (webr <= chunk) ? 5000 : 0; + } */ + marine.add_or_sub_health(-_modified_damage); + + // Check if marine is dead + if (check_dead_marines(marine, marine_index)) { + // Remove dead infantry from further hits + valid_marines = array_delete_value(valid_marines, marine_index); + _damage_data.units_lost++; + } + } + + return; +} + +/// @mixin +function damage_vehicles(_damage_data, _shots, _damage, _weapon_index) { + var _armour_pierce = apa[_weapon_index]; + var _armour_mod = 0; + switch (_armour_pierce) { + case 4: + _armour_mod = 0; + break; + case 3: + _armour_mod = 2; + break; + case 2: + _armour_mod = 4; + break; + case 1: + _armour_mod = 6; + break; + default: + _armour_mod = 6; + break; + } + + var veh_index = -1; + + // Find valid vehicle targets + var valid_vehicles = []; + for (var v = 0, l = array_length(veh_hp); v < l; v++) { + if (veh_hp[v] > 0 && veh_dead[v] == 0) { + array_push(valid_vehicles, v); + } + } + + // Apply damage for each hostile shot, until we run out of targets + for (var shot = 0; shot < _shots; shot++) { + if (array_length(valid_vehicles) == 0) { + break; + } + + _damage_data.hits++; + + // Select a random vehicle from the valid list + veh_index = array_random_element(valid_vehicles); + + // Apply damage + var _modified_damage = _damage - (veh_ac[veh_index] * _armour_mod); + if (_modified_damage < 0) { + _modified_damage = 0.25; + } + if (enemy == 13 && _modified_damage < 1) { + _modified_damage = 1; + } + veh_hp[veh_index] -= _modified_damage; + _damage_data.unit_type = veh_type[veh_index]; + + // Check if the vehicle is destroyed + if (veh_hp[veh_index] <= 0 && veh_dead[veh_index] == 0) { + veh_dead[veh_index] = 1; + _damage_data.units_lost++; + obj_ncombat.player_forces -= 1; + + // Record loss + var existing_index = array_get_index(lost, veh_type[veh_index]); + if (existing_index != -1) { + lost_num[existing_index] += 1; + } else { + array_push(lost, veh_type[veh_index]); + array_push(lost_num, 1); + } + + // Remove dead vehicles from further hits + valid_vehicles = array_delete_value(valid_vehicles, veh_index); + } + } + + return; +} \ No newline at end of file diff --git a/scripts/scr_colors_initialize/scr_colors_initialize.gml b/scripts/scr_colors_initialize/scr_colors_initialize.gml index bbb3b30a4b..84cdb279e6 100644 --- a/scripts/scr_colors_initialize/scr_colors_initialize.gml +++ b/scripts/scr_colors_initialize/scr_colors_initialize.gml @@ -1,5 +1,5 @@ enum Colors { - White, + White = 0, Silver, Fenrisian_Grey, Grey, @@ -9,7 +9,7 @@ enum Colors { Lighter_Black, Black, Red, - Sanguine_Red, + Sanguine_Red = 10, Dark_Red, Gold, Orange, @@ -19,7 +19,7 @@ enum Colors { Deathwing, Bone, Yellow, - Dark_Gold, + Dark_Gold = 20, Copper, Lime, Green, @@ -29,14 +29,16 @@ enum Colors { Dark_Green, Cyan, Turqoise, - Light_Blue, + Light_Blue = 30, Blue, Enchanted_Blue, Ultramarine, Dark_Ultramarine, Purple, Pink, - Imperial_Fists + Imperial_Fists, + Raptors_Green, + Screamer_Pink } function scr_colors_initialize() { @@ -49,8 +51,8 @@ function scr_colors_initialize() { ["Dark Metal", 105, 105, 105], ["Dark Grey", 70, 70, 70], ["Lighter Black", 52, 52, 52], - ["Black", 35, 35, 35], - ["Red", 201, 0, 0], + ["Black", 30, 32, 34], + ["Red", 220, 41, 41], ["Sanguine Red", 150, 0, 0], ["Dark Red", 124, 0, 0], ["Gold", 229, 162, 22], @@ -76,9 +78,11 @@ function scr_colors_initialize() { ["Enchanted Blue", 58, 110, 158], ["Ultramarine", 4, 78, 168], ["Dark Ultramarine", 31, 74, 127], - ["Purple", 117, 0, 217], + ["Purple", 138, 45, 207], ["Pink", 255, 0, 198], - ["Imperial Fists", 255, 200, 0] + ["Imperial Fists", 255, 200, 0], + ["Raptors Green", 65, 74, 29], + ["Screamer Pink", 122, 14, 68] ]; global.colors_count = array_length(colors_array); @@ -99,5 +103,16 @@ function get_shader_array(wanted_colour){ return _cols; } +function get_colour_name (wanted_colour){ + var _instance = instance_exists(obj_controller) ? obj_controller : obj_creation; + var _cols = "" + with (_instance){ + _cols = col[clamp(wanted_colour,0,array_length(col)-1)]; + } + + return _cols; +} + + diff --git a/scripts/scr_company_order/scr_company_order.gml b/scripts/scr_company_order/scr_company_order.gml index 81d0c70f75..749097fe80 100644 --- a/scripts/scr_company_order/scr_company_order.gml +++ b/scripts/scr_company_order/scr_company_order.gml @@ -25,7 +25,6 @@ function temp_marine_variables(co, unit_num){ } } array_push(temp_race,race[co][unit_num]); - array_push(temp_loc,loc[co][unit_num]); array_push(temp_name,name[co][unit_num]); array_push(temp_role,role[co][unit_num]); array_push(temp_wep1,wep1[co][unit_num]); @@ -36,7 +35,7 @@ function temp_marine_variables(co, unit_num){ array_push(temp_mobi,mobi[co][unit_num]); array_push(temp_spe,spe[co][unit_num]); array_push(temp_god,god[co][unit_num]); - array_push(temp_struct,jsonify_marine_struct(co,unit_num)); + array_push(temp_struct,variable_clone(TTRPG[co][unit_num])); scr_wipe_unit(co,unit_num); } function sort_all_companies(){ @@ -56,8 +55,46 @@ function sort_all_companies_to_map(map){ } } } + +/*takes a template of a role, required role number and if there are enough +of those units not in a squad creates a new squad of a given type*/ +function create_squad_from_squadless(squadless_and_squads,build_data,company){ + var squadless = squadless_and_squads[0]; + var empty_squads = squadless_and_squads[1]; + var role = build_data[1]; + var required_unit_count = build_data[2]; + var new_squad_type = build_data[0]; + var new_squad_index, role_number; + if (struct_exists(squadless,role)){ + role_number = array_length(squadless[$ role]); + while (role_number >= required_unit_count){ + new_squad_index=false; + if (array_length(empty_squads)>0){ + new_squad_index = empty_squads[0]; + array_delete(empty_squads,0,1); + create_squad(new_squad_type, company, false, new_squad_index); + } else{ + create_squad(new_squad_type, company, false); + } + var sorted_units = 0; + for (var i = 0; i < role_number; i++){ + unit = TTRPG[company,squadless[$ role][i]]; + if (unit.squad != "none"){ + array_delete(squadless[$ role], i, 1); + sorted_units++; + i--; + role_number--; + } + } + //this is to catch any potential infinite loops where by squads dont get formed and the role number dosnt derease + if (sorted_units==0) then break; + } + + } + return [squadless,empty_squads]; +} function scr_company_order(company) { - try_and_report_loop($"company order {company}", function(company){ + try { // company : company number // This sorts and crunches the marine variables for the company @@ -86,45 +123,6 @@ function scr_company_order(company) { temp_god=[]; temp_struct=[]; - - /*takes a template of a role, required role number and if there are enough - of those units not in a squad creates a new squad of a given type*/ - function create_squad_from_squadless(squadless_and_squads,build_data,company){ - var squadless = squadless_and_squads[0]; - var empty_squads = squadless_and_squads[1]; - var role = build_data[1]; - var required_unit_count = build_data[2]; - var new_squad_type = build_data[0]; - var new_squad_index, role_number; - if (struct_exists(squadless,role)){ - role_number = array_length(squadless[$ role]); - while (role_number >= required_unit_count){ - new_squad_index=false; - if (array_length(empty_squads)>0){ - new_squad_index = empty_squads[0]; - array_delete(empty_squads,0,1); - create_squad(new_squad_type, company, false, new_squad_index); - } else{ - create_squad(new_squad_type, company, false); - } - var sorted_units = 0; - for (var i = 0; i < role_number; i++){ - unit = TTRPG[company,squadless[$ role][i]]; - if (unit.squad != "none"){ - array_delete(squadless[$ role], i, 1); - sorted_units++; - i--; - role_number--; - } - } - //this is to catch any potential infinite loops where by squads dont get formed and the role number dosnt derease - if (sorted_units==0) then break; - } - - } - return [squadless,empty_squads]; - } - // the order that marines are displayed in the company view screen(this order is augmented by squads) var role_orders = role_hierarchy(); @@ -236,7 +234,7 @@ function scr_company_order(company) { squad.empty_squad(); for (var m=0;m=0){ company_squads = []; var cur_squad; @@ -37,24 +55,40 @@ function CompanyStruct(comp) constructor{ } else if (company == -1){ var _disp_units = obj_controller.display_unit; for (var i=0; i0){ - array_push(company_squads,unit.squad); + array_push(company_squads,_unit.squad); } } else { - unit.squad = "none"; + _unit.squad = "none"; } } } } } + if (squad_location != ""){ + var _squads_len = array_length(company_squads); + for (var i=_squads_len-1;i>=0;i--){ + var _squad = fetch_squad(company_squads[i]); + var _squad_loc = _squad.squad_loci(); + if (_squad_loc.system != squad_location){ + array_delete(company_squads, i, 1); + } + } + } + has_squads = array_length(company_squads); + if (has_squads){ + obj_controller.unit_focus = fetch_squad(company_squads[0]).fetch_member(0); + } } + + var xx=__view_get( e__VW.XView, 0 )+0; var yy=__view_get( e__VW.YView, 0 )+0; center_width = [580,1005]; @@ -106,12 +140,28 @@ function CompanyStruct(comp) constructor{ text_color : c_green, str1 : "Allow mass equip", }); + mass_equip_toggle.update(); + static squad_selection_mode = function(){ + return (obj_controller.managing<0 && obj_controller.selection_data.select_type==MissionSelectType.Squads); + } + + + select_squad_button = new UnitButtonObject({ + x1 : xx+center_width[0]+5, + y1 : yy+center_height[0]+150, + color:c_red, + label : "Select Squad", + //tooltip : obj_controller.selection_data.purpose + }); + + selected_squads = []; + + static send_squad_on_mission = function(mission_type, star){ with (star){ - var unload_squad=instance_create(x,y,obj_star_select); unload_squad.target=self; unload_squad.loading=1; @@ -125,6 +175,154 @@ function CompanyStruct(comp) constructor{ } + static draw_squad_unit_sprites = function(){ + var member_width=0, member_height=0; + var x_mod=0,y_mod=0; + + var x_overlap_mod =0; + if (unit_rollover){ + if (scr_hit(xx+25, yy+144, xx+925, yy+981)){ + x_overlap_mod =180; + } else { + unit_rollover = !unit_rollover; + } + } else { + x_overlap_mod =90+(9*rollover_sequence); + } + var sprite_draw_delay="none" + var unit_sprite_coords=[]; + for (var i=0;i0){ + rollover_sequence--; + } + } + } + if (exit_period and !scr_hit(xx+25, yy+144, xx+525, yy+981)){ + exit_period=false; + } + } + + static draw_squad_assignment_options = function(){ + var _squad_sys = squad_loc.system; + if (current_squad.assignment == "none"){ + + draw_text_transformed(xx+bound_width[0]+5, yy+bound_height[0]+125, $"Squad has no current assignments",1,1,0); + + var send_on_mission=false, mission_type; + if (squad_loc.same_system) and (_squad_sys!="Warp" && _squad_sys!="Lost"){ + if (garrison_button.draw()){ + send_on_mission=true; + mission_type="garrison"; + } + + garrison_button.keystroke = press_exclusive(ord("G")); + if (array_contains(current_squad.class, "scout")) || (array_contains(current_squad.class, "bike")){ + if (sabotage_button.draw()){ + send_on_mission=true; + mission_type="sabotage"; + } + } + } + if (send_on_mission){ + send_squad_on_mission(mission_type,star_by_name(_squad_sys)); + } + bound_height[0] += 180; + } else { + if (is_struct(current_squad.assignment)){ + var cur_assignment = current_squad.assignment + draw_text_transformed(xx+bound_width[0]+5, yy+bound_height[0]+125, $"Assignment : {cur_assignment.type}",1,1,0); + var tooltip_text = "Cancel Assignment" + var cancel_but = draw_unit_buttons([xx+bound_width[0]+5, yy+bound_height[0]+150],tooltip_text,[1,1],c_red,,,,true); + if(point_and_click(cancel_but) || keyboard_check_pressed(ord("C"))){ + var cancel_system=noone; + with (obj_star){ + if (name == _squad_sys){ + cancel_system=self; + } + } + if (cancel_system!=noone){ + var planet = current_squad.assignment.ident; + var operation; + for (var i=0;i=array_length(company_squads) ? 0 : cur_squad+1; @@ -132,7 +330,7 @@ function CompanyStruct(comp) constructor{ cur_squad = (cur_squad-1<0) ? array_length(company_squads)-1 : cur_squad-1; } member = grab_current_squad().members[0]; - obj_controller.temp[120] = fetch_unit(member); + obj_controller.unit_focus = fetch_unit(member); } squad_search(); @@ -140,7 +338,7 @@ function CompanyStruct(comp) constructor{ exit_period=false; unit_rollover=false; rollover_sequence=0; - selected_unit=obj_controller.temp[120]; + selected_unit=obj_controller.unit_focus; drop_down_open=false; captain = "none"; champion = "none"; @@ -169,30 +367,30 @@ function CompanyStruct(comp) constructor{ reset_squad_surface(); if (company>0 && company<11){ - var unit; + var _unit; var company_units = obj_controller.display_unit; var role_set = obj_ini.role[100]; for (var i=0;i 0){ if (selected_unit.company == company || company ==-1){ if (company_squads[cur_squad] != selected_unit.squad){ @@ -239,14 +437,10 @@ function CompanyStruct(comp) constructor{ } if (selected_unit.squad=="none"){ default_member(); - } - if (selected_unit.squad!="none"){ + }else { current_squad = obj_ini.squads[selected_unit.squad]; - var x_mod=0,y_mod=0; - var member_width=0, member_height=0; - var x_overlap_mod =0; - var bound_width = center_width; - var bound_height = center_height; + bound_width = center_width; + bound_height = center_height; draw_set_halign(fa_left); if (array_length(company_squads) > 0){ @@ -268,90 +462,52 @@ function CompanyStruct(comp) constructor{ draw_set_halign(fa_left); //should be moved elsewhere for efficiency - var squad_leader = current_squad.determine_leader(); + squad_leader = current_squad.determine_leader(); if (squad_leader != "none"){ var leader_text = $"Squad Leader : {fetch_unit(squad_leader).name_role()}" draw_text_transformed(xx+bound_width[0]+5, yy+bound_height[0]+50, leader_text,1,1,0); } - var squad_loc = current_squad.squad_loci(); + squad_loc = current_squad.squad_loci(); draw_text_transformed(xx+bound_width[0]+5, yy+bound_height[0]+75, $"Squad Members : {current_squad.life_members}",1,1,0); draw_text_transformed(xx+bound_width[0]+5, yy+bound_height[0]+100, $"Squad Location : {squad_loc.text}",1,1,0); - var send_on_mission=false, mission_type; - if (current_squad.assignment == "none"){ - draw_text_transformed(xx+bound_width[0]+5, yy+bound_height[0]+125, $"Squad has no current assignments",1,1,0); - - var _squad_sys = squad_loc.system; - if (squad_loc.same_system) and (_squad_sys!="Warp" && _squad_sys!="Lost"){ - if (garrison_button.draw()){ - send_on_mission=true; - mission_type="garrison"; - } + if (!squad_selection_mode()){ + draw_squad_assignment_options(); + } else { + var _select_action = false; + if (array_contains(selected_squads, company_squads[cur_squad])){ + select_squad_button.update({ + color:c_red, + label : "De-select Squad", + x1 : xx+center_width[0]+5, + y1 : yy+center_height[0]+150, + }); + } else { - garrison_button.keystroke = press_exclusive(ord("G")); - if (array_contains(current_squad.class, "scout")) || (array_contains(current_squad.class, "bike")){ - if (sabotage_button.draw()){ - send_on_mission=true; - mission_type="sabotage"; - } - } - } - if (send_on_mission){ - send_squad_on_mission(mission_type,star_by_name(squad_loc.system)); + select_squad_button.update({ + color:c_green, + label : "Select Squad", + tooltip : obj_controller.selection_data.purpose, + x1 : xx+center_width[0]+5, + y1 : yy+center_height[0]+150, + }); + _select_action = true; } - bound_height[0] += 180; - } else { - if (is_struct(current_squad.assignment)){ - var cur_assignment = current_squad.assignment - draw_text_transformed(xx+bound_width[0]+5, yy+bound_height[0]+125, $"Assignment : {cur_assignment.type}",1,1,0); - var tooltip_text = "Cancel Assignment" - var cancel_but = draw_unit_buttons([xx+bound_width[0]+5, yy+bound_height[0]+150],tooltip_text,[1,1],c_red,,,,true); - if(point_and_click(cancel_but) || keyboard_check_pressed(ord("C"))){ - var cancel_system=noone; - with (obj_star){ - if (name == squad_loc.system){ - cancel_system=self; - } - } - if (cancel_system!=noone){ - var planet = current_squad.assignment.ident; - var operation; - for (var i=0;i0){ - rollover_sequence--; - } - } - } - if (exit_period and !scr_hit(xx+25, yy+144, xx+525, yy+981)){ - exit_period=false; - } + + draw_squad_unit_sprites(); } } } diff --git a/scripts/scr_company_view/scr_company_view.gml b/scripts/scr_company_view/scr_company_view.gml index da5972464c..69a3927bd3 100644 --- a/scripts/scr_company_view/scr_company_view.gml +++ b/scripts/scr_company_view/scr_company_view.gml @@ -29,6 +29,7 @@ function reset_manage_arrays() { ma_wep2=[]; ma_armour=[]; ma_health=[]; + ma_health_string=[]; ma_chaos=[]; ma_exp=[]; ma_promote=[]; @@ -36,6 +37,7 @@ function reset_manage_arrays() { ma_view = []; squad = []; } + manage_tags = []; reset_ship_manage_arrays(); } @@ -66,7 +68,10 @@ function add_man_to_manage_arrays(unit){ array_push(ma_wep2,unit.weapon_two()); array_push(ma_armour,unit.armour()); array_push(ma_gear,unit.gear()); + array_push(ma_health,unit.hp()); + array_push(ma_health_string,$"{round((unit.hp() / unit.max_health()) * 100)}% HP"); + array_push(ma_mobi,unit.mobility_item()); array_push(ma_chaos,unit.corruption); array_push(ma_exp,unit.experience); @@ -114,6 +119,9 @@ function add_vehicle_to_manage_arrays(unit){ array_push(ma_armour,obj_ini.veh_wep3[unit[0]][unit[1]]); array_push(ma_gear,obj_ini.veh_upgrade[unit[0]][unit[1]]); array_push(ma_health,obj_ini.veh_hp[unit[0]][unit[1]]); + var _percent = round((obj_ini.veh_hp[unit[0]][unit[1]] / 100) * 100); + array_push(ma_health_string, $"{_percent}% HP"); + array_push(ma_mobi,obj_ini.veh_acc[unit[0]][unit[1]]); array_push(ma_chaos,0); array_push(ma_exp,0); @@ -465,15 +473,14 @@ function switch_view_company(new_view){ } if (new_view>10){ view_squad=false; - company_data={}; scr_special_view(new_view); } else { with (obj_ini){ scr_company_order(new_view); } scr_company_view(new_view); - new_company_struct(); } + new_company_struct(); } } function company_manage_actions(){ @@ -494,13 +501,13 @@ function company_manage_actions(){ unit_profile=false; } // Previous company - if (point_and_click([xx+424, yy+80,xx+496,yy+128]) || keyboard_check_pressed(ord(string("N")))){ + if (point_and_click([xx+424, yy+80,xx+496,yy+128]) || (keyboard_check_pressed(ord(string("N"))) && allow_shortcuts)){ var new_view = managing == 1 ? 15 : managing-1; switch_view_company(new_view) } // Next company - if (point_and_click([xx+1105, yy+80,xx+1178,yy+128]) || keyboard_check_pressed(ord(string("M")))){ + if (point_and_click([xx+1105, yy+80,xx+1178,yy+128]) || (keyboard_check_pressed(ord(string("M"))) && allow_shortcuts)){ var new_view = managing == 15 ? 1 : managing+1; switch_view_company(new_view) } diff --git a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml index 49ba4f05f4..c90272d57f 100644 --- a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml +++ b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml @@ -13,39 +13,72 @@ function ColourItem(xx,yy) constructor{ self.xx=xx; self.yy=yy; data_slate = new DataSlate(); - static scr_unit_draw_data = function(defualt_val = 0){ + + static swap_role_set = function(type_start, type_end){ + var _full_livs = obj_creation.full_liveries; + var _comp_livs = obj_creation.company_liveries; + switch(type_start){ + case 1:_full_livs[role_set] = variable_clone(map_colour);break; + case 0:_full_livs[0] = variable_clone(map_colour);break; + case 2:_comp_livs[role_set] = variable_clone(map_colour);break; + } + + switch(type_end){ + case 1: + role_set = obj_creation.roles_radio.selection_val("role_id"); + role_set = role_set == noone ? 0: role_set; + map_colour = variable_clone(_full_livs[role_set]); + break; + case 0: + role_set = 0 + map_colour = variable_clone(_full_livs[0]); + break; + case 2: + role_set = obj_creation.buttons.company_liveries_choice.current_selection; + if (role_set == -1){ + role_set = 1; + } + map_colour = variable_clone(_comp_livs[role_set]); + break; + } + shuffle_dummy(); + reset_image(); + colour_pick=false; + } + static scr_unit_draw_data = function(default_val = 0){ map_colour = { is_changed : false, - left_leg_lower : defualt_val, - left_leg_upper : defualt_val, - left_leg_knee : defualt_val, - right_leg_lower : defualt_val, - right_leg_upper : defualt_val, - right_leg_knee : defualt_val, - metallic_trim : defualt_val, - right_trim : defualt_val, - left_trim : defualt_val, - left_chest : defualt_val, - right_chest : defualt_val, - left_thorax : defualt_val, - right_thorax : defualt_val, - left_pauldron : defualt_val, - left_arm : defualt_val, - left_hand : defualt_val, - right_pauldron: defualt_val, - right_arm : defualt_val, - right_hand : defualt_val, - left_head : defualt_val, - right_head: defualt_val, - left_muzzle: defualt_val, - right_muzzle: defualt_val, - eye_lense :defualt_val, - right_backpack : defualt_val, - left_backpack : defualt_val, - weapon_primary : defualt_val, - weapon_secondary : defualt_val, - company_marks : defualt_val, - company_marks_loc : defualt_val, + block_company_colours : false, + left_leg_lower : default_val, + left_leg_upper : default_val, + left_leg_knee : default_val, + right_leg_lower : default_val, + right_leg_upper : default_val, + right_leg_knee : default_val, + metallic_trim : default_val, + right_trim : default_val, + left_trim : default_val, + left_chest : default_val, + right_chest : default_val, + left_thorax : default_val, + right_thorax : default_val, + left_pauldron : default_val, + left_arm : default_val, + left_hand : default_val, + right_pauldron: default_val, + right_arm : default_val, + right_hand : default_val, + left_head : default_val, + right_head: default_val, + left_muzzle: default_val, + right_muzzle: default_val, + eye_lense :default_val, + right_backpack : default_val, + left_backpack : default_val, + weapon_primary : default_val, + weapon_secondary : default_val, + company_marks : default_val, + company_marks_loc : default_val, } return map_colour; } @@ -127,6 +160,18 @@ function ColourItem(xx,yy) constructor{ company_marks: "Company Marks" } + var _radio_opts = []; + var _names = struct_get_names(name_maps); + for (var i=0;i= 500) && (menu <= 510)) { if (mouse_y >= __view_get(e__VW.YView, 0) + 27) { cooldown = 8000; @@ -45,15 +38,13 @@ function scr_menu_clear_up(specific_area_function) { } } - if (menu >= 500) { + /*if (menu >= 500 && array_length(obj_turn_end.audience_stack) == 0) { exit; - } + }*/ - var zoomeh = 0, - diyst = 999; + diyst = 999; xx = __view_get(e__VW.XView, 0); yy = __view_get(e__VW.YView, 0); - zoomeh = zoomed; if (menu == 0) { hide_banner = 0; @@ -70,14 +61,22 @@ function scr_menu_clear_up(specific_area_function) { return false; } -function scr_change_menu(specific_area_function) { +function scr_change_menu(wanted_menu, specific_area_function=false) { var continue_sequence = false; + if (obj_controller.menu_lock){ + return false; + } + if (wanted_menu == obj_controller.menu){ + main_map_defaults(); + return true; + } with(obj_controller) { + main_map_defaults(); set_zoom_to_default(); continue_sequence = scr_menu_clear_up(function() { - if ((zoomed == 0) && (diplomacy == 0)) { + //if ((zoomed == 0) && (diplomacy == 0)) { return true; - } + //} }); if (continue_sequence) { with(obj_fleet_select) { @@ -89,47 +88,54 @@ function scr_change_menu(specific_area_function) { } } close_popups = true; - specific_area_function(); + if (is_callable(specific_area_function)){ + specific_area_function(); + } } } } +function main_map_defaults(){ + with (obj_controller){ + menu = MENU.Default; + hide_banner = 0; + location_viewer.update_garrison_log(); + managing = 0; + managing = 0; + menu_adept = 0; + view_squad = false; + unit_profile = false; + force_goodbye = 0; + hide_banner = 0; + diplomacy = 0; + audience = 0; + zoomed = 0; + } +} + function scr_in_game_help() { - scr_change_menu(function() { + scr_change_menu(MENU.GameHelp,function() { with(obj_controller) { if ((zoomed == 0) && (!instance_exists(obj_ingame_menu)) && (!instance_exists(obj_popup))) { set_zoom_to_default(); - if (menu != 17.5) { - menu = 17.5; + if (menu != 30) { + menu = 30; cooldown = 8000; click = 1; hide_banner = 0; instance_activate_object(obj_event_log); obj_event_log.top = 1; obj_event_log.help = 1; - } else { - menu = 0; - click = 1; - hide_banner = 0; - } - managing = 0; - view_squad = false; - unit_profile = false; + } } } }); } function scr_in_game_menu() { - scr_change_menu(function() { + scr_change_menu(-1,function() { if ((!instance_exists(obj_ingame_menu)) && (!instance_exists(obj_popup)) && (!obj_controller.zoomed)) { - // Main Menu - with(obj_controller) { - menu = 0; - hide_banner = 0; - location_viewer.update_garrison_log(); - managing = 0; - } + // Main MENU set_zoom_to_default(); instance_create(0, 0, obj_ingame_menu); } @@ -137,13 +143,18 @@ function scr_in_game_menu() { } function basic_manage_settings() { - menu = 1; - popup = 0; - selected = 0; - hide_banner = 1; - diplomacy = 0; - zoomed = 0; - view_squad = false; + with (obj_controller){ + menu = MENU.Manage; + popup = 0; + selected = 0; + diplomacy = 0; + allow_shortcuts = true; + + init_manage_buttons(); + } +} + +function init_manage_buttons(){ management_buttons = { squad_toggle: new UnitButtonObject({ style: "pixel", @@ -159,81 +170,74 @@ function basic_manage_settings() { style: "pixel", label: "Show Bio", tooltip: "Click here or press B to Toggle Unit Biography." - }) + }), + capture_image: new UnitButtonObject({ + style: "pixel", + label: "Capture Image", + tooltip: "Click to create a local png of the given marine in the game folder." + }), + + company_namer : new TextBarArea(800, 108, 600, false), }; } function scr_toggle_manage() { - scr_change_menu(function() { + scr_change_menu(MENU.Manage,function() { with(obj_controller) { - if (menu != 1) { + if (menu != MENU.Manage) { + hide_banner = 1; basic_manage_settings(); scr_management(1); - } else if (menu == 1) { - menu = 0; - hide_banner = 0; - location_viewer.update_garrison_log(); } - managing = 0; } }); } function scr_toggle_setting() { - scr_change_menu(function() { + scr_change_menu(MENU.Settings,function() { with(obj_controller) { - if (menu != 21) { - menu = 21; + if (menu != MENU.Settings) { + menu = MENU.Settings; popup = 0; selected = 0; hide_banner = 1; - } else if (menu == 21) { - if (!settings) { - menu = 0; - cooldown = 8000; - click = 1; - hide_banner = 0; - } else if (settings) { - menu = 21; - cooldown = 8000; - click = 1; - settings = 0; - } + } else if (settings) { + menu = MENU.Settings; + cooldown = 8000; + click = 1; + settings = 0; } } }); } function scr_toggle_apothecarion() { - scr_change_menu(function() { + scr_change_menu(MENU.Apothecarion,function() { with(obj_controller) { menu_adept = 0; hide_banner = 1; if (scr_role_count("Master of the Apothecarion", "0") == 0) { menu_adept = 1; } - if (menu != 11) { - menu = 11; + if (menu != MENU.Apothecarion) { + menu = MENU.Apothecarion; temp[36] = scr_role_count(obj_ini.role[100][15], ""); - } else if (menu == 11) { - menu = 0; } - managing = 0; } }); } function scr_toggle_reclu() { - scr_change_menu(function() { + scr_change_menu(MENU.Reclusiam,function() { with(obj_controller) { menu_adept = 0; hide_banner = 1; if (scr_role_count("Master of Sanctity", "0") == 0) { menu_adept = 1; } - if (menu != 12) { - menu = 12; + if (menu != MENU.Reclusiam) { + menu = MENU.Reclusiam; temp[36] = string(scr_role_count(obj_ini.role[100][14], "field")); temp[37] = string(scr_role_count(obj_ini.role[100][14], "home")); @@ -251,26 +255,21 @@ function scr_toggle_reclu() { } } } - } else if (menu == 12) { - menu = 0; - - location_viewer.update_garrison_log(); - } - managing = 0; + } } }); } function scr_toggle_lib() { - scr_change_menu(function() { + scr_change_menu(MENU.Librarium,function() { with(obj_controller) { menu_adept = 0; hide_banner = 1; if (scr_role_count("Chief " + string(obj_ini.role[100][17]), "0") == 0) { menu_adept = 1; } - if (menu != 13) { - menu = 13; + if (menu != MENU.Librarium) { + menu = MENU.Librarium; if ((artifacts > 0) && (menu_artifact == 0)) { menu_artifact = 1; @@ -283,36 +282,34 @@ function scr_toggle_lib() { artifact_destroy = new ShutterButton(); artifact_namer = new TextBarArea(xx + 622, yy + 460, 350); set_chapter_arti_data(); - } else if (menu == 13) { - menu = 0; - - location_viewer.update_garrison_log(); - } - managing = 0; + artifact_slate = new DataSlate({ + set_width : true, + XX : 392, + YY : 500, + width : 460, + height : 240, + }) + } } }); } function scr_toggle_armamentarium() { - scr_change_menu(function() { + scr_change_menu(MENU.Armamentarium,function() { with(obj_controller) { - menu_adept = 0; - hide_banner = 1; - if (scr_role_count("Forge Master", "0") == 0) { - menu_adept = 1; - } - if (menu != 14) { + if (menu != MENU.Armamentarium) { + if (scr_role_count("Forge Master", "0") == 0) { + menu_adept = 1; + } + hide_banner = 1; set_up_armentarium(); - } else if (menu == 14) { - menu = 0; } - managing = 0; } }); } function scr_toggle_recruiting() { - scr_change_menu(function() { + scr_change_menu(MENU.Recruiting,function() { with(obj_controller) { var geh = 0, good = 0; @@ -324,27 +321,19 @@ function scr_toggle_recruiting() { } } } - menu_adept = 0; - hide_banner = 1; - if (menu != 15) { + if (menu != MENU.Recruiting) { set_up_recruitment_view(); - } else if (menu == 15) { - menu = 0; - - location_viewer.update_garrison_log(); - } - - managing = 0; + hide_banner = 1; + } } }); } function scr_toggle_fleet_area() { - scr_change_menu(function() { + scr_change_menu(MENU.Fleet,function() { with(obj_controller) { menu_adept = 0; - hide_banner = 1; var geh = 0, good = 0; for (geh = 1; geh <= 50; geh++) { @@ -354,9 +343,10 @@ function scr_toggle_fleet_area() { } } } - if (menu != 16) { + if (menu != MENU.Fleet) { + hide_banner = 1; //TODO rewrite all this shit when fleets finally become OOP - menu = 16; + menu = MENU.Fleet; cooldown = 8000; click = 1; @@ -416,58 +406,48 @@ function scr_toggle_fleet_area() { } man_max = m; man_current = 0; - } else if (menu == 16) { - menu = 0; - - cooldown = 8000; - click = 1; } - managing = 0; } }); } function scr_toggle_diplomacy() { - scr_change_menu(function() { + scr_change_menu(MENU.Diplomacy, function() { with(obj_controller) { - if (menu != 20) { - menu = 20; - + if (menu != MENU.Diplomacy) { + set_up_diplomacy_buttons(); + menu = MENU.Diplomacy; + audience = 0; + diplomacy = 0; hide_banner = 1; - } else if (menu == 20) { - menu = 0; - - hide_banner = 0; - location_viewer.update_garrison_log(); + character_diplomacy = false; + show_debug_message_adv("set_diplo") } - managing = 0; } }); } function scr_toggle_event_log() { - scr_change_menu(function() { + scr_change_menu(MENU.EventLog,function() { with(obj_controller) { - if (menu != 17) { - menu = 17; + if (menu != MENU.EventLog) { + menu = MENU.EventLog; hide_banner = 1; instance_activate_object(obj_event_log); obj_event_log.top = 1; - } else if (menu == 17) { - menu = 0; - - hide_banner = 0; } - managing = 0; } }); } function scr_end_turn() { - scr_change_menu(function() { + if (instance_exists(obj_turn_end)){ + return false; + } + scr_change_menu(-1,function() { with(obj_controller) { - if ((menu == 0) && (cooldown <= 0)) { + if ((menu == MENU.Default) && (cooldown <= 0)) { if (location_viewer.hide_sequence == 0) { location_viewer.hide_sequence++; } @@ -477,11 +457,11 @@ function scr_end_turn() { if (!instance_exists(obj_turn_end)) { ok = 1; } - if (instance_exists(obj_turn_end)) { + /*if (instance_exists(obj_turn_end)) { if (obj_turn_end.popups_end == 1) { ok = 1; } - } + }*/ if (ok == 1) { if(settings_autosave == true){ @@ -508,7 +488,6 @@ function scr_end_turn() { with(obj_star_event) { instance_destroy(); } - cooldown = 8; audio_play_sound(snd_end_turn, -50, 0); audio_sound_gain(snd_end_turn, master_volume * effect_volume, 0); @@ -566,20 +545,6 @@ function scr_end_turn() { scr_turn_first(); } } - - if (menu == 1) { - menu = 0; - cooldown = 8000; - click = 1; - hide_banner = 0; - } - managing = 0; - /*with(obj_ini){ - for (var i=0;i<11;i++){ - scr_company_order(i); - } - }*/ - location_viewer.update_garrison_log(); } }); } diff --git a/scripts/scr_count_forces/scr_count_forces.gml b/scripts/scr_count_forces/scr_count_forces.gml index 3da9230204..8dd0224ac9 100644 --- a/scripts/scr_count_forces/scr_count_forces.gml +++ b/scripts/scr_count_forces/scr_count_forces.gml @@ -6,17 +6,16 @@ function scr_count_forces(_unit_location, _target_location, _is_planet, instance //For each of the companies (HQ + 10) for(var company=0;company<11;company++) { - //For now, obj_ini arrays start at array[1]. - var i = 1; - + var i = 0; + var _unit = fetch_unit([company, i]); //For each unit in that company, while unit exists //Marines and vehicles get checked AT THE SAME TIME //This is possible since array for saving vehicles and marines are separated - while ((obj_ini.name[company][i]!="" || i0){ + show_debug_message_adv($"calling scr_creation with input {slide_num}"); + if (slide_num == eCREATIONSLIDES.CHAPTERTRAITS && custom!=eCHAPTER_TYPE.PREMADE){ if (name_bad=1){/*(sound_play(bad);*/} if (name_bad=0){ - change_slide=1;goto_slide=3;race[100,17]=1; - if (scr_has_disadv("Psyker Intolerant")) then race[100,17]=0; + change_slide=true; + goto_slide=3; + race[100,17]=1; + if (scr_has_disadv("Psyker Intolerant")){ + race[100,17]=0; + } } } - if (slide_num=2 && custom==0){ - change_slide=1; + if (slide_num=eCREATIONSLIDES.CHAPTERTRAITS && custom==eCHAPTER_TYPE.PREMADE){ + change_slide=true; goto_slide=3; race[100,eROLE.Chaplain]=1; race[100,eROLE.Librarian]=1; @@ -41,14 +187,126 @@ function scr_creation(slide_num) { } - if (slide_num==3 ){ - change_slide=1; - goto_slide=4; + if (slide_num== eCREATIONSLIDES.CHAPTERHOME){ + change_slide=true; + goto_slide=eCREATIONSLIDES.CHAPTERLIVERY; alarm[0]=1; - - if (slide_num=3){ + update_creation_roles_radio(); + + if (slide_num == eCREATIONSLIDES.CHAPTERHOME){ + draw_set_font(fnt_40k_12); + complex_livery_radio = new RadioSet([ + { + str1 : "Sergeant Markers", + font : fnt_40k_12, + value : "sgt", + display_name : "Sergeant" + }, + { + str1 : "Veteran Sergeant Markers", + font : fnt_40k_12, + value : "vet_sgt", + display_name : "Veteran Sergeant" + }, + { + str1 : "Captain Markers", + font : fnt_40k_12, + value : "captain", + display_name : "Captain" + }, + { + str1 : "Veteran Markers", + font : fnt_40k_12, + value : "veteran", + display_name : "Veteran" + }, + ], "", {max_width : 50, x1:862, y1:225}); - + bulk_armour_pattern = new RadioSet([ + { + str1 : "Single Colour", + font : fnt_40k_12, + style : "box", + }, + { + str1 : "Breastplate", + font : fnt_40k_12, + style : "box", + }, + { + str1 : "Vertical", + font : fnt_40k_12, + style : "box", + }, + { + str1 : "Quadrant", + font : fnt_40k_12, + style : "box", + }, + ], "", {x1 : 477, y1 : 515, max_width : 400}); + + advanced_helmet_livery = new RadioSet([ + { + str1 : "Single Colour", + font : fnt_40k_12, + style : "box", + }, + { + str1 : "Stripe", + font : fnt_40k_12, + style : "box", + }, + { + str1 : "Muzzle", + font : fnt_40k_12, + style : "box", + }, + { + str1 : "Pattern", + font : fnt_40k_12, + style : "box", + }, + ], "", {x1 : 477, y1 : 515, max_width : 400}); + + set_complex_livery_buttons(); + + draw_set_font(fnt_40k_14b); + bulk_selection_buttons_setup(); + livery_selection_options = new RadioSet([ + { + str1 : "Default", + tooltip : "The default livery all marines will be coloured in", + font: fnt_menu + }, + { + str1 : "Role", + tooltip : "Role specific livery that will overide default livery", + font: fnt_menu + }, + { + str1 : "Company", + tooltip : "company specific livery that will overide role livery", + font: fnt_menu + + } + ]) + colour_selection_options = new RadioSet([ + { + str1 : "Standard", + tooltip : "standard options to colour marine", + font: fnt_menu + }, + { + str1 : "Bulk", + tooltip : "bulk colouring for ease and speed", + font: fnt_menu + }, + { + str1 : "Advanced", + tooltip : "Advanced options for colouring", + font: fnt_menu + } + ]) if (full_liveries == ""){ var struct_cols = { main_color :main_color, @@ -74,13 +332,21 @@ function scr_creation(slide_num) { } } } - - if (slide_num=4){ - if (custom == 0 || (hapothecary!="" && hchaplain!="" && clibrarian!="" && fmaster!="" && recruiter!="" && admiral!="" && battle_cry!="")){ - change_slide=1; - goto_slide=5; - - if (custom=2){ + + if (slide_num=eCREATIONSLIDES.CHAPTERLIVERY){ + if (custom == eCHAPTER_TYPE.PREMADE || (hapothecary!="" && hchaplain!="" && clibrarian!="" && fmaster!="" && recruiter!="" && admiral!="" && battle_cry!="")){ + change_slide=true; + goto_slide=eCREATIONSLIDES.CHAPTERROLES; + update_creation_roles_radio(2); + role_setup_objects(); + } + } + + if (slide_num = eCREATIONSLIDES.CHAPTERROLES){ + if (custom == eCHAPTER_TYPE.PREMADE || (hapothecary!="" && hchaplain!="" && clibrarian!="" && fmaster!="" && recruiter!="" && admiral!="" && battle_cry!="")){ + change_slide=true; + goto_slide=eCREATIONSLIDES.CHAPTERGENE + if (custom==eCHAPTER_TYPE.CUSTOM){ mutations_selected=0; preomnor=0; voice=0; @@ -97,8 +363,8 @@ function scr_creation(slide_num) { mucranoid=0; mutations = 10 - purity } - - if (custom > 0) { + + if (custom != eCHAPTER_TYPE.PREMADE) { disposition[0] = 0; disposition[eSTART_FACTION.Progenitor] = 60 + ((cooperation - 5) * 4); // Prog disposition[eSTART_FACTION.Imperium] = 50 + ((cooperation - 5) * 4); // Imp @@ -167,19 +433,19 @@ function scr_creation(slide_num) { disposition[eSTART_FACTION.Astartes] -= 5; } } - } + } } // 5 to 6 - if (slide_num=5){ - if (custom=0 || mutations<=mutations_selected){ - change_slide=1; - goto_slide=6; + if (slide_num=eCREATIONSLIDES.CHAPTERGENE){ + if (custom==eCHAPTER_TYPE.PREMADE || mutations<=mutations_selected){ + change_slide=true; + goto_slide=eCREATIONSLIDES.CHAPTERMASTER; } } // 6 to finish - if (slide_num=6){ + if (slide_num=eCREATIONSLIDES.CHAPTERMASTER){ if (chapter_master_name!="" && chapter_master_melee!=0 && chapter_master_ranged!=0 && chapter_master_specialty!=0){ cooldown=9999; instance_create(0,0,obj_ini); diff --git a/scripts/scr_creation_draw_slides/scr_creation_draw_slides.gml b/scripts/scr_creation_draw_slides/scr_creation_draw_slides.gml index 913ba4f3ce..31b4a79fd9 100644 --- a/scripts/scr_creation_draw_slides/scr_creation_draw_slides.gml +++ b/scripts/scr_creation_draw_slides/scr_creation_draw_slides.gml @@ -6,13 +6,14 @@ enum eCREATIONSLIDES{ CHAPTERTRAITS=2, CHAPTERHOME = 3, CHAPTERLIVERY = 4, - CHAPTERGENE = 5, - CHAPTERMASTER = 6 + CHAPTERROLES = 5, + CHAPTERGENE = 6, + CHAPTERMASTER = 7 } /// @mixin function draw_chapter_select(){ - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); draw_text(800, 80, string_hash_to_newline("Select Chapter")); @@ -22,8 +23,8 @@ function draw_chapter_select(){ draw_text_transformed(440, founding_y, "Founding Chapters", 0.75, 0.75, 0); draw_text_transformed(440, successor_y, "Existing Chapters", 0.75, 0.75, 0); - draw_text_transformed(440, custom_y, string_hash_to_newline("Custom Chapters"), 0.75, 0.75, 0); - draw_text_transformed(440, other_y, string_hash_to_newline("Other"), 0.75, 0.75, 0); + draw_text_transformed(440, custom_y, "Custom Chapters", 0.75, 0.75, 0); + draw_text_transformed(440, other_y, "Other", 0.75, 0.75, 0); /// @localvar grid object to keep track of where to draw icon boxes var grid = { @@ -103,10 +104,11 @@ function draw_chapter_select(){ if (!chap.disabled) { if (scr_chapter_new(chapter_name)) { scr_load_chapter_icon(chap.icon_name, true); - custom = 0; + custom = eCHAPTER_TYPE.PREMADE; change_slide = 1; goto_slide = 2; chapter_string = chapter_name; + setup_chapter_trait_select(); } else { // Chapter is borked } @@ -147,10 +149,11 @@ function draw_chapter_select(){ if (!chap.disabled) { if (scr_chapter_new(chapter_name)) { scr_load_chapter_icon(chap.icon_name, true); - custom = 0; + custom = eCHAPTER_TYPE.PREMADE; change_slide = 1; goto_slide = 2; chapter_string = chapter_name; + setup_chapter_trait_select(); } else { // borked } @@ -202,13 +205,15 @@ function draw_chapter_select(){ global.chapter_id = chap.id; change_slide = 1; goto_slide = 2; - custom = 2; + custom = eCHAPTER_TYPE.CUSTOM; + setup_chapter_trait_select(); scr_chapter_new(chap.id); } else { global.chapter_id = chap.id; change_slide = 1; goto_slide = 2; - custom = 2; + custom = eCHAPTER_TYPE.CUSTOM; + setup_chapter_trait_select(); scr_chapter_random(0); } } @@ -251,10 +256,11 @@ function draw_chapter_select(){ // global.chapter_icon_path = $"creation/chapters/icons"; // global.chapter_icon_filename = chap.icon_name; global.chapter_id = chap.id; - custom = 0; + custom = eCHAPTER_TYPE.PREMADE; change_slide = 1; goto_slide = 2; chapter_string = chapter_name; + setup_chapter_trait_select(); } else { // borked } @@ -265,6 +271,8 @@ function draw_chapter_select(){ grid.new_cell(); + grid.new_cell(); + grid.new_cell(); //padding between fanmade and the custom/random buttons // Blank Custom Chapter @@ -289,8 +297,9 @@ function draw_chapter_select(){ scr_load_chapter_icon("unknown", true); change_slide = 1; goto_slide = 2; - custom = 2; + custom = eCHAPTER_TYPE.CUSTOM; scr_chapter_random(0); + setup_chapter_trait_select(); } } @@ -317,8 +326,9 @@ function draw_chapter_select(){ scr_load_chapter_icon(array_random_element(global.chapter_icons_array), true); change_slide = 1; goto_slide = 2; - custom = 1; + custom = eCHAPTER_TYPE.RANDOM; scr_chapter_random(1); + setup_chapter_trait_select(); } } @@ -345,12 +355,12 @@ function draw_chapter_select(){ } if (highlight <= array_length(all_chapters)) { var splash_chapter = all_chapters[highlight]; - //show_debug_message($"highlight {highlight} splash chapter {splash_chapter.id} splash icon {splash_chapter.splash}"); + //show_debug_message_adv($"highlight {highlight} splash chapter {splash_chapter.id} splash icon {splash_chapter.splash}"); scr_image("creation/chapters/splash", splash_chapter.splash, 0, 68, 374, 713); } draw_set_alpha(slate4 / 30); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_rectangle(0, 68, 374, 781, 1); } draw_set_alpha(slate4 / 30); @@ -390,17 +400,37 @@ function draw_chapter_select(){ } } +function setup_chapter_trait_select(){ + chapter_type_radio = new RadioSet([ + { + str1 : "Homeworld", + font : fnt_40k_14b, + tooltip : "Homeworld\nYour chapter has a homeworld that they base on. Contained upon it is a massive Fortress Monastery, which provides high levels of defense and automated weapons.", + }, + { + str1 :"Fleet Based", + font : fnt_40k_14b, + tooltip : "Fleet Based\Rather than a homeworld your chapter begins near their recruiting world. The fleet includes a Battle Barge, which serves as a mobile base, and powerful ship.", + }, + { + str1 : "Penitent", + font : fnt_40k_14b, + tooltip : "Penitent\As with Fleet Based, but you must crusade and fight until your penitence meter runs out. Note that recruiting is disabled until then.", + }, + ], "Chapter Type" ,{ x1: 445, y1 : 211 , max_width : 1125-445, center : true}); + chapter_type_radio.current_selection = fleet_type-1; +} /// @mixin function draw_chapter_trait_select(){ - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); obj_cursor.image_index=0; if (name_bad=1) then draw_set_color(c_red); - if (text_selected!="chapter") or (custom!=2) then draw_text(800,80,string_hash_to_newline(string(chapter_name))); - if (custom=2){ + if (text_selected!="chapter") or (custom!=eCHAPTER_TYPE.CUSTOM) then draw_text(800,80,string_hash_to_newline(string(chapter_name))); + if (custom==eCHAPTER_TYPE.CUSTOM){ if (text_selected="chapter") and (text_bar>30) then draw_text(800,80,string_hash_to_newline(string(chapter_name))); if (text_selected="chapter") and (text_bar<=30) then draw_text(805,80,string_hash_to_newline(string(chapter_name)+"|")); if (scr_text_hit(800,80,true,chapter_name)){ @@ -414,12 +444,12 @@ function draw_chapter_trait_select(){ draw_set_alpha(0.75);draw_rectangle(580,80,1020,118,1);draw_set_alpha(1); } - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_text_transformed(800,120,string_hash_to_newline("Points: "+string(points)+"/"+string(maxpoints)),0.6,0.6,0); obj_cursor.image_index=0; - if (custom>0) and (restarted=0){ + if (custom!=eCHAPTER_TYPE.PREMADE) and (restarted=0){ if (scr_hit(436,74,436+128,74+128)) and (popup=""){ obj_cursor.image_index=1; if (scr_click_left()){ @@ -428,64 +458,22 @@ function draw_chapter_trait_select(){ } } - /*if (custom>0) and (restarted=0){ + /*if (custom!=eCHAPTER_TYPE.PREMADE) and (restarted=0){ draw_sprite_stretched(spr_creation_arrow,0,550,160,32,32); draw_sprite_stretched(spr_creation_arrow,1,597,160,32,32); }*/ - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_line(445,200,1125,200); draw_line(445,201,1125,201); draw_line(445,202,1125,202); if (popup=""){ - if (custom<2) then draw_set_alpha(0.5); - draw_text_transformed(800,211,string_hash_to_newline("Chapter Type"),0.6,0.6,0); - draw_set_halign(fa_left); - - if (scr_hit(516,242,674,266)){ - tooltip="Homeworld"; - tooltip2="Your chapter has a homeworld that they base on. Contained upon it is a massive Fortress Monastery, which provides high levels of defense and automated weapons."; + if (custom!=eCHAPTER_TYPE.CUSTOM){ + draw_set_alpha(0.5); } - if (scr_hit(768,242,866,266)){ - tooltip="Fleet Based"; - tooltip2="Rather than a homeworld your chapter begins near their recruiting world. The fleet includes a Battle Barge, which serves as a mobile base, and powerful ship."; - } - if (scr_hit(952,242,1084,266)){ - tooltip="Penitent"; - tooltip2="As with Fleet Based, but you must crusade and fight until your penitence meter runs out. Note that recruiting is disabled until then."; - }// Avoiding fights will result in excomunicatus traitorus. - - if (custom<2) then draw_set_alpha(0.5); - yar=0; - if (fleet_type=1) then yar=1; - draw_sprite(spr_creation_check,yar,519,239);yar=0; - if (custom=2 && point_and_click([519,239,519+32,239+32])){ - if (points+20<=maxpoints) and (fleet_type=3){points+=20;fleet_type=1;} - if (fleet_type=2){fleet_type=1;} - } - draw_text_transformed(551,239,"Homeworld",0.6,0.6,0); - - yar=0; - if (fleet_type=2) then yar=1; - draw_sprite(spr_creation_check,yar,771,239);yar=0; - if (custom=2 && point_and_click([771,239,771+32,239+32])) { - if (points+20<=maxpoints) and (fleet_type=3){points+=20;fleet_type=2;} - if (fleet_type=1){fleet_type=2;} - } - draw_text_transformed(804,239,"Fleet Based",0.6,0.6,0); - - yar=0; - if (fleet_type=3) then yar=1; - draw_sprite(spr_creation_check,yar,958,239);yar=0; - if (custom=2 && point_and_click([958,239,958+32,239+32])){ - if (fleet_type!=3) { - points-=20; - } - fleet_type=3; - } - draw_text_transformed(990,239,"Penitent",0.6,0.6,0); - draw_set_alpha(1); + chapter_type_radio.draw(); + fleet_type = chapter_type_radio.current_selection+1; draw_line(445,289,1125,289); draw_line(445,290,1125,290); @@ -508,7 +496,7 @@ function draw_chapter_trait_select(){ var scores_max = [10, 10, 10, 99]; var scores_min = [1, 1, 1, 1]; var click_change = keyboard_check(vk_control) ? 10 : 1; - if (custom == 2) { + if (custom == eCHAPTER_TYPE.CUSTOM) { for (var i = 0; i < 4; i++) { draw_sprite_stretched(spr_arrow, 0, 436, 325 + (i * 55), 32, 32); if (scr_hit(436, 325 + (i * 55), 436 + sprite_get_width(spr_arrow), 357 + (i * 55))) { @@ -560,11 +548,11 @@ function draw_chapter_trait_select(){ draw_rectangle(445, 551, 1125, 553, 0); } - if (popup!="") or (custom<2) then draw_set_alpha(0.5); + if (popup!="") or (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); if (popup!="icons"){ - var advantage_click_allow = custom>1; + var advantage_click_allow = custom==eCHAPTER_TYPE.CUSTOM; draw_set_halign(fa_left); draw_set_font(fnt_40k_30b); draw_text_transformed(436,564,"Chapter Advantages",0.5,0.5,0); @@ -583,7 +571,7 @@ function draw_chapter_trait_select(){ draw_text(adv_txt.x1,adv_txt.y1+(i*adv_txt.h), draw_string); if (scr_hit(adv_txt.x1,adv_txt.y1+(i*adv_txt.h),adv_txt.x2,adv_txt.y2+(i*adv_txt.h))){ - if (points>=maxpoints) and (adv_num[i]=0) and (popup="") and (custom>1){ + if (points>=maxpoints) and (adv_num[i]=0) and (popup="") and (custom==eCHAPTER_TYPE.CUSTOM){ tooltip="Insufficient Points"; tooltip2="Add disadvantages or decrease Chapter Stats"; } @@ -675,7 +663,7 @@ function draw_chapter_trait_select(){ draw_set_color(0); draw_rectangle(450,206,1144,711,0); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_line(445,727,1125,727); draw_line(445,728,1125,728); draw_line(445,729,1125,729); @@ -693,7 +681,7 @@ function draw_chapter_trait_select(){ draw_set_color(c_white); draw_set_alpha(0.25); draw_text_transformed(800,687,string_hash_to_newline("Cancel"),0.6,0.6,0); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_alpha(1); if (scr_click_left()){ @@ -736,7 +724,7 @@ function draw_chapter_trait_select(){ draw_rectangle(x3, y3, x3 + 96, y3 + 96, false); draw_set_blend_mode(bm_normal); draw_set_alpha(1); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); if (scr_click_left()) { popup = ""; @@ -780,7 +768,7 @@ function draw_chapter_trait_select(){ column.x1 = 904; column.x2 = column.x1 + column.w; }; - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_alpha(1); disable = array_contains(adv, adv_name); if (!disable){ @@ -840,7 +828,7 @@ function draw_chapter_trait_select(){ column.x1 = 904; column.x2 = column.x1 + column.w; }; - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); @@ -891,7 +879,7 @@ function draw_chapter_trait_select(){ function draw_chapter_homeworld_select(){ var yar = 0; - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); @@ -901,7 +889,7 @@ function draw_chapter_homeworld_select(){ draw_text(800,80,chapter_name); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_rectangle(445, 200, 1125, 202, 0); scr_creation_home_planet_create(); @@ -912,7 +900,7 @@ function draw_chapter_homeworld_select(){ var trial_data = scr_trial_data(); draw_text_transformed(160,90,"Aspirant Trial",0.6,0.6,0); - if (custom>1){ + if (custom==eCHAPTER_TYPE.CUSTOM){ draw_sprite_stretched(spr_creation_arrow,0,40,90,32,32); if (point_and_click([40,90,40+32,90+32])){ aspirant_trial++; @@ -939,7 +927,9 @@ function draw_chapter_homeworld_select(){ var asp_info; asp_info = scr_compile_trial_bonus_string(current_trial); - draw_text_ext_transformed(left_data_slate.XX+20,150,asp_info,-1,left_data_slate.width-20,0.4,0.4,0); + draw_set_halign(fa_center); + + draw_text_ext_transformed(160,150,asp_info,-1,left_data_slate.width-20,0.4,0.4,0); if (scr_hit(50,480,950,510)){ tooltip="Aspirant Trial"; diff --git a/scripts/scr_creation_home_planet_create/scr_creation_home_planet_create.gml b/scripts/scr_creation_home_planet_create/scr_creation_home_planet_create.gml index cf947f7002..75a51ea4ce 100644 --- a/scripts/scr_creation_home_planet_create/scr_creation_home_planet_create.gml +++ b/scripts/scr_creation_home_planet_create/scr_creation_home_planet_create.gml @@ -1,27 +1,27 @@ // Script assets have changed for v2.3.0 see // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information function player_recruit_planet_selection(){ + add_draw_return_values(); with (obj_creation){ - if (fleet_type!=1) or (custom<2) then draw_set_alpha(0.5); - yar=0; + draw_set_color(CM_GREEN_COLOR); + draw_set_font(fnt_40k_30b); + draw_set_halign(fa_center); + if (fleet_type!=1) or (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); var _recruit_home = buttons.recruit_home_relationship; _recruit_home.x1 = 1265; _recruit_home.y1 = 110; - if (custom==0){ + if (custom==eCHAPTER_TYPE.PREMADE){ _recruit_home.allow_changes = false; } _recruit_home.draw(); - var _recruit_world_type = _recruit_home.current_selection; - draw_set_color(38144); - draw_set_font(fnt_40k_30b); - draw_set_halign(fa_center); + var _recruit_world_type = _recruit_home.current_selection; if (_recruit_world_type==0){ recruiting = homeworld; } var _cur_planet_index2 = scr_planet_image_numbers(recruiting); - if (custom>1 && _recruit_world_type>0){ + if (custom==eCHAPTER_TYPE.CUSTOM && _recruit_world_type>0){ draw_sprite_stretched(spr_creation_arrow,0,1265,285,32,32); draw_sprite_stretched(spr_creation_arrow,1,1455,285,32,32); recruiting = list_traveler(planet_types, recruiting, [1265,285,1265+32,285+32],[1455,285,1455+32,285+32]); @@ -44,8 +44,8 @@ function player_recruit_planet_selection(){ if (fleet_type=1 && _recruit_world_type<2) and (homeworld_name=recruiting_name) then name_bad=1; //TODO make a centralised logic for player renaming things in the creation screen if (name_bad=1) then draw_set_color(c_red); - if (text_selected!="recruiting_name") or (custom<2) then draw_text_transformed(1044+333,398,recruiting_name,0.5,0.5,0); - if (custom>1 && _recruit_world_type==2){ + if (text_selected!="recruiting_name") or (custom!=eCHAPTER_TYPE.CUSTOM) then draw_text_transformed(1044+333,398,recruiting_name,0.5,0.5,0); + if (custom==eCHAPTER_TYPE.CUSTOM && _recruit_world_type==2){ if (text_selected="recruiting_name") and (text_bar>30) then draw_text_transformed(1044+333,398,recruiting_name,0.5,0.5,0); if (text_selected="recruiting_name") and (text_bar<=30) then draw_text_transformed(1044+333,398,$"{recruiting_name}|",0.5,0.5,0); if (scr_text_hit(1044+333,398,true,recruiting_name)){ @@ -62,19 +62,20 @@ function player_recruit_planet_selection(){ if (_recruit_world_type==2){ var _refresh_rec_name_btn =[1503, 398, 1503+20, 398+20]; - draw_unit_buttons(_refresh_rec_name_btn,"?", [1,1], 38144,,fnt_40k_14b); + draw_unit_buttons(_refresh_rec_name_btn,"?", [1,1], CM_GREEN_COLOR,,fnt_40k_14b); if(point_and_click(_refresh_rec_name_btn)){ var _new_rec_name = global.name_generator.generate_star_name(); - //show_debug_message($"regen name of recruiting_name from {recruiting_name} to {_new_rec_name}"); + //show_debug_message_adv($"regen name of recruiting_name from {recruiting_name} to {_new_rec_name}"); recruiting_name = _new_rec_name; } } } } + pop_draw_return_values() } function scr_creation_home_planet_create(){ - + add_draw_return_values(); var fleet_type_text = fleet_type==ePlayerBase.home_world ? "Homeworld" : "Flagship"; draw_text_transformed(644,218,fleet_type_text,0.6,0.6,0); @@ -90,9 +91,9 @@ function scr_creation_home_planet_create(){ draw_text_transformed(644,378,homeworld,0.5,0.5,0); // draw_text_transformed(644,398,string(homeworld_name),0.5,0.5,0); - if (text_selected!="home_name") or (custom<2) then draw_text_transformed(644,398,homeworld_name,0.5,0.5,0); + if (text_selected!="home_name") or (custom!=eCHAPTER_TYPE.CUSTOM) then draw_text_transformed(644,398,homeworld_name,0.5,0.5,0); - if (custom>1){ + if (custom==eCHAPTER_TYPE.CUSTOM){ if (text_selected="home_name") { draw_text_transformed(644,398,homeworld_name+(text_bar>30?"":"|"),0.5,0.5,0); @@ -110,15 +111,15 @@ function scr_creation_home_planet_create(){ draw_rectangle(525,398,760,418,1); draw_set_alpha(1); var _refresh_hw_name_btn =[770, 398, 790, 418]; - draw_unit_buttons(_refresh_hw_name_btn,"?", [1,1], 38144,,fnt_40k_14b); + draw_unit_buttons(_refresh_hw_name_btn,"?", [1,1], CM_GREEN_COLOR,,fnt_40k_14b); if(point_and_click(_refresh_hw_name_btn)){ var _new_hw_name = global.name_generator.generate_star_name(); - //show_debug_message($"regen name of homeworld from {homeworld_name} to {_new_hw_name}"); + //show_debug_message_adv($"regen name of homeworld from {homeworld_name} to {_new_hw_name}"); homeworld_name = _new_hw_name; } } - if (custom>1){ + if (custom==eCHAPTER_TYPE.CUSTOM){ draw_sprite_stretched(spr_creation_arrow,0,525,285,32,32); draw_sprite_stretched(spr_creation_arrow,1,725,285,32,32); homeworld = list_traveler(planet_types, homeworld, [525,285,525+32,285+32],[725,285,725+32,285+32]); @@ -135,10 +136,10 @@ function scr_creation_home_planet_create(){ draw_text_transformed(644,378,"Battle Barge",0.5,0.5,0); // draw_text_transformed(644,398,string(homeworld_name),0.5,0.5,0); - if (text_selected!="flagship_name") or (custom=0) then draw_text_transformed(644,398,flagship_name,0.5,0.5,0); + if (text_selected!="flagship_name") or (custom==eCHAPTER_TYPE.PREMADE) then draw_text_transformed(644,398,flagship_name,0.5,0.5,0); //TODO swap out for TextBarArea constructor - if (custom>1){ + if (custom==eCHAPTER_TYPE.CUSTOM){ if (text_selected="flagship_name") and (text_bar>30) then draw_text_transformed(644,398,flagship_name,0.5,0.5,0); if (text_selected="flagship_name") and (text_bar<=30) then draw_text_transformed(644,398,flagship_name+"|",0.5,0.5,0); if (scr_text_hit(644,398,true,flagship_name)){ @@ -155,10 +156,10 @@ function scr_creation_home_planet_create(){ draw_rectangle(525,398,760,418,1); draw_set_alpha(1); var _refresh_fs_name_btn =[770, 398, 790, 418]; - draw_unit_buttons(_refresh_fs_name_btn,"?", [1,1], 38144,,fnt_40k_14b); + draw_unit_buttons(_refresh_fs_name_btn,"?", [1,1], CM_GREEN_COLOR,,fnt_40k_14b); if(point_and_click(_refresh_fs_name_btn)){ var _new_fs_name = global.name_generator.generate_imperial_ship_name(); - show_debug_message($"regen name of flagship_name from {flagship_name} to {_new_fs_name}"); + show_debug_message_adv($"regen name of flagship_name from {flagship_name} to {_new_fs_name}"); flagship_name = _new_fs_name; } } @@ -213,7 +214,7 @@ function scr_creation_home_planet_create(){ //TODO move to OOP checkboxes if (fleet_type == ePlayerBase.home_world){ - if (custom<2) then draw_set_alpha(0.5); + if (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); var _homeworld_types = [ { name : "Planetary Governer", @@ -244,11 +245,12 @@ function scr_creation_home_planet_create(){ if (scr_hit(_draw_x, _draw_y,_draw_x+32, _draw_y+32)){ tooltip = _home_rule_type.tooltip; tooltip2 = _home_rule_type.tooltip2; - if (scr_click_left() && custom>1){ + if (scr_click_left() && custom==eCHAPTER_TYPE.CUSTOM){ homeworld_rule = i+1; } } _coords[1] += 45; } } + pop_draw_return_values() } \ No newline at end of file diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 3d86d304b0..69d13868ea 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -14,7 +14,9 @@ function load_visual_sets(){ } for (var i=0;i=0;g--){ + var _found_sprite = false; + var _subimg = _sub_group[g]; + if (!is_string(_subimg)){ + if (!sprite_exists(_subimg)){ + array_delete(_sub_group,g,1); + } + continue; + } + if (_subimg == "blank"){ + _item.subcomponents[s][g] = spr_blank; + _found_sprite = true; + } else { + for (var m=0;m 0 ? livery_picker.role_set :eROLE.Tactical]; }else { return role[100][eROLE.Tactical]; @@ -962,6 +1627,8 @@ function DummyMarine()constructor{ var _armour = armour[100][livery_picker.role_set > 0 ? livery_picker.role_set : eROLE.Tactical]; if (array_contains(armours, _armour) || _armour == STR_ANY_POWER_ARMOUR){ _armour = array_random_element(armours); + } else if(array_contains(LIST_TERMINATOR_ARMOUR, _armour)|| _armour == STR_ANY_POWER_ARMOUR){ + _armour = array_random_element(LIST_TERMINATOR_ARMOUR); } if (_armour == "Power Armour"){ _armour = "MK7 Aquila"; @@ -969,7 +1636,7 @@ function DummyMarine()constructor{ } else { _armour = _last_armour; } - if (buttons.company_options_toggle.company_view){ + if (obj_creation.livery_selection_options.current_selection == 2){ if (!array_contains(armours, _armour)){ _armour = "MK7 Aquila"; } @@ -992,8 +1659,62 @@ function DummyMarine()constructor{ return is_specialist(role(), search_type,include_trainee, include_heads); } static has_trait = marine_has_trait; - + static is_dreadnought = function(){ + var _arm_data = gear_weapon_data("armour", last_armour); + if (is_struct(_arm_data)){ + if (_arm_data.has_tag("dreadnought")){ + return true + } + } + return false; + } experience = 120; + //get equipment data methods by deafult they garb all equipment data and return an equipment struct e.g new EquipmentStruct(item_data, core_type,quality="none") + static get_armour_data = function(type = "all") { + return gear_weapon_data("armour", armour(), type, false); + }; + + static get_gear_data = function(type = "all") { + return gear_weapon_data("gear", gear(), type, false); + }; + + static get_mobility_data = function(type = "all") { + return gear_weapon_data("mobility", mobility_item(), type, false); + }; + + static get_weapon_one_data = function(type = "all") { + return gear_weapon_data("weapon", weapon_one(), type, false); + }; + + static get_weapon_two_data = function(type = "all") { + return gear_weapon_data("weapon", weapon_two(), type, false); + }; + + static equipment_has_tag = function(tag, area){ + var tags = []; + switch (area){ + case "wep1": + tags = get_weapon_one_data("tags"); + break; + case "wep2": + tags = get_weapon_two_data("tags"); + break; + case "mobi": + tags = get_mobility_data("tags"); + break; + case "armour": + tags = get_armour_data("tags"); + break; + case "gear": + tags = get_gear_data("tags"); + break; + } + if (!is_array(tags) || array_length(tags) == 0){ + return false; + } else { + return array_contains(tags, tag); + } + } } function scr_get_body_data (body_item_key,body_slot="none"){ @@ -1032,10 +1753,12 @@ function generate_marine_body(){ "left_leg":{ leg_variants: irandom(100), shin_variant : irandom(100), + knee_variant: irandom(100), }, "right_leg":{ leg_variants: irandom(100), shin_variant : irandom(100), + knee_variant: irandom(100), }, "torso":{ cloth:{ @@ -1074,6 +1797,7 @@ function generate_marine_body(){ }, "throat":{ variant : irandom(100), + hanging_variant : irandom(100), }, "jaw":{ variant: irandom(100), @@ -1112,16 +1836,16 @@ function add_purity_seal_markers (){ function format_weapon_visuals(weapon_name){ if (struct_exists(global.weapon_visual_data, weapon_name)){ - weapon_visual_data = global.weapon_visual_data[$ weapon_name]; + var _weapon_visual_data = global.weapon_visual_data[$ weapon_name]; } else { return []; } - var base_data = variable_clone(weapon_visual_data.base); + var base_data = variable_clone(_weapon_visual_data.base); base_data.weapon_map = weapon_name; base_data.position = "weapon"; var return_options = []; - for (var i=0;i 50 ? 1 : -1; + var _relative_strength = floor(obj_controller/20); + var _nature = ""; +} + +function clear_inspections(){ + with(obj_en_fleet){ + if (owner = eFACTION.Inquisition) and (string_count("Inqis",trade_goods)>0){ + trade_goods="cancel_inspection"; + target=0; + } + } +} + +function inquis_use_inspection_pass(){ + if (inspection_passes>0){ + inspection_passes-=1; + last_world_inspection=turn+25; + last_fleet_inspection=turn+25; + //obj_controller.liscensing=5; + clear_inspections(); + diplo_text = "Very well i shall honour our previous agreements. (24 months leave of inspections)"; + } +} + +function inquis_demand_inspection_pass(){ + var resistance=10; + var _worked = false; + clear_diplo_choices(); + if (inspection_passes==0){ + rull=floor(random(10))+1; + if (rull>resistance){ + _worked=true; + last_world_inspection=turn+24; + last_fleet_inspection=turn+24; + //obj_controller.liscensing=5; + clear_inspections(); + diplo_text = "Very well Chapter Master I Your service to the imperium is well known i have no doubt that you would not ask such of me without good reasoon. I shall forgoe my normal duties just this onece. \n do not becomne complacent Chapter Master i may not always be so generous"; + } else { + var _diff = resistance - rull; + alter_disposition(eFACTION.Inquisition, -1); + diplo_text = "Consider your request denied. If there is heresy or any wrong doing i shal see that is rooted out and made plain for all to see";; + + } + } + +} - // argument0: button +function scr_demand(demand_type) { + + // demand_type: button @@ -14,7 +64,11 @@ function scr_demand(argument0) { annoyed[trading_demand]+=2; if (trading_demand=2){// Imperium - with(obj_star){if (owner = eFACTION.Imperium) then instance_create(x,y,obj_temp2);} + with(obj_star){ + if (owner = eFACTION.Imperium){ + instance_create(x,y,obj_temp2); + } + } resistance=min(instance_number(obj_temp2),8); with(obj_temp2){instance_destroy();} if (obj_controller.disposition[2]<30) then resistance+=1; @@ -23,15 +77,25 @@ function scr_demand(argument0) { if (rela="hostile") or (faction_status[eFACTION.Imperium]="Antagonism") then resistance+=2; if (faction_status[eFACTION.Imperium]="War") then resistance+=3; - if (argument0=1){// Requisition + if (demand_type=1){// Requisition rull=floor(random(10))+1; - if (rull>resistance){requisition+=300;worked=true;} - if (rull<=resistance){worked=false;} + if (rull>resistance){ + requisition+=300; + worked=true; + } + else if (rull<=resistance){ + worked=false; + } } - if (argument0=2){// Crusade + if (demand_type=2){// Crusade rull=floor(random(10))+1; - if (rull>resistance){obj_controller.liscensing=2;worked=true;} - if (rull<=resistance){worked=false;} + if (rull>resistance){ + obj_controller.liscensing=2; + worked=true; + } + if (rull<=resistance){ + worked=false; + } } } @@ -46,7 +110,7 @@ function scr_demand(argument0) { if (faction_status[diplomacy]="War") then resistance+=3; if (rela="friendly") then resistance-=2; - if (argument0=1){// Requisition + if (demand_type=1){// Requisition rull=floor(random(10))+1; if (rull>resistance){requisition+=300;worked=true;} if (rull<=resistance){worked=false;} @@ -58,29 +122,15 @@ function scr_demand(argument0) { if (trading_demand=4){ resistance=10; - if (argument0=1){// Requisition - rull=floor(random(10))+1; - if (rull>resistance){requisition+=300;worked=true;} - if (rull<=resistance){worked=false;} - } - if (argument0=2) and (inspection_passes=0){ + if (demand_type=1){// Requisition rull=floor(random(10))+1; if (rull>resistance){ - worked=true; - last_world_inspection=turn+12; - last_fleet_inspection=turn+12; - obj_controller.liscensing=5; - with(obj_en_fleet){if (owner = eFACTION.Inquisition) and (string_count("Inqis",trade_goods)>0){trade_goods="cancel_inspection";target=0;}} + requisition+=300; + worked=true; + } + if (rull<=resistance){ + worked=false; } - if (rull<=resistance){worked=false;} - } - if (argument0=2) and (inspection_passes>0){ - inspection_passes-=1; - worked=true;no_penalty=true; - last_world_inspection=turn+12; - last_fleet_inspection=turn+12; - obj_controller.liscensing=5; - with(obj_en_fleet){if (owner = eFACTION.Inquisition) and (string_count("Inqis",trade_goods)>0){trade_goods="cancel_inspection";target=0;}} } } @@ -97,7 +147,7 @@ function scr_demand(argument0) { if (rela="neutral") then resistance-=1; if (rela="friendly") then resistance-=3; - if (argument0=2) then resistance-=2; + if (demand_type=2) then resistance-=2; if (obj_controller.faction_status[eFACTION.Eldar]="War") or (obj_controller.faction_status[eFACTION.Eldar]="Antagonism"){ with(obj_star){if (owner = eFACTION.Eldar) and (craftworld=1) then instance_create(x,y,obj_temp5);} @@ -110,7 +160,7 @@ function scr_demand(argument0) { with(obj_temp3){instance_destroy();} } - if (argument0=1){// Requisition + if (demand_type=1){// Requisition rull=floor(random(10))+1; if (rull>resistance){ requisition+=150; @@ -118,7 +168,7 @@ function scr_demand(argument0) { } if (rull<=resistance){worked=false;} } - if (argument0=2){// useful info + if (demand_type=2){// useful info rull=floor(random(10))+1; if (rull>resistance){worked=true;} if (rull<=resistance){worked=false;} @@ -139,17 +189,24 @@ function scr_demand(argument0) { if (rela="neutral") then resistance-=2; if (rela="friendly") then resistance-=2; - if (argument0=2) then resistance-=2; + if (demand_type=2) then resistance-=2; - if (argument0=1){// Requisition + if (demand_type=1){// Requisition rull=floor(random(10))+1; if (rull>resistance){requisition+=200;worked=true;} if (rull<=resistance){worked=false;} } - if (argument0=2){// Crusade + if (demand_type=2){// Crusade rull=floor(random(10))+1; - if (rull>resistance){obj_controller.liscensing=2;worked=true;if (disposition[7]>=40) then no_penalty=true;} - if (rull<=resistance){worked=false;} + if (rull>resistance){ + obj_controller.liscensing=2;worked=true; + if (disposition[7]>=40){ + no_penalty=true; + } + } + if (rull<=resistance){ + worked=false; + } } } @@ -166,12 +223,12 @@ function scr_demand(argument0) { // If only one planet, and player is at it, should probably get a bonus - if (argument0=1){// Requisition + if (demand_type=1){// Requisition rull=floor(random(10))+1; if (rull>resistance){requisition+=300;worked=true;} if (rull<=resistance){worked=false;} } - if (argument0=2){ + if (demand_type=2){ rull=floor(random(10))+1; @@ -221,14 +278,37 @@ function scr_demand(argument0) { if (worked=true){ - var h;h=0;repeat(4){h+=1;obj_controller.diplo_option[h]="";obj_controller.diplo_goto[h]="";} - if (rela="friendly") and (no_penalty=false){disposition[trading_demand]-=8;turns_ignored[trading_demand]+=3;if (trading_demand=8) then disposition[trading_demand]+=6;} - if (rela="neutral") and (no_penalty=false){disposition[trading_demand]-=10;turns_ignored[trading_demand]+=6;if (trading_demand=8) then disposition[trading_demand]+=6;} - if (rela="hostile") and (no_penalty=false){disposition[trading_demand]-=15;turns_ignored[trading_demand]+=9;if (trading_demand=8) then disposition[trading_demand]+=9;} + clear_diplo_choices(); + if (!no_penalty){ + if (rela="friendly") { + disposition[trading_demand]-=8; + turns_ignored[trading_demand]+=3; + if (trading_demand=8){ + disposition[trading_demand]+=6; + } + } + if (rela="neutral") { + disposition[trading_demand]-=10; + turns_ignored[trading_demand]+=6; + if (trading_demand=8){ + disposition[trading_demand]+=6; + } + } + if (rela="hostile") { + disposition[trading_demand]-=15; + turns_ignored[trading_demand]+=9; + if (trading_demand=8){ + disposition[trading_demand]+=9; + } + } + if (disposition[trading_demand]<-100){ + disposition[trading_demand]=-100; + } + } - if (disposition[trading_demand]<-100) and (no_penalty=false) then disposition[trading_demand]=-100; + - if (trading_demand=6) and (argument0=2){ + if (trading_demand=6) and (demand_type=2){ if (no_penalty=false) then disposition[trading_demand]+=7; force_goodbye=1;trading_demand=0;scr_dialogue("useful_information"); exit; @@ -240,10 +320,18 @@ function scr_demand(argument0) { force_goodbye=1; } if (worked=false){ - var h;h=0;repeat(4){h+=1;obj_controller.diplo_option[h]="";obj_controller.diplo_goto[h]="";} - if (rela="friendly") and (no_penalty=false){disposition[trading_demand]-=2;turns_ignored[trading_demand]+=1;} - if (rela="neutral") and (no_penalty=false){disposition[trading_demand]-=4;turns_ignored[trading_demand]+=3;} - if (rela="hostile") and (no_penalty=false){disposition[trading_demand]-=8;turns_ignored[trading_demand]+=6;} + var h=0; + clear_diplo_choices(); + if (rela="friendly") and (no_penalty=false){ + disposition[trading_demand]-=2; + turns_ignored[trading_demand]+=1; + } + if (rela="neutral") and (no_penalty=false){ + disposition[trading_demand]-=4; + turns_ignored[trading_demand]+=3; + } + if (rela="hostile") and (no_penalty=false){ + disposition[trading_demand]-=8;turns_ignored[trading_demand]+=6;} if (disposition[trading_demand]<-100) then disposition[trading_demand]=-100; trading_demand=0;force_goodbye=1; @@ -251,7 +339,7 @@ function scr_demand(argument0) { var war,woo;war=false;woo=floor(random(100))+1; if (no_penalty=false){ if (disposition[diplomacy]<=10) and (faction_status[diplomacy]="Antagonism") and (woo<=35) then war=true; - if (diplomacy=8) and (argument0=2) and (war=true) then war=false; + if (diplomacy=8) and (demand_type=2) and (war=true) then war=false; } if (war=false) then scr_dialogue("demand_refused"); diff --git a/scripts/scr_destroy_planet/scr_destroy_planet.gml b/scripts/scr_destroy_planet/scr_destroy_planet.gml index 900d7ce210..ae7d8e7f04 100644 --- a/scripts/scr_destroy_planet/scr_destroy_planet.gml +++ b/scripts/scr_destroy_planet/scr_destroy_planet.gml @@ -45,7 +45,7 @@ function scr_destroy_planet(destruction_method) { for (var cah = 0; cah <= obj_ini.companies; cah++) { for (var ed = 0; ed < array_length(obj_ini.role[cah]); ed++) { unit = fetch_unit([cah, ed]); - if ((obj_ini.loc[cah, ed] == you.name) && (unit.planet_location == baid)) { + if ((unit.location_string == you.name) && (unit.planet_location == baid)) { if (unit.role() == obj_ini.role[100][eROLE.ChapterMaster]) { obj_controller.alarm[7] = 15; if (global.defeat <= 1) { @@ -99,97 +99,30 @@ function scr_destroy_planet(destruction_method) { } else if ((you.p_owner[baid] == eFACTION.Mechanicus || you.p_first[baid] == eFACTION.Mechanicus) && obj_controller.faction_status[eFACTION.Mechanicus] != "War") { obj_controller.loyalty -= 50; obj_controller.loyalty_hidden -= 50; - obj_controller.disposition[eFACTION.Imperium] -= 50; - obj_controller.disposition[3] -= 80; - obj_controller.disposition[4] -= 40; - obj_controller.disposition[5] -= 30; - - obj_controller.faction_status[eFACTION.Imperium] = "War"; - obj_controller.faction_status[eFACTION.Mechanicus] = "War"; - obj_controller.faction_status[eFACTION.Inquisition] = "War"; - obj_controller.faction_status[eFACTION.Ecclesiarchy] = "War"; - - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 3; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 2; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; - if (obj_controller.known[eFACTION.Inquisition] > 1) { - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 4; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; - } - if (obj_controller.known[eFACTION.Ecclesiarchy] > 1) { - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 5; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; - } - - if (planet_feature_bool(you.p_feature[baid], P_features.Sororitas_Cathedral) == 1) { - obj_controller.disposition[5] -= 30; - if (obj_controller.known[eFACTION.Mechanicus] > 1) { - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 3; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; - } - } + decare_war_on_imperium_audiences(); } else if (enemy9 == eFACTION.Ecclesiarchy && obj_controller.faction_status[eFACTION.Ecclesiarchy] != "War") { obj_controller.loyalty -= 50; obj_controller.loyalty_hidden -= 50; - obj_controller.disposition[eFACTION.Imperium] -= 50; + obj_controller.disposition[3] -= 80; - obj_controller.disposition[4] -= 40; - obj_controller.disposition[5] -= 30; - obj_controller.faction_status[eFACTION.Imperium] = "War"; + + obj_controller.faction_status[eFACTION.Mechanicus] = "War"; - obj_controller.faction_status[eFACTION.Inquisition] = "War"; - obj_controller.faction_status[eFACTION.Ecclesiarchy] = "War"; - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 5; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; + scr_audience(eFACTION.Ecclesiarchy, "declare_war", -30, "War", 9999, 0); + if (obj_controller.known[eFACTION.Inquisition] > 1) { - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 4; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; + scr_audience(eFACTION.Inquisition, "declare_war", -40, "War", 9999, 0); } - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 2; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; + scr_audience(eFACTION.Imperium, "declare_war", -50, "War", 9999, 2); + } else if (obj_controller.faction_status[eFACTION.Imperium] != "War" && planet_feature_bool(you.p_feature[baid], P_features.Daemonic_Incursion) == 0 && you.p_tyranids[baid] < 5) { if (you.p_first[baid] == eFACTION.Imperium && you.p_type[baid] == "Hive") { obj_controller.loyalty -= 50; obj_controller.loyalty_hidden -= 50; - obj_controller.disposition[eFACTION.Imperium] -= 60; - obj_controller.disposition[eFACTION.Mechanicus] -= 30; - obj_controller.disposition[eFACTION.Inquisition] -= 40; - obj_controller.disposition[eFACTION.Ecclesiarchy] -= 40; - - obj_controller.faction_status[eFACTION.Imperium] = "War"; - obj_controller.faction_status[eFACTION.Mechanicus] = "War"; - obj_controller.faction_status[eFACTION.Inquisition] = "War"; - obj_controller.faction_status[eFACTION.Ecclesiarchy] = "War"; - - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 2; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; - if (obj_controller.known[eFACTION.Inquisition] > 1) { - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 4; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; - } - if (obj_controller.known[eFACTION.Ecclesiarchy] > 1) { - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 5; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; - } - if (obj_controller.known[eFACTION.Mechanicus] > 1) { - obj_controller.audiences += 1; - obj_controller.audien[obj_controller.audiences] = 3; - obj_controller.audien_topic[obj_controller.audiences] = "declare_war"; - } + + decare_war_on_imperium_audiences() if (planet_feature_bool(you.p_feature[baid], P_features.Sororitas_Cathedral) == 1) { obj_controller.disposition[5] -= 30; diff --git a/scripts/scr_dialogue/scr_dialogue.gml b/scripts/scr_dialogue/scr_dialogue.gml index 0976887efb..170c773fa1 100644 --- a/scripts/scr_dialogue/scr_dialogue.gml +++ b/scripts/scr_dialogue/scr_dialogue.gml @@ -1,12 +1,85 @@ + +function initialize_dialogue(){ + global.dialogue = {}; + global.dialogue.sisters = json_to_gamemaker(working_directory + "\\data\\dialogue\\sisters.json", json_parse); +} + + +function interpret_diag_string(string_data, data){ + var _string = ""; + + // Case 1: Arrays → pick random element + if (is_array(string_data)){ + string_data = array_random_element(string_data); + } + + // Case 2: Raw string + if (is_string(string_data)){ + return string_interpolate_from_struct(string_data, data); + } + + // Case 3: Structs → interpret + else if (is_struct(string_data)){ + + // Multipart sequences + if (struct_exists(string_data, "multi_part")){ + for (var i = 0; i < array_length(string_data.parts); i++){ + _string += interpret_diag_string(string_data.parts[i], data); + } + return _string; + } + + // Relationship-based dialogue + if (struct_exists(string_data, "relationship")){ + var _string = string_data.relationship[$ data.relationship]; + if (is_string(_string)){ + return string_interpolate_from_struct(_string, data); + } else { + return interpret_diag_string(_string, data); + } + } + + // Override dialogue (new!) + if (struct_exists(string_data, "override")){ + // check if a matching override key exists in `data` + var override_key = data.override_condition; + if (string_exists(string_data.override, override_key)){ + return string_interpolate_from_struct(string_data.override[$ override_key], data); + } + } + } + + return _string; +} + +function create_dialogue_string(dialogue_set, key, data){ + if (!struct_exists(dialogue_set, key)){ + return "Error : Could not fetch dialogue string data"; + } + var _string_data = variable_clone(dialogue_set[$ key]); + + return interpret_diag_string(_string_data, data); +} + + + // Handles all dialog for all factions and special events. Handles diplomatic changes and diplomacy as well -function scr_dialogue(diplo_keyphrase) { +function scr_dialogue(diplo_keyphrase, data = {}) { // diplo_last=""; + with (obj_controller){ // diplo_keyphrase = keyphrase - for(var h=1; h<=4; h++){ - obj_controller.diplo_option[h]=""; - obj_controller.diplo_goto[h]=""; + clear_diplo_choices(); + if (diplomacy == -1){ + if (is_struct(character_diplomacy)){ + if (_unit.role == "Forge Master"){ + if (diplo_keyphrase == "intro"){ + diplo_text = "Chapter Master. What may " + iplomacy_option({option_text:"The Imperium and Inquisition's ignorance and hypocrisy will be the death of my Chapter.", goto: _goto}); + } + } + } } var event_log=""; var rando=0,tempd="",sorc=false; @@ -22,7 +95,7 @@ function scr_dialogue(diplo_keyphrase) { if (diplo_keyphrase=="declare_war") and (faction_status[diplomacy]!="War"){ faction_status[diplomacy]="War"; - event_log=string(obj_controller.faction_title[diplomacy])+" "+string(obj_controller.faction_leader[diplomacy])+" declares war on the "+string(global.chapter_name)+"."; + event_log=string(obj_controller.faction_title[diplomacy])+" "+string(obj_controller.faction_leader[diplomacy])+$" declares war on the {global.chapter_name}."; scr_event_log("red",event_log); if (string_count("|SC|",obj_controller.useful_info)>1) and (diplomacy==4) then sorc=true; @@ -30,42 +103,26 @@ function scr_dialogue(diplo_keyphrase) { if (diplo_keyphrase=="declare_war") and (string_count("|SC|",obj_controller.useful_info)>1) and (diplomacy==4) then sorc=true; if (diplo_keyphrase=="intro") or (diplo_keyphrase=="intro1") or ((diplomacy==10) and (diplo_keyphrase=="intro2")){ - event_log="Chapter Master "+string(obj_ini.master_name)+" meets the "+string(obj_controller.faction[diplomacy])+" "+string(obj_controller.faction_title[diplomacy])+", "+string(obj_controller.faction_leader[diplomacy])+"."; + event_log=$"Chapter Master {obj_ini.master_name} meets the {obj_controller.faction[diplomacy]} {obj_controller.faction_title[diplomacy]}, {obj_controller.faction_leader[diplomacy]}."; scr_event_log("",event_log); } var dip_score=diplomacy; // repeat(3){ // i+=1; - rela="neutral"; - - if (diplomacy>0){ - // if (diplomacy!=8){ - if (disposition[dip_score]>=60) then rela="friendly"; - if (disposition[dip_score]<60) and (disposition[dip_score]>=20) then rela="neutral"; - if (disposition[dip_score]<20) then rela="hostile"; - // } - if (diplomacy==6){ - if (disposition[dip_score]>=60) then rela="friendly"; - if (disposition[dip_score]<60) and (disposition[dip_score]>=0) then rela="neutral"; - if (disposition[dip_score]<0) then rela="hostile"; - } - - if (diplomacy==8){ - if (disposition[dip_score]>=40) then rela="friendly"; - if (disposition[dip_score]<40) and (disposition[dip_score]>=-15) then rela="neutral"; - if (disposition[dip_score]<-15) then rela="hostile"; - }// */ - } + rela="neutral"; + if (diplomacy>0){ + rela=relationship_hostility_matrix(diplomacy); + // */ + } // if (i<=5) and (fleet_type=3) and (rela="hostile") then rela="neutral"; // } // ** Chaos Meetings ** if (diplo_keyphrase=="cs_meeting1"){ diplomacy=10; - diplo_text="So you have brought yourself before me "+string(obj_ini.master_name)+". This pleases me. You are not the first among the Astartes to come to me. Do not look so shocked. Many have gazed upon the decay and decrepitude of the Imperium with open eyes, and heard the empty slogans of the Corpse Emperor with fresh ears and come to the realization I had so many long millennia ago. There is only one truth in the universe, one path worthy of an Astartes to walk. The path of true power. The path of true insight into the nature of reality and what lies beyond. The path of Chaos. Only when free of the pointless bondage of the Imperium can we ascend to our rightful place in the universe."; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting2"; + diplo_text=$"So you have brought yourself before me {obj_ini.master_name}. This pleases me. You are not the first among the Astartes to come to me. Do not look so shocked. Many have gazed upon the decay and decrepitude of the Imperium with open eyes, and heard the empty slogans of the Corpse Emperor with fresh ears and come to the realization I had so many long millennia ago. There is only one truth in the universe, one path worthy of an Astartes to walk. The path of true power. The path of true insight into the nature of reality and what lies beyond. The path of Chaos. Only when free of the pointless bondage of the Imperium can we ascend to our rightful place in the universe."; + add_diplomacy_option({option_text:"[Continue]", goto : "cs_meeting2"}); disposition[10]+=10; } // First branch of choices @@ -75,7 +132,11 @@ function scr_dialogue(diplo_keyphrase) { var mos=false,ii=0; repeat(obj_temp_meeting.dudes){ ii+=1; - if (mos=false){if (obj_ini.role[obj_temp_meeting.co[ii],obj_temp_meeting.ide[ii]]="Master of Sanctity") then mos=true;} + if (mos=false){ + if (obj_ini.role[obj_temp_meeting.co[ii],obj_temp_meeting.ide[ii]]="Master of Sanctity"){ + mos=true; + } + } } if (diplo_keyphrase=="cs_meeting2") then disposition[10]+=10; @@ -85,75 +146,77 @@ function scr_dialogue(diplo_keyphrase) { // Meeting20 if (diplo_keyphrase=="cs_meeting20"){ - diplo_text="[[A low rumbling growl issues from "+string(obj_controller.faction_leader[eFACTION.Chaos])+"’s power armour before he speaks.]]##I ask you for the last time Astartes. Why did you seek me out?"; + diplo_text="[[A low rumbling growl issues from "+string(obj_controller.faction_leader[eFACTION.Chaos])+"’s power armour before he speaks.]]\nI ask you for the last time Astartes. Why did you seek me out?"; } if (mos==true) and (diplo_keyphrase!="cs_meeting20"){ - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting_m1"; + add_diplomacy_option({option_text:"[Continue]", goto : "cs_meeting_m1"}); } if (mos==false) or (diplo_keyphrase=="cs_meeting20"){ - diplo_option[1]="The Imperium has bound us and kept us from our true potential. We seek strength."; - diplo_option[2]="The Imperium and Inquisition's ignorance and hypocrisy will be the death of my Chapter."; - diplo_option[3]="Our enemies are many and our strength is diminished. We need allies to join with us while we rebuild our forces."; - diplo_option[4]="I sought you out to slay you with my own hands."; - - // Set targets for those options - diplo_goto[1]="cs_meeting30"; - - if (obj_controller.disposition[4]<=30) then diplo_goto[2]="cs_meeting40";// Convinced - if (obj_controller.disposition[4]>30) then diplo_goto[2]="cs_meeting45";// Not convinced, high inquisition dispositioin - + add_diplomacy_option( + { + option_text:"The Imperium has bound us and kept us from our true potential. We seek strength.", + goto : "cs_meeting30", + } + ); + + // if over 30 Not convinced due to high inquisition dispositioin + var _goto = obj_controller.disposition[4]>30 ? "cs_meeting45" : "cs_meeting40"; + add_diplomacy_option({option_text:"The Imperium and Inquisition's ignorance and hypocrisy will be the death of my Chapter.", goto: _goto}); + var testy=true; - if (obj_controller.faction_status[eFACTION.Imperium]="War") or (obj_controller.marines<=600) then testy=false; - if (testy=false) then diplo_goto[3]="cs_meeting50";// Scurrying like a rat, accepts - if (testy=true) then diplo_goto[3]="cs_meeting55";// Not convinced - - diplo_goto[4]="cs_meeting60"; + if (obj_controller.faction_status[eFACTION.Imperium]="War" || obj_controller.marines<=600) then testy=false; + if (testy=false) then _goto="cs_meeting50";// Scurrying like a rat, accepts + if (testy=true) then _goto="cs_meeting55";// Not convinced + + add_diplomacy_option({option_text:"Our enemies are many and our strength is diminished. We need allies to join with us while we rebuild our forces.", goto : _goto}); + + add_diplomacy_option({option_text:"I sought you out to slay you with my own hands.", goto: "cs_meeting60"}); + } } if (diplo_keyphrase=="cs_meeting21"){ - event_log=string(obj_ini.master_name)+" kills the "+string(global.chapter_name)+" Master of Sanctity for "+string(obj_controller.faction_leader[eFACTION.Chaos])+"."; + event_log=string(obj_ini.master_name)+$" kills the {global.chapter_name} Master of Sanctity for "+string(obj_controller.faction_leader[eFACTION.Chaos])+"."; scr_event_log("purple",event_log); // scr_alert("purple","lol",string(tix),0,0); - diplo_text="As the echoes fade, it becomes clear that the Master of Sanctity of "+string(global.chapter_name)+" has fallen."; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting135"; + diplo_text=$"As the echoes fade, it becomes clear that the Master of Sanctity of {global.chapter_name} has fallen."; + add_diplomacy_option({option_text:"[Continue]", goto : "cs_meeting135"}); } // MoS cuts in if (diplo_keyphrase=="cs_meeting_m1"){ diplomacy=-5.2; - diplo_text="[["+string(obj_ini.name[0,3])+" hisses your name over a private vox channel.]]##"; + diplo_text=$"[[{obj_ini.name[0,3]} hisses your name over a private vox channel.]]\n"; diplo_text+="My lord! What are we doing here, treating with this monster of the Traitor Legions? The very existence of the Archenemy is a threat to everything the Chapter stands for, and we endanger our immortal souls just being here. You know this! I demand to know your intentions! And I warn you, I will not hesitate to do what I must, for the good of the Chapter and the Imperium."; - - diplo_option[1]="Times change and the Chapter must change with them or be ground into the dust of history. (Chaos)"; - diplo_option[2]="We will not serve the Imperium’s crooked ends any longer. Our Chapter will control its own destiny. (Renegade)"; - diplo_option[3]="I haven’t turned traitor and my faith is strong. The Beast has foolishly opened its lair to us. Be ready for my signal."; + + var _goto = "cs_meeting_m2"; + add_diplomacy_option({option_text:"Times change and the Chapter must change with them or be ground into the dust of history. (Chaos)", goto: _goto}); + add_diplomacy_option({option_text:"We will not serve the Imperium’s crooked ends any longer. Our Chapter will control its own destiny. (Renegade)", goto: _goto}); + add_diplomacy_option({option_text:"I haven’t turned traitor and my faith is strong. The Beast has foolishly opened its lair to us. Be ready for my signal.", goto: _goto}); - for(var g=1; g<=3; g++){diplo_goto[g]="cs_meeting_m2";} // Option4 here if all the right conditions are met var born=false; - for(var ii=1; i<=200; i++){if (obj_ini.role[0,ii]==obj_ini.role[100][eROLE.ChapterMaster]) and (string_count("$",obj_ini.spe[0,ii])>0) then born=true;} + for(var ii=1; i<=200; i++){ + if (obj_ini.role[0,ii]==obj_ini.role[100][eROLE.ChapterMaster]) and (string_count("$",obj_ini.spe[0,ii])>0){ + born=true; + } + } if (obj_ini.TTRPG[0][3].corruption>=50) and (born=true){ - diplo_option[4]="Right now I need my Master of Sanctity at my side, trusting that his Chapter Master is doing what is best, what is necessary for the Chapter, during this dangerous moment. All will be made clear in time, I promise you brother. This is the right path."; - diplo_goto[4]="cs_meeting_m3"; + add_diplomacy_option({option_text:"Right now I need my Master of Sanctity at my side, trusting that his Chapter Master is doing what is best, what is necessary for the Chapter, during this dangerous moment. All will be made clear in time, I promise you brother. This is the right path.", goto:"cs_meeting_m3"}); } } if (diplo_keyphrase=="cs_meeting_m2"){ - event_log="The "+string(global.chapter_name)+" Master of Sanctity takes a stand against you."; + event_log=$"The {global.chapter_name} Master of Sanctity takes a stand against you."; scr_event_log("purple",event_log);// scr_alert("purple","lol",string(tix),0,0); - diplo_text="You have besmirched the honor of our chapter this day, and I will not forget it /my lord Chapter Master/.##[["+string(obj_ini.name[0,3])+" strides forward and his shout erupts from his external vox speakers with a boom that shatters the silence in the room.]]##We will not stand idly by and bandy words with heretic scum! To me my brothers! Slay these traitors in the name of our Emperor!"; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting9"; + diplo_text="You have besmirched the honor of our chapter this day, and I will not forget it /my lord Chapter Master/.\n[["+string(obj_ini.name[0,3])+" strides forward and his shout erupts from his external vox speakers with a boom that shatters the silence in the room.]]\nWe will not stand idly by and bandy words with heretic scum! To me my brothers! Slay these traitors in the name of our Emperor!"; + add_diplomacy_option({option_text:"[Continue]", goto: "cs_meeting9"}); } if (diplo_keyphrase=="cs_meeting_m3"){ - diplo_text="[["+string(obj_ini.name[0,3])+" is silent for a moment, before giving you an imperceptible nod.]]##I stand with you, Lord "+string(obj_ini.master_name)+". Let us face this together."; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting20"; + diplo_text="[["+string(obj_ini.name[0,3])+" is silent for a moment, before giving you an imperceptible nod.]]\nI stand with you, Lord "+string(obj_ini.master_name)+". Let us face this together."; + add_diplomacy_option({option_text:"[Continue]", goto :"cs_meeting20" }); obj_controller.useful_info+="CRMOS|"; } if (diplo_keyphrase=="cs_meeting_m5"){ @@ -161,10 +224,8 @@ function scr_dialogue(diplo_keyphrase) { instance_activate_all(); diplo_text="By the sacred oath I have sworn, I bear witness to your darkest secrets. Know this: I am compelled to report your heresy to the Inquisition. Redemption or retribution, their verdict shall decide. May the Emperor's mercy guide your path."; - diplo_option[1]="Very well. I did what must be done for my brothers, and now accept the price. [Game Over]"; - diplo_option[2]="Never! [Battle Loyalist "+string(global.chapter_name)+"]"; - diplo_goto[1]="cs_meeting_m6"; - diplo_goto[2]="cs_meeting_battle7"; + add_diplomacy_option({option_text:"Very well. I did what must be done for my brothers, and now accept the price. [Game Over]", goto :"cs_meeting_m6" }); + add_diplomacy_option({option_text: $"Never! [Battle Loyalist {global.chapter_name}]", goto :"cs_meeting_battle7" }); } if (diplo_keyphrase=="cs_meeting_m6"){ global.defeat=3; @@ -172,107 +233,103 @@ function scr_dialogue(diplo_keyphrase) { } if (diplo_keyphrase=="cs_meeting9"){ diplomacy=10; - diplomacy=10; - diplo_text="[["+string(obj_controller.faction_leader[eFACTION.Chaos])+" turns to you, his voice even and calm]]##Here is the first step you must take, to prove you’ve truly left the Imperium behind. Kill him. Kill your loyal brothers.##[[His Chaos Terminators raise their weapons as one and point them at you. Somewhere behind them a daemon cackles.]]##Choose now or be obliterated."; - - diplo_option[1]="Stand with me my brothers! Fight for the future of your Chapter, and slay "+string(obj_ini.name[0,3])+"! [Battle loyalist "+string(global.chapter_name)+"]"; - diplo_goto[1]="cs_meeting_battle1"; - diplo_option[2]=string(global.chapter_name)+", I order you to hold your fire! "+string(obj_ini.name[0,3])+", if you doubt my leadership then let it be decided by single combat! [Duel your Master of Sanctity]"; - diplo_goto[2]="cs_meeting_battle2"; - diplo_option[3]="I deny you "+string(obj_controller.faction_leader[eFACTION.Chaos])+". And now I shall destroy you. For the Emperor! [Attack Chaos forces]"; - diplo_goto[3]="cs_meeting_battle5"; + + diplo_text=$"[[{obj_controller.faction_leader[eFACTION.Chaos]} turns to you, his voice even and calm]]\n\nHere is the first step you must take, to prove you’ve truly left the Imperium behind. Kill him. Kill your loyal brothers.\n[[His Chaos Terminators raise their weapons as one and point them at you. Somewhere behind them a daemon cackles.]]\nChoose now or be obliterated."; + + var _master_of_sanct = fetch_unit([0,3]); + + var _string = $"Stand with me my brothers! Fight for the future of your Chapter, and slay {_master_of_sanct.name()}! [Battle loyalist {global.chapter_name}" + add_diplomacy_option({option_text:_string, goto : "cs_meeting_battle1", goto:"cs_meeting_battle1"});; + + var _string = $"{global.chapter_name}, I order you to hold your fire! {_master_of_sanct.name()}, if you doubt my leadership then let it be decided by single combat! [Duel your Master of Sanctity]" + add_diplomacy_option({option_text: _string, goto : "cs_meeting_battle2"}); + + var _string = $"I deny you {obj_controller.faction_leader[eFACTION.Chaos]}. And now I shall destroy you. For the Emperor! [Attack Chaos forces]"; + add_diplomacy_option({option_text:_string, goto :"cs_meeting_battle5" }); } + // First explanation for chaos if (diplo_keyphrase=="cs_meeting30"){ diplo_text="Then you have awakened to the truth the Imperium so hypocritically denies, that there is only one real power in the universe, and it goes to those with the will to seize it."; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting135"; + add_diplomacy_option({option_text:"[Continue]", goto : "cs_meeting135"}); disposition[10]+=30; } // Fucking inquisition if (diplo_keyphrase=="cs_meeting40"){ diplo_text="Yes...you do not fit the precious mold the Codex Astartes carves out for you, do you? And the Imperium destroys that which it cannot understand."; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting135"; + add_diplomacy_option({option_text:"[Continue]",goto : "cs_meeting135"}); disposition[10]+=30; } // Nah dawg if (diplo_keyphrase=="cs_meeting45"){ - diplo_text="Do you take me as a fool, "+string(obj_ini.master_name)+"? Even in the Eye there are whispers of your running to and fro at the Inquisition’s beck and call, like a dog playing fetch. You’re a well-trained, and maybe even a clever, dog. I’ve killed so many clever dogs in my time. How do I know this isn’t just a hopelessly doomed plot to try and kill me, hatched by your Inquisition masters still holding your leash?"; + diplo_text=$"Do you take me as a fool, {obj_ini.master_name}? Even in the Eye there are whispers of your running to and fro at the Inquisition’s beck and call, like a dog playing fetch. You’re a well-trained, and maybe even a clever, dog. I’ve killed so many clever dogs in my time. How do I know this isn’t just a hopelessly doomed plot to try and kill me, hatched by your Inquisition masters still holding your leash?"; - diplo_option[1]="There are advantages to staying on the Inquisition’s good side, and I’m not one to ignore an advantage."; - diplo_option[2]="Appeasing the Inquisition is no hard choice when your options are obey, or eventually be branded a heretic and be destroyed."; - diplo_option[3]="Given enough time, everyone becomes a heretic in the eyes of the Inquisition. I will not wait for them to make their move against us."; - diplo_option[4]="You have one thing right, "+string(obj_controller.faction_leader[eFACTION.Chaos])+". I am here to kill you. Open fire brothers, NOW! [Battle Chaos forces]"; - diplo_goto[4]="cs_meeting_battle5"; + add_diplomacy_option({ + option_text:"There are advantages to staying on the Inquisition’s good side, and I’m not one to ignore an advantage.", + goto : choose("cs_meeting46","cs_meeting47"), + }); + add_diplomacy_option({option_text:"Appeasing the Inquisition is no hard choice when your options are obey, or eventually be branded a heretic and be destroyed.",goto : choose("cs_meeting46","cs_meeting47"),}); + add_diplomacy_option({option_text:"Given enough time, everyone becomes a heretic in the eyes of the Inquisition. I will not wait for them to make their move against us.",goto : choose("cs_meeting46","cs_meeting47"),}); - for(var q=1; q<=3; q++){diplo_goto[q]=choose("cs_meeting46","cs_meeting47");} + var _string = "You have one thing right, {obj_controller.faction_leader[eFACTION.Chaos]}. I am here to kill you. Open fire brothers, NOW! [Battle Chaos forces]"; + add_diplomacy_option({option_text:_string, goto:"cs_meeting_battle5", goto:"cs_meeting_battle5"}); } // Sorry brah, you're not their homie if (diplo_keyphrase=="cs_meeting46"){ diplo_text="I am not convinced. A shame. I was hoping you might actually be of use- but now it is apparent that your use will only be as a bloody, broken offering to the Dark Gods."; - diplo_option[1]="[Battle Chaos AND any loyalist forces]"; - diplo_option[2]="cs_meeting_battle6"; + add_diplomacy_option({option_text:"[Battle Chaos AND any loyalist forces]"}); + add_diplomacy_option({option_text:"cs_meeting_battle6"}); } // you might be their homie, fine if (diplo_keyphrase=="cs_meeting47"){ diplo_text="You may yet be of use to me. Very well, we will assist you. It will be no trouble at all to exterminate you, should you displease me at a future time."; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting135"; + add_diplomacy_option({option_text:"[Continue]", goto:"cs_meeting135"}); disposition[10]+=30; } // mah numbers if (diplo_keyphrase=="cs_meeting50"){ diplo_text="Yes we have seen you struggle alone, scurrying from shadow to shadow like a hunted rat. I won’t lie to you though, I’ve seen the potential in you and your….brothers. Alright, we will assist you. It will be no trouble at all to exterminate you, should you displease me."; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting135"; + add_diplomacy_option({option_text:"[Continue]", goto : "cs_meeting135"}); disposition[10]+=30; } // such numbers, wow if (diplo_keyphrase=="cs_meeting55"){ diplo_text="I could overrun this sector with half the warriors you have now. Is your “Chapter” so pathetic you need to throw scores more men into the meatgrinder to succeed? You have not convinced me. I'd have enjoyed making use of your Chapter, but this was clearly not meant to be. Make your peace."; - diplo_option[1]="[Battle Chaos AND any loyalist forces]"; - diplo_option[2]="cs_meeting_battle6"; + add_diplomacy_option({option_text:"[Battle Chaos AND any loyalist forces]"}); + add_diplomacy_option({option_text:"cs_meeting_battle6"}); } // Actually here to kill you if (diplo_keyphrase=="cs_meeting60"){ var chaos_leader = obj_controller.faction_leader[eFACTION.Chaos]; disposition[10]+=10; - diplo_text=$"[[{chaos_leader} is silent for a moment, then a slow chuckle rises from deep within his ancient power armour. The chuckle erupts into hideous laughter that chills your blood with its otherworldly tenor.]]##I thank you, I have not truly laughed in three hundred years. I shall take your skull as a memento of this day and your fine jest. But before I do, indulge my curiosity. Let us say you did kill me, /then/ what would you do? Claim the price on my head? Go crawling back on your belly to your Imperial masters like a whipped cur, dragging your kill behind you? Become master of this sector yourself now that you’ve bested your greatest foe? Or perhaps you’d offer up my soul to the Dark Gods, ignorantly fumbling about in the darkness for their favor? Tell me."; + diplo_text=$"[[{chaos_leader} is silent for a moment, then a slow chuckle rises from deep within his ancient power armour. The chuckle erupts into hideous laughter that chills your blood with its otherworldly tenor.]]\nI thank you, I have not truly laughed in three hundred years. I shall take your skull as a memento of this day and your fine jest. But before I do, indulge my curiosity. Let us say you did kill me, /then/ what would you do? Claim the price on my head? Go crawling back on your belly to your Imperial masters like a whipped cur, dragging your kill behind you? Become master of this sector yourself now that you’ve bested your greatest foe? Or perhaps you’d offer up my soul to the Dark Gods, ignorantly fumbling about in the darkness for their favor? Tell me."; - diplo_option[1]="The reward for one such as you will be great, and I /will/ claim it."; - diplo_goto[1]="cs_meeting61"; - diplo_option[2]="The atrocities you’ve visited on this sector are reason enough."; - diplo_goto[2]="cs_meeting63"; - diplo_option[3]=$"You think me ignorant of the ways of Chaos, {chaos_leader}, but I know one truth. There is power in blood. Your blood. My power. They will hear me."; - diplo_goto[3]="cs_meeting65"; - diplo_option[4]=$"I’m just tired of listening to you talk, {chaos_leader}."; - diplo_goto[4]="cs_meeting67"; + add_diplomacy_option({option_text:"The reward for one such as you will be great, and I /will/ claim it.", goto : "cs_meeting61"}); + + add_diplomacy_option({option_text:"The atrocities you’ve visited on this sector are reason enough.",goto : "cs_meeting63"}); + add_diplomacy_option({option_text:$"You think me ignorant of the ways of Chaos, {chaos_leader}, but I know one truth. There is power in blood. Your blood. My power. They will hear me.",goto : "cs_meeting65"}); + add_diplomacy_option({option_text:$"I’m just tired of listening to you talk, {chaos_leader}.",goto : "cs_meeting67"}); } // Reward if (diplo_keyphrase=="cs_meeting61"){ diplo_text="It is this blind overconfidence that makes killing a Space Marine so satisfying."; - diplo_option[1]="[Battle Chaos forces]"; - diplo_goto[1]="cs_meeting_battle5"; + add_diplomacy_option({option_text:"[Battle Chaos forces]", goto : "cs_meeting_battle5"}); } // Atrocities if (diplo_keyphrase=="cs_meeting63"){ diplo_text="Oh, but I have one more atrocity to commit you simply shouldn’t miss..."; - diplo_option[1]="[Battle Chaos forces]"; - diplo_goto[1]="cs_meeting_battle5"; + add_diplomacy_option({option_text:"[Battle Chaos forces]", goto : "cs_meeting_battle5"}); } // BLOOD BLOOD BLOOD if (diplo_keyphrase=="cs_meeting65"){ diplo_text="You know, I think I would actually enjoy watching you attempt it. But I’ll spare you having your soul torn to shreds by daemons, and just give you an agonizing death instead."; - diplo_option[1]="[Battle Chaos AND any loyalist forces]"; - diplo_goto[1]="cs_meeting_battle6"; + add_diplomacy_option({option_text:"[Battle Chaos AND any loyalist forces]", goto : "cs_meeting_battle6"}); } // stahp talking if (diplo_keyphrase=="cs_meeting67"){ disposition[10]+=10; diplo_text="And I thought we were becoming such fast friends, you and I. Very well, don’t bore me."; - diplo_option[1]="[Battle Chaos forces]"; - diplo_goto[1]="cs_meeting_battle5"; + add_diplomacy_option({option_text:"[Battle Chaos forces]", goto : "cs_meeting_battle5"}); } // Finish the conversation @@ -282,21 +339,20 @@ function scr_dialogue(diplo_keyphrase) { if (diplo_keyphrase=="cs_meeting135"){ disposition[10]=max(disposition[10]+10,10); - diplo_text="[["+string(obj_controller.faction_leader[eFACTION.Chaos])+"’s power armour grinds as he leans forward, his posture predatory.]]##Then we have an accord. We will assist you as you take your first steps on the path toward Chaos. And my payment for all this?##[[He chuckles.]]##Enlisting an entire chapter in the service of the Dark Gods is all the reward I require."; - diplo_text+="##But you cannot simply paint the eight-pointed star on your wargear and begin slaughtering in the name of the Dark Gods. No, some within your chapter will resist the choice you’ve made, either out of loyalty to the Corpse Emperor or out of fear of Chaos. Just think, it will be like your own little heresy. The ''"+string(obj_ini.master_name)+" Heresy!''"; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting136"; + diplo_text=$"[[{obj_controller.faction_leader[eFACTION.Chaos]}’s power armour grinds as he leans forward, his posture predatory.]]\nThen we have an accord. We will assist you as you take your first steps on the path toward Chaos. And my payment for all this?\n[[He chuckles.]]\nEnlisting an entire chapter in the service of the Dark Gods is all the reward I require."; + diplo_text+="\nBut you cannot simply paint the eight-pointed star on your wargear and begin slaughtering in the name of the Dark Gods. No, some within your chapter will resist the choice you’ve made, either out of loyalty to the Corpse Emperor or out of fear of Chaos. Just think, it will be like your own little heresy. The ''"+string(obj_ini.master_name)+" Heresy!''"; + add_diplomacy_option({option_text:"[Continue]", goto : "cs_meeting136"}); } if (diplo_keyphrase=="cs_meeting136"){ event_log=string(obj_controller.faction_leader[eFACTION.Chaos])+" gives you an Artifact, meant to help corrupt your marines to the path of Chaos."; scr_event_log("purple",event_log);// scr_alert("purple","lol",string(tix),0,0); - diplo_text="[The tones of his humorless laughter are filled with the bitterness of ancient, poisoned memories. He continues.]##You must emerge victorious from this... \\Civil War\\, and not decimate your ranks in the process, if you are to be of any use to the Gods or to me. "; - diplo_text+="And to that end, I give you this.##[["+string(obj_controller.faction_leader[eFACTION.Chaos])+" gestures to one of his Terminators, who presents you with an Artifact. In your mind, something sinister seems to cling to the lines of its form.]]##The more of your warriors that come to accept Chaos, the fewer holdouts there will be to overcome when the time comes. This object will speed their introduction to its ways. You must also encourage your warriors to...broaden their horizons wherever possible, so they come to their own understanding of the Primordial Truth. But you must tread carefully at the same time, lest you alert the Inquisition. They must not have even a hint of what’s taking place in your Chapter, or they will obliterate you."; - diplo_option[1]="[Continue]"; - diplo_goto[1]="cs_meeting137"; + diplo_text="[The tones of his humorless laughter are filled with the bitterness of ancient, poisoned memories. He continues.]\nYou must emerge victorious from this... \\Civil War\\, and not decimate your ranks in the process, if you are to be of any use to the Gods or to me. "; + diplo_text+=$"And to that end, I give you this.\n[[{obj_controller.faction_leader[eFACTION.Chaos]} gestures to one of his Terminators, who presents you with an Artifact. In your mind, something sinister seems to cling to the lines of its form.]]\nThe more of your warriors that come to accept Chaos, the fewer holdouts there will be to overcome when the time comes. This object will speed their introduction to its ways. You must also encourage your warriors to...broaden their horizons wherever possible, so they come to their own understanding of the Primordial Truth. But you must tread carefully at the same time, lest you alert the Inquisition. They must not have even a hint of what’s taking place in your Chapter, or they will obliterate you."; + add_diplomacy_option({option_text:"[Continue]", goto : "cs_meeting137"}); } + if (diplo_keyphrase=="cs_meeting137"){ - diplo_text="When enough of your warriors have embraced Chaos, assemble them together in one place and then speak with me, and I will show you the beginning of the Eightfold Path. Now, begone.##[[As you leave he calls out to you one more time.]]##And "+string(obj_ini.master_name)+", I expect action within a few years. My patience, unlike Chaos, is not infinite."; + diplo_text=$"When enough of your warriors have embraced Chaos, assemble them together in one place and then speak with me, and I will show you the beginning of the Eightfold Path. Now, begone.\n[[As you leave he calls out to you one more time.]]\nAnd {obj_ini.master_name}, I expect action within a few years. My patience, unlike Chaos, is not infinite."; complex_event=true; current_eventing=""; force_goodbye=1; @@ -309,99 +365,111 @@ function scr_dialogue(diplo_keyphrase) { var born=false; for(var ii=1; ii<200; ii++){ - if (obj_ini.role[0,ii]==obj_ini.role[100][eROLE.ChapterMaster]) then obj_ini.TTRPG[0][ii].corruption+=floor(random_range(30,50)); + if (obj_ini.role[0,ii]==obj_ini.role[100][eROLE.ChapterMaster]){ + fetch_unit([0,ii]).corruption+=floor(random_range(30,50)); + } } obj_controller.chaos_rating+=1; // Casket, Chalice, Tome - if (obj_ini.fleet_type=ePlayerBase.home_world) then scr_add_artifact("chaos_gift","",0,obj_ini.home_name,2); - if (obj_ini.fleet_type != ePlayerBase.home_world) then scr_add_artifact("chaos_gift","",0,obj_ini.ship[0],501); + if (obj_ini.fleet_type=ePlayerBase.home_world){ + scr_add_artifact("chaos_gift","",0,obj_ini.home_name,2); + } + if (obj_ini.fleet_type != ePlayerBase.home_world){ + scr_add_artifact("chaos_gift","",0,obj_ini.ship[0],501); + } } if (string_count("cs_meeting_battle",diplo_keyphrase)>0){ - current_eventing=diplo_keyphrase;combating=1; + var current_eventing=diplo_keyphrase;combating=1; cooldown=30; diplomacy=0; menu=0; instance_activate_all(); with(obj_ground_mission){instance_destroy();} + var _found = false; + var _star, _planet; with(obj_star){ - for (var run=1; run<=4; run++) { - for (var s=1; s<=4; s++) { - if (p_problem[run,s]=="meeting") or (p_problem[run,s]=="meeting_trap"){ - for (var repeatCount=1; repeatCount<=run; repeatCount++){instance_create(x,y,obj_ground_mission);} - } - } - } - } - if (instance_number(obj_ground_mission)==0){ - with(obj_star){ - if (string_count(name,scr_master_loc())>0){ - repeat(obj_ini.TTRPG[0,0].planet_location){ - instance_create(x,y,obj_ground_mission); - } - } - } + if (has_problem_star("meeting")>0 && has_problem_star("meeting")>0){ + _found = true; + _star = id; + _planet = has_problem_star("meeting") > 0 ? has_problem_star("meeting"): has_problem_star("meeting_trap"); + break; + } + } + if (!_found){ + var _master = fetch_unit([0,0]); + if (_master.planet_location > 0){ + var _master_star = star_by_name(_master.location_string); + if (_master_star != "none"){ + _found = true; + _planet = _master.planet_location; + _star = _master_star; + } + } } // show_message(string(instance_number(obj_ground_mission))); - - instance_create(0,0,obj_ncombat); - obj_ncombat.battle_special=diplo_keyphrase; - obj_ncombat.battle_object=instance_nearest(obj_ground_mission.x,obj_ground_mission.y,obj_star); - obj_ncombat.battle_loc=instance_nearest(obj_ground_mission.x,obj_ground_mission.y,obj_star).name; - obj_ncombat.battle_id=instance_number(obj_ground_mission); - with(obj_ground_mission){instance_destroy();} - obj_ncombat.dropping=0; - obj_ncombat.attacking=1; - obj_ncombat.local_forces=0; - - if (diplo_keyphrase=="cs_meeting_battle1"){ - obj_ncombat.enemy=1; - obj_ncombat.threat=2; - } - if (diplo_keyphrase=="cs_meeting_battle2"){ - obj_ncombat.enemy=1; - obj_ncombat.threat=1; - } - if (diplo_keyphrase=="cs_meeting_battle5"){ - obj_ncombat.enemy=10; - obj_ncombat.threat=3; - } - if (diplo_keyphrase=="cs_meeting_battle6"){ - obj_ncombat.enemy=10; - obj_ncombat.threat=3; - } - if (diplo_keyphrase=="cs_meeting_battle7"){ - obj_ncombat.enemy=1; - obj_ncombat.threat=2; - } - - if (obj_ncombat.enemy=10) and (obj_controller.faction_defeated[10]=0){ - obj_ncombat.leader=1; - - with(obj_star){ - remove_star_problem("meeting"); - remove_star_problem("meeting_trap"); - } - } - - for(var v=1; v=1){ - diplo_option[1]="My Chapter is prepared to join Chaos. [Begin]"; - diplo_goto[1]="civilwar_begin"; - diplo_option[2]="I require more time to corrupt my brethren."; - diplo_goto[2]="civilwar_soon"; + add_diplomacy_option({option_text:"My Chapter is prepared to join Chaos. [Begin]", goto : "civilwar_begin"}); + add_diplomacy_option({option_text:"I require more time to corrupt my brethren.", goto : "civilwar_soon"}); } } if (disposition[10]>-80) and (chaos_rating==0){ @@ -604,10 +669,10 @@ function scr_dialogue(diplo_keyphrase) { } } if (string_count("agree",diplo_keyphrase)==1){ - if (trading_artifact==0) then diplo_text=string(trade_msg)+"##"; - if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]##"; + if (trading_artifact==0) then diplo_text=string(trade_msg)+"\n"; + if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]\n"; if (liscensing>0){ - diplo_text="[[Trade Accepted. License(s) Transmitted.]]##"; + diplo_text="[[Trade Accepted. License(s) Transmitted.]]\n"; force_goodbye=1; // something else here; schedule the license and do not go to the next audience } @@ -624,27 +689,6 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="disagree"){ - if (trading_artifact==0) then diplo_text="[[Trade Refused]]##"; - if (trading_artifact==1) then diplo_text=""; - annoyed[diplomacy]+=1; - rando=choose(1,2,3); - if (rela=="hostile"){ - force_goodbye=1; - if (rando==1) then diplo_text+="You would offer me scraps for the keys to a kingdom? You are foolish and, worse, you are unaware of your own incompetence."; - if (rando==2) then diplo_text+="Do not attempt exchanges with those so far above you, lapdog of the Corpse Emperor, it makes you look even more idiotic than you already do."; - if (rando==3) then diplo_text+="I would spit upon this ‘offer' you bring before me but I find myself too amused by it."; - } - if (rela!="hostile"){ - if (rando==1) then diplo_text+="You may consider my response to be a ‘no' and assume my attitude to be whatever you like, Chapter Master."; - if (rando==2) then diplo_text+="Have a care that you do not overstep the mark, Chapter Master, I see no reason to accept such a trade."; - if (rando==3) then diplo_text+="An unreasonable trade, whatever our working relationship might be. I refuse."; - } - if (annoyed[diplomacy]>=10){ - force_goodbye=1; - turns_ignored[diplomacy]=max(turns_ignored[diplomacy],1); - diplo_last=string(diplo_keyphrase); - diplo_char=0;diplo_alpha=0;exit; - } } if (diplo_keyphrase=="attacked"){ // TODO @@ -664,7 +708,9 @@ function scr_dialogue(diplo_keyphrase) { if (rando==3) then diplo_text+="Were we not already engaged in a war 10,000 years old, your declaration might mean something."; } } - if (diplo_keyphrase=="accept_peace"){scr_chaos_alliance_test();} + if (diplo_keyphrase=="accept_peace"){ + scr_chaos_alliance_test(); + } if (diplo_keyphrase=="ignored"){ // TODO @@ -672,17 +718,23 @@ function scr_dialogue(diplo_keyphrase) { if (diplo_keyphrase=="denounced"){ if (faction_gender[10]==1){ disposition[10]-=1; - rando=choose(1,2,3,4,5,6,6,7,8,9); - if (rando==1) then diplo_text="You are nothing."; - if (rando==2) then diplo_text="Pathetic."; - if (rando==3) then diplo_text="I grow weary of your ineptitude."; - if (rando==4) then diplo_text="Judgement comes for all."; - if (rando==5) then diplo_text="Your kind will be destroyed, in time."; - if (rando==6) then diplo_text="["+string(faction_leader[eFACTION.Inquisition])+" lets out an amused, extremely confident chuckle.]"; - if (rando==7) then diplo_text="Your soul will be mine."; - if (rando==8) then diplo_text="Do not trifle with me, worm."; - if (rando==9){ - diplo_text="I have travelled the stars for millennia. Worlds have burned at my command, countless souls damned. The ground trembles with every step. Now I sit here and listen to you. Where did it all go so wrong?"; + + var _diag_opts = [ + "You are nothing.", + "Pathetic.", + "I grow weary of your ineptitude.", + "Judgement comes for all.", + "Your kind will be destroyed, in time.", + $"[{faction_leader[eFACTION.Inquisition]} lets out an amused, extremely confident chuckle.]", + "Your soul will be mine.", + "Do not trifle with me, worm.", + "I have travelled the stars for millennia. Worlds have burned at my command, countless souls damned. The ground trembles with every step. Now I sit here and listen to you. Where did it all go so wrong?" + ] + diplo_text = array_random_element(_diag_opts); + + + + if (irandom(9)==9){ force_goodbye=1; } if (disposition[10]<=-80){ @@ -762,49 +814,54 @@ function scr_dialogue(diplo_keyphrase) { if (rando==2) then diplo_text+="I am not a being of unlimited leisure time, Chapter Master, so you will need to be swift with your words."; if (rando==3) then diplo_text+="Speak but do not be offended if I seem not to be paying attention; I'm probably not."; } - diplo_option1="Demand Requisition"; - diplo_option2="Demand Military Assistance"; - diplo_option3="Cancel"; + add_diplomacy_option({option_text:"Demand Requisition"}); + add_diplomacy_option({option_text:"Demand Military Assistance"}); + add_diplomacy_option({ + option_text:"Cancel", + goto:"disagree" + }); } if (diplo_keyphrase=="propose_alliance") and (obj_controller.faction_gender[10]==1){ - with(obj_temp5){instance_destroy();} + var _found = false; + var _star, _planet; with(obj_star){ - var yeah=0; for(var i=1; i<=4;){ for(var r=1; r<=4; r++){ - if (p_problem[i,r]=="meeting") or (p_problem[i,r]=="meeting_trap") then yeah=r; + if (p_problem[i,r]=="meeting") or (p_problem[i,r]=="meeting_trap"){ + _found = true; + _star = id; + _planet = r; + break + } } } - if (yeah>0){ - for(var j=0; j0){ - diplo_text="[[Trade Accepted. License(s) Transmitted.]]##"; + diplo_text="[[Trade Accepted. License(s) Transmitted.]]\n"; force_goodbye=1; // TODO something else here; schedule the lisence and do not go to the next audience } @@ -852,7 +909,7 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="disagree"){ - if (trading_artifact==0) then diplo_text="[[Trade Refused]]##"; + if (trading_artifact==0) then diplo_text="[[Trade Refused]]\n"; if (trading_artifact==1) then diplo_text=""; annoyed[diplomacy]+=2; if (annoyed[diplomacy]>=10){ @@ -961,11 +1018,13 @@ function scr_dialogue(diplo_keyphrase) { if (rando==2) then diplo_text="I believe this trade would be beneficial to us both."; if (rando==3) then diplo_text="What benefits us both benefits the Imperium. Who better for you to trade with than myself?"; } - if (diplo_keyphrase=="open_trade") then diplo_text="Make your proposal, Chapter Master."; - if (diplo_keyphrase=="artifact_thanks"){ + if (diplo_keyphrase=="open_trade"){ + diplo_text="Make your proposal, Chapter Master."; + } + else if (diplo_keyphrase=="artifact_thanks"){ diplo_text="Thank you indeed, Chapter Master. A relic of such magnificence... I thank you more than I can say."; } - if (diplo_keyphrase=="artifact_daemon"){ + else if (diplo_keyphrase=="artifact_daemon"){ diplo_text="Thank you indeed, Chapter Master. A relic of such magnificence... I thank you. This item is precious to me."; } if (diplo_keyphrase=="stc_thanks"){ @@ -997,21 +1056,23 @@ function scr_dialogue(diplo_keyphrase) { if (rela=="friendly") then diplo_text=string(obj_ini.master_name)+"?"; if (rela=="neutral") then diplo_text="What is the meaning of this?"; if (rela=="hostile") then diplo_text="Consider your next words carefully."; - diplo_option[1]="Demand Requisition"; - diplo_option[2]="Demand Military Assistance"; - diplo_option[3]="Cancel"; - } - if (string_count("assassination_angryish",diplo_keyphrase)>0){ - var ta="",tb="",tc=""; - explode_script(diplo_keyphrase,"|"); - ta=string(explode[0]); - tb=string(explode[1]); - tc=real(explode[2]); - + add_diplomacy_option({option_text:"Demand Requisition"}); + add_diplomacy_option({option_text:"Demand Military Assistance"}); + add_diplomacy_option({ + option_text:"Cancel", + goto:"disagree" + }); + } + if (diplo_keyphrase == "assassination_angryish"){ + + var _event = audience_data; rando=choose(1,2,3); - if (rando==1) then diplo_text="Several sources indicate that you have killed the Planetary Governor of "+string(tb)+" "+scr_roman(tc)+" and went on to meddle with the succession. Such subterfuge will not be tolerated, Chapter Master."; - if (rando==2) then diplo_text="I have received word that you have killed the Planetary Governor of "+string(tb)+" "+scr_roman(tc)+" and placed a fool in power. Your attempts to control this sector, and seemingly emulate the Ultramarines, have not gone unnoticed. Do not think this will go unpunished."; - if (rando==3) then diplo_text="What do you think you are doing, Chapter Master? Killing a Planetary Governor? Replacing them with one of your tools? Inquisitor Lord "+string(faction_leader[eFACTION.Inquisition])+" will hear of this madness."; + var _assasin_place = planet_numeral_name(_event.planet, _event.system); + if (rando==1) then diplo_text=$"Several sources indicate that you have killed the Planetary Governor of {_assasin_place} and went on to meddle with the succession. Such subterfuge will not be tolerated, Chapter Master."; + if (rando==2) then diplo_text=$"I have received word that you have killed the Planetary Governor of {_assasin_place} and placed a fool in power. Your attempts to control this sector, and seemingly emulate the Ultramarines, have not gone unnoticed. Do not think this will go unpunished."; + if (rando==3) then diplo_text=$"What do you think you are doing, Chapter Master? Killing a Planetary Governor? Replacing them with one of your tools? Inquisitor Lord {faction_leader[eFACTION.Inquisition]} will hear of this madness."; + array_delete(obj_controller.event, _event_index, 1); + } } // ** Mechanicus ** @@ -1020,7 +1081,7 @@ function scr_dialogue(diplo_keyphrase) { rando=choose(1,2); if (rando==1) then diplo_text="[["+string(faction_leader[eFACTION.Mechanicus])+" is a name often spoken of on the factory floor of "+string(obj_ini.sector_name)+"'s forgeworlds, though it cursed as often as it's praised. Sometimes referred to as “The Iron Whip”, "+string(faction_leader[eFACTION.Mechanicus])+" is famed for the high level of efficiency he extracts from those working under him, if not particularly for the quality of their works.]]"; if (rando==2) then diplo_text="[[The flesh is weak. "+string(faction_leader[eFACTION.Mechanicus])+" believes in this part of the iron creed above all others, forcing all those under him to mirror his dedication. All meaty parts of his body have been removed, leaving only the most vital parts of his brain. His retinue display their rank by showing how little of their body remains.]]"; - diplo_text+="###"; + diplo_text+="\n#"; if (disposition[3]>30) and (disposition[3]<60) then tempd="Greetings. I wish to see you bring the light of civilization to this sector, Chapter Master."; if (disposition[3]<=30) or (scr_has_disadv("Tech-Heresy")) then tempd="You are impure, illogical and irritating. Keep your army of techno barbarians away from my territory."; if (disposition[3]>=60) or (scr_has_adv("Tech-Brothers")) then tempd="Hail, Chapter Master. Were it not a logical fallacy, I would wish you luck in your coming endeavors."; @@ -1052,8 +1113,8 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="agree"){ - if (trading_artifact==0) then diplo_text=string(trade_msg)+"##"; - if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]##"; + if (trading_artifact==0) then diplo_text=string(trade_msg)+"\n"; + if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]\n"; rando=choose(1,2,3); if (rela=="friendly"){ if (rando==1) then diplo_text+="Let it be so, and may the Machine God bless this venture."; @@ -1072,7 +1133,7 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="disagree"){ - if (trading_artifact==0) then diplo_text="[[Trade Refused]]##"; + if (trading_artifact==0) then diplo_text="[[Trade Refused]]\n"; if (trading_artifact==1) then diplo_text=""; rando=choose(1,2,3); if (rela=="friendly"){ @@ -1147,8 +1208,13 @@ function scr_dialogue(diplo_keyphrase) { if (diplo_keyphrase=="open_trade") then diplo_text="..."; if (diplo_keyphrase=="artifact"){ if (rela!="hostile"){ - diplo_option[1]="Propose a trade for the Artifact."; - diplo_option[2]="Leave it be; Exit."; + add_diplomacy_option({ + option_text:"Propose a trade for the Artifact." + }); + add_diplomacy_option({ + option_text:"Leave it be; Exit.", + is_exit : true, + }); diplo_text="The Adeptus Mechanicus is aware of the Artifact. Do not concern yourself with that which is rightly within our territory."; } if (rela=="hostile"){ @@ -1201,8 +1267,11 @@ function scr_dialogue(diplo_keyphrase) { if (randoo==1) then diplo_text="Calculations reveal that depending on your query we may have to beat your ass."; if (randoo!=1) then diplo_text="Certain queries may have to be answered by action."; } - diplo_option[1]="Demand Requisition"; - diplo_option[2]="Cancel"; + add_diplomacy_option({option_text:"Demand Requisition"}); + add_diplomacy_option({ + option_text:"Cancel", + goto:"disagree" + }); } } // ** Inquisition ** @@ -1211,7 +1280,7 @@ function scr_dialogue(diplo_keyphrase) { rando=choose(1,1,2); if (rando==1) then tempd="[[An ancient and well respected Inquistor Lord, "+string(faction_leader[eFACTION.Inquisition])+" has purged heresy and exterminated mutants for well over four centuries. His steely gaze and iron will have broken as many heretics as have the tools of persuasion wielded by his retinue. Were he to die, the Ordo "+choose("Malleus","Xenos","Hereticus")+" would dearly miss his services.]]"; if (rando==2) then tempd="[[A thousand heretics have cursed the name of "+string(faction_leader[eFACTION.Inquisition])+" with their last breath but he is still not satisfied. Remorse is as alien to him as pity and he will stop at nothing to destroy the enemies of purity.]]"; - tempd+="###"; + tempd+="\n#"; if (rela=="friendly") then tempd+="Ave Imperator, Chapter Master. You show great promise and I look forward to seeing you bring the light of the Emperor to "+string(obj_ini.sector_name)+"."; if (rela=="neutral") then tempd+="Greetings, space marine. Serve the Emperor in body and soul and you shall have nothing to fear from the Inquisition."; if (rela=="hostile") then tempd+="I hear worrying rumors about your conduct, astartes. I have no doubt we will meet again soon."; @@ -1243,8 +1312,8 @@ function scr_dialogue(diplo_keyphrase) { } } if (string_count("agree",diplo_keyphrase)>0){ - if (trading_artifact==0) then diplo_text=string(trade_msg)+"##"; - if (trading_artifact!=0) or (liscensing>0) then diplo_text="[[Trade Accepted.]]##"; + if (trading_artifact==0) then diplo_text=string(trade_msg)+"\n"; + if (trading_artifact!=0) or (liscensing>0) then diplo_text="[[Trade Accepted.]]\n"; rando=choose(1,2,3); if (rela=="friendly"){ if (rando==1) then diplo_text+="An interesting proposal. I look forward to the fruition of this deal."; @@ -1263,7 +1332,7 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="disagree"){ - if (trading_artifact==0) then diplo_text="[[Trade Refused]]##"; + if (trading_artifact==0) then diplo_text="[[Trade Refused]]\n"; if (trading_artifact==1) then diplo_text=""; annoyed[diplomacy]+=2; if (rela=="friendly") and (annoyed[diplomacy]>=8){ @@ -1374,8 +1443,8 @@ function scr_dialogue(diplo_keyphrase) { } if (diplo_keyphrase=="open_trade") then diplo_text="Make me an offer and I shall consider it, both for its value and its potential heresy."; if (diplo_keyphrase=="artifact"){ - diplo_option[1]="Propose a trade for the Artifact."; - diplo_option[2]="Leave it be; Exit."; + add_diplomacy_option({option_text:"Propose a trade for the Artifact."}); + add_diplomacy_option({option_text:"Leave it be; Exit."}); diplo_text="The Inquisition is, of course, aware of the artifact in question. What, precisely, are you offering for it?"; } if (diplo_keyphrase=="artifact_thanks"){ @@ -1440,39 +1509,105 @@ function scr_dialogue(diplo_keyphrase) { if (rando==3) then diplo_text="You have handed away the root of the Imperium's most powerful warriors to foul xenos. Did you truly believe a crime of this magnitude would escape the eye of the Imperium?"; faction_status[diplomacy]="War"; var lol=""; - lol=string(obj_controller.faction_title[diplomacy])+" "+string(obj_controller.faction_leader[diplomacy])+" declares war on the "+string(global.chapter_name)+"."; + lol=string(obj_controller.faction_title[diplomacy])+" "+string(obj_controller.faction_leader[diplomacy])+$" declares war on the {global.chapter_name}."; scr_event_log("red",lol); force_goodbye=1; gene_xeno=0; } if (diplo_keyphrase=="trading_demand"){ if (rela=="friendly") then diplo_text="Remember whom you speak to, Chapter Master."; - if (rela=="neutral") then diplo_text="I, Inquisitor Lord "+string(faction_leader[eFACTION.Inquisition])+", on behalf of the Inquisition, am awaiting your words."; + if (rela=="neutral") then diplo_text=$"I, Inquisitor Lord {faction_leader[eFACTION.Inquisition]}, on behalf of the Inquisition, am awaiting your words."; if (rela=="hostile") then diplo_text="Speak your next words very carefully, Astartes, for they may be your last."; - diplo_option[1]="Demand Requisition"; - diplo_option[2]="Skip Inspection"; - diplo_option[3]="Cancel"; - if (inspection_passes>0) then diplo_option[2]="Skip Inspection ("+string(inspection_passes)+" pass)"; + add_diplomacy_option({ + option_text:"Demand Requisition" + }); + + + add_diplomacy_option({ + option_text:"Skip Inspection", + choice_func : inquis_demand_inspection_pass, + }); + + if (inspection_passes>0){ + add_diplomacy_option({ + option_text:"Skip Inspection (Use pass)", + choice_func : inquis_use_inspection_pass + }); + } + add_diplomacy_option({ + option_text:"Cancel", + goto:"disagree" + }); } if (diplo_keyphrase=="penitent_end"){ rando=choose(1,2); if (rando==1) then diplo_text="It seems that congratulations are in order. While some might think the Inquisition blind to the possibility that it, that is to say we, could ever do wrong, it is not so. I know that we are as fallible as any man, save the Emperor, and can make mistakes when judging character. I took you for a traitor to humanity's cause. I see that I was wrong now and let it not be said I will not give credit where it is due; well done, Chapter Master. May the enemies of mankind speak your name in fear and humanity in adoration."; if (rando==2) then diplo_text="Few return from a penitent crusade, Chapter Master, and I find that those who do are invariably changed by the experience. Tell me, do you feel your vision expanded? Your faults exposed and then erased by his glorious light? I do not doubt that you do. To battle the Emperor's enemies without any thought of pause or relief is the highest form of honour, the highest form of service. You are to be congratulated on your diligence and dedication, not to mention your skill at arms."; } - if (string_count("assassination_angry",diplo_keyphrase)>0){ + if (diplo_keyphrase == "assassination_angry"){ // aa|planet_name|planet number| - var ta="",tb="",tc=""; - explode_script(diplo_keyphrase,"|"); - ta=string(explode[0]); - tb=string(explode[1]); - tc=real(explode[2]); - obj_controller.temp[1008]=string(tb)+"|"+string(tc)+"|"; - - diplo_text="My patience is wearing thin, Chapter Master. I have many more problems more urgent and, yet, you continue to force me away from the work assigned to me by He on Terra. Your serf on "+string(tb)+" "+scr_roman(tc)+" will be executed along with all the other puppets I ferret out. You are close to treason, Chapter Master. Choose your next words with exceptional care for they may be your last."; + + + var _event = audience_data; + var _system = _event.system; + var _planet = _event.planet; + var _star_name = planet_numeral_name(_planet, star_by_name(_system)) + diplo_text=$"My patience is wearing thin, Chapter Master. I have many more problems more urgent and, yet, you continue to force me away from the work assigned to me by He on Terra. Your serf on {_star_name} will be executed along with all the other puppets I ferret out. You are close to treason, Chapter Master. Choose your next words with exceptional care for they may be your last."; - diplo_option[1]="It will not happen again"; - diplo_option[2]="Very well"; - diplo_option[3]="You will not. "+string(tb)+" is MINE!"; + add_diplomacy_option({ + option_text:"It will not happen again", + key : "serf_removal_submit", + choice_func : function(){ + scr_dialogue("you_better"); + force_goodbye=1; + hunt_player_serfs(audience_data.planet, audience_data.system); + alter_dispositions([ + [eFACTION.Imperium, -15], + [eFACTION.Inquisition, -30], + [eFACTION.Ecclesiarchy, -10], + ]); + exit; + } + }); + add_diplomacy_option({ + option_text:"Very well", + key : "serf_removal_accept", + choice_func : function(){ + force_goodbye=1; + + hunt_player_serfs(audience_data.planet, audience_data.system); + + alter_dispositions([ + [eFACTION.Imperium, -15], + [eFACTION.Inquisition, -30], + [eFACTION.Ecclesiarchy, -10], + ]); + exit; + } + }); + + if (obj_controller.disposition[eFACTION.Inquisition] >= 70){ + add_diplomacy_option({ + option_text:"Perhaps We can come to an arrangement", + tooltip : "This action will trigger a Charisma test", + choice_func : function(){ + + } + }); + } + add_diplomacy_option({ + option_text:$"You will not. {_star_name} is MINE!", + key : "serf_removal_defy", + force_goodbye : 1, + choice_func : function(){ + alter_dispositions([ + [eFACTION.Imperium, -30], + [eFACTION.Inquisition, -60], + [eFACTION.Ecclesiarchy, -30], + ]); + }, + goto : "die_heretic", + }); } if (diplo_keyphrase=="you_better"){ rando=choose(1,2); @@ -1487,9 +1622,10 @@ function scr_dialogue(diplo_keyphrase) { if (obj_ini.fleet_type != ePlayerBase.home_world) then diplo_text="I am mobilizing the Segmentum battlefleet. You may run, heretic, but it will do you no good."; } var ev=0; - for(var v=1; v<=99; v++){if (ev=0) and (event[v]="") then ev=v;} - event[ev]="game_over_man"; - event_duration[ev]=1; + add_event({ + e_id : "game_over_man", + duration : 1, + }) } rando=choose(1,2,3); if (diplo_keyphrase=="chaos_audience1"){ @@ -1526,17 +1662,14 @@ function scr_dialogue(diplo_keyphrase) { diplo_text="Your arrogant, blatant disregard for proper Imperial conduct can no longer go unanswered, Astartes. Time and time again you have ignored the Imperium's call to arms, refusing to strike out at the enemies of man when it was most needed, and callously ignored the Inquisition's wants. It has become clear that you are not in line with the High Lords of Terra and His will. This heresy must be cut from your Chapter like the festering blight it is. You may either atone for your Chapter's crimes, in penitence, or see it ground to dust around you."; // Speak your next words carefully, Chapter Master, for they may damn all the souls of your men to oblivion. - diplo_option[1]="You are right in that we must account for our sins. Let our Penitence begin."; - diplo_goto[1]="loyalty_penitence"; - diplo_option[2]="I answer only to the Emperor himself, not to the likes of you."; - diplo_goto[2]="die_heretic"; - diplo_option[3]="Threaten my Chapter at your own peril."; - diplo_goto[3]="die_heretic"; + add_diplomacy_option({option_text:"You are right in that we must account for our sins. Let our Penitence begin.", goto : "loyalty_penitence"}); + add_diplomacy_option({option_text:"I answer only to the Emperor himself, not to the likes of you.",goto:"die_heretic"}); + add_diplomacy_option({option_text:"Threaten my Chapter at your own peril.", goto:"die_heretic"}); } if (diplo_keyphrase=="loyalty_penitence"){ diplo_text="Brothers, hear my words! It is time to embark on a sacred journey of redemption, a penitence crusade to cleanse our souls. Our past wrongdoings have led us astray form the Emperor, but through unwavering determination and righteous deeds, we shall forge a path to absolution. With every battle fought, every sacrifice made, we shall restore honor to our name and rekindle the flame of righteousness within. "; - var tx="The "+string(global.chapter_name)+" become Penitent."; + var tx=$"The {global.chapter_name} become Penitent."; scr_alert("green","halp",string(tx),0,0); scr_event_log("",string(tx)); @@ -1557,67 +1690,28 @@ function scr_dialogue(diplo_keyphrase) { } // ** Ecclesiarchy ** if (diplomacy==5){ - if (diplo_keyphrase=="intro"){ - rando=choose(1,2); - if (rando==1) then tempd="[[Old and experienced, this Prioress of the Sisters of Battle is not a woman to be trifled with. Clad in an elaborate set of full power armour and with her face sporting several scars, "+string(faction_leader[eFACTION.Ecclesiarchy])+" exudes battlefield experience.]]"; - if (rando==2) then tempd="[[The Ecclesiarchy have assigned one of their militant arm to their dealings with you- Prioress "+string(faction_leader[eFACTION.Ecclesiarchy])+". The woman wears a set of well-used powered armour that has seen many battles, if its charred exterior is to be believed. Incense burners hang from chains on her belt and waft smoke around her body.]]"; - tempd+="###"; - rando=choose(1,1,2,2,2); - if (rando==1) then tempd+="Hail, Chapter Master! As a son of the Emperor, you will no doubt take great joy in bringing his light to this benighted sector. I look forward to watching heretics fall before your armies."; - if (rando==2) then tempd+="And the Emperor spoke; “You shall know my servants by the eagle they bear, so the people of old Terra did know the eagle as the symbol of enlightenment and freedom.” Fitting that we, the instruments of His will, still bear the eagle? May the Emperor's gaze be upon you, Space Marine."; - diplo_text=tempd; - } - if (diplo_keyphrase=="hello"){ - if (rela=="friendly") then diplo_text="Hail, hero of "+string(obj_ini.sector_name)+", how may I assist you this day?"; - if (rela=="neutral") then diplo_text="Praise be to the Emperor. What is your business here?"; - if (rela=="hostile") then diplo_text="State your business, for many heretics pray the Emperor's mercy."; - } - if (diplo_keyphrase=="trade_close"){ - if (rela=="friendly") then diplo_text="Ave Imperator, Chapter Master. No doubt an unslain Xenos calls for your blade."; - if (rela=="neutral") then diplo_text="I hope there is a good reason for this affront, Chapter Master, for it is never wise to slight the Emperor's truest servants."; - if (rela=="hostile") then diplo_text="While it is immaterial whether the Ecclesiarchy needed those supplies, it is a sign of disrespect for you to act thus. When you slight us, you slight the Emperor, Chapter Master."; - } - if (diplo_keyphrase=="demand_refused"){ - rando=choose(1,2); - if (rela=="friendly"){ - if (rando==1) then diplo_text="It is not to be, Chapter Master, as much as we wish it otherwise."; - if (rando==2) then diplo_text="I do not believe we can fulfil your request. Ask the Emperor for guidance and perhaps he will see fit to deliver."; - } - if (rela=="neutral"){ - if (rando==1) then diplo_text="Unless we receive a sign from the Lords of Terra to the contrary, we cannot comply with your request."; - if (rando==2) then diplo_text="It is not something that we can condone or agree with."; - } - if (rela=="hostile"){ - if (rando==1) then diplo_text="Flee back to the darkness, heretic. You will have nothing from us."; - if (rando==2) then diplo_text="While we will not fulfill your request, perhaps your warp spawned allies will, heretic scum?"; - } - } - if (diplo_keyphrase=="agree"){ - if (trading_artifact==0) then diplo_text=string(trade_msg)+"##"; - if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]##"; - rando=choose(1,2,3); - if (rela=="friendly"){ - if (rando==1) then diplo_text+="Let it be so."; - if (rando==2) then diplo_text+="You need but ask, Chapter Master, and your commands will be fulfilled."; - if (rando==3) then diplo_text+="As you command, son of the Emperor."; - } - if (rela=="neutral"){ - if (rando==1) then diplo_text+="It shall be done."; - if (rando==2) then diplo_text+="I agree, and may the Emperor look favorably upon this venture."; - if (rando==3) then diplo_text+="Doubt is anathema to a true servant of the Emperor, but still... I have little choice but to agree."; - } - if (rela=="hostile"){ - if (rando==1) then diplo_text+="It will take some time in penitence to erase the crime of this action, but I agree."; - if (rando==2) then diplo_text+="Circumstances force me to agree."; - if (rando==3) then diplo_text+="Had I any other option, you would be burning in purifying flame at this moment... but I do not. I am with you."; - } - } + var _diag_data = { + faction_leader:faction_leader[eFACTION.Ecclesiarchy], + sector:obj_ini.sector_name, + relationship : rela, + annoyed:annoyed[diplomacy], + turns_ignored :turns_ignored[diplomacy], + chapter_name :global.chapter_name, + master_name : obj_ini.master_name, + faction_status:obj_controller.faction_status[eFACTION.Ecclesiarchy] + } + var _diag_set = global.dialogue.sisters; + diplo_text = create_dialogue_string(global.dialogue.sisters, diplo_keyphrase,_diag_data); + + if(struct_exists(data,"prepend")){ + diplo_text=$"{data.prepend} {diplo_text}" + } + if (diplo_keyphrase=="disagree"){ - if (trading_artifact==0) then diplo_text="[[Trade Refused]]##"; + if (trading_artifact==0) then diplo_text="[[Trade Refused]]\n"; if (trading_artifact==1) then diplo_text=""; annoyed[diplomacy]+=2; - if (rela=="neutral") and (annoyed[diplomacy]>=8){ - diplo_text+="I cannot agree to this, Chapter Master, no matter how stubborn you may be."; + if (rela=="neutral") and (_diag_data.annoyed>=8){ force_goodbye=1; turns_ignored[diplomacy]=max(turns_ignored[diplomacy],1); diplo_last=string(diplo_keyphrase); @@ -1625,23 +1719,10 @@ function scr_dialogue(diplo_keyphrase) { diplo_alpha=0; exit; } - rando=choose(1,2,3); - if (rela=="friendly"){ - if (rando==1) then diplo_text+="I am sorry Chapter Master but I cannot help you."; - if (rando==2) then diplo_text+="Perhaps another Imperial faction can assist you, but I am unable to."; - if (rando==3) then diplo_text+="My hands are tied in this matter, my Lord, else I would rush to your aide."; - } - if (rela=="neutral"){ - if (rando==1) then diplo_text+="I cannot agree."; - if (rando==2) then diplo_text+="My sisters and I are unwilling to join you in this course of action."; - if (rando==3) then diplo_text+="It would not be fitting for my order to join you."; - } + if (rela=="hostile"){ force_goodbye=choose(0,1); - if (rando==1) then diplo_text+="I would rather die, heretic. You have turned from His light and will pay the price!"; - if (rando==2) then diplo_text+="When I made my vows to the Emperor, I made them for life, unlike you. Take your deal and burn with it."; - if (rando==3) then diplo_text+="Your attempt to draw me away from the light are as clumsy as an ork's handwriting! I say thee nay!"; - if (annoyed[diplomacy]>=4){ + if (_diag_data.annoyed>=4){ turns_ignored[diplomacy]=max(turns_ignored[diplomacy],1); diplo_last=string(diplo_keyphrase); diplo_char=0; @@ -1649,17 +1730,10 @@ function scr_dialogue(diplo_keyphrase) { } } } - if (diplo_keyphrase=="attacked"){ - diplo_text="You pile infamy on sin, traitorous dog. I will be happy to wipe the stain of your existence from the galaxy."; - } - if (diplo_keyphrase=="declare_war"){force_goodbye=1;turns_ignored[diplomacy]+=4;known[diplomacy]=max(2,known[diplomacy]); - diplo_text="There is a price for all things and the accounting is now. Know that you reap only what you have sown."; - } - if (diplo_keyphrase=="accept_peace"){ - diplo_text="It leaves a bitter taste in my mouth, but you may go in peace. I will be watching you from now on, however."; - } - if (diplo_keyphrase=="ignored"){ - diplo_text="Human we may be, but the Adepta Sororitas are second in loyalty only to the astartes themselves. Why do you ignore us so?"; + if (diplo_keyphrase=="declare_war"){ + force_goodbye=1; + turns_ignored[diplomacy]+=4; + known[diplomacy]=max(2,known[diplomacy]); } if (diplo_keyphrase=="denounced"){ if (faction_justmet==1){ @@ -1667,91 +1741,48 @@ function scr_dialogue(diplo_keyphrase) { faction_justmet=0; } scr_loyalty("Irreverance for His Servants","+"); - rando=choose(1,2,3); - if (rela=="friendly"){ - if (rando==1) then diplo_text="I'm sure you have your reasons for saying such things, my lord."; - if (rando==2) then diplo_text="Ha, your words would wound me if I thought you were any less loyal to the Emperor."; - if (rando==3) then diplo_text="Lucky for you I don't take offense easily."; - } - if (rela=="neutral"){ - if (rando==1) then diplo_text="You are wrong and I will show you this."; - if (rando==2) then diplo_text="I couldn't give less of a damn for your words."; - if (rando==3) then diplo_text="I don't care what you think, only what you do."; - } - if (rela=="hostile"){ - if (rando==1) then diplo_text="Send your poison elsewhere; it is actions and not words that make a man."; - if (rando==2) then diplo_text="So men act well but speak lies, some speak beautiful truths but act like common criminals. But you manage to get the worst of both worlds. It is almost impressive."; - if (rando==3) then diplo_text="When my flame sends you to your dark gods, it will be too late for such words."; - } } if (diplo_keyphrase=="praised"){ if (faction_justmet==1){ - disposition[diplomacy]+=3; + alter_disposition(diplomacy,3); faction_justmet=0; - var o=0; - if (scr_has_adv("Reverent Guardians")) { - o=500; - } - if (o>100) then obj_controller.disposition[5]+=2; } - rando=choose(1,2,3); - if (rela=="friendly"){ - if (rando==1) then diplo_text="Thank you, Chapter Master. That means a lot from a warrior such as you."; - if (rando==2) then diplo_text="Your words raise my spirits, comrade. I hope to see you on the battlefield soon.."; - if (rando==3) then diplo_text="Apply your mind to defeating the Emperor's enemies, not thinking up clever compliments to pile at my feet. Unless you feel you can do both?"; - } - if (rela=="neutral"){ - if (rando==1) then diplo_text="We thank you, but will not let words alter our disposition."; - if (rando==2) then diplo_text="The only praise that matters is the praise we give to the Emperor."; - if (rando==3) then diplo_text="Venerate the Emperor with the same enthusiasm and He may look kindly upon you."; - } - if (rela=="hostile"){ - if (rando==1) then diplo_text="Your words will not stall my forces."; - if (rando==2) then diplo_text="Compliments will not put out the cleansing flame I will bathe you in."; - if (rando==3) then diplo_text="Save your breath for prayers of forgiveness, for I will destroy you."; - } - } - if (diplo_keyphrase=="offer"){ - rando=choose(1,2,3); - if (rando==1) then diplo_text="Is this trade acceptable to you?"; - if (rando==2) then diplo_text="The Emperor, hallowed be His name, would doubtless endorse this trade."; - if (rando==3) then diplo_text="Ask yourself; would a true son of the Emperor turn down this trade?"; + } - if (diplo_keyphrase=="open_trade") then diplo_text="Make me an offer, Space Marine, and I will pray for the guidance to respond."; + if (diplo_keyphrase=="artifact"){ - diplo_option[1]="Propose a trade for the Artifact."; - diplo_option[2]="Leave it be; Exit."; - diplo_text="You have done a service to us by making us aware of this artifact. It is a little amusing that is was under our noses this whole time, though now I am sure it can be retrieved."; - } - if (diplo_keyphrase=="artifact_thanks"){ - diplo_text="You are a true servant of the Emperor! This artifact, while it might be of great value to others, shall forever be a symbol of our friendship."; + add_diplomacy_option({ + option_text:create_dialogue_string(_diag_set, "propose_arti_trade",_diag_data), + }); + add_diplomacy_option({ + option_text:create_dialogue_string(_diag_set, "leave_it",_diag_data), + }); + } + if (diplo_keyphrase=="artifact_daemon"){ - if (rela=="friendly") then obj_controller.disposition[5]-=2; - if (rela=="neutral") then obj_controller.disposition[5]-=6; - if (rela=="hostile"){obj_controller.disposition[5]-=10; - if (obj_controller.faction_status[eFACTION.Ecclesiarchy]=="Allied") then obj_controller.faction_status[eFACTION.Ecclesiarchy]="Antagonism";} - if (rela=="friendly") then diplo_text=" I am sure it was not your intention, Chapter Master, but to give a daemonic artifact to the Ecclesiarchy is a great insult. Only the Inquisition has been given leave to wield such things, and few among our number agree with the practice. You will be forgiven this time, but do not let it happen again."; - if (rela=="neutral") then diplo_text="It is possible that you did not know of the presence of the daemon within this artifact, but ignorance is no excuse. Maybe you are simply too corrupt to notice the heretical whispers and temptations that the item exudes. I will pray for your soul, or cleanse it with holy fire."; - if (rela=="hostile") then diplo_text="Heretic! You dare to hand us, the Emperor's most devout followers, a artifact tainted by the presence of a monstrous daemon!? Beneath the facade of an Astartes, you are the very embodiment of servant of chaos! We will not forget this."; - } - if (diplo_keyphrase=="artifact_angry"){ - diplo_text="How dare you strike at us, the truest and most devoted servants of the Emperor!? That artifact was on our territory! You had no right and you shall pay in blood for your actions!"; - } - if (diplo_keyphrase=="stc_thanks"){ - diplo_text="On behalf of Imperium, I extend our deepest gratitude to "+string(global.chapter_name)+" for the invaluable gift given to us."; - } + if (rela=="friendly"){ + obj_controller.disposition[5]-=2; + } + else if (rela=="neutral"){ + obj_controller.disposition[5]-=6; + } + else if (rela=="hostile"){ + obj_controller.disposition[5]-=10; + } + if (_diag_data.faction_status=="Allied"){ + obj_controller.faction_status[eFACTION.Ecclesiarchy]="Antagonism"; + } + } + if (diplo_keyphrase=="trading_demand"){ - if (rela=="friendly") then diplo_text=string(obj_ini.master_name)+"?"; - if (rela=="neutral") then diplo_text="What is the meaning of this?"; - if (rela=="hostile") then diplo_text="“The Heretic and Blasphemer can offer no excuse for their crimes. Those who are pardoned merely live to further shroud Humanity from the Light of the Emperor with the Darkness of their souls.”"; - diplo_option[1]="Demand Requisition"; - diplo_option[2]="Cancel"; - } - if (diplo_keyphrase=="penitent_end"){ - rando=choose(1,2); - if (rando==1) then diplo_text="Yours is the glory, Chapter Master. I admit that I did not expect you to survive this ordeal, having wronged the name of the Emperor as you have. It seems, in his wisdom, that he has chosen to spare you for greater things. That you marched through the fires of war and return practically unscathed... it is all the proof I need of your favour with the God Emperor. Take his word to the heretic, the mutant and the Xenos, Astartes. You have once more earned that right."; - if (rando==2) then diplo_text="Penitent crusades are a cathartic experience, are they not? To bathe oneself in the blood of The Imperium's foes, until one's faults are washed away. To let oneself forget restraint and self control, to simply revel in the joy of spilling heretical, Xenos blood. Make no mistake, I envy you. It is a long time since I had not thought but of the next kill to fall under my blade. Congratulations on not losing yourself, however. Few return from penitent crusades with as much of their minds in tact as you seem to have."; + add_diplomacy_option({ + option_text:"Demand Requisition" + }); + add_diplomacy_option({ + option_text:"Cancel", + goto:"disagree" + }); } } // ** Eldar ** @@ -1770,7 +1801,7 @@ function scr_dialogue(diplo_keyphrase) { } diplo_text+=" Do not expect futher contact.]]"; } - diplo_text+="###"; + diplo_text+="\n#"; // * Normal craftworld reveal * if (string_count("1",diplo_keyphrase)>0){ if (scr_has_adv("Enemy: Eldar")){ @@ -1838,8 +1869,8 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="agree"){ - if (trading_artifact==0) then diplo_text=string(trade_msg)+"##"; - if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]##"; + if (trading_artifact==0) then diplo_text=string(trade_msg)+"\n"; + if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]\n"; rando=choose(1,2,3); if (rela=="friendly"){ if (rando==1) then diplo_text+="We are agreed."; @@ -1858,7 +1889,7 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="disagree"){ - if (trading_artifact==0) then diplo_text="[[Trade Refused]]##"; + if (trading_artifact==0) then diplo_text="[[Trade Refused]]\n"; if (trading_artifact==1) then diplo_text=""; annoyed[diplomacy]+=2; if (rela=="friendly") and (annoyed[diplomacy]>=6){ @@ -1899,7 +1930,7 @@ function scr_dialogue(diplo_keyphrase) { } if (diplo_keyphrase=="attacked"){ if (rela!="friendly") then diplo_text="Normal 'we were attacked' line goes here."; - if (rela=="friendly") then diplo_text="I would say 'you should know better', "+string(obj_ini.master_name)+", but children are incapable of acting with wisdom, as is their nature.##This act of war obliges us to respond in kind. I expect to see you upon the fields of battle."; + if (rela=="friendly") then diplo_text="I would say 'you should know better', "+string(obj_ini.master_name)+", but children are incapable of acting with wisdom, as is their nature.\nThis act of war obliges us to respond in kind. I expect to see you upon the fields of battle."; } if (diplo_keyphrase=="declare_war"){ force_goodbye=1; @@ -1962,7 +1993,7 @@ function scr_dialogue(diplo_keyphrase) { } if (diplo_keyphrase=="open_trade") then diplo_text="Speak."; if (diplo_keyphrase=="artifact"){ - diplo_text="Representatives of the Imperium, as the Chapter Master of "+string(global.chapter_name)+", I inform you of a potential artifact within our possession, one that we are willing to trade."; + diplo_text=$"Representatives of the Imperium, as the Chapter Master of {global.chapter_name}, I inform you of a potential artifact within our possession, one that we are willing to trade."; } if (diplo_keyphrase=="artifact_thanks"){ diplo_text="We... thank you, for the gift of this imperial curio. I am sure it will prove useful for something. What, I am not sure."; @@ -1997,9 +2028,12 @@ function scr_dialogue(diplo_keyphrase) { if (rando==2) then diplo_text="You may not always have what you wish for, Mon'keigh."; if (rando==3) then diplo_text="Were I a lesser being, such as yourself, spitting in your face might prove tempting."; } - diplo_option[1]="Demand Requisition"; - diplo_option[2]="Demand Useful Information"; - diplo_option[3]="Cancel"; + add_diplomacy_option({option_text:"Demand Requisition"}); + add_diplomacy_option({option_text:"Demand Useful Information"}); + add_diplomacy_option({ + option_text:"Cancel", + goto:"disagree" + }); } if (diplo_keyphrase=="mission1"){ diplo_text="The good that might come from simple acts of benevolence are oft underestimated. A token goodwill gesture can go far, "; @@ -2007,12 +2041,30 @@ function scr_dialogue(diplo_keyphrase) { if (rela!="hostile") then diplo_text+="human"; diplo_text+=". Even something as small as water, raw material, and sustenance can have a profound efect."; - diplo_option[1]="Give 500 Requisition"; - diplo_option[2]="Maybe"; - diplo_option[3]="Refuse"; + add_diplomacy_option({ + option_text:"Give 500 Requisition", + goto : "elder_mission1_thanks", + choice_func : function(){ + scr_loyalty("Xeno Trade","+"); + scr_quest(2,"fund_elder",6,0); + requisition-=500; + } + }); + add_diplomacy_option({ + option_text:"Maybe", + goto : "quest_maybe", + }); + add_diplomacy_option({ + option_text:"Refuse", + goto : "mission1_refused", + choice_func : function(){ + scr_quest(3,"fund_elder",6,0); + questing=0; + } + }); questing=1; } - if (diplo_keyphrase=="mission1_thanks"){ + if (diplo_keyphrase=="elder_mission1_thanks"){ scr_recent("eldar_mission","completed",1); rando=choose(1,1,1,2,2,3,3,3); if (rando==1) then diplo_text="You intend to hand over these resources? Without a promise of compensation? You are a strange human, Chapter Master. Few would do this, and it will not be forgotten."; @@ -2038,10 +2090,7 @@ function scr_dialogue(diplo_keyphrase) { if (rando==2) then diplo_text="While this is not the gesture I was referring to, I suppose the fact you are yet to scream and shout about ‘Xenos Scum' must be taken as a minor miracle."; if (rando==3) then diplo_text="Not hard to see why your species is so universally viewed as foolish. Still, perhaps you will manage to be a little more enlightened than the rest."; questing=0; - for(var h=1; h<=4; h++){ - obj_controller.diplo_option[h]=""; - obj_controller.diplo_goto[h]=""; - } + clear_diplo_choices(); } if (diplo_keyphrase=="useful_information"){ var found=0; @@ -2117,11 +2166,11 @@ function scr_dialogue(diplo_keyphrase) { var you,nuum,plan=0; you=instance_nearest(obj_temp5.x,obj_temp5.y,obj_star); nuum=you.name; - for(var i=1; i<=4; i++){ + for(var i=1; i<=you.planets; i++){ if (planet_feature_bool(you.p_feature[1], P_features.Warlord10)==1) then plan=i; } found=1; - diplo_text="The fallen warlord of your kind is located somewhere within the "+string(nuum)+" system. More I cannot say. It would be prudent to deal with this soon- that abomination may not remain there long."; + diplo_text=$"The fallen warlord of your kind is located somewhere within the {nuum} system. More I cannot say. It would be prudent to deal with this soon- that abomination may not remain there long."; } }} } @@ -2145,7 +2194,7 @@ function scr_dialogue(diplo_keyphrase) { var you,nuum,plan=0; you=instance_nearest(obj_temp5.x,obj_temp5.y,obj_star); nuum=you.name; - for(var i=1; i<=4; i++){ + for(var i=1; i<=you.planets; i++){ if (planet_feature_bool(you.p_feature[1], P_features.OrkWarboss)==1) then plan=i; } if (you.p_orks[plan]<6) then you.p_orks[plan]=6; @@ -2188,12 +2237,7 @@ function scr_dialogue(diplo_keyphrase) { } if (onceh!=0){ array_push(p_feature[onceh], new NewPlanetFeature(P_features.Webway)); - obj_controller.temp[90]=name; - good=1; - if (onceh==1) then obj_controller.temp[90]+=" I"; - if (onceh==2) then obj_controller.temp[90]+=" II"; - if (onceh==3) then obj_controller.temp[90]+=" III"; - if (onceh==4) then obj_controller.temp[90]+=" IV"; + obj_controller.temp[90] = planet_numeral_name(onceh); } } } @@ -2220,19 +2264,17 @@ function scr_dialogue(diplo_keyphrase) { var that,good=0; that=instance_nearest(random(room_width),random(room_height),obj_star); for(var j=0; j<5; j++){ - if (good==0) then with(that){ - var i=0,onceh=0; - for(var k=0; k<10; k++){ - i=floor(random(planets))+1; - if (array_length(p_feature[i])==0) and (onceh==0) then onceh=i;} - if (onceh!=0){ - array_push(p_feature[onceh], new NewPlanetFeature(P_features.Webway)); - obj_controller.temp[90]=name; - good=1; - if (onceh==1) then obj_controller.temp[90]+=" I"; - if (onceh==2) then obj_controller.temp[90]+=" II"; - if (onceh==3) then obj_controller.temp[90]+=" III"; - if (onceh==4) then obj_controller.temp[90]+=" IV"; + if (good==0){ + with(that){ + var onceh=0; + for(var k=0; k<10; k++){ + var i=floor(random(planets))+1; + if (array_length(p_feature[i])==0) and (onceh==0) then onceh=i; + } + if (onceh!=0){ + array_push(p_feature[onceh], new NewPlanetFeature(P_features.Webway)); + obj_controller.temp[90] = planet_numeral_name(onceh); + } } } } @@ -2259,7 +2301,7 @@ function scr_dialogue(diplo_keyphrase) { rando=choose(1,2); if (rando==1) then diplo_text="[["+string(faction_leader[diplomacy])+" is the scourge of the sector, a colossal green brute infamous for the destruction of a dozen worlds. He rules his vicious horde of xenos savages the only way greenskins know how; with brute force. Trophies from the champions of a score of races bedeck his armour, including many from "+string(choose("other Astartes","the Tyranids","the Tau Empire"))+".]]"; if (rando==2) then diplo_text="[["+string(faction_leader[diplomacy])+" is a veteran of countless engagements, leading his tribe into battle with an almost manic giddiness. His name is synonymous with extended campaigns of looting and senseless violence, even more so than the other members of his barbaric race. He and the rest of his tribe hail from the "+string(choose("Goffs","Blood Axes","Bad Moons","Death Skulls","Death Skulls"))+" clan.]]"; - diplo_text+="###"; + diplo_text+="\n#"; if (scr_has_adv("Enemy: Orks")){ diplo_text+="Oi Beaky! I ain't heard your name round here before! If ya eva get bored of havin' your ‘ead attached to your shouldas, good old "+string(faction_leader[diplomacy])+" can sort dat out for ya!"; } else { @@ -2274,7 +2316,7 @@ function scr_dialogue(diplo_keyphrase) { if (diplo_keyphrase=="new_warboss"){ rando=choose(1,1,1,2); diplo_text="[["+string(faction_leader[diplomacy])+" is the scourge of many sectors, a colossal green brute infamous for the destruction of dozens of worlds. His name is synonymous with extended campaigns of looting and senseless violence, even more so than the other members of his barbaric race. He and the rest of his tribe hail from the "+string(choose("Goffs","Blood Axes","Bad Moons","Death Skulls","Death Skulls"))+" clan. He is recently arrived to the sector, bringing with him a massive invasion fleet.]]"; - diplo_text+="###"; + diplo_text+="\n#"; if (rando==1) then diplo_text+="I've got good news, humie! "+string(faction_leader[diplomacy])+" is da warboss now! An' ya know wot dat means? It means yer krumped! Krumped good an' well, just as soon as me Mekboys get dis piece o junk movin'. Thaz right! Get ready fer a foight, humies; me an' da boyz'll be antsy when we gets there, and it'd be downroight inhorspitotalibile not to give us a good one!" if (rando==2) then diplo_text+="Tasty humie worldz. All dat loot. All dat MEAT. By Gork an Mork, we's gonna smash it all up wiv an ax, burn it to da ground and have a proppa meal! "+string(faction_leader[diplomacy])+" is da warboss now, and I's commin for you humie! Git ready for da WWWAAAGGGGGGGGGGHHHHHHH!" } @@ -2316,8 +2358,8 @@ function scr_dialogue(diplo_keyphrase) { } } if (string_count("agree",diplo_keyphrase)>0){ - if (trading_artifact==0) then diplo_text=string(trade_msg)+"##"; - if (trading_artifact!=0) or (liscensing>0) then diplo_text="[[Trade Accepted.]]##"; + if (trading_artifact==0) then diplo_text=string(trade_msg)+"\n"; + if (trading_artifact!=0) or (liscensing>0) then diplo_text="[[Trade Accepted.]]\n"; rando=choose(1,2,3); if (rela=="friendly"){ if (rando==1) then diplo_text+="Ha, this is gunna be a whole lot of fun! I'm in!"; @@ -2336,7 +2378,7 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="disagree"){ - if (trading_artifact==0) then diplo_text="[[Trade Refused]]##"; + if (trading_artifact==0) then diplo_text="[[Trade Refused]]\n"; if (trading_artifact==1) then diplo_text=""; annoyed[diplomacy]+=2; if (annoyed[diplomacy]>=6){ @@ -2472,9 +2514,12 @@ function scr_dialogue(diplo_keyphrase) { if (diplo_keyphrase=="open_trade") then diplo_text="Wut?"; if (diplo_keyphrase=="trading_demand"){ diplo_text="Yeah? Wut?"; - diplo_option[1]="Demand Requisition"; - diplo_option[2]="Demand Military Assistance"; - diplo_option[3]="Cancel"; + add_diplomacy_option({option_text:"Demand Requisition"}); + add_diplomacy_option({option_text:"Demand Military Assistance"}); + add_diplomacy_option({ + option_text:"Cancel", + goto:"disagree" + }); } } // ** Tau ** @@ -2483,7 +2528,7 @@ function scr_dialogue(diplo_keyphrase) { rando=choose(1,2); if (rando==1) then tempd="[[Tall and slender, its skin is blue and clammy-looking. Disgusting. Its face contains two large, expressionless eyes, a slit-like mouth, and a bizarre I-shaped gash between its eyes that must function as a nose. So this is "+string(faction_title[8])+" "+string(faction_leader[eFACTION.Tau])+". This particular xenos is said to "+choose("have quite the silver tongue","have negotiated the surrender of many Imperial worlds","have a great deal of military backing.")+".]]"; if (rando==2) then tempd="[[Tall and slender, its skin is a light blue and looks almost reptilian. A Y-shaped slit nestles between its eyes, and a mouth like a slit sits below that. This must be "+string(faction_title[8])+" "+string(faction_leader[eFACTION.Tau])+". The Ordo Xenos tells us that this particular xeno "+choose("can sense weakness in a rock","knows more than it will let on","uses its words like a scalpel")+".]]"; - tempd+="###"; + tempd+="\n#"; rando=choose(1,2); if (rando==1) then tempd+="Greetings, Chapter Master. As you know, we have claimed for ourselves planets along the borders of your Imperium. I wish to clarify that we of the Tau do not seek a war. Rather, we hope to cooperate with you so that we may both work towards a Greater Good."; if (rando==2) then tempd+="Salutations, "+string(obj_ini.master_name)+". I represent the interests of the Tau Empire. We wish to exist in peace beside you for now, and hope that one day you will see the wisdom of the Greater Good. We will be more than happy to accept you into the fold, for the way of the Tau is one of benevolence and acceptance."; @@ -2515,8 +2560,8 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="agree"){ - if (trading_artifact==0) then diplo_text=string(trade_msg)+"##"; - if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]##"; + if (trading_artifact==0) then diplo_text=string(trade_msg)+"\n"; + if (trading_artifact!=0) then diplo_text="[[Trade Accepted.]]\n"; rando=choose(1,2,3); if (rela=="friendly"){ if (rando==1) then diplo_text+="Yes! We wholeheartedly agree to this deal. The Tau Empire thanks you for your continuing support."; @@ -2535,7 +2580,7 @@ function scr_dialogue(diplo_keyphrase) { } } if (diplo_keyphrase=="disagree"){ - if (trading_artifact==0) then diplo_text="[[Trade Refused]]##"; + if (trading_artifact==0) then diplo_text="[[Trade Refused]]\n"; if (trading_artifact==1) then diplo_text=""; rando=choose(1,2,3); if (rela=="friendly"){ @@ -2639,11 +2684,14 @@ function scr_dialogue(diplo_keyphrase) { if (diplo_keyphrase=="trade_error_2") then diplo_text="[Error 2: "+string(obj_controller.faction[diplomacy])+" has no valid origin for a fleet.]"; // ** Sets ignored turns when kicked out of diplomacy screen ** - if (force_goodbye==1) then turns_ignored[diplomacy]=max(turns_ignored[diplomacy],1); + if (force_goodbye==1){ + turns_ignored[diplomacy]=max(turns_ignored[diplomacy],1); + } // ** Resets global vars ** diplo_last=string(diplo_keyphrase); diplo_char=0; diplo_alpha=0; + } } diff --git a/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml b/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml index 5f2c08908a..9590468bd0 100644 --- a/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml +++ b/scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml @@ -1,67 +1,249 @@ // Script assets have changed for v2.3.0 see // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information +function relationship_hostility_matrix(faction){ + var _rela="neutral"; + var _disp = disposition[faction]; + with (obj_controller){ + // if (diplomacy!=8){ + if (_disp>=60) then _rela="friendly"; + if (_disp<60) and (_disp>=20) then _rela="neutral"; + if (_disp<20) then _rela="hostile"; + // } + if (diplomacy==6){ + if (_disp>=60) then _rela="friendly"; + if (_disp<60) and (_disp>=0) then _rela="neutral"; + if (_disp<0) then _rela="hostile"; + } + + if (diplomacy==8){ + if (_disp>=40) then _rela="friendly"; + if (_disp<40) and (_disp>=-15) then _rela="neutral"; + if (_disp<-15) then _rela="hostile"; + } + } + return _rela; +} + +function alter_disposition(faction, alter_value){ + switch (faction){ + case eFACTION.Eldar: + case eFACTION.Tau: + case eFACTION.Ork: + if (scr_has_disadv("Tolerant")) { + alter_value++; + } + break; + case eFACTION.Ecclesiarchy: + if (scr_has_adv("Reverent Guardians")) { + alter_value+=2; + } + } + obj_controller.disposition[faction] = clamp(obj_controller.disposition[faction]+alter_value, -100, 100); +} + +function alter_dispositions(alterations){ + for (var i=0;i=0;i--){ + var _opt = obj_controller.diplo_option[i]; + if (struct_exists(_opt, "option_text") && _opt.option_text != ""){ + valid = true; + } else { + array_delete(obj_controller.diplo_option, i, 1); + } + } + }else{ + return false; + } + return valid; +} + +function add_diplomacy_option(option={}){ + if (!struct_exists(option, "goto")){ + option.goto = ""; + } + if (!struct_exists(option, "key")){ + option.key = option.option_text; + } + var _button = new UnitButtonObject(option); + _button.style = "pixel"; + _button.label = option.option_text; + array_push(obj_controller.diplo_option, _button); +} function basic_diplomacy_screen(){ var yy=__view_get( e__VW.YView, 0 ); var xx=__view_get( e__VW.XView, 0 ); - if (trading=0) and ((diplo_option[1]!="") or (diplo_option[2]!="") or (diplo_option[3]!="") or (diplo_option[4]!="")){ - if (force_goodbye=0){ + if (trading=0 && valid_diplomacy_options()){ + if (!force_goodbye){ draw_set_halign(fa_center); - var opts=0,slot=0,dp=0,opt_cord=0; - for (dp=1;dp<5;dp++){ - if (diplo_option[dp]!="") then opts+=1; - } - if (opts=4) then yy-=30; - if (opts=2) then yy+=30; - if (opts=1) then yy+=60; + var opts = array_length(diplo_option); + if (opts==4) then yy-=30; + if (opts==2) then yy+=30; + if (opts==1) then yy+=60; + var left,top,right,base,opt; option_selections = []; - for (slot=1;slot<5;slot++){ - if (diplo_option[slot]!=""){ - left = xx+354; - top = yy+694; - right = xx+887; - base = yy+717; - draw_set_color(38144); - draw_rectangle(left,top,right,base,0); - draw_set_color(0); - - var sw=1; - for (var i=1;i<5;i++){ - if (string_width(string_hash_to_newline(diplo_option[slot]))*sw>530) then sw-=0.05; - } - if (string_width(string_hash_to_newline(diplo_option[slot]))*sw<=530) and (sw=1) then draw_text_transformed(xx+620,yy+696,string_hash_to_newline(string(diplo_option[slot])),sw,sw,0); - if (string_width(string_hash_to_newline(diplo_option[slot]))*sw<=530) and (sw<1) then draw_text_transformed(xx+620,yy+696+2,string_hash_to_newline(string(diplo_option[slot])),sw,sw,0); - if (string_width(string_hash_to_newline(diplo_option[slot]))*sw>530){ - draw_text_ext_transformed(xx+620,yy+696-4,string_hash_to_newline(string(diplo_option[slot])),16,530/sw,sw,sw,0); - } - if point_in_rectangle(mouse_x, mouse_y,left,top,right,base){ - draw_set_alpha(0.2);draw_rectangle(left,top,right,base,0);draw_set_alpha(1); - } - opt = [left,top,right,base]; - array_push(option_selections,opt); - opt_cord+=1; - yy+=30; + var diplo_pressed = -1; + for (var slot=0; slot-1){ + evaluate_chosen_diplomacy_option(diplo_pressed); } yy=__view_get( e__VW.YView, 0 ); } - if (menu==20) and (diplomacy==10.1){ + if (menu==MENU.Diplomacy) and (diplomacy==10.1){ scr_emmisary_diplomacy_routes(); } - if (force_goodbye=1){ + /*if (force_goodbye=1){ draw_rectangle(xx+818,yy+796,xx+897,yy+815,0); draw_set_color(0); - draw_text(xx+857.5,yy+797,string_hash_to_newline("Exit")); + draw_text(xx+857.5,yy+797,"Exit"); draw_set_alpha(0.2); if (mouse_x>=xx+818) and (mouse_y>=yy+796) and (mouse_x<=xx+897) and (mouse_y<=yy+815) then draw_rectangle(xx+818,yy+796,xx+897,yy+815,0); draw_set_alpha(1); - } + }*/ } } + +function draw_character_diplomacy(){ + var _diplo_unit = character_diplomacy; + if (_diplo_unit.allegiance == global.chapter_name){ + + + /*if (advi="flee") { + _diplomacy_faction_name="Master of the Fleet "+string(obj_ini.lord_admiral_name); + }*/ + var _splash = ""; + var _specific_splash = 0; + _diplomacy_faction_name = _diplo_unit.name_role(); + _diplo_unit.IsSpecialist(SPECIALISTS_HEADS){ + + var _customs = obj_ini.custom_advisors; + if (_diplo_unit.IsSpecialist(SPECIALISTS_APOTHECARIES)) { + _specific_splash = struct_exists(_customs,"apothecary") ? _customs.apothecary : 2; + } + else if (_diplo_unit.IsSpecialist(SPECIALISTS_CHAPLAINS)) { + _specific_splash = struct_exists(_customs,"chaplain") ? _customs.chaplain : 3; + } + else if (_diplo_unit.IsSpecialist(SPECIALISTS_LIBRARIANS)) { + _specific_splash = struct_exists(_customs,"librarian") ? _customs.librarian : 4; + } + else if (_diplo_unit.IsSpecialist(SPECIALISTS_TECHS)) { + _specific_splash = struct_exists(_customs,"forge_master") ? _customs.forge : 5; + } + scr_image("advisor/splash", _specific_splash, 16, 43, 310, 828); + } + /* else if (advi="") { + _diplomacy_faction_name="First Sergeant "+string(recruiter_name); + }*/ + + } + + var _main_slate = diplo_buttons.main_slate; + var _meet = diplo_buttons.meet_slate; + var _cm_slate = diplo_buttons.cm_slate; + with (_meet){ + XX = 0; + YY = 520; + width = 520; + } + + _meet.inside_method = function(){ + var _diplo_unit = obj_controller.character_diplomacy; + if (!struct_exists(obj_controller, "diplo_image")){ + obj_controller.diplo_image = _diplo_unit.draw_unit_image(); + } + obj_controller.diplo_image.draw(210, 520-271,true, 1,1,0,CM_GREEN_COLOR, 1); + _diplo_unit.stat_display(false,{ + x1: 10, + y1: 520, + w: 569, + h: 303, + }, true); + draw_sprite(spr_holo_pad, 0, 210, 520); + } + + _meet.draw_with_dimensions(); + + _main_slate.XX = _meet.XX+_meet.width; + _main_slate.YY = 175; + _main_slate.draw_with_dimensions(); + draw_diplomacy_diplo_text(); + draw_set_halign(fa_center); + draw_text_transformed(622,104,$"{_diplo_unit.name_role()}",0.6,0.6,0); + draw_set_halign(fa_left); + + with (_cm_slate){ + XX = _main_slate.XX+_main_slate.width; + YY = 520; + } + _cm_slate.inside_method = function(){ + var _master = fetch_unit([0,0]); + + if (!struct_exists(obj_controller, "master_image")){ + obj_controller.master_image = _master.draw_unit_image(); + } + obj_controller.master_image.draw(1108+200, 520-271,true, 1,1,0,CM_GREEN_COLOR, 1); + _master.stat_display(false,{ + x1: 1108, + y1: 520, + w: 569, + h: 303, + } , true); + draw_sprite(spr_holo_pad, 0, 1108+200, 520); + } + _cm_slate.draw_with_dimensions(); + + + + basic_diplomacy_screen(); +} + +function evaluate_chosen_diplomacy_option(diplo_pressed){ + var _opt = diplo_option[diplo_pressed]; + + var _pressed_option = _opt.key; + if (struct_exists(_opt, "choice_func")){ + if (is_callable(_opt.choice_func)){ + script_execute(_opt.choice_func); + } + } + if (_opt.goto != ""){ + scr_dialogue(_opt.goto); + } + + if ((struct_exists(_opt,"is_exit") && _opt.is_exit)){ + exit_diplomacy_dialogue(); + } +} + function scr_diplomacy_hit(selection, new_path, complex_path="none"){ if (array_length(option_selections)>selection){ if (point_and_click(option_selections[selection])){ @@ -93,7 +275,7 @@ function scr_emmisary_diplomacy_routes(){ } else if (diplomacy_pathway == "Khorne_path") { scr_diplomacy_hit(0, ,function(){ - //TODO central get cm method + //TODO central get cm choice_func var chapter_master = obj_ini.TTRPG[0,0]; cooldown=8000; diplomacy_pathway = "sacrifice_lib"; diff --git a/scripts/scr_draw_armentarium/scr_draw_armentarium.gml b/scripts/scr_draw_armentarium/scr_draw_armentarium.gml index f7234ffdb5..192d7ae460 100644 --- a/scripts/scr_draw_armentarium/scr_draw_armentarium.gml +++ b/scripts/scr_draw_armentarium/scr_draw_armentarium.gml @@ -10,29 +10,50 @@ function drop_down_sandwich(selection, draw_x, draw_y, options, open_marker,left } function set_up_armentarium(){ - static xx=__view_get( e__VW.XView, 0 ); - static yy=__view_get( e__VW.YView, 0 ); - menu=14; - onceh=1; - cooldown=8000; - click=1; - temp[36]=scr_role_count(obj_ini.role[100][16],""); - temp[37]=temp[36]+scr_role_count(string(obj_ini.role[100][16])+" Aspirant",""); - specialist_point_handler.calculate_research_points(); - in_forge=false - forge_button = new ShutterButton(); - stc_flashes = new GlowDot(); - /*for (var i =0;i<3;i++){ - for (var f =0;f<7;f++){ - stc_flashes[i][f] = new GlowDot(); - // stc_flashes[i][f].flash_size - } - }*/ - speeding_bits = { - "wargear":new SpeedingDot(0, 0,(210/6)*stc_wargear), - "vehicles":new SpeedingDot(0, 0,(210/6)*stc_vehicles), - "ships":new SpeedingDot(0, 0,(210/6)*stc_ships) - } + static xx=__view_get( e__VW.XView, 0 ); + static yy=__view_get( e__VW.YView, 0 ); + menu=14; + onceh=1; + cooldown=8000; + click=1; + temp[36]=scr_role_count(obj_ini.role[100][16],""); + temp[37]=temp[36]+scr_role_count(string(obj_ini.role[100][16])+" Aspirant",""); + specialist_point_handler.calculate_research_points(); + in_forge=false + forge_button = new ShutterButton(); + forge_button.cover_text = "FORGE"; + stc_flashes = new GlowDot(); + gift_stc_button = new UnitButtonObject( + { + x1: 650, + y1: 467, + style : "pixel", + label : "Gift", + set_width : true, + w : 90, + } + ); + identify_stc_button = new UnitButtonObject( + { + x1: 670, + y1: 467, + style : "pixel", + label : "Identify", + set_width : true, + w : 90, + } + ); + /*for (var i =0;i<3;i++){ + for (var f =0;f<7;f++){ + stc_flashes[i][f] = new GlowDot(); + // stc_flashes[i][f].flash_size + } + }*/ + speeding_bits = { + "wargear":new SpeedingDot(0, 0,(210/6)*stc_wargear), + "vehicles":new SpeedingDot(0, 0,(210/6)*stc_vehicles), + "ships":new SpeedingDot(0, 0,(210/6)*stc_ships) + } } function same_locations(first_loc,second_loc){ @@ -74,6 +95,54 @@ function identify_stc(area){ break; } } + +function scr_draw_armentarium_gui(){ + if (!in_forge){ + draw_set_alpha(1); + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + draw_text(384, 468, string(stc_wargear_un + stc_vehicles_un + stc_ships_un )+ " Unidentified Fragments"); + var _has_stc = stc_wargear_un + stc_vehicles_un + stc_ships_un > 0; + if (!_has_stc){ + var _tools = "No STCs Available"; + gift_stc_button.tooltip = _tools; + identify_stc_button.tooltip = _tools; + } + if (gift_stc_button.draw(_has_stc)){ + setup_gift_stc_popup(); + } + identify_stc_button.update({x1 :gift_stc_button.x2}); + if (identify_stc_button.draw(_has_stc)){ + audio_play_sound(snd_stc,-500,0) + audio_sound_gain(snd_stc,master_volume*effect_volume,0); + + + if (stc_wargear_un > 0 && + stc_wargear < MAX_STC_PER_SUBCATEGORY) { + + stc_wargear_un--; + identify_stc("wargear"); + } + else if (stc_vehicles_un > 0 && + stc_vehicles < MAX_STC_PER_SUBCATEGORY) { + + stc_vehicles_un--; + identify_stc("vehicles"); + } + else if(stc_ships_un > 0 && + stc_ships < MAX_STC_PER_SUBCATEGORY) { + + stc_ships_un--; + identify_stc("ships"); + } + + // Refresh the shop + instance_create(1000,1000,obj_shop); + set_up_armentarium(); + } + } +} + function scr_draw_armentarium(){ var _recruit_pace = ARR_recruitment_pace; var _train_tiers = ARR_techmarine_training_tiers; @@ -132,83 +201,7 @@ function scr_draw_armentarium(){ if (!in_forge){ - draw_set_font(fnt_40k_14); - draw_set_halign(fa_left); - draw_text(xx + 384, yy + 468, string_hash_to_newline(string(stc_wargear_un + stc_vehicles_un + stc_ships_un) + " Unidentified Fragments")); - - draw_set_halign(fa_center); - - // Identify STC - if (stc_wargear_un + stc_vehicles_un + stc_ships_un = 0) then draw_set_alpha(0.5); - draw_set_color(c_gray); - draw_rectangle(xx + 621, yy + 466, xx + 720, yy + 486, 0); - draw_set_color(0); - draw_text(xx + 670, yy + 467, string_hash_to_newline("Identify")); - if (mouse_x > xx + 621) and(mouse_y > yy + 466) and(mouse_x < xx + 720) and(mouse_y < yy + 486) { - draw_set_color(0); - draw_set_alpha(0.2); - draw_rectangle(xx + 621, yy + 466, xx + 720, yy + 486, 0); - if (mouse_check_button_pressed(mb_left)){ - if (stc_wargear_un + stc_vehicles_un + stc_ships_un > 0){ - - cooldown=8000; - audio_play_sound(snd_stc,-500,0) - audio_sound_gain(snd_stc,master_volume*effect_volume,0); - - - if (stc_wargear_un > 0 && - stc_wargear < MAX_STC_PER_SUBCATEGORY) { - - stc_wargear_un--; - identify_stc("wargear"); - } - else if (stc_vehicles_un > 0 && - stc_vehicles < MAX_STC_PER_SUBCATEGORY) { - - stc_vehicles_un--; - identify_stc("vehicles"); - } - else if(stc_ships_un > 0 && - stc_ships < MAX_STC_PER_SUBCATEGORY) { - - stc_ships_un--; - identify_stc("ships"); - } - - // Refresh the shop - instance_create(1000,1000,obj_shop); - set_up_armentarium(); - } - } - } - draw_set_alpha(1); - if (stc_wargear_un + stc_vehicles_un + stc_ships_un = 0) then draw_set_alpha(0.5); - draw_set_color(c_gray); - draw_rectangle(xx + 733, yy + 466, xx + 790, yy + 486, 0); - draw_set_color(0); - draw_text(xx + 761, yy + 467, string_hash_to_newline("Gift")); - if (mouse_x > xx + 733) and(mouse_y > yy + 466) and(mouse_x < xx + 790) and(mouse_y < yy + 486) { - draw_set_color(0); - draw_set_alpha(0.2); - draw_rectangle(xx + 733, yy + 466, xx + 790, yy + 486, 0); - if (mouse_check_button_pressed(mb_left)){ - if (stc_wargear_un+stc_vehicles_un+stc_ships_un>0){ - var chick=0; - if (known[eFACTION.Imperium]>1) and (faction_defeated[2]==0) then chick=1; - if (known[eFACTION.Mechanicus]>1) and (faction_defeated[3]==0) then chick=1; - if (known[eFACTION.Inquisition]>1) and (faction_defeated[4]==0) then chick=1; - if (known[eFACTION.Ecclesiarchy]>1) and (faction_defeated[5]==0) then chick=1; - if (known[eFACTION.Eldar]>1) and (faction_defeated[6]==0) then chick=1; - if (known[eFACTION.Tau]>1) and (faction_defeated[8]==0) then chick=1; - if (chick!=0){ - var pop=instance_create(0,0,obj_popup); - pop.type=9.1; - cooldown=8000; - } - } - } - } draw_set_alpha(1); draw_set_font(fnt_40k_12); @@ -223,7 +216,7 @@ function scr_draw_armentarium(){ yyy1 = max_techs - temp[37]; if (yyy1 < 0) then yyy1 = yyy1 * -1; yyy = (yyy1 * 2); - if (disposition[3] mod 2 == 0) then yyy += 2; + if (disposition[3] % 2 == 0) then yyy += 2; else { yyy += 1; } @@ -287,13 +280,13 @@ function scr_draw_armentarium(){ - var forge_buttons= [xx + 450 + 16, y_offset+40+string_height(research_eta_message), 0, 0] + var forge_buttons = [xx + 450 + 16, y_offset+40+string_height(research_eta_message), 0, 0] if (forge_button.draw_shutter(forge_buttons[0]+60, forge_buttons[1], "Enter Forge", 0.5)){ in_forge=true; } draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); - draw_text_transformed(xx + 605, yy + 432, string_hash_to_newline("STC Fragments"), 0.75, 0.75, 0); + draw_text_transformed(xx + 605, yy + 432, "STC Fragments", 0.75, 0.75, 0); draw_set_font(fnt_40k_12); draw_set_halign(fa_left); draw_set_color(c_gray); @@ -398,7 +391,7 @@ function scr_draw_armentarium(){ } } - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); // draw_rectangle(xx + 711, yy + 539, xx + 728, yy + 539 + hi, 0); draw_set_alpha(1); draw_set_color(c_gray); diff --git a/scripts/scr_draw_management_unit/scr_draw_management_unit.gml b/scripts/scr_draw_management_unit/scr_draw_management_unit.gml index efbd668c1c..5c995cc73c 100644 --- a/scripts/scr_draw_management_unit/scr_draw_management_unit.gml +++ b/scripts/scr_draw_management_unit/scr_draw_management_unit.gml @@ -1,6 +1,6 @@ -function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { +function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true, click_lock=false) { var assignment = "none"; - var unit; + var _unit; var string_role = ""; var health_string = ""; var eventing = false; @@ -9,29 +9,51 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { var is_man = false; if (man[selected] == "man" && is_struct(display_unit[selected])) { is_man = true; - unit = display_unit[selected]; - if (unit.name() == "" || unit.base_group == "none") { + _unit = display_unit[selected]; + if (_unit.name() == "" || _unit.base_group == "none") { return "continue"; } - var unit_specialist = is_specialist(unit.role()); + var _active_tags = array_length(manage_tags); + if(_active_tags){ + var _valid_tag = false; + if (!array_length(_unit.manage_tags)){ + _valid_tag = false; + } else { + for (var t = 0; t -1) && (fest_repeats > 0) && (ma_lid[selected] == fest_sid)) { @@ -43,7 +65,7 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { } } if (draw) { - health_string = $"{round((unit.hp() / unit.max_health()) * 100)}% HP"; + health_string = ma_health_string[selected]; var exp_string = $"{round(ma_exp[selected])} EXP"; @@ -61,23 +83,23 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { //TODO handle recursively if (ma_armour[selected] != "") { - ma_ar = gear_weapon_data("armour", unit.armour(), "abbreviation"); + ma_ar = gear_weapon_data("armour", _unit.armour(), "abbreviation"); ma_ar = is_string(ma_ar) ? ma_ar : ""; } if (ma_gear[selected] != "") { - ma_ge = gear_weapon_data("gear", unit.gear(), "abbreviation"); + ma_ge = gear_weapon_data("gear", _unit.gear(), "abbreviation"); ma_ge = is_string(ma_ge) ? ma_ge : ""; } if (ma_mobi[selected] != "") { - ma_mb = gear_weapon_data("mobility", unit.mobility_item(), "abbreviation"); + ma_mb = gear_weapon_data("mobility", _unit.mobility_item(), "abbreviation"); ma_mb = is_string(ma_mb) ? ma_mb : ""; } if (ma_wep1[selected] != "") { - ma_we1 = gear_weapon_data("weapon", unit.weapon_one(), "abbreviation"); + ma_we1 = gear_weapon_data("weapon", _unit.weapon_one(), "abbreviation"); ma_we1 = is_string(ma_we1) ? ma_we1 : ""; } if (ma_wep2[selected] != "") { - ma_we2 = gear_weapon_data("weapon", unit.weapon_two(), "abbreviation"); + ma_we2 = gear_weapon_data("weapon", _unit.weapon_two(), "abbreviation"); ma_we2 = is_string(ma_we1) ? ma_we2 : ""; } } @@ -152,38 +174,38 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { draw_rectangle(xx + 25, yy + 64, xx + 974, yy + 85, 1); if (man[selected] == "man" && is_struct(display_unit[selected])) { if (!unit_specialist) { - var unit = display_unit[selected]; - var _role = unit.role(); - var _experience = unit.experience; + var _unit = display_unit[selected]; + var _role = _unit.role(); + var _experience = _unit.experience; var _data, valid = false; var _circle_coords = [xx + 321, yy + 77]; var _circle_radius = 3; for (var s = 0; s <= 3; s++) { _data = obj_controller.spec_train_data[s]; - var valid = stat_valuator(_data.req, unit); + var valid = stat_valuator(_data.req, _unit); if (valid) { unit_specialism_option = true; var _draw_coords = [_circle_coords[0] + _data.coord_offset[0], _circle_coords[1] + _data.coord_offset[1]]; var _draw_coords_mouse = [_draw_coords[0] - _circle_radius, _draw_coords[1] - _circle_radius, _draw_coords[0] + _circle_radius, _draw_coords[1] + _circle_radius]; - specialistdir = unit.specialist_tooltips(_data.name, _data.min_exp); + specialistdir = _unit.specialist_tooltips(_data.name, _data.min_exp); if (scr_hit(_draw_coords_mouse)) { draw_set_alpha(0.8); if (scr_click_left()) { switch (_data.name) { case "Techmarine": - unit.role_tag[eROLE_TAG.Techmarine] = !unit.role_tag[eROLE_TAG.Techmarine]; + _unit.role_tag[eROLE_TAG.Techmarine] = !_unit.role_tag[eROLE_TAG.Techmarine]; break; case "Librarian": - unit.role_tag[eROLE_TAG.Librarian] = !unit.role_tag[eROLE_TAG.Librarian]; + _unit.role_tag[eROLE_TAG.Librarian] = !_unit.role_tag[eROLE_TAG.Librarian]; break; case "Chaplain": - unit.role_tag[eROLE_TAG.Chaplain] = !unit.role_tag[eROLE_TAG.Chaplain]; + _unit.role_tag[eROLE_TAG.Chaplain] = !_unit.role_tag[eROLE_TAG.Chaplain]; break; case "Apothecary": - unit.role_tag[eROLE_TAG.Apothecary] = !unit.role_tag[eROLE_TAG.Apothecary]; + _unit.role_tag[eROLE_TAG.Apothecary] = !_unit.role_tag[eROLE_TAG.Apothecary]; break; } } @@ -201,35 +223,35 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { var sqi = ""; draw_set_color(c_black); var squad_colours = [ - #ff0000, // Red (HSL: 0, 100%, 50%) - #ff8000, // Orange (HSL: 30, 100%, 50%) - #ffff00, // Yellow (HSL: 60, 100%, 50%) - #00ff00, // Green (HSL: 120, 100%, 50%) - #00ffff, // Cyan (HSL: 180, 100%, 50%) - #0080ff, // Light Blue (HSL: 210, 100%, 50%) - #0000ff, // Blue (HSL: 240, 100%, 50%) - #8000ff, // Purple (HSL: 270, 100%, 50%) - #ff00ff, // Magenta (HSL: 300, 100%, 50%) - - #b20000, // Red (HSL: 0, 100%, 25%) - #b26e00, // Orange (HSL: 30, 100%, 25%) - #b2b200, // Yellow (HSL: 60, 100%, 25%) - #00b200, // Green (HSL: 120, 100%, 25%) - #00b2b2, // Cyan (HSL: 180, 100%, 25%) - #004db2, // Light Blue (HSL: 210, 100%, 25%) - #0000b2, // Blue (HSL: 240, 100%, 25%) - #4d00b2, // Purple (HSL: 270, 100%, 25%) - #b200b2, // Magenta (HSL: 300, 100%, 25%) - - #ff4d4d, // Red (HSL: 0, 50%, 50%) - #ffb84d, // Orange (HSL: 30, 50%, 50%) - #ffff66, // Yellow (HSL: 60, 50%, 50%) - #66ff66, // Green (HSL: 120, 50%, 50%) - #66ffff, // Cyan (HSL: 180, 50%, 50%) - #6680ff, // Light Blue (HSL: 210, 50%, 50%) - #6666ff, // Blue (HSL: 240, 50%, 50%) - #b366ff, // Purple (HSL: 270, 50%, 50%) - #ff66ff, // Magenta (HSL: 300, 50%, 50%) + #ff0000, // Red (HSL: 0, 100%, 50%) + #ff8000, // Orange (HSL: 30, 100%, 50%) + #ffff00, // Yellow (HSL: 60, 100%, 50%) + #00ff00, // Green (HSL: 120, 100%, 50%) + #00ffff, // Cyan (HSL: 180, 100%, 50%) + #0080ff, // Light Blue (HSL: 210, 100%, 50%) + #0000ff, // Blue (HSL: 240, 100%, 50%) + #8000ff, // Purple (HSL: 270, 100%, 50%) + #ff00ff, // Magenta (HSL: 300, 100%, 50%) + + #b20000, // Red (HSL: 0, 100%, 25%) + #b26e00, // Orange (HSL: 30, 100%, 25%) + #b2b200, // Yellow (HSL: 60, 100%, 25%) + #00b200, // Green (HSL: 120, 100%, 25%) + #00b2b2, // Cyan (HSL: 180, 100%, 25%) + #004db2, // Light Blue (HSL: 210, 100%, 25%) + #0000b2, // Blue (HSL: 240, 100%, 25%) + #4d00b2, // Purple (HSL: 270, 100%, 25%) + #b200b2, // Magenta (HSL: 300, 100%, 25%) + + #ff4d4d, // Red (HSL: 0, 50%, 50%) + #ffb84d, // Orange (HSL: 30, 50%, 50%) + #ffff66, // Yellow (HSL: 60, 50%, 50%) + #66ff66, // Green (HSL: 120, 50%, 50%) + #66ffff, // Cyan (HSL: 180, 50%, 50%) + #6680ff, // Light Blue (HSL: 210, 50%, 50%) + #6666ff, // Blue (HSL: 240, 50%, 50%) + #b366ff, // Purple (HSL: 270, 50%, 50%) + #ff66ff, // Magenta (HSL: 300, 50%, 50%) ]; if (squad[selected] != -1) { var _squad_modulo = squad[selected] % array_length(squad_colours); @@ -302,7 +324,7 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { draw_text_transformed(xx + 27.5 + 8, yy + 66.5, string_hash_to_newline(string(string_role)), name_xr, 1, 0); // Draw current location - if ((unit_location_string == "Mechanicus Vessel") || (unit_location_string == "Terra IV") || (unit_location_string == "=Penitorium=") || (assignment != "none")) { + if (location_out_of_player_control(unit_location_string) || (unit_location_string == "=Penitorium=") || (assignment != "none")) { draw_set_alpha(0.5); } var truncatedLocation = string_truncate(string(unit_location_string), 130); // Truncate the location string to 100 pixels @@ -314,10 +336,10 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { } else { if (man[selected] == "man") { c = managing <= 10 ? managing : 0; - var unit = display_unit[selected]; + var _unit = display_unit[selected]; if ((ma_lid[selected] > -1) && (ma_wid[selected] == 0)) { - draw_sprite(spr_loc_icon, unit.is_boarder ? 2 : 1, xx + 427 + 8, yy + 66); + draw_sprite(spr_loc_icon, _unit.is_boarder ? 2 : 1, xx + 427 + 8, yy + 66); } else if (ma_wid[selected] > 0) { draw_sprite(spr_loc_icon, 0, xx + 427 + 8, yy + 66); } @@ -381,6 +403,30 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { draw_set_color(881503); } draw_text(xx + 573 + xoffset, yy + 66, string_hash_to_newline(string(ma_we2))); + xoffset += 100; + + if (array_length(_unit.manage_tags)){ + var _tag_button = draw_unit_buttons([xx + 573 + xoffset,yy + 66], "T"); + if (scr_hit(_tag_button)){ + var _tooltip = ""; + for (var t=array_length(_unit.manage_tags)-1;t>=0;t--){ + var _tag = _unit.manage_tags[t]; + if (!array_contains(obj_controller.management_tags, _tag)){ + array_delete(_unit.manage_tags, t, 1); + } else { + _tooltip += $"{_tag}\n" + } + } + _tooltip += "Click to set filter to units tags"; + tooltip_draw(_tooltip); + } + if (point_and_click(_tag_button)){ + manage_tags = _unit.manage_tags; + if (instance_exists(obj_popup) && obj_popup.type == POPUP_TYPE.ADD_TAGS){ + obj_popup.tag_selects.set(manage_tags); + } + } + } } var cols = [c_gray, c_gray, 881503]; if (man[selected] != "man") { @@ -424,13 +470,13 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { } } - if (!wrong_location) { - wrong_location = ma_loc[selected] == "Terra"; + if (is_man && !wrong_location) { + wrong_location = !_unit.controllable(); } var unclickable = eventing || jailed || wrong_location || impossible || instance_exists(obj_star_select); - if (!unclickable) { + if (!unclickable && !click_lock) { var changed = false; if (sel_all != "") { @@ -441,10 +487,10 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { } else if (sel_all == "man" && is_man) { changed = true; } else if (sel_all == "Command" && is_man) { - if (unit.IsSpecialist(SPECIALISTS_COMMAND)) { + if (_unit.IsSpecialist(SPECIALISTS_COMMAND)) { changed = true; - } else if (unit.squad != "none") { - if (obj_ini.squads[unit.squad].type == "command_squad") { + } else if (_unit.squad != "none") { + if (obj_ini.squads[_unit.squad].type == "command_squad") { changed = true; } } @@ -497,7 +543,7 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { selecting_planet = ma_wid[selected]; } ma_loc[selected] = selecting_location; - var unit_man_size = is_man ? unit.get_unit_size() : scr_unit_size("", ma_role[selected], true); + var unit_man_size = is_man ? _unit.get_unit_size() : scr_unit_size("", ma_role[selected], true); if (man_sel[selected]) { man_size += unit_man_size; } else { @@ -515,12 +561,12 @@ function scr_draw_management_unit(selected, yy = 0, xx = 0, draw = true) { } if (is_man) { force_tool = 0; - if ((temp[101] == $"{unit.role()} {unit.name}") && ((temp[102] != unit.armour()) || (temp[104] != unit.gear()) || (temp[106] == unit.mobility_item()) || (temp[108] != unit.weapon_one()) || (temp[110] != unit.weapon_two()) || (temp[114] == "refresh"))) { + if ((temp[101] == $"{_unit.role()} {_unit.name}") && ((temp[102] != _unit.armour()) || (temp[104] != _unit.gear()) || (temp[106] == _unit.mobility_item()) || (temp[108] != _unit.weapon_one()) || (temp[110] != _unit.weapon_two()) || (temp[114] == "refresh"))) { force_tool = 1; } - if (((mouse_x >= xx + 25 && mouse_y >= yy + 64 && mouse_x < xx + 974 && mouse_y < yy + 85) || force_tool == 1) && is_struct(unit)) { - temp[120] = unit; // unit_struct + if (((mouse_x >= xx + 25 && mouse_y >= yy + 64 && mouse_x < xx + 974 && mouse_y < yy + 85) || force_tool == 1) && is_struct(_unit)) { + unit_focus = _unit; // unit_struct } } if (!ma_view[selected]) { diff --git a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml index f83a478ac3..32ea1b2f2d 100644 --- a/scripts/scr_draw_planet_features/scr_draw_planet_features.gml +++ b/scripts/scr_draw_planet_features/scr_draw_planet_features.gml @@ -51,6 +51,7 @@ function FeatureSelected(Feature, system, planet) constructor{ var area_height = main_slate.height; var generic = false; var title="", body=""; + var _button_tooltip = ""; //draw_glow_dot(xx+150, yy+150); //rack_and_pinion(xx+230, yy+170); var rectangle = []; @@ -150,7 +151,7 @@ function FeatureSelected(Feature, system, planet) constructor{ }else if (cult_control<75){ control_string = "Has managed to galvanise the populace to overcome the former governor of the planet turning much of the local pdf to it's cause, it must be stopped, lest it spread."; } else { - control_string = "The Cults rot and control of the planet is complete even if the cult can be dismantled the rot is great and the population will need significant purging and monitering to remove the taint"; + control_string = "The cult’s rot and control of the planet is complete; even if the cult can be dismantled, the corruption is great and the population will need significant purging and monitoring to remove the taint"; } body = $"The Cult of {feature.name} {control_string}"; break; @@ -177,6 +178,15 @@ function FeatureSelected(Feature, system, planet) constructor{ }; } break; + case P_features.OrkStronghold: + title = "Ork Stronghold"; + generic = true; + if (planet_data.planet_forces[eFACTION.Ork]){ + body = $"For as long as this Stronghold stands the orks here will continue to fortify it. The larger it gets the greater the capacity of this planet to produce orkish machines of war and ships and the better protected the ork forces will be from bombardment"; + } else { + body = "Without a force of orks to hold it together the fortress is slowly pulled apart from within by the inhabitants, It's capabilities will constantly decrease until soon there will be nothing left"; + } + break case P_features.Recruiting_World: generic = true; var _planet = planet_data.planet; @@ -226,7 +236,7 @@ function FeatureSelected(Feature, system, planet) constructor{ if (feature.reason == "importance"){ } - mission_description=$"The governor of {planet_name} has requested a force of marines might stay behind following your departure.\n\n\n assign a squad to garrison to initiate mission, The garrison leeader will need to be capable of conducting himself in a diplomatic manor in order for the garrison duration to be a success"; + mission_description=$"The governor of {planet_name} has requested a force of marines might stay behind following your departure.\n\n\n assign a squad to garrison to initiate mission, The garrison leeader will need to be capable of conducting himself in a diplomatic manner in order for the garrison duration to be a success"; break; case "join_communion": @@ -234,6 +244,7 @@ function FeatureSelected(Feature, system, planet) constructor{ break; case "hunt_beast": mission_description=$"The governor of {planet_name} has bemoaned the raiding of huge beasts on the fringes of the planets largest city, the numbers have swelled recently and are causing huge damage to the planets small economy. You could send a force to intervene, it would provide a fine test of metal for any that partake."; + help = "This is a good opportunity to provide experience and training, having at least one marine with experience in such matters would be advisable"; button_text = "Send Hunters"; button_function = function(){ var dudes = collect_role_group("all", obj_star_select.target.name); @@ -251,8 +262,25 @@ function FeatureSelected(Feature, system, planet) constructor{ } break; case "protect_raiders": - mission_description=$"The governor of {planet_name} has sent many requests to the sector commander for help with defending against xenos raids on the populace of the planet, the reports seem to suggest the xenos in question are in fact dark elder."; - help = "Set a squad to ambush "; + mission_description=$"The governor of {planet_name} has sent many requests to the sector commander for help with defending against xenos raids on the populace of the planet, the reports seem to suggest the xenos in question are in fact dark eldar."; + help = "Set a squad to ambush"; + button_text = "Send Squad"; + _button_tooltip = "milage may vary on playability of this mission progress at your own risk"; + button_function = function(){ + var dudes = collect_role_group("all", obj_star_select.target.name); + group_selection(dudes,{ + purpose:"Select Squad for Ambush", + purpose_code : feature.problem, + number:1, + system : planet_data.system, + feature:obj_star_select.feature, + planet : planet_data.planet, + array_slot : feature.array_position, + select_type : MissionSelectType.Squads, + selections : [] + }); + destroy=true; + } break; case "train_forces": mission_description=$"The governor of {planet_name} fears the planet will not hold in the case of major incursion, it has not seen war in some time and he fears the ineptitude of the commanders available, he asks for aid in planning a thorough plan for defense and schedule of works for a period of at least 6 months."; @@ -288,7 +316,11 @@ function FeatureSelected(Feature, system, planet) constructor{ } if (button_text!="none"){ - if (point_and_click(draw_unit_buttons([xx+((area_width/2)-(string_width(button_text)/2)), yy+40+text_body_height+10], button_text))){ + var _button = draw_unit_buttons([xx+((area_width/2)-(string_width(button_text)/2)), yy+40+text_body_height+10], button_text); + if (_button_tooltip != "" && scr_hit(_button)){ + tooltip_draw(_button_tooltip); + } + if (point_and_click(_button)){ if (is_callable(button_function)){ button_function(); destroy=true; @@ -309,348 +341,3 @@ function FeatureSelected(Feature, system, planet) constructor{ return "done"; } } - -function draw_building_builder(xx, yy, req_require, building_sprite){ - var clicked =false; - draw_sprite_ext(building_sprite, 0, xx, yy, 0.5, 0.5, 0, c_white, 1); - var image_bottom = yy+50; - var image_middle = xx-15; - if (obj_controller.requisition>=req_require){ - if (scr_hit(image_middle+30, image_bottom+28, image_middle+78, image_bottom+44)){ - draw_sprite_ext(spr_slate_2, 5, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); - if (scr_click_left()){ - clicked=true; - } - } else { - draw_sprite_ext(spr_slate_2, 3, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); - } - } else { - draw_sprite_ext(spr_slate_2, 7, image_middle-10, image_bottom, 1, 1, 0, c_white, 1); - } - draw_sprite_ext(spr_requisition,0,image_middle+65,image_bottom+30,1,1,0,c_white,1); - draw_set_halign(fa_left); - draw_text(image_middle+32, image_bottom+30, req_require); - return clicked; -} - -function DataSlateMKTwo()constructor{ - height=0; - width=0; - XX=0; - YY=0; - static entered = function(){ - return scr_hit(XX, YY, XX+width, YY+height); - } - static draw = function(xx,yy,x_scale=1, y_scale=1){ - XX=xx; - YY=yy; - height = 250*y_scale; - width=365*x_scale; - draw_sprite_ext(spr_slate_2, 1, xx, yy, x_scale, y_scale, 0, c_white, 1); - draw_sprite_ext(spr_slate_2, 0, xx, yy, x_scale, y_scale, 0, c_white, 1); - draw_sprite_ext(spr_slate_2, 2, xx, yy, x_scale, y_scale, 0, c_white, 1); - //draw_sprite_ext(spr_slate_2, 0, xx, yy, 1, 1, 0, c_white, 1) - } -} - -function RackAndPinion(Type="forward") constructor{ - reverse =false; - rack_y=0; - rotation = 360; - type=Type - if (type="forward"){ - draw = function(x, y, freeze=false, Reverse=""){ - x+=19; - if (!freeze){ - if (Reverse != ""){ - if (Reverse){ - reverse=true; - } else { - reverse=false; - } - } - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - if (!reverse){ - rotation-=4; - } else { - rotation+=4; - } - rack_y = (75.3982236862/360)*(360-rotation); - if (rack_y > 70){ - reverse = true; - } else if (rack_y < 2){ - reverse = false; - } - draw_sprite_ext(spr_rack, 0, x-13, y-rack_y, 1, 1, 0, c_white, 1) - } else { - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - draw_sprite_ext(spr_rack, 0, x-13, y-rack_y, 1, 1, 0, c_white, 1) - } - } - } else if (type="backward"){ - draw = function(x, y, freeze=false, Reverse=""){ - x-=19; - if (!freeze){ - if (Reverse != ""){ - if (Reverse){ - reverse=true; - } else { - reverse=false; - } - } - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - if (!reverse){ - rotation+=4; - } else { - rotation-=4; - } - rack_y = (75.3982236862/360)*(360-rotation) - if (rack_y > 70){ - reverse = true; - } else if (rack_y < 2){ - reverse = false; - } - draw_sprite_ext(spr_rack, 0, x+13, y+rack_y, -1, 1, 0, c_white, 1) - } else { - draw_sprite_ext(spr_cog_pinion, 0, x, y, 1, 1, rotation, c_white, 1) - draw_sprite_ext(spr_rack, 0, x+13, y+rack_y, -1, 1, 0, c_white, 1) - } - } - } -} -function SpeedingDot(XX,YY, limit) constructor{ - bottom_limit = limit; - stack = 0; - yyy=YY; - xxx=XX; - draw = function(xx,yy){ - if (bottom_limit+(48*0.7)0 ? 36-stack :0; - var bottom_cut = bottom_limit 1){ - flash_size--; - }else { - flash_size++; - flash = 0; - } - } - } - draw_one_flash = function(xx, yy){ - if (one_flash_finished) then exit; - draw_set_color(c_green); - for (var i=0; i<=flash_size;i++){ - draw_set_alpha(1 - ((1/40)*i)) - draw_circle(xx, yy, (i/3), 1); - } - if (flash==0){ - if (flash_size<40){ - flash_size++; - } else { - flash = 1; - flash_size--; - } - } else { - if (flash_size > 1){ - flash_size--; - }else { - flash_size++; - flash = 0; - one_flash_finished = true; - } - } - } -} - -function ShutterButton() constructor{ - time_open = 0; - click_timer = 0; - Width = 315; - Height = 90; - XX=0; - YY=0; - width=0; - height=0; - right_rack = new RackAndPinion(); - left_rack = new RackAndPinion("backward"); - draw_shutter = function(xx,yy,text, scale=1, entered = ""){ - XX=xx; - YY=yy; - draw_set_alpha(1); - - draw_set_font(fnt_40k_12); - draw_set_halign(fa_left); - draw_set_color(c_gray); - width = Width *scale; - height = Height *scale; - if (text=="") then entered = false; - if (entered==""){ - entered = scr_hit(xx, yy, xx+width, yy+height); - } else { - entered=entered; - } - var shutter_backdrop = 5; - if (entered || click_timer>0){ - if (time_open<20){ - time_open++; - right_rack.draw(xx+width, yy, false, false); - left_rack.draw(xx, yy, false, false); - } else { - right_rack.draw(xx+width, yy, true); - left_rack.draw(xx, yy, true); - } - if (point_and_click([xx, yy, xx+width, yy+height]) || click_timer>0 ){ - shutter_backdrop = 6; - click_timer++; - } - } else if (time_open>0){ - time_open--; - right_rack.draw(xx+width, yy, false, true); - left_rack.draw(xx, yy, false, true); - } else { - right_rack.draw(xx+width, yy, true); - left_rack.draw(xx, yy, true); - } - var text_draw = xx+(width/2)-(string_width(text)*(3*scale)/2); - var main_sprite = 0; - if (time_open<2){ - draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) - } else if (time_open<8 && time_open>=2){ - main_sprite=1; - }else if (time_open<13 && time_open>=8){ - main_sprite=2; - }else if (time_open<18 && time_open>=13){ - main_sprite=3; - } else if (time_open>=18){ - main_sprite=4; - } - if (time_open>=2){ - draw_sprite_ext(spr_shutter_button, shutter_backdrop, xx, yy, scale, scale, 0, c_white, 1) - draw_set_color(c_red); - if (click_timer>0){ - draw_text_transformed(text_draw, yy+(24*scale), text, 3*scale, 3*scale, 0); - } else { - draw_text_transformed(text_draw, yy+(20*scale), text, 3*scale, 3*scale, 0); - } - draw_sprite_ext(spr_shutter_button, main_sprite, xx, yy, scale, scale, 0, c_white, 1) - } - draw_set_color(c_grey); - if (click_timer>7){ - click_timer = 0; - return true; - } else { - return false; - } - } -} - -function DataSlate() constructor{ - static_line=1; - title=""; - sub_title=""; - body_text = ""; - inside_method = ""; - XX=0; - YY=0; - width=0; - height=0; - percent_cut=0; - - static entered = function(){ - return (scr_hit( - XX-4, - YY, - XX + width, - YY + height, - )); - } - static draw = function(xx,yy, scale_x=1, scale_y=1){ - XX=xx; - YY=yy; - width = 860*scale_x; - height = 850*scale_y; - draw_sprite_ext(spr_data_slate,1, xx,yy, scale_x, scale_y, 0, c_white, 1); - if (is_callable(inside_method)){ - inside_method(); - } - if (static_line<=10) then draw_set_alpha(static_line/10); - if (static_line>10) then draw_set_alpha(1-((static_line-10)/10)); - draw_set_color(5998382); - var line_move = yy+(70*scale_y)+((36*scale_y)*static_line); - draw_line(xx+(30*scale_x),line_move,xx+(820*scale_x),line_move); - draw_set_alpha(1); - if (irandom(75)=0 && static_line>1){static_line--;} - else{ - static_line+=0.1; - } - if (static_line>20) then static_line=1; - draw_set_color(c_gray); - draw_set_halign(fa_center); - var draw_height = 5; - if (title!=""){ - draw_text_transformed(xx+(0.5*width), yy+(50*scale_y), title, 3*scale_x, 3*scale_y, 0); - draw_height += (string_height(title)*3)*scale_y; - } - if (sub_title!=""){ - draw_text_transformed(xx+(0.5*width), yy+(50*scale_y)+draw_height, sub_title, 2*scale_x, 2*scale_y, 0); - draw_height+=(25*scale_y) +(string_height(sub_title)*2)*scale_y; - } - if (body_text!=""){ - draw_text_ext(xx+(0.5*width), yy+(50*scale_y)+draw_height, string_hash_to_newline(body_text), -1, width-60); - } - } - static draw_cut = function(xx,yy, scale_x=1, scale_y=1, middle_percent=percent_cut){ - XX=xx; - YY=yy; - draw_sprite_part_ext(spr_data_slate,1, 0, 0, 850, 69, XX, YY, scale_x, scale_y, c_white, 1); - draw_sprite_part_ext(spr_data_slate,1, 0, 69, 850, 683*(middle_percent/100), XX, YY+(69*scale_y), scale_x, scale_y, c_white, 1); - draw_sprite_part_ext(spr_data_slate,1, 0, 752, 850, 98, XX, YY+(69+683*((middle_percent/100)))*scale_y, scale_x, scale_y, c_white, 1); - width = 860*scale_x; - height = (69+(683*(middle_percent/100))+98 )*scale_y; - if (is_callable(inside_method)){ - inside_method(); - } - } - - static percent_mod_draw_cut = function(xx,yy, scale_x=1, scale_y=1, mod_edit=1){ - percent_cut = min(percent_cut+mod_edit, 100); - if (!percent_cut) then percent_cut=0; - draw_cut(xx,yy, scale_x, scale_y); - } -} - - - - - - - - - - diff --git a/scripts/scr_draw_rainbow/scr_draw_rainbow.gml b/scripts/scr_draw_rainbow/scr_draw_rainbow.gml index 45e2539659..d884a8d05e 100644 --- a/scripts/scr_draw_rainbow/scr_draw_rainbow.gml +++ b/scripts/scr_draw_rainbow/scr_draw_rainbow.gml @@ -1,31 +1,28 @@ -function scr_draw_rainbow(argument0, argument1, argument2, argument3, argument4) { +function scr_draw_rainbow(x1, y1, x2, y2, colour_ratio) { - // argument0: x1 - // argument1: y1 - // argument2: x2 - // argument3: y2 - // argument4: ratio // Draws a variable length and color rectangle based on a ratio of two variables - var wid,rat;wid=argument2-argument0;rat=argument4; + with (obj_controller){ + var wid,rat;wid=x2-x1;rat=colour_ratio; - if (menu!=20) or (diplomacy!=0){ - if (argument4<=0.15) then draw_set_color(c_red); - if (argument4>=0.15) and (argument4<=0.4) then draw_set_color(c_orange); - if (argument4>=0.4) and (argument4<=0.7) then draw_set_color(c_yellow); - if (argument4>=0.7) then draw_set_color(c_green); - } - if (menu=20) and (diplomacy=0){ - if (argument4<=0.5) then draw_set_color(c_red); - if (argument4>=0.5) and (argument4<=0.65) then draw_set_color(c_orange); - if (argument4>=0.65) and (argument4<=0.85) then draw_set_color(c_yellow); - if (argument4>=0.85) then draw_set_color(c_green); - } - if (rat>1) then rat=1;if (rat<-1) then rat=-1; - draw_rectangle(argument0,argument1,argument0+(wid*rat),argument3,0); - draw_set_color(c_gray); - draw_rectangle(argument0,argument1,argument2,argument3,1); + if (menu!=MENU.Diplomacy) or (diplomacy!=0){ + if (colour_ratio<=0.15) then draw_set_color(c_red); + if (colour_ratio>=0.15) and (colour_ratio<=0.4) then draw_set_color(c_orange); + if (colour_ratio>=0.4) and (colour_ratio<=0.7) then draw_set_color(c_yellow); + if (colour_ratio>=0.7) then draw_set_color(c_green); + } + if (menu=MENU.Diplomacy) and (diplomacy=0){ + if (colour_ratio<=0.5) then draw_set_color(c_red); + if (colour_ratio>=0.5) and (colour_ratio<=0.65) then draw_set_color(c_orange); + if (colour_ratio>=0.65) and (colour_ratio<=0.85) then draw_set_color(c_yellow); + if (colour_ratio>=0.85) then draw_set_color(c_green); + } + if (rat>1) then rat=1;if (rat<-1) then rat=-1; + draw_rectangle(x1,y1,x1+(wid*rat),y2,0); + draw_set_color(c_gray); + draw_rectangle(x1,y1,x2,y2,1); + } } diff --git a/scripts/scr_draw_text/scr_draw_text.gml b/scripts/scr_draw_text/scr_draw_text.gml index 8bf76252f1..a1a3fdae9b 100644 --- a/scripts/scr_draw_text/scr_draw_text.gml +++ b/scripts/scr_draw_text/scr_draw_text.gml @@ -119,6 +119,16 @@ function draw_text_shadow(_x, _y, _text){ draw_text(_x, _y, _text); } +function calc_text_scale_confines(text, width, buffer = 0){ + var _scale = 1; + var _string_width = string_width(text); + if (_string_width > (width - buffer)){ + _scale = (width - buffer)/_string_width + } + + return _scale; +} + /// @function draw_text_ext_shadow /// @description This function will draw text in a similar way to draw_text_ext(), only now the text will have a diagonal shadow. function draw_text_ext_shadow(_x, _y, _text, _sep=-1, _w=9999){ diff --git a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml index fbfccb32cf..2e91b9643a 100644 --- a/scripts/scr_draw_unit_image/scr_draw_unit_image.gml +++ b/scripts/scr_draw_unit_image/scr_draw_unit_image.gml @@ -55,7 +55,12 @@ function surface_clear_and_free(_surface) { function UnitImage(_unit_sprite) constructor { unit_sprite = _unit_sprite; - static draw = function(xx, yy, _background = false) { + x1 = 0; + y1 = 0; + x2 = 0; + y2 = 0; + + static draw = function(xx, yy, _background = false,xscale = 1, yscale=1, rot=0, col=c_white, alpha=1) { if (_background) { draw_rectangle_color_simple(xx - 1, yy - 1, xx + 1 + 166, yy + 271 + 1, 0, c_black); draw_rectangle_color_simple(xx - 1, yy - 1, xx + 166 + 1, yy + 271 + 1, 1, c_gray); @@ -63,11 +68,10 @@ function UnitImage(_unit_sprite) constructor { draw_rectangle_color_simple(xx - 3, yy - 3, xx + 166 + 3, yy + 3 + 271, 1, c_gray); } if (sprite_exists(unit_sprite)) { - draw_sprite(unit_sprite, 0, xx - 200, yy - 90); + draw_sprite_ext(unit_sprite, 0, xx - 200, yy - 90, xscale, yscale, rot, col, alpha) } }; - - static draw_part = function(xx, yy, left, top, width, height, _background = false) { + static draw_part = function(xx, yy, left, top, width, height, _background = false,xscale = 1, yscale=1, rot=0, col=c_white, alpha=1) { if (_background) { draw_rectangle_color_simple(xx - 1 + left, yy - 1 + top, xx + 1 + width, yy + height + 1, 0, c_black); draw_rectangle_color_simple(xx - 1 + left, yy - 1 + top, xx + width + 1, yy + height + 1, 1, c_gray); @@ -77,8 +81,19 @@ function UnitImage(_unit_sprite) constructor { if (sprite_exists(unit_sprite)) { draw_sprite_part(unit_sprite, 0, left + 200, top + 90, width, height, xx, yy); } + x1 = xx; + y1 = yy; + x2 = xx + width; + y2 = yy + height; }; + + static hit = function(){ + return scr_hit(x1, y1, x2, y2); + } + static box = function(){ + return [x1, y1, x2, y2]; + } static destroy_image = function() { if (sprite_exists(unit_sprite)) { sprite_delete(unit_sprite); @@ -219,7 +234,6 @@ function scr_draw_unit_image(_background = false) { try { if ((name_role() != "") && (base_group == "astartes")) { - var draw_backpack = true; var pauldron_trim = false; var armour_bypass = false; var hide_bionics = false; @@ -244,15 +258,11 @@ function scr_draw_unit_image(_background = false) { var armour_sprite = spr_weapon_blank; var complex_livery = false; var back_equipment = BackType.None; - var psy_hood = false; - var skull_mask = false; var servo_arm = 0; var servo_harness = 0; var halo = 0; var reverent_guardians = false; - var tech_brothers_trait = -5; var body_part; - var dev_trait = 0; static _body_parts = ARR_body_parts; // Chaplain @@ -307,16 +317,6 @@ function scr_draw_unit_image(_background = false) { } } - if (unit_gear == "Psychic Hood") { - psy_hood = true; - } - - if (array_contains([UnitSpecialization.Chaplain, UnitSpecialization.WolfPriest], unit_specialization)) { - skull_mask = true; - } - - // if (_armour_type!=ArType.Norm) then draw_backpack=false; - if (unit_back == "Servo-arm") { servo_arm = 1; } else if (unit_back == "Servo-harness") { @@ -327,22 +327,24 @@ function scr_draw_unit_image(_background = false) { halo = 1; } - switch (unit_armour) { - case "Scout Armour": - armour_type = ArmourType.Scout; - break; - case "Terminator Armour": - case "Tartaros": - armour_type = ArmourType.Terminator; - break; - case "Dreadnought": - armour_type = ArmourType.Dreadnought; - break; - case ITEM_NAME_NONE: - case "": - case "None": - armour_type = ArmourType.None; - break; + if (is_dreadnought()){ + armour_type = ArmourType.Dreadnought; + } else { + switch (unit_armour) { + case "Scout Armour": + armour_type = ArmourType.Scout; + break; + case "Terminator Armour": + case "Tartaros": + case "Cataphractii": + armour_type = ArmourType.Terminator; + break; + case ITEM_NAME_NONE: + case "": + case "None": + armour_type = ArmourType.None; + break; + } } draw_backpack = armour_type == ArmourType.Normal; @@ -359,55 +361,6 @@ function scr_draw_unit_image(_background = false) { pauldron_trim = _controller ? obj_controller.trim : obj_creation.trim; //TODO complex shader means no need for all this edge case stuff - - // Dark Angels Deathwing - if (unit_special_colours == UnitSpecialColours.Deathwing) { - if (!array_contains([_role[eROLE.Chaplain], _role[eROLE.Librarian], _role[eROLE.Techmarine]], unit_role)) { - shader_array_set[ShaderType.Body] = Colors.Deathwing; - shader_array_set[ShaderType.Trim] = Colors.Light_Caliban_Green; - if (unit_role != _role[eROLE.Apothecary]) { - shader_array_set[ShaderType.Helmet] = Colors.Deathwing; - } - } - if (!array_contains([_role[eROLE.Chaplain], _role[eROLE.Techmarine]], unit_role)) { - shader_array_set[ShaderType.RightPauldron] = Colors.Deathwing; - } - shader_array_set[ShaderType.LeftPauldron] = Colors.Deathwing; - pauldron_trim = 0; - specialist_colours = 0; - } - - // Dark Angels Ravenwing - if (unit_special_colours == UnitSpecialColours.Ravenwing) { - if (!array_contains([_role[eROLE.Chaplain], _role[eROLE.Librarian], _role[eROLE.Techmarine], _role[eROLE.Apothecary]], unit_role)) { - shader_array_set[ShaderType.Body] = Colors.Black; - shader_array_set[ShaderType.Helmet] = Colors.Black; - } - if (!array_contains([_role[eROLE.Chaplain], _role[eROLE.Techmarine]], unit_role)) { - shader_array_set[ShaderType.RightPauldron] = Colors.Black; - } - shader_array_set[ShaderType.LeftPauldron] = Colors.Black; - pauldron_trim = 0; - specialist_colours = 0; - } - - // Dark Angels Captains - if (unit_chapter == "Dark Angels" && unit_role == _role[eROLE.Captain] && company != 1) { - shader_array_set[ShaderType.RightPauldron] = Colors.Dark_Red; - shader_array_set[ShaderType.Helmet] = Colors.Deathwing; - pauldron_trim = 0; - specialist_colours = 0; - } - - // Dark Angels Honour Guard - if (unit_chapter == "Dark Angels" && unit_role == _role[eROLE.HonourGuard]) { - shader_array_set[ShaderType.Body] = Colors.Deathwing; - shader_array_set[ShaderType.RightPauldron] = Colors.Deathwing; - shader_array_set[ShaderType.LeftPauldron] = Colors.Deathwing; - shader_array_set[ShaderType.Trim] = Colors.Copper; - pauldron_trim = 0; - specialist_colours = 0; - } //We can return to the custom shader values at any time during draw doing this set_shader_array(shader_array_set); // Marine draw sequence @@ -424,28 +377,8 @@ function scr_draw_unit_image(_background = false) { //Rejoice! // draw_sprite(spr_marine_base,img,x_surface_offset,y_surface_offset); - if (unit_armour != "") { - var yep = 0; - if (scr_has_adv("Devastator Doctrine")) { - dev_trait = 1; - } - if (unit_specialization == UnitSpecialization.Techmarine) { - if (scr_has_adv("Tech-Brothers")) { - tech_brothers_trait = 0; - } - } - } else { - armour_sprite = spr_weapon_blank; - } // Define armour - // Draw the lights - if ((unit_specialization == UnitSpecialization.Apothecary) && (unit_armour != "") && (back_equipment == BackType.None)) { - if (unit_armour == "Terminator Armour") { - draw_sprite(spr_gear_apoth, 0, x_surface_offset, y_surface_offset - 22); // for terminators - } else { - draw_sprite(spr_gear_apoth, 0, x_surface_offset, y_surface_offset - 6); - } // for normal power armour - } + armour_sprite = spr_weapon_blank; // Draw Techmarine gear if ((servo_arm > 0 || servo_harness > 0) && (!arm_bypass)) { @@ -466,7 +399,7 @@ function scr_draw_unit_image(_background = false) { // if (skin_color!=6) then draw_sprite(spr_clothing_colors,clothing_style,x_surface_offset,y_surface_offset); } else { - var _complex_armours = ["MK3 Iron Armour", "Terminator Armour", "Tartaros", "MK7 Aquila", "Power Armour", "MK8 Errant", "Artificer Armour", "MK4 Maximus", "MK5 Heresy", "MK6 Corvus", "Dreadnought", "Scout Armour"]; + var _complex_armours = ["MK3 Iron Armour", "Terminator Armour", "Tartaros", "MK7 Aquila", "Power Armour", "MK8 Errant", "Artificer Armour", "MK4 Maximus", "MK5 Heresy", "MK6 Corvus", "Dreadnought", "Scout Armour","Cataphractii", "Contemptor Dreadnought"]; if (array_contains(_complex_armours, unit_armour)) { complex_set = new ComplexSet(self); complex_livery = true; @@ -499,32 +432,6 @@ function scr_draw_unit_image(_background = false) { } draw_sprite(spr_gear_halo, halo_type + halo_color, x_surface_offset, y_surface_offset + halo_offset_y); } - - if (armour_type == ArmourType.Terminator && complex_livery) { - for (var part = 0; part < array_length(_body_parts); part++) { - if (struct_exists(body[$ _body_parts[part]], "bionic")) { - var body_part = _body_parts[part]; - var bionic = body[$ body_part][$ "bionic"]; - switch (body_part) { - case "left_eye": - complex_set.add_to_area("left_eye", spr_indomitus_left_eye_bionic); - break; - - case "right_eye": - complex_set.add_to_area("right_eye", spr_indomitus_right_eye_bionic); - break; - - case "left_leg": - complex_set.add_to_area("left_leg", spr_indomitus_left_leg_bionic); - break; - - case "right_leg": - complex_set.add_to_area("right_leg", spr_indomitus_right_leg_bionic); - break; - } - } - } - } if (armour_type == ArmourType.Normal && (!robes_bypass || !robes_hood_bypass)) { var robe_offset_x = 0; var robe_offset_y = 0; @@ -543,50 +450,15 @@ function scr_draw_unit_image(_background = false) { if (body.torso.robes == 0) { complex_set.add_to_area("robe", spr_marine_robes); } else if (body.torso.robes == 1) { - if (scr_has_disadv("Warp Tainted") && !modest_livery) { + if (scr_has_disadv("Warp Tainted")) { complex_set.add_to_area("robes", spr_binders_robes); - } else { - complex_set.add_to_area("robes", spr_marine_robes); } + complex_set.add_to_area("robes", spr_marine_robes); } else { complex_set.add_to_area("tabbard", spr_cloth_tabbard); } } } - - if (armour_type == ArmourType.Normal && complex_livery) { - if (struct_exists(body[$ "right_leg"], "bionic")) { - complex_set.replace_area("right_leg", spr_bionic_leg_right); - } - } - if (armour_type == ArmourType.Normal && complex_livery) { - if (struct_exists(body[$ "left_leg"], "bionic")) { - complex_set.replace_area("left_leg", spr_bionic_leg_left); - } - } - - if (complex_livery) { - if (armour_type == ArmourType.Normal && psy_hood) { - complex_set.replace_area("crown", spr_psy_hood_complex); - } - for (var part = 0; part < array_length(_body_parts); part++) { - if (struct_exists(body[$ _body_parts[part]], "bionic")) { - if (armour_type == ArmourType.Normal) { - var body_part = _body_parts[part]; - var bionic = body[$ body_part][$ "bionic"]; - switch (body_part) { - case "left_eye": - complex_set.add_to_area("left_eye", spr_bionic_left_eyes); - break; - - case "right_eye": - complex_set.add_to_area("right_eye", spr_bionic_right_eyes); - break; - } - } - } - } - } // Draw torso if (!armour_bypass) { if (complex_livery) { @@ -606,22 +478,8 @@ function scr_draw_unit_image(_background = false) { draw_sprite(armour_draw[0], armour_draw[1], x_surface_offset, y_surface_offset); } - // Draw decals, features and other stuff - if ((dev_trait >= 10) && (!modest_livery)) { - draw_sprite(armour_sprite, dev_trait, x_surface_offset, y_surface_offset); - } // Devastator Doctrine battle damage - // if (tech_brothers_trait>=0) and (modest_livery=0) then draw_sprite(spr_gear_techb,tech_brothers_trait,x_surface_offset,y_surface_offset);// Tech-Brothers bling - //sgt helms - // Apothecary Details if (unit_specialization == UnitSpecialization.Apothecary) { - if (unit_armour == "Tartaros") { - draw_sprite(spr_gear_apoth, 1, x_surface_offset, y_surface_offset - 6); // was y_draw-4 with old tartar - } else if (unit_armour == "Terminator Armour") { - draw_sprite(spr_gear_apoth, 1, x_surface_offset, y_surface_offset - 6); - } else { - draw_sprite(spr_gear_apoth, 1, x_surface_offset, y_surface_offset); - } if (gear() == "Narthecium") { if (armour_type == ArmourType.Normal) { draw_sprite(spr_narthecium_2, 0, x_surface_offset + 66, y_surface_offset + 5); @@ -631,54 +489,19 @@ function scr_draw_unit_image(_background = false) { } } } - - // Draw Custom Helmets - if (armour_type == ArmourType.Normal && !armour_bypass) { - if (unit_role == _role[eROLE.Champion]) { - draw_sprite(spr_helm_decorations, 1, x_surface_offset, y_surface_offset); - } - if (unit_role == _role[eROLE.Sergeant] || unit_role == _role[eROLE.VeteranSergeant]) { - draw_sprite(spr_helm_decorations, 1, x_surface_offset, y_surface_offset); - } - } else if (unit_armour == "Terminator Armour" && !armour_bypass) { - if (unit_role == _role[eROLE.Champion]) { - draw_sprite(spr_helm_decorations, 0, x_surface_offset, y_surface_offset - 10); - } - if (unit_role == _role[eROLE.Sergeant] || unit_role == _role[eROLE.VeteranSergeant]) { - draw_sprite(spr_helm_decorations, 0, x_surface_offset, y_surface_offset - 10); - } - } - - var shield_offset_x = 0; - var shield_offset_y = 0; - if (unit_armour == "Terminator Armour") { - shield_offset_x = -15; - shield_offset_y = -10; - } else if (unit_armour == "Tartaros") { - shield_offset_x = -8; - } - if (gear() == "Combat Shield") { - if (unit_role == _role[eROLE.Champion]) { - draw_sprite(spr_gear_combat_shield, 1, x_surface_offset + shield_offset_x, y_surface_offset + shield_offset_y); - } else { - draw_sprite(spr_gear_combat_shield, 0, x_surface_offset + shield_offset_x, y_surface_offset + shield_offset_y); - } - } - - // if (reverent_guardians=1) then draw_sprite(spr_pack_brazier,1,x_surface_offset,y_surface_offset); - if (armour_type == ArmourType.Dreadnought) { + /*if (armour_type == ArmourType.Dreadnought) { var left_arm = dreadnought_sprite_components(weapon_two()); var colour_scheme = specialist_colours <= 1 ? 0 : 1; draw_sprite(left_arm, colour_scheme, x_surface_offset, y_surface_offset); colour_scheme += 2; var right_arm = dreadnought_sprite_components(weapon_one()); draw_sprite(right_arm, colour_scheme, x_surface_offset, y_surface_offset); - } + }* /*}else{ draw_set_color(c_gray); draw_text(0,0,string_hash_to_newline("Color swap shader#did not compile")); }*/ - // if (race()!="1"){draw_set_color(38144);draw_rectangle(0,x_surface_offset,y_surface_offset+166,0+231,0);} + // if (race()!="1"){draw_set_color(CM_GREEN_COLOR);draw_rectangle(0,x_surface_offset,y_surface_offset+166,0+231,0);} } } catch (_exception) { handle_exception(_exception); @@ -716,6 +539,7 @@ function scr_draw_unit_image(_background = false) { } surface_reset_target(); shader_reset(); + //show_debug_message_adv($"1{get_marine_icon_set(2)}"); var _complex_sprite_names = struct_get_names(complex_set); for (var i = 0; i < array_length(_complex_sprite_names); i++) { var _area = _complex_sprite_names[i]; @@ -726,7 +550,18 @@ function scr_draw_unit_image(_background = false) { } } } - + + surface_clear_and_free(global.base_component_surface); + global.base_component_surface = -1; + var _keep_alive = ["unit", "_texture_draws", "texture_draws"] + + for (var i=0;i0){ - repeat(max(floor(_stat_val/2),1)){ - descriptive_string += "+" - } - } else { - repeat(max(floor((_stat_val*-1)/2),1)){ - descriptive_string += "-" - } + var _trait_growth_effect = ""; + var _stat_list = ARR_stat_list; + for (var j=0;j0){ + repeat(max(floor(_stat_val/2),1)){ + descriptive_string += "+" } - _trait_growth_effect += $"{_stat_name} : {descriptive_string}\n"; + } else { + repeat(max(floor((_stat_val*-1)/2),1)){ + descriptive_string += "-" + } } + _trait_growth_effect += $"{_stat_name} : {descriptive_string}\n"; } - array_push(trait_tool_tips, [x1, y1, x2, y2, $"{trait_description}\n{trait_effect}\n{_trait_growth_effect}" + trait_effect]); } - } else { - draw_set_halign(fa_right); - draw_text(data_block.x2-16, attribute_box.y2+16, "No Traits"); - draw_set_halign(fa_left); + array_push(trait_tool_tips, [x1, y1, x2, y2, $"{trait_description}\n{trait_effect}\n{_trait_growth_effect}" + trait_effect]); } + } else { + draw_set_halign(fa_right); + draw_text(data_block.x2-16, attribute_box.y2+16, "No Traits"); + draw_set_halign(fa_left); + } - for (var i=0;i1) and (obj_ncombat.enemy!=13) then obj_ncombat.threat-=1; - if ((obj_ncombat.threat > 1) && (obj_ncombat.battle_special != "world_eaters") && (attack == 0)) { + if ((obj_ncombat.threat > 1) && (obj_ncombat.battle_special != "ChaosWarband") && (attack == 0)) { obj_ncombat.threat -= 1; } if (obj_ncombat.threat < 1) { diff --git a/scripts/scr_en_weapon/scr_en_weapon.gml b/scripts/scr_en_weapon/scr_en_weapon.gml index dce60ac22b..89b18785f8 100644 --- a/scripts/scr_en_weapon/scr_en_weapon.gml +++ b/scripts/scr_en_weapon/scr_en_weapon.gml @@ -17,1046 +17,1104 @@ function scr_en_weapon(name, is_man, man_number, man_type, group) { rang = 0; atta = 0; spli = 0; - arp = 0; + arp = 1; acr = 0; amm = -1; faith_bonus = 0; // var struct = gear_weapon_data("weapon",name); if (string_count("elee", name) > 0) { - var to; - to = string_delete(name, 0, 5); + var to = string_delete(name, 0, 5); atta = 10; - arp = 0; - rang = 1; - spli = 3; - } - - //if (obj_ncombat.enemy=5) then faith_bonus=faith[man_type]; - - if (name = "Venom Claws") { - atta = 200; - arp = 0; - rang = 1; - spli = 0; - if (obj_ini.preomnor = 1) { - atta = 240; - } - } - if (name = "Web Spinner") { - atta = 40; - arp = 0; - rang = 2.1; - spli = 3; - amm = 1; - } - if (name = "Warpsword") { - atta = 300; - arp = 1; - rang = 1; - spli = 3; - } - if (name = "Iron Claw") { - atta = 400; - arp = 1; - rang = 1; - spli = 0; - } - if (name = "Maulerfiend Claws") { - atta = 300; - arp = 300; - rang = 1; - spli = 3; - } - - if (name = "Eldritch Fire") { - atta = 80; - arp = 1; - rang = 5.1; - } - if (name = "Bloodletter Melee") { - atta = 70; - arp = 0; - rang = 1; - spli = 3; - } - if (name = "Daemonette Melee") { - atta = 65; - arp = 0; - rang = 1; - spli = 3; - } - if (name = "Plaguebearer Melee") { - atta = 60; - arp = 0; - rang = 1; - spli = 3; - if (obj_ini.preomnor = 1) { - atta = 70; - } - } - if (name = "Khorne Demon Melee") { - atta = 350; - arp = 1; - rang = 1; - spli = 3; - } - if (name = "Demon Melee") { - atta = 250; - arp = 1; - rang = 1; - spli = 3; - } - if (name = "Lash Whip") { - atta = 80; - arp = 0; - rang = 2; - } - if (name = "Nurgle Vomit") { - atta = 100; - arp = 0; - rang = 2; - spli = 3; - if (obj_ini.preomnor = 1) { - atta = 260; - } - } - if (name = "Multi-Melta") { - atta = 200; - arp = 1; - rang = 4.1; - spli = 0; - amm = 6; - } - - if (obj_ncombat.enemy = 3) { - if (name = "Phased Plasma-fusil") { - atta = 100; - arp = 1; - rang = 7.1; - spli = 3; - } - if (name = "Lightning Gun") { - atta = choose(80, 80, 80, 150); - arp = 0; - rang = 5; - spli = 0; - } - if (name = "Thallax Melee") { - atta = 80; - arp = 0; - rang = 1; - spli = 3; - } - } - - if (obj_ncombat.enemy = 6) { - - if (argument0 = "Fusion Gun") or(argument0 = "Firepike") { - atta = 200; - arp = 1; - rang = 2; - amm = 4; - } - if (argument0 = "Singing Spear") { - atta = 120; - arp = 0; - rang = 1; - spli = 3; - } - if (argument0 = "Singing Spear Throw") { - atta = 120; - arp = 1; - rang = 2; - spli = 3; - } - if (argument0 = "Witchblade") { - atta = 100; - arp = 1; - rang = 1; - } - if (argument0 = "Psyshock") { - atta = 50; - arp = 0; - rang = 2; - } - if (argument0 = "Wailing Doom") { - atta = 200; - arp = 1; - rang = 1; - spli = 3; - } - if (argument0 = "Avatar Smite") { - atta = 300; - arp = 1; - rang = 2; - amm = 2; - } - if (argument0 = "Ranger Long Rifle") { - atta = 60; - arp = 0; - rang = 25; - } - if (argument0 = "Pathfinder Long Rifle") { - atta = 70; - arp = 0; - rang = 25; - } - if (argument0 = "Shuriken Catapult") { - atta = 35; - arp = 0; - rang = 2; - } - if (argument0 = "Twin Linked Shuriken Catapult") { - atta = 50; - arp = 0; - rang = 2; - } - if (argument0 = "Avenger Shuriken Catapult") { - atta = 40; - arp = 0; - rang = 3; - } - if (argument0 = "Power Weapon") or(argument0 = "Power Blades") { - atta = 80; - arp = 0; - rang = 1; - spli = 3; - } - if (argument0 = "Shuriken Pistol") { - atta = 25; - arp = 0; - rang = 2.1; - } - if (argument0 = "Executioner") { - atta = 200; - arp = 1; - rang = 1; - } - if (argument0 = "Scorpion Chainsword") { - atta = 40; - arp = 0; - rang = 1; - spli = 3; - } - if (argument0 = "Mandiblaster") { - atta = 20; - arp = 0; - rang = 1; - } - if (argument0 = "Biting Blade") { - atta = 70; - arp = 0; - rang = 1; - spli = 3; - } - if (argument0 = "Scorpian's Claw") { - atta = 150; - arp = 1; - rang = 1; - spli = 3; - } - if (argument0 = "Meltabomb") { - atta = 0; - arp = 200; - rang = 1; - amm = 1; - } - if (argument0 = "Deathspinner") { - atta = 50; - arp = 0; - rang = 2; - } - if (argument0 = "Dual Deathspinner") { - atta = 80; - arp = 0; - rang = 2; - } - if (argument0 = "Reaper Launcher") { - atta = 150; - arp = 80; - rang = 20; - amm = 8; - spli = 3; - } - if (argument0 = "Eldar Missile Launcher") { - atta = 200; - arp = 1; - rang = 20; - amm = 4; - spli = 3; - } - if (argument0 = "Laser Lance") { - atta = 80; - arp = 0; - rang = 2; - spli = 3; - } - if (argument0 = "Fusion Pistol") { - atta = 100; - arp = 1; - rang = 1.1; - amm = 4; - } - if (argument0 = "Plasma Pistol") { - atta = 60; - arp = 1; - rang = 3.1; - } - if (argument0 = "Harlequin's Kiss") { - atta = 350; - arp = 0; - rang = 1; - amm = 1; - } - if (argument0 = "Wraithcannon") { - atta = 80; - arp = 1; - rang = 2.1; - } - if (argument0 = "Pulse Laser") { - atta = 80; - arp = 1; - rang = 15; - } - if (argument0 = "Bright Lance") { - atta = 100; - arp = 1; - rang = 8; - } - if (argument0 = "Shuriken Cannon") { - atta = 65; - arp = 0; - rang = 3; - } - if (argument0 = "Prism Cannon") { - atta = 250; - arp = 1; - rang = 20; - } - if (argument0 = "Twin Linked Doomweaver") { - atta = 100; - arp = 0; - rang = 2; - } // Also create difficult terrain? - if (argument0 = "Starcannon") { - atta = 140; - arp = 1; - rang = 3; - spli = 3; - } - if (argument0 = "Two Power Fists") { - atta = 300; - arp = 1; - rang = 1; - } - if (argument0 = "Flamer") { - atta = 100; - arp = 0; - rang = 2; - amm = 4; - spli = 3; - } - if (argument0 = "Titan Starcannon") { - atta = 220; - arp = 1; - rang = 4; - spli = 3; - } - if (argument0 = "Phantom Pulsar") { - atta = 500; - arp = 1; - rang = 20; - spli = 3; - } - } - - if (obj_ncombat.enemy = 7) { - - if (argument0 = "Choppa") { - atta = 28; - arp = 0; - rang = 1; - spli = 3; - } - if (argument0 = "Power Klaw") { - atta = 150; - arp = 1; - rang = 1; - spli = 3; - } - if (argument0 = "Slugga") { - atta = 27; - arp = 0; - rang = 3.1; - amm = 4; - spli = 3; - } - if (argument0 = "Tankbusta Bomb") { - atta = 264; - arp = 1; - rang = 1; - amm = 1; - spli = 0; - } - if (argument0 = "Big Shoota") { - atta = 100; - arp = 0; - rang = 12; - amm = 30; - spli = 0; - } - if (argument0 = "Dakkagun") { - atta = 150; - arp = 0; - rang = 10; - amm = 20; - spli = 0; - } - if (argument0 = "Deffgun") { - atta = 120; - arp = 0; - rang = 8; - amm = 20; - spli = 0; - } - if (argument0 = "Snazzgun") { - atta = 80; - arp = 0; - rang = 10; - spli = 0; - } - if (argument0 = "Grot Blasta") { - atta = 12; - arp = 0; - rang = 2; - amm = 6; - } - if (argument0 = "Kannon") { - atta = 200; - arp = 1; - rang = 10.1; - amm = 5; - spli = 3; - } - if (argument0 = "Shoota") { - atta = 30; - arp = 0; - rang = 6; - } - if (argument0 = "Burna") { - atta = 140; - arp = 1; - rang = 2; - amm = 4; - spli = 3; - } - if (argument0 = "Skorcha") { - atta = 160; - arp = 1; - rang = 2; - amm = 6; - spli = 3; - } - if (argument0 = "Rokkit Launcha") { - atta = 150; - arp = 1; - rang = 15; - spli = 3; - } - if (argument0 = "Krooz Missile") { - atta = 250; - arp = 1; - rang = 15; - spli = 3; - } - - } - - if (obj_ncombat.enemy = 8) { - if (name = "Fusion Blaster") { - atta = 200; - arp = 1; - rang = 2; - amm = 4; - } - if (name = "Plasma Rifle") { - atta = 120; - arp = 1; - rang = 10; - } - if (name = "Cyclic Ion Blaster") { - atta = 180; - arp = 0; - rang = 6; - spli = 3; - } // x6 - if (name = "Burst Rifle") { - atta = 130; - arp = 0; - rang = 16; - spli = 3; - } - if (name = "Missile Pod") { - atta = 160; - arp = 1; - rang = 15; - amm = 6; - spli = 3; - } - if (name = "Smart Missile System") { - atta = 150; - arp = 1; - rang = 15; - } - if (name = "Small Railgun") { - atta = 150; - arp = 1; - rang = 18; - } - if (name = "Pulse Rifle") { - atta = 37; - arp = 0; - rang = 12; - } - if (name = "Rail Rifle") { - atta = 65; - arp = 0; - rang = 14; - } - if (name = "Kroot Rifle") { - atta = 25; - arp = 0; - rang = 6; - } - if (name = "Vespid Crystal") { - atta = 60; - arp = 0; - rang = 2.1; - } - if (name = "Railgun") { - atta = 400; - arp = 1; - rang = 20; - } - } - - if (obj_ncombat.enemy = 9) { - - if (argument0 = "Bonesword") { - atta = 120; - arp = 0; - rang = 1; - spli = 3; - } - if (argument0 = "Lash Whip") { - atta = 80; - arp = 0; - rang = 2; - } - if (argument0 = "Heavy Venom Cannon") { - atta = 150; - arp = 1; - rang = 8; - } - if (argument0 = "Crushing Claws") { - atta = 90; - arp = 1; - rang = 1; - spli = 3; - } - if (argument0 = "Rending Claws") { - atta = 80; - arp = 1; - rang = 1; - spli = 3; - } - if (argument0 = "Devourer") { - atta = choose(40, 60, 80, 100); - arp = 0; - rang = 5; - if (obj_ini.preomnor = 1) { - atta = choose(48, 72, 96, 120); - } - } - if (argument0 = "Zoanthrope Blast") { - atta = 200; - arp = 1; - rang = 2; - } - if (argument0 = "Carnifex Claws") { - atta = 300; - arp = 1; - rang = 1; - spli = 3; - } - if (argument0 = "Venom Cannon") { - atta = 150; - arp = 0; - rang = 5; - } - if (argument0 = "Deathspitter") { - atta = 100; - arp = 0; - rang = 2.1; - if (obj_ini.preomnor = 1) { - atta = 120; - } - } - if (argument0 = "Fleshborer") { - atta = 15; - arp = 0; - rang = 2.1; - if (obj_ini.preomnor = 1) { - atta = 19; - } - } - if (argument0 = "Scything Talons") { - atta = 30; - arp = 0; - rang = 1; - } - if (argument0 = "Genestealer Claws") { - atta = choose(105, 105, 130); - arp = 1; - rang = 1; - } - if (argument0 = "Witchfire") { - atta = 100; - arp = 1; - rang = 2; - } - if (argument0 = "Autogun") { - atta = 20; - arp = 0; - rang = 6; - amm = 12; - spli = 3; - } - if (argument0 = "Lictor Claws") { - atta = 300; - arp = 0; - rang = 1; - } - if (argument0 = "Flesh Hooks") { - atta = 50; - arp = 0; - rang = 2; - amm = 1; - } - + arp = 1; + rang = 1; + spli = 3; } - if (obj_ncombat.enemy >= 10) or(obj_ncombat.enemy = 2) or(obj_ncombat.enemy = 5) or(obj_ncombat.enemy = 1) { + //if (obj_ncombat.enemy=5) then faith_bonus=faith[man_type]; - if (argument0 = "Plasma Pistol") { - atta = 70; - arp = 1; - rang = 3.1; - } - if (argument0 = "Power Weapon") { - atta = 120; - arp = 0; - rang = 1; - } - if (argument0 = "Power Sword") { - atta = 120; - arp = 0; - rang = 1; - } - if (argument0 = "Force Weapon") { - atta = 400; - arp = 1; - rang = 1; - } - if (argument0 = "Chainfist") { - atta = 300; - arp = 1; - rang = 1; - spli = 3; - } - if (argument0 = "Meltagun") { + switch(name) { + case "Venom Claws": atta = 200; + arp = 4; + rang = 1; + spli = 0; + if (obj_ini.preomnor = 1) { + atta = 240; + } + break; + case "Web Spinner": + atta = 40; arp = 1; - rang = 2; - amm = 4; - } - if (argument0 = "Flamer") { - atta = 160; - arp = 0; - rang = 2.1; - amm = 4; - spli = 3; - } - if (argument0 = "Heavy Flamer") { - atta = 250; - arp = 0; rang = 2.1; - amm = 6; spli = 3; - } - if (argument0 = "Combi-Flamer") { - atta = 160; - arp = 0; - rang = 2.1; amm = 1; - spli = 3; - } - if (argument0 = "Bolter") { - atta = 45; - arp = 0; - rang = 12; - amm = 15; - if (obj_ncombat.enemy = 5) then atta = 35; - } // Bursts - if (argument0 = "Power Fist") { - atta = 425; - arp = 1; - rang = 1; - } - if (argument0 = "Possessed Claws") { - atta = 250; - arp = 1; + break; + case "Warpsword": + atta = 300; + arp = 4; rang = 1; spli = 3; - } - if (argument0 = "Missile Launcher") { - atta = 200; - arp = 1; - rang = 20; - amm = 4; - spli = 3; - } - if (argument0 = "Chainsword") { - atta = 45; - arp = 0; - rang = 1; - } - if (argument0 = "Bolt Pistol") { - atta = 35; - arp = 0; - rang = 3.1; - amm = 18; - } - if (argument0 = "Chainaxe") { - atta = 55; - arp = 0; + break; + case "Iron Claw": + atta = 400; + arp = 4; rang = 1; - } - if (argument0 = "Poisoned Chainsword") { - atta = 90; - arp = 0; + spli = 0; + break; + case "Maulerfiend Claws": + atta = 300; + arp = 4; rang = 1; - if (obj_ini.preomnor = 1) { - atta = 130; - } - } - if (argument0 = "Sonic Blaster") { - atta = 120; - arp = 0; - rang = 3; spli = 3; - } - if (argument0 = "Rubric Bolter") { + break; + case "Eldritch Fire": atta = 80; - arp = 0; - rang = 12; - amm = 15; - } // Bursts - if (argument0 = "Witchfire") { - atta = 200; - arp = 1; + arp = 4; rang = 5.1; - } - if (argument0 = "Autogun") { - atta = 20; - arp = 0; - rang = 6; - amm = 12; - } - if (argument0 = "Storm Bolter") { - atta = 65; - arp = 0; - rang = 8; - amm = 10; + break; + case "Bloodletter Melee": + atta = 70; + arp = 2; + rang = 1; spli = 3; - } - if (argument0 = "Lascannon") { - atta = 200; + break; + case "Daemonette Melee": + atta = 65; arp = 1; - rang = 20; - amm = 8; - } - if (argument0 = "Twin Linked Heavy Bolters") { - atta = 240; - arp = 0; - rang = 16; - spli = 3; - } - if (argument0 = "Twin-Linked Heavy Bolters") { - atta = 240; - arp = 0; - rang = 16; + rang = 1; spli = 3; - } - if (argument0 = "Twin Linked Lascannon") { - atta = 300; - arp = 1; - rang = 20; - } - if (argument0 = "Twin-Linked Lascannon") { - atta = 300; - arp = 1; - rang = 20; - } - if (argument0 = "Battle Cannon") { - atta = 300; - arp = 1; - rang = 12; - } - if (argument0 = "Demolisher Cannon") { - atta = 500; + break; + case "Plaguebearer Melee": + atta = 60; arp = 1; - rang = 2; - if (instance_exists(obj_nfort)) then rang = 5; - } - if (argument0 = "Earthshaker Cannon") { - atta = 300; - arp = 0; - rang = 12; + rang = 1; spli = 3; - } - if (argument0 = "Havoc Launcher") { - atta = 100; - arp = 0; - rang = 12; - } - if (argument0 = "Baleflame") { - atta = 120; - arp = 0; - rang = 2; - } - if (argument0 = "Defiler Claws") { + if (obj_ini.preomnor = 1) { + atta = 70; + } + break; + case "Khorne Demon Melee": atta = 350; - arp = 1; + arp = 4; rang = 1; spli = 3; - } - if (argument0 = "Reaper Autocannon") { - atta = 320; - arp = 0; - rang = 18; - amm = 10; - spli = 3; - } - - if (name = "Ripper Gun") { - atta = 40; - arp = 0; - rang = 3; - amm = 5; - spli = 0; - } - if (name = "Ogryn Melee") { - atta = 90; - arp = 0; - rang = 1; - } - if (name = "Multi-Laser") { - atta = choose(60, 75, 90, 105); - arp = 0; - rang = 10; - } - - if (argument0 = "Blessed Weapon") { - atta = 150; - arp = 1; - rang = 1; - } - if (argument0 = "Electro-Flail") { - atta = 125; - arp = 1; + break; + case "Demon Melee": + atta = 250; + arp = 4; rang = 1; spli = 3; - } - if (argument0 = "Neural Whip") { - atta = 85; - arp = 0; - rang = 1; - spli = 3 - } - if (argument0 = "Sarissa") { - atta = 65; - arp = 0; + break; + case "Lash Whip": + atta = 80; + arp = 1; rang = 2; - } - if (argument0 = "Seraphim Pistols") { - atta = 200; + break; + case "Nurgle Vomit": + atta = 100; arp = 1; - rang = 4; - } - if (argument0 = "Laser Mace") { + rang = 2; + spli = 3; + if (obj_ini.preomnor = 1) { + atta = 260; + } + break; + case "Multi-Melta": atta = 200; - arp = 1; - rang = 5.1; - amm = 3; - } - if (argument0 = "Heavy Bolter") { - atta = 120; - arp = 0; - rang = 16; + arp = 4; + rang = 4.1; spli = 0; - } + amm = 6; + break; + default: + show_debug_message_adv($"Unknown weapon name: {name}; script: scr_en_weapon.gml"); + break; + } - if (name = "Lasgun") { - atta = 20; - arp = 0; - rang = 6; - amm = 30; - } - if (name = "Daemonhost Claws") { - atta = 350; - arp = 1; - rang = 1; - spli = 3; - } - if (name = "Daemonhost_Powers") { - atta = round(random_range(100, 300)); - arp = round(random_range(100, 300)); - rang = round(random_range(1, 6)); - spli = choose(0, 1); + if (obj_ncombat.enemy = 3) { + switch(name) { + case "Phased Plasma-fusil": + atta = 80; + arp = 4; + rang = 7.1; + spli = 3; + break; + case "Lightning Gun": + atta = choose(80, 80, 80, 150); + arp = 2; + rang = 5; + spli = 0; + break; + case "Thallax Melee": + atta = 80; + arp = 1; + rang = 1; + spli = 3; + break; + default: + show_debug_message_adv($"Unknown weapon name: {name}; script: scr_en_weapon.gml"); + break; } } - if (obj_ncombat.enemy = 13) { // Some of these, like the Gauss Particle Cannon and Particle Whip, used to be more than twice as strong. - if (name = "Staff of Light") { - atta = 200; - arp = 1; - rang = 1; - spli = 3; - } - if (name = "Staff of Light Shooting") { - atta = 180; - arp = 0; - rang = 3; - spli = 3; - } - if (name = "Warscythe") { - atta = 200; - arp = 1; - rang = 1; - spli = 0; - } - if (name = "Gauss Flayer") { - atta = choose(30, 30, 30, 50, 50, 70); - rang = 6.1; - spli = 0; - } - if (name = "Gauss Blaster") { - atta = choose(70, 70, 70, 70, 70, 100); - arp = choose(0, 0, 0, 0, 0, 1); - rang = 6.1; - spli = 0; - } - if (name = "Gauss Cannon") { - atta = 180; - arp = 1; - rang = 10; - spli = 3; - } - if (name = "Gauss Particle Cannon") { - atta = 300; - arp = 1; - rang = 10.1; - spli = 3; - } - if (name = "Overcharged Gauss Cannon") { - atta = 250; - arp = 1; - rang = 8.1; - spli = 3; - } - if (name = "Wraith Claws") { - atta = 80; - arp = 1; - rang = 1; - spli = 0; + if (obj_ncombat.enemy = 6) { + switch(argument0) { + case "Fusion Gun": + atta = 180; + arp = 4; + rang = 2; + amm = 4; + break; + case "Firepike": + atta = 150; + arp = 4; + rang = 4; + amm = 4; + break; + case "Singing Spear": + atta = 150; + arp = 2; + rang = 1; + spli = 3; + break; + case "Singing Spear Throw": + atta = 120; + arp = 2; + rang = 2; + spli = 3; + break; + case "Witchblade": + atta = 130; + arp = 3; + rang = 1; + break; + case "Psyshock": + atta = 80; + arp = 3; + rang = 2; + break; + case "Wailing Doom": + atta = 200; + arp = 4; + rang = 1; + spli = 3; + break; + case "Avatar Smite": + atta = 300; + arp = 4; + rang = 2; + amm = 2; + break; + case "Ranger Long Rifle": + atta = 60; + arp = 2; + rang = 25; + break; + case "Pathfinder Long Rifle": + atta = 70; + arp = 2; + rang = 25; + break; + case "Shuriken Catapult": + atta = 50; + arp = 2; + rang = 2; + break; + case "Twin Linked Shuriken Catapult": + atta = 100; + arp = 2; + rang = 2; + break; + case "Avenger Shuriken Catapult": + atta = 90; + arp = 2; + rang = 3; + break; + case "Power Weapon": + case "Power Blades": + atta = 100; + arp = 4; + rang = 1; + spli = 3; + break; + case "Shuriken Pistol": + atta = 50; + arp = 2; + rang = 2.1; + break; + case "Executioner": + atta = 150; + arp = 4; + rang = 1; + break; + case "Scorpion Chainsword": + atta = 100; + arp = 2; + rang = 1; + spli = 3; + break; + case "Mandiblaster": + atta = 60; + arp = 1; + rang = 1; + break; + case "Biting Blade": + atta = 125; + arp = 2; + rang = 1; + spli = 3; + break; + case "Scorpian's Claw": + atta = 150; + arp = 4; + rang = 1; + spli = 3; + break; + case "Meltabomb": + atta = 200; + arp = 4; + rang = 1; + amm = 1; + break; + case "Deathspinner": + atta = 125; + arp = 2; + rang = 2; + break; + case "Dual Deathspinner": + atta = 250; + arp = 2; + rang = 2; + break; + case "Reaper Launcher": + atta = 120; + arp = 4; + rang = 20; + amm = 8; + spli = 3; + break; + case "Tempest Launcher": + atta = 200; + arp = 1; + rang = 15; + amm = 8; + spli = 9; + break; + case "Laser Lance": + atta = 180; + arp = 4; + rang = 2; + spli = 3; + break; + case "Fusion Pistol": + atta = 125; + arp = 4; + rang = 2.1; + amm = 4; + break; + case "Plasma Pistol": + atta = 100; + arp = 4; + rang = 3.1; + break; + case "Harlequin's Kiss": + atta = 250; + arp = 4; + rang = 1; + amm = 1; + break; + case "Wraithcannon": + atta = 200; + arp = 4; + rang = 2.1; + break; + case "Pulse Laser": + atta = 120; + arp = 3; + rang = 15; + break; + case "Bright Lance": + atta = 200; + arp = 4; + rang = 8; + break; + case "Shuriken Cannon": + atta = 160; + arp = 2; + rang = 3; + break; + case "Prism Cannon": + atta = 400; + arp = 4; + rang = 20; + spli = 1; + break; + case "Twin Linked Doomweaver": + atta = 250; + arp = 4; + rang = 2; + spli = 2; + break; // Also create difficult terrain? + case "Starcannon": + atta = 250; + arp = 4; + rang = 8; + spli = 4; + break; + case "Two Power Fists": + atta = 300; + arp = 4; + rang = 1; + spli = 2; + break; + case "Flamer": + atta = 200; + arp = 1; + rang = 2; + amm = 4; + spli = 3; + break; + case "Titan Starcannon": + atta = 500; + arp = 4; + rang = 4; + spli = 8; + break; + case "Phantom Pulsar": + atta = 500; + arp = 4; + rang = 20; + spli = 3; + break; + default: + show_debug_message_adv($"Unknown weapon name: {name}; script: scr_en_weapon.gml"); + break; } - if (name = "Claws") { - atta = 300; - arp = 1; - rang = 1; - spli = 0; + } + + if (obj_ncombat.enemy = 7) { + switch(argument0) { + case "Choppa": + atta = 100; + arp = 1; + rang = 1; + spli = 3; + break; + case "Power Klaw": + atta = 160; + arp = 3; + rang = 1; + spli = 3; + break; + case "Slugga": + atta = 70; + arp = 1; + rang = 3.1; + amm = 4; + spli = 3; + break; + case "Tankbusta Bomb": + atta = 150; + arp = 4; + rang = 1; + amm = 1; + spli = 1; + break; + case "Big Shoota": + atta = 120; + arp = 1; + rang = 6; + amm = 30; + spli = 5; + break; + case "Dakkagun": + atta = 140; + arp = 1; + rang = 8; + amm = 20; + spli = 10; + break; + case "Deffgun": + atta = 150; + arp = 4; + rang = 8; + amm = 20; + spli = 1; + break; + case "Snazzgun": + atta = 200; + arp = 2; + rang = 5; + spli = 0; + break; + case "Grot Blasta": + atta = 50; + arp = 1; + rang = 2; + amm = 6; + break; + case "Kannon": + atta = 200; + arp = 4; + rang = 10.1; + amm = 5; + spli = 3; + break; + case "Shoota": + atta = 80; + arp = 1; + rang = 5; + break; + case "Burna": + atta = 140; + arp = 2; + rang = 2; + amm = 4; + spli = 3; + break; + case "Skorcha": + atta = 200; + arp = 3; + rang = 2; + amm = 6; + spli = 3; + break; + case "Rokkit Launcha": + atta = 150; + arp = 4; + rang = 15; + spli = 3; + break; + case "Krooz Missile": + atta = 300; + arp = 4; + rang = 15; + spli = 3; + break; + default: + show_debug_message_adv($"Unknown weapon name: {name}; script: scr_en_weapon.gml"); + break; } - if (name = "Gauss Flux Arc") { - atta = 180; - arp = 1; - rang = 8; - spli = 3; + } + + if (obj_ncombat.enemy = 8) { + switch(name) { + case "Fusion Blaster": + atta = 150; + arp = 4; + rang = 2; + amm = 4; + break; + case "Plasma Rifle": + atta = 120; + arp = 3; + rang = 10; + break; + case "Cyclic Ion Blaster": + atta = 80; + arp = 2; + rang = 6; + spli = 3; + break; // x6 + case "Burst Rifle": + atta = 130; + arp = 1; + rang = 16; + spli = 3; + break; + case "Missile Pod": + atta = 150; + arp = 2; + rang = 15; + amm = 6; + spli = 3; + break; + case "Smart Missile System": + atta = 150; + arp = 2; + rang = 15; + break; + case "Small Railgun": + atta = 150; + arp = 4; + rang = 18; + spli = 1; + break; + case "Pulse Rifle": + atta = 80; + arp = 2; + rang = 12; + break; + case "Rail Rifle": + atta = 80; + arp = 4; + rang = 14; + break; + case "Kroot Rifle": + atta = 100; + arp = 1; + rang = 6; + break; + case "Vespid Crystal": + atta = 100; + arp = 3; + rang = 2.1; + break; + case "Railgun": + atta = 250; + arp = 4; + rang = 20; + break; + default: + show_debug_message_adv($"Unknown weapon name: {name}; script: scr_en_weapon.gml"); + break; } - if (name = "Particle Whip") { - atta = 300; - arp = 1; - rang = 4.1; - spli = 3; + } + + if (obj_ncombat.enemy = 9) { + switch(argument0) { + case "Bonesword": + atta = 120; + arp = 3; + rang = 1; + spli = 3; + break; + case "Lash Whip": + atta = 100; + arp = 1; + rang = 2; + break; + case "Heavy Venom Cannon": + atta = 200; + arp = 4; + rang = 8; + break; + case "Crushing Claws": + atta = 150; + arp = 4; + rang = 1; + spli = 3; + break; + case "Rending Claws": + atta = 80; + arp = 3; + rang = 1; + spli = 3; + break; + case "Devourer": + atta = 90; + arp = 2; + rang = 5; + spli = 3; + if (obj_ini.preomnor = 1) { + atta = 120; + } + break; + case "Zoanthrope Blast": + atta = 250; + arp = 4; + rang = 8; + spli = 1; + break; + case "Carnifex Claws": + atta = 225; + arp = 4; + rang = 1; + spli = 3; + break; + case "Venom Cannon": + atta = 100; + arp = 4; + rang = 5; + break; + case "Deathspitter": + atta = 100; + arp = 2; + rang = 2.1; + if (obj_ini.preomnor = 1) { + atta = 150; + } + break; + case "Fleshborer": + atta = 70; + arp = 1; + rang = 2.1; + if (obj_ini.preomnor = 1) { + atta = 90; + } + break; + case "Scything Talons": + atta = 50; + arp = 1; + rang = 1; + break; + case "Genestealer Claws": + atta = 70; + arp = 3; + rang = 1; + break; + case "Witchfire": + atta = 100; + arp = 3; + rang = 2; + break; + case "Autogun": + atta = 60; + arp = 1; + rang = 6; + amm = 12; + spli = 3; + break; + case "Lictor Claws": + atta = 300; + arp = 3; + rang = 1; + break; + case "Flesh Hooks": + atta = 100; + arp = 2; + rang = 2; + amm = 1; + break; + default: + show_debug_message_adv($"Unknown weapon name: {name}; script: scr_en_weapon.gml"); + break; } - if (name = "Gauss Flayer Array") { - atta = 180; - arp = 1; - rang = 8.1; - spli = 3; + } + + if (obj_ncombat.enemy >= 10 || obj_ncombat.enemy == 2 || obj_ncombat.enemy == 5 || obj_ncombat.enemy == 1) { + switch(name) { + case "Plasma Pistol": + atta = 70; + arp = 4; + rang = 3.1; + break; + case "Power Weapon": + atta = 120; + arp = 4; + rang = 1; + break; + case "Power Sword": + atta = 120; + arp = 4; + rang = 1; + break; + case "Force Weapon": + atta = 250; + arp = 4; + rang = 1; + break; + case "Chainfist": + atta = 300; + arp = 4; + rang = 1; + spli = 3; + break; + case "Meltagun": + atta = 200; + arp = 4; + rang = 2; + amm = 4; + break; + case "Flamer": + atta = 160; + arp = 1; + rang = 2.1; + amm = 4; + spli = 3; + break; + case "Heavy Flamer": + atta = 200; + arp = 2; + rang = 2.1; + amm = 6; + spli = 3; + break; + case "Combi-Flamer": + atta = 160; + arp = 1; + rang = 2.1; + amm = 1; + spli = 3; + break; + case "Bolter": + atta = 120; + arp = 1; + rang = 12; + amm = 15; + if (obj_ncombat.enemy = 5) then atta = 80; + break; // Bursts + case "Power Fist": + atta = 250; + arp = 4; + rang = 1; + break; + case "Possessed Claws": + atta = 150; + arp = 1; + rang = 1; + spli = 3; + break; + case "Missile Launcher": + atta = 200; + arp = 2; + rang = 20; + amm = 4; + break; + case "Chainsword": + atta = 120; + arp = 1; + rang = 1; + spli = 4; + break; + case "Bolt Pistol": + atta = 100; + arp = 1; + rang = 3.1; + amm = 18; + spli = 1; + break; + case "Chainaxe": + atta = 140; + arp = 1; + rang = 1; + spli = 3; + break; + case "Poisoned Chainsword": + atta = 150; + arp = 1; + rang = 1; + spli = 1; + if (obj_ini.preomnor = 1) { + atta = 180; + } + break; + case "Sonic Blaster": + atta = 150; + arp = 3; + rang = 3; + spli = 6; + break; + case "Rubric Bolter": + atta = 150; + arp = 1; + rang = 12; + amm = 15; + spli = 5; + break; // Bursts + case "Witchfire": + atta = 200; + arp = 4; + rang = 5.1; + spli = 1; + break; + case "Autogun": + atta = 60; + arp = 1; + rang = 6; + amm = 12; + spli = 3; + break; + case "Storm Bolter": + atta = 180; + arp = 1; + rang = 8; + amm = 10; + spli = 3; + break; + case "Lascannon": + atta = 400; + arp = 4; + rang = 20; + amm = 8; + spli = 1; + break; + case "Twin Linked Heavy Bolters": + atta = 240; + arp = 2; + rang = 16; + spli = 3; + break; + case "Twin-Linked Heavy Bolters": + atta = 240; + arp = 2; + rang = 16; + spli = 3; + break; + case "Twin Linked Lascannon": + atta = 800; + arp = 4; + rang = 20; + spli = 2; + break; + case "Twin-Linked Lascannon": + atta = 800; + arp = 4; + rang = 20; + spli = 2; + break; + case "Battle Cannon": + atta = 300; + arp = 4; + rang = 12; + break; + case "Demolisher Cannon": + atta = 500; + arp = 4; + rang = 2; + spli = 8; + if (instance_exists(obj_nfort)) then rang = 5; + break; + case "Earthshaker Cannon": + atta = 250; + arp = 3; + rang = 12; + spli = 8; + break; + case "Havoc Launcher": + atta = 300; + arp = 2; + rang = 12; + spli = 12; + break; + case "Baleflame": + atta = 225; + arp = 4; + rang = 2; + break; + case "Defiler Claws": + atta = 350; + arp = 4; + rang = 1; + spli = 3; + break; + case "Reaper Autocannon": + atta = 320; + arp = 2; + rang = 18; + amm = 10; + spli = 3; + break; + case "Ripper Gun": + atta = 120; + arp = 1; + rang = 3; + amm = 5; + spli = 0; + break; + case "Ogryn Melee": + atta = 90; + arp = 4; + rang = 1; + break; + case "Multi-Laser": + atta = 150; + arp = 2; + rang = 10; + break; + case "Blessed Weapon": + atta = 150; + arp = 4; + rang = 1; + break; + case "Electro-Flail": + atta = 125; + arp = 1; + rang = 1; + spli = 3; + break; + case "Neural Whip": + atta = 85; + arp = 1; + rang = 1; + spli = 3; + break; + case "Sarissa": + atta = 65; + arp = 1; + rang = 2; + break; + case "Seraphim Pistols": + atta = 120; + arp = 1; + rang = 4; + break; + case "Laser Mace": + atta = 150; + arp = 3; + rang = 5.1; + amm = 3; + break; + case "Heavy Bolter": + atta = 120; + arp = 2; + rang = 16; + spli = 0; + break; + case "Lasgun": + atta = 60; + arp = 1; + rang = 6; + amm = 30; + break; + case "Daemonhost Claws": + atta = 350; + arp = 4; + rang = 1; + spli = 3; + break; + case "Daemonhost_Powers": + atta = round(random_range(100, 300)); + arp = round(random_range(100, 300)); + rang = round(random_range(1, 6)); + spli = choose(0, 1); + break; + default: + show_debug_message_adv($"Unknown weapon name: {name}; script: scr_en_weapon.gml"); + break; } - if (name = "Doomsday Cannon") { - atta = 300; - arp = 1; - rang = 6.1; - spli = 3; + } + + if (obj_ncombat.enemy = 13) { // Some of these, like the Gauss Particle Cannon and Particle Whip, used to be more than twice as strong. + switch(name) { + case "Staff of Light": + atta = 200; + arp = 4; + rang = 1; + spli = 3; + break; + case "Staff of Light Shooting": + atta = 180; + arp = 4; + rang = 3; + spli = 3; + break; + case "Warscythe": + atta = 200; + arp = 4; + rang = 1; + spli = 0; + break; + case "Gauss Flayer": + atta = 50; + arp = 2; + rang = 6.1; + spli = 1; + break; + case "Gauss Blaster": + atta = 80; + arp = 2; + rang = 6.1; + spli = 0; + break; + case "Gauss Cannon": + atta = 120; + arp = 4; + rang = 10; + spli = 3; + break; + case "Gauss Particle Cannon": + atta = 250; + arp = 4; + rang = 10.1; + spli = 3; + break; + case "Overcharged Gauss Cannon": + atta = 250; + arp = 4; + rang = 8.1; + spli = 3; + break; + case "Wraith Claws": + atta = 80; + arp = 1; + rang = 1; + spli = 0; + break; + case "Claws": + atta = 300; + arp = 1; + rang = 1; + spli = 0; + break; + case "Gauss Flux Arc": + atta = 180; + arp = 2; + rang = 8; + spli = 3; + break; + case "Particle Whip": + atta = 300; + arp = 4; + rang = 4.1; + spli = 3; + break; + case "Gauss Flayer Array": + atta = 180; + arp = 2; + rang = 8.1; + spli = 3; + break; + case "Doomsday Cannon": + atta = 300; + arp = 4; + rang = 6.1; + spli = 3; + break; + default: + show_debug_message_adv($"Unknown weapon name: {name}; script: scr_en_weapon.gml"); + break; } } - if (faith_bonus = 1) then atta = atta * 2; - if (faith_bonus = 2) then atta = atta * 3; + switch(faith_bonus){ + case 1: + atta = atta * 2; + break; + case 2: + atta = atta * 3; + break; + } + atta = round(atta * obj_ncombat.global_defense); arp = round(arp * obj_ncombat.global_defense); if (obj_ncombat.enemy = 1) { // more attack crap here - if (rang <= 1) or(floor(rang) != rang) then atta = round(atta * dudes_attack[group]); - if (rang > 1) and(floor(rang) == rang) then atta = round(atta * dudes_ranged[group]); + if ((rang <= 1) || (floor(rang) != rang)) { atta = round(atta * dudes_attack[group]); } + if ((rang > 1) && (floor(rang) == rang)) { atta = round(atta * dudes_ranged[group]); } } - if (is_man = false) then amm = -1; + if (!is_man) { amm = -1; } - var b, goody, first; - b = 0; - goody = 0; - first = -1; - repeat(30) { - if (wep[b] = name) and(goody = 0) { + var goody = 0; + var first = -1; + for(var b = 0; b < 30; b++) { + if ((wep[b] == name) && (goody == 0)) { att[b] += atta * man_number; - apa[b] += arp * man_number; + apa[b] += arp; range[b] = rang; wep_num[b] += man_number; - if (obj_ncombat.started = 0) then ammo[b] = amm; + if (obj_ncombat.started == 0) { ammo[b] = amm; } goody = 1; - if (wep_owner[b] != "") or(man_number > 1) then wep_owner[b] = "assorted"; - if (wep_owner[b] = "") and(man_number = 1) then wep_owner[b] = man_type; + if ((wep_owner[b] != "") || (man_number > 1)) { wep_owner[b] = "assorted"; } + if ((wep_owner[b] == "") && (man_number == 1)) { wep_owner[b] = man_type; } } - if (wep[b] = "") and(first = -1) then first = b; - b += 1; + if ((wep[b] == "") && (first == -1)) { first = b; } } - if (goody = 0) { + if (goody == 0) { wep[first] = name; splash[first] = spli; att[first] += atta * man_number; - apa[first] += arp * man_number; + apa[first] += arp; range[first] = rang; wep_num[first] += man_number; - if (obj_ncombat.started = 0) then ammo[first] = amm; + if (obj_ncombat.started == 0) { ammo[first] = amm; } goody = 1; - if (man_number = 1) then wep_owner[first] = man_type; - if (man_number > 1) then wep_owner[first] = "assorted"; + if (man_number == 1) { wep_owner[first] = man_type; } + if (man_number > 1) { wep_owner[first] = "assorted"; } } /* @@ -1065,4 +1123,1079 @@ function scr_en_weapon(name, is_man, man_number, man_type, group) { att[i]=0; apa[i]=0; */ -} \ No newline at end of file +} + +// Global Enemy Weapons +// Convention: (freely changeable, but i started with this) +// attack -> armor_penetration -> range -> splash -> ammo -> special +// Array of 2 elements contains range from-to values +// Array of more than 2 elements indicates specific attack values to randomly choose from +// Exception is "special" attribute, which is always array of strings +// Poison means dmg is added when picking weakness to poison and toxins as geneseed mutation +// Siege means a range increase when there is a siege situation (attacking a fortification) (only one weapon uses it so far) + +global.en_weapons = { + + // ===================== + // Tyranid Weapons + // ===================== + + "Venom Claws": { + "attack": 200, + "armor_penetration": 0, + "range": 1, + "splash": 0, + "special": ["poison"], // poison adds 40 dmg (20% increase) + }, + "Lash Whip": { + "attack": 80, + "armor_penetration": 0, + "range": 2, + "splash": 0, + }, + "Bonesword": { + "attack": 120, + "armor_penetration": 0, + "range": 1, + "splash": 3, + }, + "Heavy Venom Cannon": { + "attack": 150, + "armor_penetration": 1, + "range": 8, + "splash": 0, + }, + "Crushing Claws": { + "attack": 90, + "armor_penetration": 1, + "range": 1, + "splash": 3, + }, + "Rending Claws": { + "attack": 80, + "armor_penetration": 1, + "range": 1, + "splash": 3, + }, + "Devourer": { + "attack": [40, 60, 80, 100], + "armor_penetration": 0, + "range": 5, + "splash": 0, + "special": ["poison"], // poison adds 8, 12, 16, 20 dmg (20% increase) + }, + "Zoanthrope Blast": { + "attack": 200, + "armor_penetration": 1, + "range": 2, + "splash": 0, + }, + "Carnifex Claws": { + "attack": 300, + "armor_penetration": 1, + "range": 1, + "splash": 3, + }, + "Venom Cannon": { + "attack": 150, + "armor_penetration": 0, + "range": 5, + "splash": 0, + }, + "Deathspitter": { + "attack": 100, + "armor_penetration": 0, + "range": 2.1, + "splash": 0, + "special": ["poison"], // poison adds 20 dmg (20% increase) + }, + "Fleshborer": { + "attack": 15, + "armor_penetration": 0, + "range": 2.1, + "splash": 0, + "special": ["poison"], // poison adds 4 dmg (4/15 increase) + }, + "Scything Talons": { + "attack": 30, + "armor_penetration": 0, + "range": 1, + "splash": 0, + }, + "Genestealer Claws": { + "attack": [105, 105, 130], + "armor_penetration": 1, + "range": 1, + "splash": 0, + }, + "Tyranid Witchfire": { // Dont know why tyranids would have witchfire, but it's in the original code + "attack": 100, + "armor_penetration": 1, + "range": 2, + "splash": 0, + }, + "Tyranid Autogun": { + "attack": 20, + "armor_penetration": 0, + "range": 6, + "splash": 3, + "ammo": 12, + }, + "Lictor Claws": { + "attack": 300, + "armor_penetration": 0, + "range": 1, + "splash": 0, + }, + "Flesh Hooks": { + "attack": 50, + "armor_penetration": 0, + "range": 2, + "splash": 0, + "ammo": 1, + }, + + // ===================== + // Chaos / Daemonic Weapons + // ===================== + + "Warpsword": { + "attack": 300, + "armor_penetration": 1, + "range": 1, + "splash": 3, + }, + "Iron Claw": { + "attack": 400, + "armor_penetration": 1, + "range": 1, + "splash": 0, + }, + "Maulerfiend Claws": { + "attack": 300, + "armor_penetration": 300, + "range": 1, + "splash": 3, + }, + "Chaos Witchfire": { // Dont know why tyranids would have witchfire, but it's in the original code + "attack": 200, + "armor_penetration": 1, + "range": 5.1, + "splash": 0, + }, + "Eldritch Fire": { + "attack": 80, + "armor_penetration": 1, + "range": 5.1, + }, + "Bloodletter Melee": { + "attack": 70, + "armor_penetration": 0, + "range": 1, + "splash": 3, + }, + "Daemonette Melee": { + "attack": 65, + "armor_penetration": 0, + "range": 1, + "splash": 3, + }, + "Plaguebearer Melee": { + "attack": 60, + "armor_penetration": 0, + "range": 1, + "splash": 3, + "special": ["poison"], // poison adds 10 dmg (1/6 increase) + }, + "Khorne Demon Melee": { + "attack": 350, + "armor_penetration": 1, + "range": 1, + "splash": 3, + }, + "Demon Melee": { + "attack": 250, + "armor_penetration": 1, + "range": 1, + "splash": 3, + }, + "Nurgle Vomit": { + "attack": 100, + "armor_penetration": 0, + "range": 2, + "splash": 3, + "special": ["poison"], // poison adds 160 dmg (160% increase) + }, + "Possessed Claws": { + "attack": 250, + "armor_penetration": 1, + "range": 1, + "splash": 3, + }, + "Baleflame": { + "attack": 120, + "armor_penetration": 0, + "range": 2, + "splash": 0, + }, + "Defiler Claws": { + "attack": 350, + "armor_penetration": 1, + "range": 1, + "splash": 3, + }, + "Daemonhost Claws": { + "attack": 350, + "armor_penetration": 1, + "range": 1, + "splash": 3, + }, + "Daemonhost Powers": { + "attack": [100, 300], + "armor_penetration": [100, 300], + "range": [1, 6], + "splash": [0, 0, 1, 1], // Doubled up to keep convention + }, + + // ===================== + // Necron Weapons + // ===================== + + "Staff of Light": { + "attack": 200, + "armor_penetration": 1, + "range": 1, + "splash": 3, + }, + "Staff of Light Shooting": { + "attack": 180, + "armor_penetration": 0, + "range": 3, + "splash": 3, + }, + "Warscythe": { + "attack": 200, + "armor_penetration": 1, + "range": 1, + "splash": 0, + }, + "Gauss Flayer": { + "attack": [30, 30, 30, 50, 50, 70], + "armor_penetration": 1, // Original code had no armor penetration for this weapon, Flayer Array has arp 1 so will this does as well + "range": 6.1, + "splash": 0, + }, + "Gauss Blaster": { + "attack": [70, 70, 70, 70, 70, 100], + "armor_penetration": [0, 0, 0, 0, 0, 1], + "range": 6.1, + "splash": 0, + }, + "Gauss Cannon": { + "attack": 180, + "armor_penetration": 1, + "range": 10, + "splash": 3, + }, + "Gauss Particle Cannon": { + "attack": 300, + "armor_penetration": 1, + "range": 10.1, + "splash": 3, + }, + "Overcharged Gauss Cannon": { + "attack": 250, + "armor_penetration": 1, + "range": 8.1, + "splash": 3, + }, + "Wraith Claws": { + "attack": 80, + "armor_penetration": 1, + "range": 1, + "splash": 0, + }, + "Necron Claws": { // Renamed from just "Claws" to avoid confusion + "attack": 300, + "armor_penetration": 1, + "range": 1, + "splash": 0, + }, + "Gauss Flux Arc": { + "attack": 180, + "armor_penetration": 1, + "range": 8, + "splash": 3, + }, + "Particle Whip": { + "attack": 300, + "armor_penetration": 1, + "range": 4.1, + "splash": 3, + }, + "Gauss Flayer Array": { + "attack": 180, + "armor_penetration": 1, + "range": 8.1, + "splash": 3, + }, + "Doomsday Cannon": { + "attack": 300, + "armor_penetration": 1, + "range": 6.1, + "splash": 3, + }, + + // ===================== + // Aeldari Weapons + // ===================== + + "Web Spinner": { + "attack": 40, + "armor_penetration": 0, + "range": 2.1, + "splash": 3, + "ammo": 1 + }, + "Fusion Gun": { + "attack": 200, + "armor_penetration": 1, + "range": 2, + "splash": 0, + "ammo": 4, + }, + "Firepike": { + "attack": 200, + "armor_penetration": 1, + "range": 2, + "splash": 0, + "ammo": 4, + }, + "Singing Spear": { + "attack": 120, + "armor_penetration": 0, + "range": 1, + "splash": 3, + }, + "Singing Spear Throw": { + "attack": 120, + "armor_penetration": 1, + "range": 2, + "splash": 3, + }, + "Witchblade": { + "attack": 100, + "armor_penetration": 1, + "range": 1, + "splash": 0, + }, + "Psyshock": { + "attack": 50, + "armor_penetration": 0, + "range": 2, + "splash": 0, + }, + "Wailing Doom": { + "attack": 200, + "armor_penetration": 1, + "range": 1, + "splash": 3, + }, + "Avatar Smite": { + "attack": 300, + "armor_penetration": 1, + "range": 2, + "splash": 0, + "ammo": 2, + }, + "Ranger Long Rifle": { + "attack": 60, + "armor_penetration": 0, + "range": 25, + "splash": 0, + }, + "Pathfinder Long Rifle": { + "attack": 70, + "armor_penetration": 0, + "range": 25, + "splash": 0, + }, + "Shuriken Catapult": { + "attack": 35, + "armor_penetration": 0, + "range": 2, + "splash": 0, + }, + "Twin Linked Shuriken Catapult": { + "attack": 50, + "armor_penetration": 0, + "range": 2, + "splash": 0, + }, + "Avenger Shuriken Catapult": { + "attack": 40, + "armor_penetration": 0, + "range": 3, + "splash": 0, + }, + "Aeldari Plasma Pistol": { + "attack": 60, + "armor_penetration": 1, + "range": 3.1, + "splash": 0, + }, + "Aeldari Power Weapon": { + "attack": 80, + "armor_penetration": 0, + "range": 1, + "splash": 3, + }, + "Aeldari Power Blades": { + "attack": 80, + "armor_penetration": 0, + "range": 1, + "splash": 3, + }, + "Shuriken Pistol": { + "attack": 25, + "armor_penetration": 0, + "range": 2.1, + "splash": 0, + }, + "Executioner": { + "attack": 200, + "armor_penetration": 1, + "range": 1, + "splash": 0, + }, + "Scorpion Chainsword": { + "attack": 40, + "armor_penetration": 0, + "range": 1, + "splash": 3, + }, + "Mandiblaster": { + "attack": 20, + "armor_penetration": 0, + "range": 1, + "splash": 0, + }, + "Biting Blade": { + "attack": 70, + "armor_penetration": 0, + "range": 1, + "splash": 3, + }, + "Scorpian's Claw": { + "attack": 150, + "armor_penetration": 1, + "range": 1, + "splash": 3, + }, + "Scorpion's Claw": { + "attack": 150, + "armor_penetration": 1, + "range": 1, + "splash": 3, + }, + "Meltabomb": { + "attack": 0, + "armor_penetration": 200, + "range": 1, + "splash": 1, + }, + "Deathspinner": { + "attack": 50, + "armor_penetration": 0, + "range": 2, + "splash": 0, + }, + "Dual Deathspinner": { + "attack": 80, + "armor_penetration": 0, + "range": 2, + "splash": 0, + }, + "Reaper Launcher": { + "attack": 150, + "armor_penetration": 80, + "range": 20, + "splash": 3, + "ammo": 8, + }, + "Eldar Missile Launcher": { + "attack": 200, + "armor_penetration": 1, + "range": 20, + "splash": 3, + "ammo": 4, + }, + "Laser Lance": { + "attack": 80, + "armor_penetration": 0, + "range": 2, + "splash": 3, + }, + "Fusion Pistol": { + "attack": 100, + "armor_penetration": 1, + "range": 1.1, + "splash": 0, + "ammo": 4, + }, + "Harlequin's Kiss": { + "attack": 350, + "armor_penetration": 0, + "range": 1, + "splash": 0, + "ammo": 1, + }, + "Wraithcannon": { + "attack": 80, + "armor_penetration": 1, + "range": 2.1, + "splash": 0, + }, + "Pulse Laser": { + "attack": 80, + "armor_penetration": 1, + "range": 15, + "splash": 0, + }, + "Bright Lance": { + "attack": 100, + "armor_penetration": 1, + "range": 8, + "splash": 0, + }, + "Shuriken Cannon": { + "attack": 65, + "armor_penetration": 0, + "range": 3, + "splash": 0, + }, + "Prism Cannon": { + "attack": 250, + "armor_penetration": 1, + "range": 20, + "splash": 0, + }, + "Twin Linked Doomweaver": { + "attack": 100, + "armor_penetration": 0, + "range": 2, + "splash": 0, + }, + "Starcannon": { + "attack": 140, + "armor_penetration": 1, + "range": 3, + "splash": 3, + }, + "Two Power Fists": { + "attack": 300, + "armor_penetration": 1, + "range": 1, + "splash": 0, + }, + "Aeldari Flamer": { + "attack": 100, + "armor_penetration": 0, + "range": 2, + "splash": 3, + "ammo": 4, + }, + "Titan Starcannon": { + "attack": 220, + "armor_penetration": 1, + "range": 4, + "splash": 3, + }, + "Phantom Pulsar": { + "attack": 500, + "armor_penetration": 1, + "range": 20, + "splash": 3, + }, + + // ===================== + // Ork Weapons + // ===================== + + "Choppa": { + "attack": 28, + "armor_penetration": 0, + "range": 1, + "splash": 3, + }, + "Power Klaw": { + "attack": 150, + "armor_penetration": 1, + "range": 1, + "splash": 3, + }, + "Slugga": { + "attack": 27, + "armor_penetration": 0, + "range": 3.1, + "splash": 3, + "ammo": 4, + }, + "Tankbusta Bomb": { + "attack": 264, + "armor_penetration": 1, + "range": 1, + "splash": 0, + "ammo": 1, + }, + "Big Shoota": { + "attack": 100, + "armor_penetration": 0, + "range": 12, + "splash": 0, + "ammo": 30, + }, + "Dakkagun": { + "attack": 150, + "armor_penetration": 0, + "range": 10, + "splash": 0, + "ammo": 20, + }, + "Deffgun": { + "attack": 120, + "armor_penetration": 0, + "range": 8, + "splash": 0, + "ammo": 20, + }, + "Snazzgun": { + "attack": 80, + "armor_penetration": 0, + "range": 10, + "splash": 0, + }, + "Grot Blasta": { + "attack": 12, + "armor_penetration": 0, + "range": 2, + "splash": 0, + "ammo": 6, + }, + "Kannon": { + "attack": 200, + "armor_penetration": 1, + "range": 10.1, + "splash": 3, + "ammo": 5, + }, + "Shoota": { + "attack": 30, + "armor_penetration": 0, + "range": 6, + "splash": 0, + }, + "Burna": { + "attack": 140, + "armor_penetration": 1, + "range": 2, + "splash": 3, + "ammo": 4, + }, + "Skorcha": { + "attack": 160, + "armor_penetration": 1, + "range": 2, + "splash": 3, + "ammo": 6, + }, + "Rokkit Launcha": { + "attack": 150, + "armor_penetration": 1, + "range": 15, + "splash": 3, + }, + "Krooz Missile": { + "attack": 250, + "armor_penetration": 1, + "range": 15, + "splash": 3, + }, + + // ===================== + // T'au Empire + // ===================== + + "Fusion Blaster": { + "attack": 200, + "armor_penetration": 1, + "range": 2, + "splash": 0, + "ammo": 4, + }, + "Plasma Rifle": { + "attack": 120, + "armor_penetration": 1, + "range": 10, + "splash": 0, + }, + "Cyclic Ion Blaster": { + "attack": 180, + "armor_penetration": 0, + "range": 6, + "splash": 3, + }, + "Burst Rifle": { + "attack": 130, + "armor_penetration": 0, + "range": 16, + "splash": 3, + }, + "Missile Pod": { + "attack": 160, + "armor_penetration": 1, + "range": 15, + "splash": 3, + "ammo": 6, + }, + "Smart Missile System": { + "attack": 150, + "armor_penetration": 1, + "range": 15, + "splash": 0, + }, + "Small Railgun": { + "attack": 150, + "armor_penetration": 1, + "range": 18, + "splash": 0, + }, + "Pulse Rifle": { + "attack": 37, + "armor_penetration": 0, + "range": 12, + "splash": 0, + }, + "Rail Rifle": { + "attack": 65, + "armor_penetration": 0, + "range": 14, + "splash": 0, + }, + "Kroot Rifle": { + "attack": 25, + "armor_penetration": 0, + "range": 6, + "splash": 0, + }, + "Vespid Crystal": { + "attack": 60, + "armor_penetration": 0, + "range": 2.1, + "splash": 0, + }, + "Railgun": { + "attack": 400, + "armor_penetration": 1, + "range": 20, + "splash": 0, + }, + + // ===================== + // Imperium / Chaos Space Marines Weapons + // ===================== + + "Multi-Melta": { + "attack": 200, + "armor_penetration": 1, + "range": 4.1, + "splash": 0, + "ammo": 6, + }, + "Imperium Plasma Pistol": { + "attack": 70, + "armor_penetration": 1, + "range": 3.1, + "splash": 0, + }, + "Meltagun": { + "attack": 200, + "armor_penetration": 1, + "range": 2, + "splash": 0, + "ammo": 4, + }, + "Imperium Flamer": { + "attack": 160, + "armor_penetration": 0, + "range": 2.1, + "splash": 3, + "ammo": 4, + }, + "Imperium Heavy Flamer": { + "attack": 250, + "armor_penetration": 0, + "range": 2.1, + "splash": 3, + "ammo": 6, + }, + "Combi-Flamer": { + "attack": 160, + "armor_penetration": 0, + "range": 2.1, + "splash": 3, + "ammo": 1, + }, + "Bolter": { + "attack": 45, + "armor_penetration": 0, + "range": 12, + "splash": 0, + "ammo": 15, + }, + "Bolt Pistol": { + "attack": 35, + "armor_penetration": 0, + "range": 3.1, + "splash": 0, + "ammo": 18, + }, + "Sonic Blaster": { + "attack": 120, + "armor_penetration": 0, + "range": 3, + "splash": 3, + }, + "Rubric Bolter": { + "attack": 80, + "armor_penetration": 0, + "range": 12, + "splash": 0, + "ammo": 15, + }, + "Storm Bolter": { + "attack": 65, + "armor_penetration": 0, + "range": 8, + "splash": 3, + "ammo": 10, + }, + "Heavy Bolter": { + "attack": 120, + "armor_penetration": 0, + "range": 16, + "splash": 0, + }, + "Twin Linked Heavy Bolters": { + "attack": 240, + "armor_penetration": 0, + "range": 16, + "splash": 3, + }, + "Lascannon": { + "attack": 200, + "armor_penetration": 1, + "range": 20, + "splash": 0, + "ammo": 8, + }, + "Twin Linked Lascannon": { + "attack": 300, + "armor_penetration": 1, + "range": 20, + "splash": 0, + }, + "Missile Launcher": { + "attack": 200, + "armor_penetration": 1, + "range": 20, + "splash": 3, + "ammo": 4, + }, + "Battle Cannon": { + "attack": 300, + "armor_penetration": 1, + "range": 12, + "splash": 0, + }, + "Demolisher Cannon": { + "attack": 500, + "armor_penetration": 1, + "range": 2, + "splash": 0, + "special": ["Siege"], // Siege means +3 range in siege situations + }, + "Earthshaker Cannon": { + "attack": 300, + "armor_penetration": 0, + "range": 12, + "splash": 3, + }, + "Havoc Launcher": { + "attack": 100, + "armor_penetration": 0, + "range": 12, + "splash": 0, + }, + "Reaper Autocannon": { + "attack": 320, + "armor_penetration": 0, + "range": 18, + "splash": 3, + "ammo": 10, + }, + "Lasgun": { + "attack": 20, + "armor_penetration": 0, + "range": 6, + "splash": 0, + "ammo": 30, + }, + "Multi-Laser": { + "attack": [60, 75, 90, 105], + "armor_penetration": 0, + "range": 10, + "splash": 0, + }, + "Imperium Autogun": { + "attack": 20, + "armor_penetration": 0, + "range": 6, + "splash": 0, + "ammo": 12, + }, + + // ===================== + // Imperium Melee / Specialist + // ===================== + + "Chainsword": { + "attack": 45, + "armor_penetration": 0, + "range": 1, + "splash": 0, + }, + "Chainaxe": { + "attack": 55, + "armor_penetration": 0, + "range": 1, + "splash": 0, + }, + "Poisoned Chainsword": { + "attack": 90, + "armor_penetration": 0, + "range": 1, + "splash": 0, + "special": ["poison"], // poison adds 40 dmg (4/9 increase) + }, + "Imperium Power Weapon": { + "attack": 120, + "armor_penetration": 0, + "range": 1, + "splash": 0, + }, + "Power Sword": { + "attack": 120, + "armor_penetration": 0, + "range": 1, + "splash": 0, + }, + "Force Weapon": { + "attack": 400, + "armor_penetration": 1, + "range": 1, + "splash": 0, + }, + "Chainfist": { + "attack": 300, + "armor_penetration": 1, + "range": 1, + "splash": 3, + }, + "Power Fist": { + "attack": 425, + "armor_penetration": 1, + "range": 1, + "splash": 0, + }, + "Blessed Weapon": { + "attack": 150, + "armor_penetration": 1, + "range": 1, + "splash": 0, + }, + "Electro-Flail": { + "attack": 125, + "armor_penetration": 1, + "range": 1, + "splash": 3, + }, + "Neural Whip": { + "attack": 85, + "armor_penetration": 0, + "range": 1, + "splash": 3, + }, + "Sarissa": { + "attack": 65, + "armor_penetration": 0, + "range": 2, + "splash": 0, + }, + "Ogryn Melee": { + "attack": 90, + "armor_penetration": 0, + "range": 1, + "splash": 0, + }, + "Ripper Gun": { + "attack": 40, + "armor_penetration": 0, + "range": 3, + "splash": 0, + "ammo": 5, + }, + "Adepta Sororitas Bolter": { + "attack": 35, + "armor_penetration": 0, + "range": 12, + "splash": 0, + "ammo": 15, + } + ,"Seraphim Pistols": { + "attack": 200, + "armor_penetration": 1, + "range": 4, + "splash": 0, + }, + "Laser Mace": { + "attack": 200, + "armor_penetration": 1, + "range": 5.1, + "splash": 3, + }, + + // ===================== + // Mechanicum / Other + // ===================== + + "Phased Plasma-fusil": { + "attack": 100, + "armor_penetration": 1, + "range": 7.1, + "splash": 3, + }, + "Lightning Gun": { + "attack": [80, 80, 80, 150], + "armor_penetration": 0, + "range": 5, + "splash": 0, + }, + "Thallax Melee": { + "attack": 80, + "armor_penetration": 0, + "range": 1, + "splash": 3, + } +}; +// End of Global Enemy Weapons diff --git a/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml b/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml index f4a34ae61d..27fc95e104 100644 --- a/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml +++ b/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml @@ -2,28 +2,27 @@ function scr_enemy_ai_a() { system_garrison = []; system_sabatours = []; + system_datas = [0]; + + for (var i=1;i<=planets;i++){ + array_push(system_datas,new PlanetData(i, self)); + } // guardsmen hop from planet to planet - if (system_guard_total()>0) and (present_fleet[eFACTION.Imperium]){ + //not sure we really need this as it's handled with tht navy fleet functions but fuck it updated it and leaving it fot the sec + if (system_guard_total()>0 && present_fleet[eFACTION.Imperium]){ + show_debug_message_adv($"system_has_guard {p_guardsmen}"); var cur_planet=0,most_enemies_found=0,current_guard_planet=0,most_enemies_planet=0; - repeat(planets){ - cur_planet+=1; - if (p_guardsmen[cur_planet]>0) and (current_guard_planet=0) then current_guard_planet=cur_planet; - } - cur_planet=0; - var imperium_enemies; - repeat(planets){ - cur_planet+=1; - imperium_enemies=planet_imperial_base_enemies(cur_planet); - if (imperium_enemies>most_enemies_found){ - most_enemies_found=imperium_enemies; - most_enemies_planet=cur_planet; - } - } - if (planet_imperial_base_enemies(current_guard_planet)==0) and (most_enemies_planet!=current_guard_planet){ - p_guardsmen[most_enemies_planet]=p_guardsmen[current_guard_planet]; - p_guardsmen[current_guard_planet]=0; + var _guard_planets = guard_find_planet_with_most_enemy_forces(self); + + if (_guard_planets[0] > 0 && _guard_planets[1] > 0){ + var _next = _guard_planets[0]; + var _current = _guard_planets[1]; + p_guardsmen[_next] = p_guardsmen[_current]; + p_guardsmen[_current] = 0; + } + show_debug_message_adv($"system_has_guard {p_guardsmen}"); } if (obj_controller.faction_defeated[10]>0) and (obj_controller.faction_gender[10]=2){ @@ -31,76 +30,16 @@ function scr_enemy_ai_a() { repeat(planets){ cur_planet+=1; if (array_length(p_feature[cur_planet])!=0){ - if (planet_feature_bool(p_feature[cur_planet], P_features.World_Eaters)==1) and (p_chaos[cur_planet]<=0){ - delete_features(p_feature[cur_planet],P_features.World_Eaters); + if (planet_feature_bool(p_feature[cur_planet], P_features.ChaosWarband)==1) and (p_chaos[cur_planet]<=0){ + delete_features(p_feature[cur_planet],P_features.ChaosWarband); } } } } // checking for inquisition dead world inspections here - if (present_fleet[eFACTION.Player]>=0) and (present_fleet[eFACTION.Inquisition]==0){ - var chapter_asset_discovery,yep=0,stop=false; - - var shitty = scr_has_disadv("Shitty Luck"); - - if (present_fleet[1]=0){ - chapter_asset_discovery = irandom_range(1, shitty?800:2000); - } else { - chapter_asset_discovery = irandom_range(1, shitty?50:200); - } - - // 137 ; chapter_asset_discovery=floor(random(20))+1; - - var cur_planet=0; - if (chapter_asset_discovery<=5){ - repeat(planets){ - cur_planet+=1; - if (p_first[cur_planet]=1) and (p_owner[cur_planet]=2) then p_owner[cur_planet]=1; - if (p_type[cur_planet]=="Dead") and (array_length(p_upgrades[cur_planet])>0){ - if (planet_feature_bool(p_feature[cur_planet], [P_features.Secret_Base,P_features.Arsenal,P_features.Gene_Vault])==0) /*and (string_count(".0|",p_upgrades[cur_planet])>0)*/{ - yep=cur_planet; - } - } - } - } - - //if an inquis wants to check out a dead world with chapter assets - if (yep>0){ - var planet_coords = [x,y]; - with(obj_en_fleet){ - //checks if there is already an inquis ship investigating planet - if (owner=4){ - if (point_distance(action_x,action_y,planet_coords[0],planet_coords[1])<30 && - string_count("investigate_dead",trade_goods)>0){ - stop=true; - } - } - } - - - if (!stop){ - var plap=0,old_x=x,old_y=y,flee=0; - var _current_planet_name = name; - var launch_planet, launch_point_found=false; - launch_planet = nearest_star_with_ownership(x,y, [eFACTION.Imperium, eFACTION.Mechanicus], self.id); - if (launch_planet != "none"){ - if (instance_exists(launch_planet)){ - flee=instance_create(launch_planet.x,launch_planet.y,obj_en_fleet); - with (flee){ - base_inquis_fleet(); - } - flee.action_x=x; - flee.action_y=y; - flee.trade_goods+="|investigate_dead|"; - with (flee){ - set_fleet_movement(); - } - } - } - } - } - + if (present_fleet[eFACTION.Player]>=0 && !present_fleet[eFACTION.Inquisition]){ + inquisitor_inspect_base(); } var stop; @@ -108,7 +47,7 @@ function scr_enemy_ai_a() { var garrison_force=false, total_garrison=0; var _planet_data; for (var _run =1;_run<=planets;_run++){ - _planet_data = new PlanetData(_run, self); + _planet_data = system_datas[_run]; garrison_force=false; var garrison = new GarrisonForce(p_operatives[_run], true); var sabatours = new GarrisonForce(p_operatives[_run], true, "sabotage"); @@ -161,7 +100,6 @@ function scr_enemy_ai_a() { var necrons_score=p_necrons[_run]; var sisters_score=p_sisters[_run]; // if (p_eldar[_run]>0) then eldar_score=p_eldar[_run]+1; - if (p_tyranids[_run]<4) then tyranids_score=0; if (p_tyranids[_run]>0) and (stop!=1) and (p_owner[_run]!=9){// This might have been causing the problem /*if (p_tyranids[_run]<5) and (p_guardsmen[_run]>0){ @@ -172,7 +110,6 @@ function scr_enemy_ai_a() { }*/ if (p_tyranids[_run]>=5) then tyranids_score=7; } - var pdf_with_player=_planet_data.pdf_will_support_player(); var pdf_loss_reduction=_planet_data.pdf_loss_reduction_calc();//redues man loss from battle loss if higher defences @@ -313,7 +250,7 @@ function scr_enemy_ai_a() { if (!stop){// Start stop - default_imperium_attack = guard_score>0 && !((guard_score<=0.5) && (pdf_score>1)) ?"guard":"pdf"; + default_imperium_attack = guard_score>0 && !((guard_score<=0.5) && (pdf_score>0)) ?"guard":"pdf"; if (ork_attack=="imp") then ork_attack = default_imperium_attack; @@ -347,10 +284,11 @@ function scr_enemy_ai_a() { var after_combat_tyranids=tyranids_score; var after_combat_sisters=sisters_score; var tempor=0,rand1=0,rand2=0; - + + var _active_garrison = pdf_with_player && garrison.viable_garrison>0; // Guard attack if (guard_score>0) and (guard_attack!="") and (guard_score>0.5){ - + show_debug_message_adv($"{name}:{guard_attack}") if (guard_attack="ork") then tempor=choose(1,2,3,4,5,6)*planet_forces[eFACTION.Ork]; if (guard_attack="tau") then tempor=choose(1,2,3,4,5,6)*planet_forces[eFACTION.Tau]; if (guard_attack="traitors") then tempor=choose(1,2,3,4,5,6)*traitors_score; @@ -367,23 +305,32 @@ function scr_enemy_ai_a() { if (guard_attack="pdf"){ if (pdf_with_player){ - pdf_mod=floor(random(6+garrison.total_garrison*0.1))+1; + pdf_mod=irandom_range(1,6+garrison.total_garrison*0.1); }else{ pdf_mod=irandom(5)+1; - } + } rand1=(choose(3,4,5,6)*guard_score)*choose(1,1.25,1.25); rand2=(pdf_mod*pdf_score)*choose(1,1.25); + show_debug_message_adv($"{name} guard attack guard_Win:{rand1>rand2}"); if (rand1>rand2){ - + var _pdf_before = p_pdf[_run]; if (guard_score<=3) then p_pdf[_run]=floor(p_pdf[_run]*(min(0.95, 0.7+pdf_loss_reduction))); if (guard_score>=4) then p_pdf[_run]=floor(p_pdf[_run]*(min(0.95, 0.55+pdf_loss_reduction))); if (guard_score>=4) and (p_pdf[_run]<30000) then p_pdf[_run]*=(min(0.95, 1+pdf_loss_reduction)); if (guard_score>=3) and (p_pdf[_run]<10000) then p_pdf[_run]*=(min(0.95, 0+pdf_loss_reduction)); if (guard_score>=2) and (p_pdf[_run]<2000) then p_pdf[_run]=0; if (guard_score>=1) and (p_pdf[_run]<200) then p_pdf[_run]=0; + if (_planet_data.population_influences[eFACTION.Tyranids] > 50 && _planet_data.has_feature(P_features.Gene_Stealer_Cult)){ + var _cur_influ = p_influence[_run][eFACTION.Tyranids]; + var _influence_reduction = _cur_influ * (p_pdf[_run]/_pdf_before); + adjust_influence(eFACTION.Tyranids,-min(_influence_reduction,_cur_influ-3) , _run); + if (p_influence[_run][eFACTION.Tyranids] < 20){ + _planet_data.delete_feature(P_features.Gene_Stealer_Cult); + } + } } if (p_pdf[_run]=0) and (pdf_with_player){ - if (planet_feature_bool(p_feature[_run],P_features.Monastery)==0) and (p_player[_run]<=0){ + if (!_planet_data.has_feature(P_features.Monastery)) and (p_player[_run]<=0){ p_owner[_run]=2; dispo[_run]=-50; } @@ -394,7 +341,9 @@ function scr_enemy_ai_a() { if (guard_attack="tau") then after_combat_tau-=1; if (guard_attack="traitors") then after_combat_traitor-=1; if (guard_attack="csm") then after_combat_csm-=1; - if (guard_attack="tyranids") then after_combat_tyranids-=1; + if (guard_attack="tyranids"){ + after_combat_tyranids-=1; + } } } @@ -428,7 +377,9 @@ function scr_enemy_ai_a() { if (pdf_attack=="sisters") then after_combat_sisters=tempor; if (pdf_attack=="guard"){ + rand2=(choose(1,2,3,4,5,6)*guard_score)*choose(1,1.25,2); + show_debug_message_adv($"{name} : pdf attack ,pdf win {rand1>rand2}"); if (rand1>rand2){ if (pdf_score<=3) then p_guardsmen[_run]=floor(p_guardsmen[_run]*0.7); if (pdf_score>=4) then p_guardsmen[_run]=floor(p_guardsmen[_run]*0.6); @@ -524,32 +475,39 @@ function scr_enemy_ai_a() { }else if (ork_attack="guard"){var onc=0; rand2=(choose(1,2,3,4,5,6)*guard_score)*choose(1,1.25); if (rand1>rand2){ - if (planet_forces[eFACTION.Ork]<=3) and (onc=0){p_guardsmen[_run]=floor(p_guardsmen[_run]*(min(0.95, 0.7+pdf_loss_reduction)));onc=1;} - if (planet_forces[eFACTION.Ork]>=4) and (onc=0){p_guardsmen[_run]=floor(p_guardsmen[_run]*(min(0.95, 0.55+pdf_loss_reduction)));onc=1;} - if (planet_forces[eFACTION.Ork]>=4) and (p_guardsmen[_run]<15000) and (onc=0){p_guardsmen[_run]=0;onc=1;} - if (planet_forces[eFACTION.Ork]>=3) and (p_guardsmen[_run]<5000) and (onc=0){p_guardsmen[_run]=0;onc=1;} + if (planet_forces[eFACTION.Ork]<=3) and (onc=0){ + p_guardsmen[_run]=floor(p_guardsmen[_run]*(min(0.95, 0.7+pdf_loss_reduction)));onc=1; + } + if (planet_forces[eFACTION.Ork]>=4) and (onc=0){ + p_guardsmen[_run]=floor(p_guardsmen[_run]*(min(0.95, 0.55+pdf_loss_reduction))); + onc=1; + } + if (planet_forces[eFACTION.Ork]>=4) and (p_guardsmen[_run]<15000) and (onc=0){ + p_guardsmen[_run]=0;onc=1; + } + if (planet_forces[eFACTION.Ork]>=3) and (p_guardsmen[_run]<5000) and (onc=0){ + p_guardsmen[_run]=0;onc=1; + } } }else if (ork_attack="pdf"){ var pdf_random = choose(1,2,3,4,5,6); rand2=(pdf_random*pdf_score); - var active_garrison = pdf_with_player && garrison.viable_garrison>0; if (rand1>rand2){ _planet_data.pdf_defence_loss_to_orks(); - if (active_garrison){ + if (_active_garrison){ var tixt = $"Chapter Forces led by {garrison.garrison_leader.name_role()} on {name} {scr_roman_numerals()[_run-1]} were unable to secure PDF victory chapter support requested"; if (garrison.garrison_sustain_damages("loose")>0){ - tixt += $". {garrison.garrison_sustain_damages()} Marines Lost"; + tixt += $". {garrison.garrison_sustain_damages("loose")} Marines Lost"; } scr_alert("red","owner",tixt,x,y); //garrison.determine_battle(false,rand2-rand1, eFACTION.Ork); } } else { - if (active_garrison){ - garrison.garrison_sustain_damages(); + if (_active_garrison){ var tixt = $"Chapter Forces led by {garrison.garrison_leader.name_role()} on {name} {scr_roman_numerals()[_run-1]} secure PDF victory"; if (garrison.garrison_sustain_damages("win")>0){ - tixt += $". {garrison.garrison_sustain_damages()} Marines Lost"; + tixt += $". {garrison.garrison_sustain_damages("win")} Marines Lost"; } scr_alert("green","owner",tixt,x,y); } @@ -702,7 +660,7 @@ function scr_enemy_ai_a() { if (rand1>rand2){ /*if (tyranids_score<=3) then p_guardsmen[_run]=floor(p_guardsmen[_run]*0.6); if (tyranids_score>=4) then p_guardsmen[_run]=floor(p_guardsmen[_run]*0.5);*/ - var onh;onh=0; + var onh=0; if (tyranids_score=1) and (onh=0){p_guardsmen[_run]-=2000;onh=1;} if (tyranids_score=2) and (onh=0){p_guardsmen[_run]-=30000;onh=1;} if (tyranids_score=3) and (onh=0){p_guardsmen[_run]-=100000;onh=1;} @@ -752,10 +710,19 @@ function scr_enemy_ai_a() { }else if (necrons_attack="guard"){ rand2=(choose(1,2,3,4,5)*guard_score)*choose(1,1.25); if (rand1>rand2){ - if (necrons_score<=3) then p_guardsmen[_run]=floor(p_guardsmen[_run]*0.6); - if (necrons_score>=4) then p_guardsmen[_run]=floor(p_guardsmen[_run]*0.5); - if (necrons_score>=6) then p_guardsmen[_run]=floor(p_guardsmen[_run]*0.2); - if (necrons_score>=4) and (p_guardsmen[_run]<15000) then p_guardsmen[_run]=0; + if (necrons_score<=3){ + p_guardsmen[_run]=floor(p_guardsmen[_run]*0.6); + } + else if (necrons_score>=6){ + p_guardsmen[_run]=floor(p_guardsmen[_run]*0.2); + } + else if (necrons_score>=4){ + if (p_guardsmen[_run]<15000){ + p_guardsmen[_run]=0; + } else { + p_guardsmen[_run]=floor(p_guardsmen[_run]*0.5); + } + } } }else if (necrons_attack="pdf"){ rand2=(choose(1,2,3,4,5)*pdf_score)*choose(1,1.25); @@ -807,7 +774,17 @@ function scr_enemy_ai_a() { p_traitors[_run]=after_combat_traitor; p_chaos[_run]=after_combat_csm; p_necrons[_run]=after_combat_necrons; - if (p_tyranids[_run]>4) then p_tyranids[_run]=after_combat_tyranids; + if (p_tyranids[_run] != after_combat_tyranids){ + p_tyranids[_run] = after_combat_tyranids; + if (_planet_data.has_feature(P_features.Gene_Stealer_Cult)){ + adjust_influence(eFACTION.Tyranids,-min(p_influence[_run][eFACTION.Tyranids]-4, 5),_run); + var _cult = _planet_data.get_features(P_features.Gene_Stealer_Cult)[0]; + if (p_influence[_run][eFACTION.Tyranids]<5){ + _cult.hiding = true; + } + } + } + p_sisters[_run]=after_combat_sisters; @@ -871,113 +848,113 @@ function scr_enemy_ai_a() { } // end repeat here - // quene player battles here - - - // End quene player battles - - - - scr_star_ownership(true); - - - - - // Restock PDF and military - var i; - i = 0; - repeat(planets) { - i += 1; - if (p_type[i] == "Daemon") { - p_heresy[i] = 200; - p_owner[i] = 10; - } - - if (p_population[i] <= 0) and(p_large[i] = 0) and(p_chaos[i] = 0) and(p_traitors[i] = 0) and(p_tau[i] = 0) and(p_type[i] != "Daemon") then p_heresy[i] = 0; - if (p_population[i] < 1) and(p_large[i] = 1) { - p_population[i] = p_population[i] * 100000000; - p_large[i] = 0; - } - - if (p_owner[i] = 2) and(p_type[i] != "Dead") and(planets >= i) and(p_tyranids[i] = 0) and(p_chaos[i] = 0) and(p_traitors[i] = 0) and(p_eldar[i] = 0) and(p_tau[i] = 0) { - var military, pdf, rando, contin; - military = 0; - pdf = 0; - contin = 0; - rando = floor(random(100)) + 1; - - if (p_population[i] >= 10000000) { - military = (p_population[i] / 470); - pdf = floor(military * 0.75); - military = floor(military * 0.25); - } - if (p_population[i] >= 5000000) and(p_population[i] < 10000000) { - military = p_population[i] / 200; - pdf = floor(military * 0.75); - military = floor(military * 0.25); - } - if (p_population[i] >= 100000) and(p_population[i] < 5000000) { - military = p_population[i] / 50; - pdf = floor(military * 0.75); - military = floor(military * 0.25); - } - if (p_large[i] = 1) { - military = military * 1000000000; - pdf = pdf * 1000000000; - } - - if (p_large[i] = 0) and(rando < 50) and(military != 0) and(pdf != 0) { - // if (p_guardsmen[i] 5) and(p_large[i] = 0) { - pdf = floor(p_population[i] / 25); - military = 0; - } - if (p_population[i] < 2000) and(p_population[i] > 5) and(p_large[i] = 0) { - pdf = floor(p_population[i] / 10); - military = 0; - } - - if (p_large[i] = 0) and(rando < 3) { - // if (p_guardsmen[i]= i) and(p_tyranids[i] = 0) and(p_chaos[i] = 0) and(p_traitors[i] = 0) and(p_eldar[i] = 0) and(p_tau[i] = 0) { + var military, pdf, rando, contin; + military = 0; + pdf = 0; + contin = 0; + rando = floor(random(100)) + 1; + + if (p_population[i] >= 10000000) { + military = (p_population[i] / 470); + pdf = floor(military * 0.75); + military = floor(military * 0.25); + } + if (p_population[i] >= 5000000) and(p_population[i] < 10000000) { + military = p_population[i] / 200; + pdf = floor(military * 0.75); + military = floor(military * 0.25); + } + if (p_population[i] >= 100000) and(p_population[i] < 5000000) { + military = p_population[i] / 50; + pdf = floor(military * 0.75); + military = floor(military * 0.25); + } + if (p_large[i] = 1) { + military = military * 1000000000; + pdf = pdf * 1000000000; + } + + if (p_large[i] = 0) and(rando < 50) and(military != 0) and(pdf != 0) { + // if (p_guardsmen[i] 5) and(p_large[i] = 0) { + pdf = floor(p_population[i] / 25); + military = 0; + } + if (p_population[i] < 2000) and(p_population[i] > 5) and(p_large[i] = 0) { + pdf = floor(p_population[i] / 10); + military = 0; + } + + if (p_large[i] = 0) and(rando < 3) { + // if (p_guardsmen[i] 0) { diff --git a/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml b/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml index c73009fe8a..33b4d73bf4 100644 --- a/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml +++ b/scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml @@ -8,113 +8,7 @@ function scr_enemy_ai_c() { with(obj_star){if (craftworld=1) or (space_hulk=1){x-=20000;y-=20000;}} // Orks spread - for (i=1;i<=planets;i++){ - if (!p_orks[i]) then continue; - contin=0; - rando=floor(random(100))+1;// This part handles the spreading - // if (rando<30){ - non_deads = planets_without_type("dead"); - if (array_length(non_deads)>0){ - var ork_spread_planet = non_deads[irandom(array_length(non_deads)-1)]; - - var spread_orks = !((p_owner[i]!=7) or (p_pdf[i]>0) or (p_guardsmen[i]>0) or (p_traitors[i]>0) or (p_tau[i]>0) or (p_orks[i]<3) or (p_player[i]>0)); - if (spread_orks){ - if (p_orks[i]<5 && p_orks[ork_spread_planet]<2) then p_orks[ork_spread_planet]++; - if (p_orks[i]>4 && p_orks[ork_spread_planet]<3){ - p_orks[ork_spread_planet]++; - if (p_orks[ork_spread_planet]<3){ - p_orks[ork_spread_planet]++; - p_orks[i]--; - } - - } - - } - } - contin=0; - rando=floor(random(100))+1;// This part handles the ship building - if (p_population[i]>0) and (p_pdf[i]=0) and (p_guardsmen[i]=0) and (p_traitors[i]=0) and (p_tau[i]=0) and (p_large[i]=0) then p_population[i]=round(p_population[i]*0.97); - if (p_population[i]>0) and (p_pdf[i]=0) and (p_guardsmen[i]=0) and (p_traitors[i]=0) and (p_tau[i]=0) and (p_large[i]=1) then p_population[i]-=0.01; - // ^ And extermination - - var enemies_present=false; - for (var n=0;n=1) and ((p_pdf[plan]>0) or (p_guardsmen[plan]>0) or (p_traitors[plan]>0) or (p_tau[plan]>0)) then enemies_present=true; - } - //What is the point of this? - if (owner = eFACTION.Ork){ - contin=1; - } - - if (contin=1 && !enemies_present){ - rando=floor(random(100))+1; - if (obj_controller.known[eFACTION.Ork]>0) then rando-=10;// Empire bonus, was 15 before - - // Check for industrial facilities - if (p_type[i]!="Dead") and (p_type[i]!="Lava"){// Used to not have Ice either - if (p_orks[i]>=4){// Have the proppa facilities and size - fleet=0; - contin=2; - if (instance_number(obj_en_fleet)==0) then contin=3; - if (instance_number(obj_en_fleet)>0) then contin=2; - - if (instance_exists(obj_p_fleet)){ - var ppp=instance_nearest(x,y,obj_p_fleet); - if (point_distance(x,y,ppp.x,ppp.y)<50) and (ppp.action="") then contin=0; - } - if (contin==2){ - var ork_fleet = 0; - var oriting_name = name; - var fleet_loop =true; - var _instance_count=0; - var _instance_numer = instance_number(obj_en_fleet); - while (fleet_loop){ - var loop_fleet = instance_nearest(x,y, obj_en_fleet); - with (loop_fleet){ - if (instance_nearest(x,y,obj_star).name==oriting_name){ - if (owner==eFACTION.Ork && action==""){ - ork_fleet=self; - fleet_loop=false; - } else{ - instance_deactivate_object(id); - } - } else { - fleet_loop=false; - } - } - _instance_count++; - if (_instance_count>_instance_numer) then break; - } - instance_activate_object(obj_en_fleet); - if (instance_exists(ork_fleet)) { - var star_id=self.id; - with (ork_fleet){ - build_new_ork_ships_to_fleet(star_id, i); - } - } else { - if (rando<=25){ - new_ork_fleet(x,y); - } - } - } - if (contin=3) and (rando<=25){// Create a fleet - // fleet=instance_create - new_ork_fleet(x,y); - } - /*if (fleet!=0){ - if (instance_exists(fleet)) then with(fleet){ - var ii;ii=0;ii+=capital_number;ii+=round((frigate_number/2));ii+=round((escort_number/4)); - if (ii<=1) then ii=1;image_index=ii; - } - }*/ - } - } - - } - } - - + orks_end_turn_growth(); // traitors below here @@ -279,11 +173,16 @@ function scr_enemy_ai_c() { var aler=0; if (present_fleet[10]>0) and (present_fleet[1]+present_fleet[2]=0) and (boat!="none") and (planets>0) { - var ii,gud;ii=0;gud=0; - repeat(planets){ii+=1;if (gud=0){if (planets>=ii) and (p_type[ii]!="Dead") and (p_owner[ii]!=10) then gud=ii;}} + var ii=0,gud=0; + repeat(planets){ + ii+=1; + if (gud=0){ + if (planets>=ii) and (p_type[ii]!="Dead") and (p_owner[ii]!=10) then gud=ii; + } + } if (gud!=0) and (instance_exists(boat)){ - if (boat.trade_goods="csm"){ + if (fleet_has_cargo("csm", boat)){ if (p_chaos[gud]<4){ p_chaos[gud]+=max(1,floor(boat.image_index*0.5)); if (p_chaos[gud]>4) then p_chaos[gud]=4; diff --git a/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml b/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml index 1e8a0c05b2..974fb2790c 100644 --- a/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml +++ b/scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml @@ -1,5 +1,5 @@ function scr_enemy_ai_d() { - + if (x<-15000){x+=20000;y+=20000;} if (x<-15000){x+=20000;y+=20000;} if (x<-15000){x+=20000;y+=20000;} @@ -201,25 +201,26 @@ function scr_enemy_ai_d() { //TODO marker point for cohesion mechanics var alert_text=""; var unit; - if (ran>33){// Give all marines +3d6 corruption and reduce loyalty by 20*/ + if (irandom(100)>33){// Give all marines +3d6 corruption and reduce loyalty by 20*/ var me=0; for (var co=0;co<=obj_ini.companies;co++){ me=0; for (me=0;me-1){ @@ -405,16 +406,20 @@ function scr_enemy_ai_d() { break; } - if ((p_owner[r]==eFACTION.Imperium) or (p_owner[r]==eFACTION.Ecclesiarchy)) and (p_type[r]!="Lava") and (p_type[r]!="Hive") and (p_type[r]!="Temperate") then array_push(non_priority_requests, r); + if ((p_owner[r]==eFACTION.Imperium) or (p_owner[r]==eFACTION.Ecclesiarchy)){ + array_push(non_priority_requests, r); + } } } - if (array_length(pop_doner_options)>0 && array_length(non_priority_requests) && array_length(priority_requests)){ + if (array_length(pop_doner_options)>0 && (array_length(non_priority_requests) || array_length(priority_requests))){ var onceh=0; var random_chance=floor(random(100))+1; var doner_index = 0; + // TODO check possible fixes for this logic + // currently this only calculates for priority requests for pops for(var i=1;i 0) { obj_controller.temp[1049] = self.id; obj_controller.temp[1050] = f; - + var _orbiting = self.id; + var _wanted_owner = f; + var fleet_strength = 0; with(obj_en_fleet) { - if (orbiting = obj_controller.temp[1049]) and(owner = obj_controller.temp[1050]) { - obj_controller.temp[1051] = self.escort_number + (self.frigate_number * 4) + (self.capital_number * 8); + if (orbiting = _orbiting) and(owner = _wanted_owner) { + fleet_strength = self.escort_number + (self.frigate_number * 4) + (self.capital_number * 8); + if (owner == fleet_has_cargo("ork_warboss")){ + fleet_strength*=1.5; + } } } - strength[f] = obj_controller.temp[1051]; + strength[f] = fleet_strength; - if (f = 7) and(strength[7] > 0) then strength[f] = strength[f] * 0.8; - if (f = 9) and(strength[9] > 0) then strength[f] = strength[f] * 1.1; - if (f = 10) and(strength[10] > 0) then strength[f] = strength[f] * 1.1; - if (f = 11) and(strength[13] > 0) then strength[13] = strength[13] * 2; + if (f = 7) and(strength[7] > 0){ + strength[f] = strength[f] * 0.8; + } + else if (f = 9) and(strength[9] > 0){ + strength[f] = strength[f] * 1.1; + } + else if (f = 10) and(strength[10] > 0){ + strength[f] = strength[f] * 1.1; + } + else if (f = 11) and(strength[13] > 0){ + strength[13] = strength[13] * 2; + } // if (f=10) or (f=2) then show_message("["+string(f)+"] Fleet strength: "+string(strength[f])); @@ -403,7 +416,7 @@ function scr_enemy_ai_e() { } with(obj_en_fleet) { if (action = "") and(orbiting = obj_controller.temp[1049]) and(owner = 10) { - if (string_count("Khorne_warband", trade_goods) > 0) then instance_create(x, y, obj_temp2); + if (string_count("warband", trade_goods) > 0) then instance_create(x, y, obj_temp2); if (string_lower(trade_goods) = "csm") then instance_create(x, y, obj_temp3); } } @@ -502,19 +515,9 @@ function scr_enemy_ai_e() { } } } - } - if (p_player[run] > 0 && has_problem_planet(run,"necron")) { - log_message($"player on planet with necron mission {name} planet: {run}") - var have_bomb; - have_bomb = scr_check_equip("Plasma Bomb", name, run, 0); - log_message($"have bomb? {have_bomb} ") - if (have_bomb > 0) { - var tixt; - tixt = "Your marines on " + planet_numeral_name(run); - tixt += " are prepared and ready to enter the Necron Tombs. A Plasma Bomb is in tow."; - scr_popup("Necron Tomb Excursion", tixt, "necron_cave", "blarg|" + string(name) + "|" + string(run) + "|999|"); - } + if (p_player[run] > 0 && has_problem_planet(run,"necron")){ + setup_necron_tomb_raid(run); } if (p_player[run] > 0) and(force_count > 0) { for (force = 2; force < 14; force++) { @@ -699,9 +702,10 @@ function scr_enemy_ai_e() { repeat(200) { i += 1; good = 0; - if (obj_ini.role[co, i] != "") and(obj_ini.loc[co, i] = name) and(obj_ini.TTRP[co, i].planet_location == floor(chaos_meeting)) then good += 1; - if (obj_ini.role[co, i] != obj_ini.role[100, 6]) and(obj_ini.role[co, i] != "Venerable " + string(obj_ini.role[100, 6])) then good += 1; - if (string_count("Dread", obj_ini.armour[co, i]) = 0) or(obj_ini.role[co, i] == obj_ini.role[100][eROLE.ChapterMaster]) then good += 1; + var _unit = fetch_unit([co,i]); + if (_unit.role() != "" && _unit.location_string = name) and(_unit.planet_location == floor(chaos_meeting)) then good += 1; + if (_unit.role() != obj_ini.role[100, 6]) and(_unit.role() != "Venerable " + string(obj_ini.role[100, 6])) then good += 1; + if (string_count("Dread", obj_ini.armour[co, i]) = 0) or(_unit.role() == obj_ini.role[100][eROLE.ChapterMaster]) then good += 1; if (good = 3) { obj_temp_meeting.dudes += 1; @@ -709,7 +713,7 @@ function scr_enemy_ai_e() { obj_temp_meeting.present[otm] = 1; obj_temp_meeting.co[otm] = co; obj_temp_meeting.ide[otm] = i; - if (obj_ini.role[co, i] == obj_ini.role[100][eROLE.ChapterMaster]) then master_present = 1; + if (_unit.role() == obj_ini.role[100][eROLE.ChapterMaster]) then master_present = 1; } } } diff --git a/scripts/scr_equipment_struct/scr_equipment_struct.gml b/scripts/scr_equipment_struct/scr_equipment_struct.gml index b4b673d841..c14be36dd0 100644 --- a/scripts/scr_equipment_struct/scr_equipment_struct.gml +++ b/scripts/scr_equipment_struct/scr_equipment_struct.gml @@ -1,6 +1,34 @@ -function EquipmentStruct(item_data, core_type, quality_request = "none") constructor { +global.tag_maintenance_values = { + "heavy_ranged" : 0.5, + "power" : 0.5, + "ancient" : 1.0, + "plasma" : 0.8, + "melta" : 0.8, + "las" : 0.1, + "bolt" : 0.01, + "chain" : 0.01, + "flame" : 0.02, + "xenos" : 1, + "dreadnought" : 0.6, + "vehicle" : 0.4, + "terminator" : 0.6, +} + +global.tag_recovery_values = { + "terminator" : 30, +}; + +function EquipmentStruct(item_data, core_type, quality_request = "none", arti_struct = -1) constructor { type = core_type; + if (is_real(arti_struct) && arti_struct > -1) { + is_artifact = true; + artifact_id = arti_struct; + } else { + is_artifact = false; + } + artifact_id = arti_struct; + // Struct defaults; hp_mod = 0; description = ""; @@ -24,6 +52,7 @@ function EquipmentStruct(item_data, core_type, quality_request = "none") constru req_exp = 0; maintenance = 0; specials = ""; + recovery_chance = 0; quality = quality_request == "none" ? "standard" : quality_request; // Struct defaults end; @@ -45,9 +74,22 @@ function EquipmentStruct(item_data, core_type, quality_request = "none") constru // Placeholder maintenance values; if (maintenance == 0) { - if (has_tags(["heavy_ranged", "power", "plasma", "melta"])) { - maintenance = 0.05; + var _maintenance_names = struct_get_names(global.tag_maintenance_values); + for (var i=0;i 0) { - array_push(special_properties_array, "Armour Piercing"); - } else if (arp < 0) { - array_push(special_properties_array, "Low Penetration"); + if (arp=4){ + array_push(special_properties_array, "Anti Vehicle") + } + else if (arp=1){ + array_push(special_properties_array, "Low Penetration") + } + else if (arp=2){ + array_push(special_properties_array, "Medium Penetration") + } + else if (arp=3){ + array_push(special_properties_array, "High Penetration") } if (array_length(second_profiles) > 0) { for (var h = 0; h < array_length(second_profiles); h++) { @@ -316,7 +365,8 @@ function EquipmentStruct(item_data, core_type, quality_request = "none") constru }; } -function gear_weapon_data(search_area = "any", item, wanted_data = "all", sub_class = false, quality_request = "standard") { +/// @param {string} search_area possible values: "any", "weapon", "gear", "armour", "mobility" +function gear_weapon_data(search_area = "any", item, wanted_data = "all", sub_class = false, quality_request = "standard", arti_struct = -1) { var item_data_set = false; var equip_area = false; gear_areas = ["gear", "armour", "mobility"]; @@ -356,7 +406,7 @@ function gear_weapon_data(search_area = "any", item, wanted_data = "all", sub_cl if (is_struct(item_data_set)) { if (wanted_data == "all") { item_data_set.name = item; - return new EquipmentStruct(item_data_set, search_area, quality_request); + return new EquipmentStruct(item_data_set, search_area, quality_request, arti_struct); } if (struct_exists(item_data_set, wanted_data)) { if (is_struct(item_data_set[$ wanted_data])) { @@ -394,23 +444,29 @@ function quality_string_conversion(quality_request) { } } +function gen_item_tooltip(item){ + var _tooltip = ""; + var _equip_data=gear_weapon_data("any", item); + + if (is_struct(_equip_data)){ + _tooltip=$"{_equip_data.item_tooltip_desc_gen()}"; + } + + return _tooltip; +} + function quality_color(_item_quality) { switch (_item_quality) { case "standard": return draw_get_color(); - break; case "master_crafted": return #bf9340; - break; case "artificer": return #bf4040; - break; case "artifact": return #40bfbf; - break; case "exemplary": return #80bf40; - break; } } diff --git a/scripts/scr_event_code/scr_event_code.gml b/scripts/scr_event_code/scr_event_code.gml new file mode 100644 index 0000000000..35bf476edc --- /dev/null +++ b/scripts/scr_event_code/scr_event_code.gml @@ -0,0 +1,460 @@ + + +function add_event(event_data){ + var _inserted = false; + if (!struct_exists(event_data,"duration")){ + event_data.duration = 1; + } + for (var i=0;i= event_data.duration){ + array_insert(obj_controller.event, i, event_data); + _inserted = true; + break; + } + } + if (!_inserted){ + array_push(obj_controller.event, event_data); + } +} + +function find_event(e_id){ + var _event_found = -1; + for (var i=0;i= 0; i--){ + var _event = event[i]; + if (_event.e_id=="" || _event.duration<0){ + array_delete(event, i, 1); + continue; + } + + _event.duration-=1; + + if (_event.duration==0){ + if (_event.e_id=="game_over_man"){ + obj_controller.alarm[8]=1; + } + // Removes planetary governor installed by the chapter + if (_event.e_id == "remove_surf"){ + + var _star_name = _event.system; + var _event_star = star_by_name(_event.system); + var _planet = _event.planet; + if (_event_star!="none"){ + _event_star.dispo[_planet]=-10;// Resets + var twix=$"Inquisition executes Chapter Serf in control of {pllanet_numera_name(planet, _event_star)} and installs a new Planetary Governor."; + if (_event_star.p_owner[_planet]=eFACTION.Player){ + _event_star.p_owner[_planet]=_event_star.p_first[_planet]; + } + scr_alert("","",twix,0,0); + scr_event_log("",twix, _star_name); + } + } + // Changes relation to good + else if (_event.e_id=="enemy_imperium"){ + scr_alert("green","enemy","You have made amends with your enemy in the Imperium.",0,0); + disposition[eFACTION.Imperium]+=20; + scr_event_log("","Amends made with Imperium."); + } + else if (_event.e_id=="enemy_mechanicus"){ + scr_alert("green","enemy","You have made amends with your Mechanicus enemy.",0,0); + disposition[eFACTION.Mechanicus]+=20; + scr_event_log("","Amends made with Mechanicus enemy."); + } + else if (_event.e_id=="enemy_inquisition"){ + scr_alert("green","enemy","You have made amends with your enemy in the Inquisition.",0,0); + disposition[eFACTION.Inquisition]+=20; + scr_event_log("","Amends made with Inquisition enemy."); + } + else if (_event.e_id=="enemy_ecclesiarchy"){ + scr_alert("green","enemy","You have made amends with your enemy in the Ecclesiarchy.",0,0); + disposition[eFACTION.Ecclesiarchy]+=20; + scr_event_log("","Amends made with Ecclesiarchy enemy."); + } + // Sector commander losses its mind + else if (_event.e_id=="imperium_daemon"){ + var alert_string = $"Sector Commander {faction_leader[eFACTION.Imperium]} has gone insane." + scr_alert("red","lol",alert_string,0,0); + faction_defeated[eFACTION.Imperium]=1; + scr_event_log("red",alert_string); + } + // Starts chaos invasion + if (_event.e_id=="chaos_invasion"){ + var xx=0,yy=0,flee=0,dirr=0; + var star_id = scr_random_find(1,true,"",""); + if(star_id != undefined){ + scr_event_log("purple",$"Chaos Fleets exit the warp near the {star_id.name} system.", star_id.name); + for(var j=0; j<4; j++){ + dirr+=irandom_range(50,100); + xx=star_id.x+lengthdir_x(72,dirr); + yy=star_id.y+lengthdir_y(72,dirr); + flee=instance_create(xx,yy,obj_en_fleet); + flee.owner=eFACTION.Chaos; + flee.sprite_index=spr_fleet_chaos; + flee.image_index=4; + flee.capital_number=choose(0,1); + flee.frigate_number=choose(2,3); + flee.escort_number=choose(4,5,6); + flee.cargo_data.csm = true; + obj_controller.chaos_fleets+=1; + flee.action_x=star_id.x; + flee.action_y=star_id.y; + with(flee){ + set_fleet_movement(); + } + } + } + } + // Ships construction + if (_event.e_id == "ship_construction"){ + var new_ship_event=_event.ship_class; + var active_forges = []; + var chosen_star = false; + with(obj_star){ + if (owner==eFACTION.Mechanicus){ + for (f=1;f<=planets;f++){ + if (p_type[f]=="Forge") and (p_owner[f]==eFACTION.Mechanicus){ + array_push(active_forges,new PlanetData(f, self)); + } + } + } + } + if (array_length(active_forges)>0){ + var ship_spawn = active_forges[irandom(array_length(active_forges)-1)]; + var _new_player_fleet=instance_create(ship_spawn.system.x,ship_spawn.system.y,obj_p_fleet); + + // Creates the ship + var last_ship = new_player_ship(new_ship_event, ship_spawn.system.name); + + add_ship_to_fleet(last_ship, _new_player_fleet) + + // show_message(string(obj_ini.ship_class[last_ship])+":"+string(obj_ini.ship[last_ship])); + + if (obj_ini.ship_size[last_ship]!=1) then scr_popup("Ship Constructed",$"Your new {obj_ini.ship_class[last_ship]} '{obj_ini.ship[last_ship]}' has finished being constructed. It is orbiting {ship_spawn.system.name} and awaits its maiden voyage.","shipyard",""); + if (obj_ini.ship_size[last_ship]==1) then scr_popup("Ship Constructed",$"Your new {obj_ini.ship_class[last_ship]} Escort '{obj_ini.ship[last_ship]}' has finished being constructed. It is orbiting {ship_spawn.system.name} and awaits its maiden voyage.","shipyard",""); + var bob=instance_create(ship_spawn.system.x+16,ship_spawn.system.y-24,obj_star_event); + bob.image_alpha=1; + bob.image_speed=1; + } + if (array_length(active_forges)==0){ + _event.duration=2; + scr_popup("Ship Construction halted",$"A lack of suitable forge worlds in the system has halted construction of your requested ship","shipyard",""); + } + } + // Spare the inquisitor + if (_event.e_id == "inquisitor_spared"){ + hunt_inquisition_spared_inquisitor_consequence(_event); + } + + if (_event.e_id == "strange_building"){ + + var marine_name=_event.name; + var comp=_event.company; + var marine_num=_event.marine; + var _unit=fetch_unit([marine_num,comp]); + var item=_event.crafted; + + var killy=0,tixt=$"{obj_ini.role[100][16]} {marine_name} has finished his work- "; + + if (item=="Icon"){ + tixt+=$"it is a {global.chapter_name} Icon wrought in metal, finely decorated. Pride for his chapter seems to have overtaken him. There are no corrections to be made and the item is placed where many may view it."; + } + if (item=="Statue"){ + tixt+="it is a small, finely crafted statue wrought in metal. The "+string(obj_ini.role[100][16])+" is scolded for the waste of material, but none daresay the quality of the piece."; + } + if (item=="Bike"){ + scr_add_item("Bike",1); + tixt+="it is a finely crafted Bike, conforming mostly to STC standards. The other "+string(obj_ini.role[100][16])+" are surprised at the rapid pace of his work."; + } + if (item=="Rhino"){ + scr_add_vehicle("Rhino",0,{},"Storm Bolter","Storm Bolter","","Artificer Hull","Dozer Blades"); + tixt+="it is a finely crafted Rhino, conforming to STC standards. The other "+string(obj_ini.role[100][16])+" are surprised at the rapid pace of his work."; + } + if (item=="Artifact"){ + scr_event_log("",string(obj_ini.role[100][16])+" "+string(marine_name)+" constructs an Artifact."); + var _last_artifact = scr_add_artifact("random_nodemon","",0); + + tixt+=$"some form of divine inspiration has seemed to have taken hold of him. An artifact {obj_ini.artifact[_last_artifact]} has been crafted."; + } + if (item=="baby"){ + _unit.edit_corruption(choose(8,12,16,20)) + tixt+="some form of horrendous statue. A weird amalgram of limbs and tentacles, the sheer atrocity of it is made worse by the tiny, baby-like form, the once natural shape of a human child twisted nearly beyond recognition."; + } + else if (item=="robot"){ + _unit.edit_corruption(choose(2,4,6,8,10)); + tixt+=$"some form of small, box-like robot. It seems to teeter around haphazardly, nearly falling over with each step. {_unit.name()} maintains that it has no AI, though the other "+string(obj_ini.role[100][16])+" express skepticism."; + _unit.add_trait("tech_heretic"); + } + else if (item=="demon"){ + _unit.edit_corruption(choose(8,12,16,20)); + tixt+="some form of horrendous statue. What was meant to be some sort of angel, or primarch, instead has a mishappen face that is hardly human in nature. Between the fetid, ragged feathers and empty sockets it is truly blasphemous."; + _unit.add_trait("tech_heretic"); + } + else if (item=="fusion"){ + //TODO if tech heretic chosen don't kill the dude + // _unit.corruption+=choose(70); + tixt+=$"some kind of ill-mannered ascension. One of your battle-brothers enters the armamentarium to find {marine_name} fused to a vehicle, his flesh twisted and submerged into the frame. Mechendrites and weapons fire upon the marine without warning, a windy scream eminating from the abomination. It takes several battle-brothers to take out what was once a "+string(obj_ini.role[100][16])+"."; + + // This is causing the problem + + scr_kill_unit(comp,marine_num) + with(obj_ini){scr_company_order(0);} + } + if (item != "fusion"){ + var options = [ + { + str1:"Execute the heretic", + choice_func : function(){ + scr_kill_unit(pop_data.company, pop_data.marine_number); + var company_to_order = pop_data.company; + with (obj_ini) { + scr_company_order(company_to_order); + } + popup_default_close(); + } + }, + { + str1:"Move him to the Penitorium", + choice_func : function(){ + popup_default_close(); + } + }, + { + str1 : "I see no problem", + choice_func : popup_default_close, + } + ] + var _pop_data = { + options:options, + marine_number : marine_num, + company :comp, + marine_name : marine_name, + } + } else { + _pop_data = ""; + } + + scr_popup("He Built It",tixt,"tech_build",_pop_data); + } + if (_event.duration<=0){ + array_delete(event, i ,1); + continue; + } + } + } +} + +function handle_discovered_governor_assasinations(){ + for (var i=0;i 1){ + break; + } + if (_event.e_id != "governor_assassination"){ + continue; + } + if (_event.duration == 1 && obj_controller.faction_status[eFACTION.Imperium]!="War"){ + var _disp_hit = _event.variant == 1 ? 2 : 4; + with(obj_star){ + for (var o=1;o<=planets;o++){ + if (p_owner == eFACTION.Imperium){ + if (dispo[o]>0) and (dispo[o]<90){ + dispo[o]=max(dispo[o]-_disp_hit,0); + } + } + } + } + if (_event.variant == 1){ + alter_dispositions([ + [eFACTION.Imperium, -7], + [eFACTION.Inquisition, -10], + [eFACTION.Ecclesiarchy, -5], + ]); + + if (obj_controller.disposition[4]>0 && obj_controller.disposition[2]>0){ + _event.e_id = "assassination_angryish"; + } + } else if (_event.variant == 2){ + alter_disposition(eFACTION.Inquisition, -3); + if (obj_controller.disposition[4]>0&& obj_controller.disposition[2]>0){ + _event.e_id = "assassination_angry"; + } + } + + if (obj_controller.disposition[4]<=0) or (obj_controller.disposition[2]<=0){ + obj_controller.alarm[8]=1; + } else{ + scr_audience(4,_event.e_id,0,"",0,0,_event); + } + } + } +} + +function strange_build_event(){ + log_message("RE: Fey Mood"); + var _search_params = {trait : ["crafter","tinkerer"], trait_any : true} + var marine_and_company = scr_random_marine("",0, _search_params); + if (marine_and_company == "none"){ + marine_and_company = scr_random_marine("",0, "none"); + } + if(marine_and_company != "none"){ + var marine = marine_and_company[0]; + var company = marine_and_company[1]; + var text=""; + var _unit = fetch_unit(marine_and_company); + var role = _unit.role(); + text = _unit.name_role(); + text+=" is taken by a strange mood and starts building!"; + + + var crafted_object; + var craft_roll=roll_dice_chapter(1, 100, "low"); + var heritical_item = false; + + //this bit should be improved, idk what duke was checking for here + //TODO make craft chance reflective of crafters skill, rewards players for having skilled tech area + if (scr_has_disadv("Tech-Heresy")) { + craft_roll+=20; + } + if (_unit.has_trait("tech_heretic")){ + craft_roll+=60; + } + if (scr_has_adv("Crafter")) { + if (craft_roll>80) { + craft_roll-=10; + } + if (craft_roll<60) { + craft_roll+=10; + } + } + + if (craft_roll<=50){ + crafted_object=choose("Icon","Icon","Statue"); + } + else if ((craft_roll>50) && (craft_roll<=60)) { + crafted_object=choose("Bike","Rhino"); + } + else if ((craft_roll>60) && (craft_roll<=80)) { + crafted_object="Artifact"; + } + else { + crafted_object=choose("baby","robot","demon","fusion"); + heritical_item=1; + } + + + add_event({ + e_id : "strange_building", + duration : 1, + name : _unit.name(), + company : company, + marine : marine, + crafted : crafted_object, + }) + + scr_popup("Can He Build marine?!?",text,"tech_build",""); + + var marine_is_planetside = _unit.planet_location>0; + if (marine_is_planetside && heritical_item) { + var _system = star_by_name(_unit.location_string); + var _planet = _unit.planet_location; + if (_system!="none"){ + with (_system){ + p_hurssy[_planet]+=6; + p_hurssy_time[_planet]=2; + } + } + } + else if (!marine_is_planetside and heritical_item){ + var _fleet = find_ships_fleet(_unit.ship_location); + if (_fleet!="none"){ + //the intended code for here was to add some sort of chaos event on the ship stashed up ready to fire in a few turns + } + } + return true; + } + return false; +} +function make_faction_enemy_event(){ + log_message("RE: Enemy"); + + var factions = []; + if(obj_controller.known[eFACTION.Imperium] == 1){ + array_push(factions,2); + } + if(obj_controller.known[eFACTION.Mechanicus] == 1){ + array_push(factions,3); + } + if(obj_controller.known[eFACTION.Inquisition] == 1){ + array_push(factions,4); + } + if(obj_controller.known[eFACTION.Ecclesiarchy] == 1){ + array_push(factions,5); + } + + if(array_length(factions) == 0){ + log_error("RE: Enemy, no faction could be chosen"); + exit; + } + var chosen_faction = array_random_element(factions); + + var text = "You have made an enemy within the "; + var log = "An enemy has been made within the "; + var _e_name = ""; + switch(chosen_faction) { + case 2: + _e_name="enemy_imperium"; + text += "Imperium"; + log += "Imperium"; + break; + case 3: + _e_name="enemy_mechanicus"; + text += "Mechanicus"; + log += "Mechanicus"; + break; + case 4: + _e_name="enemy_inquisition"; + text += "Inquisition"; + log += "Inquisition"; + break; + case 5: + _e_name="enemy_ecclesiarchy"; + text += "Ecclesiarchy"; + log += "Ecclesiarchy"; + break; + default: + log_error("RE: Enemy, no faction could be chosen"); + exit; + } + if (_e_name != ""){ + add_event({ + duration : irandom_range(12,96), + e_id : _e_name, + }) + alter_disposition(chosen_faction, -20) + text +="; relations with them will be soured for the forseable future."; + scr_popup("Diplomatic Incident",text,"angry",""); + scr_event_log("red",string(log)); + return true; + } + return false; +} + + +function event_dispose_of_mutated_gene(){ + if (pop_data.percent_remove > 0){ + obj_controller.gene_seed -= (obj_controller.gene_seed * (pop_data.percent_remove/100)) + } + popup_default_close(); +} \ No newline at end of file diff --git a/scripts/scr_event_code/scr_event_code.yy b/scripts/scr_event_code/scr_event_code.yy new file mode 100644 index 0000000000..7ea9d41e5d --- /dev/null +++ b/scripts/scr_event_code/scr_event_code.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_event_code", + "isCompatibility":false, + "isDnD":false, + "name":"scr_event_code", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_event_dudes/scr_event_dudes.gml b/scripts/scr_event_dudes/scr_event_dudes.gml index 95b18911e2..57a028deeb 100644 --- a/scripts/scr_event_dudes/scr_event_dudes.gml +++ b/scripts/scr_event_dudes/scr_event_dudes.gml @@ -35,7 +35,7 @@ function scr_event_dudes(do_action, is_planet, system_name, location_id) { if (is_planet=0) and (unit.ship_location=location_id){ if (obj_ini.race[coh,ide]=1) or (obj_ini.race[coh,ide]=5) then adding=true; } - else if (is_planet=1) and (obj_ini.loc[coh,ide]=system_name) and (unit.planet_location==location_id){ + else if (is_planet=1) and (unit.location_string=system_name) and (unit.planet_location==location_id){ if (obj_ini.race[coh,ide]=1) or (obj_ini.race[coh,ide]=5) then adding=true; } diff --git a/scripts/scr_flavor/scr_flavor.gml b/scripts/scr_flavor/scr_flavor.gml index 82980dd773..39359363ad 100644 --- a/scripts/scr_flavor/scr_flavor.gml +++ b/scripts/scr_flavor/scr_flavor.gml @@ -54,21 +54,21 @@ function scr_flavor(id_of_attacking_weapons, target, target_type, number_of_shot unit_name = "", cm_kill = 0; - // I don't understand how this part of code works, nor how it should work, but it doesn't seem to be working properly. - // if (id_of_attacking_weapons > 0) { - // if (array_length(wep_solo[id_of_attacking_weapons]) > 0) { - // character_shot = true; - // full_names = wep_solo[id_of_attacking_weapons]; - // if (wep_title[id_of_attacking_weapons] != "") { - // if (array_length(full_names) == 1) { - // unit_name = wep_title[id_of_attacking_weapons] + " " + wep_solo[id_of_attacking_weapons][0]; - // } else { - // unit_name = wep_title[id_of_attacking_weapons] + "'s" - // } - // } - // if (wep_solo[id_of_attacking_weapons][0] == obj_ini.master_name) then cm_kill = 1; - // } - // } + + if (id_of_attacking_weapons > 0) { + if (array_length(wep_solo[id_of_attacking_weapons]) > 0) { + character_shot = true; + full_names = wep_solo[id_of_attacking_weapons]; + if (wep_title[id_of_attacking_weapons] != "") { + if (array_length(full_names) == 1) { + unit_name = wep_title[id_of_attacking_weapons] + " " + wep_solo[id_of_attacking_weapons][0]; + } else { + unit_name = wep_title[id_of_attacking_weapons] + "'s" + } + } + if (wep_solo[id_of_attacking_weapons][0] == obj_ini.master_name) then cm_kill = 1; + } + } if (obj_ncombat.battle_special = "WL10_reveal") or (obj_ncombat.battle_special = "WL10_later") { if (target_name = "Veteran Chaos Terminator") and (target_name > 0) then obj_ncombat.chaos_angry += casulties * 2; diff --git a/scripts/scr_flavor2/scr_flavor2.gml b/scripts/scr_flavor2/scr_flavor2.gml index 1f37791a76..f19fc51419 100644 --- a/scripts/scr_flavor2/scr_flavor2.gml +++ b/scripts/scr_flavor2/scr_flavor2.gml @@ -203,10 +203,9 @@ function scr_flavor2(lost_units_count, target_type, hostile_range, hostile_weapo if (ranz = 2) then m1 = string(_hostile_shots) + " " + string(_hostile_weapon) + "z are clamped onto " + string(target_type) + ". "; if (ranz = 3) then m1 = string(_hostile_shots) + " " + string(_hostile_weapon) + "z are flung into " + string(target_type) + ". "; } - if (_hostile_weapon = "Melee1") and(enemy = 7) { + if (_hostile_weapon == "Melee1") and (enemy == eFACTION.Ork) { flavor = 1; - var ranz; - ranz = choose(1, 2, 3); + var ranz = choose(1, 2, 3); if (ranz = 1) then m1 = string(_hostile_shots) + " Orks club and smash at " + string(target_type) + ". "; if (ranz = 2) then m1 = string(_hostile_shots) + " Orks shoot their Slugas and smash gunbarrels into " + string(target_type) + ". "; if (ranz = 3) then m1 = string(_hostile_shots) + " Orks claw and punch at " + string(target_type) + ". "; @@ -260,13 +259,13 @@ function scr_flavor2(lost_units_count, target_type, hostile_range, hostile_weapo flavor = true; if (_hostile_shots == 1) { if (lost_units_count == 0) { - m1 += $"{_hostile_weapon} strikes at {target_type}, but fails to inflict any damage."; + m1 += $"{_hostile_weapon} strikes at {target_type}, no casualties."; } else { m1 += $"{_hostile_weapon} strikes at {target_type}. "; } } else { if (lost_units_count == 0) { - m1 += $"{_hostile_shots} {_hostile_weapon}s strike at {target_type}, but fail to inflict any damage."; + m1 += $"{_hostile_shots} {_hostile_weapon}s strike at {target_type}, no casualties."; } else { m1 += $"{_hostile_shots} {_hostile_weapon}s strike at {target_type}. "; } @@ -336,15 +335,17 @@ function scr_flavor2(lost_units_count, target_type, hostile_range, hostile_weapo if (him != -1) { // found a valid unit obj_ncombat.dead_jims += 1; if (marine_type[him] == obj_ini.role[100][5]) { - obj_ncombat.dead_jim[obj_ncombat.dead_jims] = $"A {marine_type[him]} has been critically injured!"; + obj_ncombat.dead_jim[obj_ncombat.dead_jims] = $"A {marine_type[him]} has been lost!"; } else { - obj_ncombat.dead_jim[obj_ncombat.dead_jims] = $"{unit_struct[him].name_role()} has been critically injured!"; + obj_ncombat.dead_jim[obj_ncombat.dead_jims] = $"{unit_struct[him].name_role()} has been lost!"; } } } } } + lost = []; + lost_num = []; var unce = 0; @@ -355,7 +356,7 @@ function scr_flavor2(lost_units_count, target_type, hostile_range, hostile_weapo var lis, y1, y2; lis = string_rpos(", ", m2); m2 = string_delete(m2, lis, 3); // This clears the last ', ' and replaces it with the end statement - if (lost_units_count > 0) then m2 += " critically damaged."; + if (lost_units_count > 0) then m2 += " lost."; // show_message(m2); @@ -376,7 +377,7 @@ function scr_flavor2(lost_units_count, target_type, hostile_range, hostile_weapo var lis, y1, y2; lis = string_rpos(", ", m2); m2 = string_delete(m2, lis, 3); - if (lost_units_count > 0) then m2 += " critically damaged."; + if (lost_units_count > 0) then m2 += " lost."; } if (string_count(", ", m2) = 1) and(unce = 0) and(hostile_weapon = "Web Spinner") { var lis, y1, y2; diff --git a/scripts/scr_fleet_functions/scr_fleet_functions.gml b/scripts/scr_fleet_functions/scr_fleet_functions.gml index 377d79ed39..d64ab26d71 100644 --- a/scripts/scr_fleet_functions/scr_fleet_functions.gml +++ b/scripts/scr_fleet_functions/scr_fleet_functions.gml @@ -124,22 +124,28 @@ function get_largest_player_fleet(){ return chosen_fleet; } -function is_orbiting(){ - if (action != "") then return false; - try { - var nearest = instance_nearest(x,y,obj_star); - if (point_distance(x,y,nearest.x, nearest.y)<10 && nearest.name != ""){ - orbiting = nearest.id; - return true +function is_orbiting(fleet = "none"){ + if (fleet == "none"){ + if (action != "") then return false; + try { + var nearest = instance_nearest(x,y,obj_star); + if (point_distance(x,y,nearest.x, nearest.y)<10 && nearest.name != ""){ + orbiting = nearest.id; + return true + } + orbiting=false; + } catch(_exception){ + return false; } - orbiting=false; - } catch(_exception){ return false; + } else{ + with (fleet){ + return is_orbiting(); + } } - return false; } -function set_fleet_movement(fastest_route = true, new_action="move"){ +function set_fleet_movement(fastest_route = true, new_action="move", minimum_eta=1, maximum_eta = 1000){ action = ""; @@ -180,17 +186,19 @@ function set_fleet_movement(fastest_route = true, new_action="move"){ action_eta = eta; if (action_eta<=0) or (owner != eFACTION.Inquisition){ action_eta=eta; - if (owner = eFACTION.Inquisition) and (action_eta<2) and (string_count("_her",trade_goods)=0) then action_eta=2; + + } else if (owner = eFACTION.Inquisition) and (action_eta<2) and (string_count("_her",trade_goods)=0){ + action_eta=2; + } + if (is_orbiting()){ + if (owner != eFACTION.Eldar && mine.storm) then action_eta+=10000; } - - if (owner != eFACTION.Eldar && mine.storm) then action_eta+=10000; // action_x=sys.x; // action_y=sys.y; orbiting = false; action=new_action; - minimum_eta=1; - if (minimum_eta>action_eta) and (minimum_eta>0) then action_eta=minimum_eta; + action_eta = clamp(action_eta, minimum_eta, maximum_eta) } } } @@ -206,7 +214,7 @@ function load_unit_to_fleet(fleet, unit){ if (obj_ini.ship_capacity[ship_ident]>obj_ini.ship_carrying[ship_ident]){ obj_ini.ship_carrying[ship_ident]+=unit.size; unit.planet_location=0; - obj_ini.loc[unit.company][unit.marine_number]=obj_ini.ship_location[ship_ident]; + unit.location_string=obj_ini.ship_location[ship_ident]; unit.ship_location=ship_ident; loaded=true; break @@ -293,45 +301,92 @@ function calculate_action_speed(fleet = "none", selected = false) { function scr_efleet_arrive_at_trade_loc(){ - var chase_fleet =false; - var arrive_at_player_fleet = (instance_exists(target)); - if (arrive_at_player_fleet){ - arrive_at_player_fleet = target.object_index == obj_p_fleet; - if (arrive_at_player_fleet){ - var chase_fleet = (target.action!="" || point_distance(x,y,target.x,target.y)>40) && obj_ini.fleet_type != ePlayerBase.home_world; - } - } else { - arrive_at_player_fleet=false; - target=noone; - } - if (arrive_at_player_fleet && chase_fleet) { + //if player fleet at star or player forces trade + var chase_fleet = false; + var _valid_fleet = false; + var _orbit = orbiting; + var _valid_planet = false; - var mah_x=instance_nearest(x,y,obj_star).x; - var mah_y=instance_nearest(x,y,obj_star).y; - - if (string_count("Inqis",trade_goods)=0){ + var _viewer = obj_controller.location_viewer; + if (orbiting.owner < 6 && _viewer.has_troops(orbiting.name)){ + _valid_planet = true; + } - - - if (target.action!="") { - action_x=target.action_x; - action_y=target.action_y; - } - else if (target.action=="" ){ - action_x=instance_nearest(target.x,target.y,obj_star).x; - action_y=instance_nearest(target.x,target.y,obj_star).y; - } - action=""; - set_fleet_movement(); - if (owner!=eFACTION.Eldar) then obj_controller.disposition[owner]-=1; + with (obj_p_fleet){ + if (x==_orbit.x && y==_orbit.y){ + _valid_fleet = true; + break; + } + } - } - } + //iff no forces see iffleet to chase + if (!_valid_fleet && !_valid_planet){ + var _chase_target = -1; + if (instance_exists(target) && target.object_index == obj_p_fleet){ + _chase_target = target; + } else { + target = instance_nearest(x, y,obj_p_fleet); + } + var _chase_fleet = instance_exists(target) &&(target.action!="" || point_distance(x,y,target.x,target.y)>40) && obj_ini.fleet_type != ePlayerBase.home_world; - - - else if (arrive_at_player_fleet || obj_ini.fleet_type=ePlayerBase.home_world){ + if (_chase_fleet){ + if (!string_count("Inqis",trade_goods)){ + + + + if (target.action!="") { + action_x=target.action_x; + action_y=target.action_y; + } + else if (target.action=="" ){ + var _targ_star = instance_nearest(target.x,target.y,obj_star); + action_x=_targ_star.x; + action_y=_targ_star.y; + } + action=""; + set_fleet_movement(); + if (owner!=eFACTION.Eldar) then obj_controller.disposition[owner]-=1; + + } + } + + //if no fleet find a valid planet with player forces + if (action == ""){ + var _player_star = nearest_star_with_ownership(x, y, 1); + if (_player_star != "none"){ + action_x = _player_star.x; + action_y = _player_star.y; + set_fleet_movement(); + } else { + var _player_presence_stars = _viewer.player_force_stars(); + if (array_length(_player_presence_stars)){ + var _nearest_index = nearest_from_array(x, y,_player_presence_stars); + var _nearest = _player_presence_stars[_nearest_index]; + action_x = _nearest.x; + action_y = _nearest.y; + set_fleet_movement(); + } + } + + } + + //if no other viable options drop off at random imperial planet + if (action==""){ + var _imp = nearest_star_with_ownership(x, y, 2); + if (_imp != "none"){ + if (x == _imp.x && y==_imp.y){ + _valid_planet = true; + } else{ + action_x = _imp.x; + action_y = _imp.y; + set_fleet_movement(); + } + } + } + } + + if (_valid_fleet|| _valid_planet){ var targ; var cur_star=nearest_star_proper(x, y); @@ -346,10 +401,13 @@ function scr_efleet_arrive_at_trade_loc(){ scr_event_log("",bleh,cur_star.name); // Drop off here - if (trade_goods!="stuff") and (trade_goods!="none") then scr_trade_dep(); + if (fleet_has_cargo("player_goods")){ + scr_trade_dep(); + } - trade_goods="return"; - if (target!=noone) then target=noone; + if (target!=noone){ + target=noone; + } if (owner==eFACTION.Eldar){ cur_star = nearest_star_with_ownership(xx,yy, eFACTION.Eldar); @@ -359,25 +417,48 @@ function scr_efleet_arrive_at_trade_loc(){ } } else { action_x=home_x; - action_y=home_y; + action_y=home_y; + set_fleet_movement(); } - - action_eta=0; - action=""; - - set_fleet_movement(); + trade_goods="return"; if (action_eta==0){ instance_destroy(); } + return true; } + return false; } + + +/// @function scr_orbiting_fleet(faction, system) +/// @description Returns the ID of a fleet orbiting the given system/star that matches the specified faction. +/// @param {any|array} faction +/// The faction identifier to check against. Can be a single faction ID or an array of multiple factions. +/// @param {any} [system="none"] +/// The system instance or star to check. If `"none"`, the function uses the calling instance's position. +/// @returns {real|string} The ID of the matching fleet instance, or `"none"` if no valid fleet is found. +/// +/// @example +/// ```gml +/// // Find a fleet orbiting this star that belongs to faction 3 +/// var fleet_id = scr_orbiting_fleet(3); +/// if (fleet_id != "none") { +/// show_debug_message_adv("Faction fleet found: " + string(fleet_id)); +/// } +/// +/// // Find fleets from multiple factions +/// var factions = [1, 2, 5]; +/// var fleet_id = scr_orbiting_fleet(factions, some_system); +/// ``` +/// + function scr_orbiting_fleet(faction, system="none"){ var _found_fleet = "none"; var _faction_list = is_array(faction); var xx = system == "none" ? x : system.x; var yy = system == "none" ? y : system.y; with (obj_en_fleet){ - if (x=xx && y==yy){ + if (x==xx && y==yy){ var _valid = false; if (_faction_list){ _valid = array_contains(faction, owner); @@ -388,12 +469,70 @@ function scr_orbiting_fleet(faction, system="none"){ } if (_valid && action == ""){ _found_fleet = id; + break; } } } return _found_fleet; } + +/// @function object_distance(obj_1, obj_2) +/// @description Returns the distance in pixels between two instances or objects based on their `x` and `y` coordinates. +/// @param {instance} obj_1 The first object or instance. +/// @param {instance} obj_2 The second object or instance. +/// @returns {real} The distance in pixels between `obj_1` and `obj_2`. +/// +/// @example +/// ```gml +/// var dist = object_distance(player, enemy); +/// if (dist < 100) { +/// show_debug_message_adv("Enemy is within range!"); +/// } +/// ``` +/// + +function object_distance(obj_1, obj_2){ + return (point_distance(obj_1.x, obj_1.y,obj_2.x, obj_2.y )) +} + + +/// @function scr_orbiting_player_fleet(system) +/// @description Returns the ID of the nearest player fleet orbiting the given system or star. +/// @param {any} [system="none"] +/// The system instance or identifier to check. If `"none"`, the function checks the calling star instance. +/// @returns {real} The instance ID of the orbiting player fleet, or -1 if none is found. +/// +/// @example +/// ```gml +/// var fleet_id = scr_orbiting_player_fleet(); +/// if (fleet_id != -1) { +/// show_debug_message_adv("Fleet orbiting star: " + string(fleet_id)); +/// } +/// ``` +/// +function scr_orbiting_player_fleet(system = "none"){ + if (system == "none" && !(is_struct(self)) && object_index == obj_star){ + var _fleet = instance_nearest(x, y, obj_p_fleet); + if (object_distance(self, _fleet) > 0){ + return -1 + } else{ + return _fleet.id; + } + } else if system != "none"{ + try{ + with (system){ + return scr_orbiting_player_fleet(); + } + } catch(_exception){ + handle_exception(_exception); + } + } + + return -1; + +} + function get_orbiting_fleets(faction,system="none"){ var _fleets = []; var _faction_list = is_array(faction); @@ -482,19 +621,20 @@ function fleet_arrival_logic(){ x = cur_star.x; y = cur_star.y; sta=instance_nearest(action_x,action_y,obj_star); + is_orbiting(); // cur_star.present_fleets+=1;if (owner = eFACTION.Tau) then cur_star.tau_fleets+=1; if (owner == eFACTION.Mechanicus){ - if (string_count("spelunk1",trade_goods)=1){ + if (trade_goods == "mars_spelunk1"){ trade_goods="mars_spelunk2"; action_x=home_x; action_y=home_y; action_eta=52; + action = "move"; exit; - } - if (string_count("spelunk2",trade_goods)=1){ + } else if (trade_goods == "mars_spelunk2"){ // Unload techmarines nao plz scr_mission_reward("mars_spelunk",instance_nearest(home_x,home_y,obj_star),1); instance_destroy(); @@ -510,7 +650,7 @@ function fleet_arrival_logic(){ - if (trade_goods="return"){ + if (trade_goods=="return"){ // with(instance_nearest(x,y,obj_star)){present_fleets-=1;} instance_destroy(); } @@ -518,46 +658,12 @@ function fleet_arrival_logic(){ - - if (trade_goods="female_her") or (trade_goods="male_her"){ - // if (owner = eFACTION.Inquisition) then show_message("A"); - - var next=0; - if (!instance_exists(obj_p_fleet)) then next=1; - if (instance_exists(obj_p_fleet)){ - with(obj_p_fleet){if (action!="") then instance_deactivate_object(id);} - var pfa;pfa=instance_nearest(x,y,obj_p_fleet); - if (point_distance(x,y,pfa.x,pfa.y)<40) then next=2; - if (point_distance(x,y,pfa.x,pfa.y)>=40) then next=1; - } - instance_activate_object(obj_p_fleet); - if (next=1){ - action_x=choose(room_width*-1,room_width*2); - action_y=choose(room_height*-1,room_height*2); - action_spd=256; - action=""; - set_fleet_movement(); - trade_goods="|DELETE|"; - obj_controller.disposition[4]-=15; - scr_popup("Inquisitor Mission Failed","The radical Inquisitor has departed from the planned intercept coordinates. They will now be nearly impossible to track- the mission is a failure.","inquisition",""); - scr_event_log("red","Inquisition Mission Failed: The radical Inquisitor has departed from the planned intercept coordinates."); - } - if (next=2){ - action=""; - var tixt,gender; - if (trade_goods="male_her") then gender="he";if (trade_goods="female_her") then gender="she"; - tixt="You have located the radical Inquisitor. As you prepare to destroy their ship, and complete the mission, you recieve a hail- it appears as though "+string(gender)+" wishes to speak."; - if (trade_goods="male_her") then scr_popup("Inquisitor Located",tixt,"inquisition","1"); - if (trade_goods="female_her") then scr_popup("Inquisitor Located",tixt,"inquisition","2"); - } - instance_deactivate_object(id); - instance_deactivate_object(id); - exit; - } - - - - + if (owner == eFACTION.Inquisition){ + if (fleet_has_cargo("radical_inquisitor")){ + radical_inquisitor_mission_ship_arrival(); + exit; + } + } if (!navy){ @@ -594,12 +700,15 @@ function fleet_arrival_logic(){ if (string_count("_her",trade_goods)>0) then cancel=true; if (string_count("investigate_dead",trade_goods)>0) then cancel=true; if (string_count("spelunk",trade_goods)>0) then cancel=true; - if (string_count("BLOOD",trade_goods)>0) then cancel=true; + if (fleet_has_cargo("warband")) then cancel=true; if (fleet_has_cargo("ork_warboss")) cancel=true; - if (trade_goods="csm") then cancel=true; + if (fleet_has_cargo("csm")) then cancel=true; + + if (!cancel && ((trade_goods!="return" && owner!=eFACTION.Tyranids && owner!=eFACTION.Chaos) && (fleet_has_cargo("player_goods")))){ + if (scr_efleet_arrive_at_trade_loc()){ + exit; + } - if (!cancel && trade_goods!="" && trade_goods!="return" && owner!=eFACTION.Tyranids && owner!=eFACTION.Chaos){ - scr_efleet_arrive_at_trade_loc(); } } @@ -620,7 +729,7 @@ function fleet_arrival_logic(){ orbiting=instance_nearest(x,y,obj_star); action_x=orbiting.x; action_y=orbiting.y; - alarm[4]=1; + set_fleet_movement(); instance_activate_object(obj_star); trade_goods+="|DELETE|"; exit; @@ -664,10 +773,6 @@ function fleet_arrival_logic(){ } }*/ - - - - action=""; if (owner= eFACTION.Inquisition){ @@ -734,7 +839,9 @@ function fleet_arrival_logic(){ // show_message("Tau||| Other Owner: "+string(cur_star.owner)+" ret: "+string(ret)+" mergus: "+string(mergus)); } - if (owner=eFACTION.Chaos) and (trade_goods="csm") or (trade_goods="Khorne_warband") then mergus=0; + if (owner=eFACTION.Chaos) and (fleet_has_cargo("csm")) or ( fleet_has_cargo("warband")){ + mergus=0; + } // if (cur_star.owner!=owner) then mergus=0; @@ -816,7 +923,9 @@ function fleet_arrival_logic(){ if (new_star.owner=eFACTION.Tau){ // show_message("Tau fleet actually fleeing"); - action="";action_x=new_star.x;action_y=new_star.y;alarm[4]=1; + action_x=new_star.x; + action_y=new_star.y; + set_fleet_movement(); } instance_activate_object(obj_star); @@ -831,11 +940,17 @@ function fleet_arrival_logic(){ x=old_x; y=old_y; - if (cur_star.x=old_x) and (cur_star.y=old_y) and (cur_star.owner=self.owner) and (cur_star.action="") and ((owner = eFACTION.Tau) or (owner = eFACTION.Chaos)) and (mergus=10) and (trade_goods!="csm") and (trade_goods!="Khorne_warband"){// Move somewhere new + var _csm = fleet_has_cargo("warband"); + + if (cur_star.x=old_x) and (cur_star.y=old_y) and (cur_star.owner=self.owner) and (cur_star.action="") and ((owner = eFACTION.Tau) or (owner = eFACTION.Chaos)) and (mergus=10) and (!_csm){// Move somewhere new var stue, stue2;stue=0;stue2=0; var goood=0; - with(obj_star){if (planets=1) and (p_type[1]="Dead") then instance_deactivate_object(id);} + with(obj_star){ + if (is_dead_star()){ + instance_deactivate_object(id); + } + } stue=instance_nearest(x,y,obj_star); instance_deactivate_object(stue); repeat(10){ @@ -850,7 +965,7 @@ function fleet_arrival_logic(){ } action_x=stue2.x; action_y=stue2.y; - alarm[4]=1;// stue.present_fleets-=1; + set_fleet_movement();// stue.present_fleets-=1; instance_activate_object(obj_star); } @@ -862,26 +977,26 @@ function fleet_arrival_logic(){ // If the connected planet is owned by orks then choose a random one within 400 not owned by orks - if (owner = eFACTION.Ork){ + if (owner == eFACTION.Ork){ if (is_orbiting()){ with (orbiting){ ork_fleet_arrive_target(); } } - var kay, temp5, temp6, temp7; - kay=0;temp5=0;temp6=0;temp7=0; + + var kay=0,temp5=0,temp6=0,temp7=0; var cur_star=instance_nearest(x,y,obj_star); // This is the new check to go along code; if doesn't add up to all planets = 7 then they exit - if (!is_dead_star(cur_star)) then kay=5; - - if (kay=5){// KILL the enemy - if (cur_star.present_fleet[1]>1) or (cur_star.present_fleet[2]>1) then exit; + if (!is_dead_star(cur_star)){// KILL the enemy + if (cur_star.present_fleet[1]>1) or (cur_star.present_fleet[2]>1) then exit; } - if ((cur_star.owner = eFACTION.Chaos) and (image_index>=5) and (owner = eFACTION.Chaos)) or ((owner = eFACTION.Chaos) and (image_index>=5) and (cur_star.planets=0)) then kay=50; + if ((cur_star.owner = eFACTION.Chaos) and (image_index>=5) and (owner = eFACTION.Chaos)) or ((owner = eFACTION.Chaos) and (image_index>=5) and (cur_star.planets=0)){ + kay=50; + } if (kay=50){ @@ -889,7 +1004,8 @@ function fleet_arrival_logic(){ repeat(20){ if (kay=50){ - temp5=x+choose(random(300),random(300)*-1);temp6=y+choose(random(300),random(300)*-1); + temp5=x+choose(random(300),random(300)*-1); + temp6=y+choose(random(300),random(300)*-1); temp7=instance_nearest(temp5,temp6,obj_star); if (owner = eFACTION.Ork) and (temp7.owner != eFACTION.Ork) and (temp7.planets>0) and (temp7.image_alpha>=1) then kay=55; @@ -901,12 +1017,14 @@ function fleet_arrival_logic(){ if (kay=55) and (instance_exists(temp7)){ action_x=temp7.x; action_y=temp7.y; - alarm[4]=1; + set_fleet_movement(); // cur_star.present_fleets-=1; } instance_activate_object(obj_star); + } else { + cur_star.present_fleet[eFACTION.Ork]++; } @@ -914,7 +1032,6 @@ function fleet_arrival_logic(){ } - exit;// end of eta=0 } @@ -1015,7 +1132,7 @@ function fleet_respond_crusade(){ if (ok){ action_x=ns.x; action_y=ns.y; - alarm[4]=1; + set_fleet_movement(); orbiting.present_fleet[owner]-=1; home_x=orbiting.x; home_y=orbiting.y; diff --git a/scripts/scr_fleet_functions/scr_fleet_functions.yy b/scripts/scr_fleet_functions/scr_fleet_functions.yy index b2a657753f..1a9f0167cc 100644 --- a/scripts/scr_fleet_functions/scr_fleet_functions.yy +++ b/scripts/scr_fleet_functions/scr_fleet_functions.yy @@ -5,8 +5,8 @@ "isDnD":false, "name":"scr_fleet_functions", "parent":{ - "name":"Scripts", - "path":"folders/Scripts.yy", + "name":"fleet", + "path":"folders/Scripts/fleet.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/scr_garrison/scr_garrison.gml b/scripts/scr_garrison/scr_garrison.gml index 79f73e5937..36010cffda 100644 --- a/scripts/scr_garrison/scr_garrison.gml +++ b/scripts/scr_garrison/scr_garrison.gml @@ -1,7 +1,9 @@ function disposition_description_chart(dispo) { if (global.cheat_debug) { return $"{dispo}" - } else if (dispo < -100) { + } else if (dispo < -4000) { + return "Ruled"; + }else if (dispo < -100) { return "DEBUG: Numbers lower than -100 detected, this shouldn't happen!"; } else if (dispo <= 0) { return "Extremely Hostile"; @@ -106,9 +108,9 @@ function GarrisonForce(planet_operatives, turn_end=false, type="garrison") const var hierarchy = role_hierarchy(); var leader_hier_pos=array_length(hierarchy); var unit; - for (var squad=0;squad 1){ report_string+= $"The garrison is comprised of {array_length(garrison_squads)} squads," - } else {report_string+="The garrison is comprised of a single squad,"} + } else {report_string+="The garrison is comprised of a single _squad,"} report_string+= $" with a total man count of {total_garrison}.#" - if (system.p_owner[planet] != eFACTION.Player) { + if (system.p_owner[planet] != eFACTION.Player && system.dispo[planet] >=-100) { var disposition = disposition_description_chart(system.dispo[planet]); report_string += $"Our Relationship with the Rulers of the planet is {disposition}#"; - } else if (system.dispo[planet] < -1000 && system.p_owner[planet] == eFACTION.Player) { - report_string += $"Rule of the planet is going well"; + } else if (system.dispo[planet] < -1000) { + if (system.p_owner[planet] == eFACTION.Player){ + report_string += $"Rule of the planet is going well"; + } else { + report_string += $"Your rule of the the planet is being undermined by hostile forces"; + } } else { report_string += $"DEBUG: planet owner check failed"; //report_string+=$"There is no clear chain of command on the planet we suspect the existence of Xenos or Heretic Forces"; // TODO LOW GARRISON_XENO // Readd when this actually gets implented @@ -169,52 +175,54 @@ function GarrisonForce(planet_operatives, turn_end=false, type="garrison") const static garrison_disposition_change = function(star, planet, up_or_down = false){ dispo_change = 0; - if (array_contains(obj_controller.imperial_factions, star.p_owner[planet])){ - planet_disposition = star.dispo[planet]; + var _pdata = new PlanetData(planet, star); + if (array_contains(obj_controller.imperial_factions, _pdata.current_owner)){ + var _planet_disposition = _pdata.player_disposition; - var disposition_modifier = planet_disposition<=50 ? (planet_disposition/10) :((planet_disposition-50)/10)%5; + var _main_faction_disp = _pdata.owner_faction_disposition(); + + //basivally it is easier to increase dispositioon the nearer you are to 50 but becomminig greatly hated or greaty liked is much harder + var _disposition_modifier = _planet_disposition<=50 ? (_planet_disposition/10) :((_planet_disposition-50)/10)%5; + + _disposition_modifier /= 10; + + var _time_modifier = max(time_on_planet/2.5, 10); - disposition_modifier = planet_disposition/10 - time_modifier = time_on_planet/2.5; - if (time_modifier>10) then time_modifier = 10; if (!garrison_leader){ find_leader(); } - var final_modifier = 5 + total_garrison/10 - disposition_modifier + time_modifier; + var _diplomatic_leader = false; + if (is_struct(garrison_leader)) { + _diplomatic_leader = garrison_leader.has_trait("honorable"); + } else { + scr_alert("yellow", "DEBUG", $"DEBUG: Garrison _Leader on {star.name} {planet} couldn't be found!", 0, 0); + scr_event_log("yellow", $"DEBUG: Garrison _Leader on {star.name} {planet} couldn't be found!"); + log_error($"DEBUG: Garrison _Leader on {star.name} {planet} couldn't be found!"); + } + var _garrison_size_mod = total_garrison/10; + + var final_modifier = 5 + _garrison_size_mod - _disposition_modifier + _time_modifier; + if (up_or_down){ - dispo_change = garrison_leader.charisma+final_modifier; - if (dispo_change<50 && (planet_disposition obj_controller.disposition[star.p_owner[planet]]) { - dispo_change = charisma_test[1] / 10; - if (planet_disposition + dispo_change <= -100) { - dispo_change = -(planet_disposition + 100); - } + if (_planet_disposition > _main_faction_disp) { + _pdata.add_disposition(dispo_change); } else { dispo_change = 0; } } } else { dispo_change = charisma_test[1] / 10; - if (planet_disposition + dispo_change >= 100) { - dispo_change = abs(planet_disposition - 100); - } + _pdata.add_disposition(dispo_change); } } } else { @@ -226,32 +234,33 @@ function GarrisonForce(planet_operatives, turn_end=false, type="garrison") const /* this is probably going to become infinatly complex with many different functions and far more complex inputs but for now i'm just trying to set up a concept with some simple examples*/ static determine_battle = function(attack_defend, win, margin, enemy, location, planet=0, ship=0){ + var _sim = global.character_tester; if (win){ }else{ //var squad_positions; - var leader; - var mem; + var _leader; + var m; var unit; var effort="failed"; switch(enemy){ case eFACTION.Ork://trying to come up with how we might auto evaluate a squads fate in a battle for (var s=0;smargin){//if unit "wins" in combat test against weapon skill as this is a cc enagement - if (irandom(4999)= 2000) { pdf_score = 1; - } else if (pdf < 2000) { + } else if (pdf < 2000 &&pdf >500) { pdf_score = 0.5; - } else if (pdf < 500) { + } else if (pdf <= 500) { pdf_score = 0.1; } explanations += $"PDF Defence: {pdf_score}#" diff --git a/scripts/scr_get_item_names/scr_get_item_names.gml b/scripts/scr_get_item_names/scr_get_item_names.gml index 9d8dd70614..b321731631 100644 --- a/scripts/scr_get_item_names/scr_get_item_names.gml +++ b/scripts/scr_get_item_names/scr_get_item_names.gml @@ -22,7 +22,7 @@ function get_none_or_any_item_names(_item_names, _with_none=false, _with_any=fal /// @param {array} _item_names - The list of ranged weapons to append to. /// @returns {void} function push_marine_ranged_weapons_item_names(_item_names) { - var item_count = 22 + var item_count = 29; var initial_size = array_length(_item_names); array_resize(_item_names, initial_size + item_count); @@ -33,6 +33,12 @@ function push_marine_ranged_weapons_item_names(_item_names) { _item_names[@ index++] = "Bolter"; _item_names[@ index++] = "Stalker Pattern Bolter"; _item_names[@ index++] = "Combiflamer"; + _item_names[@ index++] = "Combiplasma"; + _item_names[@ index++] = "Combimelta"; + _item_names[@ index++] = "Combigrav"; + _item_names[@ index++] = "Grav-Pistol"; + _item_names[@ index++] = "Grav-Gun"; + _item_names[@ index++] = "Grav-Cannon"; _item_names[@ index++] = "Flamer"; _item_names[@ index++] = "Heavy Bolter"; _item_names[@ index++] = "Heavy Flamer"; @@ -44,18 +50,19 @@ function push_marine_ranged_weapons_item_names(_item_names) { _item_names[@ index++] = "Missile Launcher"; _item_names[@ index++] = "Multi-Melta"; _item_names[@ index++] = "Autocannon"; + _item_names[@ index++] = "Plasma Cannon"; _item_names[@ index++] = "Plasma Gun"; _item_names[@ index++] = "Plasma Pistol"; _item_names[@ index++] = "Sniper Rifle"; _item_names[@ index++] = "Storm Bolter"; - _item_names[@ index++] = "Webber"; // 22 + _item_names[@ index++] = "Webber"; // 29 } /// @description This function returns the hard-coded list of melee weapons. /// @param {array} _item_names - The list to append to. /// @returns {void} function push_marine_melee_weapons_item_names(_item_names) { - var item_count = 17; + var item_count = 19; var initial_size = array_length(_item_names); array_resize(_item_names, initial_size + item_count); @@ -66,17 +73,19 @@ function push_marine_melee_weapons_item_names(_item_names) { _item_names[@ index++] = "Eviscerator"; _item_names[@ index++] = "Power Sword"; _item_names[@ index++] = "Power Axe"; + _item_names[@ index++] = "Power Spear"; _item_names[@ index++] = "Power Fist"; _item_names[@ index++] = "Boltstorm Gauntlet"; _item_names[@ index++] = "Chainfist"; _item_names[@ index++] = "Lightning Claw"; _item_names[@ index++] = "Force Staff"; _item_names[@ index++] = "Thunder Hammer"; + _item_names[@ index++] = "Heavy Thunder Hammer"; _item_names[@ index++] = "Crozius Arcanum"; _item_names[@ index++] = "Boarding Shield"; _item_names[@ index++] = "Storm Shield"; _item_names[@ index++] = "Bolt Pistol"; - _item_names[@ index++] = "Bolter"; // 17 + _item_names[@ index++] = "Bolter"; // 19 } @@ -141,7 +150,7 @@ function push_marine_mobility_item_names(_item_names) { /// @param {array} _item_names - The list to append to. /// @returns {void} function push_dreadnought_ranged_weapons_item_names(_item_names) { - var item_count = 10; + var item_count = 11; var initial_size = array_length(_item_names); array_resize(_item_names, initial_size + item_count); @@ -155,7 +164,8 @@ function push_dreadnought_ranged_weapons_item_names(_item_names) { _item_names[@ index++] = "Twin Linked Lascannon"; _item_names[@ index++] = "Twin Linked Assault Cannon Mount"; _item_names[@ index++] = "Twin Linked Heavy Bolter"; - _item_names[@ index++] = "Heavy Conversion Beam Projector"; // 10 + _item_names[@ index++] = "Heavy Conversion Beam Projector"; + _item_names[@ index++] = "Twin-linked Volkite Culverins";// 10 } /// @description This function appends the list of dreadnought melee weapons to the given list. @@ -504,15 +514,6 @@ function get_filtered_equipment_item_names(_item_names, _equip_category, _melee_ return _item_names; } -enum eEQUIPMENT_TYPE { - None, - PrimaryWeapon = 1, // LeftHand, Turret, Front, Primary - SecondaryWeapon = 2, // RightHand, Sponson, Secondary - Armour = 3, - GearUpgrade = 4, - MobilityAccessory = 5 -} - enum eENGAGEMENT { None = 0, Ranged = 1, // Regular land raider weapons @@ -544,58 +545,58 @@ function get_slot_name(_role, _slot) { case eROLE.Sergeant: case eROLE.VeteranSergeant: switch (_slot) { - case 1: return "First Weapon"; - case 2: return "Second Weapon"; - case 3: return "Armour"; - case 4: return "Gear"; - case 5: return "Mobility"; + case 0: return "First Weapon"; + case 1: return "Second Weapon"; + case 2: return "Armour"; + case 3: return "Gear"; + case 4: return "Mobility"; default: return "Unknown"; } case eROLE.Dreadnought: switch (_slot) { - case 1: return "First Weapon"; - case 2: return "Second Weapon"; - case 5: return "Accessory"; + case 0: return "First Weapon"; + case 1: return "Second Weapon"; + case 4: return "Accessory"; default: return "Unknown"; } case eROLE.LandRaider: switch (_slot) { - case 1: return "Front"; - case 2: return "Sponson"; - case 3: return "Pintle"; - case 4: return "Upgrade"; - case 5: return "Accessory"; + case 0: return "Front"; + case 1: return "Sponson"; + case 2: return "Pintle"; + case 3: return "Upgrade"; + case 4: return "Accessory"; default: return "Unknown"; } case eROLE.Rhino: switch (_slot) { - case 1: return "Weapon"; - case 2: return "Side"; - case 4: return "Upgrade"; - case 5: return "Accessory"; + case 0: return "Weapon"; + case 1: return "Side"; + case 3: return "Upgrade"; + case 4: return "Accessory"; default: return "Unknown"; } case eROLE.Predator: switch (_slot) { - case 1: return "Turret"; - case 2: return "Sponsons"; - case 3: return "Pintle"; - case 4: return "Upgrade"; - case 5: return "Accessory"; + case 0: return "Turret"; + case 1: return "Sponsons"; + case 2: return "Pintle"; + case 3: return "Upgrade"; + case 4: return "Accessory"; default: return "Unknown"; } case eROLE.LandSpeeder: switch (_slot) { - case 1: return "First Weapon"; - case 2: return "Second Weapon"; + case 0: return "First Weapon"; + case 1: return "Second Weapon"; default: return "Unknown"; } case eROLE.Whirlwind: switch (_slot) { - case 1: return "Missiles"; - case 2: return "Pintle"; - case 4: return "Upgrade"; - case 5: return "Accessory"; + case 0: return "Missiles"; + case 1: return "Pintle"; + case 3: return "Upgrade"; + case 4: return "Accessory"; default: return "Unknown"; } default: @@ -644,8 +645,8 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com case eROLE.Sergeant: case eROLE.VeteranSergeant: switch (_slot) { + case 0: case 1: - case 2: if (_engagement == eENGAGEMENT.Ranged) { if (_show_available_only) { get_filtered_equipment_item_names( @@ -703,7 +704,7 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com return; } break; - case 3: + case 2: if (_show_available_only) { _item_names = get_filtered_equipment_item_names( _item_names, @@ -720,7 +721,7 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com push_marine_armour_item_names(_item_names); } break; - case 4: + case 3: if (_show_available_only) { get_filtered_equipment_item_names( _item_names, @@ -737,7 +738,7 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com push_marine_gear_item_names(_item_names); } break; - case 5: + case 4: if (_show_available_only) { get_filtered_equipment_item_names( _item_names, @@ -761,8 +762,8 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com break; case eROLE.Dreadnought: switch (_slot) { - case 1: - case 2: + case EquipmentSlot.WEAPON_ONE: + case EquipmentSlot.WEAPON_TWO: if (_engagement == eENGAGEMENT.Ranged) { if (_show_available_only) { get_filtered_equipment_item_names( @@ -817,12 +818,12 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com return; } break; - case 5: + case EquipmentSlot.MOBILITY: get_none_or_any_item_names(_item_names, _with_none_if_not_skip, false); push_tank_accessory_item_names(_item_names, false, true); break; - case 3: - case 4: + case EquipmentSlot.GEAR: + case EquipmentSlot.ARMOUR: // Dreadnought doesn't have these slots, but empty lists are shown in the UI break; default: @@ -833,7 +834,7 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com case eROLE.LandRaider: get_none_or_any_item_names(_item_names, _with_none_if_not_skip, false); switch (_slot) { - case 1: + case EquipmentSlot.WEAPON_ONE: if (_engagement == eENGAGEMENT.Ranged) { // Regular land raider weapons push_land_raider_front_weapons_item_names(_item_names); } else if (_engagement == eENGAGEMENT.Melee) { // Relic land raider weapons @@ -846,7 +847,7 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com return; } break; - case 2: + case EquipmentSlot.WEAPON_TWO: if (_engagement == eENGAGEMENT.Ranged) { // Regular land raider weapons push_land_raider_regular_sponsons_item_names(_item_names); } else if (_engagement == eENGAGEMENT.Melee) { // Relic land raider weapons @@ -859,9 +860,9 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com return; } break; - case 3: push_land_raider_pintle_item_names(_item_names); break; - case 4: push_tank_upgrade_item_names(_item_names, _with_none_if_not_skip); break; - case 5: push_tank_accessory_item_names(_item_names, _with_none_if_not_skip, false); break; + case EquipmentSlot.ARMOUR: push_land_raider_pintle_item_names(_item_names); break; + case EquipmentSlot.GEAR: push_tank_upgrade_item_names(_item_names, _with_none_if_not_skip); break; + case EquipmentSlot.MOBILITY: push_tank_accessory_item_names(_item_names, _with_none_if_not_skip, false); break; default: assert_error_popup($"Invalid slot for land raider: {_slot}"); return; @@ -870,11 +871,11 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com case eROLE.Rhino: get_none_or_any_item_names(_item_names, _with_none_if_not_skip, false); switch (_slot) { - case 1: push_rhino_weapons_item_names(_item_names); break; - case 2: push_rhino_side_item_names(_item_names); break; - case 4: push_tank_upgrade_item_names(_item_names, false); break; - case 5: push_tank_accessory_item_names(_item_names, false, false); break; - case 3: + case 0: push_rhino_weapons_item_names(_item_names); break; + case 1: push_rhino_side_item_names(_item_names); break; + case EquipmentSlot.GEAR: push_tank_upgrade_item_names(_item_names, false); break; + case EquipmentSlot.MOBILITY: push_tank_accessory_item_names(_item_names, false, false); break; + case EquipmentSlot.ARMOUR: // Rhino doesn't have these slots, but empty lists are shown in the UI break; default: @@ -885,11 +886,11 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com case eROLE.Predator: get_none_or_any_item_names(_item_names, _with_none_if_not_skip, false); switch (_slot) { - case 1: push_predator_turret_item_names(_item_names); break; - case 2: push_predator_sponsons_item_names(_item_names); break; - case 3: push_predator_pintle_item_names(_item_names); break; - case 4: push_tank_upgrade_item_names(_item_names, false); break; - case 5: push_tank_accessory_item_names(_item_names, false, false); break; + case 0: push_predator_turret_item_names(_item_names); break; + case 1: push_predator_sponsons_item_names(_item_names); break; + case 2: push_predator_pintle_item_names(_item_names); break; + case 3: push_tank_upgrade_item_names(_item_names, false); break; + case 4: push_tank_accessory_item_names(_item_names, false, false); break; default: assert_error_popup($"Invalid slot for predator: {_slot}"); return; @@ -898,11 +899,11 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com case eROLE.LandSpeeder: get_none_or_any_item_names(_item_names, _with_none_if_not_skip, false); switch (_slot) { - case 1: push_land_speeder_primary_item_names(_item_names); break; - case 2: push_land_speeder_secondary_item_names(_item_names); break; - case 4: + case 0: push_land_speeder_primary_item_names(_item_names); break; + case 1: push_land_speeder_secondary_item_names(_item_names); break; case 3: - case 5: + case 2: + case 4: // Land speeder doesn't have these slots, but empty lists are shown in the UI break; default: @@ -913,11 +914,11 @@ function scr_get_item_names(_item_names, _role, _slot, _engagement, _include_com case eROLE.Whirlwind: get_none_or_any_item_names(_item_names, _with_none_if_not_skip, false); switch (_slot) { - case 1: push_whirlwind_missiles_item_names(_item_names); break; - case 2: push_whirlwind_pintle_item_names(_item_names); break; - case 4: push_tank_upgrade_item_names(_item_names, false); break; - case 5: push_tank_accessory_item_names(_item_names, false, false); break; - case 3: + case 0: push_whirlwind_missiles_item_names(_item_names); break; + case 1: push_whirlwind_pintle_item_names(_item_names); break; + case 3: push_tank_upgrade_item_names(_item_names, false); break; + case 4: push_tank_accessory_item_names(_item_names, false, false); break; + case 2: // Whirlwind doesn't have this slot, but an empty list is shown in the UI break; default: diff --git a/scripts/scr_gift_items/scr_gift_items.gml b/scripts/scr_gift_items/scr_gift_items.gml new file mode 100644 index 0000000000..a37ba69f30 --- /dev/null +++ b/scripts/scr_gift_items/scr_gift_items.gml @@ -0,0 +1,310 @@ + + +function draw_gift_items_popup(){ + draw_sprite(spr_planet_screen, 0, 231 + 314, 112); + draw_set_font(fnt_40k_14); + draw_set_halign(fa_center); + draw_set_color(c_gray); + + var inq_hide = 0; + if (subtype == 0) { + if (array_contains(obj_ini.artifact_tags[obj_controller.menu_artifact], "inq")) { + if (array_contains(obj_controller.quest, "artifact_loan")) { + inq_hide = 1; + } + if (array_contains(obj_controller.quest, "artifact_return")) { + inq_hide = 2; + } + } + } + var iter = 0, spacer = 0; + for (var i = 0; i < array_length(fac_buttons); i++) { + var _button = fac_buttons[i]; + var _fac = _button.faction; + if (_button.draw(obj_controller.known[_fac]>=1)){ + if (_fac == eFACTION.Inquisition) { + if (inq_hide == 1) { + continue; + } + } + giveto = _fac; + } + } + draw_set_alpha(1); + draw_set_color(CM_GREEN_COLOR); + if (cancel_button.draw()) { + instance_destroy(); + exit; + } + if (giveto > 0) { + if (subtype == 0){ + gift_artifact(giveto, true); + } else if (subtype == 1){ + gift_stc_fragment(); + } + } +} + +function gift_artifact(give_to, known = true){ + if (known){ + var arti_index = obj_controller.menu_artifact; + } else { + obj_controller.menu_artifact = scr_add_artifact("random", "minor"); + } + + var arti_index = obj_controller.menu_artifact; + + var artifact_struct = obj_ini.artifact_struct[arti_index]; + var cur_tags = obj_ini.artifact_tags[arti_index]; + + // obj_controller.artifacts-=1; // this is done by delete_artifact() that is run later; + + obj_controller.cooldown = 10; + if (obj_controller.menu_artifact > obj_controller.artifacts) { + obj_controller.menu_artifact = obj_controller.artifacts; + } + + scr_toggle_diplomacy(); + obj_controller.diplomacy = give_to; + obj_controller.force_goodbye = -1; + var the = ""; + + if ((give_to != 7) && (give_to != 10)) { + the = "the "; + } + + var inq_hide = 0; + + if (array_contains(obj_ini.artifact_tags[obj_controller.menu_artifact], "inq")) { + if (array_contains(obj_controller.quest, "artifact_loan")) { + inq_hide = 1; + } + if (array_contains(obj_controller.quest, "artifact_return")) { + inq_hide = 2; + } + } + + scr_event_log("", $"Artifact gifted to {the} {obj_controller.faction[give_to]}."); + var is_daemon = artifact_struct.has_tag("daemonic"); + var is_chaos = artifact_struct.has_tag("chaos"); + if (inq_hide != 2) { + with (obj_controller) { + if ((!is_daemon) || ((diplomacy != 4) && (diplomacy != 5) && (diplomacy != 2))) { + scr_dialogue("artifact_thanks"); + } + if (is_daemon && ((diplomacy == 4) || (diplomacy == 5) || (diplomacy == 2))) { + scr_dialogue("artifact_daemon"); + } + } + } + if ((inq_hide == 2) && (obj_controller.diplomacy == 4)) { + with (obj_controller) { + scr_dialogue("artifact_returned"); + } + } + + if (artifact_struct.has_tag("MINOR")) { + obj_controller.disposition[give_to] = clamp(obj_controller.disposition[give_to] + 1, -100, 100); + } else { + var daemon_arts = function(faction, is_chaos, is_daemon) { + switch (faction) { + case eFACTION.Imperium: + if (is_daemon) { + var v = 0, ev = 0; + add_event({ + e_id : "imperium_daemon", + duration : 1, + }); + with (obj_star) { + for (var i = 1; i <= planets; i++) { + if (p_owner[i] == 2) { + p_heresy[i] += choose(30, 40, 50, 60); + } + } + } + } + if (is_chaos) { + with (obj_star) { + for (var i = 1; i <= planets; i++) { + if ((p_owner[i] == 2) && (p_heresy[i] > 0)) { + p_heresy[i] += 10; + } + } + } + } + break; + case eFACTION.Tau: + if (is_daemon) { + with (obj_star) { + for (var i = 1; i <= planets; i++) { + if (p_owner[i] == 8) { + p_heresy[i] += 40; + } + } + } + } + break; + } + } + + var specialmod = 0 + switch (give_to) { + case eFACTION.Imperium: + break; + case eFACTION.Mechanicus: + break; + case eFACTION.Inquisition: + if (inq_hide == 2) { + specialmod -= 1; + } + + if (is_chaos) { + specialmod += 2; + } + + if (is_daemon) { + specialmod += 4; + } + break; + case eFACTION.Ecclesiarchy: + if (!is_daemon) { + if (scr_has_adv("Reverent Guardians")) { + specialmod += 2; + } + } else { + specialmod -= 2; + } + break; + } + + daemon_arts(give_to, is_chaos, is_daemon) + var tagmod = artifact_struct.artifact_faction_value(give_to); + + alter_disposition(give_to, 2 + specialmod + tagmod) + } + + // Need to modify ^^^^ based on if it is chaos or daemonic + + delete_artifact(arti_index); + instance_destroy(); + exit; +} +function are_giftable_factions(){ + var chick=false; + //list of all giftable factions enum numbers + var giftable_factions = [eFACTION.Imperium, eFACTION.Mechanicus,eFACTION.Inquisition,eFACTION.Ecclesiarchy,eFACTION.Eldar,eFACTION.Tau] + for (var i = 0; i < array_length(giftable_factions); i++){ + var gift_faction = giftable_factions[i]; + if (known[gift_faction] && !faction_defeated[gift_faction]) then chick=true; + } + return chick; +} + +function setup_gift_popup(){ + if (are_giftable_factions()){ + var pop=instance_create(0,0,obj_popup); + pop.type=9; + with (pop){ + cancel_button = new UnitButtonObject( + { + x1: 700, + y1: 370, + style : "pixel", + label : "Cancel", + } + ); + + fac_buttons = []; + + for (var i=2;i<=8;i++){ + if (i==7){ + continue; + } + var _y1 = 131; + if (i>2){ + var _y1 = _last_y; + } + var _fac_but = new UnitButtonObject( + { + x1: 660, + w : 147, + set_width : true, + y1: _y1, + style : "pixel", + label : obj_controller.faction[i], + faction : i, + tooltip : $"Disposition : {obj_controller.disposition[i]}", + } + ); + var _last_y = _fac_but.y2; + array_push(fac_buttons, _fac_but); + } + } + return pop; + } +} +function setup_gift_artifact_popup(){ + setup_gift_popup(); +} + +function setup_gift_stc_popup(){ + var _pip = setup_gift_popup(); + if (instance_exists(obj_popup)){ + _pip.subtype = 1; + } +} + +function gift_stc_fragment(){ + + var r1,r2,cn;r2=0;cn=obj_controller; + r1=floor(random(cn.stc_wargear_un+cn.stc_vehicles_un+cn.stc_ships_un))+1; + + if (r10) then r2=1; + if (r1>cn.stc_wargear_un) and (r1<=cn.stc_wargear_un+cn.stc_vehicles_un) and (cn.stc_vehicles_un>0) then r2=2; + if (r1>cn.stc_wargear_un+cn.stc_vehicles_un) and (r2<=cn.stc_wargear_un+cn.stc_vehicles_un+cn.stc_ships_un) and (cn.stc_ships_un>0) then r2=3; + + if (cn.stc_wargear_un>0) and (cn.stc_vehicles_un+cn.stc_ships_un=0) then r2=1; + if (cn.stc_vehicles_un>0) and (cn.stc_wargear_un+cn.stc_ships_un=0) then r2=2; + if (cn.stc_ships_un>0) and (cn.stc_vehicles_un+cn.stc_wargear_un=0) then r2=3; + + cn.stc_un_total-=1; + if (r2=1) then cn.stc_wargear_un-=1; + if (r2=2) then cn.stc_vehicles_un-=1; + if (r2=3) then cn.stc_ships_un-=1; + + // Modify disposition here + if (giveto = eFACTION.Imperium){ + obj_controller.disposition[giveto]+=3; + } + else if (giveto = eFACTION.Mechanicus){ + obj_controller.disposition[giveto]+=choose(5,6,7,8); + } + else if (giveto = eFACTION.Inquisition){ + obj_controller.disposition[giveto]+=3; + } + else if (giveto = eFACTION.Ecclesiarchy) { + obj_controller.disposition[giveto]+=3; + } + + if (giveto=eFACTION.Eldar) + obj_controller.disposition[giveto] +=2; + if (giveto=eFACTION.Tau) { + obj_controller.disposition[giveto]+=15; + }// 137 ; chance for mechanicus to get very pissed + // End disposition + obj_controller.cooldown=7000; + scr_toggle_diplomacy(); + obj_controller.diplomacy=giveto; + obj_controller.force_goodbye=-1; + var the; + the=""; + if (giveto!=eFACTION.Ork) and (giveto!=eFACTION.Chaos) then the="the "; + + scr_event_log("",$"STC Fragment gifted to {the}{obj_controller.faction[giveto]}."); + + with(obj_controller ) { + scr_dialogue("stc_thanks"); + } + instance_destroy(); + exit; +} \ No newline at end of file diff --git a/scripts/scr_gift_items/scr_gift_items.yy b/scripts/scr_gift_items/scr_gift_items.yy new file mode 100644 index 0000000000..c04fc3dfcd --- /dev/null +++ b/scripts/scr_gift_items/scr_gift_items.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_gift_items", + "isCompatibility":false, + "isDnD":false, + "name":"scr_gift_items", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_ground_ai_helpers/scr_ground_ai_helpers.gml b/scripts/scr_ground_ai_helpers/scr_ground_ai_helpers.gml index 7f834040c6..fb507282b0 100644 --- a/scripts/scr_ground_ai_helpers/scr_ground_ai_helpers.gml +++ b/scripts/scr_ground_ai_helpers/scr_ground_ai_helpers.gml @@ -18,6 +18,36 @@ function planet_imperial_base_enemies(planet, star="none"){ } } + +function has_imperial_enemies(planet, system){ + var _enemies = system.p_orks[planet]+system.p_chaos[planet]+system.p_tyranids[planet]+system.p_necrons[planet]+system.p_tau[planet]+system.p_traitors[planet]; + + if (obj_controller.faction_status[eFACTION.Imperium] == "War"){ + _enemies += system.p_player[planet]; + } + + return _enemies; +} + +function guard_find_planet_with_most_enemy_forces(system, current_planet = 0){ + var _next_planet=0,_highest=0; + for (var o=1; o <= system.planets;o++){ + if (current_planet == 0 && system.p_guardsmen[o]>0){ + current_planet = o; + } + var _enemy_count = has_imperial_enemies(o, system); + if (_enemy_count > _highest && system.p_type[o]!="Daemon"){ + _next_planet=o; + _highest = _enemy_count; + } + } + if (_next_planet == current_planet){ + _next_planet = 0; + } + + return [_next_planet,current_planet]; +} + function ensure_no_planet_negatives(planet){ if (p_eldar[planet]<0) then p_eldar[planet]=0; if (p_orks[planet]<0) then p_orks[planet]=0; diff --git a/scripts/scr_hit/scr_hit.gml b/scripts/scr_hit/scr_hit.gml index 0e6210750d..23b1a9bac6 100644 --- a/scripts/scr_hit/scr_hit.gml +++ b/scripts/scr_hit/scr_hit.gml @@ -2,19 +2,23 @@ /// @description Returns true if mouse is hovering on the specified rectangle area. /// @returns {bool} function scr_hit(x1=0, y1=0, x2=0, y2=0) { - var mouse_consts = return_mouse_consts(); + var _mouse_consts = return_mouse_consts(); if (is_array(x1)){ - return point_in_rectangle(mouse_consts[0],mouse_consts[1],x1[0],x1[1],x1[2],x1[3]); + return point_in_rectangle(_mouse_consts[0],_mouse_consts[1],x1[0],x1[1],x1[2],x1[3]); } else { - return point_in_rectangle(mouse_consts[0],mouse_consts[1],x1, y1, x2, y2); + return point_in_rectangle(_mouse_consts[0],_mouse_consts[1],x1, y1, x2, y2); } - return false; - } function scr_hit_relative(x1, relative = [0,0]){ - var mouse_consts = return_mouse_consts(); - return point_in_rectangle(mouse_consts[0],mouse_consts[1],relative[0] + x1[0],relative[1] + x1[1],relative[0] + x1[2],relative[1] + x1[3]); + var _mouse_consts = return_mouse_consts(); + return point_in_rectangle(_mouse_consts[0],_mouse_consts[1],relative[0] + x1[0],relative[1] + x1[1],relative[0] + x1[2],relative[1] + x1[3]); +} + +function scr_hit_dimensions(x1=0, y1=0,w=0,h=0){ + var _mouse_consts = return_mouse_consts(); + return point_in_rectangle(_mouse_consts[0],_mouse_consts[1],x1, y1,x1+w, y1+h); + } /// @function point_and_click @@ -59,36 +63,42 @@ function point_and_click(rect, cooldown = 60, lock_bypass = false) { } } - var mouse_consts = return_mouse_consts(); - var point_check = point_in_rectangle(mouse_consts[0], mouse_consts[1], rect[0], rect[1],rect[2], rect[3]); + var _mouse_consts = return_mouse_consts(); + var point_check = point_in_rectangle(_mouse_consts[0], _mouse_consts[1], rect[0], rect[1],rect[2], rect[3]); if (point_check && cooldown > 0) { if (controller_exist) { obj_controller.cooldown = cooldown * delta_time/1000000; if(is_debug_overlay_open()){ - show_debug_message($"Cooldown Set! {array_to_string_list(debug_get_callstack(), true)}"); + show_debug_message_adv($"Cooldown Set! {array_to_string_list(debug_get_callstack(), true)}"); } } if (main_menu_exists) { obj_main_menu.cooldown = cooldown * delta_time/1000000; if(is_debug_overlay_open()){ - show_debug_message($"Cooldown Set! {array_to_string_list(debug_get_callstack(), true)}"); + show_debug_message_adv($"Cooldown Set! {array_to_string_list(debug_get_callstack(), true)}"); } } else if (creation_screen_exists) { obj_creation.cooldown = cooldown * delta_time/1000000; if(is_debug_overlay_open()){ - show_debug_message($"Cooldown Set! {array_to_string_list(debug_get_callstack(), true)}"); + show_debug_message_adv($"Cooldown Set! {array_to_string_list(debug_get_callstack(), true)}"); } } // log_message("scr_click_left: clicked and set cooldown!"); - // show_debug_message($"{array_to_string_list(debug_get_callstack())}"); + // show_debug_message_adv($"{array_to_string_list(debug_get_callstack())}"); } if(is_debug_overlay_open()){ - show_debug_message($"Mouse Clicked at: x: {mouse_consts[0]} y: {mouse_consts[1]} {array_to_string_list(debug_get_callstack(), true)}!"); + show_debug_message_adv($"Mouse Clicked at: x: {_mouse_consts[0]} y: {_mouse_consts[1]} {array_to_string_list(debug_get_callstack(), true)}!"); } return true; } +function point_and_click_sprite(x1, y1, sprite, x_scale = 1, y_scale = 1){ + var _width = sprite_get_width(sprite) * x_scale; + var _height = sprite_get_height(sprite) * y_scale; + return point_and_click([x1, y1, x1 +_width, y1 + _height]); +} + function scr_click_left(cooldown = 60, lock_bypass = false){ if (lock_bypass == false && global.ui_click_lock == true) { return false; @@ -106,10 +116,10 @@ function scr_click_left(cooldown = 60, lock_bypass = false){ return false; } else if (controller_exist && cooldown > 0) { // log_message("scr_click_left: clicked and set cooldown!"); - // show_debug_message($"{array_to_string_list(debug_get_callstack())}"); + // show_debug_message_adv($"{array_to_string_list(debug_get_callstack())}"); obj_controller.cooldown = cooldown * delta_time/1000000; if(is_debug_overlay_open()){ - show_debug_message($"Cooldown Set! {array_to_string_list(debug_get_callstack(), true)}"); + show_debug_message_adv($"Cooldown Set! {array_to_string_list(debug_get_callstack(), true)}"); } } else if (!controller_exist) { var main_menu_exists = instance_exists(obj_main_menu); @@ -122,7 +132,7 @@ function scr_click_left(cooldown = 60, lock_bypass = false){ } else if (cooldown > 0) { obj_main_menu.cooldown = cooldown * delta_time/1000000; if(is_debug_overlay_open()){ - show_debug_message($"Cooldown Set! {array_to_string_list(debug_get_callstack(), true)}"); + show_debug_message_adv($"Cooldown Set! {array_to_string_list(debug_get_callstack(), true)}"); } } } else if (creation_screen_exists) { @@ -133,14 +143,14 @@ function scr_click_left(cooldown = 60, lock_bypass = false){ } else if (cooldown > 0) { obj_creation.cooldown = cooldown * delta_time/1000000; if(is_debug_overlay_open()){ - show_debug_message($"Cooldown Set! {array_to_string_list(debug_get_callstack(), true)}"); + show_debug_message_adv($"Cooldown Set! {array_to_string_list(debug_get_callstack(), true)}"); } } } } if(is_debug_overlay_open()){ - show_debug_message($"Mouse Clicked! {array_to_string_list(debug_get_callstack(), true)}"); + show_debug_message_adv($"Mouse Clicked! {array_to_string_list(debug_get_callstack(), true)}"); } return mouse_clicked; @@ -179,9 +189,11 @@ function mouse_button_held(_button = mb_left) { } function return_mouse_consts(){ + var mouse_const_x; + var mouse_const_y; if (event_number==ev_gui){ - var mouse_const_x = device_mouse_x_to_gui(0); - var mouse_const_y = device_mouse_y_to_gui(0); + mouse_const_x = device_mouse_x_to_gui(0); + mouse_const_y = device_mouse_y_to_gui(0); } else { mouse_const_x = mouse_x; mouse_const_y = mouse_y; @@ -190,8 +202,8 @@ function return_mouse_consts(){ } function mouse_distance_less(xx, yy, distance){ - var mouse_consts = return_mouse_consts(); - return (point_distance(xx,yy,mouse_consts[0],mouse_consts[1])<=distance) + var _mouse_consts = return_mouse_consts(); + return (point_distance(xx,yy,_mouse_consts[0],_mouse_consts[1])<=distance) } function return_mouse_consts_tooltip(){ diff --git a/scripts/scr_imperial_manage_fleet_functions/scr_imperial_manage_fleet_functions.gml b/scripts/scr_imperial_manage_fleet_functions/scr_imperial_manage_fleet_functions.gml index 34a5410ab2..acbeff0316 100644 --- a/scripts/scr_imperial_manage_fleet_functions/scr_imperial_manage_fleet_functions.gml +++ b/scripts/scr_imperial_manage_fleet_functions/scr_imperial_manage_fleet_functions.gml @@ -5,7 +5,7 @@ function new_colony_fleet (doner_star, doner_planet, target, target_planet, miss new_colonise_fleet.image_index=3; new_colonise_fleet.warp_able=false; - show_debug_message($"{doner_star.name}, {doner_planet}, {target.name}, {target_planet}"); + show_debug_message_adv($"{doner_star.name}, {doner_planet}, {target.name}, {target_planet}"); var doner_volume = 0; if (doner_star.p_large[doner_planet]) { doner_volume = (doner_star.p_population[doner_planet]*0.01)*power(10,8); @@ -32,8 +32,8 @@ function new_colony_fleet (doner_star, doner_planet, target, target_planet, miss new_colonise_fleet.cargo_data.colonize = new_cargo; - new_colonise_fleet.action_x=target.x; - new_colonise_fleet.action_y=target.y; + new_colonise_fleet.action_x = target.x; + new_colonise_fleet.action_y = target.y; new_colonise_fleet.target = target; with (new_colonise_fleet){ set_fleet_movement(); @@ -54,8 +54,29 @@ function fleet_has_cargo(desired_cargo, fleet="none"){ } } + +function fleet_add_cargo(new_cargo,data,overwrite = false,fleet = "none"){ + if (fleet == "none"){ + var _add = true; + if (fleet_has_cargo(new_cargo) && !overwrite){ + _add = false; + } + + if (_add){ + cargo_data[$ new_cargo] = data; + } + } else { + with (fleet){ + fleet_add_cargo(new_cargo,data,overwrite); + } + } +} + + + +//TODO integrate this into PlanetData constructor function deploy_colonisers(star){ - var lag=1,r=0; + var lag=1; var data = cargo_data.colonize; if (data.target_planet>0){ @@ -77,10 +98,13 @@ function deploy_colonisers(star){ } scr_alert("green","duhuhuhu",alert_string,star.x,star.y); } else { - for (r=1;r<=star.planets;r++){ - if (data.mission == "new_colony") && (star.p_population[r]<=0) then continue; + for (var r=1;r<=star.planets;r++){ + if (data.mission == "new_colony" && star.p_population[r]<=0){ + continue; + } + //TODO sort out some of the issues of this regarding difference with large and small planet populations if (star.p_type[r]!="") and (star.p_type[r]!="Dead") { - if (lag=1){ + if (lag == 1){ star.p_population[r] += data.colonists; star.p_large[r]=0; guardsmen=0; @@ -95,7 +119,6 @@ function deploy_colonisers(star){ star.dispo[r]=min(obj_ini.imperium_disposition,obj_controller.disposition[2])+irandom_range(-4,4); if (star.name=obj_ini.home_name) and (star.p_type[r]=obj_ini.home_type) and (obj_controller.homeworld_rule!=1) then star.dispo[r]=-5000; - } } } diff --git a/scripts/scr_imperial_manage_fleet_functions/scr_imperial_manage_fleet_functions.yy b/scripts/scr_imperial_manage_fleet_functions/scr_imperial_manage_fleet_functions.yy index 5db3b0403a..f6d451ca3a 100644 --- a/scripts/scr_imperial_manage_fleet_functions/scr_imperial_manage_fleet_functions.yy +++ b/scripts/scr_imperial_manage_fleet_functions/scr_imperial_manage_fleet_functions.yy @@ -5,8 +5,8 @@ "isDnD":false, "name":"scr_imperial_manage_fleet_functions", "parent":{ - "name":"Scripts", - "path":"folders/Scripts.yy", + "name":"fleet", + "path":"folders/Scripts/fleet.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/scr_imperial_navy_functions/scr_imperial_navy_functions.gml b/scripts/scr_imperial_navy_functions/scr_imperial_navy_functions.gml index 51c578bc55..0fa27ee7f9 100644 --- a/scripts/scr_imperial_navy_functions/scr_imperial_navy_functions.gml +++ b/scripts/scr_imperial_navy_functions/scr_imperial_navy_functions.gml @@ -1,3 +1,115 @@ +function navy_orbiting_planet_end_turn_action(){ + end_sequence_finished = false; + orbiting = instance_nearest(x,y,obj_star); + + var _war_with_player = obj_controller.faction_status[eFACTION.Imperium] == "War"; + if (trade_goods != "player_hold") { + + + if (trade_goods="" ){ + ///basicically if there is a player fleet enroute for this star and the player is at war with the navy it will trigger + ///meaning the navy fleet is going to sit and wait fot the player to arrive + if (orbiting.present_fleet[20]>0){ + end_sequence_finished = true; + } + } + + + // Check if the ground battle is victorious or not + if (!end_sequence_finished && _war_with_player && trade_goods="invading_player" && guardsmen_unloaded=1) { + navy_finish_destroying_player_world(); + } + + // Invade the player homeworld as needed + if (!end_sequence_finished){ + navy_attack_player_world(); + } + // Bombard the shit out of the player homeworld + if (!end_sequence_finished && _war_with_player && trade_goods="" && !guardsmen_unloaded ){ + navy_bombard_player_world(); + } + + + //hunt the player like the dog they are + if (!end_sequence_finished &&_war_with_player && action="" && trade_goods="" && guardsmen_unloaded=0) { + navy_hunt_player_assets() + } + + if (trade_goods=="building_ships"){ + var _forge = scr_get_planet_with_type(orbiting,"Forge"); + if (_forge == -1 || orbiting.p_owner[i] != eFACTION.Mechanicus){ + trade_goods = ""; + } else { + end_sequence_finished = true; + } + } + //Eldar shit I think? Doesn't check for eldar ships + new_navy_ships_forge(); + + + + //OK this calculates how many imperial guard the ships have and can have at a max + guardsmen_ratio = fleet_remaining_guard_ratio(); + + + if (action="" && guardsmen_unloaded){// Move from one planet to another + scr_navy_has_unloaded_guardsmen_turn_end(); + } + + + if (navy_strength_calc()<=14 && !guardsmen_unloaded){ + dock_navy_at_forge(); + + send_navy_to_forge(); + } + // Bombard the shit out of things when able + else if (trade_goods=="" && action==""){ + imperial_navy_bombard(); + } + + + // If the guardsmen all die then move on and find recruit world this should really be handled by guardsmen_ratio but will monitor for now + check_navy_guard_still_live(); + + // Go to recruiting grounds + if ((guardsmen_unloaded = 0 && guardsmen_ratio<0.5 && (trade_goods!="goto_forge") && trade_goods!="building_ships") || trade_goods="recr"){// determine what sort of planet is needed + scr_navy_find_recruit_world(); + } + // Get recruits + if (!end_sequence_finished && action == "" && (trade_goods == "goto_recruiting" || trade_goods == "recruiting")){ + scr_navy_recruit_new_guard(); + } + + if (trade_goods="recruited"){ + trade_goods=""; + } + + if (!end_sequence_finished){ + scr_navy_planet_action(); + } + /* */ + } +} + +function check_navy_guard_still_live(){ + var o=0; + if (guardsmen_unloaded){ + var o=0,guardsmen_dead=true; + repeat(orbiting.planets){ + o+=1; + if (orbiting.p_guardsmen[o]>0){ + guardsmen_dead=false; + break; + } + } + if (guardsmen_dead){ + guardsmen_unloaded=0; + guardsmen_ratio=0; + trade_goods=""; + } + } +} + function build_new_navy_fleet(construction_forge){ new_navy_fleet=instance_create(construction_forge.x,construction_forge.y,obj_en_fleet); @@ -18,7 +130,7 @@ function build_new_navy_fleet(construction_forge){ total_ships+=capital_number-1; total_ships+=round((frigate_number/2)); total_ships+=round((escort_number/4)); - if (total_ships<=1) and (capital_number+frigate_number+escort_number>0) then total_ships=1; + if (total_ships<=1 && capital_number+frigate_number+escort_number>0) then total_ships=1; choose_fleet_sprite_image() image_index=total_ships; image_speed=0; @@ -46,7 +158,9 @@ function new_navy_ships_forge(){ } } - if (!advance) then return false; + if (!advance){ + exit; + } //TODO here we can make fleet be restored more quickly by better forge worlds if (escort_number<12) { @@ -72,12 +186,12 @@ function new_navy_ships_forge(){ image_index=ii<=1?1:ii; } - if (capital_number>=1) and (frigate_number>=5) and (escort_number>=12){ - var i=0; + if (capital_number>=1 && frigate_number>=5 && escort_number>=12){ + var i=-1; repeat(capital_number){i+=1; capital_max_imp[i]=(((floor(random(15))+1)*1000000)+15000000)*2; } - i=0; + i=-1; repeat(frigate_number){i+=1; frigate_max_imp[i]=(500000+(floor(random(50))+1)*10000)*2; } @@ -85,10 +199,8 @@ function new_navy_ships_forge(){ } - //if (trade_goods="building_ships") or (!advance) then exit; - return advance; - } else{ - return true; + //if (trade_goods="building_ships" || !advance) then exit; + end_sequence_finished = true; } } //TODO further breakup into a nvay fleet functions script @@ -99,14 +211,14 @@ function navy_strength_calc(){ function dock_navy_at_forge(){ // Got to forge world - if (action="") and (trade_goods="goto_forge") and (instance_exists(orbiting)){ + if (action="" && trade_goods="goto_forge" && scr_star_has_planet_with_type(orbiting,"Forge")){ trade_goods="building_ships"; } } function send_navy_to_forge(){ // Quene a visit to a forge world - if (action="") and (trade_goods="") and (instance_exists(orbiting)){ + if (action="" && trade_goods=""){ var forge_list = []; with(obj_star){ @@ -130,62 +242,220 @@ function send_navy_to_forge(){ var target_forge = forge_list[go_there]; action_x=target_forge.x; action_y=target_forge.y; - trade_goods="goto_forge";// show_message("D"); set_fleet_movement(); + } else { + scr_alert("Yellow","Sector Info","The sector has no active Forge Worlds as a result The imperial navy are unable to effectivly recover from Combat losses"); } } } function imperial_navy_bombard(){ - if (guardsmen_unloaded=0) or ((array_sum(orbiting.p_guardsmen)==0) and (guardsmen_unloaded=1)) or ((array_sum(orbiting.p_player)>0) and (obj_controller.faction_status[eFACTION.Imperium]=="War")){ - if (orbiting.present_fleet[6]+orbiting.present_fleet[7]+orbiting.present_fleet[8]+orbiting.present_fleet[9]+orbiting.present_fleet[10]+orbiting.present_fleet[13]=0){ - var hol=false; - if ((orbiting.present_fleet[1]>0) and (obj_controller.faction_status[eFACTION.Imperium]="War")) then hol=true; + if (turns_static < 12){ + exit; + } + var _fleets = get_orbiting_fleets([6,7,8,9,10,11,12,13],orbiting); + if (array_length(_fleets)){ + exit; + } + + if ((orbiting.present_fleet[1]>0 && obj_controller.faction_status[eFACTION.Imperium]="War")){ + exit; + } + + var _bombard = 0; + for (var p=0;p<=orbiting.planets;p++){ + if (orbiting.p_type[p]!="Daemon"){ + if (orbiting.p_population[p]=0 && orbiting.p_tyranids[p]>0){ + _bombard=p; + + } + else if (orbiting.p_population[p]=0 && orbiting.p_orks[p]>0 && orbiting.p_owner[p]=7){ + _bombard=p; + } + else if (orbiting.p_owner[p]=8 && orbiting.p_tau[p]+orbiting.p_pdf[p]>0){ + _bombard=p; + + } + else if (orbiting.p_owner[p]=10 && (orbiting.p_chaos[p]+orbiting.p_traitors[p]+orbiting.p_pdf[p]>0 || orbiting.p_heresy[p]>=50)){ + _bombard=p; + } + else{ + var _cults = return_planet_features(orbiting.p_feature[p],P_features.Gene_Stealer_Cult); + if (array_length(_cults)){ + if (!_cults[0].hiding){ + _bombard=p; + } + } + } + } + } + + if (_bombard>0){ + if (guardsmen_unloaded){ + navy_load_guardsmen(); + } + var _p_data = new PlanetData(_bombard, orbiting); + scare=(capital_number*3)+frigate_number; + _p_data.suffer_navy_bombard(scare); + end_sequence_finished = true; + } else { + + } +} + + +function navy_hunt_player_assets(){ + var hold = false; + + var player_owns_planet = scr_get_planet_with_owner(orbiting, eFACTION.Player); + hold = player_owns_planet or (orbiting.present_fleet[eFACTION.Player] > 0) + + + if (hold){ + // Chase player fleets + var chase_fleet = get_nearest_player_fleet(x,y, false, true); + if (chase_fleet!="none"){ + var thatp,my_dis; + etah=chase_fleet.eta; + + var intercept = fleet_intercept_time_calculate(chase_fleet); + if (intercept){ + + if (intercept<=etah) { + target = chase_fleet.id; + chase_fleet_target_set(target); + trade_goods="player_hold"; + exit; + } + } + with(obj_temp8){instance_destroy();} + } + // End chase + + + // Go after home planet or fleet? - if (hol=false){ - var p,bombard,deaths,hurss,scare,onceh,wob,kill; - p=0;bombard=0;deaths=0;hurss=0;onceh=0;wob=0;kill=0; + + if (trade_goods="" && action="") { + var homeworld_distance,homeworld_nearby,fleet_nearby,fleet_distance,planet_nearby; + homeworld_distance=9999;fleet_distance=9999;fleet_nearby=0;homeworld_nearby=0;planet_nearby=0; + + with(obj_p_fleet){ + if (action="") then instance_create(x,y,obj_temp7); + } + with(obj_star) { + if array_contains(p_owner, eFACTION.Player) + instance_create(x,y,obj_temp8); + } + + if (instance_exists(obj_temp7)) { + fleet_nearby=instance_nearest(x,y,obj_temp7); + fleet_distance=point_distance(x,y,fleet_nearby.x,fleet_nearby.y); + } + if (instance_exists(obj_temp8)) {homeworld_nearby=instance_nearest(x,y,obj_temp8); + homeworld_distance=point_distance(x,y,homeworld_nearby.x,homeworld_nearby.y)-30; + } + + if (homeworld_distance40) {// Go towards planet + action_x=homeworld_nearby.x; + action_y=homeworld_nearby.y; + with(obj_temp7){instance_destroy();} + with(obj_temp8){instance_destroy();} + exit; + } + + + + if (fleet_distance40 && instance_exists(obj_temp7)) {// Go towards that fleet + planet_nearby=instance_nearest(fleet_nearby.x,fleet_nearby.y,obj_star); - repeat(orbiting.planets){ - p+=1; - if (orbiting.p_type[p]!="Daemon"){ - if (orbiting.p_population[p]=0) and (orbiting.p_tyranids[p]>0) and (onceh=0){ - bombard=p; - onceh=1; + if (instance_exists(planet_nearby)){ + if (fleet_distance<=500 && planet_nearby!=orbiting){// Case 1; really close, wait for them to make the move + with(obj_temp7){ + instance_destroy(); } - if (orbiting.p_population[p]=0) and (orbiting.p_orks[p]>0) and (orbiting.p_owner[p]=7) and (onceh=0){bombard=p;onceh=1;} - if (orbiting.p_owner[p]=8) and (orbiting.p_tau[p]+orbiting.p_pdf[p]>0) and (onceh=0){ - bombard=p; - onceh=1; + with(obj_temp8){ + instance_destroy(); } - if (orbiting.p_owner[p]=10) and ((orbiting.p_chaos[p]+orbiting.p_traitors[p]+orbiting.p_pdf[p]>0) or (orbiting.p_heresy[p]>=50)){bombard=p;onceh=1;} + exit; + } + if (fleet_distance>500) {// Case 2; kind of far away, move closer + var diss=fleet_distance/2; + var goto=0; + var dirr=point_direction(x,y,fleet_nearby.x,fleet_nearby.y); + + with(orbiting){y-=20000;} + goto=instance_nearest(x+lengthdir_x(diss,dirr),y+lengthdir_x(diss,dirr),obj_star); + with(orbiting){y+=20000;} + if (goto.present_fleet[eFACTION.Player]=0) { + action_x=goto.x; + action_y=goto.y; + set_fleet_movement(); + } + + with(obj_temp7){instance_destroy();} + with(obj_temp8){instance_destroy();} + exit; } } - if (bombard>0){ - - var _p_data = new PlanetData(bombard, orbiting); - scare=(capital_number*3)+frigate_number; - _p_data.suffer_navy_bombard(scare); - - exit; - } } } - } -} + + with(obj_temp7){instance_destroy();} + with(obj_temp8){instance_destroy();} + /*var homeworld_distance,homeworld_nearby,fleet_nearby,fleet_distance; + homeworld_distance=9999;fleet_distance=9999;fleet_nearby=0;homeworld_nearby=0; + + with(obj_p_fleet){if (action!="") then y-=20000;}// Disable non-stationary player fleets + if (instance_exists(obj_p_fleet)){fleet_nearby=instance_nearest(x,y,obj_p_fleet);fleet_distance=point_distance(x,y,fleet_nearby.x,fleet_nearby.y);}// Get closest player fleet + with(obj_star){if (owner = eFACTION.Player) then instance_create(x,y,obj_temp7);}// Create temp7 at player stars + if (instance_exists(obj_temp7)){homeworld_nearby=instance_nearest(x,y,obj_temp7);homeworld_distance=point_distance(x,y,homeworld_nearby.x,homeworld_nearby.y);}// Get closest star + with(obj_p_fleet){if (y<-10000) then y+=20000;}// Enable non-stationary player fleets + + if (homeworld_distance<=fleet_distance && homeworld_distance<7000 && instance_exists(homeworld_nearby)){// Go towards planet + action_x=homeworld_nearby.x;action_y=homeworld_nearby.y;set_fleet_movement();;exit; + } + + + */ + } +} + +function navy_finish_destroying_player_world(){ + + //slightly more verbose than the last way, but reduces reliance on fixed array sizes + var tar = array_reduce(orbiting.p_guardsmen, function(prev, _curr, idx) { + return _curr > 0 ? idx : prev; + },0) + + if (tar == 0) {// Guard all dead + trade_goods="recr"; + action=""; + } else { //this was always a dead path previously since tar could never be bigger than i, now it will + var _targ = new PlanetData(tar, orbiting); + if (orbiting.p_owner[tar]=eFACTION.Player && orbiting.p_player[tar]=0 && planet_feature_bool(orbiting.p_feature[tar],P_features.Monastery)==0){ + _targ.return_to_first_owner(); + _targ.add_disposition(-50); + trade_goods=""; + action=""; + } + } +} function navy_attack_player_world(){ - if (obj_controller.faction_status[eFACTION.Imperium]="War") and (trade_goods="invade_player") and (guardsmen_unloaded=0){ + if (obj_controller.faction_status[eFACTION.Imperium]="War" && trade_goods="invade_player" && guardsmen_unloaded=0){ if (instance_exists(orbiting)){ var tar=0; var i=0; for (i = 1; i <= orbiting.planets; i++) { if (orbiting.p_owner[i]=eFACTION.Player) and (planet_feature_bool(orbiting.p_feature[i],P_features.Monastery)==0) - and (orbiting.p_guardsmen[i]=0) - then tar=i; + and (orbiting.p_guardsmen[i]==0) { + tar=i; + } + } if (tar){ guardsmen_unloaded=1; @@ -218,128 +488,195 @@ function navy_attack_player_world(){ } } } +} + +function navy_bombard_player_world(){ + var bombard=false; + if (orbiting!=noone){ + if (orbiting.object_index==obj_star) then bombard=true; + } + if (bombard){ + var orbiting_guardsmen = array_sum(orbiting.p_guardsmen); + var player_forces = array_sum(orbiting.p_player); + + if (orbiting_guardsmen == 0 || player_forces > 0) { + + //cleaned this up so it is easier to read, even though it reads more verbosely + var hostile_fleet_count = 0; + with(orbiting) { + hostile_fleet_count += present_fleet[eFACTION.Player] + + present_fleet[eFACTION.Eldar] + + present_fleet[eFACTION.Ork] + + present_fleet[eFACTION.Tau] + + present_fleet[eFACTION.Tyranids] + + present_fleet[eFACTION.Chaos] + + present_fleet[eFACTION.Necrons] + } + if (hostile_fleet_count == 0){ + + var bombard=0,deaths=0,hurss=0,onceh=0,wob=0,kill=0; + + for (var o=1;o<=orbiting.planets;o++){ + if (orbiting.p_owner[o]==eFACTION.Player){ + if (orbiting.p_population[o]+orbiting.p_pdf[o]>0) || (orbiting.p_player[o]>0){ + bombard=o; + break; + } + } + } + + if (bombard){ + var _orbiting_data = new PlanetData(bombard, orbiting); + scare=(capital_number*3)+frigate_number; + + if (scare>2) then scare=2; + if (scare<1) then scare=0; + //onceh=2; + + if (orbiting.p_large[bombard]) { + kill=scare*0.15; // Population if large + } else { + kill=scare*15000000; // pop if small + } + + var bombard_name = _orbiting_data.name(); + var bombard_report_string=$"Imperial Battlefleet bombards {bombard_name}."; + var PDF_loses=min(orbiting.p_pdf[bombard],(scare*15000000)/2); + + var civil_loss_mod = orbiting.p_large[bombard]?scare*0.15:scare*15000000; + var civilian_losses=min(orbiting.p_population[bombard],civil_loss_mod) + + + if (civilian_losses>0 && orbiting.p_large[bombard]=0) then { + bombard_report_string+=$" {civilian_losses} civilian casualties"; + } + if (civilian_losses>0 && orbiting.p_large[bombard]=1) { + if (civilian_losses>=1) then bombard_report_string+=$" {civilian_losses} billion civilian casualties"; + if (civilian_losses<1) then bombard_report_string+=$" {floor(civilian_losses*1000)} million civilian casualties"; + } + if (PDF_loses>0) then bombard_report_string+=$" and {scr_display_number(PDF_loses)} PDF lost."; + if (PDF_loses<=0 && civilian_losses>0) then bombard_report_string+="."; + if (civilian_losses=0 && PDF_loses>0) then bombard_report_string+=$" {PDF_loses} PDF lost."; + + if (bombard_report_string!="") { + scr_alert("red","owner",bombard_report_string,orbiting.x,orbiting.y); + scr_event_log("red",bombard_report_string, orbiting.name); + bombard_report_string=string_replace(bombard_report_string,",.",","); + } + + orbiting.p_pdf[bombard]-=(scare*15000000)/2; + if (orbiting.p_pdf[bombard]<0) then orbiting.p_pdf[bombard]=0; + + + orbiting.p_population[bombard]-=kill; + if (orbiting.p_population[bombard]<0) then orbiting.p_population[bombard]=0; + if (orbiting.p_pdf[bombard]<0) then orbiting.p_pdf[bombard]=0; + + if (orbiting.p_population[bombard]+orbiting.p_pdf[bombard]<=0 && orbiting.p_owner[bombard]=eFACTION.Player){ + if (planet_feature_bool(orbiting.p_feature[bombard], P_features.Monastery)==0) { + _orbiting_data.return_to_first_owner(); + _orbiting_data.add_disposition(-50) + } else { + trade_goods="invade_player"; + } + } + exit; + } + } + } + } } + + function fleet_max_guard(){ - var maxi=0, i=0; - for (i=1;i0) { - if (capital_number>i){ - capital_max_imp[i]=0; - } else if (capital_number<=i){ - maxi+=capital_max_imp[i]; - } - } - } - for (i=1;i0) { - if (frigate_number>i){ - frigate_max_imp[i]=0; - } else if (frigate_number<=i){ - maxi+=frigate_max_imp[i]; - } - } - } - for (i=1;i0) { - if (escort_number>i){ - escort_max_imp[i]=0; - } else if (escort_number<=i){ - maxi+=escort_max_imp[i]; - } - } - } - return maxi; + var _maxi=0; + + _maxi = array_sum(capital_max_imp,_maxi,0,capital_number-1); + _maxi = array_sum(frigate_max_imp,_maxi,0,frigate_number-1); + _maxi = array_sum(escort_max_imp,_maxi,0,escort_number-1); + return _maxi; } +///@mixin obj_en_fleet function fleet_guard_current(){ - var curr=0,i=0; - for (i=1;i0){ - if (capital_number<=i){ - if (!guardsmen_unloaded){ - curr+=capital_imp[i]; - } - } - } - } - for (i=1;i0){ - if (frigate_number<=i){ - if (!guardsmen_unloaded){ - curr+=frigate_imp[i]; - } - } - } - } - - for (i=1;i0){ - if (escort_number<=i){ - if (!guardsmen_unloaded){ - curr+=escort_imp[i]; - } - } - } - } - return curr; + var _maxi=0; + _maxi = array_sum(capital_imp,_maxi,0,capital_number-1); + _maxi = array_sum(frigate_imp,_maxi,0,frigate_number-1); + _maxi = array_sum(escort_imp,_maxi,0,escort_number-1); + return _maxi; } + +///@mixin obj_en_fleet function fleet_remaining_guard_ratio(){ - var curr=fleet_guard_current(); - var maxi = fleet_max_guard(); - guardsmen_ratio=1; - if (guardsmen_unloaded=0) then guardsmen_ratio=curr/maxi; - return guardsmen_ratio; + var _curr = fleet_guard_current(); + var _maxi = fleet_max_guard(); + guardsmen_ratio = 0; + if (guardsmen_unloaded) { + if (is_orbiting()){ + _curr = array_sum(orbiting.p_guardsmen); + } + + guardsmen_ratio = _curr/_maxi; + if (_curr <= 0){ + guardsmen_unloaded = false; + } + } + if (_maxi > 0){ + guardsmen_ratio = _curr/_maxi; + } + return clamp(guardsmen_ratio,0,1); } + +//TODO allow for splitting forces function scr_navy_unload_guard(planet){ - var total_guard = array_sum(capital_imp); - total_guard += array_sum(frigate_imp); - total_guard += array_sum(escort_imp); + var total_guard = fleet_guard_current(); array_set_value(frigate_imp, 0); array_set_value(escort_imp, 0); array_set_value(capital_imp, 0); - orbiting.p_guardsmen[planet] = total_guard; + + orbiting.p_guardsmen[planet] += total_guard; + guardsmen_unloaded=1; + end_sequence_finished = true; } function scr_navy_planet_action(){ - if (action=="") and (is_orbiting()) and (!guardsmen_unloaded){// Unload if problem sector, otherwise patrol - var selected_planet=0,highest=0,popu=0,popu_large=false; + if (action=="" && is_orbiting() && !guardsmen_unloaded){// Unload if problem sector, otherwise patrol + var selected_planet=0,highest=0,_target_pop=0,_popu_large=false; - for (var p=1;p<=orbiting.planets;p++){ + for (var p=1; p<=orbiting.planets; p++){ var planet_enemies = planet_imperial_base_enemies(p, orbiting); - if (planet_enemies > highest) and (orbiting.p_type[p]!="Daemon"){ + if (planet_enemies > highest && orbiting.p_type[p] != "Daemon"){ selected_planet=p; highest=planet_enemies; - popu=orbiting.p_population[p]; - if (orbiting.p_large[p]) then popu_large=true; + _target_pop=orbiting.p_population[p]; + if (orbiting.p_large[p]){ + _popu_large=true; + } } // New shit here, prioritize higher population worlds - if (planet_enemies>=highest) and (orbiting.p_type[p]!="Daemon") and (p>1){ - if (orbiting.p_orks[p]+orbiting.p_chaos[p]+orbiting.p_tyranids[p]+orbiting.p_necrons[p]+orbiting.p_tau[p]+orbiting.p_traitors[p]>0){ - var isnew=false; - - if (!popu_large) and (orbiting.p_large[p]=true) and (floor(popu/1000000000)=highest && orbiting.p_type[p]!="Daemon" && p>1){ + var _large_planet_pop = orbiting.p_large[p] + var _planet_pop = orbiting.p_population[p]; + if (has_imperial_enemies(p, orbiting)){ - if (isnew=true){ + if (population_larger(_large_planet_pop,_planet_pop,_popu_large,_target_pop)){ selected_planet=p; highest=planet_imperial_base_enemies(p, orbiting); - popu_large = orbiting.p_large[p]; + _popu_large = _large_planet_pop; } - } } - if (obj_controller.faction_status[eFACTION.Imperium]="War"){ - if (orbiting.p_owner[p]=1) and (orbiting.p_player[p]=0) and (highest=0){ + if (obj_controller.faction_status[eFACTION.Imperium]=="War"){ + if (orbiting.p_owner[p]=1 && orbiting.p_player[p]=0 && highest=0){ selected_planet=p; highest=0.5; } @@ -353,10 +690,11 @@ function scr_navy_planet_action(){ } } } + var _pdf_handling_it = (orbiting.p_influence[selected_planet][eFACTION.Imperium]>50) && (orbiting.p_pdf[selected_planet]>=0 && highest<=2); - if (selected_planet>0) and (highest>0) and (array_sum(orbiting.p_guardsmen)<=0){ - if (highest>2) or (orbiting.p_pdf[selected_planet]=0){ - scr_navy_unload_guard(selected_planet) + if (selected_planet>0 && highest>0 && array_sum(orbiting.p_guardsmen)<=0){ + if (!_pdf_handling_it){ + scr_navy_unload_guard(selected_planet); } } @@ -364,7 +702,7 @@ function scr_navy_planet_action(){ if (obj_controller.faction_status[eFACTION.Imperium]=="War"){ if (scr_orbiting_fleet(eFACTION.Player)!="none") then _player_planet=true; - for (var r=1;r<=orbiting.planets;r++){ + for (var r=1; r<=orbiting.planets; r++){ _player_planet = orbiting.p_owner[r]==eFACTION.Player; if (!_player_planet){ _player_planet = planet_feature_bool(orbiting.p_feature[r], P_features.Monastery); @@ -372,7 +710,7 @@ function scr_navy_planet_action(){ } } - if (selected_planet=0) and (highest=0) and (!_player_planet){ + if (((selected_planet == 0 && highest == 0) || _pdf_handling_it) && !_player_planet){ var halp=0; var stars_needing_help = []; @@ -390,7 +728,7 @@ function scr_navy_planet_action(){ if (_star_distance<=600){ - var star_to_rescue=instance_nearest(_current_star.x,_current_star.y,obj_star); + var star_to_rescue = instance_nearest(_current_star.x,_current_star.y,obj_star); with(star_to_rescue){ array_replace_value(p_halp, 1,1.1); } @@ -398,26 +736,32 @@ function scr_navy_planet_action(){ action_x=_current_star.x; action_y=_current_star.y; set_fleet_movement(); - halp=1;// show_message("F"); } } // Patrol otherwise if (halp=0){ - with(orbiting){y-=10000;} + with(orbiting){ + y-=10000; + } with(obj_star){ - if (craftworld=1) or (space_hulk=1) then y-=10000; + if (craftworld=1 || space_hulk=1) then y-=10000; } - var next,ndis; var ndir=floor(random_range(0,360))+1; if (y<=300) then ndir=floor(random_range(180,359))+1; - if (y>(room_height-300)) then ndir=floor(random_range(0,180))+1; - if (x<=300) then ndir=choose(floor(random_range(0,90))+1,floor(random_range(270,359))+1); - if (x>(room_width-300)) then ndir=floor(random_range(90,270))+1; + if (y>(room_height-300)){ + ndir=irandom_range(0,180); + } + if (x<=300){ + ndir=choose(irandom_range(1,91),irandom_range(270,360)); + } + if (x>(room_width-300)){ + ndir=irandom_range(90,270); + } ndis=random_range(200,400); - next=instance_nearest(x+lengthdir_x(ndis,ndir),y+lengthdir_y(ndis,ndir),obj_star); + var next=instance_nearest(x+lengthdir_x(ndis,ndir),y+lengthdir_y(ndis,ndir),obj_star); // next=instance_nearest(x,y,obj_star); with(obj_star){ @@ -427,8 +771,299 @@ function scr_navy_planet_action(){ action_x=next.x; action_y=next.y; - set_fleet_movement();// show_message("G"); } } } -} \ No newline at end of file +} + +function navy_load_up_guardsmen_or_move_planet(planet, valid_next_planet){ + var _player_war=false; + var _pdata = new PlanetData(planet, orbiting) + if (_pdata.player_forces>0 && obj_controller.faction_status[eFACTION.Imperium]=="War"){ + _player_war=true; + } + if (planet<=0 || _player_war){ + exit; + } + + if (valid_next_planet>0) {// Jump to next planet + orbiting.p_guardsmen[valid_next_planet] = _pdata.guardsmen; + _pdata.edit_guardsmen(-_pdata.guardsmen) + end_sequence_finished = true; + }else {// Get back onboard + navy_load_guardsmen(); + + trade_goods=""; + guardsmen_unloaded=false; + } +} + +function navy_load_guardsmen(){ + var _new_capacity; + var _maxi = fleet_max_guard(); + _new_capacity = min(array_sum(orbiting.p_guardsmen), _maxi); + + for (var i=0;i 0 && capital_number >= i){ + capital_imp[i] = min(capital_max_imp[i],_new_capacity); + _new_capacity -=capital_imp[i]; + } + if (_new_capacity > 0 && frigate_number >= i){ + frigate_imp[i] = min(frigate_max_imp[i],_new_capacity); + _new_capacity -=frigate_imp[i]; + } + + if (_new_capacity > 0 && capital_number >= i){ + escort_imp[i] = min(escort_max_imp[i],_new_capacity); + _new_capacity -=escort_imp[i]; + } + } + orbiting.p_guardsmen = array_create(5,0); +} + +function scr_navy_has_unloaded_guardsmen_turn_end(){ + var _next_planet=0,_current_planet=0; + + var _move_data = guard_find_planet_with_most_enemy_forces(orbiting); + + _next_planet = _move_data[0]; + _current_planet = _move_data[1]; + + // Move on, man + if (_current_planet){ + if (!has_imperial_enemies(_current_planet, orbiting)){ + navy_load_up_guardsmen_or_move_planet(_current_planet,_next_planet); + } + } else { + guardsmen_unloaded = false; + } +} + +function scr_navy_recruit_new_guard(){ + + + var o=0,that=0,te=0,te_large=0; + for (var o=1;o<=orbiting.planets;o++){ + if (orbiting.p_owner[o]<=5){ + var _imp_enemies = has_imperial_enemies(o, orbiting); + if (_imp_enemies){ + continue; + } + if (orbiting.p_population[o] <= 0){ + continue; + } + var _cur_large = orbiting.p_large[o]; + var _cur_pop = orbiting.p_population[o]; + if (that == 0 || population_larger(_cur_large,_cur_pop,te_large,te)){ + te = _cur_pop; + that = o; + te_large = _cur_large; + } + } + } + + var guard_wanted = fleet_max_guard() - fleet_guard_current(); + + var recruit_planet = new PlanetData(that, orbiting); + + // if (orbiting.p_population[that] guard_wanted || recruit_planet.large_population){ + if (recruit_planet.large_population) { + guard_wanted = recruit_planet.population_large_conversion(1000000000); + + } + var _max_array = max_array_length([capital_imp,frigate_imp,escort_imp]); + recruit_planet.edit_population(-guard_wanted); + for (var i=0;i<_max_array;i++){ + if (i50000) then planet_needed=2;// Feudal and up + if (_guard_wanted>200000) then planet_needed=3;// Temperate and up + if (_guard_wanted>2000000) then planet_needed=4;// Hive + trade_goods=""; + + var _nearest = -1; + if (planet_needed=1 || planet_needed=2){ + var good + var _eligible_stars = []; + var _start = id; + with(obj_star){ + for (var o =1 ; o<=planets;o++){ + if (planet_needed <= 3){ + if (!p_large[o] && p_population[o] < (_guard_wanted*6)){ + continue; + } + } + if (planet_needed < 5 && planet_needed > 2){ + if (p_large[o] && p_population[o]<0.1){ + continue; + } + } + if (planet_needed > 3 && !p_large[o]){ + continue; + } + if (scr_is_planet_owned_by_allies(self, o) && (p_type[o]!="Dead")){ + if (p_orks[o]+p_chaos[o]+p_tyranids[o]+p_necrons[o]+p_tau[o]+p_traitors[o] <= 0 && p_influence[o][eFACTION.Imperium] > 50) { + array_push(_eligible_stars, id); + if (!instance_exists(_nearest)){ + _nearest=id; + } else { + if (point_distance(x,y,_start.x,_start.y) < point_distance(_nearest.x,_nearest.y,_start.x,_start.y)){ + _nearest = id; + } + } + break; + } + } + } + } + } + + if (instance_exists(_nearest)){ + if (_nearest.id == id){ + trade_goods="recruiting"; + } else { + trade_goods="goto_recruiting"; + action_x=_nearest.x; + action_y=_nearest.y; + set_fleet_movement(); + end_sequence_finished = true; + } + } +} + + +function create_start_imperial_fleets(){ + // Create an imperial fleet + with(obj_controller){ + with(obj_p_fleet){ + var steh=instance_nearest(x,y,obj_star); + + var choices = [ + eFACTION.Player, + eFACTION.Imperium, + eFACTION.Mechanicus, + eFACTION.Inquisition, + eFACTION.Ecclesiarchy + ] + + for(var b=1; b<=4; b++) { + var is_valid = array_contains(choices, steh.p_first[b]) + if is_valid and (steh.dispo[b]>-30) and (steh.dispo[b]<0) { + var curr_imp_dispo = obj_controller.disposition[eFACTION.Imperium] + steh.dispo[b]=min(obj_ini.imperium_disposition,curr_imp_dispo)+choose(-1,-2,-3,-4,0,1,2,3,4); + } + } + if (steh.visited==0) { + for(var planet_num = 1; planet_num<5; planet_num++) { + if (array_length(steh.p_feature[planet_num])!=0) { + with(steh){ + scr_planetary_feature(planet_num); + } + } + } + steh.visited = 1 + } + } + + var _good_navy_stars = []; + + with(obj_star){ + var sco=0; + for(var o=1; o<=4; o++){ + if (p_type[o]="Hive") then sco+=3; + if (p_type[o]="Temperate") then sco+=1; + } + if (sco>=4){ + array_push(_good_navy_stars,id); + } + } + + if (array_length(_good_navy_stars) < target_navy_number){ + + with(obj_star) { + var sco=0; + for(var o=1; o<=planets; o++){ + if (p_type[o]=="Hive") then sco+=3; + if (p_type[o]=="Temperate") then sco+=1; + if (p_type[o]=="Shrine") then sco+=1; + } + if (sco>=3 && !array_contains(_good_navy_stars,id)){ + array_push(_good_navy_stars,id); + } + } + } + _good_navy_stars = array_shuffle(_good_navy_stars); + + for (var i=0; i= target_navy_number){ + break; + } + + var _star = _good_navy_stars[i]; + + setup_start_imperial_navy_fleet(_star); + + + } + } +} + +function setup_start_imperial_navy_fleet(system){ + var ii=0; + var nav = instance_create(system.x,system.y,obj_en_fleet); + var _star = system; + _star.present_fleet[eFACTION.Imperium] += 1; + with (nav){ + orbiting=system; + + owner=eFACTION.Imperium; + navy=1; + + capital_number = choose(1,2,3); + frigate_number = (capital_number*2)+3; + escort_number=12; + home_x=x; + home_y=y; + warp_able=true; + + image_speed=0; + ii+=capital_number-1; + ii+=round((frigate_number/2)); + ii+=round((escort_number/4)); + if (ii<=1) and (capital_number+frigate_number+escort_number>0){ + ii=1; + } + image_index=ii; + + for(var i=0; i_index ){ + escort_num[i]--; + } + } + for (var i=0;i_index ){ + capital_num[i]--; + } + } + for (var i=0;i_index ){ + frigate_num[i]--; + } + } + } array_delete(ship,index,1); array_delete(ship_uid,index,1); array_delete(ship_owner,index,1); diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml index 94a2757051..a4d7a0d7ef 100644 --- a/scripts/scr_initialize_custom/scr_initialize_custom.gml +++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml @@ -39,6 +39,42 @@ enum ePROGENITOR { RANDOM, } +enum eCHAPTER_TYPE { + PREMADE, + RANDOM, + CUSTOM, +} + +#macro WEAPON_LIST_RANGED_HEAVY_TERMINATOR ["Heavy Flamer", "Heavy Flamer", "Heavy Flamer", "Assault Cannon", "Assault Cannon", "Multi-Melta", "Plasma Cannon", "Grav-Cannon"] +#macro WEAPON_LIST_RANGED_HEAVY_LONG ["Heavy Bolter", "Heavy Bolter", "Heavy Bolter", "Heavy Bolter", "Missile Launcher", "Missile Launcher", "Missile Launcher", "Lascannon", "Lascannon", "Plasma Cannon", "Grav-Cannon"] +#macro WEAPON_LIST_RANGED_HEAVY_ASSAULT ["Heavy Flamer", "Heavy Flamer", "Heavy Flamer", "Multi-Melta"] +#macro WEAPON_LIST_RANGED_HEAVY array_concat(WEAPON_LIST_RANGED_HEAVY_LONG, WEAPON_LIST_RANGED_HEAVY_ASSAULT) +#macro WEAPON_LIST_RANGED_HEAVY_VETERAN ["Heavy Bolter", "Heavy Bolter", "Missile Launcher", "Lascannon", "Lascannon", "Multi-Melta", "Plasma Cannon", "Grav-Cannon"] + +#macro WEAPON_LIST_RANGED_SPECIAL_LONG ["Plasma Gun", "Plasma Gun", "Plasma Gun", "Grav-Gun"] +#macro WEAPON_LIST_RANGED_SPECIAL_ASSAULT ["Flamer", "Flamer", "Flamer", "Meltagun"] +#macro WEAPON_LIST_RANGED_SPECIAL array_concat(WEAPON_LIST_RANGED_SPECIAL_LONG, WEAPON_LIST_RANGED_SPECIAL_ASSAULT) + +#macro WEAPON_LIST_RANGED_COMBI_LONG ["Storm Bolter", "Storm Bolter", "Storm Bolter", "Storm Bolter", "Combiplasma", "Combiplasma", "Combigrav"] +#macro WEAPON_LIST_RANGED_COMBI_ASSAULT ["Combiflamer", "Combiflamer", "Combiflamer", "Combimelta"] +#macro WEAPON_LIST_RANGED_COMBI array_concat(WEAPON_LIST_RANGED_COMBI_LONG, WEAPON_LIST_RANGED_COMBI_ASSAULT) + +#macro WEAPON_LIST_RANGED_PISTOLS_LONG ["Bolt Pistol", "Bolt Pistol", "Bolt Pistol", "Plasma Pistol", "Plasma Pistol", "Grav-Pistol"] +#macro WEAPON_LIST_RANGED_PISTOLS_ASSAULT ["Hand Flamer", "Hand Flamer", "Hand Flamer", "Infernus Pistol"] +#macro WEAPON_LIST_RANGED_PISTOLS array_concat(WEAPON_LIST_RANGED_PISTOLS_LONG, WEAPON_LIST_RANGED_PISTOLS_ASSAULT) + +#macro WEAPON_LIST_RANGED_VETERAN array_concat(["Bolter", "Bolter", "Bolter"], WEAPON_LIST_RANGED_COMBI) +#macro WEAPON_LIST_RANGED array_concat(WEAPON_LIST_RANGED_PISTOLS_LONG, WEAPON_LIST_RANGED_VETERAN) + + +#macro WEAPON_LIST_MELEE_BASIC ["Chainsword", "Chainsword", "Chainaxe"] +#macro WEAPON_LIST_MELEE_1H ["Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Power Sword", "Power Sword", "Power Sword", "Lightning Claw", "Lightning Claw", "Lightning Claw", "Power Fist", "Power Fist", "Thunder Hammer"] +#macro WEAPON_LIST_MELEE_HEAVY ["Eviscerator", "Eviscerator", "Eviscerator", "Eviscerator", "Eviscerator", "Heavy Thunder Hammer"] +#macro WEAPON_LIST_MELEE_VETERAN ["Chainsword", "Chainsword", "Chainsword", "Power Sword", "Power Sword", "Power Sword", "Lightning Claw", "Lightning Claw", "Lightning Claw", "Power Fist", "Power Fist", "Thunder Hammer"] + + +#macro WEAPON_LIST_WEIGHTED_RANGED_PISTOLS [["Bolt Pistol", 4], ["Plasma Pistol", 2], ["Grav-Pistol", 1]] + function progenitor_map(){ var founding_chapters = [ "", @@ -107,7 +143,7 @@ function select_livery_data(livery_data, specific) { function helmet_livery(progenitor, specific = "none") { var livery_data; - if ((obj_creation.custom == 0) && (global.chapter_creation_object.origin == 1)) { + if ((obj_creation.custom == eCHAPTER_TYPE.PREMADE) && (global.chapter_creation_object.origin == 1)) { progenitor = progenitor_map(); } @@ -615,7 +651,7 @@ function trial_map(trial_name){ /// @mixin obj_ini function scr_initialize_custom() { - // show_debug_message("Executing scr_initialize_custom"); + // show_debug_message_adv("Executing scr_initialize_custom"); progenitor = obj_creation.founding; successors = obj_creation.successors; @@ -664,7 +700,8 @@ function scr_initialize_custom() { global.chapter_name = obj_creation.chapter_name; global.founding = obj_creation.founding; global.founding_secret = ""; - global.game_seed = floor(random(99999999)) + string_to_integer(global.chapter_name) + string_to_integer(obj_creation.chapter_master_name); + randomise(); + global.game_seed = random_get_seed(); if (progenitor == ePROGENITOR.RANDOM) { @@ -786,7 +823,7 @@ function scr_initialize_custom() { * * Fleet based and Penitent * - 4 Battle Barges, 3 Strike Cruisers, 7 Gladius, 3 Hunters */ - if (obj_creation.custom == 0) { + if (obj_creation.custom == eCHAPTER_TYPE.PREMADE) { flagship_name = obj_creation.flagship_name; if (obj_creation.fleet_type == ePlayerBase.home_world) { battle_barges = 2; @@ -799,16 +836,8 @@ function scr_initialize_custom() { gladius = 7; hunters = 3; } - - battle_barges = battle_barges + obj_creation.extra_ships.battle_barges; - strike_cruisers = strike_cruisers + obj_creation.extra_ships.strike_cruisers; - gladius = gladius + obj_creation.extra_ships.gladius; - hunters = hunters + obj_creation.extra_ships.hunters; - } - if (scr_has_adv ("Kings of Space")) {battle_barges += 1;} - if (scr_has_adv("Boarders")){ strike_cruisers += 2;} if (scr_has_disadv("Obliterated")){ if (obj_creation.fleet_type == ePlayerBase.home_world) { battle_barges = 0; strike_cruisers = 2; @@ -821,9 +850,18 @@ function scr_initialize_custom() { hunters = 0; } } + if (scr_has_adv ("Kings of Space")) {battle_barges += 1;} + if (scr_has_adv("Boarders")){ strike_cruisers += 2;} + if(struct_exists(obj_creation, "extra_ships")){ + battle_barges = battle_barges + obj_creation.extra_ships.battle_barges; + strike_cruisers = strike_cruisers + obj_creation.extra_ships.strike_cruisers; + gladius = gladius + obj_creation.extra_ships.gladius; + hunters = hunters + obj_creation.extra_ships.hunters; + } + var ship_summary_str = $"Ships: bb: {battle_barges} sc: {strike_cruisers} g: {gladius} h: {hunters}" // log_message(ship_summary_str); - // show_debug_message(ship_summary_str); + // show_debug_message_adv(ship_summary_str); if (battle_barges>=1){ for (v=0;v ePROGENITOR.NONE && progenitor < ePROGENITOR.RANDOM) { - if (obj_creation.strength <= 4) then ninth = 0; - if (obj_creation.strength <= 3) then eighth = 0; - if (obj_creation.strength <= 2) then seventh = 0; - if (obj_creation.strength <= 1) then sixth = 0; - - var bonus_marines = 0; - if (obj_creation.strength > 5) then bonus_marines = (obj_creation.strength - 5) * 50; - } - - if (obj_creation.custom != 0) { - var bonus_marines = 0; - if (obj_creation.strength > 5) then bonus_marines = (obj_creation.strength - 5) * 50; - if scr_has_disadv("Obliterated") then bonus_marines = (obj_creation.strength - 1) * 10; - var i = 0; - while (bonus_marines >= 5) { - switch (i % 10) { - case 0: - if (veteran > 0) { - bonus_marines -= 5; - veteran += 5; - } - break; - case 1: - if (second > 0) { - bonus_marines -= 5; - second += 5; - } - break; - case 2: - if (third > 0) { - bonus_marines -= 5; - third += 5; - } - break; - case 3: - if (fourth > 0) { - bonus_marines -= 5; - fourth += 5; - } - break; - case 4: - if (fifth > 0) { - bonus_marines -= 5; - fifth += 5; - } - break; - case 5: - if (sixth > 0) { - bonus_marines -= 5; - sixth += 5; - } - break; - case 6: - if (seventh > 0) { - bonus_marines -= 5; - seventh += 5; - } - break; - case 7: - if (eighth > 0) { - bonus_marines -= 5; - eighth += 5; - } - break; - case 8: - if (ninth > 0) { - bonus_marines -= 5; - ninth += 5; - } - break; - case 9: - if (tenth > 0) { - bonus_marines -= 5; - tenth += 5; - } - break; - } - i++; + + if (obj_creation.strength <= 4) then ninth = 0; + if (obj_creation.strength <= 3) then eighth = 0; + if (obj_creation.strength <= 2) then seventh = 0; + if (obj_creation.strength <= 1) then sixth = 0; + + var bonus_marines = 0; + if (obj_creation.strength > 5) then bonus_marines = (obj_creation.strength - 5) * 50; + if scr_has_disadv("Obliterated") then bonus_marines = (obj_creation.strength - 1) * 10; + var i = 0; + while (bonus_marines >= 5) { + switch (i % 10) { + case 0: + if (veteran > 0) { + bonus_marines -= 5; + veteran += 5; + } + break; + case 1: + if (second > 0) { + bonus_marines -= 5; + second += 5; + } + break; + case 2: + if (third > 0) { + bonus_marines -= 5; + third += 5; + } + break; + case 3: + if (fourth > 0) { + bonus_marines -= 5; + fourth += 5; + } + break; + case 4: + if (fifth > 0) { + bonus_marines -= 5; + fifth += 5; + } + break; + case 5: + if (sixth > 0) { + bonus_marines -= 5; + sixth += 5; + } + break; + case 6: + if (seventh > 0) { + bonus_marines -= 5; + seventh += 5; + } + break; + case 7: + if (eighth > 0) { + bonus_marines -= 5; + eighth += 5; + } + break; + case 8: + if (ninth > 0) { + bonus_marines -= 5; + ninth += 5; + } + break; + case 9: + if (tenth > 0) { + bonus_marines -= 5; + tenth += 5; + } + break; } + i++; } if (struct_exists(obj_creation, "extra_specialists")) { @@ -1200,7 +1231,7 @@ function scr_initialize_custom() { for (var s = 0; s < array_length(c_specialist_names); s++) { var s_name = c_specialist_names[s]; var s_val = struct_get(c_specialists, s_name); - // show_debug_message($"updating specialist {s_name} with {s_val})"); + // show_debug_message_adv($"updating specialist {s_name} with {s_val})"); switch (s_name) { case "chaplains": chaplains = chaplains + real(s_val); @@ -1244,6 +1275,10 @@ function scr_initialize_custom() { case "devastator": devastator = devastator + real(s_val); break; + case "dreadnought": + case "Contemptor Dreadnought": + dreadnought = dreadnought + real(s_val); + break; } } } @@ -1273,7 +1308,7 @@ function scr_initialize_custom() { if(epistolary <= 0) {epistolary_per_company = 0}; - if (obj_creation.custom == 0) { + if (obj_creation.custom == eCHAPTER_TYPE.PREMADE) { if (veteran >= 20) and(global.founding = ePROGENITOR.NONE) { veteran -= 20; terminator += 20; @@ -1350,7 +1385,6 @@ function scr_initialize_custom() { // Initialize default marines for loadouts for (var i = 0; i <= 100; i++) { race[100, i] = 1; - loc[100, i] = ""; name[100, i] = ""; role[100, i] = ""; wep1[100, i] = ""; @@ -1366,11 +1400,9 @@ function scr_initialize_custom() { // Initialize special marines for (var i = 0; i <= 500; i++) { race[0, i] = 1; - loc[0, i] = ""; name[0, i] = ""; role[0, i] = ""; wep1[0, i] = ""; - bio[0, i] = 0; spe[0, i] = ""; wep2[0, i] = ""; armour[0, i] = ""; @@ -1426,11 +1458,11 @@ function scr_initialize_custom() { load_default_gear(eROLE.Scout, "Scout", "Bolter", "Combat Knife", "Scout Armour", "", ""); load_default_gear(eROLE.Chaplain, "Chaplain", "Crozius Arcanum", "Bolt Pistol", STR_ANY_POWER_ARMOUR, "", "Rosarius"); load_default_gear(eROLE.Apothecary, "Apothecary", "Chainsword", "Bolt Pistol", STR_ANY_POWER_ARMOUR, "", "Narthecium"); - load_default_gear(eROLE.Techmarine, "Techmarine", "Power Axe", "Bolt Pistol", _hi_qual_armour, "Servo-arm", ""); + load_default_gear(eROLE.Techmarine, "Techmarine", "Omnissian Axe", "Bolt Pistol", _hi_qual_armour, "Servo-arm", ""); load_default_gear(eROLE.Librarian, "Librarian", "Force Staff", "Bolt Pistol", STR_ANY_POWER_ARMOUR, "", "Psychic Hood"); load_default_gear(eROLE.Sergeant, "Sergeant", "Chainsword", "Bolt Pistol", STR_ANY_POWER_ARMOUR, "", ""); load_default_gear(eROLE.VeteranSergeant, "Veteran Sergeant", "Chainsword", "Plasma Pistol", STR_ANY_POWER_ARMOUR, "", ""); - + if(struct_exists(obj_creation, "custom_roles")){ var c_roles = obj_creation.custom_roles; @@ -1472,7 +1504,7 @@ function scr_initialize_custom() { var value = c_roles[$ c_rolename][$ attribute]; // var dbg_m = $"role {c_roleid} {c_rolename} updated {attribute} to {typeof(value)} {value}"; // log_message(dbg_m); - // show_debug_message(dbg_m); + // show_debug_message_adv(dbg_m); switch (attribute){ case "name": role[defaults_slot][c_roleid] = value; break; case "wep1": wep1[defaults_slot][c_roleid] = value; break; @@ -1510,23 +1542,7 @@ function scr_initialize_custom() { veteran_sergeant: role[defaults_slot][eROLE.VeteranSergeant], } // log_message($"roles: {json_stringify(roles, true)}") - - var weapon_lists = { - heavy_weapons: ["Heavy Bolter", "Heavy Bolter", "Heavy Bolter", "Heavy Bolter", "Missile Launcher", "Missile Launcher", "Multi-Melta", "Lascannon"], - special_weapons: ["Flamer", "Flamer", "Flamer", "Meltagun", "Meltagun", "Plasma Gun"], - melee_weapons: ["Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Power Sword", "Power Sword", "Power Sword", "Lightning Claw", "Lightning Claw", "Lightning Claw", "Power Fist", "Power Fist"], - ranged_weapons: ["Bolter", "Bolter", "Bolter", "Bolter", "Bolter", "Bolter", "Storm Bolter", "Storm Bolter", "Storm Bolter", "Combiflamer", "Combiflamer", "Plasma Pistol"], - pistols: ["Bolt Pistol", "Bolt Pistol", "Bolt Pistol", "Bolt Pistol", "Plasma Pistol"], - one_hand_melee: ["Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Chainsword", "Power Sword", "Power Sword", "Power Sword", "Lightning Claw", "Lightning Claw", "Lightning Claw", "Power Fist", "Power Fist", "Thunder Hammer"], - } - - var weapon_weighted_lists = { - heavy_weapons: [["Heavy Bolter", 4], ["Missile Launcher", 3], ["Multi-Melta", 2], ["Lascannon", 1]], - special_weapons: [["Flamer", 3], ["Meltagun", 2], ["Plasma Gun", 1]], - melee_weapons: [["Chainsword", 5], ["Power Sword", 4], ["Lightning Claw", 3], ["Power Fist", 2], ["Thunder Hammer", 1]], - ranged_weapons: [["Bolter", 10], ["Storm Bolter", 3], ["Combiflamer", 2], ["Plasma Pistol", 1]], - pistols: [["Bolt Pistol", 5], ["Plasma Pistol", 1]], - } + #endregion #region Squad Loadouts @@ -1551,7 +1567,7 @@ function scr_initialize_custom() { */ var squad_name = "Squad"; - if(obj_creation.custom != 0){ + if(obj_creation.custom != eCHAPTER_TYPE.PREMADE){ if (obj_ini.progenitor == ePROGENITOR.SPACE_WOLVES) { squad_name = "Pack"; } @@ -1593,8 +1609,15 @@ function scr_initialize_custom() { "min": 0, "loadout": { "required": { - "wep1": [wep1[defaults_slot][eROLE.Veteran], 5], - "wep2": [wep2[defaults_slot][eROLE.Veteran], 5], + "wep1": ["", 0], + "wep2": ["Combat Knife", max], + }, + "option": { + "wep1": [ + [ + WEAPON_LIST_RANGED_VETERAN, 5 + ], + ], } }, "role": $"Company {roles.veteran}" @@ -1623,9 +1646,21 @@ function scr_initialize_custom() { "role": $"{roles.terminator} {roles.sergeant}", "loadout": { "required": { - "wep1": [wep1[defaults_slot][eROLE.Terminator], 1], - "wep2": [wep2[defaults_slot][eROLE.Terminator], 1], + "wep1": ["", 0], + "wep2": ["", 0], }, + "option": { + "wep1": [ + [ + ["Power Fist", "Chainfist"], 1 + ], + ], + "wep2": [ + [ + WEAPON_LIST_RANGED_COMBI, 1 + ], + ] + } } }], // Terminator @@ -1635,7 +1670,7 @@ function scr_initialize_custom() { "loadout": { "required": { "wep1": ["", 0], - "wep2": [wep2[100, 4], 3], + "wep2": ["", 0], }, "option": { "wep1": [ @@ -1645,9 +1680,14 @@ function scr_initialize_custom() { ], "wep2": [ [ - ["Assault Cannon", "Heavy Flamer"], 1 + WEAPON_LIST_RANGED_COMBI, 3 ], ], + "wep2": [ + [ + WEAPON_LIST_RANGED_HEAVY_TERMINATOR, 1 + ], + ] } } }], @@ -1697,12 +1737,11 @@ function scr_initialize_custom() { }] ], - "sternguard_veteran_squad": [ - // Sternguard Veteran - [roles.veteran, { - "max": 9, - "min": 4, - "role": $"Sternguard {roles.veteran}", + "veteran_squad": [ + [roles.veteran_sergeant, { + "max": 1, + "min": 1, + "role": $"{roles.veteran_sergeant}", "loadout": { "required": { "wep1": ["", 0], @@ -1711,92 +1750,40 @@ function scr_initialize_custom() { "option": { "wep1": [ [ - ["Bolter", "Stalker Pattern Bolter", "Storm Bolter"], 5 - ], - [ - ["Combiflamer"], 2 + WEAPON_LIST_RANGED_VETERAN, 1 ], - [ - weapon_lists.special_weapons, 1 - ], - [ - weapon_lists.heavy_weapons, 1, { - "wep2":"Combat Knife", - "mobi":"Heavy Weapons Pack", - } - ], - ] + ], } - } - }], - // Sternguard Veteran Sergeant - [roles.veteran_sergeant, { - "max": 1, - "min": 1, - "role": $"Sternguard {roles.veteran_sergeant}", - "loadout": { - "required": { - "wep1": ["Stalker Pattern Bolter", 1], - "wep2": [wep2[100][eROLE.Veteran], 1], - }, - } + }, }], - ["type_data", { - "display_data": $"Sternguard {roles.veteran} {squad_name}", - "formation_options": ["veteran", "assault", "devastator", "scout", "tactical"], - }] - ], - - "vanguard_veteran_squad": [ - // Vanguard Veterans [roles.veteran, { "max": 9, "min": 4, - "role": $"Vanguard {roles.veteran}", + "role": $"{roles.veteran}", "loadout": { "required": { "wep1": ["", 0], - "wep2": ["Bolt Pistol", 4], - "mobi": ["Jump Pack", 9] + "wep2": ["Combat Knife", max], }, "option": { "wep1": [ [ - ["Chainsword", "Power Sword", "Power Axe", "Lightning Claw"], 6 + WEAPON_LIST_RANGED_VETERAN, 7 ], [ - ["Power Fist"], 2 + WEAPON_LIST_RANGED_SPECIAL, 1 ], [ - ["Thunder Hammer"], 1 - ], + WEAPON_LIST_RANGED_HEAVY, 1, { + "mobi": "Heavy Weapons Pack", + } + ] ], - "wep2": [ - [ - ["Storm Shield"], 2, - ], - [ - ["Plasma Pistol"], 3 - ], - ] } - } - }], - // Vanguard Veteran Sergeant - [roles.veteran_sergeant, { - "max": 1, - "min": 1, - "role": $"Vanguard {roles.veteran_sergeant}", - "loadout": { - "required": { - "wep1": ["Thunder Hammer", 1], - "wep2": ["Storm Shield", 1], - "mobi": ["Jump Pack", 1] - }, - } - }], + }, + }, ], ["type_data", { - "display_data": $"Vanguard {roles.veteran} {squad_name}", + "display_data": $"{roles.veteran} {squad_name}", "formation_options": ["veteran", "assault", "devastator", "scout", "tactical"], }] ], @@ -1815,7 +1802,7 @@ function scr_initialize_custom() { "option": { "wep1": [ [ - weapon_lists.heavy_weapons, 4, { + WEAPON_LIST_RANGED_HEAVY, 4, { "mobi":"Heavy Weapons Pack", } ], @@ -1830,19 +1817,15 @@ function scr_initialize_custom() { "role": $"{roles.devastator} {roles.sergeant}", "loadout": { "required": { - "mobi": ["", 1], + "wep2": ["Combat Knife", 1], + "mobi": ["", 0] }, "option": { "wep1": [ [ - weapon_lists.pistols, 1 + WEAPON_LIST_RANGED, 1 ], - ], - "wep2": [ - [ - weapon_lists.melee_weapons, 1 - ], - ], + ] } } }], @@ -1864,10 +1847,10 @@ function scr_initialize_custom() { "option": { "wep1": [ [ - weapon_lists.special_weapons, 1 + WEAPON_LIST_RANGED_SPECIAL, 1 ], [ - weapon_lists.heavy_weapons, 1, { + WEAPON_LIST_RANGED_HEAVY, 1, { "wep2":"Combat Knife", "mobi":"Heavy Weapons Pack", } @@ -1883,17 +1866,17 @@ function scr_initialize_custom() { "loadout": { "required": { "wep1": ["", 0], - "wep2": ["Chainsword", 1] + "wep2": ["", 0] }, "option": { "wep1": [ [ - weapon_lists.pistols, 1 + WEAPON_LIST_RANGED_PISTOLS_LONG, 1 ], ], "wep2": [ [ - weapon_lists.melee_weapons, 1 + WEAPON_LIST_MELEE_BASIC, 1 ], ], } @@ -1927,7 +1910,7 @@ function scr_initialize_custom() { ], "wep2": [ [ - ["Plasma Pistol", "Flamer"], 2 + ["Flamer", "Flamer", "Flamer", "Plasma Pistol"], 2 ] ] } @@ -1946,12 +1929,12 @@ function scr_initialize_custom() { "option": { "wep1": [ [ - weapon_lists.pistols, 1 + WEAPON_LIST_RANGED_PISTOLS, 1 ], ], "wep2": [ [ - weapon_lists.melee_weapons, 1 + WEAPON_LIST_MELEE_1H, 1 ], ], } @@ -1969,13 +1952,13 @@ function scr_initialize_custom() { "min": 4, "loadout": { "required": { - "wep1": [wep1[100][12], 6], - "wep2": [wep2[100][12], 9] + "wep1": ["", 0], + "wep2": ["Combat Knife", max] }, "option": { "wep1": [ [ - ["Bolter", "Stalker Pattern Bolter"], 2 + ["Bolter", "Bolter", "Shotgun", "Sniper Rifle", "Stalker Pattern Bolter"], 8 ], [ ["Missile Launcher", "Heavy Bolter"], 1 @@ -1988,15 +1971,14 @@ function scr_initialize_custom() { "max": 1, "min": 1, "loadout": { + "required": { + "wep1": ["", 0], + "wep2": ["Combat Knife", 1] + }, "option": { "wep1": [ [ - ["Bolt Pistol", "Bolt Pistol", "Plasma Pistol", "Bolter", "Bolter", "Stalker Pattern Bolter"], 1 - ] - ], - "wep2": [ - [ - ["Power Sword", "Chainsword", "Power Axe"], 1 + WEAPON_LIST_RANGED, 1 ] ] } @@ -2009,128 +1991,64 @@ function scr_initialize_custom() { "formation_options": ["scout", "tactical", "assault", "devastator"], }], ], - - "scout_sniper_squad": [ - [roles.scout, - { - "max": 9, - "min": 4, - "loadout": { - "required": { - "wep1": ["Sniper Rifle", 8], - "wep2": ["Combat Knife", 9] - }, - "option": { - "wep1": [ - [ - ["Missile Launcher"], 1 - ] - ], - } - }, - "role": $"{roles.scout} Sniper", - }], - [roles.sergeant, { - "max": 1, - "min": 1, - "loadout": { - "required": { - "wep1": ["Sniper Rifle", 1], - "wep2": ["Combat Knife", 1] - }, - }, - "role": $"Sniper {roles.sergeant}", - } - ], - ["type_data", { - "display_data": $"{roles.scout} Sniper {squad_name}", - "class": ["scout"], - "formation_options": ["scout"], - }], - ] }; - // show_debug_message($"squads object for chapter {chapter_name}"); - // show_debug_message($"{st}"); + // show_debug_message_adv($"squads object for chapter {chapter_name}"); + // show_debug_message_adv($"{st}"); if(struct_exists(obj_creation, "custom_squads")){ var custom_squads = obj_creation.custom_squads; - // show_debug_message($"custom roles {custom_squads}"); + // show_debug_message_adv($"custom roles {custom_squads}"); if(array_length(struct_get_names(custom_squads)) != 0){ var names = struct_get_names(st); - // show_debug_message($"names {names}"); + // show_debug_message_adv($"names {names}"); for(var n = 0; n < array_length(names); n++){ var squad_name = names[n]; - // show_debug_message($"matched squad name name {squad_name}"); + // show_debug_message_adv($"matched squad name name {squad_name}"); if(struct_exists(custom_squads, squad_name)){ var custom_squad = struct_get(custom_squads, squad_name); - // show_debug_message($"overwriting squad layout for {squad_name}"); - // show_debug_message($"{custom_squad}") + // show_debug_message_adv($"overwriting squad layout for {squad_name}"); + // show_debug_message_adv($"{custom_squad}") variable_struct_set(st, squad_name, custom_squad); } } } } - // show_debug_message($"roles object for chapter {chapter_name} after setting from obj"); - // show_debug_message($"{st}"); + // show_debug_message_adv($"roles object for chapter {chapter_name} after setting from obj"); + // show_debug_message_adv($"{st}"); - if (scr_has_adv("Crafters")) { //salamanders squads - variable_struct_set(st, "assault_squad", [ + if (global.chapter_name == "Salamanders") { + st[$ "assault_squad"][0] = [roles.assault, { "max": 9, "min": 4, - "loadout": { //assault_marine - "required": { - "wep1": [wep1[100, 10], 4], - "wep2": [wep2[100, 10], 4], - "gear": ["Combat Shield", 4] - }, - "option": { - "wep1": [ - [ - ["Power Sword", "Power Axe", "Eviscerator"], 2 - ], - ], - "wep2": [ - [ - ["Flamer", "Meltagun", "Plasma Pistol", "Bolt Pistol"], 2 - ], - - ], - } - } - }], - [roles.sergeant, { - "max": 1, - "min": 1, //sergeant "loadout": { "required": { - "wep1": ["Bolt Pistol", 0], - "wep2": ["Chainsword", 0], + "wep1": [wep1[100, 10], 5], + "wep2": [wep2[100, 10], 5], }, "option": { "wep1": [ [ - ["Power Sword", "Thunder Hammer", "Power Fist", "Chainsword"], 1 - ] + ["Eviscerator"], 2, { + "wep2":"", + } + ], ], "wep2": [ [ - ["Plasma Pistol", "Combiflamer", "Meltagun"], 1 + ["Flamer"], 2 ] ] } - }, - "role": $"{roles.sergeant} {roles.assault}" - }], - ["type_data", { - "display_data": $"{roles.assault} {squad_name}" - }] - ]) + } + } + ] } + if (scr_has_adv("Lightning Warriors")) { variable_struct_set(st, "bikers", [ [roles.assault, { @@ -2164,6 +2082,7 @@ function scr_initialize_custom() { }] ]) } + if (scr_has_adv("Boarders")) { variable_struct_set(st, "breachers", [ [roles.tactical, { @@ -2180,10 +2099,10 @@ function scr_initialize_custom() { "option": { "wep1": [ [ - ["Flamer", "Grav-Gun", "Meltagun", "Lascutter"], 2, + ["Flamer", "Flamer", "Flamer", "Grav-Gun", "Meltagun", "Lascutter"], 2, ], ] - } + } }, "role": $"Breacher" }], @@ -2200,7 +2119,7 @@ function scr_initialize_custom() { "option": { "wep1": [ [ - ["Bolter", "Bolter", "Bolter", "Combiflamer"], 1 + WEAPON_LIST_RANGED_COMBI, 1 ] ], } @@ -2212,79 +2131,129 @@ function scr_initialize_custom() { "formation_options": ["tactical", "assault", "devastator", "scout" ], }] ]) - variable_struct_set(st,"assault_squad", [ - [roles.assault, { - "max": 9, - "min": 4, + } + + if (scr_has_adv("Assault Doctrine")) { + variable_struct_set(st, "veteran_squad", [ + [roles.veteran_sergeant, { + "max": 1, + "min": 1, + "role": $"{roles.veteran_sergeant}", "loadout": { "required": { - "wep1": [wep1[100, 10], 7], - "wep2": [wep2[100, 10], 7], + "wep1": ["", 0], + "wep2": ["", 0], + "mobi": ["Jump Pack", max], + "gear": ["Combat Shield", max] }, "option": { "wep1": [ [ - weapon_lists.melee_weapons, 2 + WEAPON_LIST_RANGED_PISTOLS, 1 ], ], "wep2": [ [ - ["Plasma Pistol", "Flamer"], 2 - ] + WEAPON_LIST_MELEE_VETERAN, 1 + ], ] } - } + }, }], - [roles.sergeant, { - "max": 1, - "min": 1, - "role": $"{roles.assault} {roles.sergeant}", + [roles.veteran, { + "max": 9, + "min": 4, + "role": $"{roles.veteran}", "loadout": { "required": { "wep1": ["", 0], "wep2": ["", 0], - "gear": ["Combat Shield", 1] + "mobi": ["Jump Pack", max], + "gear": ["Combat Shield", max] }, "option": { "wep1": [ [ - weapon_lists.pistols, 1 + WEAPON_LIST_RANGED_PISTOLS, 9 ], ], "wep2": [ [ - weapon_lists.melee_weapons, 1 + WEAPON_LIST_MELEE_VETERAN, 9 ], - ], + ] } - } - }], + }, + }, ], ["type_data", { - "display_data": $"{roles.assault} {squad_name}", - "formation_options": ["assault"], + "display_data": $"{roles.veteran} {squad_name}", + "formation_options": ["veteran", "assault", "devastator", "scout", "tactical"], }] ]) } + if (scr_has_adv("Devastator Doctrine")) { + st[$ "veteran_squad"][1] = + [roles.veteran, { + "max": 9, + "min": 4, + "role": $"{roles.veteran}", + "loadout": { + "required": { + "wep1": ["", 0], + "wep2": ["Combat Knife", max], + }, + "option": { + "wep1": [ + [ + WEAPON_LIST_RANGED_VETERAN, 5 + ], + [ + WEAPON_LIST_RANGED_HEAVY_VETERAN, 4, { + "mobi": "Heavy Weapons Pack", + } + ] + ], + } + }, + }, ] + } + - var squad_names = struct_get_names(st); - // show_debug_message($" {squad_names}"); - // show_debug_message($"^^^ Squad names"); + var _squad_names = struct_get_names(st); + // show_debug_message_adv($" {squad_names}"); + // show_debug_message_adv($"^^^ Squad names"); - for (var st_iter = 0; st_iter < array_length(squad_names); st_iter++) { - var s_group = st[$squad_names[st_iter]]; - squad_types[$squad_names[st_iter]] = {}; - for (var iter_2 = 0; iter_2 < array_length(s_group); iter_2++) { - squad_types[$squad_names[st_iter]][$s_group[iter_2][0]] = s_group[iter_2][1]; - } + for (var st_iter = 0; st_iter < array_length(_squad_names); st_iter++) { + var _squad_name = _squad_names[st_iter]; + var _squad_data = st[$ _squad_name]; + squad_types[$ _squad_name] = {}; + var _new_squad_data = squad_types[$ _squad_name]; + // Guard: ensure array and entries are well-formed before indexing + if (!is_array(_squad_data)) { + continue; + } + var _len = array_length(_squad_data); + for (var iter_2 = 0; iter_2 < _len; iter_2++) { + var _entry = _squad_data[iter_2]; + if (!is_array(_entry) || array_length(_entry) < 2) { + continue; + } + var _data_name = _entry[0]; + if (!is_string(_data_name) || _data_name == "") { + continue; + } + _new_squad_data[$ _data_name] = _entry[1]; + } } + if(scr_has_adv("Ambushers")){ var _class_data = squad_types.tactical_squad.type_data.class; array_push(_class_data, "scout") } - // show_debug_message("Squad types"); - // show_debug_message(squad_types); + // show_debug_message_adv("Squad types"); + // show_debug_message_adv(squad_types); #endregion for (i = 0; i <= 20; i++) { @@ -2314,7 +2283,6 @@ function scr_initialize_custom() { for (var c = 0; c <11; c++){ for (var i = 0; i < 501; i++) { race[c, i] = 1; - loc[c, i] = ""; name[c, i] = ""; role[c, i] = ""; wep1[c, i] = ""; @@ -2379,7 +2347,7 @@ function scr_initialize_custom() { // Forge Master name[company, 1] = obj_creation.fmaster; - var _forge_master = add_unit_to_company("marine", company, 1, "Forge Master", eROLE.Techmarine, "Infernus Pistol", "Power Axe", "default", "Servo-harness", _hq_armour); + var _forge_master = add_unit_to_company("marine", company, 1, "Forge Master", eROLE.Techmarine, "Infernus Pistol", "Omnissian Axe", "default", "Servo-harness", _hq_armour); if (_forge_master.technology < 40) { _forge_master.technology = 40; } @@ -2436,7 +2404,7 @@ function scr_initialize_custom() { k += 1; commands += 1; man_size += 1; - add_unit_to_company("marine", company, k, roles.techmarine, eROLE.Techmarine, "default", choose_weighted(weapon_weighted_lists.pistols)); + add_unit_to_company("marine", company, k, roles.techmarine, eROLE.Techmarine, "default", choose_weighted(WEAPON_LIST_WEIGHTED_RANGED_PISTOLS)); } // Librarians in the librarium @@ -2444,14 +2412,14 @@ function scr_initialize_custom() { k += 1; commands += 1; man_size += 1; - var _epi = add_unit_to_company("marine", company, k, roles.librarian, eROLE.Librarian, "default", choose_weighted(weapon_weighted_lists.pistols)); + var _epi = add_unit_to_company("marine", company, k, roles.librarian, eROLE.Librarian, "default", choose_weighted(WEAPON_LIST_WEIGHTED_RANGED_PISTOLS)); } // Codiciery repeat(codiciery) { k += 1; commands += 1; man_size += 1; - var _codi = add_unit_to_company("marine", company, k, "Codiciery", eROLE.Librarian, "default", choose_weighted(weapon_weighted_lists.pistols)); + var _codi = add_unit_to_company("marine", company, k, "Codiciery", eROLE.Librarian, "default", choose_weighted(WEAPON_LIST_WEIGHTED_RANGED_PISTOLS)); } // Lexicanum @@ -2459,7 +2427,7 @@ function scr_initialize_custom() { k += 1; commands += 1; man_size += 1; - var _lexi = add_unit_to_company("marine", company, k, "Lexicanum", eROLE.Librarian, "default", choose_weighted(weapon_weighted_lists.pistols)); + var _lexi = add_unit_to_company("marine", company, k, "Lexicanum", eROLE.Librarian, "default", choose_weighted(WEAPON_LIST_WEIGHTED_RANGED_PISTOLS)); } // Apothecaries in Apothecarion @@ -2467,7 +2435,7 @@ function scr_initialize_custom() { k += 1; commands += 1; man_size += 1; - add_unit_to_company("marine", company, k, roles.apothecary, eROLE.Apothecary,"Chainsword", choose_weighted(weapon_weighted_lists.pistols)); + add_unit_to_company("marine", company, k, roles.apothecary, eROLE.Apothecary,"Chainsword", choose_weighted(WEAPON_LIST_WEIGHTED_RANGED_PISTOLS)); } // Chaplains in Reclusium @@ -2475,7 +2443,7 @@ function scr_initialize_custom() { k += 1; commands += 1; man_size += 1; - add_unit_to_company("marine", company, k, roles.chaplain, eROLE.Chaplain,"default", choose_weighted(weapon_weighted_lists.pistols)); + add_unit_to_company("marine", company, k, roles.chaplain, eROLE.Chaplain,"default", choose_weighted(WEAPON_LIST_WEIGHTED_RANGED_PISTOLS)); } // Honour Guard @@ -2483,7 +2451,7 @@ function scr_initialize_custom() { if (scr_has_adv("Retinue of Renown")){ _honour_guard_count += 10; } - if (progenitor == ePROGENITOR.DARK_ANGELS && obj_creation.custom == 0) { + if (progenitor == ePROGENITOR.DARK_ANGELS && obj_creation.custom == eCHAPTER_TYPE.PREMADE) { _honour_guard_count += 6; } if (_honour_guard_count == 0) { @@ -2509,7 +2477,7 @@ function scr_initialize_custom() { tacticals: 0, assaults: 0, devastators: 0, - dreadnoughts: dreadnought+1, + dreadnoughts: dreadnought == 0 ? 0 : dreadnought+1, //handle obliterated predators: predator, landraiders: landraider }, @@ -2598,7 +2566,7 @@ function scr_initialize_custom() { } } - // log_message($"Pre balancing company totals: {json_stringify(companies,true)}") + log_message($"Pre balancing company totals: {json_stringify(companies,true)}") // Extra vehicles loaded from json files all get dumped into the 10th company for the player to sort out var vehicle_keys = ["rhino", "whirlwind", "predator", "land_raider", "land_speeder"]; @@ -2638,6 +2606,9 @@ function scr_initialize_custom() { var _moved_scouts = 0; var _coys = struct_get_names(companies); + function _is_terminator (_armour) { + return array_contains(["Terminator Armour", "Tartaros"], _armour); + }; for(var _c = 0, _clen = array_length(_coys); _c < _clen; _c++ ){ var k = 0, v = 0;//k = marine slot, v = vehicle slot @@ -2762,16 +2733,14 @@ function scr_initialize_custom() { } } - // log_message($"New Company Totals: eq specialists: {equal_specialists}: scout coy {scout_company_behaviour} equal_scouts: {equal_scouts}"); - // log_message($"Company {_coy.coy}: {json_stringify(_coy,true)}"); + log_message($"New Company Totals: eq specialists: {equal_specialists}: scout coy {scout_company_behaviour} equal_scouts: {equal_scouts}"); + log_message($"Company {_coy.coy}: {json_stringify(_coy,true)}"); var attrs = struct_get_names(_coy); - var _is_terminator = function(_armour) { - return array_contains(["Terminator Armour", "Tartaros"], _armour); - }; + // log_message($"attrs {attrs}"); for(var _a = 0, _alen = array_length(attrs); _a < _alen; _a++ ){ @@ -2798,8 +2767,13 @@ function scr_initialize_custom() { switch (_role) { // MAINLINE case "tacticals": - _rolename = roles.tactical; - _erole = eROLE.Tactical; + if(scr_has_adv("Elite Guard")){ + _rolename = roles.veteran; + _erole = eROLE.Veteran; + } else { + _rolename = roles.tactical; + _erole = eROLE.Tactical; + } break; case "assaults": _rolename = roles.assault; @@ -2814,6 +2788,7 @@ function scr_initialize_custom() { } break; case "scouts": + _unit_type = "scout"; _rolename = roles.scout; _erole = eROLE.Scout; break; @@ -2882,7 +2857,7 @@ function scr_initialize_custom() { commands++; _rolename = roles.captain; _erole = eROLE.Captain; - _wep2 = choose_weighted(weapon_weighted_lists.pistols); + _wep2 = choose_weighted(WEAPON_LIST_WEIGHTED_RANGED_PISTOLS); if (equal_specialists == false && _coy.coy == 8) { _mobi = "Jump Pack"; } @@ -2896,7 +2871,7 @@ function scr_initialize_custom() { commands++; _rolename = roles.chaplain; _erole = eROLE.Chaplain; - _wep2 = choose_weighted(weapon_weighted_lists.pistols); + _wep2 = choose_weighted(WEAPON_LIST_WEIGHTED_RANGED_PISTOLS); if (equal_specialists == false && _coy.coy == 8) { _mobi = "Jump Pack"; } @@ -2969,6 +2944,7 @@ function scr_initialize_custom() { _wep2 = wep2[defaults_slot][eROLE.Terminator]; } break; + // VEHICLES case "rhinos": @@ -3154,6 +3130,8 @@ function scr_initialize_custom() { scr_add_item(wep1[defaults_slot, eROLE.Apothecary], 4); scr_add_item(wep2[defaults_slot, eROLE.Apothecary], 4); scr_add_item("Psychic Hood", 4); + scr_add_item("Crozius Arcanum", 4); + scr_add_item("Servo-arm", 4); scr_add_item("Force Staff", 4); scr_add_item("Plasma Pistol", 4); scr_add_item("Company Standard", 4); @@ -3194,6 +3172,45 @@ function scr_initialize_custom() { scr_add_item("MK4 Maximus", irandom_range(3, 18)); } + //Fixed Loot tagble +if(scr_has_adv("Ancient Armoury")){ +//armour +var armm5=""; + armm5=choose("Tartaros","Cataphractii"); + scr_add_item("MK3 Iron Armour",irandom_range(2,5)); + scr_add_item("MK4 Maximus",irandom_range(5,10)); + scr_add_item("MK5 Heresy",irandom_range(5,10)); + scr_add_item("MK6 Corvus",irandom_range(5,10));//Lowered to balance other buffs + scr_add_item("MK7 Aquila", -10); + scr_add_item("MK8 Errant", -1); +//weapons (I'm not sure about replacing all 40k weapons with 30k) + var armm1="",armk1=0,armm2="",armk2=0,armm3="",armk3=0,armm4="",armk4=0; + scr_add_item("Bolter", -15); + scr_add_item("Bolt Pistol", -5); + scr_add_item("Lascannon",-5); + scr_add_item("Heavy Bolter",-5) + scr_add_item("Phobos Bolter",10); + scr_add_item("Phobos Bolt Pistol",3); + scr_add_item("Mars Heavy Bolter",5); + scr_add_item("Serpha Jump Pack",5); + scr_add_item("Jump Pack",-5); + armm1=choose("Volkite Culverin","Volkite Caliver","Mars Plasma Cannon","Ryza Lascannon","Grav-Cannon","Proteus Multi-Melta","Cthon Autocannon"); + armk1=irandom_range(2,5); + armm2=choose("Primus Melta Gun","Ryza Plasma Gun","Volkite Charger","Grav-Gun"); + armk2=irandom_range(2,5) + armm3=choose("Ryza Plasma Pistol","Volkite Serpenta") + armk3=irandom_range(1,3) + armk4=choose("Power Sword","Power Fist", "Lightining Claw","Power Axe","Power Scythe") + armk4=irandom_range(1,3) + scr_add_item(armm1,armk1); + scr_add_item(armm2,armk2); + scr_add_item(armm3,armk3); + scr_add_item(armm4,armk4); + scr_add_item(armm5,1); + + } + + gene_slaves = []; var bloo = 0, @@ -3250,14 +3267,15 @@ function add_veh_to_company(name, company, slot, wep1, wep2, wep3, upgrade, acce function add_unit_to_company(ttrpg_name, company, slot, role_name, role_id, wep1="default", wep2="default", gear="default", mobi="default", armour="default"){ // log_message($"adding unit to company ttrpg_name {ttrpg_name}, company {company}, slot {slot}, role_name {role_name}, role_id {role_id}") obj_ini.TTRPG[company][slot] = new TTRPG_stats("chapter", company, slot, ttrpg_name); + var spawn_unit = fetch_unit([company,slot]); obj_ini.race[company][slot] = 1; - obj_ini.loc[company][slot] = obj_ini.home_name; + spawn_unit.location_string = obj_ini.home_name; obj_ini.role[company][slot] = role_name; if(obj_ini.name[company][slot] == ""){ obj_ini.name[company][slot] = global.name_generator.generate_space_marine_name(); } - var spawn_unit = fetch_unit([company,slot]); + if(wep1 != ""){ if(wep1 == "default"){ @@ -3280,7 +3298,7 @@ function add_unit_to_company(ttrpg_name, company, slot, role_name, role_id, wep1 spawn_unit.update_armour(armour, false, false); } - // show_debug_message($"updating coy {company}:{slot} {role_name} armour to {armour}: {_msg} : {spawn_unit.armour()} : {obj_ini.armour[company][slot]}"); + // show_debug_message_adv($"updating coy {company}:{slot} {role_name} armour to {armour}: {_msg} : {spawn_unit.armour()} : {obj_ini.armour[company][slot]}"); } if(gear != ""){ if(gear == "default"){ @@ -3301,7 +3319,7 @@ function add_unit_to_company(ttrpg_name, company, slot, role_name, role_id, wep1 } else { spawn_unit.roll_age(); spawn_unit.roll_experience(); - } + } if(role_id == eROLE.HonourGuard){ spawn_unit.add_trait(choose("guardian", "champion", "observant", "perfectionist","natural_leader")); } @@ -3312,9 +3330,9 @@ function add_unit_to_company(ttrpg_name, company, slot, role_name, role_id, wep1 spawn_unit.add_trait("soft_target"); } if(role_id == eROLE.Librarian){ - if (scr_has_adv("Favoured By The Warp") && (roll_personal_dice(1, 6, "high", spawn_unit) >= 4)) { + if (scr_has_adv("Favoured By The Warp") && (roll_dice_unit(1, 6, "high", spawn_unit) >= 4)) { spawn_unit.add_trait("favoured_by_the_warp"); - } else if (roll_personal_dice(1, 10, "high", spawn_unit) == 10) { + } else if (roll_dice_unit(1, 10, "high", spawn_unit) == 10) { spawn_unit.add_trait("favoured_by_the_warp"); } @@ -3322,10 +3340,10 @@ function add_unit_to_company(ttrpg_name, company, slot, role_name, role_id, wep1 spawn_unit.psionic = irandom_range(8, 10); } else if (role_name == "Codiciery") { spawn_unit.psionic = irandom_range(5, 7); - if (roll_personal_dice(1, 6, "high", spawn_unit) < 4) { + if (roll_dice_unit(1, 6, "high", spawn_unit) < 4) { spawn_unit.update_gear(obj_ini.gear[obj_ini.defaults_slot][eROLE.Tactical], false, false); } - if (roll_personal_dice(1, 6, "high", spawn_unit) < 4) { + if (roll_dice_unit(1, 6, "high", spawn_unit) < 4) { spawn_unit.update_weapon_one(choose("Force Axe", "Force Sword"), false, false); } } else if (role_name == "Lexicanum") { diff --git a/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml b/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml index 3910912628..aebf6119af 100644 --- a/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml +++ b/scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml @@ -1,4 +1,4 @@ -function base_inquis_fleet (){ +function base_inquis_fleet(){ owner=eFACTION.Inquisition; frigate_number=1; sprite_index=spr_fleet_inquisition; @@ -14,6 +14,59 @@ function base_inquis_fleet (){ } +function hunt_player_serfs(planet, system){ + add_event({ + planet : planet, + system : system, + e_id : "remove_surf", + duration : irandom_range(1,4), + }); +} + + +function radical_inquisitor_mission_ship_arrival(){ + + //TODO make a centralised player_fleet present method + var _p_fleet = instance_nearest(x,y, obj_p_fleet); + var _intercept_fleet = -1; + if (point_distance(x,y,_p_fleet.x, _p_fleet.y)<10 && is_orbiting(obj_p_fleet)){ + _intercept_fleet = _p_fleet; + } + + + var _radical_inquisitor = cargo_data.radical_inquisitor; + if (!instance_exists(_intercept_fleet)){ + action_x=choose(room_width*-1,room_width*2); + action_y=choose(room_height*-1,room_height*2); + action_spd=256; + action=""; + set_fleet_movement(); + instance_destroy(); + alter_disposition(eFACTION.Inquisition,-15); + scr_popup("Inquisitor Mission Failed","The radical Inquisitor has departed from the planned intercept coordinates. They will now be nearly impossible to track- the mission is a failure.","inquisition",""); + scr_event_log("red","Inquisition Mission Failed: The radical Inquisitor has departed from the planned intercept coordinates."); + } + else { + action=""; + var _gender = string_gender_third_person(_radical_inquisitor.inquisitor_gender); + + var _tixt=$"You have located the radical Inquisitor. As you prepare to destroy their ship, and complete the mission, you recieve a hail- it appears as though {_gender} wishes to speak."; + _radical_inquisitor.options = [ + { + str1 : "Destroy their vessel", + choice_func: mission_hunt_inquisitor_destroy_inquisitor_ship, + }, + { + str1 : "Hear them out", + choice_func: mission_hunt_inquisitor_hear_out_radical_inquisitor, + } + ]; + _radical_inquisitor.inquisitor_ship = self.id; + scr_popup("Inquisitor Located",_tixt,"inquisition",_radical_inquisitor); + } + //instance_destroy(); + exit; +} function inquisition_fleet_inspection_chase(){ var good=0,acty=""; var reset = !instance_exists(target); @@ -56,7 +109,7 @@ function inquisition_fleet_inspection_chase(){ instance_activate_object(obj_star); var goal_x,goal_y,target_meet=0; - chase_fleet_target_set(); + chase_fleet_target_set(target); target_meet=instance_nearest(action_x,action_y,obj_star); if (string_count("!",trade_goods)=4) and (instance_exists(obj_turn_end)){ @@ -64,20 +117,24 @@ function inquisition_fleet_inspection_chase(){ scr_alert("blank","blank","blank",target_meet.x,target_meet.y); - var massa,iq;iq=0; - massa="Inquisitor "; + var iq=0; + if (inquisitor>0){ iq=inquisitor } + + var massa=$"Inquisitor {obj_controller.inquisitor[iq]}"; - massa+=string(obj_controller.inquisitor[iq]); - - if (target.action="") then massa+=$" DEMANDS that you keep your fleet at {target_meet.name} until "; - if (target.action!="") then massa+=$" DEMANDS that you station your fleet at {target_meet.name} until "; + if (target.action == ""){ + massa+=$" DEMANDS that you keep your fleet at {target_meet.name} until "; + }else if (target.action!=""){ + massa+=$" DEMANDS that you station your fleet at {target_meet.name} until "; + } - scr_event_log("red",string(massa)+" they may inspect it."); - var gender = obj_controller.inquisitor_gender[iq]==1?"he":"she" - if (obj_controller.inquisitor_gender[iq]=1) then massa+=$"{gender} is able to complete the inspection. Further avoidance will be met with harsh action."; + scr_event_log("red",$"{massa} they may inspect it."); + var _gender = string_gender_third_person(obj_controller.inquisitor_gender[iq]); + + massa+=$"{_gender} is able to complete the inspection. Further avoidance will be met with harsh action."; scr_popup("Fleet Inspection",massa,"inquisition",""); @@ -151,7 +208,7 @@ function new_inquisitor_inspection(){ with (new_inquis_fleet) { base_inquis_fleet(); target = target_player_fleet; - chase_fleet_target_set(); + chase_fleet_target_set(target); obj = instance_nearest(action_x, action_y, obj_star); trade_goods += "_fleet"; } @@ -167,67 +224,6 @@ function new_inquisitor_inspection(){ } } -function inquisition_inspection_logic(){ - var inspec_alert_string = ""; - var cur_star=instance_nearest(x,y,obj_star); - inquisitor = inquisitor<0 ? 0 : inquisitor; - var inquis_string = $"Inquisitor {obj_controller.inquisitor[inquisitor]}"; - if (string_count("fleet",trade_goods)==0){ - inspec_alert_string = $"{inquis_string} finishes inspection of {cur_star.name}"; - inquisition_inspection_loyalty("inspect_world");// This updates the loyalties - } - else if (string_count("fleet",trade_goods)>0){ - inspec_alert_string = $"{inquis_string} finishes inspection of your fleet"; - inquisition_inspection_loyalty("inspect_fleet");// This updates the loyalties - target=noone; - } - if (inspec_alert_string!=""){ - scr_event_log("", inspec_alert_string, cur_star.name); - scr_alert("green","duhuhuhu",inspec_alert_string, x,y); - } - - // Test-Slave Incubator Crap - if (obj_controller.und_gene_vaults==0){ - var hur = inquisitor_approval_gene_banks() - if (hur>0){ - - if (hur=1) then obj_controller.disposition[4]-=max(6,round(obj_controller.disposition[4]*0.2)); - if (hur=2) then obj_controller.disposition[4]-=max(3,round(obj_controller.disposition[4]*0.1)); - - - obj_controller.inqis_flag_gene+=1; - if (obj_controller.inqis_flag_gene=1){ - if (hur=1) then inquis_string+=" has noted your abundant Gene-Seed stores and Test-Slave Incubators. Your Chapter has plenty enough Gene-Seed to restore itself to full strength and the Incubators on top of that are excessive. Both have been reported, and you are ordered to remove the Test-Slave Incubators. Relations with the Inquisition are also more strained than before."; - if (hur=2) then inquis_string+=" has noted your abundant Gene-Seed stores and Test-Slave Incubators. Your Chapter is already at full strength and the Incubators on top of that are excessive. The Incubators have been reported, and you are ordered to remove them immediately. Relations with the Inquisition are also slightly more strained than before."; - } - if (obj_controller.inqis_flag_gene=2){ - if (hur=1) then inquis_string+=" has noted your abundant Gene-Seed stores and Test-Slave Incubators. Both the stores and incubators have been reported, and you are AGAIN ordered to remove the Test-Slave Incubators. The Inquisitor says this is your final warning."; - if (hur=2) then inquis_string+=" has noted your abundant Gene-Seed stores and Test-Slave Incubators. Your Chapter is already at full strength and the Incubators are unneeded. The Incubators have been reported, AGAIN, and you are to remove them. The Inquisitor says this is your final warning."; - } - if (obj_controller.inqis_flag_gene=3){ - if (obj_controller.faction_status[eFACTION.Inquisition]!="War") then obj_controller.alarm[8]=1; - } - scr_popup("Inquisition Inspection", inquis_string, "inquisition"); - - } - } -} - -function inquisitor_approval_gene_banks(){ - var gene_slave_count = 0; - var hur=0 - for (var e=0;e=100) and (obj_controller.gene_seed>=1100) then hur=1; - if (obj_controller.marines<=500) and (obj_controller.marines>200) and (gene_slave_count>=75) and (obj_controller.gene_seed>=900) then hur=1; - if (obj_controller.marines<=700) and (obj_controller.marines>500) and (gene_slave_count>=50) and (obj_controller.gene_seed>=750) then hur=1; - if (obj_controller.marines>700) and (gene_slave_count>=50) and (obj_controller.gene_seed>=500) then hur=1; - if (obj_controller.marines>990) and (gene_slave_count>=50) then hur=2; - return hur; -} - - function inquisitor_ship_approaches(){ //TODO figure out the meaning of this line if ((string_count("eet",trade_goods)!=0) and (string_count("_her",trade_goods)!=0)) then exit; @@ -264,177 +260,69 @@ function inquisitor_ship_approaches(){ } } -function inquisition_inspection_loyalty(inspection_type){ -if (inspection_type="inspect_world") or (inspection_type="inspect_fleet"){ - var i,diceh,ca,ia,that,wid,hurr; - i=0;diceh=0;ca=0;ia=0;that=0;wid=0;hurr=0; - - var sniper,finder,git,demonic; - sniper=0;finder=0;git=0;demonic=0; - - - if (inspection_type="inspect_world"){ - that=instance_nearest(x,y,obj_star); - // show_message(that); - instance_activate_object(obj_en_fleet); - - for (var i =1;i<=that.planets;i++){ - if (that.p_hurssy[i]>0) then hurr+=that.p_hurssy[i]; - } - var unit; - for (var g=1;g0) then hurr+=player_inspection_fleet.hurssy; - var ca, ia; - for (ca=0;ca<11;ca++){ - for (ia=0;ia0){ + if (planet_feature_bool(p_feature[cur_planet], [P_features.Secret_Base,P_features.Arsenal,P_features.Gene_Vault])==0) /*and (string_count(".0|",p_upgrades[cur_planet])>0)*/{ + yep=cur_planet; } } - instance_activate_object(obj_en_fleet); } + } - if (hurr>0){ - var hurrr=floor(random(12))+1; - if (hurrr<=hurr){ - obj_controller.alarm[8]=1; - if (demonic>0) then scr_alert("red","inspect","Inquisitor discovers Daemonic item(s) in your posession.",0,0); - if (sniper>0) then scr_alert("red","inspect","Inquisitor discovers Ork Sniper(s) hired by your chapter.",0,0); - if (git>0) then scr_alert("red","inspect","Inquisitor discovers Flash Git(z) hired by your chapter.",0,0); - if (finder>0) then scr_alert("red","inspect","Inquisitor discovers Eldar Ranger(s) hired by your chapter.",0,0); - if (demonic+sniper+git+finder=0) then scr_alert("red","inspect","Inquisitor discovers heretical material in your posession.",0,0); + //if an inquis wants to check out a dead world with chapter assets + if (yep>0){ + var planet_coords = [x,y]; + with(obj_en_fleet){ + //checks if there is already an inquis ship investigating planet + if (owner==4){ + if (point_distance(action_x,action_y,planet_coords[0],planet_coords[1])<30 && + string_count("investigate_dead",trade_goods)>0){ + stop=true; + } } } - i=0; - - repeat(22){ - i+=1;diceh=0; - if (obj_controller.loyal_num[i]<1) and (obj_controller.loyal_num[i]>0) and (obj_controller.loyal[i]!="Avoiding Inspections"){ - diceh=random(floor(100))+1; - - if (diceh<=(obj_controller.loyal_num[i]*1000)){ - if (obj_controller.loyal[i]="Heretic Contact"){ - obj_controller.loyal_num[i]=80; - obj_controller.loyal_time[i]=9999; - scr_alert("red","inspect","Inquisitor discovers evidence of Chaos Lord correspondence.",0,0); - - var one;one=0; - if (obj_controller.disposition[4]>=80) and (one=0){obj_controller.disposition[4]=30;one=1;} - if (obj_controller.disposition[4]<80) and (obj_controller.disposition[4]>10) and (one=0){obj_controller.disposition[4]=5;one=2;} - if (obj_controller.disposition[4]<=10) and (one=0){obj_controller.disposition[4]=0;one=3;} - - if ((obj_controller.loyalty-80)<=0) and (one<3) then one=3; - if (one=1) then with(obj_controller){scr_audience(4,"chaos_audience1",0,"",0,0);} - if (one=2) then with(obj_controller){scr_audience(4,"chaos_audience2",0,"",0,0);} - if (one=3) then obj_controller.alarm[8]=1; + + if (!stop){ + var plap=0,old_x=x,old_y=y,flee=0; + var _current_planet_name = name; + var launch_planet, launch_point_found=false; + launch_planet = nearest_star_with_ownership(x,y, [eFACTION.Imperium, eFACTION.Mechanicus], self.id); + if (launch_planet != "none"){ + if (instance_exists(launch_planet)){ + flee=instance_create(launch_planet.x,launch_planet.y,obj_en_fleet); + with (flee){ + base_inquis_fleet(); + } + flee.action_x=x; + flee.action_y=y; + flee.trade_goods+="|investigate_dead|"; + with (flee){ + set_fleet_movement(); } - if (obj_controller.loyal[i]="Heretical Homeworld"){obj_controller.loyal_num[i]=20;obj_controller.loyal_time[i]=3;} - if (obj_controller.loyal[i]="Traitorous Marines"){obj_controller.loyal_num[i]=30;obj_controller.loyal_time[i]=9999;} - // if (obj_controller.loyal[i]="Use of Sorcery"){obj_controller.loyal_num[i]=30;obj_controller.loyal_time[i]=9999;} - if (obj_controller.loyal[i]="Mutant Gene-Seed"){obj_controller.loyal_num[i]=30;obj_controller.loyal_time[i]=9999;} - - if (obj_controller.loyal[i]="Non-Codex Arming"){obj_controller.loyal_num[i]=12;obj_controller.loyal_time[i]=3;} - if (obj_controller.loyal[i]="Non-Codex Size"){obj_controller.loyal_num[i]=12;obj_controller.loyal_time[i]=3;} - if (obj_controller.loyal[i]="Lack of Apothecary"){obj_controller.loyal_num[i]=8;obj_controller.loyal_time[i]=1;} - if (obj_controller.loyal[i]="Upset Machine Spirits"){obj_controller.loyal_num[i]=8;obj_controller.loyal_time[i]=1;} - if (obj_controller.loyal[i]="Undevout"){obj_controller.loyal_num[i]=20;obj_controller.loyal_time[i]=3;} - if (obj_controller.loyal[i]="Irreverance for His Servants"){obj_controller.loyal_num[i]=12;obj_controller.loyal_time[i]=5;} - if (obj_controller.loyal[i]="Unvigilant"){obj_controller.loyal_num[i]=12;obj_controller.loyal_time[i]=9999;} - if (obj_controller.loyal[i]="Conduct Unbecoming"){obj_controller.loyal_num[i]=8;obj_controller.loyal_time[i]=9999;} - if (obj_controller.loyal[i]="Refusing to Crusade"){obj_controller.loyal_num[i]=20;obj_controller.loyal_time[i]=9999;} - - if (obj_controller.loyal[i]="Eldar Contact"){obj_controller.loyal_num[i]=4;obj_controller.loyal_time[i]=9999;} - if (obj_controller.loyal[i]="Ork Contact"){obj_controller.loyal_num[i]=4;obj_controller.loyal_time[i]=9999;} - if (obj_controller.loyal[i]="Tau Contact"){obj_controller.loyal_num[i]=4;obj_controller.loyal_time[i]=9999;} - if (obj_controller.loyal[i]="Xeno Trade"){obj_controller.loyal_num[i]=20;obj_controller.loyal_time[i]=9999;} - if (obj_controller.loyal[i]="Xeno Associate"){obj_controller.loyal_num[i]=20;obj_controller.loyal_time[i]=9999;} - - if (obj_controller.loyal[i]="Inquisitor Killer"){obj_controller.loyal_num[i]=100;obj_controller.loyal_time[i]=9999;} - // if (obj_controller.loyal[i]="Avoiding Inspections"){obj_controller.loyal_num[i]=20;obj_controller.loyal_time[i]=120;} - // if (obj_controller.loyal[i]="Lost Standard"){obj_controller.loyal_num[i]=10;obj_controller.loyal_time[i]=9999;} - - obj_controller.loyalty_hidden-=obj_controller.loyal_num[i]; } } - }// End repeat + } + } - obj_controller.loyalty=obj_controller.loyalty_hidden; - } } - - diff --git a/scripts/scr_inquisition_inspection/scr_inquisition_inspection.gml b/scripts/scr_inquisition_inspection/scr_inquisition_inspection.gml new file mode 100644 index 0000000000..60108b8eb0 --- /dev/null +++ b/scripts/scr_inquisition_inspection/scr_inquisition_inspection.gml @@ -0,0 +1,633 @@ +function inquisitor_inspection_structure() constructor { + // ----- Instance data ----- + finds = { + heresy: 0, + daemonic: 0, + poor_practices : 0, + }; + + ships = -1; + planets = 0; // can be single integer or an array of planet indices + location = ""; // location string for collect_role_group + star = -1; // star instance + units = []; // collected units for inspection + + // convenience flags populated during inspection + finds.secret_lair_flag = false; + finds.secret_arsenal_flag = false; + finds.secret_gene_flag = false; + finds.contraband_demand = false; + finds.trigger_war = false; + finds.cha = 0; + + inquisitor_disp = obj_controller.disposition[eFACTION.Inquisition]; + + // ----- Static methods ----- + + static collect_inspection_units = function() { + // Uses stored location, planets, ships + units = collect_role_group("all", [location, planets, ships]); + }; + + static planet_heresys = function() { + if (instance_exists(star)) { + if (is_array(planets)) { + for (var i = 0; i < array_length(planets); i++) { + var _p = planets[i]; + if (_p >= 0 && _p < array_length(star.p_hurssy)) { + finds.heresy += star.p_hurssy[_p]; + } + } + } else { + var _p_single = planets; + if (_p_single >= 0 && _p_single < array_length(star.p_hurssy)) { + finds.heresy += star.p_hurssy[_p_single]; + } + } + } + }; + + static inquisitor_inspect_units = function(_units_override) { + // Optionally accept an explicit array of units (used by fleet inspections). + var _units_to_check = _units_override == undefined ? units : _units_override; + + for (var i = 0; i < array_length(_units_to_check); i++) { + var unit = _units_to_check[i]; + if (unit == undefined) { continue; } + if (unit.name() == "") { continue; } + + // Xenos merc checks: ork base_group or Rangers of non-Imperial race + if (unit.base_group == "ork") { + add_xenos_mercs(unit.role()); + } else if (unit.role() == "Ranger") { + // example race check - adapt as needed + var ca = unit.company_index != undefined ? unit.company_index : 0; + var ia = unit.instance_index != undefined ? unit.instance_index : 0; + if (obj_ini.race[ca, ia] != 1) { + add_xenos_mercs(unit.role()); + } + } + + // Check equipped artifacts + var artis = unit.equipped_artifacts(); + for (var art = 0; art < array_length(artis); art++) { + var artifact_index = artis[art]; + if (artifact_index == undefined) { continue; } + if (artifact_index < 0 || artifact_index >= array_length(obj_ini.artifact_struct)) { continue; } + var artifact = obj_ini.artifact_struct[artifact_index]; + if (artifact != undefined) { + if (artifact.inquisition_disaprove()) { + finds.heresy += 8; + finds.daemonic += 1; + } + } + } + } + }; + + static inquisitor_inspect_artifacts = function() { + // Inspect all player artifacts and count those that match the inspection scope + for (var g = 0; g < array_length(obj_ini.artifact_struct); g++) { + var _arti = obj_ini.artifact_struct[g]; + if (_arti == undefined) { continue; } + if (_arti.type() == "") { continue; } + + // Ship-scoped: if ships is an array or single id, only include those ships + if (_arti.ship_id() > -1) { + if (is_array(ships)) { + if (!array_contains(ships, _arti.ship_id())) { continue; } + } else { + if (_arti.ship_id() != ships) { continue; } + } + } + + // Location / star-scoped: if artifact location doesn't match star name, skip + if (obj_ini.artifact_loc[g] != "" && obj_ini.artifact_loc[g] != star.name) { + // if the artifact isn't on this star, skip + continue; + } + + if (_arti.inquisition_disaprove() && !obj_controller.und_armouries) { + finds.heresy += 8; + finds.daemonic += 1; + } + } + }; + + static add_xenos_mercs = function(role) { + // ensure struct exists on finds + if (!struct_exists(finds, "xenos_mercs")) { + finds.xenos_mercs = {}; + } + if (!struct_exists(finds.xenos_mercs, role)) { + finds.xenos_mercs[$ role] = 1; + } else { + finds.xenos_mercs[$ role] += 1; + } + finds.heresy += 1; + }; + + // ----- Inspection modules that use internal star & planets ----- + + static inspect_secret_base = function() { + if (!instance_exists(star)) { return; } + + var planet_list = is_array(planets) ? planets : [planets]; + var any_found = false; + + for (var p = 0; p < array_length(planet_list); p++) { + var pidx = planet_list[p]; + if (pidx < 0) { continue; } + if (pidx >= star.planets) { continue; } + if (!is_array(star.p_upgrades[pidx]) || array_length(star.p_upgrades[pidx]) == 0) { continue; } + + var base_search = search_planet_features(star.p_upgrades[pidx], P_features.Secret_Base); + if (array_length(base_search) > 0) { + any_found = true; + var player_base = star.p_upgrades[pidx][base_search[0]]; + var _poor_base_practice = finds.poor_practices; + + if (player_base.vox > 0) { _poor_base_practice += 2; } + if (player_base.torture > 0) { _poor_base_practice += 1; } + if (player_base.narcotics > 0) { _poor_base_practice += 3; } + + alter_dispositions([ + [eFACTION.Imperium, -_poor_base_practice * 2], + [eFACTION.Inquisition, -_poor_base_practice * 3], + [eFACTION.Ecclesiarchy, -_poor_base_practice * 3] + ]); + + finds.heresy += _poor_base_practice; + finds.secret_lair_flag = true; + + if (_poor_base_practice >= 3) { + obj_controller.inqis_flag_lair += 1; + obj_controller.loyalty -= 10; + obj_controller.loyalty_hidden -= 10; + + if ((obj_controller.inqis_flag_lair == 2 || obj_controller.disposition[eFACTION.Inquisition] < 0 || obj_controller.loyalty <= 0) + && obj_controller.faction_status[eFACTION.Inquisition] != "War") { + finds.trigger_war = true; + } + } + + if (player_base.inquis_hidden == 1) { player_base.inquis_hidden = 0; } + } + } + + return any_found; + }; + + static inspect_arsenal = function() { + if (!instance_exists(star)) { return; } + + var planet_list = is_array(planets) ? planets : [planets]; + for (var p = 0; p < array_length(planet_list); p++) { + var pidx = planet_list[p]; + if (pidx < 0) { continue; } + if (pidx >= star.planets) { continue; } + if (!is_array(star.p_upgrades[pidx]) || array_length(star.p_upgrades[pidx]) == 0) { continue; } + + var arsenal_search = search_planet_features(star.p_upgrades[pidx], P_features.Arsenal); + if (array_length(arsenal_search) > 0) { + var arsenal = star.p_upgrades[pidx][arsenal_search[0]]; + arsenal.inquis_hidden = 0; + + var cha_local = 0; + var dem_local = 0; + + for (var e = 0; e < array_length(obj_ini.artifact_tags); e++) { + if (obj_ini.artifact[e] != "" && obj_ini.artifact_loc[e] == star.name && obj_controller.und_armouries <= 1) { + if (array_contains(obj_ini.artifact_tags[e], "chaos")) { cha_local += 1; } + if (array_contains(obj_ini.artifact_tags[e], "chaos_gift")) { cha_local += 1; } + if (array_contains(obj_ini.artifact_tags[e], "daemonic")) { dem_local += 1; } + } + } + + var perc = ((dem_local * 10) + (cha_local * 3)) / 100; + alter_dispositions([ + [eFACTION.Imperium, -max(round(obj_controller.disposition[eFACTION.Imperium] / 6 * perc), round(8 * perc))], + [eFACTION.Inquisition, -max(round(obj_controller.disposition[eFACTION.Inquisition] / 4 * perc), round(10 * perc))], + [eFACTION.Ecclesiarchy, -max(round(obj_controller.disposition[eFACTION.Ecclesiarchy] / 4 * perc), round(10 * perc))] + ]); + + finds.heresy += (cha_local + dem_local); + finds.cha += cha_local; + finds.daemonic += dem_local; + finds.secret_arsenal_flag = true; + + if ((dem_local * 10) + (cha_local * 3) >= 10) { finds.contraband_demand = true; } + + var start_inquisition_war = ((obj_controller.disposition[eFACTION.Inquisition] < 0 || obj_controller.loyalty <= 0) + && obj_controller.faction_status[eFACTION.Inquisition] != "War"); + if (start_inquisition_war) { + if (obj_controller.penitent == 1) { obj_controller.alarm[8] = 1; } + else { scr_audience(4, "loyalty_zero", 0, "", 0, 0); } + finds.trigger_war = true; + } + } + } + }; + + static inspect_gene_vault = function() { + if (!instance_exists(star)) { return; } + + var planet_list = is_array(planets) ? planets : [planets]; + for (var p = 0; p < array_length(planet_list); p++) { + var pidx = planet_list[p]; + if (pidx < 0) { continue; } + if (pidx >= star.planets) { continue; } + if (!is_array(star.p_upgrades[pidx]) || array_length(star.p_upgrades[pidx]) == 0) { continue; } + + var vault_search = search_planet_features(star.p_upgrades[pidx], P_features.Gene_Vault); + if (array_length(vault_search) > 0) { + var gene_vault = star.p_upgrades[pidx][vault_search[0]]; + gene_vault.inquis_hidden = 0; + + obj_controller.inqis_flag_gene += 1; + obj_controller.loyalty -= 10; + obj_controller.loyalty_hidden -= 10; + + alter_disposition(eFACTION.Inquisition, -tem1_base * 3); + + finds.secret_gene_flag = true; + + if ((obj_controller.inqis_flag_gene >= 3 || obj_controller.loyalty <= 0 || obj_controller.disposition[eFACTION.Inquisition] < 0) + && obj_controller.faction_status[eFACTION.Inquisition] != "War") { + obj_controller.alarm[8] = 1; + finds.trigger_war = true; + } + } + } + }; + + // Build and display the popup based on collected flags/finds + static finalize_contraband_popup = function() { + if (!instance_exists(star)) { return; } + + var inquis_string = "The Inquisition"; + var popup = 0; + var pop_tit = ""; + var pop_txt = ""; + var pop_spe = ""; + + // determine popup code (preserve your prior numeric meanings) + if (finds.secret_lair_flag) { + popup = (finds.heresy >= 3) ? 2 : 1; + } + if (finds.secret_arsenal_flag) { + popup = (finds.contraband_demand) ? 4 : 3; + } + if (finds.secret_gene_flag) { + popup = (obj_controller.inqis_flag_gene >= 2) ? 6 : 5; + } + if (finds.trigger_war) { + popup = 0.6; + } + + var planet_label = ""; + if (is_array(planets)) { + // show first planet for display purposes + planet_label = scr_roman(planets[0]); + } else { + planet_label = scr_roman(planets); + } + var star_planet = star.name + planet_label; + + // Logging + if (popup == 1) { + scr_event_log("", $"{inquis_string} discovers your Secret Lair on {star_planet}."); + } + else if (popup == 2 || popup == 0.2) { scr_event_log("red", $"{inquis_string} discovers your Secret Lair on {star_planet}.", star); } + else if (popup == 3 || popup == 0.3) { scr_event_log("", $"{inquis_string} discovers your Secret Arsenal on {star_planet}.", star); } + else if (popup == 4 || popup == 0.4) { scr_event_log("red", $"{inquis_string} discovers your Secret Arsenal on {star_planet}.", star); } + else if (popup >= 5 || popup == 0.6) { scr_event_log("", $"{inquis_string} discovers your Secret Gene-Vault on {star_planet}.", star); } + + // Popup text + if (popup == 1) { + pop_tit = "Inquisition Discovers Lair"; + pop_txt = $"{inquis_string} has discovered your Secret Lair on {star_planet}. A quick inspection revealed that there was no contraband or heresy, though the Inquisition does not appreciate your secrecy at all."; + } + else if (popup == 2) { + pop_tit = "Inquisition Discovers Lair"; + pop_txt = $"{inquis_string} has discovered your Secret Lair on {star_planet}. A quick inspection turned up heresy, most foul, and it has all been reported to the Inquisition. They are seething, and relations are damaged."; + } + else if (popup == 3) { + pop_tit = "Inquisition Discovers Arsenal"; + pop_txt = $"{inquis_string} has discovered your Secret Arsenal on {star_planet}. A quick inspection revealed that there was no contraband or heresy, though the Inquisition does not appreciate your secrecy at all."; + } + else if (popup == 4) { + pop_tit = "Inquisition Discovers Arsenal"; + pop_txt = $"{inquis_string} has discovered your Secret Arsenal on {star_planet}. A quick inspection turned up heresy, most foul, and it has all been reported to the Inquisition. Relations have been heavily damaged."; + } + else if (popup == 5) { + pop_tit = "Inquisition Discovers Gene-Vault"; + pop_txt = $"{inquis_string} has discovered your Secret Gene-Vault on {star_planet} and reported it. The Inquisition does NOT appreciate your secrecy, nor the mass production of Gene-Seed. Relations are damaged."; + } + else if (popup == 6) { + pop_tit = "Inquisition Discovers Gene-Vault"; + pop_txt = $"{inquis_string} has discovered your Secret Gene-Vault on {star_planet} and reported it. You were warned once already to not sneak about with Gene-Seed stores and Test-Slave incubators. Do not let it happen again or your Chapter will be branded heretics."; + } + + // Contraband demand text + if (finds.contraband_demand) { + pop_txt += " The Inquisitor responsible for the inspection also demands that you hand over all heretical materials and Artifacts."; + pop_spe = "contraband"; + instance_create(x, y, obj_temp_arti); + } + + // popup options and inline methods + var _pop_data = { + options: [ + { + str1: "Hand over all Chaos and Daemonic Artifacts", + choice_func: function() { + var contraband = []; + for (var i = 0; i < array_length(obj_ini.artifact_struct); i++) { + if (obj_ini.artifact[i] != "") { + var arti = fetch_artifact(i); + if (arti.inquisition_disaprove()) { array_push(contraband, i); } + } + } + for (var j = 0; j < array_length(contraband); j++) { delete_artifact(contraband[j]); } + obj_controller.cooldown = 10; + with (obj_ground_mission) { instance_destroy(); } + reset_popup_options(); + text = $"{array_length(contraband)} Chaos and Daemonic Artifacts have been handed over to the Inquisitor."; + image = ""; + exit; + } + }, + { + str1: "Over your dead body", + choice_func: function() { + obj_controller.cooldown = 10; + if (number != 0 && instance_exists(obj_turn_end)) { obj_turn_end.alarm[1] = 4; } + instance_destroy(); + exit; + } + } + ] + }; + + if (popup >= 1) { + scr_popup(pop_tit, pop_txt, "inquisition", _pop_data); + } + }; + + // optional convenience: keep an "inspection_report" wrapper that calls finalize + static inspection_report = function() { + if (finds.heresy>0){ + var _inquisitor_tolerance = inquisitor_disp/5; + var _heretic_roll = irandom(_inquisitor_tolerance); + + if (_heretic_roll <= finds.heresy){ + obj_controller.alarm[8]=1; + if (finds.daemonic > 0){ + scr_alert("red","inspect","Inquisitor discovers Daemonic item(s) in your posession.",0,0); + } + if (struct_exists(finds, "xenos_mercs")) { + var _merc_types = variable_struct_get_names(finds.xenos_mercs); + if (array_length(_merc_types) > 0) { + var _msg = "Inquisitor discovers Xenos mercenaries serving within your ranks:"; + for (var i = 0; i < array_length(_merc_types); i++) { + var _role = _merc_types[i]; + var _count = finds.xenos_mercs[$ _role]; + var _role_string = string_plural_count(_role, _count, true); + _msg += $"\n- {_role_string}"; + } + scr_alert("red", "inspect", _msg, 0, 0); + } + } + if (finds.daemonic=0 && !_struct_exists(finds,"xenos_mercs")){ + scr_alert("red","inspect","Inquisitor discovers heretical material in your posession.",0,0); + } + + + finalize_contraband_popup(); + } + } else { + var _inspection_passed_string = "The inquisitor Has chosen to turnj a blind eye to some of your more heretical dealings on this occaision. However, it would perhaps be wise to be more careful in furture "; + scr_popup("Inquisitor Finish Inspection", _inspection_passed_string,"inquisition") + } + }; +} + + +function inquisition_inspection_loyalty(inspection_type){ + if (inspection_type="inspect_world") or (inspection_type="inspect_fleet"){ + + var _inspect_results = new inquisitor_inspection_structure(); + + that=instance_nearest(x,y,obj_star); + + if (inspection_type="inspect_world"){ + var _monestary_planet = scr_get_planet_with_feature(that, P_features.Monastery); + if (_monestary_planet!= -1){ + _inspect_results.planets = _monestary_planet; + } else { + var _plans = []; + for (var i=1;i<=that.planets;i++){ + array_push(_plans,i); + } + _inspect_results.planets = _plans; + } + + _inspect_results.star = that; + + _inspect_results.planet_heresys(); + + _inspect_results.collect_inspection_units(); + + _inspect_results.inquisitor_inspect_artifacts(); + + _inspect_results.inquisitor_inspect_units(); + + } + + else if (inspection_type="inspect_fleet"){ + with(obj_en_fleet){ + if (string_count("Inqis",trade_goods)=0) or (owner != eFACTION.Inquisition) then instance_deactivate_object(id); + } + + if (instance_exists(obj_en_fleet)) and (instance_exists(obj_p_fleet)){ + var player_inspection_fleet=instance_nearest(obj_en_fleet.x,obj_en_fleet.y,obj_p_fleet); + _inspect_results.star = instance_nearest(player_inspection_fleet.x, player_inspection_fleet.y, obj_star); + + _inspect_results.ships = fleet_full_ship_array(player_inspection_fleet); + + _inspect_results.collect_inspection_units(); + + _inspect_results.inquisitor_inspect_artifacts(); + + _inspect_results.inquisitor_inspect_units(); + + if (player_inspection_fleet.hurssy>0){ + _inspect_results.finds.heresy+=player_inspection_fleet.hurssy; + } + + var unit; + if (player_inspection_fleet.hurssy>0) then hurr+=player_inspection_fleet.hurssy; + var ca, ia; + + var player_ships = fleet_full_ship_array(player_inspection_fleet); + var _search_units = collect_role_group("all",["",0,player_ships]); + + _inspect_results.inquisitor_inspect_units(_search_units); + } + instance_activate_object(obj_en_fleet); + } + + _inspect_results.inspection_report(); + + + for (var i=0;i0) and (obj_controller.loyal[i]!="Avoiding Inspections"){ + diceh=random(floor(100))+1; + + if (diceh<=(obj_controller.loyal_num[i]*1000)){ + if (obj_controller.loyal[i]="Heretic Contact"){ + obj_controller.loyal_num[i]=80; + obj_controller.loyal_time[i]=9999; + scr_alert("red","inspect","Inquisitor discovers evidence of Chaos Lord correspondence.",0,0); + + var one;one=0; + if (obj_controller.disposition[4]>=80) and (one=0){obj_controller.disposition[4]=30;one=1;} + if (obj_controller.disposition[4]<80) and (obj_controller.disposition[4]>10) and (one=0){obj_controller.disposition[4]=5;one=2;} + if (obj_controller.disposition[4]<=10) and (one=0){obj_controller.disposition[4]=0;one=3;} + + if ((obj_controller.loyalty-80)<=0) and (one<3) then one=3; + if (one=1) then with(obj_controller){ + scr_audience(4,"chaos_audience1",0,"",0,0); + } + if (one=2) then with(obj_controller){ + scr_audience(4,"chaos_audience2",0,"",0,0); + } + if (one=3) then obj_controller.alarm[8]=1; + } + if (obj_controller.loyal[i]="Heretical Homeworld"){obj_controller.loyal_num[i]=20;obj_controller.loyal_time[i]=3;} + if (obj_controller.loyal[i]="Traitorous Marines"){obj_controller.loyal_num[i]=30;obj_controller.loyal_time[i]=9999;} + // if (obj_controller.loyal[i]="Use of Sorcery"){obj_controller.loyal_num[i]=30;obj_controller.loyal_time[i]=9999;} + if (obj_controller.loyal[i]="Mutant Gene-Seed"){obj_controller.loyal_num[i]=30;obj_controller.loyal_time[i]=9999;} + + if (obj_controller.loyal[i]="Non-Codex Arming"){obj_controller.loyal_num[i]=12;obj_controller.loyal_time[i]=3;} + if (obj_controller.loyal[i]="Non-Codex Size"){obj_controller.loyal_num[i]=12;obj_controller.loyal_time[i]=3;} + if (obj_controller.loyal[i]="Lack of Apothecary"){obj_controller.loyal_num[i]=8;obj_controller.loyal_time[i]=1;} + if (obj_controller.loyal[i]="Upset Machine Spirits"){obj_controller.loyal_num[i]=8;obj_controller.loyal_time[i]=1;} + if (obj_controller.loyal[i]="Undevout"){obj_controller.loyal_num[i]=20;obj_controller.loyal_time[i]=3;} + if (obj_controller.loyal[i]="Irreverance for His Servants"){obj_controller.loyal_num[i]=12;obj_controller.loyal_time[i]=5;} + if (obj_controller.loyal[i]="Unvigilant"){obj_controller.loyal_num[i]=12;obj_controller.loyal_time[i]=9999;} + if (obj_controller.loyal[i]="Conduct Unbecoming"){obj_controller.loyal_num[i]=8;obj_controller.loyal_time[i]=9999;} + if (obj_controller.loyal[i]="Refusing to Crusade"){obj_controller.loyal_num[i]=20;obj_controller.loyal_time[i]=9999;} + + if (obj_controller.loyal[i]="Eldar Contact"){obj_controller.loyal_num[i]=4;obj_controller.loyal_time[i]=9999;} + if (obj_controller.loyal[i]="Ork Contact"){obj_controller.loyal_num[i]=4;obj_controller.loyal_time[i]=9999;} + if (obj_controller.loyal[i]="Tau Contact"){obj_controller.loyal_num[i]=4;obj_controller.loyal_time[i]=9999;} + if (obj_controller.loyal[i]="Xeno Trade"){obj_controller.loyal_num[i]=20;obj_controller.loyal_time[i]=9999;} + if (obj_controller.loyal[i]="Xeno Associate"){obj_controller.loyal_num[i]=20;obj_controller.loyal_time[i]=9999;} + + if (obj_controller.loyal[i]="Inquisitor Killer"){obj_controller.loyal_num[i]=100;obj_controller.loyal_time[i]=9999;} + // if (obj_controller.loyal[i]="Avoiding Inspections"){obj_controller.loyal_num[i]=20;obj_controller.loyal_time[i]=120;} + // if (obj_controller.loyal[i]="Lost Standard"){obj_controller.loyal_num[i]=10;obj_controller.loyal_time[i]=9999;} + + obj_controller.loyalty_hidden-=obj_controller.loyal_num[i]; + } + } + }// End repeat + + obj_controller.loyalty=obj_controller.loyalty_hidden; + } +} + +function inquisitor_contraband_take_popup(cur_star, planet) { + var _inspect = new inquisitor_inspection_structure(); + + _inspect.star = cur_star; + _inspect.planets = planet; + + // ===================================================== + // --- Run individual inspection modules --- + // ===================================================== + + if (cur_star.p_type[planet] == "Dead" && array_length(cur_star.p_upgrades[planet]) > 0) { + + // --- Secret Base --- + _inspect.inspect_secret_base(); + + // --- Arsenal --- + _inspect.inspect_arsenal(); + + // --- Gene Vault --- + _inspect.inspect_gene_vault(); + } + + // ===================================================== + // --- Generate Popup + Alerts --- + // ===================================================== + _inspect.finalize_contraband_popup(); +} + + +function inquisition_inspection_logic(){ + var inspec_alert_string = ""; + var cur_star=instance_nearest(x,y,obj_star); + inquisitor = inquisitor<0 ? 0 : inquisitor; + var inquis_string = $"Inquisitor {obj_controller.inquisitor[inquisitor]}"; + if (string_count("fleet",trade_goods)==0){ + inspec_alert_string = $"{inquis_string} finishes inspection of {cur_star.name}"; + inquisition_inspection_loyalty("inspect_world");// This updates the loyalties + } + + else if (string_count("fleet",trade_goods)>0){ + inspec_alert_string = $"{inquis_string} finishes inspection of your fleet"; + inquisition_inspection_loyalty("inspect_fleet");// This updates the loyalties + target=noone; + } + + if (inspec_alert_string!=""){ + scr_event_log("", inspec_alert_string, cur_star.name); + scr_alert("green","duhuhuhu",inspec_alert_string, x,y); + } + + // Test-Slave Incubator Crap + if (obj_controller.und_gene_vaults==0){ + var hur = inquisitor_approval_gene_banks() + if (hur>0){ + + if (hur=1) then obj_controller.disposition[4]-=max(6,round(obj_controller.disposition[4]*0.2)); + if (hur=2) then obj_controller.disposition[4]-=max(3,round(obj_controller.disposition[4]*0.1)); + + + obj_controller.inqis_flag_gene+=1; + if (obj_controller.inqis_flag_gene=1){ + if (hur=1) then inquis_string+=" has noted your abundant Gene-Seed stores and Test-Slave Incubators. Your Chapter has plenty enough Gene-Seed to restore itself to full strength and the Incubators on top of that are excessive. Both have been reported, and you are ordered to remove the Test-Slave Incubators. Relations with the Inquisition are also more strained than before."; + if (hur=2) then inquis_string+=" has noted your abundant Gene-Seed stores and Test-Slave Incubators. Your Chapter is already at full strength and the Incubators on top of that are excessive. The Incubators have been reported, and you are ordered to remove them immediately. Relations with the Inquisition are also slightly more strained than before."; + } + if (obj_controller.inqis_flag_gene=2){ + if (hur=1) then inquis_string+=" has noted your abundant Gene-Seed stores and Test-Slave Incubators. Both the stores and incubators have been reported, and you are AGAIN ordered to remove the Test-Slave Incubators. The Inquisitor says this is your final warning."; + if (hur=2) then inquis_string+=" has noted your abundant Gene-Seed stores and Test-Slave Incubators. Your Chapter is already at full strength and the Incubators are unneeded. The Incubators have been reported, AGAIN, and you are to remove them. The Inquisitor says this is your final warning."; + } + if (obj_controller.inqis_flag_gene=3){ + if (obj_controller.faction_status[eFACTION.Inquisition]!="War") then obj_controller.alarm[8]=1; + } + scr_popup("Inquisition Inspection", inquis_string, "inquisition"); + + } + } +} + +function inquisitor_approval_gene_banks(){ + var gene_slave_count = 0; + var hur=0 + for (var e=0;e=100) and (obj_controller.gene_seed>=1100) then hur=1; + if (obj_controller.marines<=500) and (obj_controller.marines>200) and (gene_slave_count>=75) and (obj_controller.gene_seed>=900) then hur=1; + if (obj_controller.marines<=700) and (obj_controller.marines>500) and (gene_slave_count>=50) and (obj_controller.gene_seed>=750) then hur=1; + if (obj_controller.marines>700) and (gene_slave_count>=50) and (obj_controller.gene_seed>=500) then hur=1; + if (obj_controller.marines>990) and (gene_slave_count>=50) then hur=2; + return hur; +} \ No newline at end of file diff --git a/scripts/scr_inquisition_inspection/scr_inquisition_inspection.yy b/scripts/scr_inquisition_inspection/scr_inquisition_inspection.yy new file mode 100644 index 0000000000..d7a6005dfc --- /dev/null +++ b/scripts/scr_inquisition_inspection/scr_inquisition_inspection.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_inquisition_inspection", + "isCompatibility":false, + "isDnD":false, + "name":"scr_inquisition_inspection", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_inquisition_mission/scr_inquisition_mission.gml b/scripts/scr_inquisition_mission/scr_inquisition_mission.gml index 54f2302d11..93fd8c8f6b 100644 --- a/scripts/scr_inquisition_mission/scr_inquisition_mission.gml +++ b/scripts/scr_inquisition_mission/scr_inquisition_mission.gml @@ -9,10 +9,10 @@ Helpers: - scr_mission_eta -> given the xy of a star where the mission is, calculate how long you should have to complete the mission + scr_mission_eta -> given the xy of a _star where the mission is, calculate how long you should have to complete the mission Todo? maybe add a disposition influence here so that angy inquisitor gives you less spare time and vice versa - scr_star_has_planet_with_feature -> given the id of a star and a `P_features` enum value, check if any planet on that star has the desired feature - star_has_planet_with_forces -> given the id of a star, and a faction, returns whether or not there are forces present there and in sufficient number + scr_star_has_planet_with_feature -> given the id of a _star and a `P_features` enum value, check if any planet on that _star has the desired feature + star_has_planet_with_forces -> given the id of a _star, and a faction, returns whether or not there are forces present there and in sufficient number */ @@ -21,20 +21,23 @@ function scr_inquisition_mission(event, forced_mission = -1){ log_message($"RE: Inquisition Mission, event {event}, forced_mission {forced_mission}"); - if(obj_controller.known[eFACTION.Inquisition] == 0 || obj_controller.faction_status[eFACTION.Inquisition] == "War"){ + if ((obj_controller.known[eFACTION.Inquisition] == 0 || obj_controller.faction_status[eFACTION.Inquisition] == "War") && !global.cheat_debug){ log_message("Player is either hasn't met or is at war with Inquisition, not proceeding with inquisition mission"); return; } - if(event == EVENT.inquisition_planet){ + if (global.cheat_debug){ + show_debug_message_adv("find mission"); + } + if (event == EVENT.inquisition_planet){ mission_investigate_planet(); - } else if(event == EVENT.inquisition_mission){ + } else if (event == EVENT.inquisition_mission){ var inquisition_missions = [ - INQUISITION_MISSION.purge, - INQUISITION_MISSION.inquisitor, - INQUISITION_MISSION.spyrer, - INQUISITION_MISSION.artifact + INQUISITION_MISSION.purge, + INQUISITION_MISSION.inquisitor, + INQUISITION_MISSION.spyrer, + INQUISITION_MISSION.artifact ]; var found_sleeping_necrons = false; @@ -47,39 +50,39 @@ function scr_inquisition_mission(event, forced_mission = -1){ var all_stars = scr_get_stars(); for(var s = 0, _len = array_length(all_stars); s <_len; s++){ - var star = all_stars[s]; + var _star = all_stars[s]; - if(scr_star_has_planet_with_feature(star, P_features.Necron_Tomb) && !awake_necron_Star(star.id)){ - array_push(necron_tomb_worlds, star); + if (scr_star_has_planet_with_feature(_star, P_features.Necron_Tomb) && !awake_necron_star(_star.id)){ + array_push(necron_tomb_worlds, _star); found_sleeping_necrons = true; } - if(star_has_planet_with_forces(star, "Demons", 1)){ - // array_push(demon_worlds, star); // turning this off til i have a way to finish the mission + if (star_has_planet_with_forces(_star, "Demons", 1)){ + // array_push(demon_worlds, _star); // turning this off til i have a way to finish the mission found_demon_world = true; } - if(star_has_planet_with_forces(star, eFACTION.Tyranids, 4)){ - array_push(tyranid_org_worlds, star) + if (star_has_planet_with_forces(_star, eFACTION.Tyranids, 4)){ + array_push(tyranid_org_worlds, _star) found_tyranid_org = true; } } - if(found_sleeping_necrons){ + if (found_sleeping_necrons){ array_push(inquisition_missions, INQUISITION_MISSION.tomb_world); - log_message($"Was able to find a star with dormant necron tomb for inquisition mission"); + log_message($"Was able to find a _star with dormant necron tomb for inquisition mission"); } else { log_message($"Couldn't find any planets with a dormant necron tomb for inquisition mission") } - if(found_tyranid_org){ - log_message($"Was able to find a star with lvl 4 tyranids for inquisition mission"); + if (found_tyranid_org){ + log_message($"Was able to find a _star with lvl 4 tyranids for inquisition mission"); array_push(inquisition_missions, INQUISITION_MISSION.tyranid_organism); } else { log_message($"Couldn't find any planets with lvl 4 tyranids for inquisition mission") } - if(found_demon_world){ + if (found_demon_world){ array_push(inquisition_missions, INQUISITION_MISSION.demon_world); - log_message($"Was able to find a star with demons on it for inquisition mission"); + log_message($"Was able to find a _star with demons on it for inquisition mission"); } else { log_message($"Couldn't find any planets with demons for inquisition mission") } @@ -87,7 +90,7 @@ function scr_inquisition_mission(event, forced_mission = -1){ //if (string_count("Tau",obj_controller.useful_info)=0){ // var found_tau = false; // with(obj_star){ - // if(found_tau){ + // if (found_tau){ // break; // } // for(var i = 1; i <= planets; i++) @@ -102,7 +105,7 @@ function scr_inquisition_mission(event, forced_mission = -1){ //} var chosen_mission = choose_array(inquisition_missions); - if(forced_mission != -1){ + if (forced_mission != -1){ chosen_mission = forced_mission; } switch (chosen_mission){ @@ -122,145 +125,482 @@ function scr_inquisition_mission(event, forced_mission = -1){ } function mission_inquisition_demon_world(demon_worlds){ - var star = choose_array(demon_worlds); + var _star = choose_array(demon_worlds); var planet = -1; - for(var i = 1; i <= star.planets; i++){ - if(star.p_demons[i] > 1){ + for(var i = 1; i <= _star.planets; i++){ + if (_star.p_demons[i] > 1){ planet = i; break; } } - var eta = scr_mission_eta(star.x, star.y, 25); - var text="The Inquisitor is trusting you with a special mission. The planet " + string(star.name) + " " + scr_roman(planet); - text+=" has been uncovered as a Demon World. The taint of chaos must be eradicated from this system. Can your chapter handle this mission?"; - scr_popup("Inquisition Mission",text,"inquisition","demon_world|"+string(star.name)+"|"+string(planet)+"|"+string(eta+1)+"|"); + var eta = scr_mission_eta(_star.x, _star.y, 25); + var text=$"The Inquisitor is trusting you with a special mission. The planet {string(_star.name)} {scr_roman(planet)}"; + text+=$" has been uncovered as a Demon World. The taint of chaos must be eradicated from this system. Can your chapter handle this mission?"; + scr_popup("Inquisition Mission",text,"inquisition",$"demon_world|{string(_star.name)}|{string(planet)}|{string(eta+1)}|"); } function mission_inquisition_ethereal(){ log_message("RE: Ethereal Capture"); var stars = scr_get_stars(); - var valid_stars = array_filter_ext(stars, function(star, index) { - for(var i = 1; i <= star.planets; i++){ - if(star.p_owner[i]==eFACTION.Tau && star.p_tau[i] >= 4) { + var _valid_stars = array_filter_ext(stars, function(_star, index) { + for(var i = 1; i <= _star.planets; i++){ + if (_star.p_owner[i]==eFACTION.Tau && _star.p_tau[i] >= 4) { return true; } } return false; }); - if(valid_stars == 0){ + if (array_length(_valid_stars) == 0){ exit; } - var star = stars[irandom(valid_stars-1)]; + var _star = array_random_element(_valid_stars); var planet = -1; - for(var i = 1; i <= star.planets; i++){ - if(star.p_owner[i]==eFACTION.Tau && star.p_tau[i] >= 4){ + for(var i = 1; i <= _star.planets; i++){ + if (_star.p_owner[i]==eFACTION.Tau && _star.p_tau[i] >= 4){ planet = i; break; } } - var eta = scr_mission_eta(star.x,star.y,1); + var eta = scr_mission_eta(_star.x,_star.y,1); eta = min(max(eta,12),50); - var text = "An Inquisitor is trusting you with a special mission."; - text +="They require that you capture a Tau Ethereal from the planet "+string(star.name)+" "+scr_roman(planet)+"for research purposes. You have"+string(eta)+" months to locate and capture one. Can your chapter handle this mission?"; - scr_popup("Inquisition Mission",text,"inquisition","ethereal|" + string(star.name) + "|" + string(planet) + "|" +string(eta+1) + "|"); + var text = $"An Inquisitor is trusting you with a special mission."; + text +=$"They require that you capture a Tau Ethereal from the planet {string(_star.name)} {scr_roman(planet)} for research purposes. You have {string(eta)} months to locate and capture one. Can your chapter handle this mission?"; + scr_popup("Inquisition Mission",text,"inquisition",$"ethereal|{string(_star.name)}|{string(planet)}|{string(eta+1)}|"); } function mission_inquisition_tyranid_organism(worlds){ log_message("RE: Gaunt Capture"); - var star = choose_array(worlds); + var _star = choose_array(worlds); var planet = -1; - for(var i = 1; i <= star.planets; i++){ - if(star.p_tyranids[i] > 4){ + for(var i = 1; i <= _star.planets; i++){ + if (_star.p_tyranids[i] > 4){ planet = i; break; } } - var eta = scr_mission_eta(star.x, star.y, 1); + var eta = scr_mission_eta(_star.x, _star.y, 1); var eta = min(max(eta,6),50); - var text="An Inquisitor is trusting you with a special mission. The planet " + string(star.name) + " " + scr_roman(planet); + var text=$"An Inquisitor is trusting you with a special mission. The planet {string(_star.name)} {scr_roman(planet)}"; text+=" is ripe with Tyranid organisms. They require that you capture one of the Gaunt species for research purposes. Can your chapter handle this mission?"; - scr_popup("Inquisition Mission",text,"inquisition","tyranid_org|"+string(star.name)+"|"+string(planet)+"|"+string(eta+1)+"|"); + scr_popup("Inquisition Mission",text,"inquisition",$"tyranid_org|{string(_star.name)}|{string(planet)}|{string(eta+1)}|"); } function mission_inquisition_tomb_world(tomb_worlds){ log_message("RE: Necron Tomb Bombing"); - var star = choose_array(tomb_worlds) - var planet = scr_get_planet_with_feature(star, P_features.Necron_Tomb); - var eta = scr_mission_eta(star.x, star.y,1) + if (is_array(tomb_worlds)){ + var _star = array_random_element(tomb_worlds); + } else { + _star = tomb_worlds; + } + + var planet = scr_get_planet_with_feature(_star, P_features.Necron_Tomb); + + if (planet == -1){ + planet = irandom_range(1,_star.planets); + array_push(_star.p_feature[planet],new NewPlanetFeature(P_features.Necron_Tomb)); + } - var text="The Inquisition is trusting you with a special mission. They have reason to suspect the Necron Tomb on planet " + string(star.name) + " " +scr_roman(planet); - text+=" may become active. You are to send a small group of marines to plant a bomb deep inside, within "+string(eta)+" months. Can your chapter handle this mission?"; - scr_popup("Inquisition Mission",text,"inquisition","necron|"+string(star.name)+"|"+string(planet)+"|"+string((eta+1))+"|"); + var eta = scr_mission_eta(_star.x, _star.y,1) + if (global.cheat_debug){ + show_debug_message_adv("mission popup"); + } + var _options = [ + { + str1 :"Accept", + choice_func: init_mission_inquisition_tomb_world, + }, + { + str1 :"Refuse", + choice_func: popup_default_close, + } + ] + var _pop_data = { + system : _star.name, + planet : planet, + estimate : eta, + mission : "necron", + options : _options, + } + + var text=$"The Inquisition is trusting you with a special mission. They have reason to suspect the Necron Tomb on planet {string(_star.name)} {scr_roman(planet)}"; + text+=$" may become active. You are to send a small group of marines to plant a bomb deep inside, within {string(eta)} months. Can your chapter handle this mission?"; + + scr_popup("Inquisition Mission",text,"inquisition",_pop_data); +} + +function init_mission_inquisition_tomb_world(){ + + mission_star = star_by_name(pop_data.system); + if (mission_star == "none"){ + popup_default_close(); + exit; + } + scr_event_log("", $"Inquisition Mission Accepted: {global.chapter_name} have been given a Bomb to seal the Necron Tomb on {mission_star.name} {scr_roman(pop_data.planet)}.", mission_star.name); + + image = "necron_cave"; + title = "New Equipment"; + fancy_title = 0; + text_center = 0; + text = $"{global.chapter_name} have been provided with 1x Plasma Bomb in order to complete the mission."; + + if (demand) { + text = $"The Inquisition demands that your Chapter demonstrate its loyalty. {global.chapter_name} have been given a Plasma Bomb to seal the Necron Tomb on {mission_star.name} {scr_roman(pop_data.planet)}. It is expected to be completed within {pop_data.estimate} months."; + } + reset_popup_options(); + scr_add_item("Plasma Bomb", 1); + obj_controller.cooldown = 10; + if (demand) { + demand = 0; + } + add_new_inquis_mission(); + exit; } function mission_inquisition_artifact(){ var text; log_message("RE: Artifact Hold"); text="The Inquisition is trusting you with a special mission. A local Inquisitor has a powerful artifact. You are to keep it safe, and NOT use it, until the artifact may be safely retrieved. Can your chapter handle this mission?"; - scr_popup("Inquisition Mission",text,"inquisition","artifact|bop|0|"+string(irandom_range(6,26))+"|"); + scr_popup("Inquisition Mission",text,"inquisition",$"artifact|bop|0|{string(irandom_range(6,26))}|"); } -function mission_inquistion_hunt_inquisitor(){ +function mission_inquistion_hunt_inquisitor(star_id = -1){ log_message("RE: Inquisitor Hunt"); var stars = scr_get_stars(); - var valid_stars = array_filter_ext(stars, - function(star,index){ - var p_fleet = instance_nearest(star.x,star.y,obj_p_fleet); - if(instance_exists(p_fleet)){ - var distance = point_distance(star.x,star.y,p_fleet.x,p_fleet.y); - if(100 <= distance & distance <= 300){ + /*var _valid_stars = array_filter_ext(stars, + function(_star,index){ + var _p_fleet = instance_nearest(_star.x,_star.y,obj_p_fleet); + if (instance_exists(_p_fleet)){ + var _distance = point_distance(_star.x,_star.y,_p_fleet.x,_p_fleet.y); + if (100 <= _distance & _distance <= 300){ return true; } } - return false; - }); + return false; + });*/ + + + if (star_id == -1){ + var _valid_stars = stars; + + if (array_length(_valid_stars) == 0) { + log_error("RE: Inquisitor Hunt,couldn't find a _star"); + exit; + } + + var _star = array_random_element(_valid_stars); + } else { + _star = star_id; + } + var _gender = set_gender(); + var _name = global.name_generator.generate_imperial_name(_gender); + var planet = irandom_range(1, _star.planets); - if(valid_stars == 0) { - log_error("RE: Inquisitor Hunt,couldn't find a star"); + var eta = scr_mission_eta(_star.x,_star.y,1); + eta=max(eta, 8); + var text=$"The Inquisition is trusting you with a special mission. A radical inquisitor named {_name} will be visiting the {string(_star.name)} system in {string(eta)} month's time. They are highly suspect of heresy, and as such, are to be put down. Can your chapter handle this mission?"; + if (obj_controller.demanding) { + text = $"The Inquisition demands that your Chapter demonstrate its loyalty to the Imperium of Mankind and the Emperor. A radical inquisitor is enroute to {_star.name}, expected within {estimate} months. They are to be silenced and removed."; + } + var _options = [ + { + str1 :"Accept", + choice_func: init_mission_hunt_inquisitor, + }, + { + str1 :"Refuse", + choice_func: popup_default_close, + } + ]; + + var _mission_data = { + inquisitor_name : _name, + inquisitor_gender : _gender, + }; + var _pop_data = { + system : _star.name, + planet : planet, + estimate : eta, + mission : "inquisitor", + options : _options, + mission_data : _mission_data, + }; + + scr_popup("Inquisition Mission",text,"inquisition",_pop_data); +} + +/// @mixin obj_popup +function add_new_inquis_mission(){ + + if (add_new_problem(pop_data.planet, pop_data.mission, pop_data.estimate, mission_star)) { + new_star_event_marker("green"); + mission_is_go = true; + } +} + +function init_mission_hunt_inquisitor(){ + mission_star = star_by_name(pop_data.system); + if (mission_star == "none"){ + popup_default_close(); exit; } - - var star = stars[irandom(valid_stars-1)]; + scr_event_log("", $"Inquisition Mission Accepted: The radical Inquisitor {pop_data.mission_data.inquisitor_name} enroute to {mission_star.name} must be removed. Estimated arrival in {pop_data.estimate} months.", mission_star.name); + + var _radical_inquisitor_fleet = instance_create(mission_star.x-irandom_range(-400,400),mission_star.y-irandom_range(-400,400),obj_en_fleet); + with (_radical_inquisitor_fleet){ + base_inquis_fleet(); + } + + fleet_add_cargo("radical_inquisitor", pop_data.mission_data, true, _radical_inquisitor_fleet); + + _radical_inquisitor_fleet.action_x=mission_star.x; + _radical_inquisitor_fleet.action_y=mission_star.y; + + var _est = pop_data.estimate; + with (_radical_inquisitor_fleet){ + set_fleet_movement(false,"move",_est,_est); + } + + if (add_new_problem(pop_data.planet, pop_data.mission, pop_data.estimate, mission_star,pop_data.mission_data)) { + new_star_event_marker("green"); + mission_is_go = true; + } +} + +function mission_hunt_inquisitor_hear_out_radical_inquisitor(){ + + var _offer = choose(1, 1, 2, 2, 3); + + var _gender = pop_data.inquisitor_gender + var _gender_third = string_gender_third_person(_gender); + var gender_pronoun = string_gender_pronouns(_gender); + + if (_offer == 1) { + replace_options( + [ + { + str1 : "Destroy their vessel", + choice_func : mission_hunt_inquisitor_destroy_inquisitor_ship, + + }, + { + str1 : "Take the artifact and then destroy them", + choice_func : mission_hunt_inquisitor_take_artifact_double_cross, + }, + { + str1 : "Take the artifact and spare them", + choice_func : mission_hunt_inquisitor_take_artifact_bribe, + } + ] + ); + title = "Artifact Offered"; + text = $"The Inquisitor claims that this is a massive misunderstanding, and {_gender_third} wishes to prove {gender_pronoun} innocence. If {global.chapter_name} allow their ship to leave {_gender_third} will give {global.chapter_name} an artifact."; + exit; + } + + else if (_offer == 2) { + replace_options( + [ + { + str1 : "Destroy their vessel", + choice_func : mission_hunt_inquisitor_destroy_inquisitor_ship, + + }, + { + str1 : "Search their ship", + //choice_func : instance_destroy, // TODO: Implement proper ship search logic + }, + { + str1 : "Spare them", + choice_func : mission_hunt_inquisitor_show_mercy, + } + ] + ) + title = "Mercy Plea"; + text = $"The Inquisitor claims that {_gender_third} has key knowledge that would grant the Imperium vital power over the forces of Chaos. If {global.chapter_name} allow {gender_pronoun} ship to leave the forces of Chaos within this sector will be weakened."; + exit; + } + + else if (_offer == 3) { + with (obj_en_fleet) { + if ((trade_goods == "male_her") || (trade_goods == "female_her")) { + with (obj_p_fleet) { + if (action != "") { + instance_deactivate_object(id); + } + } + with (instance_nearest(x, y, obj_p_fleet)) { + scr_add_corruption(true, "1d3"); + } + instance_activate_object(obj_p_fleet); + instance_destroy(); + } + } + title = "Inquisition Mission Completed"; + image = "exploding_ship"; + text = $"{global.chapter_name} allow communications. As soon as the vox turns on {global.chapter_name} hear a sickly, hateful voice. They begin to speak of the inevitable death of your marines, the fall of all that is and ever shall be, and " + string(gender_pronoun) + " Lord of Decay. Their ship is fired upon and destroyed without hesitation."; + reset_popup_options(); + scr_event_log("", "Inquisition Mission Completed: The radical Inquisitor has been purged."); + exit; + } + exit; +} + +function mission_hunt_inquisitor_take_artifact_bribe(){ + with (pop_data.inquisitor_ship) { + action_x = choose(room_width * -1, room_width * 2); + action_y = choose(room_height * -1, room_height * 2); + trade_goods = "|DELETE|"; + action_spd = 256; + set_fleet_movement(false); + } + var last_artifact = scr_add_artifact("random", "", 4); - var gender = choose(0,1); - var name=global.name_generator.generate_imperial_name(gender); - var planet = irandom_range(1, star.planets); + reset_popup_options(); + + title = "Inquisition Mission Completed"; + text = "Your ship sends over a boarding party, who retrieve the offered artifact- "; + text += $" some form of {obj_ini.artifact[last_artifact]}. As promised {global.chapter_name} allow the Inquisitor to leave, hoping for the best. What's the worst that could happen?"; + image = "artifact_recovered"; + scr_event_log("", "Artifact Recovered from radical Inquisitor."); + scr_event_log("", "Inquisition Mission Completed: The radical Inquisitor has been purged."); + + add_event({ + e_id : "inquisitor_spared", + duration : irandom_range(6, 18) + 1, + variation : 1, + }); +} + +function mission_hunt_inquisitor_take_artifact_double_cross(){ + with (pop_data.inquisitor_ship) { + instance_destroy(); + } + var last_artifact = scr_add_artifact("random", "", 4); - var eta = scr_mission_eta(star.x,star.y,1); - eta=max(eta, 8); - var text="The Inquisition is trusting you with a special mission. A radical inquisitor named "+string(name)+" will be visiting the "+string(star.name)+" system in "+string(eta)+" month's time. They are highly suspect of heresy, and as such, are to be put down. Can your chapter handle this mission?"; - scr_popup("Inquisition Mission",text,"inquisition","inquisitor|"+string(star.name)+"|"+string(planet)+"|"+string(real(eta))+"|"); + reset_popup_options(); + + title = "Inquisition Mission Completed"; + text = "Your ship sends over a boarding party, who retrieve the offered artifact- "; + text += $" some form of {obj_ini.artifact[last_artifact]}. Once it is safely stowed away your ship is then ordered to fire. The Inquisitor's own seems to hesitate an instant before banking away, but is quickly destroyed."; + image = "exploding_ship"; + scr_event_log("", "Artifact recovered from radical Inquisitor."); + scr_event_log("", "Inquisition Mission Completed: The radical Inquisitor has been purged."); + +} + + + +function mission_hunt_inquisitor_show_mercy(){ + + with (pop_data.inquisitor_ship) { + action_x = choose(room_width * -1, room_width * 2); + action_y = choose(room_height * -1, room_height * 2); + trade_goods = "|DELETE|"; + alarm[4] = 1; + action_spd = 256; + action = ""; + }; + + title = "Inquisition Mission Completed"; + text = $"{global.chapter_name} allow the Inquisitor to leave, trusting in their words. If they truly do have key information it is a risk {global.chapter_name} are willing to take. What's the worst that could happen?"; + image = "artifact_recovered"; + reset_popup_options(); + + scr_event_log("", "Inquisition Mission Completed?: The radical Inquisitor has been allowed to flee in order to weaken the forces of Chaos, as they promised."); + + add_event({ + e_id : "inquisitor_spared", + duration : irandom_range(6, 18) + 1, + variation : 2, + }) + +} + +function mission_hunt_inquisitor_destroy_inquisitor_ship(){ + + show_debug_message_adv("mission_hunt_inquisitor_destroy_inquisitor_ship"); + var _final_disp_mod = 0; + + if (obj_controller.demanding == 0) { + _final_disp_mod += 1; + } + else if (obj_controller.demanding == 1) { + _final_disp_mod += choose(0, 0, 1); + } + + if ((title == "Artifact Offered") || (title == "Mercy Plea")) { + _final_disp_mod -= choose(0, 1); + } + + alter_disposition(eFACTION.Inquisition, _final_disp_mod); + + title = "Inquisition Mission Completed"; + image = "exploding_ship"; + text = "The Inquisitor's ship begans to bank and turn, to flee, but is immediately fired upon by your fleet. The ship explodes, taking the Inquisitor with it. The mission has been accomplished."; + reset_popup_options(); + + scr_event_log("", "Inquisition Mission Completed: The radical Inquisitor has been purged."); + with (pop_data.inquisitor_ship) { + instance_destroy(); + } + exit; } +function hunt_inquisition_spared_inquisitor_consequence(event){ + var _diceh=roll_dice_chapter(1, 100, "high"); + + if (_diceh<=25){ + alarm[8]=1; + scr_loyalty("Crossing the Inquisition","+"); + scr_popup("Inquisition Crossed","","",""); + } + if (_diceh>25) and (_diceh<=50){ + scr_loyalty("Crossing the Inquisition","+"); + scr_popup("Inquisition Crossed","","",""); + } + if (_diceh>50) and (_diceh<=85){ + //nothing happens for the minute + } + if (_diceh>85) and (event.variation==2){ + scr_popup("Anonymous Message","You recieve an anonymous letter of thanks. It mentions that motions are underway to destroy any local forces of Chaos.","",""); + with(obj_star){ + for(var o=1; o<=planets; o++){ + p_heresy[o]=max(0,p_heresy[o]-10); + } + } + } +} + + function mission_inquistion_spyrer(){ log_message("RE: Spyrer"); var stars = scr_get_stars(); - var valid_stars = array_filter_ext(stars, - function(star,index){ - return scr_star_has_planet_with_type(star,"Hive"); + var _valid_stars = array_filter_ext(stars, + function(_star,index){ + return scr_star_has_planet_with_type(_star,"Hive"); }); - if(valid_stars == 0){ - log_error("RE: Spyrer, couldn't find star"); + if (array_length(_valid_stars) == 0){ + log_error("RE: Spyrer, couldn't find _star"); exit; } - var star = stars[irandom(valid_stars-1)]; - var planet = scr_get_planet_with_type(star,"Hive"); - var eta = scr_mission_eta(star.x,star.y,1); + var _star = array_random_element(_valid_stars); + var planet = scr_get_planet_with_type(_star,"Hive"); + var eta = scr_mission_eta(_star.x,_star.y,1); eta = min(max(eta, 6), 50); - var text="The Inquisition is trusting you with a special mission. An experienced Spyrer on hive world " + string(star.name) + " " + scr_roman(planet); - text += " has began to hunt indiscriminately, and proven impossible to take down by conventional means. If they are not put down within "+string(eta)+" month's time panic is likely. Can your chapter handle this mission?"; - var mission_params = "spyrer|"+string(star.name)+"|"+string(planet)+"|"+string(eta+1)+"|"; + var text=$"The Inquisition is trusting you with a special mission. An experienced Spyrer on hive world {string(_star.name)} {scr_roman(planet)}"; + text += $" has began to hunt indiscriminately, and proven impossible to take down by conventional means. If they are not put down within {string(eta)} month's time panic is likely. Can your chapter handle this mission?"; + var mission_params = $"spyrer|{string(_star.name)}|{string(planet)}|{string(eta+1)}|"; log_message($"Starting spyrer mission with params {mission_params}") scr_popup("Inquisition Mission",text,"inquisition",mission_params); } @@ -270,51 +610,51 @@ function mission_inquistion_purge(){ var mission_flavour = choose(1,1,1,2,2,3); var stars = scr_get_stars(); - var valid_stars = 0; + var _valid_stars = []; - if(mission_flavour == 3) { - valid_stars = array_filter_ext(stars, function(star,index){ - var hive_idx = scr_get_planet_with_type(star,"Hive") - return scr_is_planet_owned_by_allies(star, hive_idx); + if (mission_flavour == 3) { + _valid_stars = array_filter_ext(stars, function(_star,index){ + var hive_idx = scr_get_planet_with_type(_star,"Hive") + return scr_is_planet_owned_by_allies(_star, hive_idx); }); } else { - valid_stars = array_filter_ext(stars, - function(star,index){ - var hive_idx = scr_get_planet_with_type(star,"Hive") - var desert_idx = scr_get_planet_with_type(star,"Desert") - var temperate_idx = scr_get_planet_with_type(star,"Temperate") - var allied_hive = scr_is_planet_owned_by_allies(star, hive_idx) - var allied_desert = scr_is_planet_owned_by_allies(star, desert_idx) - var allied_temperate =scr_is_planet_owned_by_allies(star, temperate_idx) + _valid_stars = array_filter_ext(stars, + function(_star,index){ + var hive_idx = scr_get_planet_with_type(_star,"Hive") + var desert_idx = scr_get_planet_with_type(_star,"Desert") + var temperate_idx = scr_get_planet_with_type(_star,"Temperate") + var allied_hive = scr_is_planet_owned_by_allies(_star, hive_idx) + var allied_desert = scr_is_planet_owned_by_allies(_star, desert_idx) + var allied_temperate =scr_is_planet_owned_by_allies(_star, temperate_idx) return allied_hive || allied_desert || allied_temperate; }); } - if(valid_stars == 0){ - log_error("RE: Purge, couldn't find star"); + if (array_length(_valid_stars) == 0){ + log_error("RE: Purge, couldn't find _star"); exit; } - var star = stars[irandom(valid_stars - 1)]; + var _star = array_random_element(_valid_stars); var planet = -1; - if(mission_flavour == 3) { - planet = scr_get_planet_with_type(star, "Hive"); + if (mission_flavour == 3) { + planet = scr_get_planet_with_type(_star, "Hive"); } else { - var hive_planet = scr_get_planet_with_type(star,"Hive"); - var desert_planet = scr_get_planet_with_type(star,"Desert"); - var temperate_planet = scr_get_planet_with_type(star,"Temperate"); - if(scr_is_planet_owned_by_allies(star, hive_planet)) { + var hive_planet = scr_get_planet_with_type(_star,"Hive"); + var desert_planet = scr_get_planet_with_type(_star,"Desert"); + var temperate_planet = scr_get_planet_with_type(_star,"Temperate"); + if (scr_is_planet_owned_by_allies(_star, hive_planet)) { planet = hive_planet; - } else if(scr_is_planet_owned_by_allies(star, temperate_planet)) { + } else if (scr_is_planet_owned_by_allies(_star, temperate_planet)) { planet = temperate_planet; - } else if(scr_is_planet_owned_by_allies(star, desert_planet)) { + } else if (scr_is_planet_owned_by_allies(_star, desert_planet)) { planet = desert_planet; } } - if(planet == -1){ + if (planet == -1){ log_error("RE: Purge, couldn't find planet"); exit; } @@ -323,41 +663,41 @@ function mission_inquistion_purge(){ var eta = infinity with(obj_p_fleet){ if (capital_number+frigate_number==0) { - eta = min(scr_mission_eta(star.x,star.y,1),eta); // this is wrong + eta = min(scr_mission_eta(_star.x,_star.y,1),eta); // this is wrong } } eta = min(max(eta,12),100); - var text="The Inquisition is trusting you with a special mission."; + var text="The Inquisition is trusting you with a special mission."; if (mission_flavour==1) { - text +=" A number of high-ranking nobility on the planet "+scr_roman(planet)+" are being difficult and harboring heretical thoughts. They are to be selectively purged within "+string(eta)+" months. Can your chapter handle this mission?"; + text +=$" A number of high-ranking nobility on the planet {scr_roman(planet)} are being difficult and harboring heretical thoughts. They are to be selectively purged within {string(eta)} months. Can your chapter handle this mission?"; } else if (mission_flavour==2) { - text+=" A powerful crimelord on the planet "+scr_roman(planet)+" is gaining an unacceptable amount of power and disrupting daily operations. They are to be selectively purged within "+string(eta)+" months. Can your chapter handle this mission?"; + text+=$" A powerful crimelord on the planet {scr_roman(planet)} is gaining an unacceptable amount of power and disrupting daily operations. They are to be selectively purged within {string(eta)} months. Can your chapter handle this mission?"; } else if (mission_flavour==3) { - text+=" The mutants of hive world "+scr_roman(planet)+" are growing in numbers and ferocity, rising sporadically from the underhive. They are to be cleansed by promethium within "+string(eta)+" months. Can your chapter handle this mission?"; + text+=$" The mutants of hive world {scr_roman(planet)} are growing in numbers and ferocity, rising sporadically from the underhive. They are to be cleansed by promethium within {string(eta)} months. Can your chapter handle this mission?"; } if (mission_flavour!=3) { - scr_popup("Inquisition Mission",text,"inquisition","purge|"+string(star.name)+"|"+string(planet)+"|"+string(real(eta+1))+"|"); + scr_popup("Inquisition Mission",text,"inquisition",$"purge|{string(_star.name)}|{string(planet)}|{string(real(eta+1))}|"); } else { - scr_popup("Inquisition Mission",text,"inquisition","cleanse|"+string(star.name)+"|"+string(planet)+"|"+string(real(eta+1))+"|"); + scr_popup("Inquisition Mission",text,"inquisition",$"cleanse|{string(_star.name)}|{string(planet)}|{string(real(eta+1))}|"); } } function mission_investigate_planet(){ var stars = scr_get_stars(); - var valid_stars = array_filter_ext(stars, - function(star,index){ - if(scr_star_has_planet_with_feature(star, "????")){ - var fleet = instance_nearest(star.x,star.y,obj_p_fleet); - if(fleet == undefined || point_distance(star.x,star.y,fleet.x,fleet.y)>=160){ + var _valid_stars = array_filter_ext(stars, + function(_star,index){ + if (scr_star_has_planet_with_feature(_star, P_features.Ancient_Ruins)){ + var fleet = instance_nearest(_star.x,_star.y,obj_p_fleet); + if (fleet == undefined || point_distance(_star.x,_star.y,fleet.x,fleet.y)>=160){ return true; } return false; @@ -365,13 +705,13 @@ function mission_investigate_planet(){ return false; }); - if (valid_stars == 0){ - log_error("RE: Investigate Planet, couldn't find a star"); + if (array_length(_valid_stars) == 0){ + log_error("RE: Investigate Planet, couldn't find a _star"); exit; } - var star = stars[irandom(valid_stars-1)]; - var planet = scr_get_planet_with_feature(star, P_features.Ancient_Ruins); + var _star = array_random_element(_valid_stars); + var planet = scr_get_planet_with_feature(_star, P_features.Ancient_Ruins); if (planet == -1){ log_error("RE: Investigate Planet, couldn't pick a planet"); exit; @@ -383,13 +723,210 @@ function mission_investigate_planet(){ if (action!=""){ continue; } - eta = min(eta, scr_mission_eta(star.x,star.y,1)); + eta = min(eta, scr_mission_eta(_star.x,_star.y,1)); } eta = min(max(3,eta),100); - var text="The Inquisition wishes for you to investigate " + string(star.name) + " " + scr_roman(planet) + "."; - text+=" Boots are expected to be planted on its surface over the course of your investigation."; - text += " You have " + string(eta) + " months to complete this task."; - scr_popup("Inquisition Recon",text,"inquisition","recon|"+string(star.name)+"|"+string(planet)+"|"+string(eta)+"|"); + var text=$"The Inquisition wishes for you to investigate {string(_star.name)} {scr_roman(planet)}"; + text+=$" Boots are expected to be planted on its surface over the course of your investigation."; + text += $" You have {string(eta)} months to complete this task."; + scr_popup("Inquisition Recon",text,"inquisition",$"recon|{string(_star.name)}|{string(planet)}|{string(eta)}|"); + +} + + +/// @mixin obj_star +function setup_necron_tomb_raid(planet){ + log_message($"player on planet with necron mission {name} planet: {planet}") + var have_bomb; + have_bomb = scr_check_equip("Plasma Bomb", name, planet, 0); + log_message($"have bomb? {have_bomb} ") + if (have_bomb > 0) { + var tixt; + tixt = $"Your marines on {planet_numeral_name(planet)}"; + tixt += " are prepared and ready to enter the Necron Tombs. A Plasma Bomb is in tow."; + var _number = instance_exists(obj_turn_end) ? obj_turn_end.current_popup : 0; + var _pop_data = { + mission : "necron_tomb_excursion", + loc : name, + planet : planet, + estimate : 999, + number : _number, + mission_stage :1, + options : [ + { + str1 : "Begin the Mission", + choice_func : necron_tomb_mission_start, + }, + { + str1 : "Not Yet", + choice_func : instance_destroy, + } + ] + } + scr_popup("Necron Tomb Excursion", tixt, $"necron_cave",_pop_data); + } +} + + +/// @mixin obj_popup +function necron_tomb_mission_start(){ + mission_star = star_by_name(pop_data.loc); + planet = pop_data.planet; + + title = $"Necron Tunnels : {pop_data.mission_stage}"; + replace_options( + [ + { + str1 : "Continue", + choice_func : necron_tomb_mission_sequence, + + }, + { + str1 : "Return to the surface", + choice_func : instance_destroy, + } + ] + ) + image = "necron_tunnels_1"; + text = "Your marines enter the massive tunnel complex, following the energy readings. At first the walls are cramped and tiny, closing about them, but the tunnels widen at a rapid pace."; +} + +function necron_tomb_mission_sequence(){ + var battle; + var player_forces = 0; + var penalty = 0; + var roll = roll_dice_chapter(1, 100, "low"); + battle = 0; + instance_activate_all(); + player_forces = mission_star.p_player[planet]; + + // SMALL TEAM OF MARINES + if (player_forces > 6) { + penalty = 10; + } + if (player_forces > 10) { + penalty = 20; + } + if (player_forces >= 20) { + penalty = 30; + } + if (player_forces >= 40) { + penalty = 50; + } + if (player_forces >= 60) { + penalty = 100; + } + roll += penalty; + + // roll=30;if (string_count("3",title)>0) then roll=70; + + // Result + if (roll <= 60) { + pop_data.mission_stage += 1; + title = $"Necron Tunnels : {pop_data.mission_stage}"; + + if (pop_data.mission_stage == 2) { + image = "necron_tunnels_2"; + text = "The energy readings are much stronger, now that your marines are deep inside the tunnels. What was once cramped is now luxuriously large, the tunnel ceiling far overhead decorated by stalactites."; + } else if (pop_data.mission_stage == 3) { + image = "necron_tunnels_3"; + text = "After several hours of descent the entrance to the Necron Tomb finally looms ahead- dancing, sickly green light shining free. Your marine confirms that the Plasma Bomb is ready."; + } else if (pop_data.mission_stage >= 4) { + image = ""; + title = "Inquisition Mission Completed"; + text = "Your marines finally enter the deepest catacombs of the Necron Tomb. There they place the Plasma Bomb and arm it. All around are signs of increasing Necron activity. With half an hour set, your men escape back to the surface. There is a brief rumble as the charge goes off, your mission a success."; + reset_popup_options(); + + alter_disposition(eFACTION.Inquisition, obj_controller.demanding ? choose(0, 0, 1) : 1); + + mission_star = star_by_name(pop_data.loc); + remove_planet_problem(planet, "necron", mission_star); + seal_tomb_world(mission_star.p_feature[planet]); + // mission_star.p_feature[planet][search_planet_features(mission_star.p_feature[planet], P_features.Necron_Tomb)[0]].sealed = 1; + + scr_event_log("", $"Inquisition Mission Completed: Your Astartes have sealed the Necron Tomb on {mission_star.name} {scr_roman(planet)}.", mission_star.name); + scr_gov_disp(mission_star.name, planet, irandom_range(3, 7)); + var have_bomb = scr_check_equip("Plasma Bomb", pop_data.loc, pop_data.planet, 1); + exit; + } + } + if ((roll > 60) && (roll <= 82)) { + // Necron Wraith attack + battle = 1; + } + if ((roll > 82) && (roll <= 92)) { + // Tomb Spyder attack + battle = 2; + } + if ((roll > 92) && (roll <= 97)) { + // Tomb Stalker + battle = 3; + } + if (roll > 97) { + // Tomb World wakes up + if (player_forces <= 30) { + battle = 4; + } + if (player_forces > 30) { + battle = 5; + } + if (player_forces > 100) { + battle = 6; + } + } + + if (battle > 0) { + instance_deactivate_all(true); + instance_activate_object(obj_controller); + instance_activate_object(obj_ini); + + instance_create(0, 0, obj_ncombat); + _roster = new Roster(); + var _pop_data = pop_data; + with (_roster){ + roster_location = _pop_data.loc; + roster_planet = _pop_data.planet; + determine_full_roster(); + only_locals(); + update_roster(); + if (array_length(selected_units)){ + setup_battle_formations(); + add_to_battle(); + } + } + delete _roster; + + + mission_star = star_by_name(pop_data.loc); + + obj_ncombat.battle_object = mission_star; + instance_deactivate_object(obj_star); + obj_ncombat.battle_loc = pop_data.loc; + obj_ncombat.battle_id = pop_data.planet; + obj_ncombat.dropping = 0; + obj_ncombat.attacking = 0; + obj_ncombat.enemy = 13; + obj_ncombat.threat = 1; + obj_ncombat.formation_set = 1; + obj_ncombat.battle_mission = "necron_tomb_excursion"; + obj_ncombat.battle_data = pop_data; + if (battle == 1) { + obj_ncombat.battle_special = "wraith_attack"; + } else if (battle == 2) { + obj_ncombat.battle_special = "spyder_attack"; + } else if (battle == 3) { + obj_ncombat.battle_special = "stalker_attack"; + } else if (battle == 4) { + obj_ncombat.battle_special = "wake1_attack"; + } else if (battle == 5) { + obj_ncombat.battle_special = "wake2_attack"; + } else if (battle == 6) { + obj_ncombat.battle_special = "wake2_attack"; + } + + instance_destroy(); + } + exit; } \ No newline at end of file diff --git a/scripts/scr_keyboard_helpers/scr_keyboard_helpers.gml b/scripts/scr_keyboard_helpers/scr_keyboard_helpers.gml index bbd9ef4f40..0973f93260 100644 --- a/scripts/scr_keyboard_helpers/scr_keyboard_helpers.gml +++ b/scripts/scr_keyboard_helpers/scr_keyboard_helpers.gml @@ -3,49 +3,85 @@ #macro ARR_virtual_keys [vk_left, vk_right, vk_up,vk_down,vk_enter,vk_escape,vk_space,vk_shift,vk_control,vk_alt,vk_backspace,vk_tab,vk_home,vk_end,vk_delete,vk_insert,vk_pageup,vk_pagedown,vk_pause,vk_printscreen,vk_f1,vk_f2,vk_f3,vk_f4,vk_f5,vk_f6,vk_f7,vk_f8,vk_f9,vk_f10,vk_f11,vk_f12,vk_numpad0,vk_numpad1,vk_numpad2,vk_numpad3,vk_numpad4,vk_numpad5,vk_numpad6,vk_numpad7,vk_numpad8,vk_numpad9, vk_multiply,vk_divide,vk_add,vk_subtract,vk_decimal] -//,vk_lshift,vk_lcontrol,vk_lalt,vk_rshift,vk_rcontrol,vk_ralt these ones can cause issues - - -function press_exclusive(press_choice){ - if (keyboard_check_pressed(vk_nokey)) then return false; - if (!keyboard_check_pressed(press_choice)) then return false; - var _virtual_keys = ARR_virtual_keys; - for (var i=0;ip_max_population[ii]/20){ p_population[ii]=round(p_population[ii]/2); - if (p_population[ii]<=p_max_population[ii]/20) then find_new_planet=true; + if (p_population[ii]<=p_max_population[ii]/20){ + find_new_planet=true; + } } - } else if (p_population[ii]<=p_max_population[ii]/20) then find_new_planet=true; + } else if (p_population[ii]<=p_max_population[ii]/20){ + find_new_planet=true; + } } } // Next planet; rembark the chaos forces @@ -28,10 +36,10 @@ function khorne_fleet_cargo(){ find_new_planet=false; repeat(planets){ ii+=1; - if (planet_feature_bool(p_feature[ii], P_features.World_Eaters)==1){ + if (planet_feature_bool(p_feature[ii], P_features.ChaosWarband)==1){ p_chaos[ii]=0; p_traitors[ii]=max(4,p_traitors[ii]+1); - delete_features(p_feature[ii], P_features.World_Eaters); + delete_features(p_feature[ii], P_features.ChaosWarband); find_new_planet=true; } } @@ -42,12 +50,12 @@ function khorne_fleet_cargo(){ if ((good=0) or (find_new_planet=true)){ ii=0; var landing_planet=0; - with (orb){ + with (_orb){ repeat(planets) { ii+=1; if (landing_planet=0){ if (planet_imperium_ground_total(ii)>0) and (p_population[ii]>p_max_population[ii]/20){ - array_push(p_feature[ii], new NewPlanetFeature(P_features.World_Eaters)); + array_push(p_feature[ii], new NewPlanetFeature(P_features.ChaosWarband)); landing_planet=ii; p_chaos[ii]=6; break; @@ -57,17 +65,17 @@ function khorne_fleet_cargo(){ if (p_player[ii]>0) and (p_population[ii]>p_max_population[ii]/20){ landing_planet=ii; p_chaos[ii]=6; - array_push(p_feature[ii], new NewPlanetFeature(P_features.World_Eaters)); + array_push(p_feature[ii], new NewPlanetFeature(P_features.ChaosWarband)); break; }// Forces landed } } } - if (landing_planet=0) and (trade_goods!="Khorne_warband_landing_force"){// Nothing to see here, continue to next star*/ + if (landing_planet=0) and (trade_goods!="khorne_warband_landing_force"){// Nothing to see here, continue to next star*/ ii=0; - with(orb) { + with(_orb) { instance_deactivate_object(id); } @@ -75,7 +83,7 @@ function khorne_fleet_cargo(){ if (owner=eFACTION.Chaos) or (owner=eFACTION.Ork) or (owner=eFACTION.Necrons) or (owner=eFACTION.Eldar){ instance_deactivate_object(id) } else { - for (var p =1;p<=planets;p++){ + for (var p = 1;p <= planets;p++){ if (p_type[p] != "Dead") then break; if (p == planets) then instance_deactivate_object(id); } @@ -102,11 +110,11 @@ function khorne_fleet_cargo(){ if !point_in_rectangle(n2,yy2, 50,50,room_width,room_height) { - trade_goods="Khorne_warband_landing_force"; - // show_message("Khorne_warband_landing_force"); + trade_goods="khorne_warband_landing_force"; + // show_message("khorne_warband_landing_force"); } - if (trade_goods!="Khorne_warband_landing_force") { + if (trade_goods!="khorne_warband_landing_force") { next_star=instance_nearest(nx,ny,obj_star); action_x=next_star.x; action_y=next_star.y; @@ -118,7 +126,7 @@ function khorne_fleet_cargo(){ - if (landing_planet=0 && trade_goods="Khorne_warband_landing_force"){ + if (landing_planet=0 && trade_goods="khorne_warband_landing_force"){ log_message("BLOOD: A"); // Go after the player now @@ -159,13 +167,13 @@ function khorne_fleet_cargo(){ if (chase_fleet.action!=""){ if (intercept_time<=chase_fleet.eta){ target = chase_fleet; - chase_fleet_target_set(); + chase_fleet_target_set(target); target_chosen=true; } } else { if (intercept_time<12){ target = chase_fleet; - chase_fleet_target_set(); + chase_fleet_target_set(target); target_chosen=true; } } @@ -190,7 +198,7 @@ function khorne_fleet_cargo(){ } else { if (fleet_intercept_time_calculate(chase_fleet)<(floor(point_distance(x,y,nearest_star.x,nearest_star.y)/action_spd)+1)){ target=chase_fleet; - chase_fleet_target_set() + chase_fleet_target_set(target) target_chosen=true; } else { action_x = nearest_star.x; @@ -209,6 +217,8 @@ function khorne_fleet_cargo(){ } } } + + function spawn_chaos_fleet_at_system(system){ var _new_fleet = instance_create(system.x,system.y,obj_en_fleet); with (_new_fleet){ @@ -220,13 +230,7 @@ function spawn_chaos_fleet_at_system(system){ } function spawn_chaos_warlord(){ with (obj_controller){ - with(obj_turn_end){ - audiences+=1; - audien[audiences]=10; - known[eFACTION.Chaos]=2; - audien_topic[audiences]="intro"; - did_so=true; - } + scr_audience(eFACTION.Chaos, "intro", 0, "", 0, 2); fdir=terra_direction+choose(-90,90); fdir+=floor(random_range(-35,35)); var len,width,height,t,c,s; @@ -250,7 +254,7 @@ function spawn_chaos_warlord(){ image_index=9; home_x=x+lengthdir_x(5000,point_direction(x,y,room_width/2,room_height/2)); home_y=y+lengthdir_y(5000,point_direction(x,y,room_width/2,room_height/2)); - trade_goods="Khorne_warband"; + cargo_data.warband = {}; capital_number=10; frigate_number=20; escort_number=40; @@ -275,10 +279,13 @@ function spawn_chaos_warlord(){ var curr_dist = point_distance(curr.x, curr.y, nfleet.x, nfleet.y) return (prev_dist > curr_dist) ? curr : prev; - }),noone) - nfleet.action_x=fleet_target.x; - nfleet.action_y=fleet_target.y; - nfleet.alarm[4]=1; + }),noone); + + with (nfleet){ + nfleet.action_x=fleet_target.x; + nfleet.action_y=fleet_target.y; + set_fleet_movement() + } var tix=$"Chaos Lord {faction_leader[eFACTION.Chaos]} continues his Black Crusade into Sector {obj_ini.sector_name}."; scr_alert("purple","lol",tix,nfleet.x,nfleet.y); @@ -291,7 +298,7 @@ function spawn_chaos_warlord(){ function destroy_khorne_fleet(){ var chaos_lord_killed=false; with(instance_nearest(x, y, obj_star)){ - if system_feature_bool(p_feature, P_features.World_Eaters == 1) then chaos_lord_killed=true; + if system_feature_bool(p_feature, P_features.ChaosWarband == 1) then chaos_lord_killed=true; } if (chaos_lord_killed){ obj_controller.faction_defeated[10]=1; diff --git a/scripts/scr_kill_unit/scr_kill_unit.gml b/scripts/scr_kill_unit/scr_kill_unit.gml index 0dc560d3ec..8123303c9e 100644 --- a/scripts/scr_kill_unit/scr_kill_unit.gml +++ b/scripts/scr_kill_unit/scr_kill_unit.gml @@ -21,7 +21,6 @@ function scr_kill_unit(company, unit_slot){ function scr_wipe_unit(company, unit_slot){ obj_ini.spe[company][unit_slot]=""; obj_ini.race[company][unit_slot]=0; - obj_ini.loc[company][unit_slot]=""; obj_ini.name[company][unit_slot]=""; obj_ini.wep1[company][unit_slot]=""; obj_ini.role[company][unit_slot]=""; @@ -31,7 +30,6 @@ function scr_wipe_unit(company, unit_slot){ obj_ini.god[company][unit_slot]=0; obj_ini.age[company][unit_slot]=0; obj_ini.mobi[company][unit_slot]=""; - obj_ini.bio[company][unit_slot]=""; obj_ini.TTRPG[company][unit_slot].base_group="none"; } diff --git a/scripts/scr_librarium/scr_librarium.gml b/scripts/scr_librarium/scr_librarium.gml index 6d24550393..e04dfe2dc4 100644 --- a/scripts/scr_librarium/scr_librarium.gml +++ b/scripts/scr_librarium/scr_librarium.gml @@ -15,345 +15,331 @@ function set_chapter_arti_data(){ } } } -function scr_librarium(){ - var blurp=""; - var xx = __view_get(e__VW.XView, 0) + 0; - var yy = __view_get(e__VW.YView, 0) + 0; - draw_sprite(spr_rock_bg, 0, xx, yy); - draw_set_alpha(0.75); - draw_set_color(0); - draw_rectangle(xx + 326 + 16, yy + 66, xx + 887 + 16, yy + 818, 0); - draw_set_alpha(1); - draw_set_color(c_gray); - draw_rectangle(xx + 326 + 16, yy + 66, xx + 887 + 16, yy + 818, 1); // Center librarium box - draw_line(xx + 326 + 16, yy + 426, xx + 887 + 16, yy + 426); - draw_set_alpha(0.75); - draw_set_color(0); - draw_rectangle(xx + 945, yy + 66, xx + 1580, yy + 818, 0); - draw_set_alpha(1); - draw_set_color(c_gray); - draw_rectangle(xx + 945, yy + 66, xx + 1580, yy + 818, 1); // Right librarium box +function scr_librarium_gui(){ + add_draw_return_values(); + if (artifacts == 0){ + draw_text(622,440, "[No Artifacts]") + artifact_destroy.draw_shutter(765, 740, "DESTROY", 0.3, false); + artifact_equip.draw_shutter(385, 740, "EQUIP", 0.3, false); + artifact_gift.draw_shutter(575, 740, "GIFT", 0.3, false); + pop_draw_return_values(); + exit; + } + var cur_arti = obj_ini.artifact_struct[menu_artifact]; + identifiable = cur_arti.is_identifiable(); + + if (cur_arti.type() != "") { + var artif_descr = $"This artifact is an unidentified {cur_arti.type()}.##It is stored on {cur_arti.ship_id()>=0 ? "the ship" :""} '{cur_arti.location_string()}'."; + if (cur_arti.identified() > 0) and (identifiable = 0) { + draw_set_color(881503); + artif_descr += $"#To be identified it must be brought to a fleet with a Battle Barge or your Homeworld."; + }else if (cur_arti.identified() > 0) and(identifiable = 1) { + draw_set_color(881503); + artif_descr += $"##It will be identified in {cur_arti.identified()} turns. #You may spend 150 Requisition to identify it immediately."; - if (menu_adept = 0) { - // draw_sprite(spr_advisors,3,xx+16,yy+43); - if(struct_exists(obj_ini.custom_advisors, "librarian")){ - scr_image("advisor/splash", obj_ini.custom_advisors.librarian, xx + 16, yy + 43, 310, 828); - } else { - scr_image("advisor/splash", 4, xx + 16, yy + 43, 310, 828); + //TODO solidify following button into a proper styled struct button + var ident_button = draw_unit_buttons([532,765], "IDENTIFY NOW",[1,1],c_black,,fnt_40k_14b,,1,c_gray); + if (point_and_click(ident_button)){ + if (requisition>=150){ + obj_ini.artifact_identified[menu_artifact]=0; + requisition-=150; + cooldown=8000; + identifiable=0; + audio_play_sound(snd_identify,-500,0); + audio_sound_gain(snd_identify,master_volume*effect_volume,0); + } } - // if (global.chapter_name = "Space Wolves") then scr_image("advisor", 10, xx + 16, yy + 43, 310, 828); - // draw_sprite(spr_advisors,10,xx+16,yy+43); - draw_set_halign(fa_left); - draw_set_color(c_gray); - draw_set_font(fnt_40k_30b); - draw_text_transformed(xx + 336 + 16, yy + 66, string_hash_to_newline("Librarium"), 1, 1, 0); - draw_text_transformed(xx + 336 + 16, yy + 100, string_hash_to_newline("Chief " + string(obj_ini.role[100, 17]) + " " + string(obj_ini.name[0, 4])), 0.6, 0.6, 0); - draw_set_font(fnt_40k_14); - } - if (menu_adept = 1) { - // draw_sprite(spr_advisors,0,xx+16,yy+43); - scr_image("advisor/splash", 1, xx + 16, yy + 43, 310, 828); - draw_set_halign(fa_left); - draw_set_color(c_gray); - draw_set_font(fnt_large); - draw_text_transformed(xx + 336 + 16, yy + 66, string_hash_to_newline("Librarium"), 1, 1, 0); - draw_text_transformed(xx + 336 + 16, yy + 100, string_hash_to_newline("Adept " + string(obj_controller.adept_name)), 0.6, 0.6, 0); - draw_set_font(fnt_40k_14); } + else if (cur_arti.identified() < 1) { + draw_set_color(881503); + artif_descr = ""; + try{ + artif_descr = cur_arti.description(); + } catch( _exception){ + handle_exception(_exception); + } + tooltip = ""; + tooltip_other = ""; + var arti_data = gear_weapon_data("any",cur_arti.type(), "all", false, cur_arti.quality()); - var tip2 = ""; + var _can_equip = cur_arti.can_equip(); + if (_can_equip){ + if (cur_arti.equipped()) then _can_equip = false; - // Set pace of recruitment based on training psyker value - if (training_psyker >= 0 && training_psyker <= 6){ - var _recruit_pace = ARR_recruitment_pace; - blurp += _recruit_pace[training_psyker]; - } + if (_can_equip){ + if (artifact_equip.draw_shutter(385, 770, "EQUIP", 0.3,true)){ + if (_can_equip && !instance_exists(obj_popup)){ + equip_artifact_popup_setup(); + } - var artif = "", - artif_descr = "", - tp = 0; + } + } else if (is_array(cur_arti.bearer)) { + if (artifact_equip.draw_shutter(385, 770, "UNEQUIP", 0.3,true)){ + cur_arti.unequip_from_unit(); + } + } + } - if (unused_artifacts = 0) { artif = "no unused artifacts.";} - else if (unused_artifacts = 1) { artif = "one unused artifact.";} - else if (unused_artifacts > 1) { artif = string(unused_artifacts) + " unused artifacts.";} + if (artifact_gift.draw_shutter(575, 770, "GIFT", 0.3, true)){ + setup_gift_artifact_popup() + } + if (artifact_destroy.draw_shutter(765, 770, "DESTROY", 0.3, true)){ + // Below here cleans up the artifacts - // Greetings message - if (menu_adept = 0) then draw_text_ext(xx + 336 + 16, yy + 130, string_hash_to_newline("Chapter Master " + string(obj_ini.name[0, 0]) + ", greetings.#I assume you've come for the report? The Chapter currently possesses " + string(temp[36]) + " Epistolaries, " + string(temp[37]) + " Codiceries, and " + string(temp[38]) + " Lexicanum. We are working to identify additional warp-sensitive brothers before they cause harm, and the training is " + string(blurp) + ".##We could likely speed up the identification and application of appropriate training, but we would need more resources...I don't suppose we can spare some?##Our Chapter has " + string(artif)), -1, 536); - if (menu_adept = 1) then draw_text_ext(xx + 336 + 16, yy + 130, string_hash_to_newline("Your Chapter contains " + string(temp[36]) + " " + string(obj_ini.role[100, 17]) + "s, " + string(temp[37]) + " Codiceries, and " + string(temp[38]) + " Lexicanum.##Training of more " + string(obj_ini.role[100, 17]) + "s is " + string(blurp) + ".##Your chapter has " + string(artif)), -1, 536); + if (menu_artifact==fest_display) then fest_display=0; - draw_set_color(881503); - draw_set_halign(fa_center); - identifiable = 0; - if (artifacts > 0) { - var usey =0; - for (var i = 0, ilen = array_length(obj_ini.artifact); i < ilen; i++) { - if (obj_ini.artifact[i]!="") { - usey++; - } - if (i == menu_artifact) { - break; - } - } - draw_text(xx + 622, yy + 440, $"[Artifact {usey} of {artifacts}]"); + cur_arti.destroy_arti(); - if scr_hit(xx + 326 + 16, yy + 426, xx + 887 + 16, yy + 818) { - var arrow_hovered = false; - var scroll_engaged = false; - var arrow = [xx+400,yy+437,xx+445,yy+461]; - if (scr_hit(arrow[0],arrow[1],arrow[2],arrow[3])) { - arrow_hovered = true; - if (scr_click_left()){ - scroll_engaged = true; + //TODO centralise into function + for (var e = 0, elen = array_length(obj_controller.recent_keyword); e < elen; e++) { + if (obj_ini.artifact_tags[menu_artifact] == obj_controller.recent_keyword[e]) { + with (obj_controller) { + array_delete(recent_keyword, e, 1); + array_delete(recent_type, e, 1); + array_delete(recent_turn, e, 1); + array_delete(recent_number, e, 1); + } + scr_recent("artifact_destroyed", obj_controller.recent_keyword,2); + scr_recent("", "", 0); + break; } } - if (mouse_wheel_down()){ - scroll_engaged = true; + delete_artifact(menu_artifact); + set_chapter_arti_data(); + } + var base_type = cur_arti.determine_base_type(); + var _tip2 = ""; + if (base_type!="device" && is_struct(arti_data)){ + if (arti_data.armour_value != 0) { + _tip2 += $"{arti_data.armour_value} Armour#"; } - - if (scroll_engaged) { - artifact_namer.allow_input=false; - identifiable=false; - artifact_equip = new ShutterButton(); - artifact_gift = new ShutterButton(); - artifact_destroy = new ShutterButton(); - var done = false; - while (menu_artifact > 0) { - menu_artifact--; - if (obj_ini.artifact[menu_artifact] != "") { - done = true; - break; - } - } - if (!done and menu_artifact <= 0) { - // we didn't find a lower artifact to goto, so we find the highest - for (var i = array_length(obj_ini.artifact) - 1; i >= 0; i--) { - if (obj_ini.artifact[i] != "") { - menu_artifact = i; - break; - } - } - } + if (arti_data.attack != 0) { + _tip2 = $"{arti_data.attack} Damage#"; } - if (arrow_hovered) { - tooltip_draw("Click here or use mouse wheel to scroll the artifact list."); + if (arti_data.hp_mod != 0) { + _tip2 += $"{arti_data.hp_mod}% Health Bonus#"; } - - arrow_hovered = false; - scroll_engaged = false; - arrow = [xx+790,yy+437,xx+832,yy+461]; - if (scr_hit(arrow[0],arrow[1],arrow[2],arrow[3])) { - arrow_hovered = true; - if (scr_click_left()){ - scroll_engaged = true; - } + if (arti_data.melee_mod != 0) { + _tip2 += $"{arti_data.melee_mod}% Melee Bonus#"; } - if (mouse_wheel_up()){ - scroll_engaged = true; + if (arti_data.ranged_mod != 0) { + _tip2 += $"{arti_data.ranged_mod}% Ranged Bonus#"; } - - if (scroll_engaged) { - artifact_namer.allow_input=false; - identifiable=0; - artifact_equip = new ShutterButton(); - artifact_gift = new ShutterButton(); - artifact_destroy = new ShutterButton(); - var max_index = array_length(obj_ini.artifact) - 1; - var done = false; - while (menu_artifact < max_index) { - menu_artifact++; - if (obj_ini.artifact[menu_artifact] != "") { - done = true; - break; - } - } - if (!done and menu_artifact >= max_index) { - // we didn't find a higher artifact to goto, so we find the lowest - for (var i = 0, ilen = array_length(obj_ini.artifact); i < ilen; i++) { - if (obj_ini.artifact[i] != "") { - menu_artifact = i; - break; - } - } - } + if (arti_data.damage_resistance_mod != 0) { + _tip2 += $"{arti_data.damage_resistance_mod}% Resistance Bonus#"; } - if (arrow_hovered) { - tooltip_draw("Click on this arrow or use mouse wheel to scroll the artifact list."); + if (base_type=="gear") { // Gear + _tip2 = tooltip_other; } } - var artifact_name = obj_ini.artifact_struct[menu_artifact].name; - if (artifact_name == "") then artifact_name = obj_ini.artifact[menu_artifact]; - obj_ini.artifact_struct[menu_artifact].name = artifact_namer.draw(artifact_name); - draw_sprite(spr_arrow, 0, xx + 403, yy + 433); - draw_sprite(spr_arrow, 1, xx + 795, yy + 433); - // Artifact description box - var description_box = { - x: xx + 392, - y: yy + 500, - x2: xx + 852, - y2: yy + 740, - } - draw_rectangle_outline(description_box.x, description_box.y, description_box.x2, description_box.y2, c_black, c_gray, 1); - var cur_arti = obj_ini.artifact_struct[menu_artifact]; - identifiable = cur_arti.is_identifiable(); + artif_descr += $"\n {_tip2}"; - if (cur_arti.type() != "") { - var artif_descr = $"This artifact is an unidentified {cur_arti.type()}.##It is stored on {cur_arti.ship_id()>=0 ? "the ship" :""} '{cur_arti.location_string()}'."; - if (cur_arti.identified() > 0) and (identifiable = 0) { - draw_set_color(881503); - artif_descr += $"#To be identified it must be brought to a fleet with a Battle Barge or your Homeworld."; - }else if (cur_arti.identified() > 0) and(identifiable = 1) { - draw_set_color(881503); - artif_descr += $"##It will be identified in {cur_arti.identified()} turns. #You may spend 150 Requisition to identify it immediately."; + artifact_slate.body_text = artif_descr; - //TODO solidify following button into a proper styled struct button - var ident_button = draw_unit_buttons([xx+532,yy+765], "IDENTIFY NOW",[1,1],c_black,,fnt_40k_14b,,1,c_gray); - if (point_and_click(ident_button)){ - if (requisition>=150){ - obj_ini.artifact_identified[menu_artifact]=0; - requisition-=150; - cooldown=8000; - identifiable=0; - audio_play_sound(snd_identify,-500,0); - audio_sound_gain(snd_identify,master_volume*effect_volume,0); - } - } - } - else if (obj_ini.artifact_identified[menu_artifact] < 1) { - draw_set_color(881503); - artif_descr = ""; - try{ - artif_descr = obj_ini.artifact_struct[menu_artifact].description(); - } catch( _exception){ - handle_exception(_exception); - } - tooltip = ""; - tooltip_other = ""; - var arti_data = gear_weapon_data("any",obj_ini.artifact[menu_artifact], "all", false, obj_ini.artifact_quality[menu_artifact]); + artifact_slate.draw_with_dimensions(); + + } else { + artifact_destroy.draw_shutter(765, 740, "DESTROY", 0.3, false); + artifact_equip.draw_shutter(385, 740, "EQUIP", 0.3, false); + artifact_gift.draw_shutter(575, 740, "GIFT", 0.3, false); + } - var _can_equip = cur_arti.can_equip(); - if (_can_equip){ - if (cur_arti.equipped()) then _can_equip = false; - - if (_can_equip){ - if (artifact_equip.draw_shutter(xx + 385, yy + 770, "EQUIP", 0.3,true)){ - if (_can_equip && !instance_exists(obj_popup)){ - var pop=instance_create(0,0,obj_popup); - pop.type=8; - cooldown=8; - } - - } - } else if (is_array(cur_arti.bearer)) { - if (artifact_equip.draw_shutter(xx + 385, yy + 770, "UNEQUIP", 0.3,true)){ - cur_arti.unequip_from_unit(); - } - } - } + // identifiable=0; + } + pop_draw_return_values(); +} - if (artifact_gift.draw_shutter(xx + 575, yy + 770, "GIFT", 0.3, true)){ - //show_debug_message("Clicked"); - var chick=false; - //list of all giftable factions enum numbers - var giftable_factions = [eFACTION.Imperium, eFACTION.Mechanicus,eFACTION.Inquisition,eFACTION.Ecclesiarchy,eFACTION.Eldar,eFACTION.Tau] - for (var i = 0; i < array_length(giftable_factions); i++){ - var gift_faction = giftable_factions[i]; - if (known[gift_faction] && !faction_defeated[gift_faction]) then chick=true; - } +function scr_librarium(){ + add_draw_return_values(); + var blurp=""; + var xx = __view_get(e__VW.XView, 0) + 0; + var yy = __view_get(e__VW.YView, 0) + 0; + draw_sprite(spr_rock_bg, 0, xx, yy); - if (chick){ - var pop=instance_create(0,0,obj_popup); - pop.type=9; - cooldown=8; - } - } - if (artifact_destroy.draw_shutter(xx + 765, yy + 770, "DESTROY", 0.3, true)){ - // Below here cleans up the artifacts + draw_set_alpha(0.75); + draw_set_color(0); + draw_rectangle(xx + 326 + 16, yy + 66, xx + 887 + 16, yy + 818, 0); + draw_set_alpha(1); + draw_set_color(c_gray); + draw_rectangle(xx + 326 + 16, yy + 66, xx + 887 + 16, yy + 818, 1); // Center librarium box + draw_line(xx + 326 + 16, yy + 426, xx + 887 + 16, yy + 426); + draw_set_alpha(0.75); + draw_set_color(0); + draw_rectangle(xx + 945, yy + 66, xx + 1580, yy + 818, 0); + draw_set_alpha(1); + draw_set_color(c_gray); + draw_rectangle(xx + 945, yy + 66, xx + 1580, yy + 818, 1); // Right librarium box + + if (menu_adept = 0) { + // draw_sprite(spr_advisors,3,xx+16,yy+43); + if(struct_exists(obj_ini.custom_advisors, "librarian")){ + scr_image("advisor/splash", obj_ini.custom_advisors.librarian, xx + 16, yy + 43, 310, 828); + } else { + scr_image("advisor/splash", 4, xx + 16, yy + 43, 310, 828); + } + // if (global.chapter_name = "Space Wolves") then scr_image("advisor", 10, xx + 16, yy + 43, 310, 828); + // draw_sprite(spr_advisors,10,xx+16,yy+43); + draw_set_halign(fa_left); + draw_set_color(c_gray); + draw_set_font(fnt_40k_30b); + draw_text_transformed(xx + 336 + 16, yy + 66, "Librarium", 1, 1, 0); + draw_text_transformed(xx + 336 + 16, yy + 100, string_hash_to_newline("Chief " + string(obj_ini.role[100, 17]) + " " + string(obj_ini.name[0, 4])), 0.6, 0.6, 0); + draw_set_font(fnt_40k_14); + } + if (menu_adept = 1) { + // draw_sprite(spr_advisors,0,xx+16,yy+43); + scr_image("advisor/splash", 1, xx + 16, yy + 43, 310, 828); + draw_set_halign(fa_left); + draw_set_color(c_gray); + draw_set_font(fnt_large); + draw_text_transformed(xx + 336 + 16, yy + 66, "Librarium", 1, 1, 0); + draw_text_transformed(xx + 336 + 16, yy + 100, string_hash_to_newline("Adept " + string(obj_controller.adept_name)), 0.6, 0.6, 0); + draw_set_font(fnt_40k_14); + } - if (menu_artifact==fest_display) then fest_display=0; + // Set pace of recruitment based on training psyker value + if (training_psyker >= 0 && training_psyker <= 6){ + var _recruit_pace = ARR_recruitment_pace; + blurp += _recruit_pace[training_psyker]; + } - cur_arti.destroy_arti(); + var artif = "", + artif_descr = "", + tp = 0; - //TODO centralise into function - for (var e = 0, elen = array_length(obj_controller.recent_keyword); e < elen; e++) { - if (obj_ini.artifact_tags[menu_artifact] == obj_controller.recent_keyword[e]) { - with (obj_controller) { - array_delete(recent_keyword, e, 1); - array_delete(recent_type, e, 1); - array_delete(recent_turn, e, 1); - array_delete(recent_number, e, 1); - } - scr_recent("artifact_destroyed", obj_controller.recent_keyword,2); - scr_recent("", "", 0); - break; - } - } - delete_artifact(menu_artifact); - set_chapter_arti_data(); + if (unused_artifacts = 0) { artif = "no unused artifacts.";} + else if (unused_artifacts = 1) { artif = "one unused artifact.";} + else if (unused_artifacts > 1) { artif = string(unused_artifacts) + " unused artifacts.";} + + // Greetings message + if (menu_adept = 0) then draw_text_ext(xx + 336 + 16, yy + 130, string_hash_to_newline("Chapter Master " + string(obj_ini.name[0, 0]) + ", greetings.#I assume you've come for the report? The Chapter currently possesses " + string(temp[36]) + " Epistolaries, " + string(temp[37]) + " Codiceries, and " + string(temp[38]) + " Lexicanum. We are working to identify additional warp-sensitive brothers before they cause harm, and the training is " + string(blurp) + ".##We could likely speed up the identification and application of appropriate training, but we would need more resources...I don't suppose we can spare some?##Our Chapter has " + string(artif)), -1, 536); + if (menu_adept = 1) then draw_text_ext(xx + 336 + 16, yy + 130, string_hash_to_newline("Your Chapter contains " + string(temp[36]) + " " + string(obj_ini.role[100, 17]) + "s, " + string(temp[37]) + " Codiceries, and " + string(temp[38]) + " Lexicanum.##Training of more " + string(obj_ini.role[100, 17]) + "s is " + string(blurp) + ".##Your chapter has " + string(artif)), -1, 536); + + draw_set_color(881503); + draw_set_halign(fa_center); + identifiable = 0; + if (artifacts > 0) { + var usey =0; + for (var i = 0, ilen = array_length(obj_ini.artifact); i < ilen; i++) { + if (obj_ini.artifact[i]!="") { + usey++; + } + if (i == menu_artifact) { + break; + } + } + draw_text(xx + 622, yy + 440, $"[Artifact {usey} of {artifacts}]"); + + if scr_hit(xx + 326 + 16, yy + 426, xx + 887 + 16, yy + 818) { + var arrow_hovered = false; + var scroll_engaged = false; + var arrow = [xx+400,yy+437,xx+445,yy+461]; + if (scr_hit(arrow[0],arrow[1],arrow[2],arrow[3])) { + arrow_hovered = true; + if (scr_click_left()){ + scroll_engaged = true; + } + } + if (mouse_wheel_down()){ + scroll_engaged = true; + } + + if (scroll_engaged) { + artifact_namer.allow_input=false; + identifiable=false; + artifact_equip = new ShutterButton(); + artifact_gift = new ShutterButton(); + artifact_destroy = new ShutterButton(); + var done = false; + while (menu_artifact > 0) { + menu_artifact--; + if (obj_ini.artifact[menu_artifact] != "") { + done = true; + break; } - var base_type = cur_arti.determine_base_type(); - if (arti_data && base_type!="device"){ - if (arti_data.armour_value != 0) { - tip2 += $"{arti_data.armour_value} Armour#"; - } - if (arti_data.attack != 0) { - tip2 = $"{arti_data.attack} Damage#"; - } - if (arti_data.hp_mod != 0) { - tip2 += $"{arti_data.hp_mod}% Health Bonus#"; - } - if (arti_data.melee_mod != 0) { - tip2 += $"{arti_data.melee_mod}% Melee Bonus#"; - } - if (arti_data.ranged_mod != 0) { - tip2 += $"{arti_data.ranged_mod}% Ranged Bonus#"; - } - if (arti_data.damage_resistance_mod != 0) { - tip2 += $"{arti_data.damage_resistance_mod}% Resistance Bonus#"; - } - if (base_type=="gear") { // Gear - tip2 = tooltip_other; + } + if (!done and menu_artifact <= 0) { + // we didn't find a lower artifact to goto, so we find the highest + for (var i = array_length(obj_ini.artifact) - 1; i >= 0; i--) { + if (obj_ini.artifact[i] != "") { + menu_artifact = i; + break; } } - } else { - artifact_destroy.draw_shutter(xx + 765, yy + 740, "DESTROY", 0.3, false); - artifact_equip.draw_shutter(xx + 385, yy + 740, "EQUIP", 0.3, false); - artifact_gift.draw_shutter(xx + 575, yy + 740, "GIFT", 0.3, false); } - draw_set_halign(fa_center); - draw_set_font(fnt_40k_14); - draw_set_color(c_gray); - draw_text_ext(xx + 622, yy + 510, string_hash_to_newline(string(artif_descr)), -1, 436); - draw_set_font(fnt_40k_14b); - draw_set_color(c_gray); - var spack = string_height_ext(string_hash_to_newline(string(artif_descr)), -1, 436); - draw_text_ext(xx + 622, yy + 514 + spack, string_hash_to_newline(tip2), -1, 436); + } + if (arrow_hovered) { + tooltip_draw("Click here or use mouse wheel to scroll the artifact list."); + } - // identifiable=0; + arrow_hovered = false; + scroll_engaged = false; + arrow = [xx+790,yy+437,xx+832,yy+461]; + if (scr_hit(arrow[0],arrow[1],arrow[2],arrow[3])) { + arrow_hovered = true; + if (scr_click_left()){ + scroll_engaged = true; + } + } + if (mouse_wheel_up()){ + scroll_engaged = true; + } + + if (scroll_engaged) { + artifact_namer.allow_input=false; + identifiable=0; + artifact_equip = new ShutterButton(); + artifact_gift = new ShutterButton(); + artifact_destroy = new ShutterButton(); + var max_index = array_length(obj_ini.artifact) - 1; + var done = false; + while (menu_artifact < max_index) { + menu_artifact++; + if (obj_ini.artifact[menu_artifact] != "") { + done = true; + break; + } + } + if (!done and menu_artifact >= max_index) { + // we didn't find a higher artifact to goto, so we find the lowest + for (var i = 0, ilen = array_length(obj_ini.artifact); i < ilen; i++) { + if (obj_ini.artifact[i] != "") { + menu_artifact = i; + break; + } + } + } + } + if (arrow_hovered) { + tooltip_draw("Click on this arrow or use mouse wheel to scroll the artifact list."); } - }else if (artifacts == 0){ - draw_text(xx + 622, yy + 440, "[No Artifacts]") - artifact_destroy.draw_shutter(xx + 765, yy + 740, "DESTROY", 0.3, false); - artifact_equip.draw_shutter(xx + 385, yy + 740, "EQUIP", 0.3, false); - artifact_gift.draw_shutter(xx + 575, yy + 740, "GIFT", 0.3, false); } - draw_set_color(881503); - draw_set_halign(fa_center); + var artifact_name = obj_ini.artifact_struct[menu_artifact].name; + if (artifact_name == "") then artifact_name = obj_ini.artifact[menu_artifact]; + obj_ini.artifact_struct[menu_artifact].name = artifact_namer.draw(artifact_name); + draw_sprite(spr_arrow, 0, xx + 403, yy + 433); + draw_sprite(spr_arrow, 1, xx + 795, yy + 433); if (instance_exists(obj_p_fleet)) { with(obj_p_fleet) { + var _cur_arti = obj_ini.artifact_struct[obj_controller.menu_artifact]; var good = 0; - if (obj_controller.artifacts>0){ - for (var i = 1; i <= 20; i++) { - if (i <= 9 && i=2) then draw_sprite(tester_sprite,12,preview_box.x1,preview_box.y1 + 8); - - draw_sprite(tester_sprite,col_special,preview_box.x1,preview_box.y1 + 8); - if (col_special<=1){ - draw_sprite(tester_sprite,6,preview_box.x1,preview_box.y1 + 8); - draw_sprite(tester_sprite,8,preview_box.x1,preview_box.y1 + 8); - } - if (col_special>=2){ - draw_sprite(tester_sprite,6,preview_box.x1,preview_box.y1 + 8); - draw_sprite(tester_sprite,9,preview_box.x1,preview_box.y1 + 8); - } - if (trim=0) and (col_special<=1) then draw_sprite(tester_sprite,4,preview_box.x1,preview_box.y1 + 8); - if (trim=0) and (col_special>=2) then draw_sprite(tester_sprite,5,preview_box.x1,preview_box.y1 + 8); - //TODO this can be imprved but for now it's fit for purpose - if (complex_selection=="Sergeant Markers" && complex_livery){ - var sgt_col_1 = complex_livery_data.sgt.helm_primary; - var sgt_col_2 = complex_livery_data.sgt.helm_secondary; - var lens_col = complex_livery_data.sgt.helm_lens; - shader_set_uniform_f_array(colour_to_find1, [30/255,30/255,30/255]); - shader_set_uniform_f(colour_to_set1, col_r[sgt_col_1]/255, col_g[sgt_col_1]/255, col_b[sgt_col_1]/255); - shader_set_uniform_f_array(colour_to_find2, [200/255,0/255,0/255]); - shader_set_uniform_f(colour_to_set2, col_r[sgt_col_2]/255, col_g[sgt_col_2]/255, col_b[sgt_col_2]/255); - shader_set_uniform_f(colour_to_set4, col_r[lens_col]/255, col_g[lens_col]/255, col_b[lens_col]/255); - draw_sprite(tester_helm, complex_depth_selection, preview_box.x1,preview_box.y1 + 8); - } - else if (complex_selection=="Veteran Sergeant Markers" && complex_livery){ - var sgt_col_1 = complex_livery_data.vet_sgt.helm_primary; - var sgt_col_2 = complex_livery_data.vet_sgt.helm_secondary; - var lens_col = complex_livery_data.vet_sgt.helm_lens; - shader_set_uniform_f_array(colour_to_find1, [30/255,30/255,30/255]); - shader_set_uniform_f(colour_to_set1, col_r[sgt_col_1]/255, col_g[sgt_col_1]/255, col_b[sgt_col_1]/255); - shader_set_uniform_f_array(colour_to_find2, [200/255,0/255,0/255]); - shader_set_uniform_f(colour_to_set2, col_r[sgt_col_2]/255, col_g[sgt_col_2]/255, col_b[sgt_col_2]/255); - shader_set_uniform_f(colour_to_set4, col_r[lens_col]/255, col_g[lens_col]/255, col_b[lens_col]/255); - draw_sprite(tester_helm, complex_depth_selection, preview_box.x1,preview_box.y1 + 8); - } - else if (complex_selection=="Captain Markers" && complex_livery){ - var sgt_col_1 = complex_livery_data.captain.helm_primary; - var sgt_col_2 = complex_livery_data.captain.helm_secondary; - var lens_col = complex_livery_data.captain.helm_lens; - shader_set_uniform_f_array(colour_to_find1, [30/255,30/255,30/255]); - shader_set_uniform_f(colour_to_set1, col_r[sgt_col_1]/255, col_g[sgt_col_1]/255, col_b[sgt_col_1]/255); - shader_set_uniform_f_array(colour_to_find2, [200/255,0/255,0/255]); - shader_set_uniform_f(colour_to_set2, col_r[sgt_col_2]/255, col_g[sgt_col_2]/255, col_b[sgt_col_2]/255); - shader_set_uniform_f(colour_to_set4, col_r[lens_col]/255, col_g[lens_col]/255, col_b[lens_col]/255); - draw_sprite(tester_helm, complex_depth_selection, preview_box.x1,preview_box.y1 + 8); - } else if (complex_selection=="Veteran Markers" && complex_livery){ - var sgt_col_1 = complex_livery_data.veteran.helm_primary; - var sgt_col_2 = complex_livery_data.veteran.helm_secondary; - var lens_col = complex_livery_data.veteran.helm_lens; - shader_set_uniform_f_array(colour_to_find1, [30/255,30/255,30/255]); - shader_set_uniform_f(colour_to_set1, col_r[sgt_col_1]/255, col_g[sgt_col_1]/255, col_b[sgt_col_1]/255); - shader_set_uniform_f_array(colour_to_find2, [200/255,0/255,0/255]); - shader_set_uniform_f(colour_to_set2, col_r[sgt_col_2]/255, col_g[sgt_col_2]/255, col_b[sgt_col_2]/255); - shader_set_uniform_f(colour_to_set4, col_r[lens_col]/255, col_g[lens_col]/255, col_b[lens_col]/255); - draw_sprite(tester_helm, complex_depth_selection, preview_box.x1,preview_box.y1 + 8); - } - shader_set_uniform_f_array(colour_to_find1, body_colour_find ); - shader_set_uniform_f_array(colour_to_set1, body_colour_replace ); - shader_set_uniform_f_array(colour_to_find2, secondary_colour_find ); - shader_set_uniform_f_array(colour_to_set2, secondary_colour_replace ); - shader_set_uniform_f_array(colour_to_set4, lens_colour_replace ); - if(tester_sprite == spr_terminator3_colors){ - draw_sprite(spr_weapon_colors,0,444 - 12,252 + 5); - } else { - draw_sprite(spr_weapon_colors,0,444,252); - } - shader_reset(); - - }else{ - draw_text(444,252,string_hash_to_newline("Color swap shader#did not compile")); - } - - var comp_toggle = buttons.company_options_toggle; - var company_radio = buttons.company_liveries_choice; - var comp_change = false; - comp_toggle.update({ - x1 : 50, - y1 : 76 - }); - draw_set_halign(fa_center); - if (comp_toggle.draw()){ - comp_toggle.company_view = !comp_toggle.company_view; - if (!comp_toggle.company_view){ - company_liveries[livery_picker.role_set] = variable_clone(livery_picker.map_colour); - livery_picker.role_set = 0; - livery_picker.map_colour = full_liveries[livery_picker.role_set]; - } else { - full_liveries[livery_picker.role_set] = variable_clone(livery_picker.map_colour); - livery_picker.role_set = company_radio.current_selection; - livery_picker.map_colour = company_liveries[livery_picker.role_set]; - } - livery_picker.shuffle_dummy(); - livery_picker.reset_image(); - } + draw_set_alpha(1); draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); draw_set_alpha(1); - draw_set_color(38144); - if (!comp_toggle.company_view){ - var liv_string = $"Full Livery \n{livery_picker.role_set == 0? "default" :role[100][livery_picker.role_set]}"; - draw_text(160, 100, liv_string); - } else { - company_radio.update({ - max_width : 350, - x1 : 20, - y1 : 60, - allow_changes : true - }) - company_radio.draw(); - if (company_radio.changed){ - company_liveries[livery_picker.role_set] = variable_clone(livery_picker.map_colour); - livery_picker.role_set = company_radio.current_selection; - livery_picker.map_colour = company_liveries[livery_picker.role_set]; - livery_picker.shuffle_dummy(); - livery_picker.reset_image(); - } - } + draw_set_color(CM_GREEN_COLOR); + var company_radio = buttons.company_liveries_choice; + company_radio.draw_title = false; + var comp_change = false; - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_halign(fa_left); draw_text_transformed(580,118,"Battle Cry:",0.6,0.6,0); draw_set_font(fnt_40k_14b); @@ -190,19 +57,17 @@ function scr_livery_setup(){ draw_rectangle(445, 200, 1125, 202, 0) draw_set_font(fnt_40k_30b); - draw_text_transformed(444,215,"Basic Livelry",0.6,0.6,0); - var button_alpha = custom < 2 ? 0.5 : 1; - var livery_swap_button = draw_unit_buttons([570,215], complex_livery? "Simple Livery":"Complex Livery",[1,1], 38144,, fnt_40k_14b, button_alpha); - if (point_and_click(livery_swap_button) && custom >= 2){ - complex_livery=!complex_livery; - } - var str,str_width,hei,x8,y8;x8=0;y8=0; + var button_alpha = custom != eCHAPTER_TYPE.CUSTOM ? 0.5 : 1; + + var _livery_switch = buttons.livery_switch; + + var str,str_width,hei,x8=0;y8=0; //Dont ask why the pauldron colours are switched i guess duke got confused between left and right at some point //TODO extract this function somewhere /*function draw_checkbox (cords, text, main_alpha, checked){ draw_set_alpha(main_alpha); yar = col_special==(i+1) ?1:0; - if (custom<2) then draw_set_alpha(0.5); + if (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); draw_sprite(spr_creation_check,yar,cur_button.cords[0],cur_button.cords[1]); if (scr_hit(cur_button.cords[0],cur_button.cords[1],cur_button.cords[0]+32,cur_button.cords[1]+32) and allow_colour_click){ @@ -212,618 +77,138 @@ function scr_livery_setup(){ } draw_text_transformed(cur_button.cords[0]+30,cur_button.cords[1]+4,cur_button.text,0.4,0.4,0); }*/ - if (!complex_livery){ - var button_data = [ - { - text : $"Primary : {col[main_color]}", - tooltip:"Primary", - tooltip2:"The main color of your Astartes and their vehicles.", - cords : [620, 252], - }, - { - text : $"Secondary: {col[secondary_color]}", - tooltip:"Secondary", - tooltip2:"The secondary color of your Astartes and their vehicles.", - cords : [620, 287], - }, - { - text : $"Pauldron 1: {col[right_pauldron]}", - tooltip:"First Pauldron", - tooltip2:"The color of your Astartes' right Pauldron. Normally this Pauldron displays their rank and designation.", - cords : [620, 322], - }, - { - text : $"Pauldron 2: {col[left_pauldron]}", - tooltip:"Second Pauldron", - tooltip2:"The color of your Astartes' left Pauldron. Normally this Pauldron contains the Chapter Insignia.", - cords : [620, 357], - }, - { - text : $"Trim: {col[main_trim]}", - tooltip:"Trim", - tooltip2:"The trim color that appears on the Pauldrons, armour plating, and any decorations.", - cords : [620, 392], - }, - { - text : $"Lens: {col[lens_color]}", - tooltip:"Lens", - tooltip2:"The color of your Astartes' lenss. Most of the time this will be the visor color.", - cords : [620, 427], - }, - { - text : $"Weapon: {col[weapon_color]}", - tooltip:"Weapon", - tooltip2:"The primary color of your Astartes' weapons.", - cords : [620, 462], - } - ] - var button_cords, cur_button; - for (var i=0;i= 2){ - + livery_picker.set_default_armour(struct_cols, col_special); + } + + var _tooltip_add_on = ". You can change this value as much as you want in order to update the marine role, company and default options on the left but remember to set this value back to your desired base value before continuing"; + + for (var i=0;i0) and (scr_click_left()) and (custom=2){ - instance_destroy(obj_creation_popup); - var pp=instance_create(0,0,obj_creation_popup); - pp.type=role_id+100; - if (!comp_toggle.company_view){ - full_liveries[livery_picker.role_set] = variable_clone(livery_picker.map_colour); - livery_picker.role_set = role_id; - livery_picker.map_colour = full_liveries[role_id]; - if (!livery_picker.map_colour.is_changed){ - livery_picker.map_colour = variable_clone(full_liveries[0]); - } - livery_picker.shuffle_dummy(); - livery_picker.reset_image(); - } - } - } - } - } - } else { - var complex_livery_options = ["Sergeant Markers","Veteran Sergeant Markers", "Captain Markers", "Veteran Markers"]; - for (var i=0;i 0){ - if (load_to_ships[1] == 1){ - yar=1; - } - draw_sprite(spr_creation_check,yar,860,645+80);yar=0; - if (scr_hit(860,645+80,1005,645+32+80)) and (!instance_exists(obj_creation_popup)){tooltip="Distribute Scouts";tooltip2="Check to have your Scouts split across ships in the fleet.";} - if (point_and_click([860,645+80,860+32,645+32+80])) and (!instance_exists(obj_creation_popup)){ - load_to_ships[1] = !load_to_ships[1]; - } - draw_text_transformed(860+30,645+4+80,"Distribute Scouts",0.4,0.4,0); - - yar=0; - if (load_to_ships[2] == 1){ - yar=1; - } - draw_sprite(spr_creation_check,yar,1010,645+80);yar=0; - if (scr_hit(1010,645+80,1150,645+32+80)) and (!instance_exists(obj_creation_popup)){ - tooltip="Distribute Veterans";tooltip2="Check to have your Veterans split across the fleet."; - } - if (point_and_click([1010,645+80,1020+32,645+32+80])) and (!instance_exists(obj_creation_popup)){ - var onceh=0; - load_to_ships[2] = !load_to_ships[2] - } - draw_text_transformed(1010+30,645+4+80,"Distribute Veterans",0.4,0.4,0); - } - - - - - draw_line(433,535,844,535); - draw_line(433,536,844,536); - draw_line(433,537,844,537); - - if (!instance_exists(obj_creation_popup)){ - - if (scr_hit(540,547,800,725)){ - tooltip="Advisor Names"; - tooltip2="The names of your main Advisors. They provide useful information and reports on the divisions of your Chapter."; - } - - draw_text_transformed(444,550,string_hash_to_newline("Advisor Names"),0.6,0.6,0); - draw_set_font(fnt_40k_14b); - draw_set_halign(fa_right); - if (race[100,15]!=0) then draw_text(594,575,("Chief Apothecary: ")); - if (race[100,14]!=0) then draw_text(594,597,("High Chaplain: ")); - if (race[100,17]!=0) then draw_text(594,619,("Chief Librarian: ")); - if (race[100,16]!=0) then draw_text(594,641,("Forge Master: ")); - draw_text(594,663,"Master of Recruits: "); - draw_text(594,685,"Master of the Fleet: "); - draw_set_halign(fa_left); - - if (race[100,15]!=0){ - draw_set_color(38144); - if (hapothecary="") then draw_set_color(c_red); - if (text_selected!="apoth") or (custom<2) then draw_text_ext(600,575,string_hash_to_newline(string(hapothecary)),-1,580); - if (custom>1){ - if (text_selected="capoth") and (text_bar>30) then draw_text_ext(600,575,string_hash_to_newline(string(hapothecary)),-1,580); - if (text_selected="capoth") and (text_bar<=30) then draw_text_ext(600,575,string_hash_to_newline(string(hapothecary)+"|"),-1,580); - var str_width,hei;str_width=0;hei=string_height_ext(string_hash_to_newline(hapothecary),-2,580); - if (scr_hit(600,575,785,575+hei)){ - obj_cursor.image_index=2; - if (scr_click_left()) and (!instance_exists(obj_creation_popup)){ - text_selected="capoth"; - keyboard_string=hapothecary; - } - } - if (text_selected="capoth") then hapothecary=keyboard_string; - draw_rectangle(600-1,575-1,785,575+hei,1); - - var _refresh_capoth_name_btn =[794, 574, 794+20, 574+20]; - draw_unit_buttons(_refresh_capoth_name_btn,"?", [1,1], 38144,,fnt_40k_14b); - if(point_and_click(_refresh_capoth_name_btn)){ - var _new_capoth_name = global.name_generator.generate_space_marine_name(); - show_debug_message($"regen name of hapothecary from {hapothecary} to {_new_capoth_name}"); - hapothecary = _new_capoth_name; - } - } - } - - if (race[100,14]!=0){ - draw_set_color(38144);if (hchaplain="") then draw_set_color(c_red); - if (text_selected!="chap") or (custom<2) then draw_text_ext(600,597,string_hash_to_newline(string(hchaplain)),-1,580); - if (custom>1){ - if (text_selected="chap") and (text_bar>30) then draw_text_ext(600,597,string_hash_to_newline(string(hchaplain)),-1,580); - if (text_selected="chap") and (text_bar<=30) then draw_text_ext(600,597,string_hash_to_newline(string(hchaplain)+"|"),-1,580); - var str_width,hei;str_width=0;hei=string_height_ext(string_hash_to_newline(hchaplain),-2,580); - if (scr_hit(600,597,785,597+hei)){obj_cursor.image_index=2; - if (scr_click_left()) and (!instance_exists(obj_creation_popup)){text_selected="chap";keyboard_string=hchaplain;} - } - if (text_selected="chap") then hchaplain=keyboard_string; - draw_rectangle(600-1,597-1,785,597+hei,1); - var _refresh_chap_name_btn =[794, 597, 794+20, 597+20]; - draw_unit_buttons(_refresh_chap_name_btn,"?", [1,1], 38144,,fnt_40k_14b); - if(point_and_click(_refresh_chap_name_btn)){ - var _new_chap_name = global.name_generator.generate_space_marine_name(); - show_debug_message($"regen name of hchaplain from {hchaplain} to {_new_chap_name}"); - hchaplain = _new_chap_name; - } - } - } - - if (race[100,17]!=0){ - draw_set_color(38144);if (clibrarian="") then draw_set_color(c_red); - if (text_selected!="libra") or (custom<2) then draw_text_ext(600,619,string_hash_to_newline(string(clibrarian)),-1,580); - if (custom>1){ - if (text_selected="libra") and (text_bar>30) then draw_text_ext(600,619,string_hash_to_newline(string(clibrarian)),-1,580); - if (text_selected="libra") and (text_bar<=30) then draw_text_ext(600,619,string_hash_to_newline(string(clibrarian)+"|"),-1,580); - var str_width,hei;str_width=0;hei=string_height_ext(string_hash_to_newline(clibrarian),-2,580); - if (scr_hit(600,619,785,619+hei)){obj_cursor.image_index=2; - if (scr_click_left()) and (!instance_exists(obj_creation_popup)){text_selected="libra";keyboard_string=clibrarian;} - } - if (text_selected="libra") then clibrarian=keyboard_string; - draw_rectangle(600-1,619-1,785,619+hei,1); - - var _refresh_libra_name_btn =[794, 619, 794+20, 619+20]; - draw_unit_buttons(_refresh_libra_name_btn,"?", [1,1], 38144,,fnt_40k_14b); - if(point_and_click(_refresh_libra_name_btn)){ - var _new_libra_name = global.name_generator.generate_space_marine_name(); - show_debug_message($"regen name of clibrarian from {clibrarian} to {_new_libra_name}"); - clibrarian = _new_libra_name; - } - } - } - - if (race[100,16]!=0){ - draw_set_color(38144);if (fmaster="") then draw_set_color(c_red); - if (text_selected!="forge") or (custom<2) then draw_text_ext(600,641,string_hash_to_newline(string(fmaster)),-1,580); - if (custom>1){ - if (text_selected="forge") and (text_bar>30) then draw_text_ext(600,641,string_hash_to_newline(string(fmaster)),-1,580); - if (text_selected="forge") and (text_bar<=30) then draw_text_ext(600,641,string_hash_to_newline(string(fmaster)+"|"),-1,580); - var str_width,hei;str_width=0;hei=string_height_ext(string_hash_to_newline(fmaster),-2,580); - if (scr_hit(600,641,785,641+hei)){obj_cursor.image_index=2; - if (scr_click_left()) and (!instance_exists(obj_creation_popup)){text_selected="forge";keyboard_string=fmaster;} - } - if (text_selected="forge") then fmaster=keyboard_string; - draw_rectangle(600-1,641-1,785,641+hei,1); + var _livery_type = livery_selection_options.current_selection; - var _refresh_forge_name_btn =[794, 641, 794+20, 641+20]; - draw_unit_buttons(_refresh_forge_name_btn,"?", [1,1], 38144,,fnt_40k_14b); - if(point_and_click(_refresh_forge_name_btn)){ - var _new_forge_name = global.name_generator.generate_space_marine_name(); - show_debug_message($"regen name of fmaster from {fmaster} to {_new_forge_name}"); - fmaster = _new_forge_name; - } - } - } - - draw_set_color(38144);if (recruiter="") then draw_set_color(c_red); - if (text_selected!="recr") or (custom<2) then draw_text_ext(600,663,string_hash_to_newline(string(recruiter)),-1,580); - if (custom>1){ - if (text_selected="recr") and (text_bar>30) then draw_text_ext(600,663,string_hash_to_newline(string(recruiter)),-1,580); - if (text_selected="recr") and (text_bar<=30) then draw_text_ext(600,663,string_hash_to_newline(string(recruiter)+"|"),-1,580); - var str_width,hei;str_width=0;hei=string_height_ext(string_hash_to_newline(recruiter),-2,580); - if (scr_hit(600,663,785,663+hei)){obj_cursor.image_index=2; - if (scr_click_left()) and (!instance_exists(obj_creation_popup)){text_selected="recr";keyboard_string=recruiter;} - } - if (text_selected="recr") then recruiter=keyboard_string; - draw_rectangle(600-1,663-1,785,663+hei,1); - - var _refresh_recr_name_btn =[794, 663, 794+20, 663+20]; - draw_unit_buttons(_refresh_recr_name_btn,"?", [1,1], 38144,,fnt_40k_14b); - if(point_and_click(_refresh_recr_name_btn)){ - var _new_recr_name = global.name_generator.generate_space_marine_name(); - show_debug_message($"regen name of recruiter from {recruiter} to {_new_recr_name}"); - recruiter = _new_recr_name; + if (colour_selection_options.current_selection != 2 && !_update_sprite){ + if (_livery_type == 1){ + roles_radio.update({x1:882, y1 :livery_selection_options.y2+20} ); + roles_radio.draw(); + if (roles_radio.changed && custom==eCHAPTER_TYPE.CUSTOM){ + livery_picker.swap_role_set(1,1); } + } else if (_livery_type == 2){ + + company_radio.update({ + max_width : 350, + x1:862, y1 :livery_selection_options.y2+20, + allow_changes : true + }); + company_radio.draw(); + if (company_radio.changed){ + livery_picker.swap_role_set(2,2); + } + + } + } else { + complex_livery_radio.draw(); + if (complex_livery_radio.changed){ + set_complex_livery_buttons(); } - - draw_set_color(38144);if (admiral="") then draw_set_color(c_red); - if (text_selected!="admi") or (custom<2) then draw_text_ext(600,685,string_hash_to_newline(string(admiral)),-1,580); - if (custom>1){ - if (text_selected="admi") and (text_bar>30) then draw_text_ext(600,685,string_hash_to_newline(string(admiral)),-1,580); - if (text_selected="admi") and (text_bar<=30) then draw_text_ext(600,685,string_hash_to_newline(string(admiral)+"|"),-1,580); - var str_width,hei;str_width=0;hei=string_height_ext(string_hash_to_newline(admiral),-2,580); - if (scr_hit(600,685,785,685+hei)){obj_cursor.image_index=2; - if (scr_click_left()) and (!instance_exists(obj_creation_popup)){text_selected="admi";keyboard_string=admiral;} - } - if (text_selected="admi") then admiral=keyboard_string; - draw_rectangle(600-1,685-1,785,685+hei,1); + } - var _refresh_admi_name_btn =[794, 685, 794+20, 685+20]; - draw_unit_buttons(_refresh_admi_name_btn,"?", [1,1], 38144,,fnt_40k_14b); - if(point_and_click(_refresh_admi_name_btn)){ - var _new_admi_name = global.name_generator.generate_space_marine_name(); - show_debug_message($"regen name of admiral from {admiral} to {_new_admi_name}"); - admiral = _new_admi_name; - } - } - + draw_set_font(fnt_40k_30b); + draw_set_halign(fa_center); + draw_set_alpha(1); + draw_set_color(CM_GREEN_COLOR); + if (_livery_type != 2){ + var liv_string = $"Full Livery \n{livery_picker.role_set == 0? "default" :role[100][livery_picker.role_set]}"; + draw_text(160, 100, liv_string); + } else{ + draw_text(160, 100, "Company Livery"); } + draw_set_font(fnt_40k_14b); + draw_set_halign(fa_left); + draw_set_alpha(1); + draw_set_color(CM_GREEN_COLOR); right_data_slate.inside_method = function() { var _cultures = buttons.culture_styles; _cultures.x1 = right_data_slate.XX+30; @@ -838,4 +223,5 @@ function scr_livery_setup(){ } right_data_slate.draw(1210, 5,0.45, 1); + pop_draw_return_values(); } \ No newline at end of file diff --git a/scripts/scr_load/scr_load.gml b/scripts/scr_load/scr_load.gml index d6063eb829..50db75e9a2 100644 --- a/scripts/scr_load/scr_load.gml +++ b/scripts/scr_load/scr_load.gml @@ -63,7 +63,7 @@ function scr_load(save_part, save_id) { /// the object doesnt want to work with(obj_controller){ var exclusions = ["specialist_point_handler", "location_viewer", "id", - "techs","apoths","forge_queue","point_breakdown","apothecary_points", "forge_points"]; // skip automatic setting of certain vars, handle explicitly later + "techs","apoths","forge_queue","point_breakdown","apothecary_points", "forge_points", "chapter_master_data"]; // skip automatic setting of certain vars, handle explicitly later // Automatic var setting var all_names = struct_get_names(save_data); @@ -74,11 +74,11 @@ function scr_load(save_part, save_id) { continue; } var loaded_value = struct_get(save_data, var_name); - // show_debug_message($"obj_controller var: {var_name} - val: {loaded_value}"); + // show_debug_message_adv($"obj_controller var: {var_name} - val: {loaded_value}"); try { variable_struct_set(obj_controller, var_name, loaded_value); } catch (e){ - show_debug_message(e); + show_debug_message_adv(e); } } specialist_point_handler = new SpecialistPointHandler(); @@ -90,6 +90,14 @@ function scr_load(save_part, save_id) { variable_struct_set(specialist_point_handler, prop, variable_struct_get(save_data, prop)); } } + chapter_master = new scr_chapter_master(); + if (struct_exists(save_data, "chapter_master_data")){ + var _data = variable_struct_get(save_data, "chapter_master_data"); + with (chapter_master){ + move_data_to_current_scope(_data, true); + } + } + specialist_point_handler.calculate_research_points(); location_viewer = new UnitQuickFindPanel(); scr_colors_initialize(); diff --git a/scripts/scr_load_controller/scr_load_controller.gml b/scripts/scr_load_controller/scr_load_controller.gml index 1f741bc09d..f20fc9877e 100644 --- a/scripts/scr_load_controller/scr_load_controller.gml +++ b/scripts/scr_load_controller/scr_load_controller.gml @@ -51,7 +51,7 @@ function scr_load_controller(save_id){ obj_ini.progenitor=ini_read_real("Save","founding",ePROGENITOR.NONE); // global.founding_secret=ini_read_string("Save","founding_secret","Error"); - global.custom=ini_read_real("Save","custom",1); + global.custom=ini_read_real("Save","custom", eCHAPTER_TYPE.RANDOM); stars=ini_read_real("Save","stars",0); // pfleets=ini_read_real("Save","p_fleets",0); // efleets=ini_read_real("Save","en_fleets",0); @@ -100,7 +100,6 @@ function scr_load_controller(save_id){ obj_controller.unload=ini_read_real("Controller","unload",0); obj_controller.diplomacy=0; obj_controller.trading=0; - obj_controller.audience=0; obj_controller.force_goodbye=0; obj_controller.combat=0; obj_controller.new_vehicles=ini_read_real("Controller","new_vehicles",0); @@ -324,8 +323,6 @@ function scr_load_controller(save_id){ obj_controller.annoyed[g]=ini_read_real("Factions","annoyed"+string(g),0); obj_controller.ignore[g]=ini_read_real("Factions","ignore"+string(g),0); obj_controller.turns_ignored[g]=ini_read_real("Factions","turns_ignored"+string(g),0); - obj_controller.audien[g]=ini_read_real("Factions","audience"+string(g),0); - obj_controller.audien_topic[g]=ini_read_string("Factions","audience_topic"+string(g),""); } // var g;g=0; @@ -334,11 +331,6 @@ function scr_load_controller(save_id){ obj_controller.quest_faction[g]=ini_read_real("Ongoing","quest_faction"+string(g),0); obj_controller.quest_end[g]=ini_read_real("Ongoing","quest_end"+string(g),0); } - var g;g=0; - repeat(99){g+=1; - obj_controller.event[g]=ini_read_string("Ongoing","event"+string(g),""); - obj_controller.event_duration[g]=ini_read_real("Ongoing","event_duration"+string(g),0); - } // obj_controller.justmet=0; obj_controller.check_number=ini_read_real("Controller","check_number",0); diff --git a/scripts/scr_log/scr_log.gml b/scripts/scr_log/scr_log.gml index 8278e03bad..e3fcbfedd8 100644 --- a/scripts/scr_log/scr_log.gml +++ b/scripts/scr_log/scr_log.gml @@ -215,3 +215,18 @@ function os_type_format(_os_type) { return _os_type_dictionary.os_unknown; } } + +/// @func show_debug_message_adv(_message) +/// @desc Prints a debug message to the console prefixed with the time, source object, event, and line number. +/// @param {Any} _message The value or string to be logged. +function show_debug_message_adv(_message) { + var _stack = debug_get_callstack(); + + // _stack[0] is this 'log' function itself + // _stack[1] is the script/object event that called this + var _caller = array_length(_stack) > 1 ? _stack[1] : "unknown"; + + var _time = string_format(current_hour, 2, 0) + ":" + string_format(current_minute, 2, 0) + ":" + string_format(current_second, 2, 0); + + show_debug_message($"{_time} | DEBUG | {_caller} >> {_message}"); +} \ No newline at end of file diff --git a/scripts/scr_loyalty/scr_loyalty.gml b/scripts/scr_loyalty/scr_loyalty.gml index c16c6d34b6..ea708e2240 100644 --- a/scripts/scr_loyalty/scr_loyalty.gml +++ b/scripts/scr_loyalty/scr_loyalty.gml @@ -5,107 +5,98 @@ function scr_loyalty(argument0, argument1) { // This adds the crime to the chapter history if (argument1="+"){ - var i, noplus;i=0;noplus=0; - - repeat(30){ - i+=1;noplus=0; + var noplus=0; + for(var i=0; i<30; i++){ + noplus=0; + var amount=0; if (obj_controller.loyal[i]=argument0){// Increases detection chance by a variable amount - var amount;amount=0; + if (obj_controller.loyal_num[i]<1) then amount=0.03; - - if (argument0="Xeno Associate"){ - if (obj_controller.loyal_num[i]=0) then amount=0.09; - if (obj_controller.loyal_num[i]!=0) then amount=0; - } - - if (argument0="Lack of Apothecary") or (argument0="Upset Machine Spirits") or (argument0="Undevout"){ - if (obj_controller.loyal_num[i]=0) then amount=0.075; - if (obj_controller.loyal_num[i]!=0) then amount=0; - } - - if (argument0="Xeno Trade") then amount=0.05; - if (argument0="Irreverance for His Servants") then amount=0.005; - - - // if (argument0="Heretic Contact") then amount=0.01; - if (argument0="Heretic Contact") then amount=0.099; - - if (argument0="Non-Codex Size"){ - if (obj_controller.loyal_num[i]=0) then amount=0.06; - if (obj_controller.loyal_num[i]!=0) then amount=0; - } - - if (argument0="Mutant Gene-Seed"){ - if (obj_controller.loyal_num[i]=0) then amount=0.01; - if (obj_controller.loyal_num[i]!=0) then amount=0; - } - - if (argument0="Heretical Homeworld"){ - if (obj_controller.loyal_num[i]=0) then amount=0.07; - if (obj_controller.loyal_num[i]!=0) then amount=0; - } - - if (argument0="Inquisitor Killer"){ - if (obj_controller.loyal_num[i]=0) then amount=0.005; - if (obj_controller.loyal_num[i]!=0) then amount=0; - } - - if (argument0="Avoiding Inspections"){ - obj_controller.loyalty-=5; - obj_controller.loyalty_hidden-=5; - obj_controller.loyal_num[i]+=5; - obj_controller.loyal_time[i]=120; - amount=0;noplus=1;exit; - } - - if (argument0="Lost Standard"){ - obj_controller.loyalty-=2; - obj_controller.loyalty_hidden-=2; - obj_controller.loyal_num[i]+=5; - obj_controller.loyal_time[i]=9999; - amount=0; - noplus=1; - exit; - } - - if (argument0="Refusing to Crusade"){ - obj_controller.loyalty-=20; - obj_controller.loyalty_hidden-=20; - obj_controller.loyal_num[i]+=20; - obj_controller.loyal_time[i]=9999; - amount=0;noplus=1;exit; - } - - if (argument0="Crossing the Inquisition"){ - obj_controller.loyalty-=40; - obj_controller.loyalty_hidden-=40; - obj_controller.loyal_num[i]+=40; - obj_controller.loyal_time[i]=9999; - amount=0;noplus=1;exit; - } - - if (argument0="Use of Sorcery"){ - if (string_count("|SC|",obj_controller.useful_info)=0){ - obj_controller.loyalty-=30; - obj_controller.loyalty_hidden-=30; - obj_controller.loyal_num[i]+=30; - obj_controller.loyal_time[i]=9999; - } - amount=0;noplus=1;var one;one=0; - obj_controller.useful_info+="|SC|"; + + switch(argument0){ + case "Xeno Associate": + if (obj_controller.loyal_num[i]=0) then amount=0.09; + if (obj_controller.loyal_num[i]!=0) then amount=0; + break; + case "Lack of Apothecary": case "Upset Machine Spirits": case "Undevout": + if (obj_controller.loyal_num[i]=0) then amount=0.075; + if (obj_controller.loyal_num[i]!=0) then amount=0; + break; + case "Xeno Trade": amount=0.05; break; + case "Irreverance for His Servants": amount=0.005; break; + case "Heretic Contact": amount=0.099; break; // amount=0.01; + case "Non-Codex Size": + if (obj_controller.loyal_num[i]=0) then amount=0.06; + if (obj_controller.loyal_num[i]!=0) then amount=0; + break; + case "Mutant Gene-Seed": + if (obj_controller.loyal_num[i]=0) then amount=0.01; + if (obj_controller.loyal_num[i]!=0) then amount=0; + break; + case "Heretical Homeworld": + if (obj_controller.loyal_num[i]=0) then amount=0.07; + if (obj_controller.loyal_num[i]!=0) then amount=0; + break; + case "Inquisitor Killer": + if (obj_controller.loyal_num[i]=0) then amount=0.005; + if (obj_controller.loyal_num[i]!=0) then amount=0; + break; + case "Avoiding Inspections": + obj_controller.loyalty-=5; + obj_controller.loyalty_hidden-=5; + obj_controller.loyal_num[i]+=5; + obj_controller.loyal_time[i]=120; + amount=0; + noplus=1; + break; + case "Lost Standard": + obj_controller.loyalty-=2; + obj_controller.loyalty_hidden-=2; + obj_controller.loyal_num[i]+=5; + obj_controller.loyal_time[i]=9999; + amount=0; + noplus=1; + break; + case "Refusing to Crusade": + obj_controller.loyalty-=20; + obj_controller.loyalty_hidden-=20; + obj_controller.loyal_num[i]+=20; + obj_controller.loyal_time[i]=9999; + amount=0; + noplus=1; + break; + case "Crossing the Inquisition": + obj_controller.loyalty-=40; + obj_controller.loyalty_hidden-=40; + obj_controller.loyal_num[i]+=40; + obj_controller.loyal_time[i]=9999; + amount=0; + noplus=1; + break; + case "Use of Sorcery": + if (string_count("|SC|",obj_controller.useful_info)=0){ + obj_controller.loyalty-=30; + obj_controller.loyalty_hidden-=30; + obj_controller.loyal_num[i]+=30; + obj_controller.loyal_time[i]=9999; + } + amount=0;noplus=1;var one;one=0; + obj_controller.useful_info+="|SC|"; + - if (obj_controller.disposition[4]>=50) and (one=0) and (string_count("|SC|",obj_controller.useful_info)=1){obj_controller.disposition[4]=20;one=1;} - if (obj_controller.disposition[4]<50) and (string_count("|SC|",obj_controller.useful_info)=1) and (obj_controller.disposition[4]>10) and (one=0){obj_controller.disposition[4]=0;one=2;} - if (string_count("|SC|",obj_controller.useful_info)>1){obj_controller.disposition[4]=0;one=2;} + if (obj_controller.disposition[4]>=50) and (one=0) and (string_count("|SC|",obj_controller.useful_info)=1){obj_controller.disposition[4]=20;one=1;} + if (obj_controller.disposition[4]<50) and (string_count("|SC|",obj_controller.useful_info)=1) and (obj_controller.disposition[4]>10) and (one=0){obj_controller.disposition[4]=0;one=2;} + if (string_count("|SC|",obj_controller.useful_info)>1){obj_controller.disposition[4]=0;one=2;} - if (obj_controller.loyalty<=0) and (one<2) then one=2; - if (one=1) then with(obj_controller){scr_audience(4,"sorcery1",0,"",0,0);} - if (one>=2) and (obj_controller.penitent=0){repeat(2){obj_controller.useful_info+="|SC|";}scr_audience(4,"loyalty_zero",0,"",0,0);} - if (one>=2) and (obj_controller.penitent=1){repeat(2){obj_controller.useful_info+="|SC|";}obj_controller.alarm[8]=1;} + if (obj_controller.loyalty<=0) and (one<2) then one=2; + if (one=1) then with(obj_controller){scr_audience(4,"sorcery1",0,"",0,0);} + if (one>=2) and (obj_controller.penitent=0){repeat(2){obj_controller.useful_info+="|SC|";}scr_audience(4,"loyalty_zero",0,"",0,0);} + if (one>=2) and (obj_controller.penitent=1){repeat(2){obj_controller.useful_info+="|SC|";}obj_controller.alarm[8]=1;} - exit;exit; - } + break; + } + if (noplus=0) then obj_controller.loyal_num[i]+=amount; } diff --git a/scripts/scr_manage_tags/scr_manage_tags.gml b/scripts/scr_manage_tags/scr_manage_tags.gml new file mode 100644 index 0000000000..79fe2774c1 --- /dev/null +++ b/scripts/scr_manage_tags/scr_manage_tags.gml @@ -0,0 +1,302 @@ +function set_up_tag_manager(){ + instance_destroy(obj_popup); + var pip = instance_create(0, 0, obj_popup); + pip.type = POPUP_TYPE.ADD_TAGS; + pip.subtype = TAGMANAGER.SELECTION; + + + with (pip){ + var _tag_options = []; + for (var i=0;i < array_length(obj_controller.management_tags);i++){ + + array_push(_tag_options,{ + str1 : obj_controller.management_tags[i], + font : fnt_40k_14b, + }); + } + tag_selects = new MultiSelect(_tag_options, "Tags", {max_width : 500, x1:1040, y1:210}); + + tag_selects.set(obj_controller.manage_tags); + exit_button = new UnitButtonObject( + { + x1: 1061, + y1: 491, + style : "pixel", + label : "Exit", + tooltip : "All tag filters will remain in place re-open the tag manager to add oor remove filters" + } + ); + main_slate = new DataSlate({ + style : "decorated", + XX : 1006, + YY : 143, + set_width : true, + width : 571, + height : 350, + }); + + create_tag_button = new UnitButtonObject( + { + x1: 1056, + y1: 325, + label : "Create Tag", + tooltip : "Create more tags" + } + ); + delete_tag_button = new UnitButtonObject( + { + x1: create_tag_button.x2, + y1: 325, + label : "Delete Tags", + tooltip : "Delete tags permenantly" + } + ); + add_tag_button = new UnitButtonObject( + { + x1: delete_tag_button.x2, + y1: 325, + label : "Add Tags", + tooltip : "Add tags to current Marine selection" + } + ); + remove_tag_button = new UnitButtonObject( + { + x1: add_tag_button.x2, + y1: 325, + label : "Remove Tags", + tooltip : "Remove Tags from current Marine selection" + } + ); + + cancel_button = new UnitButtonObject( + { + x1: create_tag_button.x2, + y1: 350, + label : "Cancel" + } + ); + + delete_tags = new UnitButtonObject( + { + x1: delete_tag_button.x2, + y1: 350, + label : "Delete" + } + ); + create_tags = new UnitButtonObject( + { + x1: delete_tag_button.x2, + y1: 350, + label : "Create" + } + ); + + add_tags = new UnitButtonObject( + { + x1: delete_tag_button.x2, + y1: 350, + label : "Add", + tooltip : "The selected tags will be added to the current selection", + } + ); + remove_tags = new UnitButtonObject( + { + x1: delete_tag_button.x2, + y1: 325, + label : "Remove", + tooltip : "The selected tags will be removed from the current selection", + } + ); + new_tag_name = new TextBarArea(1285, 275, 530, true); + } +} + +enum TAGMANAGER{ + SELECTION, + CREATE, + DELETE, + ADD, + REMOVE +} +function draw_tag_manager(){ + add_draw_return_values(); + main_slate.draw(); + tag_selects.draw(); + if (exit_button.draw()){ + instance_destroy(); + } + + if (subtype == TAGMANAGER.SELECTION){ + obj_controller.manage_tags = tag_selects.selections(); + if (create_tag_button.draw()){ + subtype = TAGMANAGER.CREATE; + new_tag = ""; + } + if (delete_tag_button.draw()){ + subtype = TAGMANAGER.DELETE; + tag_selects.deselect_all(); + //new_tag = ""; + } + + var _addable = array_length(obj_controller.management_tags); + var _tool = "Add tags to current Marine selection"; + add_tag_button.disabled = false; + if (!_addable){ + _tool = "Make some tags to add them to marines"; + } else { + if (!array_contains(obj_controller.man_sel , 1)){ + _tool = "Select some marine to be able to add tags to"; + _addable = false; + } + } + add_tag_button.update({tooltip : _tool}); + if (!_addable){ + add_tag_button.disabled = true; + } + if (add_tag_button.draw(_addable)){ + subtype = TAGMANAGER.ADD; + var _selecs = []; + var _selec_keys = []; + for(var i=0;i TAGMANAGER.SELECTION){ + if (cancel_button.draw()){ + instance_destroy(); + set_up_tag_manager(); + } + } + + if (subtype == TAGMANAGER.CREATE){ + new_tag = new_tag_name.draw(new_tag); + + if (new_tag != ""){ + if (create_tags.draw()){ + array_push(obj_controller.management_tags, new_tag); + instance_destroy(); + set_up_tag_manager(); + } + } + } else if (subtype == TAGMANAGER.DELETE){ + if (delete_tags.draw()){ + var _deletes = tag_selects.selections(); + obj_controller.management_tags = array_delete_values(obj_controller.management_tags,_deletes ); + instance_destroy(); + set_up_tag_manager(); + } + } else if (subtype == TAGMANAGER.ADD){ + if (add_tags.draw()){ + var _tags = tag_selects.selections(); + for(var i=0;i=0;t--){ + if (array_contains(_removals, _unit.manage_tags[t])){ + array_delete(_unit.manage_tags, t, 1); + } + } + } + instance_destroy(); + set_up_tag_manager(); + } + } + } + pop_draw_return_values(); +} \ No newline at end of file diff --git a/scripts/scr_manage_tags/scr_manage_tags.yy b/scripts/scr_manage_tags/scr_manage_tags.yy new file mode 100644 index 0000000000..728c4f3326 --- /dev/null +++ b/scripts/scr_manage_tags/scr_manage_tags.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_manage_tags", + "isCompatibility":false, + "isDnD":false, + "name":"scr_manage_tags", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_manage_task_selector/scr_manage_task_selector.gml b/scripts/scr_manage_task_selector/scr_manage_task_selector.gml index 799387f950..d2fc2a5291 100644 --- a/scripts/scr_manage_task_selector/scr_manage_task_selector.gml +++ b/scripts/scr_manage_task_selector/scr_manage_task_selector.gml @@ -1,225 +1,215 @@ // Script assets have changed for v2.3.0 see // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information function scr_manage_task_selector(){ - if (exit_button.draw_shutter(xx+400,yy+70, "Exit", 0.5, true)){ - if (is_real(selection_data.system) && selection_data.system <= 10 && selection_data.system >= 0){ - managing = selection_data.system; + if (exit_button.draw_shutter(400,70, "Exit", 0.5, true)){ + if (selection_data.purpose_code == "artifact_equip"){ + scr_toggle_lib(); + obj_controller.menu_artifact = selection_data.artifact; + equip_artifact_popup_setup(); + exit; + } + + if (struct_exists(selection_data, "target_company")){ + if (is_real(selection_data.target_company) && selection_data.target_company <= 10 && selection_data.target_company >= 0){ + managing = selection_data.target_company; update_general_manage_view(); - } else { - exit_adhoc_manage(); exit; } + } else { + exit_adhoc_manage(); + exit; } + } + if (selection_data.select_type == MissionSelectType.Units){ man_count = array_sum(man_sel); - if (selection_data.purpose_code!="manage"){ - if ((man_count==0 || man_count>selection_data.number)){ - proceed_button.draw_shutter(xx+1110,yy+70, "Proceed", 0.5, false); + } else { + man_count = array_length(company_data.selected_squads); + } + if (selection_data.purpose_code!="manage"){ + if ((man_count==0 || man_count>selection_data.number)){ + proceed_button.draw_shutter(1110,70, "Proceed", 0.5, false); + } else if (proceed_button.draw_shutter(1110,70, "Proceed", 0.5, true)){ + if (selection_data.select_type == MissionSelectType.Units){ + task_selector_man_manage(); } else { - if (proceed_button.draw_shutter(xx+1110,yy+70, "Proceed", 0.5, true)){ - selections = []; - var unit; - for (var i=0; i _psionics_roll ? _second_roll : _psionics_roll; } } else if (scr_has_disadv("Psyker Intolerant")) { if (_psionics_roll >= 170) { - var _second_roll = roll_personal_dice(_dice_count, 100, "low", self); + var _second_roll = roll_dice_unit(_dice_count, 100, "low", self); _psionics_roll = _second_roll < _psionics_roll ? _second_roll : _psionics_roll; } } @@ -1336,23 +1421,23 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} //get equipment data methods by deafult they garb all equipment data and return an equipment struct e.g new EquipmentStruct(item_data, core_type,quality="none") static get_armour_data = function(type = "all") { - return gear_weapon_data("armour", armour(), type, false, armour_quality); + return gear_weapon_data("armour", armour(), type, false, armour_quality, armour(true)); }; static get_gear_data = function(type = "all") { - return gear_weapon_data("gear", gear(), type, false, gear_quality); + return gear_weapon_data("gear", gear(), type, false, gear_quality, gear(true)); }; static get_mobility_data = function(type = "all") { - return gear_weapon_data("mobility", mobility_item(), type, false, mobility_item_quality); + return gear_weapon_data("mobility", mobility_item(), type, false, mobility_item_quality, mobility_item(true)); }; static get_weapon_one_data = function(type = "all") { - return gear_weapon_data("weapon", weapon_one(), type, false, weapon_one_quality); + return gear_weapon_data("weapon", weapon_one(), type, false, weapon_one_quality, weapon_one(true)); }; static get_weapon_two_data = function(type = "all") { - return gear_weapon_data("weapon", weapon_two(), type, false, weapon_two_quality); + return gear_weapon_data("weapon", weapon_two(), type, false, weapon_two_quality, weapon_two(true)); }; static damage_resistance = function() { @@ -1362,7 +1447,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} damage_res += get_mobility_data("damage_resistance_mod"); damage_res += get_weapon_one_data("damage_resistance_mod"); damage_res += get_weapon_two_data("damage_resistance_mod"); - damage_res = min(75, damage_res + floor(((constitution * 0.005) + (experience / 1000)) * 100)); + damage_res = min(75, damage_res + floor((constitution * 0.005) * 100)); return damage_res; }; @@ -1550,6 +1635,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} explanation_string += $"Secondary: +{second_attack}#"; } } + final_range_attack = floor(final_range_attack * range_multiplyer); ranged_damage_data = [final_range_attack, explanation_string, carry_data, primary_weapon, secondary_weapon]; return ranged_damage_data; }; @@ -1613,14 +1699,16 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} }; static melee_attack = function(weapon_slot = 0) { + var _format_sign = function(_num) { + _num = format_number_with_sign(round(_num)); + return _num; + }; + encumbered_melee = false; - melee_att = 100 * (((weapon_skill / 100) * (strength / 20)) + (experience / 1000) + 0.1); - var explanation_string = string_concat("#Stats: ", format_number_with_sign(round(((melee_att / 100) - 1) * 100)), "%#"); - explanation_string += " Base: +10%#"; - explanation_string += string_concat(" WSxSTR: ", format_number_with_sign(round((((weapon_skill / 100) * (strength / 20)) - 1) * 100)), "%#"); - explanation_string += string_concat(" EXP: ", format_number_with_sign(round((experience / 1000) * 100)), "%#"); - - melee_carrying = melee_hands_limit(); + var _melee_mod = 1; + var explanation_string = ""; + + var melee_carrying = melee_hands_limit(); var _wep1 = get_weapon_one_data(); var _wep2 = get_weapon_two_data(); if (!is_struct(_wep1)) { @@ -1644,7 +1732,6 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} primary_weapon.attack = strength / 3; //calculate damage from player fists primary_weapon.name = "fists"; primary_weapon.range = 1; - primary_weapon.ammo = -1; } else { if (!valid1 && valid2) { primary_weapon = _wep2; @@ -1661,7 +1748,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} secondary_weapon = highest; } else { primary_weapon = highest; - melee_att *= 0.5; + _melee_mod += 0.5; if (primary_weapon.has_tag("flame")) { explanation_string += $"Primary is Flame: -50%#"; } else if (primary_weapon.has_tag("pistol")) { @@ -1678,9 +1765,42 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} primary_weapon = _wep2; } } - + var basic_wep_string = $"{primary_weapon.name}: {primary_weapon.attack}#"; - + explanation_string = basic_wep_string + explanation_string; + + _melee_mod += (weapon_skill / 100) + (experience / 500); + explanation_string += $"#Stats:#"; + explanation_string += $" WS: {_format_sign((weapon_skill / 100) * 100)}%#"; + explanation_string += $" EXP: {_format_sign((experience / 500) * 100)}%#"; + + if (primary_weapon.has_tag("martial") || primary_weapon.has_tag("savage")) { + var bonus_modifier = 0; + var martial_bonus = 0; + var savage_bonus = 0; + + if (primary_weapon.has_tag("martial")) { + martial_bonus = dexterity / 100; + } + if (primary_weapon.has_tag("savage")) { + savage_bonus = strength / 100; + } + + bonus_modifier = martial_bonus + savage_bonus; + _melee_mod += bonus_modifier; + + if (martial_bonus != 0) { + explanation_string += $" DEX (Martial): {_format_sign(martial_bonus * 100)}%#"; + } + if (savage_bonus != 0) { + explanation_string += $" STR (Savage): {_format_sign(savage_bonus * 100)}%#"; + } + } else { + _melee_mod += (strength / 200) + (dexterity / 200); + explanation_string += $" STR: {_format_sign((strength / 200) * 100)}%#"; + explanation_string += $" DEX: {_format_sign((dexterity / 200) * 100)}%#"; + } + if (psionic > 0) { if (has_force_weapon()) { var psychic_bonus = psionic * 20; @@ -1689,15 +1809,13 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} psychic_bonus *= IsSpecialist(SPECIALISTS_LIBRARIANS) ? 1 : 0.25; psychic_bonus = round(psychic_bonus); primary_weapon.attack += psychic_bonus; - basic_wep_string += $"Psychic Power: +{psychic_bonus}#"; + explanation_string += $"Psychic Power: +{psychic_bonus}#"; } } - - explanation_string = basic_wep_string + explanation_string; - + if (melee_carrying[0] > melee_carrying[1]) { encumbered_melee = true; - melee_att *= 0.6; + _melee_mod *= 0.6; explanation_string += $"Encumbered: x0.6#"; } if (!encumbered_melee) { @@ -1707,23 +1825,24 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} total_gear_mod += get_mobility_data("melee_mod"); total_gear_mod += _wep1.melee_mod; total_gear_mod += _wep2.melee_mod; - melee_att += total_gear_mod; - explanation_string += $"#Gear Mod: {(total_gear_mod / 100) * 100}%#"; + total_gear_mod /= 100; + _melee_mod += total_gear_mod; + explanation_string += $"#Gear Mod: {_format_sign(total_gear_mod * 100)}%#"; //TODO make trait data like this more structured to be able to be moddable if (has_trait("feet_floor") && mobility_item() != "") { - melee_att *= 0.9; + _melee_mod *= 0.9; explanation_string += $"{global.trait_list.feet_floor.display_name}: x0.9#"; } if (primary_weapon.has_tag("fist") && has_trait("brawler")) { - melee_att *= 1.1; + _melee_mod *= 1.1; explanation_string += $"{global.trait_list.brawler.display_name}: x1.1#"; } if (primary_weapon.has_tag("power") && has_trait("duelist")) { - melee_att *= 1.3; + _melee_mod *= 1.3; explanation_string += $"{global.trait_list.duelist.display_name}: x1.3#"; } } - var final_attack = floor((melee_att / 100) * primary_weapon.attack); + var final_attack = floor(_melee_mod * primary_weapon.attack); if (secondary_weapon != "none" && !encumbered_melee) { var side_arm_data = "Standard: x0.5"; var secondary_modifier = 0.5; @@ -1735,18 +1854,19 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} secondary_modifier = 0; } else { secondary_modifier = 0.6; - side_arm_data = "Pistol: x0.8"; + side_arm_data = "Pistol: x0.6"; } } else if (secondary_weapon.has_tag("flame")) { secondary_modifier = 0.3; side_arm_data = "Flame: x0.3"; } - var side_arm = floor(secondary_modifier * ((melee_att / 100) * secondary_weapon.attack)); + var side_arm = floor(secondary_modifier * (_melee_mod * secondary_weapon.attack)); if (side_arm > 0) { final_attack += side_arm; - explanation_string += $"Side Arm: +{side_arm}({side_arm_data})#"; + explanation_string += $"Side Arm: +{side_arm} ({side_arm_data})#"; } } + melee_damage_data = [final_attack, explanation_string, melee_carrying, primary_weapon, secondary_weapon]; return melee_damage_data; }; @@ -1869,22 +1989,26 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} //if marine is on planet location_id = location_type; //planet_number marine is on location_type = location_types.planet; //state marine is on planet - if (obj_ini.loc[company][marine_number] == "home") { - obj_ini.loc[company][marine_number] = obj_ini.home_name; + if (location_string == "home") { + location_string = obj_ini.home_name; } - location_name = obj_ini.loc[company][marine_number]; //system marine is in + location_name = location_string; //system marine is in } else { location_type = location_types.ship; //marine is on ship location_id = ship_location > -1 ? ship_location : 0; //ship array position if (location_id < array_length(obj_ini.ship_location)) { location_name = obj_ini.ship_location[location_id]; //location of ship } else { - location_name = location_name == obj_ini.loc[company][marine_number]; + location_name = location_string; } } return [location_type, location_id, location_name]; }; + static controllable = function(){ + return !location_out_of_player_control(location_string); + } + //quick way of getting name and role combined in string static name_role = function() { var temp_role = role(); @@ -1966,9 +2090,12 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} static unload = function(planet_number, system) { var current_location = marine_location(); set_last_ship(); + if (!controllable()){ + return; + } if (current_location[0] == location_types.ship) { - if (!array_contains(["Warp", "Terra", "Mechanicus Vessel", "Lost"], current_location[2]) && current_location[2] == system.name) { - obj_ini.loc[company][marine_number] = obj_ini.ship_location[current_location[1]]; + if (current_location[2] != "Warp" && current_location[2] == system.name) { + location_string = obj_ini.ship_location[current_location[1]]; planet_location = planet_number; ship_location = -1; get_unit_size(); @@ -1977,7 +2104,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} } } else { ship_location = -1; - obj_ini.loc[company][marine_number] = system.name; + location_string = system.name; planet_location = planet_number; system.p_player[planet_number] += size; } @@ -1998,7 +2125,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} for (var i = 1; i <= homestar.planets; i++) { if (homestar.p_owner[i] == eFACTION.Player || (obj_controller.faction_status[eFACTION.Imperium] != "War" && array_contains(obj_controller.imperial_factions, homestar.p_owner[i]))) { planet_location = i; - obj_ini.loc[company][marine_number] = obj_ini.home_name; + location_string = obj_ini.home_name; spawn_location_chosen = true; } } @@ -2020,25 +2147,35 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} static specialist_tooltips = specialistfunct; static is_at_location = function(location = "", planet = 0, ship = -1) { - var is_at_loc = false; - if (planet > 0) { - if (obj_ini.loc[company][marine_number] == location && planet_location == planet) { - is_at_loc = true; + var _is_at_loc = false; + var _multi_ship = is_array(ship); + var _multi_planet = is_array(planet); + if ((_multi_planet || planet > 0) && location_string == location) { + if (_multi_planet){ + + _is_at_loc = array_contains(planet, planet_location); } - } else if (ship > -1) { - if (ship_location == ship) { - is_at_loc = true; + else { + _is_at_loc = planet_location == planet; } - } else if (ship == -1 && planet == 0) { + } else if (_multi_ship) { + + _is_at_loc = array_contains(ship, ship_location); + + } else if (ship > -1){ + + _is_at_loc = ship_location == ship; + + }else if (ship == -1 && planet == 0) { if (ship_location > -1) { if (obj_ini.ship_location[ship_location] == location) { - is_at_loc = true; + _is_at_loc = true; } - } else if (obj_ini.loc[company][marine_number] == location) { - is_at_loc = true; + } else if (location_string == location) { + _is_at_loc = true; } } - return is_at_loc; + return _is_at_loc; }; static edit_corruption = function(edit) { @@ -2190,11 +2327,11 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} }; static perils_strength = function() { - var _perils_strength = roll_personal_dice(1, 100, "low", self); + var _perils_strength = roll_dice_unit(1, 100, "low", self); // I hope you like demons if (has_trait("warp_tainted")) { - var _second_roll = roll_personal_dice(1, 100, "high", self); + var _second_roll = roll_dice_unit(1, 100, "high", self); if (_second_roll > _perils_strength) { _perils_strength = _second_roll; } @@ -2206,7 +2343,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} } static perils_test = function() { - var _roll = roll_personal_dice(1, 1000, "high", self); + var _roll = roll_dice_unit(1, 1000, "high", self); var _perils_threshold = perils_threshold(); return _roll <= _perils_threshold; @@ -2222,13 +2359,13 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} } static psychic_focus_test = function() { - var _cast_roll = roll_personal_dice(1, 100, "high", self); + var _cast_roll = roll_dice_unit(1, 100, "high", self); var _cast_difficulty = psychic_focus_difficulty(); var _test_successful = _cast_roll >= _cast_difficulty; if (_test_successful) { roll_psionic_increase(); - if (roll_personal_dice(2, 10, "high", self) == 20) { + if (roll_dice_unit(2, 10, "high", self) == 20) { add_exp(1 * (_cast_difficulty / 100)); } } @@ -2240,7 +2377,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} if (psionic < 12) { var _psionic_difficulty = max(1, (psionic * 50) - experience); - var _dice_roll = roll_personal_dice(1, _psionic_difficulty, "high", self); + var _dice_roll = roll_dice_unit(1, _psionic_difficulty, "high", self); if (_dice_roll == _psionic_difficulty) { psionic++; add_battle_log_message($"{name_role()} was touched by the warp!", 999, 135); @@ -2273,6 +2410,82 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data = {} arti.bearer = [end_company, end_slot]; } }; + + static is_dreadnought = function(){ + var _arm_data = get_armour_data(); + if (is_struct(_arm_data)){ + if (_arm_data.has_tag("dreadnought")){ + return true + } + } + return false; + } + + /// @param {Enum.EquipmentSlot} _slot + static add_equipment_repairs = function(_slot = EquipmentSlot.ALL) { + var _slots = array_create(0); + + switch (_slot) { + case EquipmentSlot.ARMOUR: + _slots = [EquipmentSlot.ARMOUR]; + break; + case EquipmentSlot.WEAPON_ONE: + _slots = [EquipmentSlot.WEAPON_ONE]; + break; + case EquipmentSlot.WEAPON_TWO: + _slots = [EquipmentSlot.WEAPON_TWO]; + break; + case EquipmentSlot.GEAR: + _slots = [EquipmentSlot.GEAR]; + break; + case EquipmentSlot.MOBILITY: + _slots = [EquipmentSlot.MOBILITY]; + break; + case EquipmentSlot.ALL: + _slots = [EquipmentSlot.ARMOUR, EquipmentSlot.WEAPON_ONE, EquipmentSlot.WEAPON_TWO, EquipmentSlot.GEAR, EquipmentSlot.MOBILITY]; + break; + } + + for (var i = 0; i < array_length(_slots); i++) { + var _cur_slot = _slots[i]; + switch (_cur_slot) { + case EquipmentSlot.ARMOUR: + obj_controller.specialist_point_handler.add_to_armoury_repair(armour()); + if (instance_exists(obj_ncombat)) { + obj_ncombat.slime += get_armour_data("maintenance"); + } + break; + + case EquipmentSlot.WEAPON_ONE: + obj_controller.specialist_point_handler.add_to_armoury_repair(weapon_one()); + if (instance_exists(obj_ncombat)) { + obj_ncombat.slime += get_weapon_one_data("maintenance"); + } + break; + + case EquipmentSlot.WEAPON_TWO: + obj_controller.specialist_point_handler.add_to_armoury_repair(weapon_two()); + if (instance_exists(obj_ncombat)) { + obj_ncombat.slime += get_weapon_two_data("maintenance"); + } + break; + + case EquipmentSlot.GEAR: + obj_controller.specialist_point_handler.add_to_armoury_repair(gear()); + if (instance_exists(obj_ncombat)) { + obj_ncombat.slime += get_gear_data("maintenance"); + } + break; + + case EquipmentSlot.MOBILITY: + obj_controller.specialist_point_handler.add_to_armoury_repair(mobility_item()); + if (instance_exists(obj_ncombat)) { + obj_ncombat.slime += get_mobility_data("maintenance"); + } + break; + } + } + }; } function jsonify_marine_struct(company, marine, stringify=true) { @@ -2300,3 +2513,18 @@ function jsonify_marine_struct(company, marine, stringify=true) { function fetch_unit(unit) { return obj_ini.TTRPG[unit[0]][unit[1]]; } + + +function fetch_unit_uid(uuid){ + for (var i=0;i300){co+=1;v=1;/*show_message("mahreens at the start of company "+string(co)+" is equal to "+string(info_mahreens));*/} if (co>10) then good=false; if (good=true){ if (obj_ini.name[co][v] == "") then continue; unit = fetch_unit([co, v]); if (unit.role()==obj_ini.role[100][eROLE.ChapterMaster]){ - if (unit.planet_location>0) and (unit.ship_location<0) then lick=string(obj_ini.loc[co][v])+"."+string(unit.planet_location); - if (unit.planet_location<=0) and (unit.ship_location>-1) then lick=string(obj_ini.ship[unit.ship_location]); - if (lick!=""){return(lick);good=false;} - } - } + if (unit.planet_location>0) and (unit.ship_location<0) then lick=$"{unit.location_string}."+string(unit.planet_location); + if (unit.planet_location<=0) and (unit.ship_location>-1) then lick=string(obj_ini.ship[unit.ship_location]); + if (lick!=""){ + good=false; + return(lick); + } + } + } } } } - - - - - } diff --git a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml index 8e91d7ede1..f4623c1168 100644 --- a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml +++ b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.gml @@ -15,7 +15,7 @@ function mechanicus_missions_end_turn(planet){ } var bionics_planet_slot = has_problem_planet_with_time(planet,"mech_bionics"); if (bionics_planet_slot>-1){ - var check1=scr_bionics_count("star",string(name),planet,"number"); + var check1=scr_bionics_count("star",name,planet,"number"); if (check1>=10){ var _prob_data = p_problem_other_data[planet][bionics_planet_slot]; var percent_complete = increment_mission_completion(_prob_data); @@ -31,7 +31,7 @@ function mechanicus_missions_end_turn(planet){ var _mission_data = p_problem_other_data[planet][tomb2_planet_slot]; _mission_data.turns++; var battli=0; - var _roll1 = roll_dice(1, 100+_mission_data.turns, "low"); + var _roll1 = roll_dice_chapter(1, 100+_mission_data.turns, "low"); var completion = _mission_data.completion>0; if (roll1>98){ @@ -49,8 +49,8 @@ function mechanicus_missions_end_turn(planet){ if (battli=2) then obj_turn_end.battle_special[obj_turn_end.battles]="study2b"; if (obj_turn_end.battle_opponent[obj_turn_end.battles]==11){ - if (planet_feature_bool(p_feature[planet],P_features.World_Eaters)==1){ - obj_turn_end.battle_special[obj_turn_end.battles]="world_eaters"; + if (planet_feature_bool(p_feature[planet],P_features.ChaosWarband)==1){ + obj_turn_end.battle_special[obj_turn_end.battles]="ChaosWarband"; } } } @@ -61,9 +61,7 @@ function mechanicus_missions_end_turn(planet){ remove_planet_problem(planet,"mech_tomb2"); } } - else {// Done - if scr_has_adv("Shitty Luck") then roll1+=15; - + else {// Done if (roll1>20){ scr_alert("","mission","Adeptus Mechanicus research within the Necron Tomb of "+string(name)+" "+scr_roman(planet)+" continues.",0,0); } @@ -78,8 +76,8 @@ function mechanicus_missions_end_turn(planet){ scr_event_log("","Mechanicus Mission Completed: The Mechanicus research team on "+string(name)+" "+scr_roman(planet)+" have completed their work."); } else if (reward==2){ - if (obj_ini.fleet_type=ePlayerBase.home_world) then scr_add_artifact("random","",0,obj_ini.home_name,2); - if (obj_ini.fleet_type != ePlayerBase.home_world) then scr_add_artifact("random","",0,obj_ini.ship[0],501); + + var last_artifact = scr_add_artifact("random", "", 0); text="The Mechanicus Research team on planet "+string(name)+" "+scr_roman(planet)+" have completed their work without any major setbacks. Pleased with your astartes' work, they have granted your Chapter an artifact, to be used as you see fit."; scr_event_log("","Mechanicus Mission Completed: The Mechanicus research team on "+string(name)+" "+scr_roman(planet)+" have completed their work."); scr_event_log("","Artifact gifted from Mechanicus."); @@ -99,89 +97,45 @@ function mechanicus_missions_end_turn(planet){ remove_planet_problem(planet,"mech_tomb1"); add_new_problem(planet, "mech_tomb2", 999,star="none", other_data={turns:0}) scr_popup("Mechanicus Research","The Mechanicus Research team on planet "+string(name)+" "+scr_roman(planet)+" has taken note of your Astartes and are now prepared to begin their research. Your marines are to stay on the planet until further notice.","necron_cave",""); + } else { + } } - var mars_mech_mission = has_problem_planet_and_time(planet,"mech_mars", 0); - if (mars_mech_mission>-1){ - var techs_taken,com,ide,ship_planet, unit; - techs_taken=0;com=-1;ide=0;ship_planet=""; - for (com =0; com<=10;com++){ - for (ide =0; ide<=array_length(obj_ini.role[com]);ide++){ - unit = fetch_unit([com,ide]) - if (unit.role()=obj_ini.role[100][eROLE.Techmarine]){ - // Case 1: on planet - if (obj_ini.loc[com][ide]=name) and (unit.planet_location=planet){ - p_player[planet]-=scr_unit_size(obj_ini.armour[com][ide],obj_ini.role[com][ide],true); - obj_ini.loc[com][ide]="Mechanicus Vessel"; - unit.planet_location=0; - unit.ship_location=-1; - techs_taken+=1; - } - if (unit.ship_location>-1){ - ship_planet=obj_ini.ship_location[unit.ship_location]; - if (ship_planet=name){ - obj_ini.ship_carrying[unit.ship_location]-=scr_unit_size(obj_ini.armour[com][ide],obj_ini.role[com][ide],true); - obj_ini.loc[com][ide]="Mechanicus Vessel";unit.planet_location=0;unit.ship_location=0; - techs_taken+=1; - } - } - } - } - } - if (techs_taken=0){ - var alert_text="Mechanicus Mission Failed: Journey to Mars Catacombs at "+string(name)+" "+scr_roman(planet)+"."; - scr_alert("red","mission_failed",alert_text,0,0); - scr_event_log("red",alert_text); - obj_controller.disposition[3]-=10; - remove_planet_problem(planet,"mech_mars"); - } - - - else if (techs_taken>0){ - if (techs_taken>=20) then obj_controller.disposition[3]+=max(techs_taken,4); - var taxt="Mechanicus Ship departs for the Mars catacombs. Onboard are "+string(techs_taken)+" of your "+string(obj_ini.role[100][16])+"s."; - scr_alert("","mission",taxt,0,0); - scr_event_log("green",taxt); - } - - var flit=instance_create(x,y,obj_en_fleet); - flit.owner = eFACTION.Mechanicus; - flit.sprite_index=spr_fleet_mechanicus; - flit.capital_number=1;flit.image_index=0;flit.image_speed=0; - flit.trade_goods="mars_spelunk1"; - flit.home_x=x; - flit.home_y=y; - flit.action_x=x+lengthdir_x(3000,obj_controller.terra_direction); - flit.action_y=y+lengthdir_y(3000,obj_controller.terra_direction); - flit.action="move";flit.action_eta=48; - } if (has_problem_planet_and_time(planet,"mech_tomb1", 0)>-1){ var alert_text="Mechanicus Mission Failed: Necron Tomb Study at "+string(name)+" "+scr_roman(planet)+"."; scr_alert("red","mission_failed",alert_text,0,0); scr_event_log("red",alert_text, name); - obj_controller.disposition[3]-=15; + alter_disposition(eFACTION.Mechanicus,-15); remove_planet_problem(planet,"mech_tomb1"); } + + + var mars_mech_mission = has_problem_planet_and_time(planet,"mech_mars", 0); + if (mars_mech_mission>-1){ + mechanicus_mars_mission_target_time_elapsed(planet); + } + if (has_problem_planet_and_time(planet,"mech_raider", 0)>-1){ var alert_text="Mechanicus Mission Failed: Land Raider testing at "+string(name)+" "+scr_roman(planet)+"."; scr_alert("red","mission_failed",alert_text,0,0); scr_event_log("red",alert_text); - obj_controller.disposition[3]-=6; + alter_disposition(eFACTION.Mechanicus,-6); remove_planet_problem(planet,"mech_raider"); } if (has_problem_planet_and_time(planet,"mech_bionics", 0)>-1){ var alert_text="Mechanicus Mission Failed: bionics testing at "+string(name)+" "+scr_roman(planet)+"."; scr_alert("red","mission_failed",alert_text,0,0); scr_event_log("red",alert_text); - obj_controller.disposition[3]-=6; + alter_disposition(eFACTION.Mechanicus,-6); remove_planet_problem(planet,"mech_bionics"); } } -function spawn_mechanicus_mission(){ +function spawn_mechanicus_mission(chosen_mission = "random"){ log_message("RE: Mechanicus Mission"); var mechanicus_missions = [] + var _evented var _forge_stars = scr_get_stars(false, [eFACTION.Mechanicus],["Forge"]); @@ -194,7 +148,7 @@ function spawn_mechanicus_mission(){ with(obj_star){ - if(scr_star_has_planet_with_feature(id,P_features.Necron_Tomb)) and (awake_necron_Star(id)!= 0){ + if(scr_star_has_planet_with_feature(id,P_features.Necron_Tomb)) and (awake_necron_star(id)!= 0){ var planet = scr_get_planet_with_feature(id, P_features.Necron_Tomb); if(scr_is_planet_owned_by_allies(self, planet)){ array_push(mechanicus_missions, "mech_tomb"); @@ -208,12 +162,14 @@ function spawn_mechanicus_mission(){ } var mission_count = array_length(mechanicus_missions); - if(mission_count == 0){ + if (mission_count == 0 && chosen_mission== "random"){ log_error("RE: Mechanicus Mission, couldn't pick mission"); exit; } - var chosen_mission = array_random_element(mechanicus_missions); + if (chosen_mission == "random"){ + chosen_mission = array_random_element(mechanicus_missions); + } if (chosen_mission == "mech_bionics" || chosen_mission == "mech_raider" || chosen_mission == "mech_mars"){ @@ -224,27 +180,56 @@ function spawn_mechanicus_mission(){ var star = array_random_element(_forge_stars); - var mission_data = { + var _mission_data = { star : star.id, - pathway_id : chosen_mission, } var _name = star.name; if (chosen_mission == "mech_raider"){ var text=$"The Adeptus Mechanicus are trusting you with a special mission. They wish for you to bring a Land Raider and six {obj_ini.role[100][16]} to a Forge World in {_name} for testing and training, for a duration of 24 months. You have four years to complete this. Can your chapter handle this mission?"; - scr_popup("Mechanicus Mission",text,"mechanicus",mission_data); - evented = true; + _mission_data.options =[ + { + str1:"Accept", + choice_func : accept_mechanicus_land_raider_mission, + }, + { + str1:"Refuse", + choice_func : popup_default_close, + }, + ] + _evented = true; } else if (chosen_mission == "mech_bionics") { var text=$"The Adeptus Mechanicus are trusting you with a special mission. They desire a squad of Astartes with bionics to stay upon a Forge World in {_name} for testing, for a duration of 24 months. You have four years to complete this. Can your chapter handle this mission?"; - scr_popup("Mechanicus Mission",text,"mechanicus",mission_data); - evented = true; + _mission_data.options =[ + { + str1:"Accept", + choice_func :accept_mechanicus_bionics_mission, + }, + { + str1:"Refuse", + choice_func :popup_default_close + }, + ] + _evented = true; } else { - var text=$"The local Adeptus Mechanicus are preparing to embark on a voyage to Mars, to delve into the catacombs in search of lost technology. Due to your close relations they have made the offer to take some of your {obj_ini.role[100][16]}s with them. Can your chapter handle this mission?"; - scr_popup("Mechanicus Mission",text,"mechanicus",mission_data); - evented = true; + var text=$"The local Adeptus Mechanicus are preparing to embark on a voyage to Mars, to delve into the catacombs in search of lost technology. Due to your close relations they have made the offer to take some of your {obj_ini.role[100][16]}s with them for both their unique abilities to function as both scientific helpers and as helpers (high Weapon Skill and Technology is reccomended). Can your chapter handle this mission?"; + _mission_data.options =[ + { + str1:"Accept", + choice_func : accept_mechanicus_mars_mission + }, + { + str1:"Refuse", + choice_func : popup_default_close, + }, + ] + _evented = true; + } + if (_evented){ + scr_popup("Mechanicus Mission",text,"mechanicus",_mission_data); } - //show_debug_message(mission_data); + //show_debug_message_adv(_mission_data); } else if (chosen_mission=="mech_tomb") { @@ -252,7 +237,7 @@ function spawn_mechanicus_mission(){ stars = scr_get_stars(); var valid_stars = array_filter_ext(stars, function(star,index) { - if(scr_star_has_planet_with_feature(star,P_features.Necron_Tomb)) and (awake_necron_Star(star)!= 0){ + if(scr_star_has_planet_with_feature(star,P_features.Necron_Tomb)) and (awake_necron_star(star)!= 0){ var planet = scr_get_planet_with_feature(star, P_features.Necron_Tomb); if(scr_is_planet_owned_by_allies(star, planet)) { return true; @@ -270,91 +255,206 @@ function spawn_mechanicus_mission(){ star : star.id, pathway_id : chosen_mission, } + _mission_data.options =[ + { + str1:"Accept", + choice_func : accept_mechanicus_tomb_mission, + }, + { + str1:"Refuse", + choice_func : popup_default_close, + }, + ] var text=$"Mechanicus Techpriests have established a research site on a Necron Tomb World in the {star.name} system. They are requesting some of your forces to provide security for the research team until the tests may be completed. Further information is on a need-to-know basis. Can your chapter handle this mission?"; scr_popup("Mechanicus Mission",text,"mechanicus",_mission_data); - evented = true; - } + _evented = true; + } + return _evented; } -function mechanicus_mission_procedures(){ - if ((option1 == "") && (title == "Mechanicus Mission")) { - option1 = "Accept"; - option2 = "Refuse"; +/// @mixin obj_popup +function accept_mechanicus_tomb_mission(){ + + var _planet = false; + var _star = pop_data.star; + for (var i = 1; i<_star.planets; i++) { + if (awake_tomb_world(_star.p_feature[i])!=0){ + _planet = i; + break; + } + } + if (_planet > 0) { + _planet = new PlanetData(_planet, _star); + _planet.add_problem("mech_tomb1", 17) + var _name = _planet.name(); + text = $"The Adeptus Mechanicus await your forces at {_name}. They are expecting at least two squads of Astartes and have placed the testing on hold until their arrival. {global.chapter_name} have 16 months to arrive."; + scr_event_log("", "Mechanicus Mission Accepted: At least two squads of marines are expected at {_name} within 16 months.", _star.name); + with (_star) { + new_star_event_marker("green"); + } + title = "Mechanicus Mission Accepted"; + reset_popup_options(); + cooldown = 15; + exit; + } - var mission = pop_data.pathway_id; + +} +/// @mixin obj_popup +function accept_mechanicus_land_raider_mission(){ var _star = pop_data.star - if ((press == 1) && (option1 != "")) { - if (mission=="mech_tomb") { - if (_star != "none") { - var _planet = false; - for (var i = 1; i<_star.planets; i++) { - if (awake_tomb_world(_star.p_feature[i])!=0){ - _planet = i; - break; - } - } - if (_planet > 0) { - _planet = new PlanetData(_planet, _star); - _planet.add_problem("mech_tomb1", 17) - add_new_problem(_planet, "mech_tomb1", 17); - var _name = _planet.name(); - text = $"The Adeptus Mechanicus await your forces at {_name}. They are expecting at least two squads of Astartes and have placed the testing on hold until their arrival. {global.chapter_name} have 16 months to arrive."; - scr_event_log("", "Mechanicus Mission Accepted: At least two squads of marines are expected at {_name} within 16 months.", _star.name); - new_star_event_marker("green"); - title = "Mechanicus Mission Accepted"; - option1 = ""; - option2 = ""; - cooldown = 15; - exit; + var _forge_planet = scr_get_planet_with_type(_star, "Forge"); + if (_forge_planet>0){ + var _planet = new PlanetData(_forge_planet, _star); - } - } - } + var _mission_loc = _planet.name(); + var _nearest_fleet = instance_nearest(_star.x, _star.y, obj_p_fleet); + var _mission_time = get_viable_travel_time(5, _nearest_fleet.x, _nearest_fleet.y, _star.x, _star.y, _nearest_fleet, false); - else if (mission == "mech_bionics" || mission == "mech_raider" || mission == "mech_mars"){ - if (_star != "none") { - var _forge_planet = scr_get_planet_with_type(_star, "Forge"); - var _planet = new PlanetData(_forge_planet, _star); + _planet.add_problem("mech_raider", _mission_time, { + completion: 0, + required_months :24 + }); + text = $"The Adeptus Mechanicus await your forces at {_mission_loc}. They are expecting six {obj_ini.role[100][16]}s and a Land Raider."; + scr_event_log("", $"Mechanicus Mission Accepted: Six of your {obj_ini.role[100][16]}s and a Land Raider are to be stationed at {_mission_loc} for {_mission_time} months.", _star.name); + with (_star) { + new_star_event_marker("green"); + } + title = "Mechanicus Mission Accepted"; + } else { + text = $"Error valid forge planet not found please open a bug report if seen"; + } + reset_popup_options(); +} +/// @mixin obj_popup +function accept_mechanicus_bionics_mission(){ + var _star = pop_data.star + var _forge_planet = scr_get_planet_with_type(_star, "Forge"); + if (_forge_planet>0){ + var _planet = new PlanetData(_forge_planet, _star); - if (_planet.current_owner == 3 && _forge_planet) { - var _mission_loc = _planet.name(); - if (mission == "mech_raider") { - _planet.add_problem("mech_raider", 49, { - completion: 0, - required_months :24 - }); - text = $"The Adeptus Mechanicus await your forces at {_mission_loc}. They are expecting six {obj_ini.role[100][16]}s and a Land Raider."; - scr_event_log("", $"Mechanicus Mission Accepted: Six of your {obj_ini.role[100][16]}s and a Land Raider are to be stationed at {_mission_loc} for 24 months.", _star.name); - } else if (mission == "mech_bionics") { - _planet.add_problem("mech_bionics", 49, { - completion: 0, - required_months :24 - }) - text = $"The Adeptus Mechanicus await your forces at {_mission_loc}. They are expecting ten Astartes with bionics. (Beneficial traits: Weakness of Flesh )"; - scr_event_log("", $"Mechanicus Mission Accepted: Ten Astartes with bionics are to be stationed at {_mission_loc} for 24 months for testing purposes.", _star.name); - } else if (mission == "mech_mars") { - _planet.add_problem("mech_mars", 31 ) - text = $"The Adeptus Mechanicus await your {obj_ini.role[100][16]}s at {_mission_loc}. They are willing to hold on the voyage for up to 12 months."; - scr_event_log("", $"Mechanicus Mission Accepted: {obj_ini.role[100][16]}s are expected at {_mission_loc} within 30 months, for the voyage to Mars.", _star.name); - } - with (_star) { - new_star_event_marker("green"); - } - cooldown = 15; - title = "Mechanicus Mission Accepted"; - option1 = ""; - option2 = ""; - option3 = ""; - exit; - } - } + var _mission_loc = _planet.name(); + var _nearest_fleet = instance_nearest(_star.x, _star.y, obj_p_fleet); + var _mission_time = get_viable_travel_time(5, _nearest_fleet.x, _nearest_fleet.y, _star.x, _star.y, _nearest_fleet, false); + + _planet.add_problem("mech_bionics", _mission_time, { + completion: 0, + required_months :24 + }) + text = $"The Adeptus Mechanicus await your forces at {_mission_loc}. They are expecting ten Astartes with bionics. (Beneficial traits: Weakness of Flesh )"; + scr_event_log("", $"Mechanicus Mission Accepted: Ten Astartes with bionics are to be stationed at {_mission_loc} for 24 months for testing purposes.", _star.name); + with (_star) { + new_star_event_marker("green"); } - // Other missions here - } else if ((press == 2) && (option2 != "")) { - obj_controller.cooldown = 10; - if (number != 0) { - obj_turn_end.alarm[1] = 4; + title = "Mechanicus Mission Accepted"; + } else { + text = $"Error valid forge planet not found please open a bug report if seen"; + } + reset_popup_options(); + +} + +/// @mixin obj_popup +function accept_mechanicus_mars_mission(){ + var _star = pop_data.star + var _forge_planet = scr_get_planet_with_type(_star, "Forge"); + if (_forge_planet>0){ + var _planet = new PlanetData(_forge_planet, _star); + + var _mission_loc = _planet.name(); + var _nearest_fleet = instance_nearest(_star.x, _star.y, obj_p_fleet); + var _mission_time = get_viable_travel_time(5, _nearest_fleet.x, _nearest_fleet.y, _star.x, _star.y, _nearest_fleet, false); + + _planet.add_problem("mech_bionics", _mission_time, { + completion: 0, + required_months :24 + }) + _planet.add_problem("mech_mars", _mission_time ) + text = $"The Adeptus Mechanicus await your {obj_ini.role[100][16]}s at {_mission_loc}. They are willing to hold on the voyage for up to {_mission_time} months."; + scr_event_log("", $"Mechanicus Mission Accepted: {obj_ini.role[100][16]}s are expected at {_mission_loc} within 30 months, for the voyage to Mars.", _star.name); + with (_star) { + new_star_event_marker("green"); } - instance_destroy(); - } -} \ No newline at end of file + title = "Mechanicus Mission Accepted"; + reset_popup_options(); + } else { + text = $"Error valid forge planet not found please open a bug report if seen"; + } + reset_popup_options(); +} + + + +/// @mixin obj_star +function mechanicus_mars_mission_target_time_elapsed(planet){ + var techs_taken,com,ide,ship_planet, _unit; + techs_taken=0;com=-1;ide=0;ship_planet=""; + for (com =0; com<=10;com++){ + for (ide = 0; ide-1){ + ship_planet=obj_ini.ship_location[_unit.ship_location]; + if (ship_planet=name){ + obj_ini.ship_carrying[_unit.ship_location]-=_unit.get_unit_size(); + _unit.location_string="Mechanicus Vessel"; + _unit.planet_location=0; + _unit.ship_location=-1; + _unit.job = { + type : "mechanicus mission", + } + techs_taken+=1; + } + } + } + } + } + if (techs_taken=0){ + var alert_text="Mechanicus Mission Failed: Journey to Mars Catacombs at {planet_numeral_name(planet)}."; + scr_alert("red","mission_failed",alert_text,0,0); + scr_event_log("red",alert_text); + obj_controller.disposition[3]-=10; + remove_planet_problem(planet,"mech_mars"); + } + + + else if (techs_taken>0){ + if (techs_taken>=5){ + obj_controller.disposition[3]+=max(techs_taken,4); + } + var _text=$"Mechanicus Ship departs for the Mars catacombs. Onboard are {techs_taken} of your {obj_ini.role[100][16]}s."; + scr_alert("","mission",_text,0,0); + scr_event_log("green",_text); + var flit=instance_create(x,y,obj_en_fleet); + + with (flit){ + owner = eFACTION.Mechanicus; + sprite_index=spr_fleet_mechanicus; + capital_number=1; + image_index=0; + image_speed=0; + trade_goods="mars_spelunk1"; + home_x=x; + home_y=y; + action_x=x+lengthdir_x(3000,obj_controller.terra_direction); + action_y=y+lengthdir_y(3000,obj_controller.terra_direction); + set_fleet_movement(false, "move", 48, 48); + } + + } +} + diff --git a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.yy b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.yy index 1bd7877c76..852e0288fb 100644 --- a/scripts/scr_mechanicus_missions/scr_mechanicus_missions.yy +++ b/scripts/scr_mechanicus_missions/scr_mechanicus_missions.yy @@ -5,8 +5,8 @@ "isDnD":false, "name":"scr_mechanicus_missions", "parent":{ - "name":"Scripts", - "path":"folders/Scripts.yy", + "name":"events_and_missions", + "path":"folders/Scripts/events_and_missions.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/scr_mission_eta/scr_mission_eta.gml b/scripts/scr_mission_eta/scr_mission_eta.gml index 3982d2a17e..5aa6c8cb2b 100644 --- a/scripts/scr_mission_eta/scr_mission_eta.gml +++ b/scripts/scr_mission_eta/scr_mission_eta.gml @@ -17,8 +17,10 @@ function scr_mission_eta(star_x, star_y, type=1, leeway = 10) { if (instance_exists(obj_p_fleet)){ if (type=1){ - var nearest_fleet = get_nearest_player_fleet(star_x, star_y, true); - eta1 = get_viable_travel_time(leeway, nearest_fleet.x, nearest_fleet.y, star_x, star_y, nearest_fleet, false); + var nearest_fleet = get_nearest_player_fleet(star_x, star_y); + if (nearest_fleet != "none"){ + eta1 = get_viable_travel_time(leeway, nearest_fleet.x, nearest_fleet.y, star_x, star_y, nearest_fleet, false); + } // n1=instance_nearest(x,y,obj_p_fleet); // with(n1){y-=3000;} // n2=instance_nearest(x,y,obj_p_fleet); diff --git a/scripts/scr_mission_functions/scr_mission_functions.gml b/scripts/scr_mission_functions/scr_mission_functions.gml index 495f973e98..ecd0676530 100644 --- a/scripts/scr_mission_functions/scr_mission_functions.gml +++ b/scripts/scr_mission_functions/scr_mission_functions.gml @@ -5,6 +5,15 @@ function MissionHandler(planet, system) : PlanetData(planet, system) constructor{ } + + +function location_out_of_player_control(unit_loc){ + static _locs = ["Terra", "Mechanicus Vessel", "Lost", "Mars"]; + return (array_contains(_locs,unit_loc )); +} + +#macro planet_problem_keys ["meeting_trap","meeting","succession","mech_raider","mech_bionics","mech_mars","mech_tomb1","fallen","great_crusade","harlequins","fund_elder","provide_garrison","hunt_beast","protect_raiders","join_communion","join_parade","recover_artifacts","train_forces","spyrer","inquisitor","recon","cleanse","purge","tyranid_org","artifact_loan","necron","ethereal","demon_world"] + function mission_name_key(mission){ var mission_key = { "meeting_trap" : "Chaos Lord Meeting", @@ -54,7 +63,7 @@ function scr_new_governor_mission(planet, problem = ""){ problem = choose("hunt_beast", "provide_garrison"); accept_time = 6+irandom(30); } else if (planet_type == "Hive"){ - problem = choose("Show_of_power", "provide_garrison", "purge_enemies", "raid_black_market"); + problem = choose("show_of_power", "provide_garrison", "purge_enemies", "raid_black_market"); } else if (planet_type == "Temperate"){ problem = choose("provide_garrison", "train_forces", "join_parade"); }else if (planet_type == "Shrine"){ @@ -107,15 +116,16 @@ function init_marine_acting_strange(){ } var unit = fetch_unit(marine_and_company); - var role=unit.role(); + var role = unit.role(); var text = unit.name_role(); var company_text = scr_convert_company_to_string(unit.company); if(company_text != ""){ - company_text = "("+company_text+")"; + company_text = $"({company_text})"; text += company_text; } text += " is behaving strangely."; scr_alert("color","lol",text,0,0); + scr_event_log("color",text); } function init_garrison_mission(planet, star, mission_slot){ @@ -132,11 +142,11 @@ function init_garrison_mission(planet, star, mission_slot){ gar_pop.title=$"Requested Garrison Provided to {numeral_name}"; gar_pop.text=$"The governor of {numeral_name} Thanks you for considering his request for a garrison, you agree that the garrison will remain for at least {garrison_length} months."; //pip.image="event_march" - gar_pop.option1="Commence Garrison"; + gar_pop.add_option("Commence Garrison"); gar_pop.image=""; gar_pop.cooldown=8; obj_controller.cooldown=8; - scr_event_log("",$"Garrison commited to {numeral_name} for {garrison_length} months.", target.name); + scr_event_log("",$"Garrison committed to {numeral_name} for {garrison_length} months.", star.name ); } } @@ -157,7 +167,7 @@ function init_beast_hunt_mission(planet, star, mission_slot){ gar_pop.title=$"Marines assigned to hunt beasts around {numeral_name}"; gar_pop.text=$"The govornor of {numeral_name} Thanks you for the participation of your elite warriors in your execution of such a menial task."; //pip.image="event_march" - gar_pop.option1="Happy Hunting"; + gar_pop.add_option("Happy Hunting"); gar_pop.image=""; gar_pop.cooldown=8; obj_controller.cooldown=20; @@ -168,6 +178,124 @@ function init_beast_hunt_mission(planet, star, mission_slot){ function role_compare(unit, role){ return unit.role() == obj_ini.role[100][role]; } + +function init_protect_raider_mission(squad){ + var _squad_units = squad.get_squad_structs(); + var _squad_wisdom = stat_average(_squad_units, "wisdom"); + var _squad_dex = stat_average(_squad_units, "dexterity"); + var _tester = global.character_tester; + + var _pdata = new PlanetData(selection_data.planet, selection_data.system); + var _mod = _squad_wisdom+_squad_dex/20; + if (scr_has_adv("Ambushers")){ + _mod += 10 + } + + var _leader = fetch_unit(squad.determine_leader()); + + var _wis_test = _tester.standard_test(_leader, "wisdom", _mod, ["ambush"]); + + if (!_wis_test[0]){ + var _mission_data = variable_clone(selection_data); + if (_wis_test[1] < -25){ + scr_toggle_manage(); + var gar_pop = instance_create(0, 0, obj_popup); + gar_pop.title=$"Strange Disappearance"; + gar_pop.pdata = _pdata; + gar_pop.text=$"Your Marines make planet fall and are directed to report to the governor for the duration of the operation after a period of reconnaissance dig in for their ambush. After a two weeks have passed A message from the governor reaches your astropaths that your marines have not been heard of for some time, The raiders also were not noted to have arrived onor left the planet"; + //pip.image="event_march" + var _dead_marine = array_random_index(_squad_units); + for (var i = 0;i_worst_hit){ + _worst_hit = _loyalty_hit; + _worst = i; + } + } + } + + if (_worst == -1){ + text = $"You are able to convince your captains of the strategic need to cover up the incidence, various excuses are made and fake logs that cover up the disaster of the mission" + } else { + text = $"Not all of your captains are convinced of the need to use deceit and a none have breached the order but it has soured your relations with a few namely {_caps[_worst].name_role()}" + } +} + +function protect_raiders_hold_memorial(){ + reset_popup_options(); + options1 = "continue"; + _pdata.add_disposition(-30); + text = $"You prepare to have a large public memorial for your fallen marines on the planet surface as a show of defiance. The chapter are pleased by such an act and the population of the planet are mesmerized by the spectacle. The governor is furious not only has his incompetence to deal with the planets xenos issue been made public in such a way that the sector commander has now heard about it but he perceives his failures are being paraded in font of him\n nGovernor Disposition : -30"; +} + function init_train_forces_mission(planet, star, mission_slot, marine){ var _pdata = new PlanetData(planet, star); var mission_data = _pdata.problems_data[mission_slot]; @@ -189,7 +317,7 @@ function init_train_forces_mission(planet, star, mission_slot, marine){ } //pip.image="event_march" - gar_pop.option1=$"Good luck {marine.name()}"; + gar_pop.add_option($"Good luck {marine.name()}"); gar_pop.image=""; gar_pop.cooldown=500; obj_controller.cooldown=500; @@ -257,6 +385,7 @@ function complete_train_forces_mission(targ_planet, problem_index){ var _mission_string = ""; var _trainer = collect_role_group("all",[name,targ_planet,0], false, man_conditions); if (array_length(_trainer)){ + var _unit_report_string = ""; var _tester = global.character_tester; var _wis_test_difficulty = -20; _trainer = _trainer[0]; @@ -279,14 +408,35 @@ function complete_train_forces_mission(targ_planet, problem_index){ if (_brute){ _wis_test_difficulty-=10; } + + var _leader = _trainer.has_trait("natural_leader"); + if (_leader){ + _wis_test_difficulty+=10; + } + _unit_pass = _tester.standard_test(_trainer, "wisdom",_wis_test_difficulty); if (_unit_pass[0]){ var _new_pdf = planet.recruit_pdf((_unit_pass[1]/10));//this will approximate podf improvement for the time being _mission_string += $"Training of the Pdf went well and improved the quality of the pdf as well as providing sizeable big recruitment improvement for the planet {_new_pdf} new pdf were recruited"; + if (_leader){ + var _disp_gain = 10; + planet.add_disposition(_disp_gain); + _mission_string += $"\n{_trainer.name_role()}s reputation a natural and confident leader proved well earned as he also made excellent diplomatic headway with the governor and his generals (disposition +{_disp_gain})" + } if (_siege_master){ - _mission_string += "{_trainer.name()}s trained eye as a Siege Master also allowed him to make several improvements to the planets fortifications (fortification +1)"; - + _mission_string += $"{_trainer.name()}s trained eye as a Siege Master also allowed him to make several improvements to the planets fortifications (fortification +1)"; planet.alter_fortification(1); + } else { + if (roll_dice(1, 100) > 75 && _trainer.intelligence > 45){ + _mission_string += $"{_trainer.name()} has proven themselves a great strategist when it comes to defensive structures beyond previousy known "; + var _start_stats = variable_clone(_trainer.get_stat_line()); + _trainer.add_trait("siege_master"); + var end_stat = _trainer.get_stat_line(); + var _stat_diff = compare_stats(end_stat,_start_stats); + _unit_report_string += $"{_trainer.name_role()} Has gained the trait {global.trait_list.siege_master.display_name}, {(print_stat_diffs(_stat_diff))}\n"; + _mission_string += "The new insights have allowed for minor improvements to planetary fortifications (fortification +1)"; + planet.alter_fortification(1); + } } } else { disp_loss = -5; @@ -314,7 +464,8 @@ function complete_train_forces_mission(targ_planet, problem_index){ } planet.add_disposition(disp_loss); } - scr_popup($"Training Forces on {planet_numeral_name(i)}",_mission_string,"",""); + _mission_string += $"\n{_unit_report_string}"; + scr_popup($"Training Forces on {planet.name()}",_mission_string,"",""); remove_planet_problem(targ_planet, "train_forces"); _trainer.job = "none"; } @@ -341,7 +492,7 @@ function complete_beast_hunt_mission(targ_planet, problem_index){ } for (var i=0;i50){ - var unit = obj_ini.TTRPG[com][i]; - star.p_player[planet]+=unit.get_unit_size(); - obj_ini.loc[com][i]=star.name; - unit.planet_location=planet; - techs_alive+=1; - unit.add_experience(irandom_range(3,18)); - if (roll2<80) then found_requisition+=floor(random_range(5,40))+1; - } - if (roll2>=80) and (roll2<88) then found_requisition+=100; - if (roll2>=88) and (roll2<96){ - if (obj_ini.fleet_type=ePlayerBase.home_world) then scr_add_artifact("random","",4,obj_ini.home_name,2); - if (obj_ini.fleet_type != ePlayerBase.home_world) then scr_add_artifact("random","",4,obj_ini.ship[0],501); - found_artifact+=1; - } - if (roll2>=96){ - scr_add_stc_fragment();// STC here - found_stc+=1; - } - } - } + + + var roll1=roll_dice_chapter(1, 100, "high");;// For the first STC + var found_stc=0,found_artifact=0,found_requisition=0; + var techs_lost=0, techs_alive=0; + + var _conditions = {job : "mecanicus mission"} + var _techs = collect_role_group(SPECIALISTS_TECHS, star.name, false, _conditions); + + var _tech_point_gain = 0; + + + for (var i=0;i0){ + found_requisition+=irandom_range(5,40); + } + } + if (_tech_roll>=10) and (_tech_roll<15){ + found_requisition+=100; + } + if (_tech_roll>=15) and (_tech_roll<25){ + var last_artifact = scr_add_artifact("random", "", 4); + found_artifact+=1; + } + if (_tech_roll>=25){ + scr_add_stc_fragment();// STC here + found_stc+=1; + } } + obj_controller.requisition+=found_requisition; if (techs_alive+techs_lost>=2) and (techs_alive>0){ if (roll1>=(40+(techs_alive+techs_lost)*5)){ @@ -61,21 +80,31 @@ function scr_mission_reward(mission, star, planet) { } } - var tixt;tixt="The journey into the Mars Catacombs was a success. Your "+string(techs_alive)+" remaining "+string(obj_ini.role[100][16])+"s were useful to the Mechanicus force and return with a bounty. They await retrieval at "+string(star.name)+" "+scr_roman(planet)+".#"; - tixt+="#"+string(found_requisition)+" Requisition from salvage"; - if (found_artifact!=1) then tixt+="#"+string(found_artifact)+" Unidentified Artifacts recovered"; - if (found_artifact=1) then tixt+="#"+string(found_artifact)+" Unidentified Artifact recovered"; - if (found_stc!=1) then tixt+="#"+string(found_stc)+" STC Fragments recovered"; - if (found_stc=1) then tixt+="#"+string(found_stc)+" STC Fragment recovered"; + var tixt=$"The journey into the Mars Catacombs was a success. Your {techs_alive} remaining {obj_ini.role[100][16]}s were useful to the Mechanicus force and return with a bounty. They await retrieval at {star.name} {scr_roman(planet)}.\n"; + tixt+=$"\n{found_requisition} Requisition from salvage"; + if (found_artifact > 0){ + tixt+=$"\n{string_plural("Unidentified Artifacts" ,found_artifact)} recovered"; + } + if (found_stc > 0){ + tixt+=$"\n{string_plural("STC Fragment" ,found_stc)} recovered"; + } + + if (_tech_point_gain){ + tixt+=$"\n{string_plural("Tech Point" ,_tech_point_gain)} recovered"; + } scr_popup("Mechanicus Mission Completed",tixt,"mechanicus",""); - tixt="Mechanicus Mission Completed: "+string(techs_alive)+"/"+string(techs_alive+techs_lost)+" of your "+string(obj_ini.role[100][16])+"s return with "; + tixt="Mechanicus Mission Completed: {techs_alive}/{techs_alive+techs_lost} of your {obj_ini.role[100][16]}s return with "; tixt+=string(found_requisition)+" Requisition, "; - if (found_artifact!=1) then tixt+=string(found_artifact)+" Unidentified Artifacts, "; - if (found_artifact=1) then tixt+=string(found_artifact)+" Unidentified Artifact, "; - if (found_stc!=1) then tixt+=" and "+string(found_stc)+" STC Fragments."; - if (found_stc=1) then tixt+=" and "+string(found_stc)+" STC Fragment."; - + if (found_artifact > 0){ + tixt+=$"\n{found_artifact} : {string_plural("Unidentified Artifacts" ,found_artifact)} recovered"; + } + if (found_stc > 0){ + tixt+=$"\n{found_stc} : {string_plural("STC Fragment" ,found_stc)} recovered"; + } + if (_tech_point_gain){ + tixt+=$"\n{_tech_point_gain} {string_plural("Tech Point" ,_tech_point_gain)} gained"; + } // scr_alert("green","mission",tixt,star.x,star.y,); scr_event_log("green",tixt); @@ -83,8 +112,7 @@ function scr_mission_reward(mission, star, planet) { if (found_artifact>1) then scr_event_log("",string(found_artifact)+" Artifacts recovered from Mars Catacombs."); if (found_stc=1) then scr_event_log("","STC Fragment recovered from Mars Catacombs."); if (found_stc>1) then scr_event_log("",string(found_artifact)+" STC Fragments recovered from Mars Catacombs.");*/ - - i=-1;repeat(11){i+=1;if (cleanup[i]=1){obj_controller.temp[3000]=real(i);with(obj_ini){scr_vehicle_order(obj_controller.temp[3000]);}}} + sort_all_companies_to_map(cleanup); } @@ -93,15 +121,15 @@ function scr_mission_reward(mission, star, planet) { if (mission="mech_raider"){ var roll1,result; - roll1=floor(random(100))+1;result=""; - if (scr_has_disadv("Shitty Luck")) then roll1+=20; + roll1=roll_dice_chapter(1, 100, "low") + result=""; if (roll1<=33) then result="New"; if (roll1>33) and (roll1<=66) then result="Land Raider"; if (roll1>66) then result="Requisition"; if (result="New"){ - scr_popup("Mechanicus Mission Completed","Your "+string(obj_ini.role[100][16])+" have worked with the Adeptus Mechanicus in a satisfactory manor. The testing and training went well, but your Land Raider was ultimately lost. 300 Requisition has been given to your Chapter and relations are better than before.","mechanicus",""); + scr_popup("Mechanicus Mission Completed",$"Your {obj_ini.role[100][16]} have worked with the Adeptus Mechanicus in a satisfactory manor. The testing and training went well, but your Land Raider was ultimately lost. 300 Requisition has been given to your Chapter and relations are better than before.","mechanicus",""); obj_controller.requisition+=300;obj_controller.disposition[3]+=2; var com,i,onceh;onceh=0;com=-1;i=0; repeat(11){ @@ -110,7 +138,8 @@ function scr_mission_reward(mission, star, planet) { if (obj_ini.veh_role[com][i]="Land Raider") and (obj_ini.veh_loc[com][i]=star.name) and (obj_ini.veh_wid[com][i]=planet){ onceh=1; obj_ini.veh_race[com][i]=0; - obj_ini.veh_loc[com][i]="";obj_ini.veh_name[com][i]="";obj_ini.veh_role[com][i]=""; + obj_ini.veh_loc[com][i]="";obj_ini.veh_name[com][i]=""; + obj_ini.veh_role[com][i]=""; obj_ini.veh_lid[com][i]=-1; obj_ini.veh_wid[com][i]=0; obj_ini.veh_wep1[com][i]=""; @@ -151,8 +180,8 @@ function scr_mission_reward(mission, star, planet) { if (mission="mech_bionics"){ var roll1,result; - roll1=floor(random(100))+1;result=""; - if (scr_has_disadv("Shitty Luck")) then roll1+=20; + roll1=roll_dice_chapter(1, 100, "low") + result=""; if (roll1<=33) then result="Requisition"; if (roll1>33) and (roll1<=66) then result="Bionics"; @@ -175,7 +204,7 @@ function scr_mission_reward(mission, star, planet) { cleanup[_unit.company]=1; } } - var unit; + if (result=="Bionics" || result=="Requisition"){ var _new_bionics = irandom_range(40,100); obj_controller.disposition[3]+=1; diff --git a/scripts/scr_move_unit_info/scr_move_unit_info.gml b/scripts/scr_move_unit_info/scr_move_unit_info.gml index 8345d15216..152bd83f7a 100644 --- a/scripts/scr_move_unit_info/scr_move_unit_info.gml +++ b/scripts/scr_move_unit_info/scr_move_unit_info.gml @@ -10,7 +10,6 @@ function scr_move_unit_info(start_company,end_company, start_slot, end_slot, eva } obj_ini.spe[end_company][end_slot]=obj_ini.spe[start_company][start_slot]; obj_ini.race[end_company][end_slot]=obj_ini.race[start_company][start_slot]; - obj_ini.loc[end_company][end_slot]=obj_ini.loc[start_company][start_slot]; obj_ini.name[end_company][end_slot]=obj_ini.name[start_company][start_slot]; obj_ini.wep1[end_company][end_slot]=obj_ini.wep1[start_company][start_slot]; obj_ini.role[end_company][end_slot]=obj_ini.role[start_company][start_slot]; @@ -20,15 +19,22 @@ function scr_move_unit_info(start_company,end_company, start_slot, end_slot, eva obj_ini.god[end_company][end_slot]=obj_ini.god[start_company][start_slot]; obj_ini.age[end_company][end_slot]=obj_ini.age[start_company][start_slot]; obj_ini.mobi[end_company][end_slot]=obj_ini.mobi[start_company][start_slot]; - var temp_struct = jsonify_marine_struct(start_company,start_slot); //jsonified for stransfer of struct (makes a deep copy) - obj_ini.TTRPG[end_company][end_slot] = new TTRPG_stats("chapter", end_company,end_slot ,"blank"); // create new empty unit structure - if (is_string(temp_struct)){ - obj_ini.TTRPG[end_company][end_slot].load_json_data(json_parse(temp_struct)); //load in originoal marine data - obj_ini.TTRPG[end_company][end_slot].company = end_company; - obj_ini.TTRPG[end_company][end_slot].marine_number = end_slot; - } else { + + var _temp_struct = obj_ini.TTRPG[end_company][end_slot]; + + obj_ini.TTRPG[end_company][end_slot] = obj_ini.TTRPG[start_company][start_slot]; + + obj_ini.TTRPG[start_company][start_slot] = _temp_struct; + _temp_struct.company = start_company; + _temp_struct.marine_number = start_slot; + + var _temp_struct = fetch_unit([end_company, end_slot]); + if (is_struct(_temp_struct)){ + _temp_struct.company = end_company; + _temp_struct.marine_number = end_slot; + } else { obj_ini.TTRPG[end_company][end_slot] = new TTRPG_stats("chapter", end_company,end_slot ,"blank"); } scr_wipe_unit(start_company,start_slot); -} \ No newline at end of file +} diff --git a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml index 3ceafbc4b9..566029cad3 100644 --- a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml +++ b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml @@ -6,60 +6,32 @@ function new_ork_fleet(xx,yy){ fleet.owner = eFACTION.Ork; fleet.sprite_index=spr_fleet_ork; fleet.image_index=1; - fleet.capital_number=1; - present_fleet[7] = 1; -} - -function build_new_ork_ships_to_fleet(star, planet){ - - // Increase ship number for this object? - var rando=irandom(101); - if (obj_controller.known[eFACTION.Ork]>0) then rando-=10; - var _planet_type = star.p_type[planet]; - if (_planet_type=="Forge"){ - rando-=20; - } else if (_planet_type=="Hive"){ - rando-=10; - }else if (_planet_type=="Shrine" || _planet_type=="Temperate"){ - rando-=5; - } - if (rando<=15){// was 25 - rando=choose(1,1,1,1,1,1,1,3,3,3,3); - if (capital_number<=0) then rando = 3; - if (rando=1) then capital_number+=1; - // if (rando=2) then fleet.frigate_number+=1; - if (rando=3) then escort_number+=1; - } - var ii=0; - ii+=capital_number; - ii+=round((frigate_number/2)); - ii+=round((escort_number/4)); - if (ii<=1) then ii=1; - image_index=ii; - //if big enough flee bugger off to new star - if (image_index>=5){ - instance_deactivate_object(star); - with(obj_star){ - if (is_dead_star()){ - instance_deactivate_object(id); - } else { - if (owner == eFACTION.Ork || array_contains(p_owner, eFACTION.Ork)){ - instance_deactivate_object(id); - } - } - } - var new_wagh_star = instance_nearest(x,y,obj_star); - if (instance_exists(new_wagh_star)){ - action_x=new_wagh_star.x; - action_y=new_wagh_star.y; - action = ""; - set_fleet_movement(); + fleet.capital_number = 1; + fleet.frigate_number = 1 + if (!is_struct(self)){ + if (object_index == obj_star){ + present_fleet[7] = 1; } - } - instance_activate_object(obj_star); + return fleet; } +function orks_end_turn_growth(){ + for (i=1;i<=planets;i++){ + var _pdata = new PlanetData(i, self); + if (!p_orks[i]){ + var _strongholds = _pdata.get_features(P_features.OrkStronghold); + for (var s=0;s0){ - var _allow_landing=true,ork_attack_planet=0,l=0; - - repeat(planets){ - l+=1; - if (ork_attack_planet=0) and (p_tyranids[l]>0) then ork_attack_planet=l; - } - if (ork_attack_planet>0) then p_tyranids[ork_attack_planet]-=_ork_fleet.capital_number+(_ork_fleet.frigate_number/2); - - if (p_tyranids[ork_attack_planet]<=0){ - if (planet_feature_bool(p_feature[ork_attack_planet], P_features.Gene_Stealer_Cult)){ - delete_features(p_feature[ork_attack_planet], P_features.Gene_Stealer_Cult); - adjust_influence(eFACTION.Tyranids, -25, ork_attack_planet); - var nearest_imperial = nearest_star_with_ownership(x,y,eFACTION.Imperium, self.id); - if (nearest_imperial != "none"){ - var targ_planet = scr_get_planet_with_owner(nearest_imperial,eFACTION.Imperium); - if (targ_planet==-1) then targ_planet = irandom_range(1, nearest_imperial.planets); - new_colony_fleet(self.id, ork_attack_planet, nearest_imperial.id, targ_planet, "refugee"); + var _imperial_ship = scr_orbiting_fleet([eFACTION.Imperium, eFACTION.Mechanicus]); + if (_imperial_ship == "none" && planets>0 && !has_orbiting_player_fleet()){ + var _allow_landing = true,ork_attack_planet=0,l=0; + var _planets = shuffled_planet_array(); + for (var i=0;i0){ + ork_attack_planet=l; + break; + } + } + if (ork_attack_planet>0){ + p_tyranids[ork_attack_planet] -= floor(_ork_fleet.capital_number+(_ork_fleet.frigate_number/2)); + + var _pdata = new PlanetData(ork_attack_planet, self); + + //generate refugee ships to spread tyranids + if (p_tyranids[ork_attack_planet]<=0){ + if (planet_feature_bool(p_feature[ork_attack_planet], P_features.Gene_Stealer_Cult)){ + _pdata.delete_feature(P_features.Gene_Stealer_Cult); + adjust_influence(eFACTION.Tyranids, -25, ork_attack_planet); + var nearest_imperial = nearest_star_with_ownership(x,y,eFACTION.Imperium, self.id); + if (nearest_imperial != "none"){ + var targ_planet = scr_get_planet_with_owner(nearest_imperial,eFACTION.Imperium); + if (targ_planet==-1){ + targ_planet = irandom_range(1, nearest_imperial.planets); + } + _pdata.send_colony_ship(nearest_imperial.id, targ_planet, "refugee"); + } } } } _allow_landing = !is_dead_star(); if (_allow_landing){ - for (var i=1;i<=planets;i++){ - if ((p_guardsmen[i]+p_pdf[i]+p_player[i]+p_traitors[i]+p_tau[i]>0) or ((p_owner[i]!=7) and (p_orks[i]<=0))){ - if (p_type[i]!="Dead") and (p_orks[i]<4) and (i<=planets) and (instance_exists(_ork_fleet)){ - p_orks[i]+=max(2,floor(_ork_fleet.image_index*0.8)); + for (var i=0;i0) or ((p_owner[_planet]!=7) and (p_orks[_planet]<=0))){ + if (p_type[_planet]!="Dead") and (p_orks[_planet]<4) and (i<=planets){ + p_orks[_planet]+=max(2,floor(_ork_fleet.image_index*0.8)); + var _fleet_persists = false if (fleet_has_cargo("ork_warboss",_ork_fleet)){ - array_push(p_feature[i], _ork_fleet.carg_data.ork_warboss); - p_orks[i]=6; + array_push(p_feature[_planet], _ork_fleet.cargo_data.ork_warboss); + p_orks[_planet]=6; + struct_remove(_ork_fleet.cargo_data,"ork_warboss"); + _fleet_persists = true; } - if (p_orks[i]>6) then p_orks[i]=6; - with(_ork_fleet){instance_destroy();} - aler=1; - } - } else { - var new_wagh_star = distance_removed_star(x,y, choose(2,3,4,5)); - if (instance_exists(new_wagh_star)){ - with (_ork_fleet){ - action_x=new_wagh_star.x; - action_y=new_wagh_star.y; - action = ""; - set_fleet_movement(); + if (p_orks[_planet]>6) then p_orks[_planet]=6; + if (!_fleet_persists){ + with (_ork_fleet){ + instance_destroy(); + } } + aler=1; + break; } } } } - if (aler>0) then scr_alert("green","owner",$"Ork ships have crashed across the {name} system.",x,y); + if (aler>0){ + if (!_fleet_persists){ + scr_alert("green","owner",$"Ork ships have crashed across the {name} system.",x,y); + } else { + scr_alert("green","owner",$"Ork ships Spill their ravenouss hordes accross {name} system and the green skin captains turn their guns towards the surface.",x,y); + } + } else { + var new_wagh_star = distance_removed_star(x,y, choose(2,3,4,5)); + if (instance_exists(new_wagh_star)){ + with (_ork_fleet){ + action_x=new_wagh_star.x; + action_y=new_wagh_star.y; + action = ""; + set_fleet_movement(); + } + } + } }// End _allow_landingng portion of code @@ -157,21 +154,9 @@ function ork_fleet_arrive_target(){ //TOSO provide logic for fleets to attack each other function merge_ork_fleets(){ - var _stars_with_ork_fleets = {}; - with (obj_en_fleet){ - if (!owner != eFACTION.Ork) then continue; - if (capital_number+frigate_number+escort_number <= 0){ - instance_destroy(); - continue; - } - if (is_orbiting()){ - if (struct_exists(_stars_with_ork_fleets, orbiting.name)){ - array_push(_stars_with_ork_fleets[$orbiting.name],id); - } else { - _stars_with_ork_fleets[$ orbiting.name] = [id]; - } - } - } + + var _stars_with_ork_fleets = stars_with_faction_fleets(eFACTION.Ork); + var _star_names = struct_get_names(_stars_with_ork_fleets); for (var i =0;i 45) && (waaagh_1 == 3 || override ) && obj_controller.known[eFACTION.Ork] == 0) { + scr_popup("WAAAAGH!", "The greenskins have gone unchallenged for far too long. A towering Warboss has rallied the ork hordes and halted their infighting. Now unified, the greenskins pose a dire threat to the entire sector!", "waaagh", ""); + scr_event_log("red", "Ork WAAAAGH! begins"); + obj_controller.known[eFACTION.Ork] = 0.5; + } else if ((_ork_stars_count > 0 && _ork_stars_count <= 5) && (waaagh_1 == 3 || override) && obj_controller.known[eFACTION.Ork] == 0) { + scr_popup("WAAAAGH!", "The orks are nearly defeated, but in a final desperate push, a new Warboss has mustered a fresh WAAAGH! and begun reclaiming their lost worlds.", "waaagh", ""); + scr_event_log("red", "Ork WAAAAGH! begins."); + obj_controller.known[eFACTION.Ork] = 0.5; + } else if ((_ork_stars_count >= 5 && _ork_stars_count <= 45) && (waaagh == 33 || override) && obj_controller.known[eFACTION.Ork] == 0) { + scr_popup("WAAAAGH!", "The greenskins have swelled in activity, their numbers increasing seemingly without relent. A massive Warboss has risen to take control, leading most of the sector's Orks on a massive WAAAGH!", "waaagh", ""); + scr_event_log("red", "Ork WAAAAGH! begins."); + obj_controller.known[eFACTION.Ork] = 0.5; + } else { + //if no waaagh is triggered + return; + } + + var ork_waagh_activity = []; + var _any_ork_star = []; + for (var p=0;p=2){ + array_push(ork_waagh_activity, [id,_rand_planet]); + } + } + if (p_orks[i]>0){ + array_push(_any_ork_star, [id, i]); + } + } + } + } + + var _waaagh_star_found = false; + if (array_length(ork_waagh_activity)){ + + var _waaagh_star = array_random_element(ork_waagh_activity); + _waaagh_star_found = true; + + } else if (array_length(_any_ork_star) > 0) { + var _waaagh_star = array_random_element(_any_ork_star); + _waaagh_star_found = true; + } + + if (_waaagh_star_found){ + var _pdata = new PlanetData(_waaagh_star[1], _waaagh_star[0]); + + var _boss = _pdata.add_feature(P_features.OrkWarboss); + if (override) { + _boss.player_hidden = false; + scr_event_log("red", $"boss on {_pdata.name()}", _pdata.system.name); + } + + if (_pdata.planet_forces[eFACTION.Ork] < 4) { + _pdata.add_forces(eFACTION.Ork, 2); + } + } else { + out_of_system_warboss(true); + } + + if (_waaagh_star_found) { + scr_popup("WAAAAGH!","My lord, our Auspex scans indicate that the Ork Warboss is currently within the "+string(_pdata.system.name)+" system.We must strike swiftly before he relocates. ","waaagh",""); + scr_event_log("red",$"boss on {_pdata.name()}", _pdata.system.name); + } +} + + +function out_of_system_warboss(overide = false){ + + with (obj_controller){ + // More Testing + // peace_check=2; + + var did_so=false; + + if (did_so=false) && (faction_defeated[7]=1 || known[eFACTION.Ork] == 0 || overide) { + known[eFACTION.Ork] = 0; + var _warboss = new NewPlanetFeature(P_features.OrkWarboss); + if (faction_defeated[7]=1){ + faction_defeated[7] =-1; + faction_leader[eFACTION.Ork] = _warboss.name; + faction_title[7]="Warboss"; + faction_status[eFACTION.Ork]="War"; + scr_audience(eFACTION.Ork, "new_warboss", -40,"War", 0, 2); + } else { + known[eFACTION.Ork] = 0.5; + } + + + var gold=faction_gender[7]; + if (gold=0) then gold=1; + var gnew=0; + repeat(20){ + if (gnew=0 || gnew=gold){ + gnew=choose(1,2,3,4); + } + } + faction_gender[7]=gnew; + starf=0; + + var x3 = 0,y3 = 0,fnum=0; + + var side=choose("left","right","up","down"); + if (side="left") then y3=floor(random_range(0,room_height))+1; + if (side="right"){ + y3=floor(random_range(0,room_height))+1;x3=room_width; + } + if (side="up"){ + x3=floor(random_range(0,room_width))+1; + } + if (side="down"){ + x3=floor(random_range(0,room_width))+1;y3=room_height; + } + + //lots of this can be wrapped into a single with + with(obj_star){ + if (owner = eFACTION.Eldar){ + instance_deactivate_object(id); + continue + } + if (is_dead_star() || planets==0){ + instance_deactivate_object(id); + continue + } + } + + repeat(8){ + fnum+=1; + var x4,y4,dire;x4=0;y4=0;dire=0; + if (fnum=1){ + dire=point_direction(x4,y4,room_width/2,room_height/2); + x4=x3+lengthdir_x(60,dire); + y4=y3+lengthdir_y(60,dire); + } + if (fnum>1){ + dire=point_direction(x4,y4,room_width/2,room_height/2); + x4=x3+choose(round(random_range(30,50)),round(random_range(-30,-50))); + y4=y3+choose(round(random_range(30,50)),round(random_range(-30,-50))); + } + + var _nfleet = new_ork_fleet(x4,y4); + var tplan=instance_nearest(_nfleet.x,_nfleet.y,obj_star); + _nfleet.action_x=tplan.x; + _nfleet.action_y=tplan.y; + if (fnum=1){ + starf=tplan; + _nfleet.cargo_data.ork_warboss=_warboss; + } + with (_nfleet){ + frigate_number=10; + capital_number=4; + set_fleet_movement(); + } + instance_deactivate_object(tplan.id); + + } + + instance_activate_object(obj_star); + instance_activate_object(obj_en_fleet); + + var _ork_leader = obj_controller.faction_leader[eFACTION.Ork]; + var tix=$"Warboss {_ork_leader} leads a WAAAGH! into Sector {obj_ini.sector_name}."; + scr_alert("red","lol",string(tix),starf.x,starf.y); + scr_event_log("red",tix); + scr_popup("WAAAAGH!",$"A WAAAGH! led by the Warboss {_ork_leader} has arrived in {obj_ini.sector_name}. With him is a massive Ork fleet. Numbering in the dozens of battleships, they carry with them countless greenskins. The forefront of the WAAAGH! is destined for the {starf.name} system.","waaagh",""); + } + } +} + diff --git a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.yy b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.yy index 165e7830bc..de7d1cce24 100644 --- a/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.yy +++ b/scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.yy @@ -5,8 +5,8 @@ "isDnD":false, "name":"scr_ork_fleet_functions", "parent":{ - "name":"Scripts", - "path":"folders/Scripts.yy", + "name":"fleet", + "path":"folders/Scripts/fleet.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/scr_ork_planet_functions/scr_ork_planet_functions.gml b/scripts/scr_ork_planet_functions/scr_ork_planet_functions.gml index 2bf5019be8..4c03940d98 100644 --- a/scripts/scr_ork_planet_functions/scr_ork_planet_functions.gml +++ b/scripts/scr_ork_planet_functions/scr_ork_planet_functions.gml @@ -3,76 +3,80 @@ // Check for industrial facilities // Used to not have Ice either function ork_ship_production(planet){ - if(!array_contains(["dead", "lava", "ice"], p_type[planet])){ - // Have the proppa facilities and size - if (p_orks[planet]>=4){ - var fleet=0; - contin=2; - if (instance_number(obj_en_fleet)==0) then contin=3; - if (instance_number(obj_en_fleet)>0) then contin=2; - - if (instance_exists(obj_p_fleet)){ - var nearestPlayerFleet=instance_nearest(x,y,obj_p_fleet); - if (point_distance(x,y,nearestPlayerFleet.x,nearestPlayerFleet.y)<50) and (nearestPlayerFleet.action=="") then contin=0; + if (array_contains(["dead", "lava", "ice"], p_type[planet])){ + exit; + } + // Have the proppa facilities and size + if (p_orks[planet]>=4){ + var fleet=0; + contin=2; + if (instance_number(obj_en_fleet)==0) then contin=3; + if (instance_number(obj_en_fleet)>0) then contin=2; + + if (instance_exists(obj_p_fleet)){ + var nearestPlayerFleet=instance_nearest(x,y,obj_p_fleet); + if (point_distance(x,y,nearestPlayerFleet.x,nearestPlayerFleet.y)<50) and (nearestPlayerFleet.action==""){ + exit; } - if (contin==2){ - fleet=scr_orbiting_fleet(eFACTION.Ork); - if (fleet=="none") then contin=3; - if (fleet!="none") and (contin!=3){ - rando=choose(1,1,1,1,1,2,2,2,2); - switch (rando) { - case 1: - fleet.capital_number += 1; - break; - case 2: - fleet.escort_number += 1; - break; - } + } + if (contin==2){ + fleet=scr_orbiting_fleet(eFACTION.Ork); + if (fleet=="none") then contin=3; + if (fleet!="none") and (contin!=3){ + rando=choose(1,1,1,1,1,2,2,2,2); + switch (rando) { + case 1: + fleet.capital_number += 1; + break; + case 2: + fleet.escort_number += 1; + break; + } + + if (fleet.image_index>=5){ + var nearestStar=0,targetStar=0; + var locationOk=false; - if (fleet.image_index>=5){ - var nearestStar=0,targetStar=0; - var locationOk=false; - - with(obj_star){ - if (planets==1) and (p_type[1]=="Dead") then instance_deactivate_object(instance_id_get( 0 )); - } - nearestStar=instance_nearest(fleet.x,fleet.y,obj_star); - instance_deactivate_object(nearestStar); - for(var j=0; j<10; j++){ - if (!locationOk){ - targetStar=instance_nearest(fleet.x+choose(random(400),random(400)*-1),fleet.y+choose(random(100),random(100)*-1),obj_star); - if (targetStar.owner != eFACTION.Ork) then locationOk=true; - // New code testing - if (nearestStar.owner == eFACTION.Ork) and (instance_exists(nearestStar)){ - if (nearestStar.present_fleet[7]>0){ - var fli=instance_nearest(nearestStar.x,nearestStar.y,obj_en_fleet); - if (fli.action=="") and (owner != eFACTION.Ork) and (point_distance(nearestStar.x,nearestStar.y,fli.x,fli.y)<60) then locationOk=true; - if (fli.action=="") and (owner != eFACTION.Ork) and (point_distance(nearestStar.x,nearestStar.y,fli.x,fli.y)<60) then locationOk=true; - } - }// End new code testing - - if (targetStar.planets==0) then locationOk=false; - if (targetStar.planets==1) and (targetStar.p_type[1]=="Dead") then locationOk=false; - } + with(obj_star){ + if (planets==1) and (p_type[1]=="Dead") then instance_deactivate_object(instance_id_get( 0 )); + } + nearestStar=instance_nearest(fleet.x,fleet.y,obj_star); + instance_deactivate_object(nearestStar); + for(var j=0; j<10; j++){ + if (!locationOk){ + targetStar=instance_nearest(fleet.x+choose(random(400),random(400)*-1),fleet.y+choose(random(100),random(100)*-1),obj_star); + if (targetStar.owner != eFACTION.Ork) then locationOk=true; + // New code testing + if (nearestStar.owner == eFACTION.Ork) and (instance_exists(nearestStar)){ + if (nearestStar.present_fleet[7]>0){ + var fli=instance_nearest(nearestStar.x,nearestStar.y,obj_en_fleet); + if (fli.action=="") and (owner != eFACTION.Ork) and (point_distance(nearestStar.x,nearestStar.y,fli.x,fli.y)<60) then locationOk=true; + if (fli.action=="") and (owner != eFACTION.Ork) and (point_distance(nearestStar.x,nearestStar.y,fli.x,fli.y)<60) then locationOk=true; + } + }// End new code testing + + if (targetStar.planets==0) then locationOk=false; + if (targetStar.planets==1) and (targetStar.p_type[1]=="Dead") then locationOk=false; } - fleet.action_x=targetStar.x; - fleet.action_y=targetStar.y; - fleet.alarm[4]=1;// present_fleets-=1; - instance_activate_object(obj_star); } + fleet.action_x=targetStar.x; + fleet.action_y=targetStar.y; + fleet.alarm[4]=1;// present_fleets-=1; + instance_activate_object(obj_star); } } - if (contin==3 && irandom_range(1,100)<=25){// Create a fleet - // fleet=instance_create - fleet=instance_create(x,y,obj_en_fleet); - fleet.owner = eFACTION.Ork; - fleet.sprite_index=spr_fleet_ork; - fleet.image_index=1; - fleet.capital_number=2; - // present_fleets+=1; - } + } + if (contin==3 && irandom_range(1,100)<=25){// Create a fleet + // fleet=instance_create + fleet=instance_create(x,y,obj_en_fleet); + fleet.owner = eFACTION.Ork; + fleet.sprite_index=spr_fleet_ork; + fleet.image_index=1; + fleet.capital_number=2; + // present_fleets+=1; } } + } function kill_warboss(){ diff --git a/scripts/scr_pen_And_paper/scr_pen_And_paper.gml b/scripts/scr_pen_And_paper/scr_pen_And_paper.gml index e3c9623c6b..6e13099205 100644 --- a/scripts/scr_pen_And_paper/scr_pen_And_paper.gml +++ b/scripts/scr_pen_And_paper/scr_pen_And_paper.gml @@ -1,9 +1,19 @@ function PenAndPaperSim() constructor{ + + static test_rerollable = function(unit, stat){ + if (stat == "charisma"){ + if (unit.has_trait("charismatic")){ + return true; + } + } + return false; + } static oppposed_test = function(unit1, unit2, stat,unit1_mod=0,unit2_mod=0, modifiers={}){ var stat1 = irandom(99)+1; var unit1_val = unit1[$ stat]+unit1_mod; var unit2_val = unit2[$ stat]+unit2_mod; var stat2 = irandom(99)+1; + var _reroll = test_rerollable(unit1, stat); var stat1_pass_margin, stat2_pass_margin, winner, pass_margin; //unit 1 passes test if (stat1 < unit1_val){ @@ -65,6 +75,19 @@ function PenAndPaperSim() constructor{ if (unit.has_trait("harsh_born")){ total_mod+=3; } + } else if (tag=="ambush"){ + if (scr_has_adv("Ambushers")){ + total_mod+=10; + } + if (unit.has_trait("harsh_born")){ + total_mod+=3; + } + if (unit.has_trait("cunning")){ + total_mod+=6; + } + if (unit.has_trait("brute")){ + total_mod-=6; + } } } return total_mod; @@ -73,12 +96,17 @@ function PenAndPaperSim() constructor{ static standard_test = function(unit, stat, difficulty_mod=0, tags = []){ var passed =false; var margin=0; + array_push(tags,stat); + var _reroll = test_rerollable(unit, stat); difficulty_mod+=evaluate_tags(unit, tags); var random_roll = irandom_range(1,100); - if (random_roll= unit[$ stat]+difficulty_mod){ + random_roll = irandom_range(1,100); + } + if (random_roll < unit[$ stat]+difficulty_mod){ passed = true; margin = unit[$ stat]+difficulty_mod - random_roll; - } else { + } else{ passed = false; margin = unit[$ stat]+difficulty_mod - random_roll; } @@ -111,24 +139,46 @@ function print_stat_diffs(diffs){ return _diff_string; } +/// @description repeat(x){irandom_range(1, y)} with a nice name, return sum of all rolls. +/// @param {real} dices - how many dices to roll. +/// @param {real} faces - how many faces each dice has. +/// @returns {real} +function roll_dice(dices = 1, faces = 6) { + var _total_roll = 0; + var _roll = 0; + + repeat (dices) { + _roll = irandom_range(1, faces); + + _total_roll += _roll; + } + + return _total_roll; +} /// @description Roll a custom dice, influenced by the chapter' luck, return sum of all rolls. /// @param {real} dices - how many dices to roll. /// @param {real} faces - how many faces each dice has. /// @param {real} player_benefit_at - will the player benefit from low or high rolls, for the luck logic. /// @returns {real} -function roll_dice(dices = 1, faces = 6, player_benefit_at = "none") { +function roll_dice_chapter(dices = 1, faces = 6, player_benefit_at) { var _total_roll = 0; var _roll = 0; repeat (dices) { - _roll = irandom_range(1, faces); + _roll = roll_dice(1, faces); - if (scr_has_disadv("Shitty Luck") && player_benefit_at != "none") { + if (scr_has_disadv("Shitty Luck")) { if (player_benefit_at == "high" && _roll > (faces / 2)) { - _roll = irandom_range(1, faces); + _roll = roll_dice(1, faces); } else if (player_benefit_at == "low" && _roll < (faces / 2 + 1)) { - _roll = irandom_range(1, faces); + _roll = roll_dice(1, faces); + } + } else if (scr_has_adv("Great Luck")) { + if (player_benefit_at == "high" && _roll < (faces / 2 + 1)) { + _roll = roll_dice(1, faces); + } else if (player_benefit_at == "low" && _roll > (faces / 2)) { + _roll = roll_dice(1, faces); } } @@ -144,7 +194,7 @@ function roll_dice(dices = 1, faces = 6, player_benefit_at = "none") { /// @param {real} player_benefit_at - will the player benefit from low or high rolls, for the luck logic. /// @param {struct} unit - unit struct. /// @returns {real} -function roll_personal_dice(dices = 1, faces = 6, player_benefit_at = "none", unit) { +function roll_dice_unit(dices = 1, faces = 6, player_benefit_at, unit) { var _total_roll = 0; var _roll = 0; @@ -157,9 +207,9 @@ function roll_personal_dice(dices = 1, faces = 6, player_benefit_at = "none", un if (luck_chance <= unit.luck) { if (player_benefit_at == "high" && _roll > (faces / 2)) { - _roll = irandom_range(1, faces); + _roll = roll_dice(1, faces); } else if (player_benefit_at == "low" && _roll < (faces / 2 + 1)) { - _roll = irandom_range(1, faces); + _roll = roll_dice(1, faces); } } } @@ -170,3 +220,14 @@ function roll_personal_dice(dices = 1, faces = 6, player_benefit_at = "none", un return _total_roll; } + +function stat_average(units, stat){ + var _tally = 0; + for (var i=0;i 0) { repeat (6) { var t = irandom(men - 1); // Random value from 0 to men-1 @@ -38,7 +38,7 @@ function scr_perils_table(perils_strength, unit, psy_discipline, power_name, uni [ 20, function(perils_strength, unit, psy_discipline, power_name, unit_id) { - unit.add_or_sub_health(roll_dice(1, 50, "low") * -1); + unit.add_or_sub_health(roll_dice_chapter(1, 50, "low") * -1); switch (psy_discipline) { case "biomancy": var flavour_text2 = "The psychic blast he had prepared runs loose, boiling his own blood!"; @@ -60,7 +60,7 @@ function scr_perils_table(perils_strength, unit, psy_discipline, power_name, uni 30, function(perils_strength, unit, psy_discipline, power_name, unit_id) { marine_casting_cooldown[unit_id] += 20; - unit.corruption += roll_dice(1, 6, "low"); + unit.corruption += roll_dice_chapter(1, 6, "low"); var flavour_text2 = $"His mind is seared by the warp, now unable to cast more powers for {marine_casting_cooldown[unit_id]} hours."; return flavour_text2; } @@ -69,13 +69,13 @@ function scr_perils_table(perils_strength, unit, psy_discipline, power_name, uni 40, function(perils_strength, unit, psy_discipline, power_name, unit_id) { var flavour_text2 = "Capricious voices eminate from the surrounding area, whispering poisonous lies and horrible truths."; - unit.corruption += roll_dice(1, 10, "low"); + unit.corruption += roll_dice_chapter(1, 10, "low"); if (men > 0) { repeat (6) { var t = irandom(men - 1); // Random value from 0 to men-1 if (marine_type[t] != "") { var _ally = unit_struct[t]; - _ally.corruption += roll_dice(1, 10, "low"); + _ally.corruption += roll_dice_chapter(1, 10, "low"); } } } @@ -138,12 +138,12 @@ function scr_perils_table(perils_strength, unit, psy_discipline, power_name, uni 60, function(perils_strength, unit, psy_discipline, power_name, unit_id) { var flavour_text2 = "There is a massive explosion of warp energy which injures him and several other marines!"; - unit.add_or_sub_health(roll_dice(1, 50, "low") * -1); + unit.add_or_sub_health(roll_dice_chapter(1, 50, "low") * -1); if (men > 0) { repeat (6) { var t = irandom(men - 1); // Random value from 0 to men-1 if (marine_type[t] != "") { - marine_hp[t] -= roll_dice(1, 50, "low"); + marine_hp[t] -= roll_dice_chapter(1, 50, "low"); } } } @@ -161,17 +161,17 @@ function scr_perils_table(perils_strength, unit, psy_discipline, power_name, uni [ 80, function(perils_strength, unit, psy_discipline, power_name, unit_id) { - unit.add_or_sub_health(roll_dice(5, 10, "low") * -1); + unit.add_or_sub_health(roll_dice_chapter(5, 10, "low") * -1); if (men > 0) { repeat (6) { var t = irandom(men - 1); // Random value from 0 to men-1 if (marine_type[t] != "") { - marine_hp[t] -= roll_dice(1, 50, "low"); + marine_hp[t] -= roll_dice_chapter(1, 50, "low"); } } } - unit.alter_equipment({wep1: "", wep2: "", armour: "", gear: "", mobi: ""}, false, false); - var flavour_text2 = "A massive shockwave eminates from the marine, who is knocked out cold! All of his equipment is destroyed!"; + unit.add_equipment_repairs(EquipmentSlot.ALL); + var flavour_text2 = "A massive shockwave eminates from the marine, who is knocked out cold! All of his equipment is damaged!"; return flavour_text2; } ], @@ -180,7 +180,7 @@ function scr_perils_table(perils_strength, unit, psy_discipline, power_name, uni function(perils_strength, unit, psy_discipline, power_name, unit_id) { var flavour_text2; marine_casting_cooldown[unit_id] += 999; - unit.corruption += roll_dice(5, 10, "low"); + unit.corruption += roll_dice_chapter(5, 10, "low"); flavour_text2 = "The marine's flesh begins to twist and rip, seemingly turning inside out. His form looms up, and up, and up. Within seconds a Greater Daemon of "; var dem = choose("Slaanesh", "Nurgle", "Tzeentch"); diff --git a/scripts/scr_planetary_feature/scr_planetary_feature.gml b/scripts/scr_planetary_feature/scr_planetary_feature.gml index 1f10a50cde..a793501f93 100644 --- a/scripts/scr_planetary_feature/scr_planetary_feature.gml +++ b/scripts/scr_planetary_feature/scr_planetary_feature.gml @@ -11,7 +11,7 @@ enum P_features { OrkWarboss, Warlord10, Special_Force, - World_Eaters, + ChaosWarband, Webway, Secret_Base, Starship, @@ -26,11 +26,11 @@ enum P_features { Forge, Gene_Stealer_Cult, Mission, - Ork_Stronghold + OrkStronghold }; -enum base_type{ +enum base_types{ Lair, } @@ -51,7 +51,7 @@ function NewPlanetFeature(feature_type, other_data={}) constructor{ } } switch(f_type){ - case P_features.Gene_Stealer_Cult: + case P_features.Gene_Stealer_Cult: PDF_control = 0; sealed = 0; player_hidden = 1; @@ -68,7 +68,7 @@ function NewPlanetFeature(feature_type, other_data={}) constructor{ break; case P_features.Secret_Base: - base_type = 0; + base_type = base_types.Lair; inquis_hidden =1; planet_display = "Hidden Secret Base"; player_hidden = 0; @@ -141,8 +141,15 @@ function NewPlanetFeature(feature_type, other_data={}) constructor{ break; case P_features.OrkWarboss: player_hidden = 1; - planet_display= "Ork Warboss"; + planet_display = "Ork Warboss"; Warboss = "alive"; + name = global.name_generator.generate_ork_name(); + turns_static = 0; + break; + case P_features.OrkStronghold: + player_hidden = 1; + planet_display= "Ork Stronghold"; + tier = 1; break; case P_features.Monastery: planet_display="Fortress Monastary"; @@ -156,10 +163,19 @@ function NewPlanetFeature(feature_type, other_data={}) constructor{ recruit_type = 0; recruit_cost = 0; break; + case P_features.ChaosWarband: + if !(struct_exists(other_data, "patron")){ + patron = choose("slaanesh", "tzeentch", "khorne", "nurgle", "undivided"); + } else { + self.patron = other_data.patron; + } default: player_hidden = 1; planet_display = 0; } + if (global.cheat_debug){ + player_hidden = 0; + } static load_json_data = function(data){ var names = variable_struct_get_names(data); for (var i = 0; i < array_length(names); i++) { @@ -167,7 +183,15 @@ function NewPlanetFeature(feature_type, other_data={}) constructor{ } } } +function move_feature_to_fleet(planet, feature_slot, fleet, cargo_key){ + var _feat = p_feature[planet][feature_slot]; + array_delete(p_feature[planet], feature_slot, 1); + fleet.cargo_data[$ cargo_key] = _feat; +} +function move_feature_to_planet(cargo_key, star, planet){ + +} // returns an array of all the positions that a certain planet feature occurs on th p_feature array of a planet // this works for both planet_Features and planet upgrades function search_planet_features(planet, search_feature){ @@ -196,6 +220,7 @@ function return_planet_features(planet, search_feature){ return feature_positions; } + // returns 1 if dearch feature is on at least one planet in system returns 0 is search feature is not found in system function system_feature_bool(system, search_feature){ var sys_bool = 0; @@ -239,7 +264,7 @@ function delete_features(planet, del_feature){ // returns 1 if an awake necron tomb iin system -function awake_necron_Star(star){ +function awake_necron_star(star){ for(var i = 1; i <= star.planets; i++){ if(awake_tomb_world(star.p_feature[i]) == 1) { @@ -365,3 +390,725 @@ function create_starship_event(){ scr_event_log("","Ancient Starship discovered on "+string(star.name)+" "+scr_roman(planet)+".", star.name); } } + + + +function ground_mission_leave_it_function(){ + // Not worth it, mang + obj_controller.menu = 0; + obj_controller.managing = 0; + obj_controller.cooldown = 10; + with (obj_ground_mission) { + instance_destroy(); + } + instance_destroy(); +} + +/// @mixin PlanetData +function discover_artifact_popup(feature){ + obj_controller.menu = MENU.Default; + /*if ((planet_type == "Dead" || current_owner == eFACTION.Player)) { + alarm[4] = 1; + exit; + }*/ + + var pop = instance_create(0, 0, obj_popup); + pop.image = "artifact"; + pop.title = "Artifact Located"; + pop.text = $"The Artifact has been located upon {name()}; its condition and class are unlikely to be determined until returned to the ship. What is thy will?"; + pop.target_comp = current_owner; + + if ((origional_owner == 3) && (current_owner > 5)) { + if (pdf > 0) { + current_owner = eFACTION.Mechanicus; + } + } + + var _take_arti = { + str1 : "Swiftly take the Artifact", + choice_func : ground_forces_collect_artifact + } + if ((current_owner >= eFACTION.Tyranids) || ((current_owner == eFACTION.Ork) && (pdf <= 0))) { + pop.add_option([{ + str1 : "Let it be", + choice_func : ground_mission_leave_it_function, + }, _take_arti]); + } else { + var _opt1 = "Request audience with the "; + switch (current_owner) { + case eFACTION.Player: + case eFACTION.Imperium: + _opt1 += "Planetary Governor"; + pop.add_option({ + str1: "Gift the Artifact to the Sector Commander.", + choice_func : function(){ + gift_artifact(eFACTION.Imperium, false); + instance_destroy(); + }, + }); + break; + case eFACTION.Mechanicus: + _opt1 += "Mechanicus"; + pop.add_option({str1 : "Let it be. The Mechanicus' wrath is not lightly provoked.", choice_func : ground_mission_leave_it_function,}); + break; + case eFACTION.Inquisition: + _opt1 += "Inquisition"; + pop.add_option({choice_func : ground_mission_leave_it_function, str1 : "Let it be. The Inquisition's wrath is not lightly provoked."}); + break; + case eFACTION.Ecclesiarchy: + _opt1 += "Ecclesiarchy"; + pop.add_option({ + str1 : "Gift the Artifact to the Ecclesiarchy.", + choice_func : function(){ + gift_artifact(eFACTION.Ecclesiarchy, false); + instance_destroy(); + }, + }); + break; + case eFACTION.Eldar: + _opt1 += "Eldar"; + pop.add_option({ + str1 : "Gift the Artifact to the Eldar.", + choice_func : function(){ + gift_artifact(eFACTION.Eldar, false); + instance_destroy(); + }, + }); + break; + case eFACTION.Tau: + _opt1 += "Tau"; + pop.add_option({ + str1 : "Gift the Artifact to the Tau Empire.", + choice_func : function(){ + gift_artifact(eFACTION.Tau, false); + instance_destroy(); + }, + }); + break; + } + _opt1 += " regarding the Artifact."; + pop.add_option([ + { + str1 : _opt1, + choice_func : governor_negotiate_artifact + }, + _take_arti + ]); + } +} + +/// @mixin obj_star_select +function planet_selection_action(){ + var xx=__view_get( e__VW.XView, 0 )+0; + var yy=__view_get( e__VW.YView, 0 )+0; + if (instance_exists(target)){ + if (loading){ + obj_controller.selecting_planet = 0; + } + for (var i = 0;i 0) { + pop.text = $"{_text}. The present Tech Priests stress they will not condone a mission to steal the STC Fragment."; + } else if (techies > 0) { + pop.text = $"{_text}. Taking it may be seen as an act of war. What is thy will?"; + pop.add_option({str1 : "Attempt to steal the STC Fragment.", choice_func:remove_stc_from_planet}); // TODO: Fix this option, as it crashes the game when the battle starts); + } else { + pop.text = $"{_text}. Taking it may be seen as an act of war. The ground team has no Techmarines, so you have no choice but to leave it be."; + } + } else { + + var _text = $"An STC Fragment appears to be located upon {name()}" + if (techies > 0){ + array_push(options, {str1 : "Swiftly take the STC Fragment.", choice_func:remove_stc_from_planet}); + if (mechanicus_reps == 0){ + pop.text = $"{_text}; what it might contain is unknown. Your {obj_ini.role[100][16]}s wish to reclaim, identify, and put it to use immediately. What is thy will?"; + } else { + pop.text = $"{_text}. Your {obj_ini.role[100][16]}s wish to reclaim, identify, and put it to use immediately, and the Tech Priests wish to send it to the closest forge world. What is thy will?"; + } + } else if (mechanicus_reps > 0){ + pop.text = $"{_text}; what it might contain is unknown. The present Tech Priests wish to send it to Mars, and refuse to take the device off-world otherwise."; + } else{ + pop.text = $"{_text}; what it might contain is unknown. The ground team has no {obj_ini.role[100][16]}s or Tech Priests, so you have no choice but to leave it be or notify the Mechanicus about its location."; + } + + array_push(options, {str1 : "Send it to the Adeptus Mechanicuss.", choice_func : send_stc_to_adeptus_mech}); + } + array_push(options,{str1: "Leave it.", + choice_func : ground_mission_leave_it_function + }); + + pop.add_option(options); +} + +/// @mixin PlanetData +function check_for_artifact_grab_mission(){ + + if (has_feature(P_features.Artifact)){ + + var artifact=instance_create(system.x,system.y,obj_ground_mission);// Unloading / artifact crap + artifact.num=planet; + artifact.loc=obj_controller.selecting_location; + artifact.managing=obj_controller.managing; + artifact.pdata = self; + with (artifact){ + setup_planet_mission_group(); + } + discover_artifact_popup(get_features(P_features.Artifact)[0]); + } +} + + + + +/// @mixin obj_ground_mission +function ground_forces_collect_artifact(){ + with (obj_ground_mission){ + scr_return_ship(pdata.system.name,self,pdata.planet); + + var man_size,ship_id,comp,i; + i=0;ship_id=0;man_size=0;comp=0; + ship_id = get_valid_player_ship("", loc); + + var last_artifact = scr_add_artifact("random","random",4,loc,ship_id+500); + + var i=0; + + + var mission="bad"; + var mission_roll=irandom(100)+1; + if (scr_has_adv("Ambushers")) then mission_roll-=15; + if (mission_roll<=60) then mission="good";// 135 + if (pdata.planet_type="Dead") then mission="good"; + // mission="bad"; + + var pop; + pop=instance_create(0,0,obj_popup); + pop.image="artifact_recovered"; + pop.title="Artifact Recovered!"; + + if (mission="good"){ + pop.text=$"Your marines quickly converge upon the Artifact and remove it, before local forces have any idea of what is happening.##"; + pop.text+=$"It has been stowed away upon {loc}. It appears to be a {obj_ini.artifact[last_artifact]} but should be brought home and identified posthaste."; + scr_event_log("","Artifact has been forcibly recovered."); + + if (pdata.planet_type!="Dead"){ + if (pdata.current_owner=2) then obj_controller.disposition[2]-=1; + if (pdata.current_owner=eFACTION.Mechanicus) then obj_controller.disposition[3]-=10;// max(obj_controller.disposition/4,10) + if (pdata.current_owner=4) then obj_controller.disposition[4]-=max(obj_controller.disposition[4]/4,10); + if (pdata.current_owner=5) then obj_controller.disposition[5]-=3; + if (pdata.current_owner=8) then obj_controller.disposition[8]-=3; + } + } + if (mission="bad"){ + pop.text="Your marines converge upon the Artifact; resistance is light and easily dealt with. After a brief firefight the Artifact is retrieved.##"; + pop.text+=$"It has been stowed away upon {loc}. It appears to be a "+string(obj_ini.artifact[last_artifact])+" but should be brought home and identified posthaste."; + scr_event_log("red","Artifact forcibly recovered. Collateral damage is caused."); + + if (pdata.current_owner=2) then obj_controller.disposition[2]-=2; + if (pdata.current_owner=eFACTION.Mechanicus) then obj_controller.disposition[3]-=max(obj_controller.disposition[3]/3,20); + if (pdata.current_owner=4) then obj_controller.disposition[4]-=max(obj_controller.disposition[4]/3,20); + if (pdata.current_owner=5) then obj_controller.disposition[5]-=max(obj_controller.disposition[3]/4,15); + if (pdata.current_owner=6) then obj_controller.disposition[6]-=15; + if (pdata.current_owner=8) then obj_controller.disposition[8]-=8; + + if (pdata.current_owner>=3 && pdata.current_owner<=6){ + scr_audience(pdata.current_owner, "artifact_angry",); + } + } + + + if (scr_has_adv("Tech-Scavengers")){ + + var ex1="",ex1_num=0,ex2="",ex2_num=0,ex3="",ex3_num=0; + + var stah=instance_nearest(x,y,obj_star); + + if (pdata.origional_owner==2){ + ex1="Meltagun"; + ex1_num=choose(2,3,4); + ex2="Flamer"; + ex2_num=choose(2,3,4); + ex3=choose("Power Fist","Chainsword","Bolt Pistol"); + ex3_num=choose(2,3,4,5); + } + if (pdata.origional_owner==3){ + ex1="Plasma Pistol"; + ex1_num=choose(1,2); + ex2="Power Armour"; + ex2_num=choose(2,3,4); + ex3=choose("Servo-arm","Bionics"); + ex3_num=choose(2,3,4); + } + if (pdata.origional_owner==5){ + ex1="Flamer"; + ex1_num=choose(3,4,5,6); + ex2="Heavy Flamer"; + ex2_num=choose(1,2,3); + ex3=choose("Chainsword","Bolt Pistol"); + ex3_num=choose(2,3,4,5); + } + + if (ex1!=""){ + pop.text+="##While they're at it your Battle Brothers also find "; + if (ex1_num>0){ + pop.text+=string(ex1_num)+" "+string(ex1); + } + if (ex2_num>0){ + pop.text+=", "+string(ex2_num)+" "+string(ex2); + } + if (ex3_num>0){ + pop.text+=", and "+string(ex3_num)+" "+string(ex3); + } + pop.text+="."; + scr_add_item(ex1,ex1_num); + scr_add_item(ex2,ex2_num); + scr_add_item(ex3,ex3_num); + } + } + + + with(obj_star_select){instance_destroy();} + with(obj_fleet_select){instance_destroy();} + pdata.delete_feature(P_features.Artifact) + + corrupt_artifact_collectors(last_artifact); + + obj_controller.trading_artifact=0; + clear_diplo_choices(); + obj_controller.menu=0; + instance_destroy(); + } +} + +function governor_negotiate_artifact(){ + with (obj_ground_mission){ + if (pdata.current_owner == 2){ + scr_return_ship(pdata.system.name,self,pdata.planet); + + var i=0; + var ship_id = get_valid_player_ship("", loc); + + i=0; + plan=instance_nearest(x,y,obj_star); + var last_artifact = scr_add_artifact("random","random",4,pdata.system.name,ship_id+500); + + obj_popup.image="artifact_recovered"; + obj_popup.title="Artifact Recovered!"; + obj_popup.text=$"The Planetary Governor hands over the Artifact without asking for compensation.##It has been safely stowed away upon {loc}. It appears to be a {obj_ini.artifact[last_artifact]} but should be brought home and identified posthaste."; + with(obj_star_select){instance_destroy();} + with(obj_fleet_select){instance_destroy();} + pdata.delete_feature(P_features.Artifact); + with(obj_popup){ + reset_popup_options(); + } + scr_event_log("","Planetary Governor hands over Artifact."); + + corrupt_artifact_collectors(last_artifact); + + obj_controller.trading_artifact=0; + instance_destroy(); + } else { + scr_toggle_diplomacy(); + obj_controller.cooldown = 10; + obj_controller.diplomacy = pdata.current_owner; + obj_controller.trading_artifact = 1; + with (obj_controller) { + scr_dialogue("artifact"); + } + instance_destroy(); + instance_destroy(obj_popup); + } + } + +} + + +function remove_stc_from_planet(){ + with (obj_ground_mission){ + var comp,plan,i;i=0;comp=0;plan=0; + plan=instance_nearest(x,y,obj_star); + + var mission,mission_roll; + + var mission="bad"; + var mission_roll=floor(random(100))+1; + + + if (scr_has_adv("Ambushers")) then mission_roll-=15; + if (pdata.current_owner=eFACTION.Mechanicus) then mission_roll+=20; + if (mission_roll<=60) then mission="good";// 135 + if (pdata.planet_type="Dead"){ + mission="good"; + } + // mission="bad"; + + var pop; + pop=instance_create(0,0,obj_popup); + pop.image="artifact_recovered"; + pop.title="STC Recovered!"; + + if (pdata.origional_owner!=3 || pdata.planet_type!="Forge"){ + pop.text="Your forces descend beneath the surface of the planet, delving deep into an ancient tomb. Automated defenses and locks are breached.##"; + pop.text+="The STC Fragment has been safely stowed away, and is ready to be decrypted or gifted at your convenience."; + scr_return_ship(pdata.system.name,self,pdata.planet); + } + + + + if (mission == "good" && pdata.origional_owner == 3 && pdata.planet_type == "Forge"){ + pop.text="Your forces descend into the vaults of the Mechanicus Forge, bypassing sentries, automated defenses, and blast doors on the way.##"; + pop.text+="The STC Fragment has been safely recovered and stowed away. It is ready to be decrypted or gifted at your convenience."; + + /*if (pdata.planet_type!="Dead"){ + if (pdata.current_owner=2) then obj_controller.disposition[2]-=1; + if (pdata.current_owner=eFACTION.Mechanicus) then obj_controller.disposition[3]-=10;// max(obj_controller.disposition/4,10) + if (pdata.current_owner=4) then obj_controller.disposition[4]-=max(obj_controller.disposition[4]/4,10); + if (pdata.current_owner=5) then obj_controller.disposition[5]-=3; + if (pdata.current_owner=8) then obj_controller.disposition[8]-=3; + }*/ + scr_return_ship(pdata.system.name,self,pdata.planet); + } + if (mission="bad" && pdata.origional_owner=eFACTION.Mechanicus && pdata.planet_type="Forge"){ + /*pop.text="Your marines converge upon the STC Fragment; resistance is light and easily dealt with. After a brief firefight it is retrieved.##"; + pop.text+="The fragment been safely stowed away, and is ready to be decrypted or gifted at your convenience."; + + */ + + pop.image="thallax"; + pop.text="Your forces descend into the vaults of the Mechanicus Forge. Sentries, automated defenses, and blast doors stand in their way.##"; + pop.text+="Half-way through the mission a small army of Praetorian Servitors and Skitarii bear down upon your men. The Mechanicus guards seem to be upset."; + + /*if (pdata.current_owner=2) then obj_controller.disposition[2]-=2;*/ + if (pdata.current_owner=eFACTION.Mechanicus){obj_controller.disposition[3]-=40;} + /*if (pdata.current_owner=4) then obj_controller.disposition[4]-=max(obj_controller.disposition[4]/3,20); + if (pdata.current_owner=5) then obj_controller.disposition[5]-=max(obj_controller.disposition[3]/4,15); + if (pdata.current_owner=6) then obj_controller.disposition[6]-=15; + if (pdata.current_owner=8) then obj_controller.disposition[8]-=8;*/ + + if (pdata.current_owner>3 && pdata.current_owner<=6){ + scr_audience(pdata.current_owner, "artifact_angry",); + } + if (pdata.current_owner=eFACTION.Mechanicus && obj_controller.faction_status[eFACTION.Mechanicus]!="War"){ + scr_audience(pdata.current_owner, "declare_war", -20); + } + + // Start battle + pop.battle_special=3.1; + obj_controller.trading_artifact=0; + clear_diplo_choices(); + obj_controller.menu=0; + + pop.loc=pdata.system.name; + pop.planet=pdata.planet; + + exit; + } + + + if (scr_has_adv("Tech-Scavengers")){ + var ex1,ex1_num,ex2,ex2_num,ex3,ex3_num; + ex1="";ex1_num=0;ex2="";ex2_num=0;ex3="";ex3_num=0; + + var stah;stah=instance_nearest(x,y,obj_star); + + if (pdata.origional_owner=2){ + ex1="Meltagun"; + ex1_num=choose(2,3,4); + ex2="Flamer"; + ex2_num=choose(2,3,4); + ex3=choose("Power Fist","Chainsword","Bolt Pistol"); + ex3_num=choose(2,3,4,5); + } + if (pdata.origional_owner=eFACTION.Mechanicus){ + ex1="Plasma Pistol"; + ex1_num=choose(1,2); + ex2="Power Armour"; + ex2_num=choose(2,3,4); + ex3=choose("Servo-arm","Bionics"); + ex3_num=choose(2,3,4); + } + if (pdata.origional_owner=5){ + ex1="Flamer";ex1_num=choose(3,4,5,6); + ex2="Heavy Flamer";ex2_num=choose(1,2,3); + ex3=choose("Chainsword","Bolt Pistol"); + ex3_num=choose(2,3,4,5); + } + + if (ex1!=""){ + pop.text+="##While they're at it your Battle Brothers also find "; + if (ex1_num>0) then pop.text+=string(ex1_num)+" "+string(ex1); + if (ex2_num>0) then pop.text+=", "+string(ex2_num)+" "+string(ex2); + if (ex3_num>0) then pop.text+=", and "+string(ex3_num)+" "+string(ex3); + pop.text+="."; + scr_add_item(ex1,ex1_num); + scr_add_item(ex2,ex2_num); + scr_add_item(ex3,ex3_num); + } + } + + + with(obj_star_select){instance_destroy();} + with(obj_fleet_select){instance_destroy();} + pdata.delete_feature(P_features.STC_Fragment); + scr_add_stc_fragment();// STC here + + + obj_controller.trading_artifact=0; + clear_diplo_choices(); + obj_controller.menu=0; + instance_destroy(); + + /* */ + /* */ + } + instance_destroy(); +} + +function recieve_artifact_in_discussion(){ + + scr_return_ship(loc,self,num); + + var man_size,comp,plan,i; + i=0;man_size=0;comp=0;plan=0; + var ship_id = get_valid_player_ship("", loc); + plan=instance_nearest(x,y,obj_star); + var last_artifact = scr_add_artifact("random","random",4,loc,ship_id+500); + + var pop=instance_create(0,0,obj_popup); + pop.image="artifact_recovered"; + pop.title="Artifact Recovered!"; + pop.text=$"The Artifact has been safely stowed away upon {loc}. It appears to be a {obj_ini.artifact[last_artifact]} but should be brought home and identified posthaste."; + with(obj_star_select){instance_destroy();} + with(obj_fleet_select){instance_destroy();} + delete_features(plan.p_feature[num], P_features.Artifact); + scr_event_log("","Artifact recovered."); + + corrupt_artifact_collectors(last_artifact); + + obj_controller.trading_artifact=0; + clear_diplo_choices(); + instance_destroy(); + + +} + + +function send_stc_to_adeptus_mech(){ + with (obj_ground_mission){ + var _target_planet; + _target_planet = instance_nearest(x, y, obj_star); + pdata.delete_feature(P_features.STC_Fragment); + + scr_return_ship(pdata.system.name, self, pdata.planet); + + with (obj_star_select) { + instance_destroy(); + } + with (obj_fleet_select) { + instance_destroy(); + } + + scr_toggle_diplomacy(); + obj_controller.diplomacy = 3; + obj_controller.force_goodbye = 5; + + if (obj_controller.disposition[3] <= 10) { + obj_controller.disposition[3] += 5; + } + if ((obj_controller.disposition[3] > 10) && (obj_controller.disposition[3] <= 30)) { + obj_controller.disposition[3] += 7; + } + if ((obj_controller.disposition[3] > 30) && (obj_controller.disposition[3] <= 50)) { + obj_controller.disposition[3] += 9; + } + if (obj_controller.disposition[3] > 50) { + obj_controller.disposition[3] += 11; + } + + with (obj_controller) { + scr_dialogue("stc_thanks"); + } + + with (obj_temp2) { + instance_destroy(); + } + with (obj_temp7) { + instance_destroy(); + } + + if (obj_ini.fleet_type == ePlayerBase.home_world) { + with (obj_star) { + if ((owner == eFACTION.Player) && ((p_owner[1] == 1) || (p_owner[2] == eFACTION.Player))) { + instance_create(x, y, obj_temp2); + } + } + } + if (obj_ini.fleet_type != ePlayerBase.home_world) { + with (obj_p_fleet) { + // Get fleet star system + if ((capital_number > 0) && (action == "")) { + instance_create(instance_nearest(x, y, obj_star).x, instance_nearest(x, y, obj_star).y, obj_temp2); + } + if ((frigate_number > 0) && (action == "")) { + instance_create(instance_nearest(x, y, obj_star).x, instance_nearest(x, y, obj_star).y, obj_temp7); + } + } + } + + if (obj_ini.fleet_type != ePlayerBase.home_world) { + with (obj_p_fleet) { + if (action == "") { + instance_deactivate_object(instance_nearest(x, y, obj_star)); + } + } + } + + + var _enemy_fleet; + var _target = -1; + + if (instance_exists(obj_temp2)) { + _target = nearest_star_with_ownership(obj_temp2.x, obj_temp2.y, obj_controller.diplomacy); + } else if (instance_exists(obj_temp7)) { + _target = nearest_star_with_ownership(obj_temp7.x, obj_temp7.y, obj_controller.diplomacy); + } else if ((!instance_exists(obj_temp2)) && (!instance_exists(obj_temp7)) && instance_exists(obj_p_fleet) && (obj_ini.fleet_type == ePlayerBase.home_world)) { + // If player fleet is flying about then get their target for new target + with (obj_p_fleet) { + var pop; + if ((capital_number > 0) && (action != "")) { + pop = instance_create(action_x, action_y, obj_temp2); + pop.action_eta = action_eta; + } + if ((frigate_number > 0) && (action != "")) { + pop = instance_create(action_x, action_y, obj_temp7); + pop.action_eta = action_eta; + } + } + } + + if (is_struct(_target)) { + _enemy_fleet = instance_create(_target.x, _target.y, obj_en_fleet); + + _enemy_fleet.owner = obj_controller.diplomacy; + _enemy_fleet.home_x = _target.x; + _enemy_fleet.home_y = _target.y; + _enemy_fleet.sprite_index = spr_fleet_mechanicus; + + _enemy_fleet.image_index = 0; + _enemy_fleet.capital_number = 1; + _enemy_fleet.trade_goods = "Requisition!500!|"; + + if (obj_ini.fleet_type != ePlayerBase.home_world) { + if (instance_exists(obj_temp2)) { + _enemy_fleet.action_x = obj_temp2.x; + _enemy_fleet.action_y = obj_temp2.y; + _enemy_fleet.target = instance_nearest(_enemy_fleet.action_x, _enemy_fleet.action_y, obj_p_fleet); + } + if ((!instance_exists(obj_temp2)) && instance_exists(obj_temp7)) { + _enemy_fleet.action_x = obj_temp7.x; + _enemy_fleet.action_y = obj_temp7.y; + _enemy_fleet.target = instance_nearest(_enemy_fleet.action_x, _enemy_fleet.action_y, obj_p_fleet); + } + } + if (obj_ini.fleet_type == ePlayerBase.home_world) { + _target = instance_nearest(_enemy_fleet.x, _enemy_fleet.y, obj_temp2); + _enemy_fleet.action_x = _target.x; + _enemy_fleet.action_y = _target.y; + } + + with(_enemy_fleet){ + set_fleet_movement(); + } + } + + instance_activate_all(); + with (obj_temp2) { + instance_destroy(); + } + with (obj_temp7) { + instance_destroy(); + } + instance_destroy(); + } + +} diff --git a/scripts/scr_player_combat_weapon_stacks/scr_player_combat_weapon_stacks.gml b/scripts/scr_player_combat_weapon_stacks/scr_player_combat_weapon_stacks.gml index 58d028443f..127e4817de 100644 --- a/scripts/scr_player_combat_weapon_stacks/scr_player_combat_weapon_stacks.gml +++ b/scripts/scr_player_combat_weapon_stacks/scr_player_combat_weapon_stacks.gml @@ -34,7 +34,24 @@ function add_data_to_stack (stack_index, weapon, unit_damage=false, head_role=fa wep_num[stack_index]++; splash[stack_index]=weapon.spli; wep[stack_index]=weapon.name; - if (obj_ncombat.started=0) then ammo[stack_index]=weapon.ammo; + + if (obj_ncombat.started=0) { + ammo[stack_index] = weapon.ammo; + + if (is_struct(unit)) { + var _armour = unit.get_armour_data(); + if (is_struct(_armour) && _armour.has_tag("dreadnought")) { + ammo[stack_index] = weapon.ammo * 3; + } + + var _mobi = unit.get_mobility_data(); + if (is_struct(_mobi) && _mobi.has_tag("bonus_ammo")) { + ammo[stack_index] = weapon.ammo * 2; + } + } else if (unit == "vehicle") { + ammo[stack_index] = weapon.ammo * 4; + } + } if (unit!="none"){//this stops a potential infinite loop of secondary profiles add_second_profiles_to_stack(weapon, head_role, unit); @@ -154,7 +171,6 @@ function scr_player_combat_weapon_stacks() { var stack_index = find_stack_index("Hammer of Wrath", head_role, unit); if (stack_index > -1){ add_data_to_stack(stack_index, unit.hammer_of_wrath(), false, head_role, unit); - ammo[stack_index] = -1; if (head_role){ player_head_role_stack(stack_index, unit); } @@ -273,7 +289,7 @@ function scr_player_combat_weapon_stacks() { if (is_struct(weapon)){ for (j=0;j<=40;j++){ if (wep[j]==""||wep[j]==weapon.name){ - add_data_to_stack(j,weapon); + add_data_to_stack(j,weapon,,,"vehicle"); break; } } @@ -313,6 +329,34 @@ function scr_player_combat_weapon_stacks() { } } +function set_up_player_blocks_turn(){ + if (instance_exists(obj_pnunit)){ + with (obj_pnunit){ + alarm[3]=2; + wait_and_execute(3, scr_player_combat_weapon_stacks); + alarm[0]=4; + } + } + turn_count++; +} + +function reset_combat_message_arrays(){ + messages=0; + messages_to_show=8; + largest=0; + random_messages=0; + priority=0; + messages_shown=0; + for (var i=0;i97){ + if (roll_dice_chapter(1, 100, "high")>97){ return_lost_ship(); } } @@ -30,7 +30,7 @@ function return_lost_ship(){ add_ship_to_fleet(_return_id, _new_fleet); } - var _return_defect = roll_dice(1, 100, "high"); + var _return_defect = roll_dice_chapter(1, 100, "high"); var _text = $"The ship {obj_ini.ship[_return_id]} has returned to real space and is now orbiting the {_star.name} system\n"; if (_return_defect<90){ if (_return_defect>80){ @@ -85,7 +85,7 @@ function return_lost_ship(){ } scr_kill_ship(_return_id); var _chaos_fleet = spawn_chaos_fleet_at_system(_star); - var fleet_strength = ((100 - roll_dice(1, 100, "low"))/10)+3; + var fleet_strength = ((100 - roll_dice_chapter(1, 100, "low"))/10)+3; distribute_strength_to_fleet(fleet_strength, _chaos_fleet); with (_new_fleet){ instance_destroy(); @@ -184,7 +184,7 @@ function loose_ship_to_warp_event(){ } if(array_length(eligible_fleets) == 0) { - //show_debug_message("RE: Ship Lost, couldn't find a player fleet"); + //show_debug_message_adv("RE: Ship Lost, couldn't find a player fleet"); exit; } @@ -223,7 +223,7 @@ function loose_ship_to_warp_event(){ if (obj_ini.name[company][marine] == "") then continue; unit = fetch_unit([company, marine]); if(unit.ship_location == _ship_index) { - obj_ini.loc[company][marine] = "Lost"; + unit.location_string = "Lost"; } } for(var vehicle = 1; vehicle <= 100; vehicle++){ diff --git a/scripts/scr_popup/scr_popup.gml b/scripts/scr_popup/scr_popup.gml index 82b70cbffd..4a9c38ae9e 100644 --- a/scripts/scr_popup/scr_popup.gml +++ b/scripts/scr_popup/scr_popup.gml @@ -20,8 +20,10 @@ function scr_popup(type, text, image, popup_special="") { pip.image=image; if (is_struct(popup_special)){ - show_debug_message(popup_special); pip.pop_data = popup_special; + if (struct_exists(pip.pop_data , "options")){ + pip.add_option(pip.pop_data.options); + } } else if(popup_special != ""){// this is only relevant for forcing missions through cheatcodes explode_script(popup_special,"|"); pip.mission=string(explode[0]); diff --git a/scripts/scr_popup_functions/scr_popup_functions.gml b/scripts/scr_popup_functions/scr_popup_functions.gml new file mode 100644 index 0000000000..7a27c8dccf --- /dev/null +++ b/scripts/scr_popup_functions/scr_popup_functions.gml @@ -0,0 +1,659 @@ + +/// @function reset_popup_options() +/// @description Resets all popup option variables to empty strings + +enum POPUP_TYPE { + PROMOTION = 5, + EQUIP = 6, + ARTIFACT_EQUIP = 8, + ITEM_GIFT = 9, + ADD_TAGS = 12, + SYSTEM_DEBUG = 13, + BATTLE_OPTIONS = 98, + FLEET_MOVE = 99, +} + +function reset_popup_options(){ + with (obj_popup){ + options = []; + } +} + +function popup_defualt_click_action(){ + if (hide){ + exit; + } + if (instances_exist_any([obj_fleet])){ + exit; + } + if (!instance_exists(obj_controller)){ + exit; + } + if (obj_controller.scrollbar_engaged){ + exit; + } + + if (battle_special>0){ + alarm[0]=1; + cooldown=10; + exit; + } + + if (type=POPUP_TYPE.BATTLE_OPTIONS){ + obj_controller.cooldown=10; + if (instance_exists(obj_turn_end)){ + obj_turn_end.current_battle+=1; + obj_turn_end.alarm[0]=1; + } + obj_controller.force_scroll=0; + instance_destroy(); + exit; + } + + if (!array_length(options) && type<5){ + popup_default_close(); + } +} + +function popup_default_close(){ + obj_controller.cooldown=10; + if (instance_exists(obj_turn_end) && obj_controller.complex_event==false){ + if (number!=0){ + obj_turn_end.alarm[1]=4; + } + } + if (struct_exists(pop_data,"marine_display_image")){ + pop_data.marine_display_image.destroy_image(); + } + instance_destroy(); + exit; +} + +function popup_window_draw(){ + if ((size == 0) || (size == 2)) { + sprite_index = spr_popup_medium; + image_alpha = 0; + width = sprite_width - 50; + draw_sprite_ext(spr_popup_medium, type, ((1600 - sprite_width) / 2), ((900 - sprite_height) / 2), 1, y_scale, 0, c_white, 1); + if (image != "") { + image_wid = 100; + image_hei = 100; + } + } else if (size == 1) { + sprite_index = spr_popup_small; + image_alpha = 0; + width = sprite_width - 10; + draw_sprite_ext(spr_popup_small, type, ((1600 - sprite_width) / 2), ((900 - sprite_height) / 2), 1, y_scale, 0, c_white, 1); + if (image != "") { + image_wid = 150; + image_hei = 150; + } + } else if (size == 3) { + var draw_y_scale = y_scale; + sprite_index = spr_popup_large; + image_alpha = 0; + width = sprite_width - 50; + if (image == "debug") { + y_scale_mod = 1.5; + draw_y_scale = y_scale * y_scale_mod; + } + draw_sprite_ext(spr_popup_large, type, ((1600 - sprite_width) / 2), ((900 - sprite_height * y_scale_mod) / 2), 1, draw_y_scale, 0, c_white, 1); + if (image != "") { + image_wid = 200; + image_hei = 200; + } + } +} + +function PopupOption(data) constructor { + move_data_to_current_scope(data); + if !(struct_exists(self,"choice_func")){ + choice_func = popup_default_close; + } +} + +function add_option(option, if_empty = false,use_default_option = true){ + if (if_empty){ + if (array_length(options)){ + return; + } + } + if (is_string(option)){ + option = {str1:option} + } + if (is_array(option)){ + for (var i=0;i (oy + sprite_height)) { + y_scale = t8 / (oy + sprite_height); + } + } else { + if (scr_click_left()){ + popup_defualt_click_action(); + } + } + if (press > -1 && press < array_length(options)){ + if (!is_struct(options[press]) && options[press] == ""){ + press = -1; + } + } +} + +function calculate_equipment_needs(){ + var i=0,rall="",all_good=0; + + req_armour=""; + req_armour_num=0; + have_armour_num=0; + req_gear=""; + req_gear_num=0; + have_gear_num=0; + req_mobi=""; + req_mobi_num=0; + have_mobi_num=0; + req_wep1=""; + req_wep1_num=0; + have_wep1_num=0; + req_wep2=""; + req_wep2_num=0; + have_wep2_num=0; + + rall=role_name[target_role]; + + /*if (rall=obj_ini.role[100][14]) and (global.chapter_name!="Space Wolves") and (global.chapter_name!="Iron Hands"){ + req_armour="";req_armour_num=0;req_wep1="";req_wep1_num=0;req_wep2="";req_wep2_num=0;req_mobi="";req_mobi_num=0; + }*/ + if (rall="Codiciery"){ + req_armour=""; + req_armour_num=0; + req_wep1=""; + req_wep1_num=0; + req_wep2=""; + req_wep2_num=0; + req_mobi=""; + req_mobi_num=0; + req_gear=obj_ini.gear[100,17]; + req_gear_num=units; + } else if (rall="Lexicanum"){ + req_armour=""; + req_armour_num=0; + req_wep1=""; + req_wep1_num=0; + req_wep2=""; + req_wep2_num=0; + req_mobi=""; + req_mobi_num=0; + } else if (rall=obj_ini.role[100][11]){ + req_armour=STR_ANY_POWER_ARMOUR; + req_armour_num=units; + req_wep2="Company Standard"; + req_wep2_num=units; + } else { + for (var i=2;i<20;i++){ + if (obj_ini.role[100][i]==rall){ + req_armour=obj_ini.armour[100][i]; + req_armour_num=units;req_wep1=obj_ini.wep1[100][i]; + req_wep1_num=units; + req_wep2=obj_ini.wep2[100][i]; + req_wep2_num=units; + req_mobi=obj_ini.mobi[100][i]; + req_mobi_num=units; + req_gear=obj_ini.gear[100][i]; + req_gear_num=units; + break; + } + } + } + + if (rall=obj_ini.role[100][6]){ + req_armour="Dreadnought"; + req_armour_num=units; + req_wep1=obj_ini.wep1[100,6]; + req_wep1_num=units; + req_wep2=obj_ini.wep2[100,6]; + req_wep2_num=units; + } + if (rall=$"Venerable {obj_ini.role[100][6]}"){ + req_armour=""; + req_armour_num=0; + req_wep1=""; + req_wep1_num=0; + req_wep2=""; + req_wep2_num=0; + } + + + var unit_armour; + var unit_wep_one; + for (var i=0; i=min_exp){ + if (is_struct(unit_armour)) { + if (req_armour == STR_ANY_POWER_ARMOUR) { + if (array_contains(LIST_BASIC_POWER_ARMOUR, unit_armour.name)) { + have_armour_num += 1; + } + } + if (req_armour == STR_ANY_TERMINATOR_ARMOUR) { + if (array_contains(LIST_TERMINATOR_ARMOUR, unit_armour.name)) { + have_armour_num += 1; + } + } + } + + if (obj_controller.ma_wep1[i]=req_wep1) or (obj_controller.ma_wep2[i]=req_wep1) then have_wep1_num+=1; + if (obj_controller.ma_wep2[i]=req_wep2) or (obj_controller.ma_wep1[i]=req_wep2) then have_wep2_num+=1; + + + if (obj_controller.ma_gear[i]=req_gear) then have_gear_num+=1; + if (obj_controller.ma_mobi[i]=req_mobi) then have_mobi_num+=1; + + if (req_wep1=="Heavy Ranged" && is_struct(unit_wep_one)){ + if (unit_wep_one.has_tag("heavy_ranged")) then have_wep1_num+=1; + } + } + + // if (n_wep1=n_wep2) and ((o_wep1!=n_wep1) or (o_wep2!=n_wep2)){have_wep1_num-=1;have_wep2_num-=1;} + + }// End Repeat + + // This checks to see if there is any more in the armoury + if (req_armour==STR_ANY_POWER_ARMOUR){ + var _armour_list = LIST_BASIC_POWER_ARMOUR; + for (i=0;i=req_armour_num) or (req_armour="")) and ((have_wep1_num>=req_wep1_num) or (req_wep1="")) and ((have_wep2_num>=req_wep2_num) or (req_wep2="")) then all_good=0.4; + if (req_gear="") or (req_gear_num<=have_gear_num) then all_good+=0.3; + if (req_mobi="") or (req_mobi_num<=have_mobi_num) then all_good+=0.3; + return floor(all_good); + +} + + + +function default_popup_image_index(){ + var _img = -1; + if (image == "") { + _img = -1; + } + else if (image == "orks") { + _img = 0; + } + else if (image == "tau") { + _img = 1; + } + else if (image == "chaos") { + _img = 2; + } + else if (image == "shadow") { + _img = 3; + } + else if (image == "distinguished") { + _img = 4; + } + else if (image == "tech_build") { + _img = 5; + } + else if (image == "sororitas") { + _img = 6; + } + else if (image == "angry") { + _img = 7; + } + else if (image == "gene_bad") { + _img = 8; + } + else if (image == "lost_warp") { + _img = 10; + } + else if (image == "Warp") { + _img = 11; + } + else if (image == "crusade") { + _img = 12; + } + else if (image == "fuklaw") { + _img = 13; + } + if ((image == "artifact") || (image == "artifact2")) { + _img = 14; + } + else if (image == "artifact_recovered") { + _img = 15; + } + else if (image == "artifact_given") { + _img = 15; + } + else if (image == "waaagh") { + _img = 16; + } + else if (image == "shipyard") { + _img = 17; + } + else if (image == "inquisition") { + _img = 18; + } + else if (image == "succession") { + _img = 19; + } + else if (image == "rogue_trader") { + _img = 20; + } + else if (image == "necron_tomb") { + _img = 21; + } + else if (image == "webber") { + _img = 22; + } + else if (image == "spyrer") { + _img = 23; + } + else if (image == "fortress") { + _img = 24; + } + else if (image == "fortress_hive") { + _img = 25; + } + else if (image == "fortress_death") { + _img = 26; + } + else if (image == "fortress_ice") { + _img = 27; + } + else if (image == "fortress_lava") { + _img = 28; + } + else if (image == "fortress_dorf") { + _img = 29; + } + else if (image == "exploding_ship") { + _img = 30; + } + else if (image == "necron_cave") { + _img = 31; + } + else if (image == "exterminatus_new") { + _img = 32; + } + else if (image == "necron_tunnels_1") { + _img = 33; + } + else if (image == "necron_tunnels_2") { + _img = 34; + } + else if (image == "necron_tunnels_3") { + _img = 35; + } + else if (image == "necron_army") { + _img = 36; + } + else if (image == "harlequin") { + _img = 37; + } + else if (image == "black_rage") { + _img = 39; + } + else if (image == "exterminatus") { + _img = 40; + } + else if (image == "stc") { + _img = 41; + } + else if (image == "thallax") { + _img = 42; + } + else if (image == "space_hulk_done") { + _img = 44; + } + else if (image == "ancient_ruins") { + _img = 45; + } + else if (image == "geneseed_lab") { + _img = 47; + } + else if (image == "ruins_bunker") { + _img = 48; + } + else if (image == "ruins_fort") { + _img = 49; + } + else if (image == "ruins_ship") { + _img = 50; + } + else if (image == "fallen") { + _img = 51; + } + else if (image == "debug_banshee") { + _img = 52; + } + else if (image == "mechanicus") { + _img = 53; + } + else if (image == "chaos_cultist") { + _img = 54; + } + else if (image == "chaos_symbol") { + _img = 55; + } + else if (image == "chaos_messenger") { + _img = 56; + } + else if (image == "event_feast") { + _img = 57; + } + else if (image == "event_tournament") { + _img = 58; + } + else if (image == "event_deathmatch") { + _img = 59; + } + else if (image == "event_mass") { + _img = 60; + } + else if (image == "event_ccult") { + _img = 61; + } + else if (image == "event_crelic") { + _img = 62; + } + else if (image == "event_march") { + _img = 63; + } + + return _img; +} + + +function allow_governor_successor(){ + var randa = roll_dice_chapter(1, 100, "high"); + var randa2 = roll_dice(1, 100); + p_data.set_player_disposition(obj_controller.disposition[2] + choose(-1, -2, -3, -4, 0, 1, 2, 3, 4)); + + var _text_last = ""; + if (randa <= 3) { + var _newdisp = min(p_data.player_disposition, choose(1, 2, 3, 4, 5, 6) * 3); + p_data.set_player_disposition(_newdisp); + _text_last = "Regrettably he has a dim view of your chapter"; + } + if (randa >= 95) { + _newdisp = max(p_data.player_disposition, 60 + choose(1, 2, 3, 4, 5, 6) * 3); + p_data.set_player_disposition(_newdisp); + _text_last = "Fortunately you already have good relations with the new governor"; + } + + scr_event_log("", "Planetary Governor of {p_data.name()} assassinated. The next in line takes over.", new_target.name); + text = $"The next in line for rule of {p_data.name()} has taken over their rightful position of Planetary Governor. {_text_last}"; + reset_popup_options(); + with (obj_ground_mission) { + instance_destroy(); + } + exit; +} + + +function install_sympathetic_successor(){ + text = p_data.assasinate_governor(1, estimate); + + reset_popup_options(); + with (obj_ground_mission) { + instance_destroy(); + } + exit; +} + +function install_chapter_surf(){ + text = p_data.assasinate_governor(2, estimate); + reset_popup_options(); + with (obj_ground_mission) { + instance_destroy(); + } + exit; +} + + diff --git a/scripts/scr_popup_functions/scr_popup_functions.yy b/scripts/scr_popup_functions/scr_popup_functions.yy new file mode 100644 index 0000000000..161ffa6e9b --- /dev/null +++ b/scripts/scr_popup_functions/scr_popup_functions.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_popup_functions", + "isCompatibility":false, + "isDnD":false, + "name":"scr_popup_functions", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_post_battle_events/scr_post_battle_events.gml b/scripts/scr_post_battle_events/scr_post_battle_events.gml new file mode 100644 index 0000000000..0efbb63a11 --- /dev/null +++ b/scripts/scr_post_battle_events/scr_post_battle_events.gml @@ -0,0 +1,154 @@ + +/// @mixin obj_ncombat +function necron_tomb_raid_post_battle_sequence(){ + if (!string_count("wake",battle_special)){ + if (defeat == 1) { + obj_controller.combat=0; + obj_controller.cooldown=10; + obj_turn_end.alarm[1]=4; + } + + else if (defeat == 0){ + battle_data.mission_stage+=1; + obj_controller.combat=0; + var pip=instance_create(0,0,obj_popup); + pip.pop_data = battle_data; + + with (pip){ + necron_tomb_mission_start(); + necron_tomb_mission_sequence(); + number = pop_data.number; + } + } + } else { + var pip=instance_create(0,0,obj_popup); + with(pip){ + title="Necron Tomb Awakens"; + image="necron_army"; + if (obj_ncombat.defeat==0){ + text="Your marines make a tactical retreat back to the surface, hounded by Necrons all the way. The Inquisition mission is a failure- you were to blow up the Necron Tomb World stealthily, not wake it up. The Inquisition is not pleased with your conduct."; + } else { + text="Your marines are killed down to the last man. The Inquisition mission is a failure- you were to blow up the Necron Tomb World stealthily, not wake it up. The Inquisition is not pleased with your conduct."; + } + } + + var _star_obj = star_by_name(battle_loc); + if (_star_obj != "none"){ + with(_star_obj){ + var planet = obj_ncombat.battle_id; + if (remove_planet_problem(planet,"necron")){ + p_necrons[planet]=4; + } + if (awake_tomb_world(p_feature[planet])==0){ + awaken_tomb_world(p_feature[planet]); + } + } + } + + pip.pop_data = battle_data; + + alter_disposition(eFACTION.Inquisition, -5); + obj_controller.combat=0; + + with (pip){ + number = pop_data.number; + } + } +} + +/// @mixin obj_ncombat +function protect_raiders_battle_aftermath(){ + instance_activate_object(obj_star); + // show_message(obj_turn_end.current_battle); + // show_message(obj_turn_end.battle_world[obj_turn_end.current_battle]); + // title / text / image / speshul + var cur_star = battle_object; + var planet = battle_id; + var _planet = new PlanetData(planet,cur_star); + var _planet_string = _planet.name(); + _planet.remove_problem("protect_raiders"); + if (!defeat){ + + _planet.add_disposition(15); + var tixt=$"The Raiding forces on {_planet_string} have been removed. The citizens and craftsman may sleep more soundly. (planet disp +15)" + + scr_popup("Planet Protected",tixt,"protect_raiders",""); + scr_event_log("",$"Governor Request completed: Raiding forces on {_planet_string} have been eliminated.", cur_star.name); + } else { + _planet.add_disposition(-15); + var tixt=$"The Raiding forces on {_planet_string} dispatched with your forces and will continue with their bloody practices. The citizens remain unsafe and the governor is unimpressed. (planet disp -15)"; + scr_popup("Planet Protected",tixt,"protect_raiders",""); + + scr_event_log("",$"Governor Request failed: Raiding forces on {_planet_string} continue to harrass population.", cur_star.name); + } + instance_deactivate_object(obj_star); +} + + +/// @mixin obj_ncombat +function hunt_fallen_battle_aftermath(){ + if (!defeat){ + with (obj_turn_end){ + remove_planet_problem(battle_world[current_battle], "fallen", battle_object[current_battle]) + var tixt="The Fallen on "+ battle_object[current_battle].name; + tixt+=scr_roman(battle_world[current_battle]); + scr_event_log("",$"Mission Succesful: {tixt} have been captured or purged."); + tixt+=$" have been captured or purged. They shall be brought to the Chapter {obj_ini.role[100][14]}s posthaste, in order to account for their sins. "; + var _tex_options = [ + "Suffering is the beginning to penance.", + "Their screams shall be the harbringer of their contrition.", + "The shame they inflicted upon us shall be written in their flesh." + ] + tixt += _tex_options[choose(0,0,1,2)]; + scr_popup("Hunt the Fallen Completed",tixt,"fallen",""); + } + } +} + + + +function space_hulk_explore_battle_aftermath(){ + if (!defeat && hulk_treasure>0){ + var shi=0,loc=""; + + var shiyp=instance_nearest(battle_object.x,battle_object.y,obj_p_fleet); + if (shiyp.x == battle_object.x && shiyp.y ==battle_object.y){ + shi = fleet_full_ship_array(shiyp)[0]; + loc = obj_ini.ship[shi]; + } + + if (hulk_treasure == 1){// Requisition + var _reqi=irandom_range(30,60)*10; + obj_controller.requisition+=_reqi; + + var pop=instance_create(0,0,obj_popup); + pop.image="space_hulk_done"; + pop.title="Space Hulk: Resources"; + pop.text=$"Your battle brothers have located several luxury goods and coginators within the Space Hulk. They are salvaged and returned to the ship, granting {_reqi} Requisition."; + }else if (hulk_treasure == 2){// Artifact + //TODO this will eeroniously put artifacts in the wrong place but will resolve crashes + var last_artifact = scr_add_artifact("random","random",4,loc,shi+500); + var i=0; + + var pop=instance_create(0,0,obj_popup); + pop.image="space_hulk_done"; + pop.title="Space Hulk: Artifact"; + pop.text=$"An Artifact has been retrieved from the Space Hulk and stowed upon {loc}. It appears to be a {obj_ini.artifact[last_artifact]} but should be brought home and identified posthaste."; + scr_event_log("","Artifact recovered from the Space Hulk."); + }else if (hulk_treasure == 3){// STC + scr_add_stc_fragment();// STC here + var pop;pop=instance_create(0,0,obj_popup); + pop.image="space_hulk_done"; + pop.title="Space Hulk: STC Fragment"; + pop.text="An STC Fragment has been retrieved from the Space Hulk and safely stowed away. It is ready to be decrypted or gifted at your convenience."; + scr_event_log("","STC Fragment recovered from the Space Hulk."); + }else if (hulk_treasure == 4){// Termie Armour + var termi=choose(2,2,2,3); + scr_add_item("Terminator Armour",termi); + var pop;pop=instance_create(0,0,obj_popup); + pop.image="space_hulk_done"; + pop.title="Space Hulk: Terminator Armour"; + pop.text="The fallen heretics wore several suits of Terminator Armour- a handful of them were found to be cleansible and worthy of use. "+string(termi)+" Terminator Armour has been added to the Armamentarium."; + } + } +} \ No newline at end of file diff --git a/scripts/scr_battle_roster/scr_battle_roster.yy b/scripts/scr_post_battle_events/scr_post_battle_events.yy similarity index 73% rename from scripts/scr_battle_roster/scr_battle_roster.yy rename to scripts/scr_post_battle_events/scr_post_battle_events.yy index bbbf10d1fb..796f277062 100644 --- a/scripts/scr_battle_roster/scr_battle_roster.yy +++ b/scripts/scr_post_battle_events/scr_post_battle_events.yy @@ -1,9 +1,9 @@ { "$GMScript":"v1", - "%Name":"scr_battle_roster", + "%Name":"scr_post_battle_events", "isCompatibility":false, "isDnD":false, - "name":"scr_battle_roster", + "name":"scr_post_battle_events", "parent":{ "name":"Combat", "path":"folders/Scripts/Combat.yy", diff --git a/scripts/scr_powers/scr_powers.gml b/scripts/scr_powers/scr_powers.gml index c02169c7fa..987efda029 100644 --- a/scripts/scr_powers/scr_powers.gml +++ b/scripts/scr_powers/scr_powers.gml @@ -17,6 +17,38 @@ global.disciplines_data = json_to_gamemaker(working_directory + "\\data\\psychic_disciplines.json", json_parse); global.powers_data = json_to_gamemaker(working_directory + "\\data\\psychic_powers.json", json_parse); +function generate_marine_powers_description_string(unit){ + var _psy_powers_known = unit.powers_known; + var _psy_powers_count = array_length(_psy_powers_known); + var _psy_discipline = unit.psy_discipline(); + var _psy_discipline_name = get_discipline_data(_psy_discipline, "name"); + + var _tooltip = ""; + _tooltip += $"Psychic Rating: {unit.psionic}"; + + var _equipment_psychic_amplification = unit.gear_special_value("psychic_amplification"); + var _character_psychic_amplification = unit.psychic_amplification() * 100; + var _equipment_psychic_focus = unit.gear_special_value("psychic_focus"); + var _character_psychic_focus = unit.psychic_focus(); + var _perils_chance = unit.perils_threshold() / 10; + _tooltip += $"\nAmplification from Equipment: {_equipment_psychic_amplification}%"; + _tooltip += $"\nAmplification from Attributes (Psy Rating and EXP): {_character_psychic_amplification}%"; + + _tooltip += $"\n\nFocus Success Chance: {100 - unit.psychic_focus_difficulty()}%"; + _tooltip += $"\nFocus from Equipment: {_equipment_psychic_focus}%"; + _tooltip += $"\nFocus from Attributes (WIS and EXP): {_character_psychic_focus}%"; + + _tooltip += $"\n\nPerils of the Warp Chance: {_perils_chance}%"; + + _tooltip += $"\n\nMain Discipline: {_psy_discipline_name}"; + _tooltip += $"\nKnown Powers: "; + for (var i = 0; i < _psy_powers_count; i++) { + _tooltip += get_power_data(_psy_powers_known[i], "name"); + _tooltip += smart_delimeter_sign(_psy_powers_count, i, false); + } + return _tooltip; +} + /// @desc Psychic powers execution mess. Called in the scope of obj_pnunit. /// @param {real} caster_id - ID of the caster in the player column from obj_pnunit. /// @mixin @@ -461,7 +493,7 @@ function player_select_powers() { var _psy_info = get_discipline_data(discipline, "description"); draw_text_transformed(440, 729, _psy_info, 0.5, 0.5, 0); - if (custom == 2) { + if (custom == eCHAPTER_TYPE.CUSTOM) { draw_sprite_stretched(spr_creation_arrow, 0, 437, 688, 32, 32); draw_sprite_stretched(spr_creation_arrow, 1, 475, 688, 32, 32); if (point_and_click([437, 688, 437 + 32, 688 + 32])) { @@ -570,7 +602,7 @@ function process_tome_mechanics(_unit, _unit_id) { // Apply corruption based on perils chance if (_result.perils_chance > 0) { if ((_tome_roll > 90) && (_result.perils_chance > 0)) { - _unit.corruption += roll_personal_dice(1, 6, "low", _unit); + _unit.corruption += roll_dice_unit(1, 6, "low", _unit); } } } diff --git a/scripts/scr_promote/scr_promote.gml b/scripts/scr_promote/scr_promote.gml new file mode 100644 index 0000000000..5e6052329a --- /dev/null +++ b/scripts/scr_promote/scr_promote.gml @@ -0,0 +1,340 @@ + +function setup_promotion_popup(){ + if ((sel_promoting == 1) && (instance_number(obj_popup) == 0)) { + var pip = instance_create(0, 0, obj_popup); + pip.type = 5; + pip.company = managing; + + var god = 0, nuuum = 0; + for (var f = 0; f < array_length(display_unit); f++) { + if ((ma_promote[f] >= 1 || is_specialist(ma_role[f], SPECIALISTS_RANK_AND_FILE) || is_specialist(ma_role[f], SPECIALISTS_SQUAD_LEADERS)) && man_sel[f] == 1) { + nuuum += 1; + if (pip.min_exp == 0) { + pip.min_exp = ma_exp[f]; + } + pip.min_exp = min(ma_exp[f], pip.min_exp); + } + if ((god == 0) && (ma_promote[f] >= 1) && (man_sel[f] == 1)) { + god = 1; + pip.unit_role = ma_role[f]; + } + } + if (nuuum > 1) { + pip.unit_role = "Marines"; + } + with (pip){ + units = nuuum; + promote_button = new UnitButtonObject( + { + x1: 1450, + y1: 491, + style : "pixel", + label : "Promote" + } + ); + promote_button.bind_method = function(){ + + var mahreens=0,i=-1; + + if (target_comp>10){ + target_comp=0; + } + + for(i=0;i<498;i++){ + if (obj_ini.name[target_comp][i]=="" and obj_ini.name[target_comp][i+1]=="") { + mahreens=i; + break; + } + } + // Gets the number of marines in the target company + var unit, squad_mover,moveable; + var role_squad_equivilances = {};//this is the only way to set variables as keys in gml + variable_struct_set(role_squad_equivilances,obj_ini.role[100][8],"tactical_squad"); + variable_struct_set(role_squad_equivilances,obj_ini.role[100][9],"devastator_squad"); + variable_struct_set(role_squad_equivilances,obj_ini.role[100][10],"assault_squad"); + variable_struct_set(role_squad_equivilances,obj_ini.role[100][12],"scout_squad"); + variable_struct_set(role_squad_equivilances,obj_ini.role[100][3],"veteran_squad"); + variable_struct_set(role_squad_equivilances,obj_ini.role[100][4],"terminator_squad"); + + for(i=0;i=min_exp){ + moveable=true; + unit = obj_controller.display_unit[i]; + if (unit.squad != "none"){ // this evaluates if you are trying promote a whole squad + var move_squad = unit.squad; + squad = obj_ini.squads[move_squad]; + squad.update_fulfilment(); + move_members = squad.members; + if (array_length(move_members)==1){ + unit.squad = "none"; + moveable = false; + } + for (var mem = 0;mem10) then manag=0; + var company=manag; + draw_set_color(0); + main_slate.draw_with_dimensions(); + + draw_set_font(fnt_40k_14b); + draw_set_halign(fa_center); + draw_set_color(CM_GREEN_COLOR); + draw_text(1292, 150, "Promoting"); + var romanNumerals = scr_roman_numerals(); + + draw_set_font(fnt_40k_12); + var comp = ""; + if (company <= 10 && company > 0) { + comp = romanNumerals[company - 1]; + } else if (company > 10) { + comp = "HQ"; + } + draw_text(1292, 175, $"{comp} Company {unit_role}"); + + companies_select.draw(); + if (companies_select.changed){ + target_comp = companies_select.selection_val("val"); + target_role = 0; + get_unit_promotion_options(); + } + // } + draw_set_halign(fa_left); + draw_text(1020, 290, "Target Role:"); //choose new role + var role_x = 0; + role_y = 0; + if (target_comp != -1) { + + for (var r = 1; r <= 11; r++) { + if (role_name[r] != "") { + draw_set_alpha(1); + check = " "; + if (target_role == r) { + check = "x"; + } + if (min_exp < role_exp[r]) { + draw_set_alpha(0.25); + } + draw_text(1030 + role_x, 310 + role_y, $"{role_name[r]} [{check}]"); + if (point_and_click([1030 + role_x, 310 + role_y, 1180 + role_x, 330 + role_y])) { + if (min_exp >= role_exp[r]) { + target_role = r; + all_good = calculate_equipment_needs(); + } + } + if (r % 3 == 0) { + role_y += 20; + role_x = 0; + } else { + role_x += 170; + } + } + } + } + + draw_set_alpha(1); + + draw_text(1020, 370, string_hash_to_newline("Required Gear:")); + var gr = 0, tox = ""; + + if (target_role > 0) { + if (req_armour != "") { + gr = req_armour_num - have_armour_num; + tox = ""; + if (gr > 0) { + draw_set_color(c_red); + } else { + draw_set_color(CM_GREEN_COLOR); + } + draw_text(1030, 390, $"{req_armour_num} {req_armour} (Have {have_armour_num})"); + } + if (req_gear != "") { + gr = req_gear_num - have_gear_num; + tox = ""; + if (gr > 0) { + draw_set_color(c_red); + } else { + draw_set_color(CM_GREEN_COLOR); + } + draw_text(1030, 410, $"{req_gear_num} {req_gear} (Have {have_gear_num})"); + } + if (req_mobi != "") { + gr = req_mobi_num - have_mobi_num; + tox = ""; + if (gr > 0) { + draw_set_color(c_red); + } else { + draw_set_color(CM_GREEN_COLOR); + } + draw_text(1030, 430, $"{req_mobi_num} {req_mobi} (Have {have_mobi_num})"); + } + if (req_wep1 != "") { + gr = req_wep1_num - have_wep1_num; + tox = ""; + if (gr > 0) { + draw_set_color(c_red); + } else { + draw_set_color(CM_GREEN_COLOR); + } + draw_text(1280, 390, $"{req_wep1_num} {req_wep1} (Have {have_wep1_num})"); + } + if (req_wep2 != "") { + gr = req_wep2_num - have_wep2_num; + tox = ""; + if (gr > 0) { + draw_set_color(c_red); + } else { + draw_set_color(CM_GREEN_COLOR); + } + draw_text(1280, 410, $"{req_wep2_num} {req_wep2} (Have {have_wep2_num})"); + } + } + + if(cancel_button.draw()){ + instance_destroy(); + } + + promote_button.draw(all_good); + pop_draw_return_values(); +} \ No newline at end of file diff --git a/scripts/scr_promote/scr_promote.yy b/scripts/scr_promote/scr_promote.yy new file mode 100644 index 0000000000..750fbf68fb --- /dev/null +++ b/scripts/scr_promote/scr_promote.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_promote", + "isCompatibility":false, + "isDnD":false, + "name":"scr_promote", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_punit_combat_heplers/scr_punit_combat_heplers.gml b/scripts/scr_punit_combat_heplers/scr_punit_combat_heplers.gml index b205db3637..f53a26c2d0 100644 --- a/scripts/scr_punit_combat_heplers/scr_punit_combat_heplers.gml +++ b/scripts/scr_punit_combat_heplers/scr_punit_combat_heplers.gml @@ -266,7 +266,7 @@ function block_composition_string() { function draw_block_composition(_x1, _composition_string) { draw_set_alpha(1); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_line_width(_x1+5,450,817,685, 2); draw_set_font(fnt_40k_14b); draw_text(817,688,"Row Composition:"); diff --git a/scripts/scr_purge_world/scr_purge_world.gml b/scripts/scr_purge_world/scr_purge_world.gml index 84c8b7b625..b81a2eae37 100644 --- a/scripts/scr_purge_world/scr_purge_world.gml +++ b/scripts/scr_purge_world/scr_purge_world.gml @@ -89,23 +89,23 @@ function scr_purge_world(star, planet, action_type, action_score) { var _displayed_killed = star.p_large[planet] == 1 ? $"{kill} billion" : scr_display_number(floor(kill)); txt1 += $"##The world had {_displayed_population} Imperium subjects. {_displayed_killed} were purged over the duration of the bombardment.##Heresy has fallen down to {max(0, heres_after)}%."; - if (pop_after=0){ + if (pop_after<=0){ if (star.p_owner[planet]=2) and (obj_controller.faction_status[2]!="War"){ - if (star.p_type[planet]="Temperate") or (star.p_type[planet]="Hive") or (star.p_type[planet]="Desert"){ - obj_controller.audiences+=1;obj_controller.audien[obj_controller.audiences]=2; - obj_controller.audien_topic[obj_controller.audiences]="bombard_angry"; + if (star.p_type[planet]="Temperate" || star.p_type[planet]="Hive" || star.p_type[planet]="Desert"){ + var _disp_hit = -10; + if (star.p_type[planet]="Temperate") then _disp_hit = -5; + if (star.p_type[planet]="Desert") then _disp_hit = -3; + + scr_audience(eFACTION.Imperium, "bombard_angry", _disp_hit, "", 0, 0); } - if (star.p_type[planet]="Temperate") then obj_controller.disposition[2]-=5; - if (star.p_type[planet]="Desert") then obj_controller.disposition[2]-=3; - if (star.p_type[planet]="Hive") then obj_controller.disposition[2]-=10; } } if (star.p_owner[planet]=3) and (obj_controller.faction_status[3]!="War"){ - obj_controller.audiences+=1; - obj_controller.audien[obj_controller.audiences]=3; - obj_controller.audien_topic[obj_controller.audiences]="bombard_angry"; - if (star.p_type[planet]="Forge") then obj_controller.disposition[3]-=15; - if (star.p_type[planet]="Ice") then obj_controller.disposition[3]-=7; + + if (star.p_type[planet]="Forge") then _disp_hit =-15; + if (star.p_type[planet]="Ice") then _disp_hit =-7; + scr_audience(eFACTION.Inquisition, "bombard_angry", _disp_hit, "", 0, 0); + } @@ -230,31 +230,26 @@ function scr_purge_world(star, planet, action_type, action_score) { if (action_type=DropType.PurgeAssassinate){ - var dis,chance,siz_penalty,aroll,o,yep,ambush; - aroll=floor(random(100))+1;dis=0;chance=0;siz_penalty=0;o=0;yep=0;ambush=false; - - // Base - dis=star.dispo[planet]; - if (dis<=20) then chance=75; - if (dis>20) and (dis<40) then chance=40; - if (dis>40) and (dis<70) then chance=15; - if (dis>70) then chance=0; + var aroll=roll_dice_chapter(1, 100, "high"); + var chance = 100; + // var siz_penalty=0; + var o=0; + var yep=0; + // Disposition + aroll += floor(star.dispo[planet] / 10); + // Advantages - if(scr_has_adv("Ambushers")) then ambush=true; - if(scr_has_adv("Lightning Warriors")) then chance+=5; - if(scr_has_disadv("Shitty Luck")) then chance+=20; - - // Size - if ((action_score > 5) && (action_score <= 10)) { siz_penalty = 5; } - if ((action_score > 10) && (action_score <= 20)) { siz_penalty = 20; } - if ((action_score > 20) && (action_score <= 50)) { siz_penalty = 30; } - if ((action_score > 50) && (action_score <= 100)) { siz_penalty = 50; } - if ((action_score > 100) && (action_score <= 200)) { siz_penalty = 75; } - if (action_score > 200) { siz_penalty = 125; } - - // Ambushers go! - if (ambush=true) then chance=round(chance/2); + if(scr_has_adv("Ambushers")) then aroll+=10; + if(scr_has_adv("Lightning Warriors")) then aroll+=5; + + // Size - unused + // if ((action_score > 5) && (action_score <= 10)) { siz_penalty = 5; } + // if ((action_score > 10) && (action_score <= 20)) { siz_penalty = 20; } + // if ((action_score > 20) && (action_score <= 50)) { siz_penalty = 30; } + // if ((action_score > 50) && (action_score <= 100)) { siz_penalty = 50; } + // if ((action_score > 100) && (action_score <= 200)) { siz_penalty = 75; } + // if (action_score > 200) { siz_penalty = 125; } var spec1=0,spec2=0,txt=""; // TODO consider making it a battle with Planetary governor's guards txt="Your Astartes descend upon the surface of "+string(star.name)+" "+string(scr_roman(planet))+" and plot the movements and schedule of the governor. "; @@ -284,27 +279,40 @@ function scr_purge_world(star, planet, action_type, action_score) { txt+="What is thy will?"; - var he;he=instance_create(star.x,star.y,obj_temp6); - var pip;pip=instance_create(0,0,obj_popup); + var pip=instance_create(0,0,obj_popup); pip.title="Planetary Governor Assassinated"; - pip.text=txt;pip.planet=planet; - - pip.option1="Allow the official successor to become Planetary Governor."; - pip.option2="Ensure that a sympathetic successor will be the one to rule."; - pip.option3="Remove all successors and install a loyal Chapter Serf."; + pip.text=txt; + pip.planet=planet; + pip.p_data = new PlanetData(planet,star); + var options = [ + { + str1 : "Allow the official successor to become Planetary Governor.", + choice_func : allow_governor_successor, + }, + { + str1 : "Ensure that a sympathetic successor will be the one to rule.", + choice_func : install_sympathetic_successor, + }, + { + str1 : "Remove all successors and install a loyal Chapter Serf.", + choice_func : install_chapter_surf, + }, + ] + pip.add_option(options); pip.cooldown=20; // Result- this is the multiplier for the chance of discovery with the inquisition, can also be used to determine // the new Governor disposition if they are the official successor - if (aroll<=chance){// Discovered + if (aroll < chance){// Discovered pip.estimate=2; - } - if (aroll>chance){// Success + } else if (aroll >= chance){// Success pip.estimate=1; } // If there are enemy non-chaos forces then they may be used as a cover // Does not work with chaos because if the governor dies, with chaos present, the new governor would possibly be investigated - if (star.p_orks[planet]>=4) or (star.p_necrons[planet]>=3) or (star.p_tyranids[planet]>=5) then pip.estimate=pip.estimate*0.5; + if (star.p_orks[planet]>=4) or (star.p_necrons[planet]>=3) or (star.p_tyranids[planet]>=5){ + pip.estimate=pip.estimate*0.5; + } } diff --git a/scripts/scr_quest/scr_quest.gml b/scripts/scr_quest/scr_quest.gml index 6c8e6ef2e3..e9c8f99873 100644 --- a/scripts/scr_quest/scr_quest.gml +++ b/scripts/scr_quest/scr_quest.gml @@ -68,11 +68,18 @@ function scr_quest(quest_satus=0, quest_name, quest_fac, quest_end) { disposition[4]-=10; obj_controller.qsfx=1; }else { + var _result_text = ""; delete_artifact(wanted_arti); i=wanted_arti; - if (obj_controller.demanding=0) then obj_controller.disposition[4]+=1; - if (obj_controller.demanding=1) then obj_controller.disposition[4]+=choose(0,0,1); - scr_popup("Inquisition Mission Completed","The Inquisition has asked for the return of the Artifact, and your Chapter was able to hand it over without complications. The mission has been accomplished.","inquisition",""); + if (obj_controller.demanding=0){ + obj_controller.disposition[4]+=1; + obj_controller.inspection_passes++; + _result_text = "(Disposition : 1\nInspection Passes : +1(yieldable in diplommacy))"; + } + if (obj_controller.demanding=1){ + obj_controller.disposition[4]+=choose(0,0,1); + } + scr_popup("Inquisition Mission Completed","The Inquisition has asked for the return of the Artifact, and your Chapter was able to hand it over without complications. The mission has been accomplished." + _result_text,"inquisition",""); scr_event_log("","Inquisition Mission Completed: The entrusted Artifact has been returned to the Inquisition."); } } @@ -152,12 +159,13 @@ function scr_quest(quest_satus=0, quest_name, quest_fac, quest_end) { flit.image_index=0; flit.capital_number=1; - flit.trade_goods="none"; + flit.trade_goods=""; if (instance_exists(obj_temp2)){flit.action_x=obj_temp2.x;flit.action_y=obj_temp2.y;flit.target=instance_nearest(flit.action_x,flit.action_y,obj_p_fleet);} if (!instance_exists(obj_temp2)) and (instance_exists(obj_ground_mission)){flit.action_x=obj_ground_mission.x;flit.action_y=obj_ground_mission.y;flit.target=instance_nearest(flit.action_x,flit.action_y,obj_p_fleet);} - - flit.alarm[4]=1; + with(flit){ + set_fleet_movement(); + } with(obj_temp2){instance_destroy();} with(obj_temp3){instance_destroy();} diff --git a/scripts/scr_random_event/scr_random_event.gml b/scripts/scr_random_event/scr_random_event.gml index 20be7bd281..b02d9853b5 100644 --- a/scripts/scr_random_event/scr_random_event.gml +++ b/scripts/scr_random_event/scr_random_event.gml @@ -1,27 +1,26 @@ function scr_random_event(execute_now) { - var evented = false; - // This is some eldar mission, it should be fixed - // var rando4=floor(random(200))+1; - //if (obj_controller.turns_ignored[6]<=0) and (obj_controller.faction_gender[6]=2) then rando4-=2; - //if (obj_controller.turns_ignored[6]<=0) and (rando4<=3) and execute_now and (faction_defeated[6]=0){ - // if (obj_controller.known[eFACTION.Eldar]=2) and (obj_controller.disposition[6]>=-10) and (string_count("Eldar",obj_ini.strin)=0){ - // log_message("RE: Eldar Mission 1"); - // // Need something else here that prevents them from asking missions when they are pissed + var _evented = false; + /*This is some eldar mission, it should be fixed + var rando4=floor(random(200))+1; + if (obj_controller.turns_ignored[6]<=0) and (obj_controller.faction_gender[6]=2) then rando4-=2; + if (obj_controller.turns_ignored[6]<=0) and (rando4<=3) and execute_now and (faction_defeated[6]=0){ + if (obj_controller.known[eFACTION.Eldar]=2) and (obj_controller.disposition[6]>=-10) and (string_count("Eldar",obj_ini.strin)=0){ + log_message("RE: Eldar Mission 1"); + // Need something else here that prevents them from asking missions when they are pissed - // obj_turn_end.audiences+=1;// obj_turn_end.audiences+=1; - // obj_turn_end.audien[obj_turn_end.audiences]=6; + obj_turn_end.audiences+=1;// obj_turn_end.audiences+=1; + obj_turn_end.audience_stack[obj_turn_end.audiences]=6; - // // if (obj_controller.known[eFACTION.Eldar]>2) then obj_turn_end.audien_topic[obj_turn_end.audiences]="mission";// Random mission? - // if (obj_controller.known[eFACTION.Eldar]=2){ - // obj_turn_end.audien_topic[obj_turn_end.audiences]="mission1"; - // obj_controller.known[eFACTION.Eldar]=2.2; - // scr_quest(0,"fund_elder",6,24); - // } + // if (obj_controller.known[eFACTION.Eldar]>2) then obj_turn_end.audien_topic[obj_turn_end.audiences]="mission";// Random mission? + if (obj_controller.known[eFACTION.Eldar]=2){ + scr_audience(eFACTION.Eldar, "mission1", 0, "", 0, 2.2); + scr_quest(0,"fund_elder",6,24); + } - // exit; - // } - //} + exit; + } + }*/ var chosen_event; var inquisition_mission_roll = irandom(100); @@ -47,18 +46,11 @@ function scr_random_event(execute_now) { } else { var player_luck; - var has_bad_luck = scr_has_disadv("Shitty Luck"); - var luck_roll = irandom(100); - if (has_bad_luck){ - if (luck_roll<=30) then player_luck=luck.good; - if (luck_roll>30) and (luck_roll<45) then player_luck=luck.neutral; - if (luck_roll>=45) then player_luck=luck.bad; - } - else{ - if (luck_roll<=45) then player_luck=luck.good; - if (luck_roll>45) and (luck_roll<55) then player_luck=luck.neutral; - if (luck_roll>=55) then player_luck=luck.bad; - } + var luck_roll = roll_dice_chapter(1, 100, "low"); + + if (luck_roll<=45) then player_luck=luck.good; + if (luck_roll>45) and (luck_roll<55) then player_luck=luck.neutral; + if (luck_roll>=55) then player_luck=luck.bad; var events; @@ -225,7 +217,7 @@ function scr_random_event(execute_now) { if (chosen_event == EVENT.strange_behavior){ //TODO this event currenlty dose'nt do anything but now we have marine structs there is lots of potential here init_marine_acting_strange() - evented=true; + _evented=true; } else if (chosen_event == EVENT.space_hulk){ @@ -274,7 +266,7 @@ function scr_random_event(execute_now) { scr_alert(own?"red":"green","space_hulk",$"The Space Hulk {spaceHulk.name} appears near the {star_id.name} system.",spaceHulkX,spaceHulkY); scr_event_log("",$"The Space Hulk {spaceHulk.name} appears near the {star_id.name} system.",star_id.name); - evented = true; + _evented = true; } catch(_exception){ handle_exception(_exception); @@ -292,9 +284,9 @@ function scr_random_event(execute_now) { } var marine=marine_and_company[1]; var company=marine_and_company[0]; - var unit = obj_ini.TTRPG[company][marine]; - var role=unit.role(); - var text = unit.name_role(); + var _unit = obj_ini.TTRPG[company][marine]; + var role=_unit.role(); + var text = _unit.name_role(); var company_text = scr_convert_company_to_string(company); //var company_text = scr_company_string(company); if(company_text != ""){ @@ -304,101 +296,19 @@ function scr_random_event(execute_now) { text += " has distinguished himself.##He åis up for review to be promoted."; if (company != 10){ - unit.add_exp(10); + _unit.add_exp(10); } else { - unit.add_exp(max(20, unit.experience)); + _unit.add_exp(max(20, _unit.experience)); } scr_popup("Promotions!",text,"distinguished",""); - evented = true; + scr_event_log("green",text); + _evented = true; } else if (chosen_event == EVENT.strange_building){ - log_message("RE: Fey Mood"); - var marine_and_company = scr_random_marine(obj_ini.role[100][16],0); - if(marine_and_company == "none"){ - exit; - } - var marine = marine_and_company[1]; - var company = marine_and_company[0]; - var text=""; - var unit = obj_ini.TTRPG[company][marine]; - var role= unit.role(); - text = unit.name_role(); - text+=" is taken by a strange mood and starts building!"; - - - var crafted_object; - var craft_roll=irandom(100); - var heritical_item = false; - - //this bit should be improved, idk what duke was checking for here - //TODO make craft chance reflective of crafters skill, rewards players for having skilled tech area - if (scr_has_disadv("Shitty Luck")) { - craft_roll+=20; - } - if (scr_has_disadv("Tech-Heresy")) { - craft_roll+=20; - } - if (scr_has_adv("Crafter")) { - if (craft_roll>80) { - craft_roll-=10; - } - if (craft_roll<60) { - craft_roll+=10; - } - } - - if (craft_roll<=50){ - crafted_object=choose("Icon","Icon","Statue"); - unit.add_exp(choose(5,10)); - } - else if ((craft_roll>50) && (craft_roll<=60)) { - crafted_object=choose("Bike","Rhino"); - } - else if ((craft_roll>60) && (craft_roll<=80)) { - crafted_object="Artifact"; - } - else { - crafted_object=choose("baby","robot","demon","fusion"); - heritical_item=1; - } - - var event_index = -1; - for(var i = 0; i < array_length(event); i++){ - if(event[i] == "" || event[i] == undefined){ - event_index = i; - break; - } - } - if(event_index == -1){ - // - exit; - } - - scr_popup("Can He Build marine?!?",text,"tech_build",""); - evented = true; - event[event_index]="strange_building|"+unit.name()+"|"+string(company)+"|"+string(marine)+"|"+string(crafted_object)+"|"; - event_duration[event_index]=1; - - var marine_is_planetside = unit.planet_location>0; - if (marine_is_planetside && heritical_item) { - var _system = star_by_name(obj_ini.loc[company][marine]); - var _planet = unit.planet_location; - if (_system!="none"){ - with (_system){ - p_hurssy[_planet]+=6; - p_hurssy_time[_planet]=2; - } - } - } - else if (!marine_is_planetside and heritical_item){ - var _fleet = find_ships_fleet(unit.ship_location); - if (_fleet!="none"){ - //the intended code for here was to add some sort of chaos event on the ship stashed up ready to fire in a few turns - } - } + _evented = strange_build_event(); } else if (chosen_event == EVENT.sororitas){ @@ -430,7 +340,7 @@ function scr_random_event(execute_now) { var planet = eligible_planets[irandom(array_length(eligible_planets)-1)]; ++(star_id.p_sisters[planet]); - evented = true; + _evented = true; if ((own!=1) && (star_id.p_player[planet]<=0) && (star_id.present_fleet[1]==0)){ scr_alert("green","sororitas","Sororitas place a company of sisters on "+string(star_id.name)+" "+string(planet)+".",star_id.x,star_id.y); @@ -444,13 +354,13 @@ function scr_random_event(execute_now) { } } else if (chosen_event == EVENT.mechanicus_mission) { - spawn_mechanicus_mission() + evented = spawn_mechanicus_mission(); } else if (chosen_event == EVENT.inquisition_planet || chosen_event == EVENT.inquisition_mission) { scr_inquisition_mission(chosen_event); - evented = true; + _evented = true; } else if (chosen_event == EVENT.rogue_trader){ @@ -501,7 +411,7 @@ function scr_random_event(execute_now) { star_alert = instance_create(star.x+16,star.y-24,obj_star_event); star_alert.image_alpha = 1; star_alert.image_speed = 1; - evented = true; + _evented = true; } else if (chosen_event == EVENT.fleet_delay){ @@ -539,7 +449,7 @@ function scr_random_event(execute_now) { text = "Eldar pirates have attacked your fleet. Damage was minimal but the voyage has been delayed by " + string(delay)+ " months."; } scr_popup("Fleet Attacked",text,"",""); - evented = true; + _evented = true; var star_alert =instance_create(fleet.x+16,fleet.y-24,obj_star_event); star_alert.image_alpha=1; star_alert.image_speed=1; @@ -610,7 +520,7 @@ function scr_random_event(execute_now) { star_alert.image_speed=1; star_alert.col="red"; scr_event_log("red","War of Succession on "+string(text)); - evented = true; + _evented = true; } // Flavor text/events @@ -670,8 +580,9 @@ function scr_random_event(execute_now) { text +="the Chapter Garage."; break; } - scr_alert("color","lol",text,0,0); - evented = true; + scr_alert("color","lol",text,0,0); + scr_event_log("red",text); + _evented = true; } else if (chosen_event == EVENT.warp_storms){ @@ -680,9 +591,10 @@ function scr_random_event(execute_now) { time=irandom_range(6,24); if (scr_has_disadv("Shitty Luck")){ - own=1; - } - else { + own=choose(1,2,0,0,0); + } else if (scr_has_adv("Great Luck")) { + own=choose(1,1,2,2,0); + } else { own=choose(1,1,2,0,0); } @@ -702,24 +614,22 @@ function scr_random_event(execute_now) { } else{ star_id.storm += time; - evented = true; - if (own==1){ - scr_alert("red","Warp","Warp Storms rage across the "+string(star_id.name)+" system.",star_id.x,star_id.y); - } - else{ - scr_alert("green","Warp","Warp Storms rage across the "+string(star_id.name)+" system.",star_id.x,star_id.y); - } + _evented = true; + var _col = own == 1 ? "red" : "green"; + scr_alert(_col, "Warp", $"Warp Storms rage across the {star_id.name} system.", star_id.x, star_id.y); + scr_event_log(_col, $"Warp Storms rage across the {star_id.name} system."); } } else if (chosen_event == EVENT.enemy_forces){ log_message("RE: Enemy Forces"); var own; - if (scr_has_disadv("Shitty Luck")) { - own=1; - } - else{ - own=choose(1,1,2,2,3); + if (scr_has_disadv("Shitty Luck")){ + own=choose(1,1,1,1,1,1,2,2,3); + } else if (scr_has_adv("Great Luck")) { + own=choose(1,1,1,2,2,2,2,3,3); + } else { + own=choose(1,1,1,2,2,3); } var star_id = scr_random_find(own,true,"",""); @@ -785,91 +695,62 @@ function scr_random_event(execute_now) { log_error("RE: Enemy Forces, couldn't pick an enemy faction"); exit; } - scr_alert("red","enemy",string(text)+" forces suddenly appear at "+string(star_id.name)+" "+string(planet)+"!",star_id.x,star_id.y); - evented = true; + scr_alert("red","enemy", $"{text} forces suddenly appear at {star_id.name} {planet}!",star_id.x,star_id.y); + scr_event_log("red",$"{text} forces suddenly appear at {star_id.name} {planet}!"); + _evented = true; } } else if ((chosen_event == EVENT.crusade)){ //i think all events should be hanlded like this then we have far more options on when to call them and how they work - evented = launch_crusade(); + _evented = launch_crusade(); } else if (chosen_event == EVENT.enemy) { - log_message("RE: Enemy"); - - var factions = []; - if(known[eFACTION.Imperium] == 1){ - array_push(factions,2); - } - if(known[eFACTION.Mechanicus] == 1){ - array_push(factions,3); - } - if(known[eFACTION.Inquisition] == 1){ - array_push(factions,4); - } - if(known[eFACTION.Ecclesiarchy] == 1){ - array_push(factions,5); - } - - if(array_length(factions) == 0){ - log_error("RE: Enemy, no faction could be chosen"); - exit; - } - var chosen_faction = factions[irandom(array_length(factions)-1)]; - var event_index = -1; - for(var i=1;i < 99; i++){ - if(event[i] == ""){ - event_index = i; - break; - } - } - if(event_index == -1){ - log_error("RE: Enemy, couldn't find an event_index"); - exit; - } - - var text = "You have made an enemy within the "; - var log = "An enemy has been made within the "; - switch(chosen_faction) { - case 2: - event[event_index]="enemy_imperium"; - text += "Imperium"; - log += "Imperium"; - break; - case 3: - event[event_index]="enemy_mechanicus"; - text += "Mechanicus"; - log += "Mechanicus"; - break; - case 4: - event[event_index]="enemy_inquisition"; - text += "Inquisition"; - log += "Inquisition"; - break; - case 5: - event[event_index]="enemy_ecclesiarchy"; - text += "Ecclesiarchy"; - log += "Ecclesiarchy"; - break; - default: - log_error("RE: Enemy, no faction could be chosen"); - exit; - } - event_duration[event_index]=irandom_range(12,96); - disposition[chosen_faction]-=20; - text +="; relations with them will be soured for the forseable future."; - scr_popup("Diplomatic Incident",text,"angry",""); - evented = true; - scr_event_log("red",string(log)); + _evented = make_faction_enemy_event(); } else if ((chosen_event == EVENT.mutation)) { //TODO make reprocussions to ignoring this log_message("RE: Gene-Seed Mutation"); var text = "The Chapter's gene-seed has mutated! Apothecaries are scrambling to control the damage and prevent further contamination. What is thy will?"; - scr_popup("Gene-Seed Mutated!",text,"gene_bad",""); - evented = true; + var _opt1 = "Dispose of "; + var _percent_remove = 0; + if (obj_controller.gene_seed <= 30) { + _opt1 += "100% of the gene-seed."; + _percent_remove = 100; + } + if ((obj_controller.gene_seed > 30) && (obj_controller.gene_seed < 60)) { + _opt1 += "50% of all gene-seed."; + _percent_remove = 50; + } + if (obj_controller.gene_seed >= 60) { + _opt1 += "33% of all gene-seed."; + _percent_remove = 33; + } + + var _opt2 = "Tell the apothecaries to let it be."; + + + var _pop_data = { + percent_remove : _percent_remove, + options : [ + { + str1:_opt1, + choice_func : event_dispose_of_mutated_gene, + }, + { + str1:_opt2, + choice_func : function(){ + scr_loyalty("Mutant Gene-Seed", "+"); + popup_default_close(); + } + }, + ] + } + + scr_popup("Gene-Seed Mutated!",text,"gene_bad",_pop_data); + _evented = true; scr_event_log("red","The Chapter Gene-Seed has mutated."); } @@ -880,24 +761,10 @@ function scr_random_event(execute_now) { else if (chosen_event == EVENT.chaos_invasion){ log_message("RE: Chaos Invasion"); - var event_index = -1; - for(var i = 1; i < 100; i++) { - if(event[i] == ""){ - chosen_event = i; - break; - } - } - if(chosen_event == -1){ - log_error("RE: Chaos Invasion, couldn't find a id for the event"); - exit; - } - - event[chosen_event] = "chaos_invasion"; - event_duration[chosen_event] = 1; - evented = true; - - - + add_event({ + e_id : "chaos_invasion", + duration : 1 + }) var psyker_intolerant = scr_has_disadv("Psyker Intolerant"); var has_chief_psyker = scr_role_count("Chief "+string(obj_ini.role[100,17]),"") >= 1; @@ -919,15 +786,15 @@ function scr_random_event(execute_now) { } else if (chosen_event == EVENT.necron_awaken){ - evented = awaken_tomb_event(); + _evented = awaken_tomb_event(); } else if(chosen_event == EVENT.fallen){ event_fallen(); - evented = true; + _evented = true; } - if(evented) { + if(_evented) { if(force_inquisition_mission && chosen_event == EVENT.inquisition_mission) { last_mission=turn; } @@ -953,13 +820,9 @@ function scr_random_event(execute_now) { function event_fallen(){ log_message("RE: Hunt the Fallen"); var stars = scr_get_stars(); - var valid_stars = array_filter_ext(stars, - function(star,index){ - return scr_star_has_planet_with_owner(star, eFACTION.Imperium); - }); + var valid_stars = scr_get_stars(false, [eFACTION.Imperium]); - if(valid_stars == 0) - { + if (array_length(valid_stars) == 0){ log_error("RE: Hunt the Fallen, coulnd't find a star"); exit; } @@ -969,22 +832,24 @@ function event_fallen(){ var planet = scr_get_planet_with_owner(star,eFACTION.Imperium); var eta = scr_mission_eta(star.x,star.y, 1); - log_message($"Fallen: found star {star.name} planet {planet} as candidate") - - var assigned_problem = add_new_problem(planet, "fallen", eta,star) - log_message($"assigned_problem {assigned_problem}") + if (planet>0){ + log_message($"Fallen: found star {star.name} planet {planet} as candidate") + + var assigned_problem = add_new_problem(planet, "fallen", eta,star) + log_message($"assigned_problem {assigned_problem}") - if(!assigned_problem) { - log_error("RE: Hunt the Fallen, coulnd't assign a problem to the planet"); - return; + if (!assigned_problem) { + log_error("RE: Hunt the Fallen, coulnd't assign a problem to the planet"); + return; + } + + var text = "Sources indicate one of the Fallen may be upon "+string(star.name)+" "+string(scr_roman(planet))+". We have "+string(eta)+" months to send out a strike team and scour the planet. Any longer and any Fallen that might be there will have escaped."; + scr_popup("Hunt the Fallen",text,"fallen",""); + scr_event_log("","Sources indicate one of the Fallen may be upon "+string(star.name)+" "+string(scr_roman(planet))+". We have "+string(eta)+" months to investigate."); + var star_alert = instance_create(star.x+16,star.y-24,obj_star_event); + star_alert.image_alpha=1; + star_alert.image_speed=1; + star_alert.col="purple"; } - - var text = "Sources indicate one of the Fallen may be upon "+string(star.name)+" "+string(scr_roman(planet))+". We have "+string(eta)+" months to send out a strike team and scour the planet. Any longer and any Fallen that might be there will have escaped."; - scr_popup("Hunt the Fallen",text,"fallen",""); - scr_event_log("","Sources indicate one of the Fallen may be upon "+string(star.name)+" "+string(scr_roman(planet))+". We have "+string(eta)+" months to investigate."); - var star_alert = instance_create(star.x+16,star.y-24,obj_star_event); - star_alert.image_alpha=1; - star_alert.image_speed=1; - star_alert.col="purple"; -} \ No newline at end of file +} diff --git a/scripts/scr_random_marine/scr_random_marine.gml b/scripts/scr_random_marine/scr_random_marine.gml index c4f0fc8e11..7199353faf 100644 --- a/scripts/scr_random_marine/scr_random_marine.gml +++ b/scripts/scr_random_marine/scr_random_marine.gml @@ -88,12 +88,24 @@ function scr_random_marine(role, exp_req, search_params="none"){ if (struct_exists(search_params, "trait")){ //list of traits (all required) need an option for if only one is required if (is_array(search_params[$ "trait"])){ - for(var trait=0;trait=50){ + if (man[f]=="man"){ + allow=false; + break; + } else if(man[f]=="vehicle"){ + if (prev_role != ma_role[f]){ + allow=false; + break; + } + } + } + } + + if (vih>0){ + nuuum+=1; + if (o_wep1=="") and (ma_wep1[f]!="") then o_wep1=ma_wep1[f]; + if (o_wep2=="") and (ma_wep2[f]!="") then o_wep2=ma_wep2[f]; + if (o_armour=="") and (ma_armour[f]!="") then o_armour=ma_armour[f]; + if (o_gear=="") and (ma_gear[f]!="") then o_gear=ma_gear[f]; + if (o_mobi=="") and (ma_mobi[f]!="") then o_mobi=ma_mobi[f]; + + if (ma_wep1[f]=="") then b_wep1+=1; + if (ma_wep2[f]=="") then b_wep2+=1; + if (ma_armour[f]=="") then b_armour+=1; + if (ma_gear[f]=="") then b_gear+=1; + if (ma_mobi[f]=="") then b_mobi+=1; + + if ((o_wep1!="") and (ma_wep1[f]!=o_wep1)) or (b_wep1==1) then o_wep1="Assortment"; + if ((o_wep2!="") and (ma_wep2[f]!=o_wep2)) or (b_wep2==1) then o_wep2="Assortment"; + if ((o_armour!="") and (ma_armour[f]!=o_armour)) or (b_armour==1) then o_armour="Assortment"; + if ((o_gear!="") and (ma_gear[f]!=o_gear)) or (b_gear==1) then o_gear="Assortment"; + if ((o_mobi!="") and (ma_mobi[f]!=o_mobi)) or (b_mobi==1) then o_mobi="Assortment"; + } + } + + if (b_wep1==nuuum) then o_wep1=""; + if (b_wep2==nuuum) then o_wep2=""; + if (b_armour==nuuum) then o_armour=""; + if (b_gear==nuuum) then o_gear=""; + if (b_mobi==nuuum) then o_mobi=""; + + if (vih>0 && man_size>0 && allow){ + + var pip=instance_create(0,0,obj_popup); + pip.type=POPUP_TYPE.EQUIP; + pip.o_wep1=o_wep1; + pip.o_wep2=o_wep2; + pip.o_armour=o_armour; + pip.o_gear=o_gear; + pip.n_wep1=o_wep1; + pip.n_wep2=o_wep2; + pip.n_armour=o_armour; + pip.n_gear=o_gear; + pip.o_mobi=o_mobi; + pip.n_mobi=o_mobi; + pip.company=managing; + pip.units=nuuum; + + //Forwards vih selection to the vehicle_equipment variable used in mouse_50 obj_popup and weapons_equip script + pip.vehicle_equipment=vih; + with (pip){ + equipmet_area = -1; + cancel_button = new UnitButtonObject( + { + x1: 1061, + y1: 591, + style : "pixel", + label : "Cancel" + } + ); + equip_button = new UnitButtonObject( + { + x1: 1450, + y1: 591, + style : "pixel", + label : "Equip" + } + ); + + main_slate = new DataSlate({ + style : "decorated", + XX : 1006, + YY : 143, + set_width : true, + width : 571, + height : 450, + }); + + var _quality_options = [ + { + str1 : "Standard", + font : fnt_40k_14b, + val : 0 + }, + { + str1 : "Master Crafted", + font : fnt_40k_14b, + val : 1 + }, + { + str1 : "Artificer", + font : fnt_40k_14b, + val : 2 + } + ]; + quality_radio = new RadioSet(_quality_options, "", {max_width : 500, x1:1040, y1:318}); + + range_melee_radio = new RadioSet([ + { + str1 : "Ranged", + font : fnt_40k_14b, + val : eENGAGEMENT.Ranged + }, + { + str1 : "Melee", + font : fnt_40k_14b, + val : eENGAGEMENT.Melee + } + ], "", {max_width : 500, x1:1040, y1:343}); + + weapon1_select = new UnitButtonObject( + { + x1: 1300, + y1: 215, + label : "", + font : fnt_40k_12, + } + ); + weapon2_select = new UnitButtonObject( + { + x1: 1300, + y1: 235, + label : "", + font : fnt_40k_12, + } + ); + armour_select= new UnitButtonObject( + { + x1: 1300, + y1: 255, + label : "", + font : fnt_40k_12, + } + ); + if (_unchangeable_armour){ + armour_select.inactive_col = CM_RED_COLOR; + armour_select.tooltip = "One or more Marine has Dreadnought armour and cannot be changed"; + armour_select.active = false; + } + gear_select = new UnitButtonObject( + { + x1: 1300, + y1: 275, + label : "", + font : fnt_40k_12, + } + ); + mobility_select = new UnitButtonObject( + { + x1: 1300, + y1: 295, + label : "", + font : fnt_40k_12, + } + ); + + } + } + } +} + + +function reload_items(){ + item_name = []; + scr_get_item_names( + item_name, + vehicle_equipment, // eROLE + equipmet_area, // slot + range_melee_radio.selection_val("val"), + false, // include company standard + true, // limit to available equipment + quality_radio.selection_val("val"), + ); +} +function draw_popup_equip(){ + + main_slate.draw_with_dimensions(); + draw_set_color(CM_GREEN_COLOR); + draw_text(1302, 150, "Change Equipment"); + + draw_set_font(fnt_40k_12); + var comp = ""; + if (company <= 10 && company > 0) { + comp = int_to_roman(company); + } else if (company > 10) { + comp = "HQ"; + } + + if (vehicle_equipment < 6) { + draw_text(1292, 175, $"{comp} Company, {units} Marines"); + }else if (vehicle_equipment == 6) { + draw_text(1292, 175, $"{comp} Company, {units} Dreadnoughts"); + } + else { + draw_text(1292, 175, $"{comp} Company, {units} Vehicles"); + } + + draw_set_halign(fa_left); + draw_set_color(CM_GREEN_COLOR); + + var show_name = ""; + // Need to not show the artifact tags here somehow + + draw_text(1010, 195, "Before"); + draw_text(1010.5, 195.5, "Before"); + + show_name = o_wep1; + if (a_wep1 != "") { + show_name = a_wep1; + } + if (o_wep1 != "") { + draw_text(1014, 215, string_hash_to_newline(show_name)); + } else { + draw_text(1014, 215, ITEM_NAME_NONE); + } + + show_name = o_wep2; + if (a_wep2 != "") { + show_name = a_wep2; + } + if (o_wep2 != "") { + draw_text(1014, 235, string_hash_to_newline(string(show_name))); + } else { + draw_text(1014, 235, ITEM_NAME_NONE); + } + + show_name = o_armour; + if (a_armour != "") { + show_name = a_armour; + } + if (o_armour != "") { + draw_text(1014, 255, string_hash_to_newline(string(show_name))); + } else { + draw_text(1014, 255, ITEM_NAME_NONE); + } + + show_name = o_gear; + if (a_gear != "") { + show_name = a_gear; + } + if (o_gear != "") { + draw_text(1014, 275, string_hash_to_newline(string(show_name))); + } else { + draw_text(1014, 275, ITEM_NAME_NONE); + } + + show_name = o_mobi; + if (a_mobi != "") { + show_name = a_mobi; + } + if (o_mobi != "") { + draw_text(1014, 295, string_hash_to_newline(string(show_name))); + } else { + draw_text(1014, 295, ITEM_NAME_NONE); + } + + draw_text(1296, 195, string_hash_to_newline("After")); + draw_text(1296.5, 195.5, "After"); + + show_name = n_wep1; + if ((a_wep1 != "") && (n_wep1 == o_wep1)) { + show_name = a_wep1; + } + + weapon1_select.update({ + label : show_name != "" ? show_name : ITEM_NAME_NONE, + color : n_good1 == 0 ? CM_RED_COLOR : CM_GREEN_COLOR, + }) + + + show_name = n_wep2; + if ((a_wep2 != "") && (n_wep2 == o_wep2)) { + show_name = a_wep2; + } + + weapon2_select.update({ + label : show_name != "" ? show_name : ITEM_NAME_NONE, + color : n_good2 == 0 ? CM_RED_COLOR : CM_GREEN_COLOR, + }) + + + show_name = n_armour; + if ((a_armour != "") && (n_armour == o_armour)) { + show_name = a_armour; + } + + armour_select.update({ + label : show_name != "" ? show_name : ITEM_NAME_NONE, + color : n_good3 == 0 ? CM_RED_COLOR : CM_GREEN_COLOR, + }); + + + + show_name = n_gear; + if ((a_gear != "") && (n_gear == o_gear)) { + show_name = a_gear; + } + gear_select.update({ + label : show_name != "" ? show_name : ITEM_NAME_NONE, + color : n_good4 == 0 ? CM_RED_COLOR : CM_GREEN_COLOR, + }); + + show_name = n_mobi; + if ((a_mobi != "") && (n_mobi == o_mobi)) { + show_name = a_mobi; + } + + mobility_select.update({ + label : show_name != "" ? show_name : ITEM_NAME_NONE, + color : n_good5 == 0 ? CM_RED_COLOR : CM_GREEN_COLOR, + }); + + + draw_set_color(CM_GREEN_COLOR); + var _buttons = [weapon1_select, weapon2_select,armour_select, gear_select, mobility_select]; + + var _area_change = false; + for (var i = 0; i <= 4; i++) { + var _button = _buttons[i]; + if (_button.draw(equipmet_area != i)){ + equipmet_area = i; + _area_change = true; + } + if (equipmet_area == i) { + draw_text(1292, 195 + (20 * (i+1)), "->"); + } + } + + draw_set_alpha(1); + + if (equipmet_area != -1) { + var check = " "; + var mct = master_crafted == 1 ? 0.7 : 1; + var column = 0; + var row = 0; + var item_string; + var box = []; + var box_x; + var box_y; + var top = -1; + + var selected_item_name = [n_wep1, n_wep2, n_armour, n_gear, n_mobi]; + selected_item_name = selected_item_name[equipmet_area]; + + for (var o = 0; o < array_length(item_name); o++) { + box_x = 1016 + (row * 154); + box_y = 380 + (column * 20); + box = [box_x, box_y, box_x + 144, box_y + 20]; + check = selected_item_name == item_name[o] ? "x" : " "; + item_string = $"[{check}] {item_name[o]}"; + draw_text_transformed(box_x, box_y, item_string, mct, 1, 0); + if (scr_hit(box)){ + tooltip_draw(gen_item_tooltip(item_name[o])) + if (scr_click_left()){ + top = o; + } + }; + column++; + if (column > 7) { + column = 0; + row++; + } + } + + if (top != -1) { + warning = ""; + switch (equipmet_area) { + case 0: + n_wep1 = item_name[top]; + sel1 = top; + break; + case 1: + n_wep2 = item_name[top]; + sel2 = top; + break; + case 2: + n_armour = item_name[top]; + sel3 = top; + break; + case 3: + n_gear = item_name[top]; + sel4 = top; + break; + case 4: + n_mobi = item_name[top]; + sel5 = top; + break; + } + } + + if (equipmet_area == EquipmentSlot.WEAPON_ONE && (n_wep1 == ITEM_NAME_NONE || n_wep1 == "")) { + n_good1 = 1; + } + if (equipmet_area == EquipmentSlot.WEAPON_TWO && (n_wep2 == ITEM_NAME_NONE || n_wep2 == "")) { + n_good2 = 1; + } + if (equipmet_area == EquipmentSlot.ARMOUR && (n_armour == ITEM_NAME_NONE || n_armour == "")) { + n_good3 = 1; + } + if (equipmet_area == EquipmentSlot.GEAR && (n_gear == ITEM_NAME_NONE || n_gear == "")) { + n_good4 = 1; + } + if (equipmet_area == EquipmentSlot.MOBILITY && (n_mobi == ITEM_NAME_NONE || n_mobi == "")) { + n_good5 = 1; + } + + var weapon_one_data = gear_weapon_data("weapon", n_wep1); + var weapon_two_data = gear_weapon_data("weapon", n_wep2); + var armour_data = gear_weapon_data("armour", n_armour); + var gear_data = gear_weapon_data("gear", n_gear); + var mobility_data = gear_weapon_data("mobility", n_mobi); + + if ((equipmet_area == EquipmentSlot.WEAPON_ONE) && is_struct(weapon_one_data)) { + // Check numbers + req_wep1_num = units; + have_wep1_num = 0; + var i = -1; + repeat (array_length(obj_controller.display_unit)) { + i += 1; + if ((vehicle_equipment != -1) && (obj_controller.ma_wep1[i] == n_wep1)) { + have_wep1_num += 1; + } + } + have_wep1_num += scr_item_count(n_wep1); + if (have_wep1_num >= req_wep1_num || n_wep1 == ITEM_NAME_NONE) { + n_good1 = 1; + } + if (have_wep1_num < req_wep1_num && (n_wep1 != ITEM_NAME_ANY && n_wep1 != ITEM_NAME_NONE)) { + n_good1 = 0; + warning = "Not enough " + string(n_wep1) + "; " + string(req_wep1_num - have_wep1_num) + " more are required."; + } + + //TODO wrap this up in a function + if (weapon_one_data.req_exp > 0) { + var g = -1, exp_check = 0; + for (var g = 0; g < array_length(obj_controller.display_unit); g++) { + if (obj_controller.man_sel[g] == 1 && is_struct(obj_controller.display_unit[g])) { + if (obj_controller.display_unit[g].experience < weapon_one_data.req_exp) { + exp_check = 1; + n_good1 = 0; + warning = $"A unit must have {weapon_one_data.req_exp}+ EXP to use a {weapon_one_data.name}."; + break; + } + } + } + } + if (is_struct(armour_data)) { + if (((!array_contains(armour_data.tags, "terminator")) && (!array_contains(armour_data.tags, "dreadnought"))) && (n_wep1 == "Assault Cannon")) { + n_good1 = 0; + warning = "Cannot use Assault Cannons without Terminator/Dreadnought Armour."; + } + if ((!array_contains(armour_data.tags, "dreadnought")) && (n_wep1 == "Close Combat Weapon")) { + n_good1 = 0; + warning = "Only " + string(obj_ini.role[100][6]) + " can use Close Combat Weapons."; + } + } + } + if ((equipmet_area == EquipmentSlot.WEAPON_TWO) && is_struct(weapon_two_data)) { + // Check numbers + req_wep2_num = units; + have_wep2_num = 0; + var i = -1; + repeat (array_length(obj_controller.display_unit)) { + i += 1; + if ((vehicle_equipment != -1) && (obj_controller.ma_wep2[i] == n_wep2)) { + have_wep2_num += 1; + } + } + // req_wep2_num+=scr_item_count(n_wep2); + have_wep2_num += scr_item_count(n_wep2); + // req_wep2_num=units; + + if (have_wep2_num >= req_wep2_num || n_wep2 == ITEM_NAME_NONE) { + n_good2 = 1; + } + if (have_wep2_num < req_wep2_num && (n_wep2 != ITEM_NAME_ANY && n_wep2 != ITEM_NAME_NONE)) { + n_good2 = 0; + warning = $"Not enough {n_wep2}; {req_wep2_num - have_wep2_num} more are required."; + } + //TODO standardise exp check + if (weapon_two_data.req_exp > 0) { + var g, exp_check; + g = -1; + exp_check = 0; + for (var g = 0; g < array_length(obj_controller.display_unit); g++) { + if (obj_controller.man_sel[g] == 1 && is_struct(obj_controller.display_unit[g])) { + if (obj_controller.display_unit[g].experience < weapon_two_data.req_exp) { + exp_check = 1; + n_good2 = 0; + warning = $"A unit must have {weapon_two_data.req_exp}+ EXP to use a {weapon_two_data.name}."; + break; + } + } + } + } + if (is_struct(armour_data)) { + if (((!array_contains(armour_data.tags, "terminator")) && (!array_contains(armour_data.tags, "dreadnought"))) && (n_wep2 == "Assault Cannon")) { + n_good2 = 0; + warning = "Cannot use Assault Cannons without Terminator/Dreadnought Armour."; + } + if ((!array_contains(armour_data.tags, "dreadnought")) && (n_wep2 == "Close Combat Weapon")) { + n_good2 = 0; + warning = "Only " + string(obj_ini.role[100][6]) + " can use Close Combat Weapons."; + } + if (((string_count("Terminator", n_armour) > 0) || (string_count("Tartaros", n_armour) > 0) || (string_count("Dreadnought", n_armour) > 0)) && (n_mobi != "")) { + n_good2 = 0; + } + if (((string_count("Terminator", o_armour) > 0) || (string_count("Tartaros", o_armour) > 0) || (string_count("Dreadnought", o_armour) > 0)) && (n_mobi != "")) { + n_good2 = 0; + } + } + } + if ((equipmet_area == EquipmentSlot.ARMOUR) && is_struct(armour_data)) { + // Check numbers + req_armour_num = units; + have_armour_num = 0; + var i; + i = -1; + repeat (array_length(obj_controller.display_unit)) { + i += 1; + if ((vehicle_equipment != -1) && (obj_controller.man_sel[i] == 1) && (obj_controller.ma_armour[i] == n_armour)) { + have_armour_num += 1; + } + } + have_armour_num += scr_item_count(n_armour); + + if (have_armour_num >= req_armour_num || n_armour == ITEM_NAME_NONE) { + n_good3 = 1; + } + if (have_armour_num < req_armour_num && (n_armour != ITEM_NAME_ANY && n_armour != ITEM_NAME_NONE)) { + n_good3 = 0; + warning = $"Not enough {n_armour} : {units - have_armour_num} more are required."; + } + + var g = -1, exp_check = 0; + if (armour_data.has_tag("terminator")) { + if (armour_data.req_exp > 0) { + var g, exp_check; + g = -1; + exp_check = 0; + for (var g = 0; g < array_length(obj_controller.display_unit); g++) { + if (obj_controller.man_sel[g] == 1 && is_struct(obj_controller.display_unit[g])) { + if (obj_controller.display_unit[g].experience < armour_data.req_exp) { + exp_check = 1; + n_good3 = 0; + warning = $"A unit must have {armour_data.req_exp}+ EXP to use a {armour_data.name}."; + break; + } + } + } + } + } + + if ((string_count("Dread", o_armour) > 0) && (string_count("Dread", n_armour) == 0)) { + n_good4 = 0; + warning = "Marines may not exit Dreadnoughts."; + } + } + if ((equipmet_area == EquipmentSlot.GEAR) && (n_gear != "Assortment") && (n_gear != ITEM_NAME_NONE)) { + // Check numbers + req_gear_num = units; + have_gear_num = 0; + var i; + i = -1; + repeat (array_length(obj_controller.display_unit)) { + i += 1; + if ((vehicle_equipment != -1) && (obj_controller.man_sel[i] == 1) && (obj_controller.ma_gear[i] == n_gear)) { + have_gear_num += 1; + } + } + have_gear_num += scr_item_count(n_gear); + + if (have_gear_num >= req_gear_num || n_gear == ITEM_NAME_NONE) { + n_good4 = 1; + } + if (have_gear_num < req_gear_num && (n_gear != ITEM_NAME_ANY && n_gear != ITEM_NAME_NONE)) { + n_good4 = 0; + warning = "Not enough " + string(n_gear) + "; " + string(units - req_gear_num) + " more are required."; + } + + if ((n_gear != ITEM_NAME_NONE) && (n_gear != "") && (string_count("Dreadnought", n_armour) > 0) && (string_count("Contemptor Dreadnought", n_armour) > 0)) { + n_good4 = 0; + warning = "Dreadnoughts may not use infantry equipment."; + } + } + if ((equipmet_area == EquipmentSlot.MOBILITY) && (n_mobi != "Assortment") && (n_mobi != ITEM_NAME_NONE) && n_mobi != ITEM_NAME_ANY) { + // Check numbers + req_mobi_num = units; + have_mobi_num = 0; + var i; + i = -1; + repeat (array_length(obj_controller.display_unit)) { + i += 1; + if ((vehicle_equipment != -1) && (obj_controller.man_sel[i] == 1) && (obj_controller.ma_mobi[i] == n_mobi)) { + have_mobi_num += 1; + } + } + have_mobi_num += scr_item_count(n_mobi); + + if (have_mobi_num >= req_mobi_num || n_mobi == ITEM_NAME_NONE) { + n_good5 = 1; + } + if (have_mobi_num < req_mobi_num && (n_mobi != ITEM_NAME_ANY && n_mobi != ITEM_NAME_NONE)) { + n_good5 = 0; + warning = "Not enough " + string(n_mobi) + "; " + string(units - req_mobi_num) + " more are required."; + } + + if (is_struct(armour_data) && is_struct(mobility_data)) { + if (armour_data.has_tag("terminator") && !mobility_data.has_tag("terminator")){ + n_good5 = 0; + warning = "Cannot use this with Terminator Armour."; + } else if (!armour_data.has_tag("terminator") && mobility_data.has_tag("terminator_only")){ + n_good5 = 0; + warning = "Cannot use this without Terminator Armour."; + } else if (armour_data.has_tag("dreadnought") && !mobility_data.has_tag("dreadnought")) { + n_good5 = 0; + warning = "Cannot use this with Dreadnought Armour."; + } else if (!armour_data.has_tag("dreadnought") && mobility_data.has_tag("dreadnought_only")) { + n_good5 = 0; + warning = "Cannot use this without Dreadnought Armour."; + } + } + } + } + + //draw_set_halign(fa_center); + if ((equipmet_area == EquipmentSlot.WEAPON_ONE) || (equipmet_area == EquipmentSlot.WEAPON_TWO)) { + range_melee_radio.draw(); + } + + if (equipmet_area != -1){ + quality_radio.draw(); + } + + if (quality_radio.changed || range_melee_radio.changed ||_area_change){ + reload_items(); + } + + draw_set_color(255); + draw_set_halign(fa_center); + draw_text(1292, 570, string_hash_to_newline(warning)); + + if(cancel_button.draw()){ + instance_destroy(); + } + + var _valid = ((n_good1 + n_good2 + n_good3 + n_good4 + n_good5) == 5); + + + if (equip_button.draw(_valid)){ + reequip_selection(); + } + +} + + +function reequip_selection(){ + if (n_wep1=ITEM_NAME_NONE) then n_wep1=""; + if (n_wep2=ITEM_NAME_NONE) then n_wep2=""; + if (n_armour=ITEM_NAME_NONE) then n_armour=""; + if (n_gear=ITEM_NAME_NONE) then n_gear=""; + if (n_mobi=ITEM_NAME_NONE) then n_mobi=""; + + + for (var i=0;i0){ - unit = display_unit[i]; - if (is_struct(unit)){ - if (return_place[i]>0){ - unit.load_marine(return_place[i], return_planet); - } - } else if (is_array(unit)) { - if (return_place[i]>0){ - obj_ini.veh_lid[unit[0]][unit[1]]=return_place[i]; - obj_ini.veh_wid[unit[0]][unit[1]]=0; - var man_size =scr_unit_size("",obj_ini.veh_role[unit[0]][unit[1]], true); - return_planet.p_player[planet_number]-=man_size; - obj_ini.ship_carrying[return_place[i]]+=man_size; - } - } - } - } - } + var unit; + var return_planet = obj_controller.return_object; + with (object) { + var man_size; + for (var i = 0; i < array_length(display_unit); i++) { + if (object.man_sel[i] > 0) { + unit = display_unit[i]; + if (is_struct(unit)) { + if (return_place[i] > 0) { + unit.load_marine(return_place[i], return_planet); + } + } else if (is_array(unit)) { + if (return_place[i] > 0) { + obj_ini.veh_lid[unit[0]][unit[1]] = return_place[i]; + obj_ini.veh_wid[unit[0]][unit[1]] = 0; + var man_size = scr_unit_size("", obj_ini.veh_role[unit[0]][unit[1]], true); + return_planet.p_player[planet_number] -= man_size; + obj_ini.ship_carrying[return_place[i]] += man_size; + } + } + } + } + } } diff --git a/scripts/scr_role_count/scr_role_count.gml b/scripts/scr_role_count/scr_role_count.gml index a54bdbf5e8..ef6d2686c2 100644 --- a/scripts/scr_role_count/scr_role_count.gml +++ b/scripts/scr_role_count/scr_role_count.gml @@ -50,12 +50,12 @@ function scr_role_count(target_role, search_location="", return_type="count") { unit=fetch_unit([com, i]); if (unit.name()=="")then continue; if (unit.role()=target_role) and (search_location="") then match=true; - if (unit.role()=target_role) and (obj_ini.loc[com][i]=obj_ini.home_name) and (search_location="home") then match=true; - if (unit.role()=target_role) and (search_location="field") and ((obj_ini.loc[com][i]!=obj_ini.home_name) or (unit.ship_location>-1)) then match=true; + if (unit.role()=target_role) and (unit.location_string=obj_ini.home_name) and (search_location="home") then match=true; + if (unit.role()=target_role) and (search_location="field") and ((unit.location_string!=obj_ini.home_name) or (unit.ship_location>-1)) then match=true; if (search_location!="home") and (search_location!="field"){ if (unit.role()=target_role){ - var t1=string(obj_ini.loc[com][i])+"|"+string(unit.planet_location)+"|"; + var t1=unit.location_string+"|"+string(unit.planet_location)+"|"; if (search_location=t1) then match=true; } } diff --git a/scripts/scr_role_setup/scr_role_setup.gml b/scripts/scr_role_setup/scr_role_setup.gml new file mode 100644 index 0000000000..a781efe475 --- /dev/null +++ b/scripts/scr_role_setup/scr_role_setup.gml @@ -0,0 +1,267 @@ +function role_setup_objects(){ + + specialist_distribution_box = new ToggleButton({ + str1 : "Equal Specialist Distribution", + font : fnt_40k_12, + style : "box", + x1 :560, + y1 : 250, + tooltip : $"Specialist Distribution\nCheck if you wish for your Companies to be uniform and each contain {role[100][10]}s and {role[100][9]}s.", + active : equal_specialists, + clicked_check_default : true, + }); + + load_to_ship_radio = new RadioSet([ + { + str1 : "On Planet", + font : fnt_40k_12, + style : "box", + tooltip : $"On Planet/nCheck to have your Astartes Start on your home planet.", + }, + { + str1 : "Load to Ships", + font : fnt_40k_12, + style : "box", + tooltip : $"Load to Ships\nCheck to have your Astartes automatically loaded into ships when the game starts.", + }, + { + str1 : "Load (Sans Escorts)", + font : fnt_40k_12, + style : "box", + tooltip : $"Load (Sans Escorts)\nCheck to have your Astartes automatically loaded into ships, except for Escorts, when the game starts.", + } + ], "", {x1: 445, y1 : 310, x_gap:20, center : true, max_width:400}) + load_to_ship_radio.current_selection = load_to_ships[0]; + distribute_scouts_box = new ToggleButton({ + str1 : "Distribute Scouts", + font : fnt_40k_12, + style : "box", + x1 :540, + y1 : 370, + tooltip : $"Distribute Scouts\nCheck to have your Scouts split across ships in the fleet.", + active : load_to_ships[1], + clicked_check_default : true, + }); + distribute_vets_box = new ToggleButton({ + str1 : "Distribute Veterans", + font : fnt_40k_12, + style : "box", + x1 :690, + y1 : 370, + tooltip : $"Distribute Veterans\nCheck to have your Veterans split across the fleet.", + active : load_to_ships[2], + clicked_check_default : true, + }); +} + +function scr_role_setup(){ + add_draw_return_values(); + + draw_set_font(fnt_40k_30b); + draw_set_halign(fa_center); + draw_set_alpha(1); + draw_set_color(CM_GREEN_COLOR); + + + draw_text_color_simple(800,80,"Roles",CM_GREEN_COLOR); + var c=100; + if (!instance_exists(obj_creation_popup)){ + roles_radio.update({y1:150}); + roles_radio.draw(); + if (roles_radio.changed && custom==eCHAPTER_TYPE.CUSTOM){ + instance_destroy(obj_creation_popup); + var pp=instance_create(0,0,obj_creation_popup); + pp.type=roles_radio.selection_val("role_id") + 100; + } + } + draw_set_color(CM_GREEN_COLOR); + draw_set_alpha(1); + draw_set_font(fnt_40k_30b); + + if (custom != eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); + + specialist_distribution_box.draw(equal_specialists); + equal_specialists = specialist_distribution_box.active; + + + load_to_ship_radio.draw(); + + load_to_ships[0] = load_to_ship_radio.current_selection; + + + + + + if (load_to_ships[0] > 0){ + distribute_scouts_box.draw(load_to_ships[1]); + load_to_ships[1] = distribute_scouts_box.active; + + distribute_vets_box.draw(load_to_ships[2]); + load_to_ships[2] = distribute_vets_box.active; + } + + + + + draw_line(433,535,844,535); + draw_line(433,536,844,536); + draw_line(433,537,844,537); + if (!instance_exists(obj_creation_popup)){ + draw_set_halign(fa_left); + if (scr_hit(540,547,800,725)){ + tooltip="Advisor Names"; + tooltip2="The names of your main Advisors. They provide useful information and reports on the divisions of your Chapter."; + } + + draw_text_transformed(444,550,string_hash_to_newline("Advisor Names"),0.6,0.6,0); + draw_set_font(fnt_40k_14b); + draw_set_halign(fa_right); + if (race[100,15]!=0) then draw_text(594,575,("Chief Apothecary: ")); + if (race[100,14]!=0) then draw_text(594,597,("High Chaplain: ")); + if (race[100,17]!=0) then draw_text(594,619,("Chief Librarian: ")); + if (race[100,16]!=0) then draw_text(594,641,("Forge Master: ")); + draw_text(594,663,"Master of Recruits: "); + draw_text(594,685,"Master of the Fleet: "); + draw_set_halign(fa_left); + + if (race[100,15]!=0){ + draw_set_color(CM_GREEN_COLOR); + if (hapothecary="") then draw_set_color(c_red); + if (text_selected!="apoth") or (custom != eCHAPTER_TYPE.CUSTOM) then draw_text_ext(600,575,string_hash_to_newline(string(hapothecary)),-1,580); + if (custom == eCHAPTER_TYPE.CUSTOM){ + if (text_selected="capoth") and (text_bar>30) then draw_text_ext(600,575,string_hash_to_newline(string(hapothecary)),-1,580); + if (text_selected="capoth") and (text_bar<=30) then draw_text_ext(600,575,string_hash_to_newline(string(hapothecary)+"|"),-1,580); + var str_width,hei;str_width=0;hei=string_height_ext(string_hash_to_newline(hapothecary),-2,580); + if (scr_hit(600,575,785,575+hei)){ + obj_cursor.image_index=2; + if (scr_click_left()) and (!instance_exists(obj_creation_popup)){ + text_selected="capoth"; + keyboard_string=hapothecary; + } + } + if (text_selected="capoth") then hapothecary=keyboard_string; + draw_rectangle(600-1,575-1,785,575+hei,1); + + var _refresh_capoth_name_btn =[794, 574, 794+20, 574+20]; + draw_unit_buttons(_refresh_capoth_name_btn,"?", [1,1], CM_GREEN_COLOR,,fnt_40k_14b); + if(point_and_click(_refresh_capoth_name_btn)){ + var _new_capoth_name = global.name_generator.generate_space_marine_name(); + show_debug_message_adv($"regen name of hapothecary from {hapothecary} to {_new_capoth_name}"); + hapothecary = _new_capoth_name; + } + } + } + + if (race[100,14]!=0){ + draw_set_color(CM_GREEN_COLOR);if (hchaplain="") then draw_set_color(c_red); + if (text_selected!="chap") or (custom != eCHAPTER_TYPE.CUSTOM) then draw_text_ext(600,597,string_hash_to_newline(string(hchaplain)),-1,580); + if (custom == eCHAPTER_TYPE.CUSTOM){ + if (text_selected="chap") and (text_bar>30) then draw_text_ext(600,597,string_hash_to_newline(string(hchaplain)),-1,580); + if (text_selected="chap") and (text_bar<=30) then draw_text_ext(600,597,string_hash_to_newline(string(hchaplain)+"|"),-1,580); + var str_width,hei;str_width=0;hei=string_height_ext(string_hash_to_newline(hchaplain),-2,580); + if (scr_hit(600,597,785,597+hei)){obj_cursor.image_index=2; + if (scr_click_left()) and (!instance_exists(obj_creation_popup)){text_selected="chap";keyboard_string=hchaplain;} + } + if (text_selected="chap") then hchaplain=keyboard_string; + draw_rectangle(600-1,597-1,785,597+hei,1); + + var _refresh_chap_name_btn =[794, 597, 794+20, 597+20]; + draw_unit_buttons(_refresh_chap_name_btn,"?", [1,1], CM_GREEN_COLOR,,fnt_40k_14b); + if(point_and_click(_refresh_chap_name_btn)){ + var _new_chap_name = global.name_generator.generate_space_marine_name(); + show_debug_message_adv($"regen name of hchaplain from {hchaplain} to {_new_chap_name}"); + hchaplain = _new_chap_name; + } + } + } + + if (race[100,17]!=0){ + draw_set_color(CM_GREEN_COLOR);if (clibrarian="") then draw_set_color(c_red); + if (text_selected!="libra") or (custom != eCHAPTER_TYPE.CUSTOM) then draw_text_ext(600,619,string_hash_to_newline(string(clibrarian)),-1,580); + if (custom == eCHAPTER_TYPE.CUSTOM){ + if (text_selected="libra") and (text_bar>30) then draw_text_ext(600,619,string_hash_to_newline(string(clibrarian)),-1,580); + if (text_selected="libra") and (text_bar<=30) then draw_text_ext(600,619,string_hash_to_newline(string(clibrarian)+"|"),-1,580); + var str_width,hei;str_width=0;hei=string_height_ext(string_hash_to_newline(clibrarian),-2,580); + if (scr_hit(600,619,785,619+hei)){obj_cursor.image_index=2; + if (scr_click_left()) and (!instance_exists(obj_creation_popup)){text_selected="libra";keyboard_string=clibrarian;} + } + if (text_selected="libra") then clibrarian=keyboard_string; + draw_rectangle(600-1,619-1,785,619+hei,1); + + var _refresh_libra_name_btn =[794, 619, 794+20, 619+20]; + draw_unit_buttons(_refresh_libra_name_btn,"?", [1,1], CM_GREEN_COLOR,,fnt_40k_14b); + if(point_and_click(_refresh_libra_name_btn)){ + var _new_libra_name = global.name_generator.generate_space_marine_name(); + show_debug_message_adv($"regen name of clibrarian from {clibrarian} to {_new_libra_name}"); + clibrarian = _new_libra_name; + } + } + } + + if (race[100,16]!=0){ + draw_set_color(CM_GREEN_COLOR);if (fmaster="") then draw_set_color(c_red); + if (text_selected!="forge") or (custom != eCHAPTER_TYPE.CUSTOM) then draw_text_ext(600,641,string_hash_to_newline(string(fmaster)),-1,580); + if (custom == eCHAPTER_TYPE.CUSTOM){ + if (text_selected="forge") and (text_bar>30) then draw_text_ext(600,641,string_hash_to_newline(string(fmaster)),-1,580); + if (text_selected="forge") and (text_bar<=30) then draw_text_ext(600,641,string_hash_to_newline(string(fmaster)+"|"),-1,580); + var str_width,hei;str_width=0;hei=string_height_ext(string_hash_to_newline(fmaster),-2,580); + if (scr_hit(600,641,785,641+hei)){obj_cursor.image_index=2; + if (scr_click_left()) and (!instance_exists(obj_creation_popup)){text_selected="forge";keyboard_string=fmaster;} + } + if (text_selected="forge") then fmaster=keyboard_string; + draw_rectangle(600-1,641-1,785,641+hei,1); + + var _refresh_forge_name_btn =[794, 641, 794+20, 641+20]; + draw_unit_buttons(_refresh_forge_name_btn,"?", [1,1], CM_GREEN_COLOR,,fnt_40k_14b); + if(point_and_click(_refresh_forge_name_btn)){ + var _new_forge_name = global.name_generator.generate_space_marine_name(); + show_debug_message_adv($"regen name of fmaster from {fmaster} to {_new_forge_name}"); + fmaster = _new_forge_name; + } + } + } + + draw_set_color(CM_GREEN_COLOR);if (recruiter="") then draw_set_color(c_red); + if (text_selected!="recr") or (custom != eCHAPTER_TYPE.CUSTOM) then draw_text_ext(600,663,string_hash_to_newline(string(recruiter)),-1,580); + if (custom == eCHAPTER_TYPE.CUSTOM){ + if (text_selected="recr") and (text_bar>30) then draw_text_ext(600,663,string_hash_to_newline(string(recruiter)),-1,580); + if (text_selected="recr") and (text_bar<=30) then draw_text_ext(600,663,string_hash_to_newline(string(recruiter)+"|"),-1,580); + var str_width,hei;str_width=0;hei=string_height_ext(string_hash_to_newline(recruiter),-2,580); + if (scr_hit(600,663,785,663+hei)){obj_cursor.image_index=2; + if (scr_click_left()) and (!instance_exists(obj_creation_popup)){text_selected="recr";keyboard_string=recruiter;} + } + if (text_selected="recr") then recruiter=keyboard_string; + draw_rectangle(600-1,663-1,785,663+hei,1); + + var _refresh_recr_name_btn =[794, 663, 794+20, 663+20]; + draw_unit_buttons(_refresh_recr_name_btn,"?", [1,1], CM_GREEN_COLOR,,fnt_40k_14b); + if(point_and_click(_refresh_recr_name_btn)){ + var _new_recr_name = global.name_generator.generate_space_marine_name(); + show_debug_message_adv($"regen name of recruiter from {recruiter} to {_new_recr_name}"); + recruiter = _new_recr_name; + } + } + + draw_set_color(CM_GREEN_COLOR);if (admiral="") then draw_set_color(c_red); + if (text_selected!="admi") or (custom != eCHAPTER_TYPE.CUSTOM) then draw_text_ext(600,685,string_hash_to_newline(string(admiral)),-1,580); + if (custom == eCHAPTER_TYPE.CUSTOM){ + if (text_selected="admi") and (text_bar>30) then draw_text_ext(600,685,string_hash_to_newline(string(admiral)),-1,580); + if (text_selected="admi") and (text_bar<=30) then draw_text_ext(600,685,string_hash_to_newline(string(admiral)+"|"),-1,580); + var str_width,hei;str_width=0;hei=string_height_ext(string_hash_to_newline(admiral),-2,580); + if (scr_hit(600,685,785,685+hei)){obj_cursor.image_index=2; + if (scr_click_left()) and (!instance_exists(obj_creation_popup)){text_selected="admi";keyboard_string=admiral;} + } + if (text_selected="admi") then admiral=keyboard_string; + draw_rectangle(600-1,685-1,785,685+hei,1); + + var _refresh_admi_name_btn =[794, 685, 794+20, 685+20]; + draw_unit_buttons(_refresh_admi_name_btn,"?", [1,1], CM_GREEN_COLOR,,fnt_40k_14b); + if(point_and_click(_refresh_admi_name_btn)){ + var _new_admi_name = global.name_generator.generate_space_marine_name(); + show_debug_message_adv($"regen name of admiral from {admiral} to {_new_admi_name}"); + admiral = _new_admi_name; + } + } + } + pop_draw_return_values(); +} \ No newline at end of file diff --git a/scripts/scr_role_setup/scr_role_setup.yy b/scripts/scr_role_setup/scr_role_setup.yy new file mode 100644 index 0000000000..410af4f226 --- /dev/null +++ b/scripts/scr_role_setup/scr_role_setup.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_role_setup", + "isCompatibility":false, + "isDnD":false, + "name":"scr_role_setup", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_roster/scr_roster.gml b/scripts/scr_roster/scr_roster.gml index 68be5a41cf..a807c8cdf5 100644 --- a/scripts/scr_roster/scr_roster.gml +++ b/scripts/scr_roster/scr_roster.gml @@ -278,12 +278,9 @@ function Roster() constructor{ } } else { if (!array_contains(_squads, "dreadnought")){ - var _armour_data = _unit.get_armour_data(); - if (is_struct(_armour_data)){ - if (_armour_data.has_tag("dreadnought")){ - array_push(_squads, "dreadnought"); - new_squad_button("Dreadnought", "dreadnought"); - } + if (_unit.is_dreadnought()){ + array_push(_squads, "dreadnought"); + new_squad_button("Dreadnought", "dreadnought"); } } } @@ -377,7 +374,7 @@ function Roster() constructor{ } } if (_add){ - add_unit_to_battle(_unit, meeting); + add_unit_to_battle(_unit, meeting, true); } } else { var _vehic = selected_units[i]; @@ -721,24 +718,24 @@ function add_vehicle_to_battle(company, veh_index, is_local){ if (obj_ini.veh_role[company][v] = "Land Speeder") { - targ.veh_hp[targ.veh] = obj_ini.veh_hp[company][v] * 3; - targ.veh_hp_multiplier[targ.veh] = 3; - targ.veh_ac[targ.veh] = 30; + targ.veh_hp[targ.veh] = obj_ini.veh_hp[company][v] * 2.5; + targ.veh_hp_multiplier[targ.veh] = 2.5; + targ.veh_ac[targ.veh] = 25; } else if (obj_ini.veh_role[company][v] = "Rhino") or(obj_ini.veh_role[company][v] = "Whirlwind") { - targ.veh_hp[targ.veh] = obj_ini.veh_hp[company][v] * 5; - targ.veh_hp_multiplier[targ.veh] = 5; - targ.veh_ac[targ.veh] = 40; + targ.veh_hp[targ.veh] = obj_ini.veh_hp[company][v] * 3; + targ.veh_hp_multiplier[targ.veh] = 3; + targ.veh_ac[targ.veh] = 35; } else if (obj_ini.veh_role[company][v] = "Predator") { - targ.veh_hp[targ.veh] = obj_ini.veh_hp[company][v] * 6; - targ.veh_hp_multiplier[targ.veh] = 6; - targ.veh_ac[targ.veh] = 45; + targ.veh_hp[targ.veh] = obj_ini.veh_hp[company][v] * 3; + targ.veh_hp_multiplier[targ.veh] = 3; + targ.veh_ac[targ.veh] = 40; } else if (obj_ini.veh_role[company][v] = "Land Raider") { - targ.veh_hp[targ.veh] = obj_ini.veh_hp[company][v] * 8; - targ.veh_hp_multiplier[targ.veh] = 8; - targ.veh_ac[targ.veh] = 50; + targ.veh_hp[targ.veh] = obj_ini.veh_hp[company][v] * 4; + targ.veh_hp_multiplier[targ.veh] = 4; + targ.veh_ac[targ.veh] = 40; } // STC Bonuses diff --git a/scripts/scr_ruins_reward/scr_ruins_reward.gml b/scripts/scr_ruins_reward/scr_ruins_reward.gml index 32d2b01a7d..fa6db5ae4f 100644 --- a/scripts/scr_ruins_reward/scr_ruins_reward.gml +++ b/scripts/scr_ruins_reward/scr_ruins_reward.gml @@ -10,11 +10,9 @@ function scr_ruins_reward(star_system, planet, _ruins) { // star_system: world object // planet: planet // ruins_type: ruins_type - var dice=floor(random(100))+1; + var dice=roll_dice_chapter(1, 100, "high"); var loot=""; - if (scr_has_disadv("Shitty Luck")) then dice-=10; - if (dice>0) and (dice<=35) then loot="req";// if (dice>35) and (dice<=50) then loot="gear";// if (dice>50) and (dice<=60) then loot="artifact";// @@ -31,20 +29,20 @@ function scr_ruins_reward(star_system, planet, _ruins) { if (ruins_type>=10) then loot="req";// } - with(obj_p_fleet){ - if (action!="") then instance_deactivate_object(id); - } - flea=instance_nearest(star_system.x,star_system.y,obj_p_fleet); var _chosen_ship = -1; - var _ships = fleet_full_ship_array(flea); - if (array_length(_ships)){ - _chosen_ship = _ships[0]; + + var _fleet = scr_orbiting_player_fleet(star_system); + if (instance_exists(_fleet)){ + var _ships = fleet_full_ship_array(_fleet); + if (array_length(_ships)){ + _chosen_ship = _ships[0]; + } } scr_event_log("",$"The Ancient Ruins on {planet_numeral_name(planet,star_system)} has been explored.", star_system.name); // loot="artifact"; - if (loot="req"){// Requisition + if (loot == "req"){// Requisition var reqi=round(random_range(30,60)+1)*10; obj_controller.requisition+=reqi; @@ -53,7 +51,7 @@ function scr_ruins_reward(star_system, planet, _ruins) { pop.title="Ancient Ruins: Resources"; pop.text="My lord, your battle brothers have located several precious minerals and supplies within the ancient ruins. Everything was taken and returned to the ship, granting "+string(reqi)+" Requisition."; } - else if (loot="artifact"){ + else if (loot == "artifact"){ if (_chosen_ship>-1){ var last_artifact = scr_add_artifact("random", "random", 4, planet, _chosen_ship + 500); @@ -81,87 +79,130 @@ function scr_ruins_reward(star_system, planet, _ruins) { scr_event_log("","STC Fragment recovered from Ancient Ruins."); } else if (loot="gear"){ - var wep1="",wen1=0,wep2="",wen2=0,wep3="",wen3=0; - - if (ruins_type<=2) or (ruins_type>=10){ - wep1=choose("Power Fist","Chainfist","Power Axe","Power Sword"); - wen1=choose(2,3,4,5); - wep2=choose("Flamer","Meltagun","Combiflamer","Sniper Rifle"); - wen2=choose(3,4,5,6,7,8); - wep3=choose("Missile Launcher","Heavy Bolter","Lascannon","Plasma Pistol"); - wen3=choose(1,2,3); - }else if (ruins_type=3){ - wep1=choose("Terminator Armour"); - wen1=choose(1,2); - wep2=choose("Bionics"); - wen2=choose(5,6,7); - wep3=choose("Narthecium","Psychic Hood","Rosarius"); - wen3=choose(1); - } - else if (ruins_type=4){ - wep1=choose("MK4 Maximus"); - wen1=choose(2,3); - wep2=choose("MK6 Corvus"); - wen2=choose(4,5,6); - wep3=choose("MK8 Errant"); - wen3=choose(1,2); - } - else if (ruins_type=5){ - wep1=choose("Eviscerator","Underslung Flamer"); - wen1=choose(2,3,4,5); - wep2=choose("Flamer","Meltagun","Combiflamer"); - wen2=choose(3,4,5,6,7,8); - wep3=choose("Heavy Flamer","Heavy Bolter","Plasma Pistol"); - wen3=choose(1,2,3); - } - else if (ruins_type=6){ - wep1=choose("Eldar Power Sword","Power Spear"); - wen1=choose(1,2); - wep2=choose("Storm Shield","Twin Linked Bolters"); - wen2=choose(1,2); - wep3=choose("Archeotech Laspistol","Plasma Pistol"); - wen3=choose(1,2); - } - else if (ruins_type=7){ - wep1=choose("Autocannon"); - wen1=choose(1,2); - wep2=choose("Heavy Bolters","Twin Linked Heavy Bolter"); - wen2=choose(1,2,3); - wep3=choose("Twin Linked Lascannon","Lascannon"); - wen3=choose(1,2); - }else if (ruins_type=8){ - wep1=choose("Iron Halo"); - wen1=choose(1,2); - wep2=choose("Company Standard"); - wen2=choose(1); - wep3=choose("Servo-harness"); - wen3=choose(1); - } - - + var wep1="",wen1=0,wep2="",wen2=0,wep3="",wen3=0,wep4="",wen4=0,wep5="",wen5=0,wep6="",wen6=0,wep7="",wen7=0,wep8="",wen8=0; + + +//Fallen Terminator Squad +if (ruins_type<=2) or (ruins_type>=10){ + wep1=choose("Tartaros","Terminator Armour","Cataphractii"); + wen1=choose(1,2,3); + wep2=choose("Tigris Combi Bolter","Volkite Charger"); + wen2=choose(1,2,); + wep3=choose("Power Fist","Chainfist","Power Mace","Relic Blade","Power Spear","Lightning Claw","Power Scythe"); + wen3=choose(1,2,3); + wep4=choose("Assault Cannon","Plasma Cannon",); + wen4=choose(0,1); + wep5=choose("Company Standard","Narthecium","Psychic Hood","Rosarius"); + wen5=choose(0,1); + wep6="Storm Shield"; + wen6=choose(1,2,3); +} +//Fallen Tactical Squad +else if (ruins_type=3){ + wep1=choose("MK3 Iron Armour","MK4 Maximus","MK5 Heresy"); + wen1=choose(3,4,5,6); + wep2="Phobos Bolter"; + wen2=choose(2,3); + wep3=choose("Ryza Plasma Gun","Volkite Charger","Volkite Caliver"); + wen3=choose(1,2); + wep4=choose("Primus Melta Gun", "Phaestos Flamer"); + wen4=choose(1,2); + wep5=choose("Ryza Plasma Pistol","Phobos Bolt Pistol","Volkite Serpenta"); + wen5=choose(0,1) + wep6=choose("Power Sword","Chain Axe","Power Axe","Power Fist"); + wen6=choose(0,1); + wep7=choose("Company Standard","Narthecium","Psychic Hood","Rosarius"); + wen7=choose(0,1); + wep8="Bionics"; + wen8=choose(1,2,3); +} +//Fallen Devastator Squad +else if (ruins_type=4){ + wep1=choose("MK3 Iron","MK4 Maximus","MK6 Corvus"); + wen1=choose(3,4,5); + wep2="Mars Heavy Bolter"; + wen2=choose(2,3); + wep3=choose("Mars Plasma Cannon","Volkite Culverin",); + wen3=choose(1,2); + wep4=choose("Ryza Las Cannon","Cthon Auto Cannon"); + wen4=choose(1,2); + wep5=choose("Ryza Plasma Pistol","Phobos Bolt Pistol","Volkite Serpenta"); + wen5=choose(0,1) + wep6=choose("Power Sword","Chain Axe","Power Axe","Power Fist"); + wen6=choose(0,1); + wep7=choose("Company Standard","Narthecium","Psychic Hood","Rosarius"); + wen7=choose(0,1); + wep8="Heavy Weapons Pack"; + wen8=choose(1,2,3); +} +//Fallen Assault Squad +else if (ruins_type=5){ + wep1=choose("MK4 Maximus","MK6 Corvus","MK5 Heresy"); + wen1=choose(3,4,5); + wep2=choose("Chainsword","Chain Axe"); + wen2=choose(2,3); + wep3=choose("Power Sword","Power Axe","Power Fist"); + wen3=choose(1,2); + wep4=choose("Lightning Claws ","Power Scythe"); + wen4=choose(1,2); + wep5=choose("Ryza Plasma Pistol","Phobos Bolt Pistol","Volkite Serpenta"); + wen5=choose(0,1) + wep6=choose("Primus Melta Gun","Phaestos Flamer"); + wen6=choose(0,1); + wep7=choose("Company Standard","Narthecium","Psychic Hood","Rosarius"); + wen7=choose(0,1); + wep8="Serpha Jump Pack"; + wen8=choose(1,2,3); +} +//Fallen Breacher Squad +else if (ruins_type=6){ +wep1=choose("MK3 Iron Armour","MK4 Maximus","MK5 Heresy"); + wen1=choose(3,4,5,6); + wep2="Primus Melta Gun"; + wen2=choose(2,3); + wep3=choose("Ryza Plasma Gun","Volkite Charger","Volkite Caliver"); + wen3=choose(1,2); + wep4=choose("Phobos Bolter", "Phaestos Flamer"); + wen4=choose(1,2); + wep5=choose("Ryza Plasma Pistol","Phobos Bolt Pistol","Volkite Serpenta"); + wen5=choose(0,1) + wep6=choose("Power Sword","Chain Axe","Power Axe","Power Fist"); + wen6=choose(0,1); + wep7=choose("Company Standard","Narthecium","Psychic Hood","Rosarius"); + wen7=choose(0,1); + wep8="Boarding Shield"; + wen8=choose(1,2,3); +} +//Damaged Dreadnought +else if (ruins_type==7){ + wep1="Contemptor Dreadnought"; + wen1=1; + wep2=choose("Twin-linked Volkite Culverins","Heavy Conversion Beamer","Kheres Assault Cannon"); + wen2=1; + wep3="Contemptor CCW"; + wen3=3; +} + + scr_add_item(wep1,wen1); scr_add_item(wep2,wen2); scr_add_item(wep3,wen3); + scr_add_item(wep4,wen4); + scr_add_item(wep5,wen5); + scr_add_item(wep6,wen6); + scr_add_item(wep7,wen7); + scr_add_item(wep8,wen8); var pop; pop=instance_create(0,0,obj_popup); pop.image="ancient_ruins"; pop.title="Ancient Ruins: Gear"; - pop.text="These ruins were once an armoury. We found some weapons and pieces of wargear. "+string(wen1)+"x "+string(wep1)+", "+string(wen2)+"x "+string(wep2)+", and "+string(wen3)+"x "+string(wep3)+" have been added to the Armamentarium."; + pop.text="My lord, your brothers have found sealed chamber in these ruins. It bears symbols of one of the ancient legions. After your tech-marines managed to open this chamber, they've found a number of relics that can be brought back to service. They've found: "+string(wen1)+"x "+string(wep1)+", "+string(wen2)+"x "+string(wep2)+","+string(wen3)+"x "+string(wep3)+","+string(wen4)+"x "+string(wep4)+","+string(wen5)+"x "+string(wep5)+","+string(wen6)+"x "+string(wep6)+","+string(wen7)+"x "+string(wep7)+", and "+string(wen8)+"x "+string(wep8)+" have been added to the Armamentarium."; } else if (loot="gene_seed"){// Requisition - var gene,pop;gene=floor(random_range(20,40))+1; - pop=instance_create(0,0,obj_popup); - pop.image="geneseed_lab"; - pop.title="Ancient Ruins: Gene-seed"; - pop.text="My lord, your battle brothers have located a hidden, fortified laboratory within the ruins. Contained are a number of bio-vaults with astartes gene-seed; "+string(gene)+" in number. Your marines are not able to determine the integrity or origin."; - pop.option1="Add the gene-seed to chapter vaults."; - pop.option2="Salvage the laboratory for requisition."; - pop.option3="Leave the laboratory as is."; - pop.estimate=gene; + ancient_gene_lab_ruins_loot(); } else if (loot="bunker"){// Bunker - var gene=floor(random_range(20,40))+1,pop=instance_create(0,0,obj_popup);; pop.image="ruins_bunker"; pop.title="Ancient Ruins: Bunker Network"; pop.text="Your battle brothers have found several entrances into an ancient bunker network. Its location has been handed over to the PDF. The planet's defense rating has increased to "; @@ -171,16 +212,7 @@ function scr_ruins_reward(star_system, planet, _ruins) { star_system.p_fortified[planet]=min(star_system.p_fortified[planet]+1,5); } else if (loot="fortress"){// Fortress - var pop,gene=floor(random_range(20,40))+1; - pop=instance_create(0,0,obj_popup); - pop.image="ruins_fort"; - pop.title="Ancient Ruins: Fortress"; - pop.planet = planet; - pop.feature = _ruins; - pop.star_system = star_system; - pop.text="Praise the Emperor! We have found a massive, ancient fortress in needs of repairs. The gun batteries are rusted, and the walls are covered in moss with huge hole in it. Such a pity that such a majestic building is now a pale shadow of its former glory. It is possible to repair the structure. What is thy will?"; - pop.option1="Repair the fortress to boost defenses. (1000 Req)"; - pop.option2="Salvage raw materials from the fortress."; + ancient_fortress_ruins_loot(star_system, planet, _ruins) } else if (loot="starship"){// Starship var pop=instance_create(0,0,obj_popup); @@ -197,3 +229,103 @@ function scr_ruins_reward(star_system, planet, _ruins) { } } + +function ancient_gene_lab_ruins_loot(){ + var _text = $"My lord, your battle brothers have located a hidden, fortified laboratory within the ruins. Contained are a number of bio-vaults with astartes gene-seed; {gene} in number. Your marines are not able to determine the integrity or origin."; + + var _pop_data = { + gene_found : gene, + options : [ + { + str1: "Add the gene-seed to chapter vaults.", + choice_func: function() { + image = ""; + var _estimate = irandom_range(3,15) + text = string(_estimate) + " gene-seed has been added to the chapter vaults."; + reset_popup_options(); + obj_controller.gene_seed += _estimate; + //scr_play_sound(snd_success); + with (obj_ground_mission) { + instance_destroy(); + } + }, + }, + { + str1: "Salvage the laboratory for requisition.", + choice_func: function() { + var _req = floor(random_range(200, 500)) + 1; + image = ""; + text = "Technological components have been salvaged, granting " + string(_req) + " requisition."; + reset_popup_options(); + obj_controller.requisition += _req; + //scr_play_sound(snd_salvage); + with (obj_ground_mission) { + instance_destroy(); + } + }, + }, + { + str1: "Leave the laboratory as is.", + choice_func: function() { + with (obj_ground_mission) { + instance_destroy(); + } + //scr_play_sound(snd_cancel); + popup_default_close(); + }, + }, + ], + } + scr_popup( + "Ancient Ruins: Gene-seed", + _text, + "geneseed_lab", + _pop_data + ); + +} + +function ancient_fortress_ruins_loot(star_system, planet, _ruins){ + var _pop_data = {}; + _pop_data.planet = planet; + _pop_data.feature = _ruins; + _pop_data.star = star_system; + _pop_data.options = [ + { + str1 : "Repair the fortress to boost defenses. (1000 Req)", + choice_func : function(){ + var _star = pop_data.star; + var _planet = pop_data.planet; + obj_controller.requisition -= 1000; + text = "Resources have been spent on the planet to restore the fortress. The planet's defense rating has increased to 5 ("; + reset_popup_options(); + text += string(_star.p_fortified[_planet]) + "+"; + text += string(5 - _star.p_fortified[_planet]) + ")"; + _star.p_fortified[_planet] = max(_star.p_fortified[_planet], 5); + cooldown = 15; + exit; + }, + requires : { + req : 1000, + } + }, + { + str1 : "Salvage raw materials from the fortress.", + choice_func : function(){ + var req = irandom_range(200, 500); + image = ""; + text = $"Much of the fortress is demolished in order to salvage adamantium and raw materials. The opration has yielded {req} requisition."; + reset_popup_options(); + obj_controller.requisition += req; + cooldown = 15; + exit; + } + } + ] + scr_popup( + "Ancient Ruins: Fortress", + "Praise the Emperor! We have found a massive, ancient fortress in needs of repairs. The gun batteries are rusted, and the walls are covered in moss with huge hole in it. Such a pity that such a majestic building is now a pale shadow of its former glory. It is possible to repair the structure. What is thy will?", + "ruins_fort", + _pop_data + ); +}; diff --git a/scripts/scr_save_controller/scr_save_controller.gml b/scripts/scr_save_controller/scr_save_controller.gml index 961e42aaf8..787a93951b 100644 --- a/scripts/scr_save_controller/scr_save_controller.gml +++ b/scripts/scr_save_controller/scr_save_controller.gml @@ -216,9 +216,6 @@ function scr_save_controller(save_id){ ini_write_real("Factions","annoyed"+string(g),obj_controller.annoyed[g]); ini_write_real("Factions","ignore"+string(g),obj_controller.ignore[g]); ini_write_real("Factions","turns_ignored"+string(g),obj_controller.turns_ignored[g]); - - ini_write_real("Factions","audience"+string(g),obj_controller.audien[g]); - ini_write_string("Factions","audience_topic"+string(g),obj_controller.audien_topic[g]); } // var g;g=0; @@ -228,10 +225,6 @@ function scr_save_controller(save_id){ ini_write_real("Ongoing","quest_end"+string(g),obj_controller.quest_end[g]); } var g;g=0; - repeat(99){g+=1; - ini_write_string("Ongoing","event"+string(g),obj_controller.event[g]); - ini_write_real("Ongoing","event_duration"+string(g),obj_controller.event_duration[g]); - } // ini_write_real("Controller","justmet",obj_controller.faction_justmet); ini_write_real("Controller","check_number",obj_controller.check_number); diff --git a/scripts/scr_scrollbar/scr_scrollbar.gml b/scripts/scr_scrollbar/scr_scrollbar.gml index 0d71359650..6f88ba200e 100644 --- a/scripts/scr_scrollbar/scr_scrollbar.gml +++ b/scripts/scr_scrollbar/scr_scrollbar.gml @@ -22,7 +22,7 @@ function scr_scrollbar(argument0, argument1, argument2, argument3, argument4, ar var xx,yy,x1,x2,y1,y2; var siz1, siz2, siz3; - // draw_set_color(38144); + // draw_set_color(CM_GREEN_COLOR); xx=0;yy=0;x1=0;x2=0;y1=0;y2=0;temp1=0;temp2=0; siz1=0;siz2=0;siz3=0; @@ -99,7 +99,7 @@ function scr_scrollbar(argument0, argument1, argument2, argument3, argument4, ar ratio=(center-argument1)/(argument3-argument1); // draw_set_font(fnt_large);draw_set_color(c_red);draw_text(view_xview[0]+320,view_yview[0]+240,ratio); - // draw_set_color(38144); + // draw_set_color(CM_GREEN_COLOR); if (checka=1){ obj_controller.man_current=floor((obj_controller.man_max)*ratio); @@ -156,6 +156,16 @@ function ScrollableContainer(_width, _height) constructor { draw_clear_alpha(c_white, 0); }; + mouse_binds = []; + static add_scroll_mousse_binds = function(pre_offset_coords, bind_method){ + array_push(mouse_binds, pre_offset_coords); + } + + children = []; + static add_children = function(pre_offset_coords, object, method, arguments){ + array_push(children, {object, pre_offset_coords, method, arguments}); + } + static stop_draw_to_surface = function() { surface_reset_target(); }; @@ -229,7 +239,13 @@ function ScrollableContainer(_width, _height) constructor { // Draw content draw_surface_part(surface, 0, scroll_offset, width - scrollbar_width, height, pos_x, pos_y); - + for (var i=0;i 0) && (stop == 0) && (shots_fired > 0)) { var damage_per_weapon, hit_number; @@ -132,11 +132,8 @@ function scr_shoot(weapon_index_position, target_object, target_type, damage_dat hostile_type = 1; hostile_range = range[weapon_index_position]; hostile_splash = attack_count_mod; - if (hostile_splash > 1) { - hostile_damage += attack_count_mod * 3; - } - scr_clean(target_object, hostile_type, hit_number, hostile_damage, hostile_weapon, hostile_range, hostile_splash); + scr_clean(target_object, hostile_type, hit_number, hostile_damage, hostile_weapon, hostile_range, hostile_splash, weapon_index_position); } } else if (((damage_type == "arp") || (damage_type == "dread")) && (armour_pierce > 0) && (stop == 0) && (shots_fired > 0)) { var damage_per_weapon, hit_number; @@ -144,7 +141,9 @@ function scr_shoot(weapon_index_position, target_object, target_type, damage_dat if (aggregate_damage == 0) { damage_per_weapon = shots_fired; } - + if (melee_or_ranged != "wall") { + shots_fired *= attack_count_mod; + } if (melee_or_ranged == "melee") { if (shots_fired > ((target_object.veh + target_object.dreads) * 5)) { doom = ((target_object.veh + target_object.dreads) * 5) / shots_fired; @@ -156,9 +155,6 @@ function scr_shoot(weapon_index_position, target_object, target_type, damage_dat damage_per_weapon = floor((doom * damage_per_weapon)); hit_number = floor(hit_number * doom); } - if (melee_or_ranged != "wall") { - shots_fired *= attack_count_mod; - } if (damage_per_weapon == 0) { damage_per_weapon = shots_fired * doom; @@ -169,9 +165,6 @@ function scr_shoot(weapon_index_position, target_object, target_type, damage_dat hostile_range = range[weapon_index_position]; hostile_splash = attack_count_mod; hostile_damage = damage_per_weapon / hit_number; - if (hostile_splash > 1) { - hostile_damage += attack_count_mod * 3; - } if (melee_or_ranged == "wall") { var dest = 0; @@ -191,14 +184,14 @@ function scr_shoot(weapon_index_position, target_object, target_type, damage_dat target_object.hostile_shooters = (wep_owner[weapon_index_position] == "assorted") ? 999 : 1; hostile_type = 0; - scr_clean(target_object, hostile_type, hit_number, hostile_damage, hostile_weapon, hostile_range, hostile_splash); + scr_clean(target_object, hostile_type, hit_number, hostile_damage, hostile_weapon, hostile_range, hostile_splash, weapon_index_position); } } } } if (instance_exists(target_object) && (owner == eFACTION.Player)) { - // show_debug_message("{0}, {1}, {2}, {3}, {4}", wep_num[weapon_index_position], wep[weapon_index_position], splash[weapon_index_position], range[weapon_index_position], att[weapon_index_position]) + // show_debug_message_adv("{0}, {1}, {2}, {3}, {4}", wep_num[weapon_index_position], wep[weapon_index_position], splash[weapon_index_position], range[weapon_index_position], att[weapon_index_position]) var shots_fired = 0; var stop = 0; var damage_type = ""; @@ -299,30 +292,43 @@ function scr_shoot(weapon_index_position, target_object, target_type, damage_dat if (weapon_index_position == -52) { wii = "Missile Launcher Emplacement"; at = 200; - armour_pierce = 1; + armour_pierce = -1; } if (weapon_index_position == -53) { wii = "Missile Silo"; at = 250; - ar = 0; + armour_pierce = 0; } } target_armour_value = target_object.dudes_ac[target_type]; + // Calculate final armor value based on armor piercing (AP) rating against target type if (target_object.dudes_vehicle[target_type]) { - if (armour_pierce == 0) { - target_armour_value = target_armour_value * 6; + if (armour_pierce == 4) { + target_armour_value = 0; } - if (armour_pierce == -1) { - target_armour_value = damage_per_weapon; + if (armour_pierce == 3) { + target_armour_value = target_armour_value * 2; + } + if (armour_pierce == 2) { + target_armour_value = target_armour_value * 4; } - } else { if (armour_pierce == 1) { + target_armour_value = target_armour_value * 6; + } + } else { + if (armour_pierce == 4) { target_armour_value = 0; } - if (armour_pierce == -1) { - target_armour_value = target_armour_value * 6; + if (armour_pierce == 3) { + target_armour_value = target_armour_value * 1.5; + } + if (armour_pierce == 2) { + target_armour_value = target_armour_value * 2; + } + if (armour_pierce == 1) { + target_armour_value = target_armour_value * 3; } } @@ -423,18 +429,27 @@ function scr_shoot(weapon_index_position, target_object, target_type, damage_dat target_armour_value2 = target_object.dudes_ac[godd]; if (target_object.dudes_vehicle[godd] == 0) { if (ap2 == 1) { - target_armour_value2 = 0; + target_armour_value2 = target_armour_value2 * 3; } - if (ap2 == -1) { - target_armour_value2 = target_armour_value2 * 6; + if (ap2 == 2) { + target_armour_value2 = target_armour_value2 * 2; + } + if (ap2 == 3) { + target_armour_value2 = target_armour_value2 * 1.5; + } + if (ap2 == 4) { + target_armour_value2 = 0; } } if (target_object.dudes_vehicle[godd] == 1) { - if (ap2 == 0) { + if (ap2 == 1) { target_armour_value2 = target_armour_value2 * 6; } - if (ap2 == -1) { - target_armour_value2 = damage_per_weapon; + if (ap2 == 2) { + target_armour_value2 = target_armour_value2 * 4; + } + if (ap2 == 3) { + target_armour_value2 = target_armour_value2 * 2; } } b2 = a2 - target_armour_value2; diff --git a/scripts/scr_special_view/scr_special_view.gml b/scripts/scr_special_view/scr_special_view.gml index 2704832982..85428f6cdf 100644 --- a/scripts/scr_special_view/scr_special_view.gml +++ b/scripts/scr_special_view/scr_special_view.gml @@ -20,7 +20,6 @@ function scr_special_view(command_group) { penit_co[i]=0; penit_id[i]=0; } - // if (i<=100){event[i]="";event_duration[i]=0;} } reset_manage_arrays(); @@ -32,33 +31,13 @@ function scr_special_view(command_group) { // mans: number of mans that a hit has gotten b=0; - if (command_group==11) or (command_group==0){ //HQ units - for (var v = 0;v-1){ - var ham=obj_ini.TTRPG[0][v].ship_location; - if (obj_ini.ship_location[ham]=="Lost") then continue; - } - - unit = obj_ini.TTRPG[0][v]; - var yep=0; - if (unit.base_group!="astartes") and (unit.base_group!="none"){ - yep=1; - } - if ((unit.role()==obj_ini.role[100][eROLE.ChapterMaster] || unit.role()==obj_ini.role[100][eROLE.HonourGuard])){ - yep=1; - } - if (yep==1){ - add_man_to_manage_arrays(unit); - } - } - } + var _already_used = []; if (command_group==12) or (command_group==0){// Apothecarion var apothecaries = collect_role_group([SPECIALISTS_APOTHECARIES,true]); for (var i=0;i-1){ + var ham=obj_ini.TTRPG[0][v].ship_location; + if (obj_ini.ship_location[ham]=="Lost") then continue; + } + + unit = obj_ini.TTRPG[0][v]; + yep = !(unit.IsSpecialist(SPECIALISTS_TECHS) || unit.IsSpecialist(SPECIALISTS_CHAPLAINS) || unit.IsSpecialist(SPECIALISTS_LIBRARIANS) || unit.IsSpecialist(SPECIALISTS_APOTHECARIES) ); + if (yep){ + add_man_to_manage_arrays(unit); + } + } + } + diff --git a/scripts/scr_specialist_point_handler/scr_specialist_point_handler.gml b/scripts/scr_specialist_point_handler/scr_specialist_point_handler.gml index 2c4944f801..45fca2c535 100644 --- a/scripts/scr_specialist_point_handler/scr_specialist_point_handler.gml +++ b/scripts/scr_specialist_point_handler/scr_specialist_point_handler.gml @@ -25,7 +25,7 @@ function SpecialistPointHandler() constructor{ if (!struct_exists(armoury_repairs, item)){ armoury_repairs[$ item] = count; } else { - armoury_repairs[$ item]+=count; + armoury_repairs[$ item] += count; } } } @@ -111,7 +111,9 @@ function SpecialistPointHandler() constructor{ forge_points = floor(forge_points); //in this instance tech are techmarines with the "tech_heretic" trait if (turn_end){ - if (array_length(techs)==0) then scr_loyalty("Upset Machine Spirits","+"); + if (array_length(techs)==0){ + scr_loyalty("Upset Machine Spirits","+"); + } tech_ideology_spread(); new_tech_heretic_spawn(); @@ -119,8 +121,7 @@ function SpecialistPointHandler() constructor{ if (forge_master==-1){ var tech_count = scr_role_count(obj_ini.role[100][16]); if (tech_count>1){ - var last_master = obj_ini.previous_forge_masters[array_length(obj_ini.previous_forge_masters)-1]; - scr_popup("New Forge Master",$"The Demise of Forge Master {last_master} means a replacement must be chosen. Several Options have already been put forward to you but it is ultimatly your decision.","new_forge_master",""); + setup_new_forge_master_popup(techs); } else if (tech_count==1){ scr_role_count(obj_ini.role[100][16],"","units")[0].update_role("Forge Master"); } @@ -196,6 +197,7 @@ function SpecialistPointHandler() constructor{ //handles tech heretic idealology rot static tech_ideology_spread = function(){ + var _heritecs = obj_controller.tech_status == "heretics"; try{ var tech_test, charisma_test, piety_test, _met_non_heretic, heretics_persuade_chances; var _tester = global.character_tester; @@ -248,9 +250,10 @@ function SpecialistPointHandler() constructor{ if (piety_test[0] == false && choose(true,false)){ _current_tech.add_trait("tech_heretic"); } - } else if (charisma_test[0]==2){ + } else if (charisma_test[0]==2 && !_heritecs){ if (charisma_test[1] > 40 && _noticed_heresy=false){ scr_alert("purple","Tech Heresy",$"{_current_tech.name_role()} contacts you concerned of Tech Heresy in the Armentarium"); + scr_event_log("purple",$"{_current_tech.name_role()} contacts you concerned of Tech Heresy in the Armentarium"); _noticed_heresy=true; } } @@ -258,7 +261,7 @@ function SpecialistPointHandler() constructor{ if (_new_pursuasion==forge_master){ // if tech is the forge master then forge master takes a wisdom in this case doubling as a perception test // if forge master passes tech heresy is noted and chapter master notified - if (_tester.standard_test(_current_tech, "wisdom", - 40)[0] && !_noticed_heresy){ + if (_tester.standard_test(_current_tech, "wisdom", - 40)[0] && !_noticed_heresy && !_heritecs){ _noticed_heresy=true; scr_event_log("purple",$"{techs[forge_master].name_role()} Has noticed signs of tech heresy amoung the Armentarium ranks"); scr_alert("purple","Tech Heresy",$"{techs[forge_master].name_role()} Has noticed signs of tech heresy amoung the Armentarium ranks"); @@ -277,14 +280,15 @@ function SpecialistPointHandler() constructor{ if }*/ } - if (array_length(techs)>array_length(heretics)){ + if (array_length(techs)>array_length(heretics) && !_heritecs){ if (array_length(heretics)/array_length(techs)>=0.35){ if (!irandom(9)){ /*var text_string = "You Recive an Urgent Transmision from"; if (forge_master>-1){ }*/ - scr_popup("Technical Differences!","You Recive an Urgent Transmision A serious breakdown in culture has coccured causing believers in tech heresy to demand that they are given preseidence and assurance to continue their practises","tech_uprising",""); + + tech_uprising_event(); } } } @@ -393,6 +397,7 @@ function SpecialistPointHandler() constructor{ obj_controller.gene_seed+=_cur_slave.num; // color / type / text /x/y scr_alert("green","test-slaves",$"Test-Slave Incubators Batch {i} harvested for {_cur_slave.num} Gene-Seed.",0,0); + scr_event_log("green",$"Test-Slave Incubators Batch {i} harvested for {_cur_slave.num} Gene-Seed."); } else if (_cur_slave.num==0){ array_push(_stack_lost_incubators, i); } @@ -406,9 +411,11 @@ function SpecialistPointHandler() constructor{ } scr_alert("","test-slaves",_lost_inc_string ,0,0); + scr_event_log("","test-slaves",_lost_inc_string ); } if(_lost_gene_slaves>0){ scr_alert("","test-slaves",$"{_lost_gene_slaves} gene slaves lost due to geneseed instability their incubators have been returned to the armoury",0,0); + scr_event_log("",$"{_lost_gene_slaves} gene slaves lost due to geneseed instability their incubators have been returned to the armoury"); } } static scr_forge_item = function(item){ @@ -440,7 +447,7 @@ function SpecialistPointHandler() constructor{ scr_forge_item(item); } else { repeat(item.count){ - var vehicle = scr_add_vehicle(item.name,obj_controller.new_vehicles,"standard","standard","standard","standard","standard"); + var vehicle = scr_add_vehicle(item.name,obj_controller.new_vehicles); var build_loc = array_random_element(obj_controller.player_forge_data.vehicle_hanger); obj_ini.veh_loc[vehicle[0]][vehicle[1]] = build_loc[0]; obj_ini.veh_wid[vehicle[0]][vehicle[1]] = build_loc[1]; diff --git a/scripts/scr_specialist_points/scr_specialist_points.gml b/scripts/scr_specialist_points/scr_specialist_points.gml index 5eaebf1131..c25a89d206 100644 --- a/scripts/scr_specialist_points/scr_specialist_points.gml +++ b/scripts/scr_specialist_points/scr_specialist_points.gml @@ -50,7 +50,11 @@ function unit_forge_point_generation(turn_end=false){ reasons.maintenance = $"-{maintenance}"; if (has_trait("tinkerer")){ reasons.maintenance += "\n X0.5"; - } + } + if (!is_dreadnought()){ + var _tech_score_mod = 1/(technology/30); + reasons.maintenance += $"\n tech modifier : X{_tech_score_mod} (lower is better)"; + } return [points,reasons]; } diff --git a/scripts/scr_specialist_training/scr_specialist_training.gml b/scripts/scr_specialist_training/scr_specialist_training.gml index a2263b94a9..7cf686d1fa 100644 --- a/scripts/scr_specialist_training/scr_specialist_training.gml +++ b/scripts/scr_specialist_training/scr_specialist_training.gml @@ -361,7 +361,7 @@ function techmarine_training(){ scr_alert("red","recruitment","Not enough equipment: "+string(warn),0,0); } - if (obj_ini.loc[unit.company][unit.marine_number] == "Terra") { + if (unit.location_string == "Terra") { unit.allocate_unit_to_fresh_spawn("default"); } @@ -398,7 +398,7 @@ function techmarine_training(){ var man_size=unit.get_unit_size(); obj_ini.ship_carrying[unit.ship_location]-=man_size; } - obj_ini.loc[0][open_slot]="Terra"; + unit.location_string="Terra"; unit.planet_location=4; unit.ship_location=-1; } diff --git a/scripts/scr_sprite_helpers/scr_sprite_helpers.gml b/scripts/scr_sprite_helpers/scr_sprite_helpers.gml index 87d121bf6e..6f97da26af 100644 --- a/scripts/scr_sprite_helpers/scr_sprite_helpers.gml +++ b/scripts/scr_sprite_helpers/scr_sprite_helpers.gml @@ -4,4 +4,50 @@ function draw_sprite_flipped(_sprite, _subimg, _x, _y) { _sprite_xoffset *= 2; draw_sprite_ext(_sprite, _subimg, _x + _sprite_width - _sprite_xoffset, _y, -1, 1, 0, c_white, 1) -} \ No newline at end of file +} + + + +/// @function return_sprite_mirrored(sprite) +/// @param sprite The sprite index to mirror +/// @returns A new sprite index that is the mirrored version +/// @function return_sprite_mirrored(sprite) +/// @param sprite The sprite index to mirror +/// @returns A new sprite index that is the mirrored version +function return_sprite_mirrored(_spr, delete_sprite=true) { + var _w = sprite_get_width(_spr); + var _h = sprite_get_height(_spr); + var _frames = sprite_get_number(_spr); + + // New mirrored sprite we’ll build + var _new_sprite = -1; + + for (var _i = 0; _i < _frames; _i++) { + // Create surface for this frame + var _surf = surface_create(_w, _h); + surface_set_target(_surf); + draw_clear_alpha(c_black, 0); + + // Draw sprite frame mirrored (scale_x = -1 flips horizontally) + draw_sprite_ext(_spr, _i, _w, 0, -1, 1, 0, c_white, 1); + + surface_reset_target(); + + // Add to new sprite (first frame creates, rest append) + if (_i == 0) { + _new_sprite = sprite_create_from_surface(_surf, 0, 0, _w, _h, false, false, 0, 0); + } else { + sprite_add_from_surface(_new_sprite, _surf, 0, 0, _w, _h, 0, 0); + } + + // Free surface + surface_free(_surf); + } + + // Optional: delete old sprite to free memory + if (delete_sprite){ + sprite_delete(_spr); + } + + return _new_sprite; +} diff --git a/scripts/scr_squads/scr_squads.gml b/scripts/scr_squads/scr_squads.gml index 36ee13e960..e6510642af 100644 --- a/scripts/scr_squads/scr_squads.gml +++ b/scripts/scr_squads/scr_squads.gml @@ -32,7 +32,7 @@ function create_squad(squad_type, company, squad_loadout = true, squad_index=fal obj_ini.TTRPG[company][i]= new TTRPG_stats("chapter", company,i,"blank"); } unit = fetch_unit([company, i]); - if ((unit.name() =="") or (unit.base_group=="none")) then continue; + if ((unit.name() =="" || unit.base_group=="none")) then continue; if (unit.squad == "none"){ if (unit.role() == sgt_types[s]){ squad_fulfilment[$ sgt_types[s]] += 1; @@ -289,6 +289,11 @@ function UnitSquad(squad_type = undefined, company = undefined) constructor{ } } + + static stat_av = function(stat){ + + } + static add_type_data = function(data){ type_data=data; display_name = type_data[$"display_data"]; @@ -322,6 +327,20 @@ function UnitSquad(squad_type = undefined, company = undefined) constructor{ } return squad_unit_types; } + + static get_squad_structs = function(){ + var _struct_array = []; + for (var i = array_length(members)-1; i >= 0;i--){ + unit = fetch_unit(members[i]); + if (unit.name() == ""){ + array_delete(members, i, 1); + continue; + } else { + array_push(_struct_array, unit); + } + } + return _struct_array; + } // for creating a new sergeant from existing squad members static new_sergeant = function(veteran=false){ var exp_unit=""; @@ -428,9 +447,11 @@ function UnitSquad(squad_type = undefined, company = undefined) constructor{ } members = []; } + static fetch_member= function(index){ return fetch_unit(members[index]); } + static add_member = function(comp, unit_number){ array_push(members, [comp, unit_number]); life_members++; @@ -592,10 +613,9 @@ function UnitSquad(squad_type = undefined, company = undefined) constructor{ var replace_role = remove_sgt.role(); remove_sgt.update_role(new_sgt.role()); //TODO centralise loyalty changes for role changes in the update_role method - remove_sgt.loyalty-=10; - //TODO make update loyalty method to avoid manual 100 limit checks + remove_sgt.alter_loyalty(-10); new_sgt.update_role(replace_role); - new_sgt.loyalty = min(100, new_sgt.loyalty+10); + new_sgt.alter_loyalty(10); } } } @@ -717,22 +737,14 @@ function game_start_squads(){ last_squad_count = array_length(obj_ini.squads); while (last_squad_count == array_length(obj_ini.squads)){ last_squad_count = (array_length(obj_ini.squads) + 1); - if(last_squad_count%2 == 0){ - create_squad("sternguard_veteran_squad", company); - }else{ - create_squad("vanguard_veteran_squad", company); - } + create_squad("veteran_squad", company); } company = 10; create_squad("command_squad", company); last_squad_count = array_length(obj_ini.squads); while (last_squad_count == array_length(obj_ini.squads)){ ///keep making tact squads for as long as there are enough tact marines last_squad_count = (array_length(obj_ini.squads) + 1); - if(last_squad_count%2 == 0){ - create_squad("scout_squad", company); - }else{ - create_squad("scout_sniper_squad", company); - } + create_squad("scout_squad", company); } with (obj_ini){ diff --git a/scripts/scr_star_ownership/scr_star_ownership.gml b/scripts/scr_star_ownership/scr_star_ownership.gml index 158c037e0e..9a83157e90 100644 --- a/scripts/scr_star_ownership/scr_star_ownership.gml +++ b/scripts/scr_star_ownership/scr_star_ownership.gml @@ -1,3 +1,4 @@ +/// @mixin obj_star function scr_star_ownership(argument0) { @@ -7,67 +8,130 @@ function scr_star_ownership(argument0) { ork_owner=0;tau_owner=0;player_owner=0;eldar_owner=0;traitors_owner=0;forge_owner=0;imperium_owner=0;tyranids_owner=0;necrons_owner=0;nun_owner=0; repeat(planets){ - run+=1; - if (p_owner[run]=eFACTION.Player){ - if (dispo[run]<90 && !planet_feature_bool(p_feature[run], P_features.Monastery)){ - p_owner[run]=2; + run++; + p_chaos[run] = clamp(p_chaos[run], 0, 6); + p_tau[run] = clamp(p_tau[run], 0, 6); + p_orks[run] = clamp(p_orks[run], 0, 6); + p_traitors[run] = clamp(p_traitors[run], 0, 6); + p_tyranids[run] = clamp(p_tyranids[run], 0, 6); + + if (p_owner[run] = eFACTION.Player){ + if (dispo[run]<95 && !planet_feature_bool(p_feature[run], P_features.Monastery)){ + p_owner[run]=eFACTION.Imperium; } - } - if (p_type[run]="Dead") and (p_owner[run]!=2) and (p_first[run]!=1) and (p_first[run]!=5) then p_owner[run]=2; - if (p_owner[run]=7) and (p_orks[run]=0) then p_owner[run]=p_first[run]; - if (p_owner[run]=8) and (p_tau[run]=0) and (p_pdf[run]=0){ - p_owner[run]=2; + } + var _set_to_first = false; + if (p_owner[run]==7 && p_orks[run]<=0){ + _set_to_first = true; + } + if (_set_to_first){ + var _first = p_first[run]; + if (p_first[run] == eFACTION.Ork){ + p_owner[run]=2; + } else { + p_owner[run] = p_first[run]; + } + } + if (p_type[run]=="Dead" && p_owner[run]!=eFACTION.Imperium && p_first[run]!=eFACTION.Player && p_first[run]!=eFACTION.Ecclesiarchy){ + p_owner[run]=eFACTION.Imperium; + } + if (p_owner[run]==eFACTION.Tau && p_tau[run]=0 && p_pdf[run]=0){ + p_owner[run]=eFACTION.Imperium; p_influence[run][eFACTION.Tau]=round(p_influence[run][eFACTION.Tau]/2); } - if (p_owner[run]=10) and (p_chaos[run]=0) and (p_traitors[run]=0) and (p_population[run]<=0){ + if (p_owner[run]==10 && p_chaos[run]==0 && p_traitors[run]==0 && p_population[run]<=0){ p_owner[run]=p_first[run]; p_heresy[run]=0; - if (p_owner[run]=10) then p_owner[run]=2;} - if (p_type[run]="Daemon") then p_owner[run]=10; + if (p_owner[run]=10){ + p_owner[run]=2; + } + } + if (p_type[run]=="Daemon"){ + p_owner[run]=10; + } + var _nid_chosen = false; if (planet_feature_bool(p_feature[run], P_features.Gene_Stealer_Cult)){ if (p_influence[run][eFACTION.Tyranids]>50){ - p_owner[run]=9; - tyranids_owner+=1; + p_owner[run]=eFACTION.Tyranids; + tyranids_owner++; + _nid_chosen = true; } - } else if (p_tyranids[run]>=5) and (p_population[run]=0){ - p_owner[run]=9; - tyranids_owner+=1; - }else if (p_type[run]!="Dead"){ - if (p_owner[run]=eFACTION.Player) then player_owner+=1; - if (p_owner[run]=eFACTION.Imperium) then imperium_owner+=1; - if (p_owner[run]=eFACTION.Mechanicus) then forge_owner+=1; - if (p_owner[run]=5) then nun_owner+=1; - // if (p_orks[run]>0) and (p_type[run]!="Dead") then ork_owner+=1; - if (p_owner[run]=6) and (p_type[run]=="Craftworld") then eldar_owner=999; - if (p_owner[run]=7) then ork_owner+=1; - if (p_owner[run]=8) then tau_owner+=1; - if (p_owner[run]=10) then traitors_owner+=1; - if (p_owner[run]=11) then traitors_owner+=1; - if (p_owner[run]=13) then necrons_owner+=1; + } else if (p_tyranids[run]>=5 && p_population[run]==0){ + p_owner[run]=eFACTION.Tyranids; + tyranids_owner++; + _nid_chosen = true; + } + + + if (p_type[run]!="Dead" && !_nid_chosen){ + switch (p_owner[run]) + { + case eFACTION.Player: + player_owner++; + break; + case eFACTION.Imperium: + if (p_type[run] != "Forge"){ + imperium_owner++; + } else { + p_owner[run]=eFACTION.Mechanicus; + forge_owner++; + } + break; + case eFACTION.Mechanicus: + forge_owner++; + break; + case eFACTION.Ecclesiarchy: + nun_owner++; + break; + case eFACTION.Eldar: + eldar_owner=999; + break; + case eFACTION.Ork: + ork_owner++; + break; + case eFACTION.Tau: + tau_owner++; + break; + case eFACTION.Chaos: + case eFACTION.Heretics: + traitors_owner++; + break; + case eFACTION.Necrons: + necrons_owner++; + break; + } } if (argument0!=false){ if (array_length(p_feature[run]) != 0){ - if (planet_feature_bool(p_feature[run], P_features.Daemonic_Incursion)==1){ + if (planet_feature_bool(p_feature[run], P_features.Daemonic_Incursion)){ p_heresy[run]+=2; - if (p_large[run]=0) and (p_population[run]>10000) then p_population[run]=floor(p_population[run]*0.5); - if (p_large[run]=1) then p_population[run]=p_population[run]*0.7; + if (!p_large[run] && p_population[run]>10000){ + p_population[run]=floor(p_population[run]*0.5); + } + else if (p_large[run]){ + p_population[run]=p_population[run]*0.7; + } } } if (p_tyranids[run]>4){ - if (p_large[run]=0) then p_population[run]=floor(p_population[run]*0.1); - if (p_large[run]=0) and (p_population[run]<=400000) then p_population[run]=0; - if (p_large[run]=1) then p_population[run]=p_population[run]*0.1; + if (!p_large[run]){ + p_population[run]= p_population[run]<=400000 ? 0 : 1 floor(p_population[run]*0.1); + } + else { + p_population[run] = p_population[run]*0.1; + } } if (array_length(p_feature[run])!=0){ - if (p_type[run]!="Dead") and (planet_feature_bool(p_feature[run], P_features.Daemonic_Incursion)==1) and (p_heresy[run]>=100){ + if (p_type[run]!="Dead" && planet_feature_bool(p_feature[run], P_features.Daemonic_Incursion) && p_heresy[run]>=100){ var randoo=choose(1,2,3,4); if (randoo=4){ p_type[run]="Daemon"; p_fortified[run]=6; - p_traitors[run]=7;p_owner[run]=10; + p_traitors[run]=7; + p_owner[run]=10; delete_features(p_feature[run],P_features.Daemonic_Incursion); } } @@ -77,13 +141,13 @@ function scr_star_ownership(argument0) { } - // if (player_owner>0) and (player_owner>=imperium_owner) and (player_owner>=forge_owner) and (player_owner>=necrons_owner) and (player_owner>=ork_owner) and (player_owner>=tau_owner) and (player_owner>=traitors_owner){owner = eFACTION.Player;} + // if (player_owner>0 && player_owner>=imperium_owner && player_owner>=forge_owner && player_owner>=necrons_owner && player_owner>=ork_owner && player_owner>=tau_owner && player_owner>=traitors_owner){owner = eFACTION.Player;} if (necrons_owner>0){ owner = eFACTION.Necrons; - } else if (player_owner>0) and (player_owner>=necrons_owner) and (player_owner>=ork_owner) and (player_owner>=tau_owner) and (player_owner>=traitors_owner){ + } else if (player_owner>0 && player_owner>=necrons_owner && player_owner>=ork_owner && player_owner>=tau_owner && player_owner>=traitors_owner){ owner = eFACTION.Player; - } else if (nun_owner>0) and (nun_owner>=forge_owner) and (nun_owner>=tau_owner) and (nun_owner>=necrons_owner) and (nun_owner>=traitors_owner) and (nun_owner>=ork_owner) and (nun_owner>=imperium_owner) and (player_owner=0){ + } else if (nun_owner>0 && nun_owner>=forge_owner && nun_owner>=tau_owner && nun_owner>=necrons_owner && nun_owner>=traitors_owner && nun_owner>=ork_owner && nun_owner>=imperium_owner && player_owner=0){ owner = eFACTION.Ecclesiarchy; } else if (tyranids_owner>0){ owner = eFACTION.Tyranids; @@ -93,13 +157,13 @@ function scr_star_ownership(argument0) { owner = eFACTION.Mechanicus; } else if (traitors_owner=planets){ owner = eFACTION.Chaos; - } else if (traitors_owner>imperium_owner) and (traitors_owner>forge_owner) and (traitors_owner>necrons_owner) and (traitors_owner>player_owner) and (traitors_owner>tau_owner) and (traitors_owner>ork_owner){ + } else if (traitors_owner>imperium_owner && traitors_owner>forge_owner && traitors_owner>necrons_owner && traitors_owner>player_owner && traitors_owner>tau_owner && traitors_owner>ork_owner){ owner = eFACTION.Chaos; - } else if (tau_owner>imperium_owner) and (tau_owner>forge_owner) and (tau_owner>ork_owner) and (tau_owner>necrons_owner) and (tau_owner>player_owner) and (tau_owner>traitors_owner){ + } else if (tau_owner>imperium_owner && tau_owner>forge_owner && tau_owner>ork_owner && tau_owner>necrons_owner && tau_owner>player_owner && tau_owner>traitors_owner){ owner = eFACTION.Tau - } else if (ork_owner>player_owner) and (ork_owner>tau_owner) and (ork_owner>traitors_owner) and (ork_owner>necrons_owner){ + } else if (ork_owner>imperium_owner) && (ork_owner>forge_owner) && (ork_owner>player_owner && ork_owner>tau_owner && ork_owner>traitors_owner && ork_owner>necrons_owner){ owner = eFACTION.Ork; - } else if (imperium_owner>0) and (imperium_owner>=forge_owner) and (imperium_owner>=tau_owner) and (imperium_owner>=necrons_owner) and (imperium_owner>=traitors_owner) and (imperium_owner>=ork_owner) and (player_owner=0){ + } else if (imperium_owner>0 && imperium_owner>=forge_owner && imperium_owner>=tau_owner && imperium_owner>=necrons_owner && imperium_owner>=traitors_owner && imperium_owner>=ork_owner && player_owner=0){ owner = eFACTION.Imperium; } diff --git a/scripts/scr_string_functions/scr_string_functions.gml b/scripts/scr_string_functions/scr_string_functions.gml index a38e10fca8..93619037b0 100644 --- a/scripts/scr_string_functions/scr_string_functions.gml +++ b/scripts/scr_string_functions/scr_string_functions.gml @@ -19,6 +19,39 @@ function string_upper_first(_string) { } } +function string_gender_third_person(gender){ + var _string = "they"; + switch(gender){ + case GENDER.Female: + _string = "she"; + break; + case GENDER.Male: + _string = "he"; + break; + } + + return _string; +} + + +function string_gender_pronouns(gender){ + var _string = "their"; + switch(gender){ + case GENDER.Female: + _string ="her" + break; + case GENDER.Male: + _string ="his" + break; + case GENDER.Neutral: + _string = "their"; + break; + } + + return _string; +} + + /// @function string_plural /// @description This function formats a string into a plural form by adding affixes following common rules. /// @param {string} _string @@ -202,51 +235,33 @@ function scr_convert_company_to_string(company_num, possessive = false, flavour= } } -/// @function scr_convert_company_to_string -/// @description This script converts a word or longer string into an integer, with each letter corresponding to a value from 1-26. -/// @param {string} _string +/* This was used to generate random game seed. Now randomise() and random_get_seed() are used. +/// @function string_to_integer +/// @description Converts a string into an integer sum where a=1, b=2, ..., z=26. +/// @param {string} _string The input text to convert. /// @returns {real} +// The purpose of this is to allow a marine's +// name to generate a semi-unique variable for the future display of veterency +// decorations when inspected in management. Whether it is odd, from 0-9, and so +// on can determine what shows on their picture at certain experience values. function string_to_integer(_string) { - // The purpose of this is to allow a marine's - // name to generate a semi-unique variable for the future display of veterency - // decorations when inspected in management. Whether it is odd, from 0-9, and so - // on can determine what shows on their picture at certain experience values. - - var lol,m1,val; - lol=_string;val=0; - m1=string_length(lol); - - repeat(m1){ - if (string_lower(string_char_at(lol,0))="a") then val+=1; - if (string_lower(string_char_at(lol,0))="b") then val+=2; - if (string_lower(string_char_at(lol,0))="c") then val+=3; - if (string_lower(string_char_at(lol,0))="d") then val+=4; - if (string_lower(string_char_at(lol,0))="e") then val+=5; - if (string_lower(string_char_at(lol,0))="f") then val+=6; - if (string_lower(string_char_at(lol,0))="g") then val+=7; - if (string_lower(string_char_at(lol,0))="h") then val+=8; - if (string_lower(string_char_at(lol,0))="i") then val+=9; - if (string_lower(string_char_at(lol,0))="j") then val+=10; - if (string_lower(string_char_at(lol,0))="k") then val+=11; - if (string_lower(string_char_at(lol,0))="l") then val+=12; - if (string_lower(string_char_at(lol,0))="m") then val+=13; - if (string_lower(string_char_at(lol,0))="n") then val+=14; - if (string_lower(string_char_at(lol,0))="o") then val+=15; - if (string_lower(string_char_at(lol,0))="p") then val+=16; - if (string_lower(string_char_at(lol,0))="q") then val+=17; - if (string_lower(string_char_at(lol,0))="r") then val+=18; - if (string_lower(string_char_at(lol,0))="s") then val+=19; - if (string_lower(string_char_at(lol,0))="t") then val+=20; - if (string_lower(string_char_at(lol,0))="u") then val+=21; - if (string_lower(string_char_at(lol,0))="v") then val+=22; - if (string_lower(string_char_at(lol,0))="w") then val+=23; - if (string_lower(string_char_at(lol,0))="x") then val+=24; - if (string_lower(string_char_at(lol,0))="y") then val+=25; - if (string_lower(string_char_at(lol,0))="z") then val+=26; - lol=string_delete(lol,0,1); + var _total_val = 0; + var _lower_str = string_lower(_string); + var _len = string_length(_lower_str); + + for (var i = 1; i <= _len; i++) { + // Get the ASCII/UTF-8 value of the character (1-indexed in GML) + var _char_code = string_ord_at(_lower_str, i); + + // In ASCII: 'a' is 97. Subtracting 96 makes 'a' = 1, 'b' = 2, etc. + if (_char_code >= 97 && _char_code <= 122) { + _total_val += (_char_code - 96); + } } - return(val); + + return _total_val; } + */ /// @description Replaces underscores with spaces and capitalizes the first letter of each word. function format_underscore_string(input_string) { @@ -324,3 +339,19 @@ function string_starts_with_any(_str, _prefixes) { } return false; } + + +//this can be way more efficient nby reading the string and finding keys rather than the other way around but until it satrts to cause issues i ccan;t be assed +function string_interpolate_from_struct(interpolate_string,data){ + var _names=struct_get_names(data); + var _name_length = array_length(_names); + show_debug_message_adv(_names); + for (var i=0;i<_name_length;i++){ + var _name=_names[i]; + var _replace_string = "{" + $"{_name}" + "}"; + show_debug_message_adv(_replace_string); + interpolate_string = string_replace_all(interpolate_string, _replace_string, data[$_name]); + } + + return interpolate_string; +} diff --git a/scripts/scr_struct_functions/scr_struct_functions.gml b/scripts/scr_struct_functions/scr_struct_functions.gml index 575da55180..89f758364a 100644 --- a/scripts/scr_struct_functions/scr_struct_functions.gml +++ b/scripts/scr_struct_functions/scr_struct_functions.gml @@ -8,6 +8,51 @@ function DeepCloneStruct(clone_struct) { return variable_clone(clone_struct); } +function move_data_to_current_scope(move_struct, overide=true){ + if (!is_struct(move_struct)){ + show_debug_message_adv(move_struct); + } else { + try{ + var _data_names = struct_get_names(move_struct); + for (var i=0;i 500 && diplomacy_faction==6){ + var got2=0; + with (obj_controller){ + repeat(10){ + if (got2<50){ + got2+=1; + if (quest[got2]="fund_elder") and (quest_faction[got2]=6){ + scr_dialogue("mission1_thanks"); + scr_quest(2,"fund_elder",6,0); + got2=50; + trading=0; + exit; + } + } + } + } + } + } else if (_opt.trade_type == "gene"){ + obj_controller.gene_seed-=_opt.number; + if (diplomacy_faction<=5) and (diplomacy_faction!=4){ + obj_controller.gene_sold += _opt.number; + } + if (diplomacy_faction>=6){ + obj_controller.gene_xeno += _opt.number; + } + } else if(_opt.trade_type == "stc"){ + for (var j = 0; j < 100; j += 1) { + var p = choose(1, 2, 3); + if (p == 1 && obj_controller.stc_wargear_un > 0) { + obj_controller.stc_wargear_un -= 1; + break; + } + if (p == 2 && obj_controller.stc_vehicles_un > 0) { + obj_controller.stc_vehicles_un -= 1; + break; + } + if (p == 3 && obj_controller.stc_ships_un > 0) { + obj_controller.stc_ships_un -= 1; + break; + } + } + } else if(_opt.trade_type == "info"){ + obj_controller.info_chips-=_opt.number; + }else if (_opt.trade_type == "favour"){ + edit_faction_favour(diplomacy_faction,-_opt.number); + } + } + var flit = setup_ai_trade_fleet(trade_from_star, diplomacy_faction); + flit.cargo_data.player_goods = trading_object; + flit.target = trade_to_obj; + with (flit){ + action_x=target.x; + action_y=target.y; + set_fleet_movement(); + } - for (var i = 1; i < 5; i++) { - if (trade_give[i]="Requisition") and (trade_mnum[i]>0) then my_worth+=trade_mnum[i]; - - if (trade_give[i]="Gene-Seed") and (trade_mnum[i]>0){ - if (diplomacy=3) or (diplomacy=4) then my_worth+=trade_mnum[i]*30; - if (diplomacy=2) or (diplomacy=5) then my_worth+=trade_mnum[i]*20; - if (diplomacy=8) or (diplomacy=10) then my_worth+=trade_mnum[i]*50; - } - - if (trade_give[i]="Info Chip") and (trade_mnum[i]>0) then my_worth+=trade_mnum[i]*80; - if (diplomacy=3) and (trade_give[i]="Info Chip") and (trade_mnum[i]>0) then my_worth+=trade_mnum[i]*10;// 20% bonus - - if (trade_give[i]="STC Fragment") and (trade_mnum[i]>0){ - if (diplomacy=2) then my_worth+=trade_mnum[i]*900;if (diplomacy=3) then my_worth+=trade_mnum[i]*1000;if (diplomacy=4) then my_worth+=trade_mnum[i]*1000; - if (diplomacy=5) then my_worth+=trade_mnum[i]*900;if (diplomacy=10) then my_worth+=trade_mnum[i]*900; - - if (diplomacy=6) then my_worth+=trade_mnum[i]*500;if (diplomacy=7) then my_worth+=trade_mnum[i]*500;if (diplomacy=8) then my_worth+=trade_mnum[i]*1000; - } - - - if (trade_take[i]="Test") then their_worth+=trade_tnum[i]*5000; - - if (trade_take[i]="Requisition") then their_worth+=trade_tnum[i]; - - // if (trade_take[i]="Storm Trooper") then their_worth+=trade_tnum[i]*20; - if (trade_take[i]="Recruiting Planet"){ - if (disposition[2]<70) then their_worth+=trade_tnum[i]*4000; - if (disposition[2]>=70) then their_worth+=trade_tnum[i]*2000; - } - if (trade_take[i]="License: Repair") then their_worth+=trade_tnum[i]*750; - if (trade_take[i]="License: Crusade") then their_worth+=trade_tnum[i]*1500; - - if (trade_take[i]="Terminator Armour") then their_worth+=trade_tnum[i]*400; - if (trade_take[i]="Tartaros") then their_worth+=trade_tnum[i]*900; - if (trade_take[i]="Land Raider") then their_worth+=trade_tnum[i]*600; - if (trade_take[i]="Castellax Battle Automata") then their_worth+=trade_tnum[i]*1200; - if (trade_take[i]="Minor Artifact") then their_worth+=trade_tnum[i]*450; - if (trade_take[i]="Skitarii") then their_worth+=trade_tnum[i]*15; - if (trade_take[i]="Techpriest") then their_worth+=trade_tnum[i]*150; - - // TODO: Condemnor Boltgun trade is temporarily disabled due to crashes as the item doesn't exist in other parts of the game. - // To re-enable: Implement the Condemnor Boltgun item in the game's inventory, equipment, and combat systems. - // if (trade_take[i]="Condemnor Boltgun") then their_worth+=trade_tnum[i]*15; - if (trade_take[i]="Hellrifle") then their_worth+=trade_tnum[i]*20; - if (trade_take[i]="Incinerator") then their_worth+=trade_tnum[i]*20; - if (trade_take[i]="Crusader") then their_worth+=trade_tnum[i]*20; - if (trade_take[i]="Exterminatus") then their_worth+=trade_tnum[i]*1500; - if (trade_take[i]="Cyclonic Torpedo") then their_worth+=trade_tnum[i]*3000; - - if (trade_take[i]="Eviscerator") then their_worth+=trade_tnum[i]*20; - if (trade_take[i]="Heavy Flamer") then their_worth+=trade_tnum[i]*12; - if (trade_take[i]="Inferno Bolts") then their_worth+=trade_tnum[i]*5; - if (trade_take[i]="Sister of Battle") then their_worth+=trade_tnum[i]*40; - if (trade_take[i]="Sister Hospitaler") then their_worth+=trade_tnum[i]*50; - - if (trade_take[i]="Eldar Power Sword") then their_worth+=trade_tnum[i]*50; - if (trade_take[i]="Archeotech Laspistol") then their_worth+=trade_tnum[i]*150; - if (trade_take[i]="Ranger") then their_worth+=trade_tnum[i]*100; - if (trade_take[i]="Useful Information") then their_worth+=trade_tnum[i]*600; - - if (trade_take[i]="Power Klaw") then their_worth+=trade_tnum[i]*50; - if (trade_take[i]="Ork Sniper") then their_worth+=trade_tnum[i]*30; - if (trade_take[i]="Flash Git") then their_worth+=trade_tnum[i]*60; - - - if (trade_take[i]="Artifact"){ - if (diplomacy=2) then their_worth+=300; - if (diplomacy=3) then their_worth+=800; - if (diplomacy=4) then their_worth+=600; - if (diplomacy=5) then their_worth+=500; - if (diplomacy>5) then their_worth=1200; - } } - - var ss1,ss2; - ss1=string(trade_give[1])+string(trade_give[2])+string(trade_give[3])+string(trade_give[4]); - ss2=string(trade_take[1])+string(trade_take[2])+string(trade_take[3])+string(trade_take[4]); - if (ss1="Requisition") or (ss1="RequisitionRequisition") or (ss1="RequisitionRequisitionRequisition") or (string_count("Requisition",ss1)=4){ - if (ss2="Requisition") or (ss2="RequisitionRequisition") or (ss2="RequisitionRequisitionRequisition") or (string_count("Requisition",ss2)=4){ - my_worth=-10000; + static find_trade_locations = function(){ + var _stars_with_player_control = []; + with(obj_star){ + if (array_contains(p_owner, 1)){ + array_push(_stars_with_player_control, id) + } } - } - if (ss1="Requisition") and (ss2="Requisition") then my_worth=-10000; - if (ss1="") and (ss2="Requisition") then my_worth=-10000; - // Modify their worth based on relationship - + var player_fleet_targets = []; + if (obj_ini.fleet_type != ePlayerBase.home_world || !array_length(_stars_with_player_control)){ + // with(obj_star){if (present_fleet[1]>0){x-=10000;y-=10000;}} + with(obj_p_fleet){// Get the nearest star system that is viable for creating the trading fleet + if ((capital_number>0 || frigate_number>0) && action=""){ + array_push(player_fleet_targets, id); + } + + } + } - // Chance to accept: 100-penalty -((their_score-my_score)*difference_penalty) - // High difference penalty = less forgiving - // High penalty: more schizo and harsh - - var dif_penalty, penalty, deal; - def_penalty=0;penalty=0;deal=0; - if (diplomacy=2){dif_penalty=.4;penalty=5;} - if (diplomacy=3){dif_penalty=.6;penalty=5;} - if (diplomacy=4){dif_penalty=1;penalty=15;} - if (diplomacy=5){dif_penalty=.8;penalty=0;} - if (diplomacy=6){dif_penalty=.6;penalty=10;} - if (diplomacy=7){dif_penalty=.4;penalty=20;} - if (diplomacy=8){dif_penalty=.4;penalty=0;} - if (diplomacy=10){dif_penalty=1;penalty=0;} + // temp2: ideal trade target + // temp3: origin + // temp4: possible trade target - deal=(100-penalty)-((their_worth-my_worth)*dif_penalty); - // if (trade_mnum[1]=0) and (trade_take[1]="Requisition") or (trade_take[2]="Requisition") or (trade_take[3]="Requisition") or (trade_take[4]="Requisition") then deal-=100; + var viable_faction_trade_stars = []; + var _check_val = diplomacy_faction; + if (diplomacy_faction==4){ + _check_val = 2 + } + with(obj_star){// Get origin star system for enemy fleet + if (array_contains(p_owner, _check_val)){ + array_push(viable_faction_trade_stars, id); + } + if (_check_val=5){ + var ahuh=0,q=0; + repeat(planets){ + q+=1; + if (p_owner[q]=5) then ahuh=1; + if (p_owner[q]<6) and (planet_feature_bool(p_feature[q],P_features.Sororitas_Cathedral) == 1) then ahuh=1; + } + if (ahuh=1){ + array_push(viable_faction_trade_stars, id); + } - if (argument0=false){ - if (deal<=20) then trade_likely="Very Unlikely"; - if (deal<=0) then trade_likely="Impossible"; - if (deal>20) and (deal<=40) then trade_likely="Unlikely"; - if (deal>40) and (deal<=60) then trade_likely="Moderate Chance"; - if (deal>60) and (deal<=80) then trade_likely="Likely"; - if (deal>80) then trade_likely="Very Likely"; - if (deal>100) then trade_likely="Unrefusable"; - - // show_message(string(deal)+" : "+string(trade_likely)); - - if (trade_mnum[1]+trade_mnum[2]+trade_mnum[3]+trade_mnum[4]<=0) and (trade_tnum[1]+trade_tnum[2]+trade_tnum[3]+trade_tnum[4]<=0) then trade_likely=""; + } + } + + if (!array_length(_stars_with_player_control) && !array_length(player_fleet_targets)){ + with (obj_controller){ + scr_dialogue("trade_error_1"); + trading = false; + } + return false + } + if (!array_length(viable_faction_trade_stars)){ + with (obj_controller){ + scr_dialogue("trade_error_2"); + trading = false; + } + return false + } + + trade_from_star = array_random_element(viable_faction_trade_stars); + + + if (!array_length(_stars_with_player_control) || (obj_ini.fleet_type!=ePlayerBase.home_world && array_length(player_fleet_targets))){ + trade_to_obj = array_random_element(player_fleet_targets); + } else if (!array_length(player_fleet_targets)){ + trade_to_obj = array_random_element(_stars_with_player_control); + } else { + trade_to_obj = choose(array_random_element(_stars_with_player_control), array_random_element(player_fleet_targets)); + } + return true; } + static attempt_trade = function(){ + calculate_deal_chance(); + var attempt_rand = roll_dice_chapter(1, 100, "high"); + var _success = attempt_rand <= deal_chance; + if (_success){ + _success = find_trade_locations(); + show_debug_message_adv("trade_success"); + if (_success){ + successful_trade_attempt(); + scr_dialogue("agree",{prepend:"[[Trade Accepted. Shipment initialized.]]"}); + //force_goodbye=1; + obj_controller.trading=0; + if (diplomacy_faction=6) or (diplomacy_faction=7) or (diplomacy_faction=8){ + scr_loyalty("Xeno Trade","+"); + } + } else { + show_debug_message_adv("no trade locations"); + } + } else { + var _dip = diplomacy_faction; + with (obj_controller){ + var _rela=relationship_hostility_matrix(diplomacy); + if (trading_artifact==0){ + diplo_text="[[Trade Refused]]##"; + } else { + diplo_text=""; + } + annoyed[_dip] += 1; + scr_dialogue("disagree",{prepend:"[[Trade Refused]]"}); + rando=choose(1,2,3); + if (_rela=="hostile"){ + force_goodbye=1; + if (rando==1) then diplo_text+="You would offer me scraps for the keys to a kingdom? You are foolish and, worse, you are unaware of your own incompetence."; + if (rando==2) then diplo_text+="Do not attempt exchanges with those so far above you, lapdog of the Corpse Emperor, it makes you look even more idiotic than you already do."; + if (rando==3) then diplo_text+="I would spit upon this ‘offer' you bring before me but I find myself too amused by it."; + } + else if (_rela!="hostile"){ + if (rando==1) then diplo_text+="You may consider my response to be a ‘no' and assume my attitude to be whatever you like, Chapter Master."; + if (rando==2) then diplo_text+="Have a care that you do not overstep the mark, Chapter Master, I see no reason to accept such a trade."; + if (rando==3) then diplo_text+="An unreasonable trade, whatever our working relationship might be. I refuse."; + } + if (annoyed[_dip]>=10){ + force_goodbye=1; + turns_ignored[_dip]=max(turns_ignored[_dip],1); + diplo_last="disagree"; + diplo_char=0; + diplo_alpha=0; + exit; + } + } + show_debug_message_adv("trade_fail"); + clear_options(); + } + } + offer_button = new UnitButtonObject({ + x1 : 630, + y1 : 649, + label : "Offer", + }); + offer_button.bind_method = function(){ + if (obj_controller.diplo_last !=" offer"){ + attempt_trade(); + } + } + offer_button.bind_scope = self; + + exit_button = new UnitButtonObject({ + x1 : 818, + y1 : 796, + label : "Exit", + }); + + exit_button.bind_method = function(){ + with (obj_controller){ + cooldown=8; + trading=0; + scr_dialogue("trade_close"); + click2=1; + if (trading_artifact!=0){ + scr_toggle_diplomacy(); + with(obj_popup){ + instance_destroy(); + } + obj_ground_mission.alarm[1]=1; + exit; + } + } + } + exit_button.bind_scope = self; + static new_demand_buttons = function(trade_disp, name, trade_type, max_take = 100000){ + var _option = new UnitButtonObject({ + label : name, + number : 0, + disp : trade_disp, + trade_type : trade_type, + max_take : max_take, + number_last : 0, + diplomacy_faction + }); + with (_option){ + bind_method = function(){ + if (max_take == 1){ + variable_struct_set(self, "number", 1); + } else { + get_diag_integer($"{label} wanted?", max_take, self, diplomacy_faction); + } + } + } + if (trader_disp < trade_disp){ + _option.disabled = true; + _option.tooltip = $"{trade_disp} disposition required"; + } + //_option.bind_scope = _option; + array_push(demand_options, _option); + } + trader_disp = obj_controller.disposition[diplomacy_faction]; + + trade_req=obj_controller.requisition; + trade_gene=obj_controller.gene_seed; + trade_chip=obj_controller.stc_wargear_un+obj_controller.stc_vehicles_un+obj_controller.stc_ships_un; + trade_info=obj_controller.info_chips; + + switch (diplomacy_faction){ + case 2: + new_demand_buttons(0, "Requisition","req"); + new_demand_buttons(0, "Recruiting Planet", "license",1); + new_demand_buttons(0, "License: Repair","license",1); + new_demand_buttons(0, "License: Crusade","license",1); + break; + case 3: + new_demand_buttons(35, "Terminator Armour", "equip",5); + new_demand_buttons(20, "Land Raider", "vehic",1); + new_demand_buttons(40, "Minor Artifact", "arti",1); + new_demand_buttons(25, "Skitarii", "merc",200); + new_demand_buttons(55, "Techpriest", "merc",3); + break; + case 4: + new_demand_buttons(30, "Hellrifle", "equip",3); + new_demand_buttons(20, "Incinerator", "equip",10); + new_demand_buttons(25, "Crusader", "merc", 5); + new_demand_buttons(40, "Exterminatus", "equip",1); + new_demand_buttons(60, "Cyclonic Torpedo", "equip",1); + break; + case 5: + new_demand_buttons(20, "Eviscerator", "equip",10); + new_demand_buttons(30, "Heavy", "equip",10); + //new_demand_buttons(30, "Inferno Bolts", "equip"); + new_demand_buttons(40, "Sister of Battle", "merc",5); + new_demand_buttons(45, "Sister Hospitaler", "merc",3); + break; + case 6: + new_demand_buttons(-10, "Master Crafted Power Sword", "equip",3); + new_demand_buttons(-10, "Archeotech Laspistol", "equip",1); + new_demand_buttons(10, "Ranger", "merc",3); + new_demand_buttons(-15, "Useful Information", "license",1); + break; + case 7: + new_demand_buttons(-100, "Power Klaw", "equip",10); + new_demand_buttons(-100, "Ork Sniper", "merc",50); + new_demand_buttons(-100, "Flash Git", "merc",50); + break; + } + static new_offer_option = function(trade_disp = -100, name, trade_type, max_count=1){ + var _option = new UnitButtonObject({ + label : name, + number : 0, + max_number : max_count, + disp : trade_disp, + trade_type : trade_type, + number_last : 0, + diplomacy_faction + }); + with (_option){ + bind_method = function(){ + if (max_number == 1){ + number = 1; + } else { + get_diag_integer($"{label} offered?",max_number, self, diplomacy_faction); + } + } + } + array_push(offer_options, _option); + } + if (obj_controller.requisition > 0){ + new_offer_option(, "Requisition", "req", obj_controller.requisition); + } + if (obj_controller.gene_seed > 0){ + new_offer_option(, "Gene Seed", "gene", obj_controller.gene_seed); + } - // show_message("A-1: "+string(liscensing)); - - - - if (argument0=true){ - - if (rando4<=deal) and (trading_artifact=0){ + if (trade_chip > 0){ + new_offer_option(, "STC Fragment","stc" ,trade_chip); + } + if (trade_info > 0){ + new_offer_option(, "Info Chip","info", trade_info); + } - var step,lisc;step=0;lisc=0; - lisc=string_count("License",string(trade_take[1]+trade_take[2]+trade_take[3]+trade_take[4])); - lisc+=string_count("Recruiting",string(trade_take[1]+trade_take[2]+trade_take[3]+trade_take[4])); - lisc+=string_count("Useful Info",string(trade_take[1]+trade_take[2]+trade_take[3]+trade_take[4])); - if (trade_take[1]!="") and (trade_take[2]="") then step=1; - if (trade_take[2]!="") and (trade_take[3]="") then step=2; - if (trade_take[3]!="") and (trade_take[4]="") then step=3; - if (trade_take[4]!="") then step=4; + if (has_faction_favour(diplomacy_faction)){ + new_offer_option(, "IOU","favour", trade_info); + } - if (lisc>0) then obj_controller.liscensing=1; - if (trade_take[1]="Recruiting Planet") or (trade_take[2]="Recruiting Planet") or (trade_take[3]="Recruiting Planet") or (trade_take[4]="Recruiting Planet"){ - obj_controller.liscensing=5; - - if (trade_take[1]="Recruiting Planet") then recruiting_worlds_bought+=1; - if (trade_take[2]="Recruiting Planet") then recruiting_worlds_bought+=1; - if (trade_take[3]="Recruiting Planet") then recruiting_worlds_bought+=1; - if (trade_take[4]="Recruiting Planet") then recruiting_worlds_bought+=1; - } - if (trade_take[1]="License: Crusade") or (trade_take[2]="License: Crusade") or (trade_take[3]="License: Crusade") or (trade_take[4]="License: Crusade"){ - obj_controller.liscensing=2; - } - if (trade_take[1]="Useful Information") or (trade_take[2]="Useful Information") or (trade_take[3]="Useful Information") or (trade_take[4]="Useful Information"){ - obj_controller.liscensing=5; - } - if (trade_take[1]="License: Repair") or (trade_take[2]="License: Repair") or (trade_take[3]="License: Repair") or (trade_take[4]="License: Repair"){ - repair_ships=1; - } - if (trade_take[1]="Exterminatus") or (trade_take[2]="Exterminatus") or (trade_take[3]="Exterminatus") or (trade_take[4]="Exterminatus"){ - obj_controller.liscensing=0; - lisc=0; - } + static draw_trade_screen = function(){ + recalc_values = false; + draw_set_color(CM_GREEN_COLOR); + draw_rectangle(342,326,486,673,1); + draw_rectangle(343,327,485,672,1);// Left Main Panel + draw_rectangle(504,371,741,641,1); + draw_rectangle(505,372,740,640,1);// Center panel + draw_rectangle(759,326,903,673,1); + draw_rectangle(760,327,902,672,1);// Right Main Panel - // show_message("A: "+string(liscensing)); - - ;var goods;goods=""; - + draw_rectangle(342,326,486,371,1);// Left Title Panel + draw_rectangle(759,326,903,371,1);// Right Title Panel + draw_set_font(fnt_40k_14b); + draw_set_halign(fa_center); + draw_text(411,330,$"{obj_controller.faction[diplomacy_faction]}\nItems"); + draw_text(829,330,$"{global.chapter_name}\nItems"); - // Temporary work around - if (lisc>0){ - for (var i = 1; i <= 4; i += 1) { - if (trade_give[i]="Requisition") then requisition-=trade_mnum[i]; - if (trade_give[i]="Gene-Seed") and (trade_mnum[i]>0){ - gene_seed-=trade_mnum[i]; - - if (diplomacy<=5) and (diplomacy!=4) then gene_sold+=trade_mnum[i]; - if (diplomacy>=6) then gene_xeno+=trade_mnum[i]; - } - if (trade_give[i]="Info Chip") and (trade_mnum[i]>0) then info_chips-=trade_mnum[i]; - if (trade_give[i]="STC Fragment") and (trade_mnum[i]>0){ - for (var j = 0; j < 100; j += 1) { - var p = choose(1, 2, 3); - if (p == 1 && stc_wargear_un > 0) { - stc_wargear_un -= 1; - break; - } - if (p == 2 && stc_vehicles_un > 0) { - stc_vehicles_un -= 1; - break; - } - if (p == 3 && stc_ships_un > 0) { - stc_ships_un -= 1; - break; - } - } - } - } - - - } - - - - if (lisc!=step) or (lisc=0){// Do not fly over licenses - - if (obj_ini.fleet_type=ePlayerBase.home_world) then with(obj_star){ - if ((p_owner[1]=1) or (p_owner[2]=1) or (p_owner[3]=1) or (p_owner[4]=1)){instance_create(x,y,obj_temp2);x-=10000;y-=10000;} - } - - - if (obj_ini.fleet_type != ePlayerBase.home_world){ - // with(obj_star){if (present_fleet[1]>0){x-=10000;y-=10000;}} - with(obj_p_fleet){// Get the nearest star system that is viable for creating the trading fleet - if (capital_number>0) and (action="") then instance_create(instance_nearest(x,y,obj_star).x,instance_nearest(x,y,obj_star).y,obj_temp2); - if (frigate_number>0) and (action="") then instance_create(instance_nearest(x,y,obj_star).x,instance_nearest(x,y,obj_star).y,obj_ground_mission); - } - } - - - // temp2: ideal trade target - // temp3: origin - // temp4: possible trade target - - - with(obj_star){// Get origin star system for enemy fleet - /*var q;q=0; - repeat(4){q+=1; - if (p_owner[q]=1) or (string_count("Monastery",p_feature[q])>0) then instance_create(x,y,obj_temp3); - }*/ - - - if /*(owner=obj_controller.diplomacy) and */((p_owner[1]=obj_controller.diplomacy) or (p_owner[2]=obj_controller.diplomacy) - or (p_owner[3]=obj_controller.diplomacy) or (p_owner[4]=obj_controller.diplomacy)){ - instance_create(x,y,obj_temp3); - } - - if (obj_controller.diplomacy=4){ - if (p_owner[1]=2) or (p_owner[2]=2) or (p_owner[3]=2) or (p_owner[4]=2) then instance_create(x,y,obj_temp3); - } - - // if (obj_controller.diplomacy=4) and (owner = eFACTION.Imperium) then instance_create(x,y,obj_temp3); - } - if (diplomacy=5){ - with(obj_star){var ahuh,q;ahuh=0;q=0; - repeat(4){q+=1;if (p_owner[q]=5) then ahuh=1; - if (p_owner[q]<6) and (planet_feature_bool(p_feature[q],P_features.Sororitas_Cathedral )==1) then ahuh=1; - } - if (ahuh=1) then instance_create(x,y,obj_temp3); - } - } - - - // show_message("TG2:"+string(instance_number(obj_temp2))+", TG3:"+string(instance_number(obj_temp3))+", TG4:"+string(instance_number(obj_ground_mission))); - - - var targ, flit, chasing;chasing=0;targ=0;// Set target, chase - - // if (obj_ini.fleet_type != ePlayerBase.home_world){ - if (instance_exists(obj_temp2)) then targ=instance_nearest(obj_temp2.x,obj_temp2.y,obj_temp3); - if (!instance_exists(obj_temp2)) and (instance_exists(obj_ground_mission)) then targ=instance_nearest(obj_ground_mission.x,obj_ground_mission.y,obj_temp3); - - if ((!instance_exists(obj_temp2)) and (!instance_exists(obj_ground_mission))) or (instance_number(obj_p_fleet)=1) and ((obj_p_fleet.x<=0) or (obj_p_fleet.x>room_width) or (obj_p_fleet.y<=0) or (obj_p_fleet.y>room_height)){ - with(obj_star){ - if (x<-3500) and (y<-3500){x+=10000;y+=10000;} - if (x<-3500) and (y<-3500){x+=10000;y+=10000;} - } - trading=0;scr_dialogue("trade_error_1"); - - if (trade_take[1]="Recruiting Planet") then recruiting_worlds_bought-=1; - if (trade_take[2]="Recruiting Planet") then recruiting_worlds_bought-=1; - if (trade_take[3]="Recruiting Planet") then recruiting_worlds_bought-=1; - if (trade_take[4]="Recruiting Planet") then recruiting_worlds_bought-=1; - if (trade_take[1]="License: Crusade") or (trade_take[2]="License: Crusade") or (trade_take[3]="License: Crusade") or (trade_take[4]="License: Crusade"){ - obj_controller.liscensing=0; - } - if (trade_take[1]="Useful Information") or (trade_take[2]="Useful Information") or (trade_take[3]="Useful Information") or (trade_take[4]="Useful Information"){ - obj_controller.liscensing=0; - } - if (trade_take[1]="License: Repair") or (trade_take[2]="License: Repair") or (trade_take[3]="License: Repair") or (trade_take[4]="License: Repair"){ - repair_ships=0; - } - - instance_activate_all();exit; - } - - // If player fleet is flying about then get their target for new target - if (!instance_exists(obj_temp2)) and (!instance_exists(obj_ground_mission)) and (instance_exists(obj_p_fleet)) and (obj_ini.fleet_type != ePlayerBase.home_world){ - // show_message("no T2 or T4: chasing"); - chasing=1; - with(obj_p_fleet){var pop; - if (capital_number>0) and (action!=""){pop=instance_create(action_x,action_y,obj_temp2);pop.action_eta=action_eta;} - if (frigate_number>0) and (action!=""){pop=instance_create(action_x,action_y,obj_ground_mission);pop.action_eta=action_eta;} - } - } - if (instance_exists(obj_temp2)) then targ=instance_nearest(obj_temp2.x,obj_temp2.y,obj_temp3); - if (!instance_exists(obj_temp2)) and (instance_exists(obj_ground_mission)) then targ=instance_nearest(obj_ground_mission.x,obj_ground_mission.y,obj_temp3); - // } - - if (!instance_exists(obj_temp3)){ - with(obj_star){ - if (x<-3500) and (y<-3500){x+=10000;y+=10000;} - if (x<-3500) and (y<-3500){x+=10000;y+=10000;} - } - trading=0;scr_dialogue("trade_error_2"); + if (trade_likely!="") then draw_text(623,348,$"[{trade_likely}]"); - for (var i=1;i<5;i++){ - if (trade_take[i]=="Recruiting Planet") then recruiting_worlds_bought-=1; - if (trade_take[i]=="License: Crusade") then obj_controller.liscensing=0; - if (trade_take[i]=="Useful Information") then obj_controller.liscensing=0; - if (trade_take[i]=="License: Repair") then repair_ships=0; - } - - instance_activate_all(); - exit; - } - - - flit=instance_create(targ.x,targ.y,obj_en_fleet); - - flit.owner=diplomacy; - flit.home_x=targ.x; - flit.home_y=targ.y; - - if (diplomacy=5) then flit.owner = eFACTION.Imperium; - - if (diplomacy=2) then flit.sprite_index=spr_fleet_imperial; - if (diplomacy=3) then flit.sprite_index=spr_fleet_mechanicus; - if (diplomacy=4){flit.sprite_index=spr_fleet_inquisition;flit.owner = eFACTION.Inquisition;} - // if (diplomacy=4){flit.sprite_index=spr_fleet_imperial;flit.owner = eFACTION.Imperium;} - if (diplomacy=6){ - flit.action_spd=6400; - flit.action_eta=1; - flit.sprite_index=spr_fleet_eldar; - } - if (diplomacy=7) then flit.sprite_index=spr_fleet_ork; - if (diplomacy=8) then flit.sprite_index=spr_fleet_tau; - - flit.image_index=0; - flit.capital_number=1; - - i=0; - repeat(4){i+=1; - if (trade_give[i]="Requisition") then requisition-=trade_mnum[i]; - if (trade_give[i]="Gene-Seed") and (trade_mnum[i]>0){ - gene_seed-=trade_mnum[i]; - - if (diplomacy<=5) and (diplomacy!=4) then gene_sold+=trade_mnum[i]; - if (diplomacy>=6) then gene_xeno+=trade_mnum[i]; - } - if (trade_give[i]="Info Chip") and (trade_mnum[i]>0) then info_chips-=trade_mnum[i]; - if (trade_give[i]="STC Fragment") and (trade_mnum[i]>0){ - var remov,p;remov=0;p=0; - repeat(100){ - if (remov=0){p=choose(1,2,3); - if (p=1) and (stc_wargear_un>0){stc_wargear_un-=1;remov=1;} - if (p=2) and (stc_vehicles_un>0){stc_vehicles_un-=1;remov=1;} - if (p=3) and (stc_ships_un>0){stc_ships_un-=1;remov=1;} - } - } - } - if (trade_take[i]!="") then goods+=string(trade_take[i])+"!"+string(trade_tnum[i])+"!|"; - } - - flit.trade_goods=goods; - if (flit.trade_goods="") then flit.trade_goods="none"; - - if (obj_ini.fleet_type != ePlayerBase.home_world){ - if (instance_exists(obj_temp2)){flit.action_x=obj_temp2.x;flit.action_y=obj_temp2.y;flit.target=instance_nearest(flit.action_x,flit.action_y,obj_p_fleet);} - if (!instance_exists(obj_temp2)) and (instance_exists(obj_ground_mission)){flit.action_x=obj_ground_mission.x;flit.action_y=obj_ground_mission.y;flit.target=instance_nearest(flit.action_x,flit.action_y,obj_p_fleet);} - } - if (obj_ini.fleet_type=ePlayerBase.home_world){ - targ=instance_nearest(flit.x,flit.y,obj_temp2); - flit.action_x=targ.x; - flit.action_y=targ.y; - } - - if (chasing=1){flit.minimum_eta=flit.target.action_eta;} - flit.alarm[4]=1; - - with(obj_temp2){instance_destroy();} - with(obj_temp3){instance_destroy();} - with(obj_ground_mission){instance_destroy();} - - - // show_message("D: "+string(liscensing)); - - if (flit.trade_goods="none"){// Elfdar mission 1 maybe - var got;got=0; - - - // show_message("E: "+string(liscensing)); - - if (trade_give[1]="Requisition") then got+=trade_mnum[1]; - if (trade_give[2]="Requisition") then got+=trade_mnum[2]; - if (trade_give[3]="Requisition") then got+=trade_mnum[3]; - if (trade_give[4]="Requisition") then got+=trade_mnum[4]; - - if (trade_tnum[1]+trade_tnum[2]+trade_tnum[3]+trade_tnum[4]>0) then got=0; - - if (got>=500) and (diplomacy=6){ - var got2;got2=0; - repeat(10){if (got2<50){got2+=1;if (quest[got2]="fund_elder") and (quest_faction[got2]=6){ - scr_dialogue("mission1_thanks");scr_quest(2,"fund_elder",6,0);got2=50;trading=0; - trade_take[0]="";trade_take[1]="";trade_take[2]="";trade_take[3]="";trade_take[4]="";trade_take[5]="";trade_tnum[0]=0;trade_tnum[1]=0;trade_tnum[2]=0;trade_tnum[3]=0;trade_tnum[4]=0;trade_tnum[5]=0; - trade_give[0]="";trade_give[1]="";trade_give[2]="";trade_give[3]="";trade_give[4]="";trade_give[5]="";trade_mnum[0]=0;trade_mnum[1]=0;trade_mnum[2]=0;trade_mnum[3]=0;trade_mnum[4]=0;trade_mnum[5]=0; - exit; - }}} - } - } - - } - + clear_button.draw(); + offer_button.draw(); + exit_button.draw(); - trading=0; - - // show_message("F: "+string(liscensing)); - - // show_message("rando4: "+string(rando4)+"#deal: "+string(deal)); - - - // show_message("Lisc: "+string(lisc)+" | Step: "+string(step)); - - if (trade_take[1]="Useful Information") or (trade_take[2]="Useful Information") or (trade_take[3]="Useful Information") or (trade_take[4]="Useful Information"){ - scr_dialogue("useful_information"); - } - else{ - if (lisc!=step) or (lisc=0) then scr_dialogue("agree"); - if (lisc=step) and (obj_controller.liscensing>0) then scr_dialogue("agree_lisc"); - } - - trade_take[0]="";trade_take[1]="";trade_take[2]="";trade_take[3]="";trade_take[4]="";trade_take[5]="";trade_tnum[0]=0;trade_tnum[1]=0;trade_tnum[2]=0;trade_tnum[3]=0;trade_tnum[4]=0;trade_tnum[5]=0; - trade_give[0]="";trade_give[1]="";trade_give[2]="";trade_give[3]="";trade_give[4]="";trade_give[5]="";trade_mnum[0]=0;trade_mnum[1]=0;trade_mnum[2]=0;trade_mnum[3]=0;trade_mnum[4]=0;trade_mnum[5]=0; - if (diplomacy=6) or (diplomacy=7) or (diplomacy=8) then scr_loyalty("Xeno Trade","+"); + draw_set_halign(fa_left); + draw_set_font(fnt_40k_14); + draw_set_color(CM_GREEN_COLOR); + var _requested_count = 0; + //if (obj_controller.trading_artifact = 0){ + for (var i=0;i 0){ + var _y_offset = 399 + (_requested_count * 20); + draw_sprite(spr_cancel_small,0,507,_y_offset); + if (point_and_click_sprite(507,_y_offset, spr_cancel_small)){ + _opt.number = 0; + recalc_values = true;; + } + + if (_opt.max_take > 1){ + draw_text(530,_y_offset,$"{_opt.label} : {_opt.number}"); + } else { + draw_text(530,_y_offset,$"{_opt.label}"); + } + _requested_count++; + } + } + //} + + var _requested_count = 0; + draw_text(507,529,$"{global.chapter_name}:"); + for (var i=0;i 0){ + var _y_offset = 547 + (_requested_count * 20); + draw_sprite(spr_cancel_small,0,507,_y_offset); + if (point_and_click_sprite(507,_y_offset, spr_cancel_small)){ + _opt.number = 0; + recalc_values = true;; + } + if (_opt.max_number > 1){ + draw_text(530,_y_offset,$"{_opt.label} : {_opt.number}"); + } else { + draw_text(530,_y_offset,$"{_opt.label}"); + } + _requested_count++; + } + } + + if (recalc_values){ + calculate_deal_chance(); + } } - if (rando4>deal) and (trading_artifact=0){ - trading=0;scr_dialogue("disagree"); - trade_take[0]="";trade_take[1]="";trade_take[2]="";trade_take[3]="";trade_take[4]="";trade_take[5]="";trade_tnum[0]=0;trade_tnum[1]=0;trade_tnum[2]=0;trade_tnum[3]=0;trade_tnum[4]=0;trade_tnum[5]=0; - trade_give[0]="";trade_give[1]="";trade_give[2]="";trade_give[3]="";trade_give[4]="";trade_give[5]="";trade_mnum[0]=0;trade_mnum[1]=0;trade_mnum[2]=0;trade_mnum[3]=0;trade_mnum[4]=0;trade_mnum[5]=0; + var _info_val = 0; + with (obj_controller){ + if (random_event_next != EVENT.none) and ((string_count("WL10|",useful_info)>0) or (turn0) or (known[eFACTION.Ork]<1)) and (string_count("WG|",useful_info)>1) and (string_count("CM|",useful_info)>0){ + _info_val=1000; + } } - - - // show_message("G: "+string(liscensing)); - - if (trading_artifact!=0){// Eheheheh, good space goy - if (rando4<=deal){ - i=0; - repeat(4){i+=1; - if (trade_give[i]="Requisition") then requisition-=trade_mnum[i]; - if (trade_give[i]="Gene-Seed") and (trade_mnum[i]>0){ - gene_seed-=trade_mnum[i]; - - if (diplomacy<=5) and (diplomacy!=4) then gene_sold+=trade_mnum[i]; - if (diplomacy>=6) then gene_xeno+=trade_mnum[i]; - } - if (trade_give[i]="Info Chip") and (trade_mnum[i]>0) then info_chips-=trade_mnum[i]; - if (trade_give[i]="STC Fragment") and (trade_mnum[i]>0){ - var remov,p;remov=0;p=0; - repeat(100){ - if (remov=0){p=choose(1,2,3); - if (p=1) and (stc_wargear_un>0){stc_wargear_un-=1;remov=1;} - if (p=2) and (stc_vehicles_un>0){stc_vehicles_un-=1;remov=1;} - if (p=3) and (stc_ships_un>0){stc_ships_un-=1;remov=1;} - } - } - } - } - trading=0;scr_dialogue("agree");force_goodbye=1;trading_artifact=2; - trade_take[0]="";trade_take[1]="";trade_take[2]="";trade_take[3]="";trade_take[4]="";trade_take[5]="";trade_tnum[0]=0;trade_tnum[1]=0;trade_tnum[2]=0;trade_tnum[3]=0;trade_tnum[4]=0;trade_tnum[5]=0; - trade_give[0]="";trade_give[1]="";trade_give[2]="";trade_give[3]="";trade_give[4]="";trade_give[5]="";trade_mnum[0]=0;trade_mnum[1]=0;trade_mnum[2]=0;trade_mnum[3]=0;trade_mnum[4]=0;trade_mnum[5]=0; - if (diplomacy=6) or (diplomacy=7) or (diplomacy=8) then scr_loyalty("Xeno Trade","+"); - } - if (rando4>deal){scr_dialogue("disagree"); - trade_give[0]="";trade_give[1]="";trade_give[2]="";trade_give[3]="";trade_give[4]="";trade_give[5]="";trade_mnum[0]=0;trade_mnum[1]=0;trade_mnum[2]=0;trade_mnum[3]=0;trade_mnum[4]=0;trade_mnum[5]=0; - } + information_value = _info_val; + + static calculate_trader_trade_value = function(){ + + their_worth = 100; + + for (var i=0;i 0 && struct_exists(relative_trade_values, _opt.label)){ + their_worth+=_opt.number*relative_trade_values[$ _opt.label]; + if (_opt.label=="Artifact"){ + var _faction_barrier = 0; + switch (diplomacy_faction){ + case 2: + _faction_barrier = 300; + break; + case 3: + _faction_barrier = 800; + break; + case 4: + _faction_barrier = 600; + break; + case 5: + _faction_barrier = 500; + break; + } + if (diplomacy_faction < 5){ + _faction_barrier = 1200 + } + their_worth += _faction_barrier; + } + } + } } - // show_message("H: "+string(liscensing)); - + static calculate_player_trade_value = function(){ + my_worth = 0; + for (var i = 0; i < array_length(offer_options); i++) { + var _opt = offer_options[i] + if (_opt.number<=0){ + continue; + } + if (_opt.label="Requisition"){ + my_worth += _opt.number; + } + + else if (_opt.label="Gene-Seed") { + if (diplomacy_faction=3) or (diplomacy_faction=4) then my_worth+=_opt.number*30; + if (diplomacy_faction=2) or (diplomacy_faction=5) then my_worth+=_opt.number*20; + if (diplomacy_faction=8) or (diplomacy_faction=10) then my_worth+=_opt.number*50; + } + + else if (_opt.label="Info Chip"){ + if (diplomacy_faction == eFACTION.Mechanicus){ + my_worth+=_opt.number*100;// 20% bonus + } else { + my_worth+=_opt.number*80; + } + my_worth+=_opt.number*80; + } + + if (_opt.label="STC Fragment") { + if (diplomacy_faction=2) then my_worth+=_opt.number*900; + if (diplomacy_faction=3) then my_worth+=_opt.number*1000; + if (diplomacy_faction=4) then my_worth+=_opt.number*1000; + if (diplomacy_faction=5) then my_worth+=_opt.number*900; + if (diplomacy_faction=10) then my_worth+=_opt.number*900; + + if (diplomacy_faction=6) then my_worth+=_opt.number*500; + if (diplomacy_faction=7) then my_worth+=_opt.number*500; + if (diplomacy_faction=8){ + my_worth+=_opt.number*1000; + } + } + } } - - with(obj_star){ - if (x<-3500) and (y<-3500){x+=10000;y+=10000;} - if (x<-3500) and (y<-3500){x+=10000;y+=10000;} + trade_likely = ""; + static chance_chart = ["Impossible", "Very Unlikely","Unlikely","Moderate Chance","Likely","Very Likely","Unrefusable"]; + static calculate_deal_chance = function(){ + + var def_penalty=0; + var penalty=0; + calculate_player_trade_value(); + calculate_trader_trade_value(); + + if (diplomacy_faction=2){ + dif_penalty=0.4; + penalty=5; + }else if (diplomacy_faction=3){ + dif_penalty=0.6; + penalty=5; + }else if (diplomacy_faction=4){ + dif_penalty=1; + penalty=15; + }else if (diplomacy_faction=5){ + dif_penalty=0.8; + penalty=0; + }else if (diplomacy_faction=6){ + dif_penalty=0.6; + penalty=10; + }else if (diplomacy_faction=7){ + dif_penalty=0.4; + penalty=20; + }else if (diplomacy_faction=8){ + dif_penalty=0.4; + penalty=0; + }else if (diplomacy_faction=10){ + dif_penalty=1; + penalty=0; + } + + deal_chance=(100-penalty)-(((their_worth-(my_worth*dif_penalty)))); + //show_debug_message_adv($"{their_worth},{my_worth},{deal_chance}"); + var _chance = clamp(floor((deal_chance/20)), 0, 6); + + trade_likely = chance_chart[_chance]; } - instance_activate_all(); - - } + diff --git a/scripts/scr_trade_add/scr_trade_add.gml b/scripts/scr_trade_add/scr_trade_add.gml deleted file mode 100644 index fdd4c37b8d..0000000000 --- a/scripts/scr_trade_add/scr_trade_add.gml +++ /dev/null @@ -1,67 +0,0 @@ -function scr_trade_add(argument0) { - - // argument0: item - - var tomp1,thinz; - tomp1=0;thinz=0; - if (trade_take[4]="") then thinz=4;if (trade_take[3]="") then thinz=3;if (trade_take[2]="") then thinz=2;if (trade_take[1]="") then thinz=1; - - - - - if (thinz!=0){ - trade_take[thinz]=argument0; - - if (argument0="Requisition"){get_diag_integer("Requisition wanted?",100000,"t"+string(thinz),"Requisition");} - if (argument0="Terminator Armour"){get_diag_integer("Terminator Armour wanted?",5,"t"+string(thinz),"Terminator Armour");} - if (argument0="Tartaros"){trade_tnum[thinz]=1;tomp1=1;} - if (argument0="Land Raider"){trade_tnum[thinz]=1;tomp1=1;} - if (argument0="Castellax Battle Automata"){trade_tnum[thinz]=1;tomp1=1;} - - if (argument0="Minor Artifact"){trade_tnum[thinz]=1;tomp1=1;} - if (argument0="Skitarii"){get_diag_integer("Skitarii wanted?",1000,"t"+string(thinz),"Skitarii");} - if (argument0="Techpriest"){trade_tnum[thinz]=3;tomp1=3;} - - // if (argument0="Storm Trooper"){trade_tnum[thinz]=get_integr("Number of Storm Troopers?",10);tomp1=100;} - if (argument0="Recruiting Planet"){trade_tnum[thinz]=1;tomp1=1;} - if (argument0="License: Repair"){trade_tnum[thinz]=1;tomp1=1;} - if (argument0="License: Crusade"){trade_tnum[thinz]=1;tomp1=1;} - - if (argument0="Eldar Power Sword"){get_diag_integer("Eldar Power Swords wanted?",5,"t"+string(thinz),"Eldar Power Sword");} - if (argument0="Archeotech Laspistol"){trade_tnum[thinz]=1;tomp1=1;} - if (argument0="Ranger"){get_diag_integer("Eldar Rangers wanted?",5,"t"+string(thinz),"Ranger");} - if (argument0="Useful Information"){ - var woj;woj=trade_take[1]+trade_take[2]+trade_take[3]+trade_take[4]; - if (string_count("Useful Info",woj)=1){trade_tnum[thinz]=1;tomp1=1;} - if (string_count("Useful Info",woj)>1){trade_tnum[thinz]=0;tomp1=0;trade_take[thinz]="";} - } - - // TODO: Condemnor Boltgun trade dialog disabled due to weapon being temporarily removed. - // Re-enable when the weapon is properly implemented. - // if (argument0="Condemnor Boltgun"){get_diag_integer("Condemnor Boltguns wanted?",20,"t"+string(thinz),"Condemnor Boltgun");} - if (argument0="Hellrifle"){get_diag_integer("Hellrifles wanted?",3,"t"+string(thinz),"Hellrifle");} - if (argument0="Incinerator"){get_diag_integer("Incinerators wanted?",10,"t"+string(thinz),"Incinerator");} - if (argument0="Crusader"){get_diag_integer("Crusaders wanted?",5,"t"+string(thinz),"Crusader");} - if (argument0="Exterminatus"){trade_tnum[thinz]=1;tomp1=1;} - if (argument0="Cyclonic Torpedo"){trade_tnum[thinz]=1;tomp1=1;} - if (argument0="Eviscerator"){get_diag_integer("Eviscerators wanted?",10,"t"+string(thinz),"Eviscerator");} - if (argument0="Heavy Flamer"){get_diag_integer("Heavy Flamers wanted?",10,"t"+string(thinz),"Heavy Flamer");} - if (argument0="Inferno Bolts"){trade_tnum[thinz]=20;tomp1=20;} - if (argument0="Sister of Battle"){get_diag_integer("Sisters of Battle wanted?",3,"t"+string(thinz),"Sister of Battle");} - if (argument0="Sister Hospitaler"){trade_tnum[thinz]=1;tomp1=1;} - - if (argument0="Power Klaw"){get_diag_integer("Power Klaws wanted?",5,"t"+string(thinz),"Power Klaw");} - if (argument0="Ork Sniper"){get_diag_integer("Ork Snipers wanted?",20,"t"+string(thinz),"Ork Sniper");} - if (argument0="Flash Git"){get_diag_integer("Flash Gitz wanted?",6,"t"+string(thinz),"Flash Git");} - - if (argument0="Test"){trade_tnum[thinz]=1;tomp1=1;} - - // if (trade_tnum[thinz]=0){trade_tnum[thinz]=0;trade_take[thinz]="";} - // if (trade_tnum[thinz]>tomp1) then trade_tnum[thinz]=tomp1; - } - - cooldown=8; - scr_trade(false); - - -} diff --git a/scripts/scr_trade_dep/scr_trade_dep.gml b/scripts/scr_trade_dep/scr_trade_dep.gml index 9cdbfa54b8..59b178aa44 100644 --- a/scripts/scr_trade_dep/scr_trade_dep.gml +++ b/scripts/scr_trade_dep/scr_trade_dep.gml @@ -1,177 +1,68 @@ function scr_trade_dep() { - - if (trade_goods="none") then exit; - - - var g, n, r, temp1, temp2; - r=-1;repeat(100){r+=1;g[r]="";n[r]=0;} - - temp1=0;temp2=string_count("|",trade_goods); - - explode_script(trade_goods,"|"); - r=0;repeat(temp2){r+=1; - g[r]=string(explode[r-1]);// show_message(string(g[r])); - } - r=0;repeat(temp2){r+=1; - explode_script(g[r],"!");g[r]=string(explode[0]);n[r]=real(explode[1]); - // show_message(string(g[r])+" x"+string(n[r])); + var _goods = cargo_data.player_goods; + + //show_debug_message_adv($"trade goods : {_goods}"); + if (struct_exists(_goods, "mercenaries")){ + var _mercs = struct_get_names(_goods.mercenaries); + for (var m=0;m= 1) and (target_comp <= 10) { + obj_ini.veh_race[target_comp][vehi]=obj_ini.veh_race[veh_data[0]][veh_data[1]]; + obj_ini.veh_loc[target_comp][vehi]=obj_ini.veh_loc[veh_data[0]][veh_data[1]]; + obj_ini.veh_role[target_comp][vehi]=obj_ini.veh_role[veh_data[0]][veh_data[1]]; + obj_ini.veh_wep1[target_comp][vehi]=obj_ini.veh_wep1[veh_data[0]][veh_data[1]]; + obj_ini.veh_wep2[target_comp][vehi]=obj_ini.veh_wep2[veh_data[0]][veh_data[1]]; + obj_ini.veh_wep3[target_comp][vehi]=obj_ini.veh_wep3[veh_data[0]][veh_data[1]]; + obj_ini.veh_upgrade[target_comp][vehi]=obj_ini.veh_upgrade[veh_data[0]][veh_data[1]]; + obj_ini.veh_acc[target_comp][vehi]=obj_ini.veh_acc[veh_data[0]][veh_data[1]]; + obj_ini.veh_hp[target_comp][vehi]=obj_ini.veh_hp[veh_data[0]][veh_data[1]]; + obj_ini.veh_chaos[target_comp][vehi]=obj_ini.veh_chaos[veh_data[0]][veh_data[1]]; + obj_ini.veh_pilots[target_comp][vehi]=0; + obj_ini.veh_lid[target_comp][vehi]=obj_ini.veh_lid[veh_data[0]][veh_data[1]]; + obj_ini.veh_wid[target_comp][vehi]=obj_ini.veh_wid[veh_data[0]][veh_data[1]]; + + destroy_vehicle(veh_data[0],veh_data[1]); + + vehi++; + } + + } + } + + } + + // Check this + + if (obj_controller.managing>0){ + with(obj_controller){scr_management(1);} + } + obj_ini.selected_company=company; + obj_ini.temp_target_company=target_comp; + with(obj_ini){ + for (var co=0;co<11;co++){ + scr_company_order(co); + scr_vehicle_order(co); + } + } + + with(obj_controller){ + // man_current=0; + var i=-1; + man_size=0; + selecting_location=""; + selecting_types=""; + selecting_ship=-1; + + if (obj_controller.managing>0){ + reset_manage_arrays(); + alll=0; + update_general_manage_view(); + } + } + + with(obj_managment_panel){instance_destroy();} + + obj_controller.cooldown=10; + instance_destroy(); +} + + +function set_up_transfer_popup(){ + if (instance_number(obj_popup)==0){ + var pip=instance_create(0,0,obj_popup); + pip.type=5.1; + pip.company=managing; + + var god=0,_marine_count=0,_vehicle_count=0,checky=0,check_number=0; + var _min_exp = 0; + for (var f=0; f1) then pip.unit_role="Vehicles"; + if (_marine_count>1) then pip.unit_role="Marines"; + if (_marine_count>0) and (_vehicle_count>0) then pip.unit_role="Units"; + pip.units=_marine_count+_vehicle_count; + if (_marine_count>0 && check_number>0 && !command_set[1]){ + cooldown=8000; + with(pip){ + instance_destroy(); + } + } else { + with (pip){ + cancel_button = new UnitButtonObject( + { + x1: 1061, + y1: 491, + style : "pixel", + label : "Cancel" + } + ); + main_slate = new DataSlate({ + style : "decorated", + XX : 1006, + YY : 143, + set_width : true, + width : 571, + height : 350, + }); + // Inside with(pip), 'min_exp' refers to pip.min_exp + if (unit_role == "Vehicles"){ + min_exp = -1; // sentinel to bypass gating only for vehicles + } + target_company_radio(min_exp); + transfer_button = new UnitButtonObject( + { + x1: 1450, + y1: 491, + style : "pixel", + label : "Transfer" + } + ); + } + } + } +} \ No newline at end of file diff --git a/scripts/scr_transfer_marines/scr_transfer_marines.yy b/scripts/scr_transfer_marines/scr_transfer_marines.yy new file mode 100644 index 0000000000..e0e2656051 --- /dev/null +++ b/scripts/scr_transfer_marines/scr_transfer_marines.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"v1", + "%Name":"scr_transfer_marines", + "isCompatibility":false, + "isDnD":false, + "name":"scr_transfer_marines", + "parent":{ + "name":"Scripts", + "path":"folders/Scripts.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/scr_turn_first/scr_turn_first.gml b/scripts/scr_turn_first/scr_turn_first.gml index 76c00bb5e2..c470e2540b 100644 --- a/scripts/scr_turn_first/scr_turn_first.gml +++ b/scripts/scr_turn_first/scr_turn_first.gml @@ -1,156 +1,75 @@ function scr_turn_first() { - try{ - // I believe this is ran at the start of the end of the turn. That would make sense, right? + try { + // I believe this is ran at the start of the end of the turn. That would make sense, right? - var identifiable=0; - var unload=0; - var cur_arti; - for (var i=0;i-1){ - obj_ini.artifact_loc[unload] = obj_ini.ship[valid_ship]; - obj_ini.artifact_sid[unload] = 500+valid_ship; - } - } - if (cur_arti.identified()>0){ - var _identifiable = cur_arti.is_identifiable() - - if (instance_exists(obj_p_fleet)) and (!_identifiable){ - var _arti_fleet = find_ships_fleet(cur_arti.ship_id()); - if (_arti_fleet!="none"){ - if (array_length(_arti_fleet.capital_num)){ - _identifiable = true; - cur_arti.set_ship_id(_arti_fleet.capital_num[0]); - } - } - } - - if (_identifiable) then obj_ini.artifact_identified[unload]-=1; - if (obj_ini.artifact_identified[unload]=0) then scr_alert("green","artifact","Artifact ("+string(obj_ini.artifact[unload])+") has been identified.",0,0); - } - _identifiable=false; - } - unload=0; + var _unload_i = 0; + for (var i = 0, l = array_length(obj_ini.artifact); i < l; i++) { + _unload_i = i; + if (obj_ini.artifact[_unload_i] == "") { + continue; + } + var _cur_arti = obj_ini.artifact_struct[_unload_i]; + if (_cur_arti.loc() == "") { + var _valid_ship_i = get_valid_player_ship(); + if (_valid_ship_i > -1) { + obj_ini.artifact_loc[_unload_i] = obj_ini.ship[_valid_ship_i]; + obj_ini.artifact_sid[_unload_i] = 500 + _valid_ship_i; + } + } + if (_cur_arti.identified() > 0) { + var _identifiable = _cur_arti.is_identifiable(); + if (instance_exists(obj_p_fleet) && (!_identifiable)) { + var _arti_fleet = find_ships_fleet(_cur_arti.ship_id()); + if (_arti_fleet != "none") { + if (array_length(_arti_fleet.capital_num)) { + _identifiable = true; + _cur_arti.set_ship_id(_arti_fleet.capital_num[0]); + } + } + } - var peace_check,host_p,ox,oy,x5,y5,fdir; - peace_check=0;ox=0;oy=0;x5=0;y5=0;fdir=0; - if (floor(turn/90)==turn/90) then peace_check=1; - // peace_check=1;// Testing - host_p=0; + if (_identifiable) { + obj_ini.artifact_identified[_unload_i] -= 1; + } + if (obj_ini.artifact_identified[_unload_i] == 0) { + scr_alert("green", "artifact", "Artifact (" + string(obj_ini.artifact[_unload_i]) + ") has been identified.", 0, 0); + } + } + } - if (peace_check>0){ - with(obj_temp3){instance_destroy();} - var baddy, total; - total = 0; - with(obj_star){ - if (owner>5){ - baddy = 0; - o = 0; - repeat(planets){ - o+=1; - if (p_orks[o]+p_tyranids[o]+p_chaos[o]+p_traitors[o]+p_necrons[o]>=3) then baddy+=1; - } - if (baddy>0) { - total++; - } - } - } - if (total<=3) then peace_check=2; - - // More Testing - // peace_check=2; - - if (peace_check=2){ - var did_so;did_so=false; - if (turn>=150) and (faction_defeated[10]=0) and (known[eFACTION.Chaos]=0) and (faction_gender[10]=2){ - // if (turn>=100000) and (faction_defeated[10]=0) and (known[eFACTION.Chaos]=0){faction_gender[10]=2; - spawn_chaos_warlord(); - - } - if (did_so=false) and (faction_defeated[7]=1){ - with(obj_turn_end){audiences+=1;audien[audiences]=7;known[eFACTION.Chaos]=2;audien_topic[audiences]="new_warboss";did_so=true;} - - faction_defeated[7]=-1;known[eFACTION.Ork]=0; - faction_leader[eFACTION.Ork]=global.name_generator.generate_ork_name(); - faction_title[7]="Warboss"; - faction_status[eFACTION.Ork]="War"; - disposition[7]=-40; - - var gold,gnew,starf;gold=faction_gender[7];if (gold=0) then gold=1;gnew=0; - repeat(20){if (gnew=0) or (gnew=gold) then gnew=choose(1,2,3,4);} - faction_gender[7]=gnew;starf=0; - - var x3,y3,fnum;fnum=0; - x3=0;y3=0; - var side=choose("left","right","up","down"); - if (side="left") then y3=floor(random_range(0,room_height))+1; - if (side="right"){y3=floor(random_range(0,room_height))+1;x3=room_width;} - if (side="up") then x3=floor(random_range(0,room_width))+1; - if (side="down"){x3=floor(random_range(0,room_width))+1;y3=room_height;} - - //lots of this can be wrapped into a single with - with(obj_star){if (owner = eFACTION.Eldar) then x-=20000;} - with(obj_star){if (planets=1) and (p_type[1]="Dead"){x-=20000;y-=20000;}} - with(obj_star){if (planets=2) and (p_type[1]="Dead")and (p_type[2]="Dead"){x-=20000;y-=20000;}} - - repeat(8){fnum+=1; - var x4,y4,dire;x4=0;y4=0;dire=0; - if (fnum=1){ - dire=point_direction(x4,y4,room_width/2,room_height/2); - x4=x3+lengthdir_x(60,dire);y4=y3+lengthdir_y(60,dire); - } - if (fnum>1){ - dire=point_direction(x4,y4,room_width/2,room_height/2); - x4=x3+choose(round(random_range(30,50)),round(random_range(-30,-50))); - y4=y3+choose(round(random_range(30,50)),round(random_range(-30,-50))); - } - - var nfleet,tplan;nfleet=instance_create(x4,y4,obj_en_fleet); - nfleet = new_ork_fleet(x4,y4); - tplan=instance_nearest(nfleet.x,nfleet.y,obj_star); - nfleet.action_x=tplan.x; - nfleet.action_y=tplan.y; - if (fnum=1){ - starf=tplan; - nfleet.cargo_data.ork_warboss=new NewPlanetFeature(OrkWarboss); - } - with (nfleet){ - frigate_number=10; - capital_number=4; - set_fleet_movement(); - } - - - nfleet.x-=20000; - nfleet.y-=20000; - tplan.x-=20000; - tplan.y-=20000; - } - - with(obj_en_fleet){if (x<-14000) and (y<-14000) and (owner = eFACTION.Ork){x+=20000;y+=20000;}} - with(obj_star){if (x<-14000) and (y<-14000){x+=20000;y+=20000;}} - with(obj_star){if (x<-14000) and (y<-14000){x+=20000;y+=20000;}} - with(obj_star){if (x<-14000) and (y<-14000){x+=20000;y+=20000;}} - with(obj_star){if (x<-14000) and (y<-14000){x+=20000;y+=20000;}} - with(obj_star){if (x<-14000) and (y<-14000){x+=20000;y+=20000;}} - - var _ork_leader = obj_controller.faction_leader[eFACTION.Ork]; - var tix=$"Warboss {_ork_leader} leads a WAAAGH! into Sector "+string(obj_ini.sector_name)+"."; - scr_alert("red","lol",string(tix),starf.x,starf.y); - scr_event_log("red",tix); - scr_popup("WAAAAGH!",$"A WAAAGH! led by the Warboss {_ork_leader} has arrived in "+string(obj_ini.sector_name)+". With him is a massive Ork fleet. Numbering in the dozens of battleships, they carry with them countless greenskins. The forefront of the WAAAGH! is destined for the "+string(starf.name)+" system.","waaagh",""); - } - } - } - }catch(_exception) { - handle_exception(_exception); - } + var _peace_check = obj_controller.turn > 100; + // peace_check=1;// Testing + if (_peace_check > 0) { + var _total = 0; + with (obj_star) { + if (owner > 5) { + var _baddy = 0; + var o = 0; + repeat (planets) { + o++; + if (p_orks[o] + p_tyranids[o] + p_chaos[o] + p_traitors[o] + p_necrons[o] >= 3) { + _baddy++; + } + } + if (_baddy > 0) { + _total++; + } + } + } + + if (_total <= 3) { + if ((obj_controller.turn >= 150) && (obj_controller.faction_defeated[eFACTION.Chaos] == 0) && (obj_controller.known[eFACTION.Chaos] == 0) && (obj_controller.faction_gender[eFACTION.Chaos] == 2)) { + // if (turn>=100000) and (faction_defeated[10]=0) and (known[eFACTION.Chaos]=0){faction_gender[10]=2; + spawn_chaos_warlord(); + } else { + out_of_system_warboss(); + } + } + } + } catch (_exception) { + handle_exception(_exception); + } } diff --git a/scripts/scr_ui_advisors/scr_ui_advisors.gml b/scripts/scr_ui_advisors/scr_ui_advisors.gml index a0db5e8918..d7a9233515 100644 --- a/scripts/scr_ui_advisors/scr_ui_advisors.gml +++ b/scripts/scr_ui_advisors/scr_ui_advisors.gml @@ -13,18 +13,18 @@ function scr_ui_advisors() { // This script draws all of the ADVISOR screens // ** Fleet ** - if (menu = 16) { + if (menu = MENU.Fleet) { scr_fleet_advisor(); } // ** Apothecarium ** - if (menu = 11) { + else if (menu = MENU.Apothecarion) { scr_apothecarium(); } // ** Reclusium ** - if ((menu = 12) or(menu = 12.1)) { + if ((floor(menu) == MENU.Reclusiam)) { draw_sprite(spr_rock_bg, 0, xx, yy); draw_set_alpha(0.75); @@ -54,7 +54,7 @@ function scr_ui_advisors() { draw_set_halign(fa_left); draw_set_color(c_gray); draw_set_font(fnt_40k_30b); - draw_text_transformed(xx + 336 + 16, yy + 66, string_hash_to_newline("Reclusium"), 1, 1, 0); + draw_text_transformed(xx + 336 + 16, yy + 66, "Reclusium", 1, 1, 0); draw_text_transformed(xx + 336 + 16, yy + 100, string_hash_to_newline("Master of Sanctity " + string(obj_ini.name[0, 2])), 0.6, 0.6, 0); } if (menu_adept = 1) { @@ -63,15 +63,15 @@ function scr_ui_advisors() { draw_set_halign(fa_left); draw_set_color(c_gray); draw_set_font(fnt_40k_30b); - draw_text_transformed(xx + 336 + 16, yy + 66, string_hash_to_newline("Reclusium"), 1, 1, 0); + draw_text_transformed(xx + 336 + 16, yy + 66, "Reclusium", 1, 1, 0); draw_text_transformed(xx + 336 + 16, yy + 100, string_hash_to_newline("Adept " + string(obj_controller.adept_name)), 0.6, 0.6, 0); } draw_set_font(fnt_40k_14); draw_set_alpha(1); draw_set_color(c_gray); - if (temp[36] != "0") then blurp = "Sir! You requested a report? Currently, we have deployed " + string(temp[36]) + " " + string(obj_ini.role[100, 14]) + "s to watch over the health of our Battle-Brothers in the field. We have an additional " + string(temp[37]) + " " + string(obj_ini.role[100, 14]) + "s who await only your order to carry the word to the troops."; - if (temp[36] = "0") then blurp = "Sir! You requested a report? Currently, we have " + string(temp[37]) + " " + string(obj_ini.role[100, 14]) + "s who await only your order to carry the word to the troops."; + if (temp[36] != "0") then blurp = $"Sir! You requested a report? Currently, we have deployed {temp[36]} {obj_ini.role[100, 14]}s to watch over the health of our Battle-Brothers in the field. We have an additional " + string(temp[37]) + " " + string(obj_ini.role[100, 14]) + "s who await only your order to carry the word to the troops."; + if (temp[36] = "0") then blurp = "Sir! You requested a report? Currently, we have {temp[37]} {obj_ini.role[100, 14]}s who await only your order to carry the word to the troops."; // if (global.chapter_name != "Space Wolves") and(global.chapter_name != "Iron Hands") { blurp += "##Currently, we are training additional " + string(obj_ini.role[100, 14]) + " at a "; @@ -89,8 +89,10 @@ function scr_ui_advisors() { draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); - if (menu = 12) then draw_text_transformed(xx + 1262, yy + 70, string_hash_to_newline("Penitorium"), 0.6, 0.6, 0); - if (menu = 12.1) then draw_text_transformed(xx + 1262, yy + 70, string_hash_to_newline("Scheduling Event"), 0.6, 0.6, 0); + if (menu == MENU.Reclusiam){ + draw_text_transformed(xx + 1262, yy + 70, "Penitorium", 0.6, 0.6, 0); + } + if (menu = 12.1) then draw_text_transformed(xx + 1262, yy + 70, "Scheduling Event", 0.6, 0.6, 0); if (penitorium > 0) and(menu != 12.1) { draw_set_font(fnt_40k_14); @@ -625,7 +627,7 @@ function scr_ui_advisors() { draw_rectangle(xx + 213, yy + 25, xx + 622, yy + 78, 0); draw_set_halign(fa_center); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_line(xx + 213, yy, xx + 213, yy + 640); draw_rectangle(xx + 213, yy + 25, xx + 622, yy + 78, 1); @@ -634,7 +636,7 @@ function scr_ui_advisors() { draw_rectangle(xx + 217, yy + 199, xx + 617, yy + 367, 0); draw_rectangle(xx + 217, yy + 380, xx + 617, yy + 411, 0); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_rectangle(xx + 217, yy + 82, xx + 617, yy + 188, 1); draw_rectangle(xx + 217, yy + 199, xx + 617, yy + 367, 1); draw_rectangle(xx + 217, yy + 380, xx + 617, yy + 411, 1); @@ -663,7 +665,7 @@ function scr_ui_advisors() { draw_text_ext(xx + 222, yy + 216, string_hash_to_newline(string(tot_ki)), -1, 396); var unit = fetch_unit([0,1]); - if (unit.ship_location == -1) then draw_text(xx + 222, yy + 380, string_hash_to_newline("Current Location: " + string(obj_ini.loc[0, 1]) + " " + string(unit.planet_location) + "#Health: " + unit.hp() + "%")); + if (unit.ship_location == -1) then draw_text(xx + 222, yy + 380, string_hash_to_newline($"Current Location: {unit.location_string} {unit.planet_location}#Health: " + unit.hp() + "%")); if (unit.ship_location>-1) then draw_text(xx + 222, yy + 380, string_hash_to_newline($"Current Location: Onboard {obj_ini.ship[unit.ship_location]}#Health: {unit.hp()}%")); draw_text(xx + 222.5, yy + 380.5, string_hash_to_newline("Current Location:#Health:")); @@ -689,12 +691,12 @@ function scr_ui_advisors() { } - if (menu = 1) and(managing = 0) { + if (menu == MENU.Manage) and (managing == 0) { draw_set_alpha(1); draw_sprite(spr_rock_bg, 0, xx, yy); draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); draw_set_color(c_gray); - draw_text(xx + 800, yy + 74, string_hash_to_newline(string(global.chapter_name) + " Chapter Organization")); + draw_text(xx + 800, yy + 74, $"{global.chapter_name} Chapter Organization"); } } diff --git a/scripts/scr_ui_diplomacy/scr_ui_diplomacy.gml b/scripts/scr_ui_diplomacy/scr_ui_diplomacy.gml index edfab42771..3975bacf74 100644 --- a/scripts/scr_ui_diplomacy/scr_ui_diplomacy.gml +++ b/scripts/scr_ui_diplomacy/scr_ui_diplomacy.gml @@ -1,22 +1,473 @@ +function draw_character_diplomacy_base_page(){ + add_draw_return_values(); + obj_controller.menu_lock = true; + if (!audience && !valid_diplomacy_options()){ + with (diplo_buttons){ + trade.draw(); + demand.draw(); + discuss.draw(); + alliance.draw(); + denounce.draw(); + praise.draw(); + declare_war.draw_shutter(praise.x1,alliance.y2,"WAR",0.4); + } + } else { + if (!valid_diplomacy_options()){ + diplo_buttons.denounce.draw(); + diplo_buttons.praise.draw(); + } + } + if (!valid_diplomacy_options() || force_goodbye){ + diplo_buttons.exit_button.draw(); + } + pop_draw_return_values(); +} + +function intro_to_diplomacy(faction_enum){ + with (obj_controller){ + var _new_diag = "intro"; + if (faction_enum!=4){ + if (known[faction_enum]==1) { + known[diplomacy]=2; + faction_justmet=1; + } + else if (known[faction_enum]>=2) { + _new_diag = "hello"; + } + } else { + if (known[eFACTION.Inquisition]==1) { + known[diplomacy]=2; + faction_justmet=1; + obj_controller.last_mission=turn+1; + } + else if (known[eFACTION.Inquisition]==3) { + known[faction_enum]=4; + faction_justmet=1; + obj_controller.last_mission=turn+1; + } + else if (known[faction_enum]>=4) { + _new_diag = "hello"; + } + } + scr_dialogue(_new_diag); + } +} + + +function exit_diplomacy_dialogue(){ + obj_controller.menu_lock = false; + if (audio_is_playing(snd_blood)==true) then scr_music("royal",2000); + + var _close_diplomacy = true; + if (complex_event==true) and (instance_exists(obj_temp_meeting)){ + complex_event=false; + with(obj_temp_meeting){ + instance_destroy(); + } + if (instance_exists(obj_turn_end)){ + obj_turn_end.alarm[1]=1; + } + } + + if (trading_artifact!=0){ + clear_diplo_choices(); + cooldown=8; + if (trading_artifact == 2 && instance_exists(obj_ground_mission)){ + with (obj_ground_mission){ + recieve_artifact_in_discussion(); + } + } + trading_artifact=0; + with(obj_popup){ + obj_ground_mission.alarm[1]=1; + instance_destroy(); + } + } + + if (force_goodbye==5){ + clear_diplo_choices(); + } + + if (liscensing==2) and (repair_ships==0){ + cooldown=8; + var cru=instance_create(mouse_x,mouse_y,obj_crusade); + cru.owner=diplomacy; + cru.placing=true; + exit_all=0; + liscensing=0; + if (zoomed==0) then scr_zoom(); + } + + if (exit_all!=0){ + exit_all=0; + } + if (diplo_last=="artifact_thanks") and (force_goodbye!=0){ + scr_toggle_lib(); + _close_diplomacy = false; + } else if (diplo_last=="stc_thanks"){ + scr_toggle_armamentarium(); + _close_diplomacy = false; + } + // Exits back to diplomacy thing + if (audience==0){ + cooldown=8; + diplomacy=0; + force_goodbye=0; + _close_diplomacy = false; + } + // No need to check for next audience + if (audience>0) and (instance_exists(obj_turn_end)){ + if (complex_event==false){ + + obj_turn_end.alarm[1]=1; + show_debug_message_adv("next_audience"); + } + if (complex_event=true){ + // TODO + } + } + if (_close_diplomacy){ + scr_toggle_diplomacy(); + } +} +function draw_diplomacy_diplo_text(){ + draw_set_font(fnt_40k_14); + draw_set_alpha(1); + draw_set_color(CM_GREEN_COLOR); + draw_set_halign(fa_left); + draw_text_ext(336+16,209,string_hash_to_newline(string(diplo_txt)),-1,536); + draw_set_halign(fa_center); + draw_line(xx+429,yy+710,xx+800,yy+710); +} +function set_up_diplomacy_buttons(){ + diplo_buttons = {}; + audience_data = {}; + set_up_diplomacy_persons(); + //Trade button setup + diplo_buttons.trade = new UnitButtonObject({ + x1 : 400, + y1 : 720, + label : "Trade", + bind_scope : obj_controller, + style:"pixel" + }); + diplo_buttons.trade.bind_method = function(){ + if ((audience==0) and (force_goodbye==0)){ + trading=1; + scr_dialogue("open_trade"); + cooldown=8; + click2=1; + trade_attempt = new TradeAttempt(diplomacy); + } + } + + + //Demand button setup + diplo_buttons.demand = new UnitButtonObject({ + x1 : 600, + y1 : 720, + label : "Demand", + bind_scope : obj_controller, + style:"pixel" + }); + diplo_buttons.demand.bind_method = function(){ + if ((audience==0) and (force_goodbye==0)){ + cooldown=8; + click2=1; + trading_demand=diplomacy; + scr_dialogue("trading_demand"); + } + } + + //Discuss button setup + diplo_buttons.discuss = new UnitButtonObject({ + x1 : 800, + y1 : 720, + label : "Discuss", + tooltip : "Unfinished", + bind_scope : obj_controller, + style:"pixel" + }); + + + //denounce button setup + diplo_buttons.denounce = new UnitButtonObject({ + x1 : 400, + y1 : diplo_buttons.trade.y2, + label : "Denounce", + bind_scope : obj_controller, + style:"pixel" + }); + + diplo_buttons.denounce.bind_method = function(){ + if (diplo_last!="denounced"){ + scr_dialogue("denounced"); + cooldown=8; + click2=1; + } + } + + diplo_buttons.praise = new UnitButtonObject({ + x1 : 600, + y1 : diplo_buttons.trade.y2, + label : "Praise", + bind_scope : obj_controller, + style:"pixel" + }); + + diplo_buttons.praise.bind_method = function(){ + if (diplo_last!="praised"){ + scr_dialogue("praised"); + cooldown=8; + click2=1; + } + } + + diplo_buttons.alliance = new UnitButtonObject({ + x1 : 800, + y1 : diplo_buttons.trade.y2, + label : "Propose\nAlliance", + bind_scope : obj_controller, + style:"pixel" + }); + + + diplo_buttons.alliance.bind_method = function(){ + if (diplo_last!="propose_alliance"){ + cooldown=8; + click2=1; + scr_dialogue("propose_alliance"); + } + } + + diplo_buttons.exit_button = new UnitButtonObject({ + x1 : 818, + y1 : 795, + label : "Exit", + bind_scope : obj_controller, + color : CM_RED_COLOR, + }); + + diplo_buttons.exit_button.bind_method = exit_diplomacy_dialogue; + + + diplo_buttons.declare_war = new ShutterButton(); + var _war = diplo_buttons.declare_war; + _war.XX= 640; + _war.YY= diplo_buttons.alliance.y2; + _war.label = "DECLARE WAR"; + _war.tooltip = "Unfinished"; + _war.color = CM_RED_COLOR; + _war.cover_text= "Declare War"; + _war.bind_scope = obj_controller; + + diplo_buttons.main_slate = new DataSlate(); + diplo_buttons.main_slate.width = 570; + diplo_buttons.main_slate.height = 854; + diplo_buttons.main_slate.set_width = true; + diplo_buttons.main_slate.style = "decorated"; + set_up_rpgcharacter_diplomacy(); +} + +function set_up_rpgcharacter_diplomacy(){ + with(obj_controller){ + diplo_buttons.meet_slate = new DataSlate(); + with(diplo_buttons.meet_slate){ + width = 572; + height = 188; + XX = 0; + YY = 712; + set_width = true; + style = "plain"; + } + diplo_buttons.cm_slate = new DataSlate(); + with(diplo_buttons.cm_slate){ + width = 572; + height = 188; + XX = 1031; + YY = 712; + set_width = true; + style = "plain"; + } + } +} + +function set_up_diplomacy_persons(){ + diplo_persons = { + } + diplo_persons.imperium = new ShutterButton(); + var _imp = diplo_persons.imperium; + _imp.image = known[eFACTION.Imperium] || global.cheat_debug? 3 : 4; + _imp._faction_enum = eFACTION.Imperium; + + diplo_persons.mechanicus = new ShutterButton(); + var _mechs = diplo_persons.mechanicus; + _mechs.image = known[eFACTION.Mechanicus] || global.cheat_debug? 5 : 6; + _mechs._faction_enum = eFACTION.Mechanicus; + + diplo_persons.inquisition = new ShutterButton(); + var _inquis = diplo_persons.inquisition; + _inquis.image = known[eFACTION.Inquisition]|| global.cheat_debug ? 7 : 8; + _inquis._faction_enum = eFACTION.Inquisition; + + diplo_persons.sisters = new ShutterButton(); + var _sisters = diplo_persons.sisters; + _sisters.image = known[eFACTION.Ecclesiarchy] || global.cheat_debug? 9 : 10; + _sisters._faction_enum = eFACTION.Ecclesiarchy; + + + + diplo_persons.eldar = new ShutterButton(); + var _eldar = diplo_persons.eldar; + if (faction_gender[eFACTION.Eldar]=1){ + _eldar.image = known[eFACTION.Eldar] || global.cheat_debug? 9 : 10; + } else { + _eldar.image = known[eFACTION.Eldar] || global.cheat_debug? 21 : 22; + } + _eldar._faction_enum = eFACTION.Eldar; + + + diplo_persons.ork = new ShutterButton(); + var _orks = diplo_persons.ork; + _orks.image = known[eFACTION.Ork] || global.cheat_debug? 13 : 14; + _orks._faction_enum = eFACTION.Ork; + + diplo_persons.tau = new ShutterButton(); + var _tau = diplo_persons.tau; + _tau.image = known[eFACTION.Tau] || global.cheat_debug? 15 : 16; + _tau._faction_enum = eFACTION.Tau; + + diplo_persons.chaos = new ShutterButton(); + var imm=19; + if (known[eFACTION.Chaos]>0 && faction_gender[eFACTION.Chaos]=2) then imm=27; + if (known[eFACTION.Chaos]<1 && faction_gender[eFACTION.Chaos]=1) then imm=20; + if (known[eFACTION.Chaos]<1 && faction_gender[eFACTION.Chaos]=2) then imm=28; + var _chaos = diplo_persons.chaos; + _chaos.image = imm; + _chaos._faction_enum = eFACTION.Chaos; + + var _shutters = [_imp, _mechs, _inquis, _sisters, _eldar, _orks, _tau, _chaos]; + + for (var i=0;i0){ + txt=$"{obj_controller.faction_title[_faction_enum]} {obj_controller.faction_leader[_faction_enum]}"; + } + draw_text_transformed(xx+169,yy+50,txt,0.7,0.7,0); + draw_text_transformed(xx+169,yy+65,$"Disposition: {obj_controller.disposition[_faction_enum]}",0.7,0.7,0); + scr_draw_rainbow(xx+250,yy+66,xx+400,yy+76,(obj_controller.disposition[_faction_enum]/200)+0.5); + + if (((obj_controller.known[_faction_enum]>0.7) and (obj_controller.faction_defeated[_faction_enum]=0) )|| global.cheat_debug) { + var _audience = management_buttons.audience; + _audience.update({ + x1: xx+169, + y1: yy+85, + }); + _audience.bind_method = function(){ + if (obj_controller.known[_faction_enum]!=0 || global.cheat_debug) and (obj_controller.turns_ignored[_faction_enum]==0){ + obj_controller.diplomacy = _faction_enum; + intro_to_diplomacy(_faction_enum); + } + + } + _audience.draw(); + var _ignore_status = obj_controller.ignore[_faction_enum] < 1 ? management_buttons.ignore : management_buttons.unignore; + + _ignore_status.update({ + x1: _audience.x2+1, + y1: yy+85, + }); + _ignore_status.draw(); + + + /*var fis;fis="[Request Audience]"; + if (turns_ignored[2]>0) then fis=" "; + if (ignore[eFACTION.Imperium]<1) then draw_text_transformed(xx+189,yy+354,string(fis)+" [Ignore]",0.7,0.7,0); + if (ignore[eFACTION.Imperium]>=1) then draw_text_transformed(xx+189,yy+354,string(fis)+"[Unignore]",0.7,0.7,0);*/ + } + } + } + } +} + +function faction_disposition_rating_string(diplomacy){ + with(obj_controller){ + var _disposition_rating = ""; + if (disposition[diplomacy]<=-20){ + _disposition_rating = ALLIANCE_GRADES[0]; + } else { + var _grade = clamp(floor((disposition[diplomacy] + 39)/20), 1, 7); + _disposition_rating = ALLIANCE_GRADES[_grade]; + } + return _disposition_rating; + } +} + function scr_ui_diplomacy() { - var xx,yy,show_stuff; - xx=__view_get( e__VW.XView, 0 )+0; - yy=__view_get( e__VW.YView, 0 )+0; - var show_stuff=false;var warning=0; + if (menu != MENU.Diplomacy){ + return; + } + + var xx=__view_get( e__VW.XView, 0 )+0; + var yy=__view_get( e__VW.YView, 0 )+0; + var show_stuff=false; + var warning=0; // This script draws all of the diplomacy stuff, up to and including trading. xx+=6; + draw_set_alpha(1); + draw_set_color(0); + draw_rectangle(xx,yy,xx+1600,yy+900,0); + draw_set_alpha(0.5); + draw_sprite(spr_rock_bg,0,xx,yy); + draw_set_alpha(1); + if (diplomacy==0){// Main diplomacy screen - if (menu=20) and (diplomacy=0){// Main diplomacy screen - draw_set_alpha(1); - draw_set_color(0); - draw_rectangle(xx,yy,xx+1600,yy+900,0); - draw_set_alpha(0.5); - draw_sprite(spr_rock_bg,0,xx,yy); - draw_set_alpha(1); - - /*draw_set_color(38144); + /*draw_set_color(CM_GREEN_COLOR); draw_rectangle(xx+31,yy+281,xx+438,yy+416,0); draw_rectangle(xx+31,yy+417,xx+438,yy+552,0); draw_rectangle(xx+31,yy+553,xx+438,yy+688,0); @@ -28,7 +479,7 @@ function scr_ui_diplomacy() { draw_rectangle(xx+451,yy+689,xx+858,yy+125+273,0);*/ - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); draw_text(xx+800,yy+74,string_hash_to_newline("Diplomacy")); @@ -36,91 +487,31 @@ function scr_ui_diplomacy() { xx+=55;yy-=20; + diplo_persons.imperium.draw_shutter(xx+31, yy+281, false, 1.5, known[eFACTION.Imperium]>0.7 || global.cheat_debug); + + diplo_persons.mechanicus.draw_shutter(xx+31, yy+417, false, 1.5, known[eFACTION.Mechanicus]>0.7 || global.cheat_debug); + + diplo_persons.inquisition.draw_shutter(xx+31, yy+553, false, 1.5, known[eFACTION.Inquisition]>0.7 || global.cheat_debug); + + diplo_persons.sisters.draw_shutter(xx+31, yy+689, false, 1.5, known[eFACTION.Ecclesiarchy]>0.7 || global.cheat_debug); + + diplo_persons.eldar.draw_shutter(xx+1041, yy+281, false, 1.5, known[eFACTION.Eldar]>0.7 || global.cheat_debug); + + diplo_persons.ork.draw_shutter(xx+1041, yy+417, false, 1.5, known[eFACTION.Ork]>0.7 || global.cheat_debug); + + diplo_persons.tau.draw_shutter(xx+1041, yy+553, false, 1.5, known[eFACTION.Tau]>0.7 || global.cheat_debug); + + diplo_persons.chaos.draw_shutter(xx+1041, yy+689, false, 1.5, known[eFACTION.Chaos]>0.7 || global.cheat_debug); + - var imm = 1; - if (known[eFACTION.Imperium]>0) then imm=3; - if (known[eFACTION.Imperium]<1) then imm=4;// draw_sprite(spr_diplomacy_med,imm,xx+31,yy+281); - scr_image("diplomacy/icons",imm,xx+31,yy+281,153,135); - if (faction_defeated[eFACTION.Imperium]=1) then draw_sprite(spr_diplomacy_defeated,0,xx+31,yy+281); - - if (known[eFACTION.Mechanicus]>0) then imm=5; - if (known[eFACTION.Mechanicus]<1) then imm=6;// draw_sprite(spr_diplomacy_med,imm,xx+31,yy+417); - scr_image("diplomacy/icons",imm,xx+31,yy+417,153,135); - if (faction_defeated[eFACTION.Mechanicus]=1) then draw_sprite(spr_diplomacy_defeated,0,xx+31,yy+417); - - if (known[eFACTION.Inquisition]>0) then imm=7; - if (known[eFACTION.Inquisition]<1) then imm=8;// draw_sprite(spr_diplomacy_med,imm,xx+31,yy+553); - scr_image("diplomacy/icons",imm,xx+31,yy+553,153,135); - if (faction_defeated[eFACTION.Inquisition]=1) then draw_sprite(spr_diplomacy_defeated,0,xx+31,yy+553); - - if (known[eFACTION.Ecclesiarchy]>0) then imm=9; - if (known[eFACTION.Ecclesiarchy]<1) then imm=10;// draw_sprite(spr_diplomacy_med,imm,xx+31,yy+689); - scr_image("diplomacy/icons",imm,xx+31,yy+689,153,135); - if (faction_defeated[eFACTION.Ecclesiarchy]=1) then draw_sprite(spr_diplomacy_defeated,0,xx+31,yy+689); - - - if (faction_gender[eFACTION.Eldar]=1){ //male eldar - if (known[eFACTION.Eldar]>0) then imm=11; - if (known[eFACTION.Eldar]<1) then imm=12;// draw_sprite(spr_diplomacy_med,imm,xx+1041,yy+281); - scr_image("diplomacy/icons",imm,xx+1041,yy+281,153,135); - } - - if (faction_gender[eFACTION.Eldar]=2){ //female eldar - if (known[eFACTION.Eldar]>0) then imm=21; - if (known[eFACTION.Eldar]<1) then imm=22;// draw_sprite(spr_diplomacy_med,imm,xx+1041,yy+281); - scr_image("diplomacy/icons",imm,xx+1041,yy+281,153,135); - } - - if (faction_defeated[eFACTION.Eldar]=1) then draw_sprite(spr_diplomacy_defeated,0,xx+1041,yy+281); - - if (known[eFACTION.Ork]>0) then imm=13; - if (known[eFACTION.Ork]<1) then imm=14;// draw_sprite(spr_diplomacy_med,imm,xx+1041,yy+417); - scr_image("diplomacy/icons",imm,xx+1041,yy+417,153,135); - if (faction_defeated[eFACTION.Ork]=1) then draw_sprite(spr_diplomacy_defeated,0,xx+1041,yy+417); - - if (known[eFACTION.Tau]>0) then imm=15; - if (known[eFACTION.Tau]<1) then imm=16;// draw_sprite(spr_diplomacy_med,imm,xx+1041,yy+553); - scr_image("diplomacy/icons",imm,xx+1041,yy+553,153,135); - if (faction_defeated[eFACTION.Tau]=1) then draw_sprite(spr_diplomacy_defeated,0,xx+1041,yy+553); - - if (known[eFACTION.Chaos]>0 && faction_gender[eFACTION.Chaos]=1) then imm=19; - if (known[eFACTION.Chaos]>0 && faction_gender[eFACTION.Chaos]=2) then imm=27; - if (known[eFACTION.Chaos]<1 && faction_gender[eFACTION.Chaos]=1) then imm=20; - if (known[eFACTION.Chaos]<1 && faction_gender[eFACTION.Chaos]=2) then imm=28; - // draw_sprite(spr_diplomacy_med,imm,xx+1041,yy+689); - scr_image("diplomacy/icons",imm,xx+1041,yy+689,153,135); - if (faction_defeated[eFACTION.Chaos]=1) then draw_sprite(spr_diplomacy_defeated,0,xx+1041,yy+689); - - - /*draw_rectangle(xx+26,yy+34,xx+312,yy+125,1);draw_line(xx+128,yy+34,xx+128,yy+125); - draw_rectangle(xx+26,yy+34+91,xx+312,yy+125+91,1);draw_line(xx+128,yy+34+91,xx+128,yy+125+91); - draw_rectangle(xx+26,yy+34+182,xx+312,yy+125+182,1);draw_line(xx+128,yy+34+182,xx+128,yy+125+182); - draw_rectangle(xx+26,yy+34+273,xx+312,yy+125+273,1);draw_line(xx+128,yy+34+273,xx+128,yy+125+273); - // - draw_rectangle(xx+26+286,yy+34,xx+312+286,yy+125,1);draw_line(xx+128+286,yy+34,xx+128+286,yy+125); - draw_rectangle(xx+26+286,yy+34+91,xx+312+286,yy+125+91,1);draw_line(xx+128+286,yy+34+91,xx+128+286,yy+125+91); - draw_rectangle(xx+26+286,yy+34+182,xx+312+286,yy+125+182,1);draw_line(xx+128+286,yy+34+182,xx+128+286,yy+125+182); - draw_rectangle(xx+26+286,yy+34+273,xx+312+286,yy+125+273,1);draw_line(xx+128+286,yy+34+273,xx+128+286,yy+125+273);*/ - - // draw_sprite(spr_diplo_symbols,0,xx+128,yy+174); - // draw_sprite(spr_diplo_symbols,1,xx+558,yy+174); - // draw_sprite(spr_diplo_symbols,2,xx+1147,yy+174); - scr_image("symbol",0,xx+128,yy+174,217,107); + scr_image("symbol",0,xx+138,yy+174,217,107); scr_image("symbol",1,xx+525,yy+174,109,54); scr_image("symbol",2,xx+1147,yy+174,217,107); - draw_rectangle(xx+31,yy+281,xx+438,yy+416,1); - draw_line(xx+184,yy+281,xx+184,yy+416); - draw_rectangle(xx+31,yy+417,xx+438,yy+552,1); - draw_line(xx+184,yy+417,xx+184,yy+553); - draw_rectangle(xx+31,yy+553,xx+438,yy+688,1); - draw_line(xx+184,yy+553,xx+184,yy+689); - draw_rectangle(xx+31,yy+689,xx+438,yy+824,1); - draw_line(xx+184,yy+689,xx+184,yy+824); - // - //draes chapter diplomacy - draw_rectangle(xx+451,yy+281,xx+675,yy+416,1); + + //draws chapter diplomacy + /*draw_rectangle(xx+451,yy+281,xx+675,yy+416,1); draw_line(xx+604,yy+281,xx+604,yy+416); draw_rectangle(xx+451,yy+417,xx+675,yy+552,1); draw_line(xx+604,yy+417,xx+604,yy+553); @@ -128,18 +519,7 @@ function scr_ui_diplomacy() { draw_line(xx+604,yy+553,xx+604,yy+689); draw_rectangle(xx+451,yy+689,xx+675,yy+824,1); draw_line(xx+604,yy+689,xx+604,yy+824); - - //draws chaos diplomacy - draw_rectangle(xx+688,yy+281,xx+1028,yy+416,1); - draw_rectangle(xx+688,yy+417,xx+1028,yy+552,1); - draw_rectangle(xx+688,yy+553,xx+1028,yy+688,1); - draw_rectangle(xx+688,yy+689,xx+1028,yy+824,1); - - // draws xenos diplomacy - draw_rectangle(xx+1041,yy+281,xx+1448,yy+416,1);draw_line(xx+1194,yy+281,xx+1194,yy+416); - draw_rectangle(xx+1041,yy+417,xx+1448,yy+552,1);draw_line(xx+1194,yy+417,xx+1194,yy+553); - draw_rectangle(xx+1041,yy+553,xx+1448,yy+688,1);draw_line(xx+1194,yy+553,xx+1194,yy+689); - draw_rectangle(xx+1041,yy+689,xx+1448,yy+824,1);draw_line(xx+1194,yy+689,xx+1194,yy+824); + */ @@ -147,112 +527,27 @@ function scr_ui_diplomacy() { draw_set_halign(fa_left); //draw faction names, etc - draw_text(xx+189,yy+285,string_hash_to_newline("Imperium")); - draw_text(xx+189,yy+421,string_hash_to_newline("Mechanicus")); - draw_text(xx+189,yy+557,string_hash_to_newline("Inquisition")); - draw_text(xx+189,yy+693,string_hash_to_newline("Ecclesiarchy")); - draw_text(xx+609,yy+285,string_hash_to_newline("Chapter 1")); - draw_text(xx+609,yy+421,string_hash_to_newline("Chapter 2")); - draw_text(xx+609,yy+557,string_hash_to_newline("Chapter 3")); - draw_text(xx+609,yy+693,string_hash_to_newline("Chapter 4")); - draw_text(xx+1199,yy+285,string_hash_to_newline("Eldar")); - draw_text(xx+1199,yy+421,string_hash_to_newline("Orks")); - draw_text(xx+1199,yy+557,string_hash_to_newline("Tau")); - draw_text(xx+1199,yy+693,string_hash_to_newline("Heretics")); + /* + draw_text(xx+609,yy+285,"Chapter 1"); + draw_text(xx+609,yy+421,"Chapter 2"); + draw_text(xx+609,yy+557,"Chapter 3"); + draw_text(xx+609,yy+693,"Chapter 4"); + */ //render status, i.e. whether at war, that stuff draw_set_font(fnt_40k_14); draw_set_halign(fa_right); - draw_text_transformed(xx+431,yy+289,string_hash_to_newline(string(faction_status[2])),0.7,0.7,0); - draw_text_transformed(xx+431,yy+425,string_hash_to_newline(faction_status[3]),0.7,0.7,0); - draw_text_transformed(xx+431,yy+561,string_hash_to_newline(faction_status[4]),0.7,0.7,0); - draw_text_transformed(xx+431,yy+697,string_hash_to_newline(faction_status[5]),0.7,0.7,0); - /*draw_text_transformed(xx+851,yy+289,faction_status[6],0.7,0.7,0); - draw_text_transformed(xx+851,yy+425,faction_status[7],0.7,0.7,0); - draw_text_transformed(xx+851,yy+561,faction_status[8],0.7,0.7,0); - draw_text_transformed(xx+851,yy+697,faction_status[10],0.7,0.7,0);*/ - draw_text_transformed(xx+1441,yy+289,string_hash_to_newline(faction_status[6]),0.7,0.7,0); - draw_text_transformed(xx+1441,yy+425,string_hash_to_newline(faction_status[7]),0.7,0.7,0); - draw_text_transformed(xx+1441,yy+561,string_hash_to_newline(faction_status[8]),0.7,0.7,0); - draw_text_transformed(xx+1441,yy+697,string_hash_to_newline(faction_status[10]),0.7,0.7,0); + draw_set_halign(fa_left); var txt; - txt="????"; - if (known[2]>0) then txt=string(faction_title[2])+" "+string(faction_leader[2]); - draw_text_transformed(xx+189,yy+309,string_hash_to_newline(txt),0.7,0.7,0); - txt="????"; - if (known[3]>0) then txt=string(faction_title[3])+" "+string(faction_leader[3]); - draw_text_transformed(xx+189,yy+445,string_hash_to_newline(txt),0.7,0.7,0); - txt="????"; - if (known[4]>0) then txt=string(faction_title[4])+" "+string(faction_leader[4]); - draw_text_transformed(xx+189,yy+581,string_hash_to_newline(txt),0.7,0.7,0); - txt="????"; - if (known[5]>0) then txt=string(faction_title[5])+" "+string(faction_leader[5]); - draw_text_transformed(xx+189,yy+717,string_hash_to_newline(txt),0.7,0.7,0); - /*txt="????";if (known[6]>0) then txt=string(faction_title[6])+" "+string(faction_leader[6]);draw_text_transformed(xx+609,yy+309,txt,0.7,0.7,0); - txt="????";if (known[7]>0) then txt=string(faction_title[7])+" "+string(faction_leader[7]);draw_text_transformed(xx+609,yy+445,txt,0.7,0.7,0); - txt="????";if (known[8]>0) then txt=string(faction_title[8])+" "+string(faction_leader[8]);draw_text_transformed(xx+609,yy+581,txt,0.7,0.7,0); - txt="????";if (known[10]>0) then txt=string(faction_title[10])+" "+string(faction_leader[10]);draw_text_transformed(xx+609,yy+717,txt,0.7,0.7,0);*/ - txt="????"; - if (known[6]>0) then txt=string(faction_title[6])+" "+string(faction_leader[6]); - draw_text_transformed(xx+1199,yy+309,string_hash_to_newline(txt),0.7,0.7,0); - txt="????"; - if (known[7]>0) then txt=string(faction_title[7])+" "+string(faction_leader[7]); - draw_text_transformed(xx+1199,yy+445,string_hash_to_newline(txt),0.7,0.7,0); - txt="????"; - if (known[8]>0) then txt=string(faction_title[8])+" "+string(faction_leader[8]); - draw_text_transformed(xx+1199,yy+581,string_hash_to_newline(txt),0.7,0.7,0); - txt="????";if (known[10]>0) then txt=string(faction_title[10])+" "+string(faction_leader[10]); - draw_text_transformed(xx+1199,yy+717,string_hash_to_newline(txt),0.7,0.7,0); - - //disposition score rendering - draw_text_transformed(xx+189,yy+324,string_hash_to_newline("Disposition: "+string(disposition[2])),0.7,0.7,0); - draw_text_transformed(xx+189,yy+460,string_hash_to_newline("Disposition: "+string(disposition[3])),0.7,0.7,0); - draw_text_transformed(xx+189,yy+596,string_hash_to_newline("Disposition: "+string(disposition[4])),0.7,0.7,0); - draw_text_transformed(xx+189,yy+732,string_hash_to_newline("Disposition: "+string(disposition[5])),0.7,0.7,0); - /*draw_text_transformed(xx+609,yy+324,"Disposition: "+string(disposition[6]),0.7,0.7,0); - draw_text_transformed(xx+609,yy+460,"Disposition: "+string(disposition[7]),0.7,0.7,0); - draw_text_transformed(xx+609,yy+596,"Disposition: "+string(disposition[8]),0.7,0.7,0); - draw_text_transformed(xx+609,yy+732,"Disposition: "+string(disposition[10]),0.7,0.7,0);*/ - draw_text_transformed(xx+1199,yy+324,string_hash_to_newline("Disposition: "+string(disposition[6])),0.7,0.7,0); - draw_text_transformed(xx+1199,yy+460,string_hash_to_newline("Disposition: "+string(disposition[7])),0.7,0.7,0); - draw_text_transformed(xx+1199,yy+596,string_hash_to_newline("Disposition: "+string(disposition[8])),0.7,0.7,0); - draw_text_transformed(xx+1199,yy+732,string_hash_to_newline("Disposition: "+string(disposition[10])),0.7,0.7,0); - - - //disposition bar rendering - scr_draw_rainbow(xx+270,yy+325,xx+420,yy+335,(disposition[2]/200)+0.5); - scr_draw_rainbow(xx+270,yy+325+136,xx+420,yy+335+136,(disposition[3]/200)+0.5); - scr_draw_rainbow(xx+270,yy+325+272,xx+420,yy+335+272,(disposition[4]/200)+0.5); - scr_draw_rainbow(xx+270,yy+325+408,xx+420,yy+335+408,(disposition[5]/200)+0.5); - - scr_draw_rainbow(xx+270+1010,yy+325,xx+420+1010,yy+335,(disposition[6]/200)+0.5); - scr_draw_rainbow(xx+270+1010,yy+325+136,xx+420+1010,yy+335+136,(disposition[7]/200)+0.5); - scr_draw_rainbow(xx+270+1010,yy+325+272,xx+420+1010,yy+335+272,(disposition[8]/200)+0.5); - scr_draw_rainbow(xx+270+1010,yy+325+408,xx+420+1010,yy+335+408,(disposition[10]/200)+0.5); - - - - /*draw_sprite(spr_disposition_small,round((disposition[2]+100)/10),xx+131,yy+74); - draw_sprite(spr_disposition_small,round((disposition[3]+100)/10),xx+131+286,yy+74); - - draw_sprite(spr_disposition_small,round((disposition[4]+100)/10),xx+131,yy+74+91); - draw_sprite(spr_disposition_small,round((disposition[5]+100)/10),xx+131+286,yy+74+91); - - draw_sprite(spr_disposition_small,round((disposition[6]+100)/10),xx+131,yy+74+182); - draw_sprite(spr_disposition_small,round((disposition[7]+100)/10),xx+131+286,yy+74+182); - - draw_sprite(spr_disposition_small,round((disposition[8]+100)/10),xx+131,yy+74+273); - draw_sprite(spr_disposition_small,round((disposition[10]+100)/10),xx+131+286,yy+74+273);*/ - - + //draw the meet chaos button draw_set_halign(fa_left); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_rectangle(xx+688,yy+240,xx+1028,yy+281,0); draw_set_color(c_black); - draw_text_transformed(xx+688,yy+241,string_hash_to_newline(" Meet Chaos Emmissary"),0.7,0.7,0); + draw_text_transformed(xx+688,yy+241," Meet Chaos Emmissary",0.7,0.7,0); //color blending stuff if hovering over the meeting chaos icon if (point_in_rectangle(mouse_x, mouse_y, xx+688,yy+240,xx+1028,yy+281)){ draw_set_alpha(0.2); @@ -265,585 +560,116 @@ function scr_ui_diplomacy() { #region faction talks/ignore stuff - if (known[2]>0.7) and (faction_defeated[2]=0) { - x6=xx+250;y6=yy+334;x7=x6+92;y7=y6+15; - if (turns_ignored[2]<=0) { - draw_set_color(38144); - draw_rectangle(x6,y6,x7,y7,0); - draw_set_color(c_black); - draw_text_transformed(x6,y6+1,string_hash_to_newline(" Request Audience"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x=1) then draw_text_transformed(x6,y6+1,string_hash_to_newline(" Unignore"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x0) then fis=" "; - if (ignore[eFACTION.Imperium]<1) then draw_text_transformed(xx+189,yy+354,string(fis)+" [Ignore]",0.7,0.7,0); - if (ignore[eFACTION.Imperium]>=1) then draw_text_transformed(xx+189,yy+354,string(fis)+"[Unignore]",0.7,0.7,0);*/ - } - - if (known[eFACTION.Mechanicus]>0.7) and (faction_defeated[3]=0){ - x6=xx+250;y6=yy+334+136;x7=x6+92;y7=y6+15; - if (turns_ignored[3]<=0) { - draw_set_color(38144); - draw_rectangle(x6,y6,x7,y7,0); - draw_set_color(c_black); - draw_text_transformed(x6,y6+1,string_hash_to_newline(" Request Audience"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x=1) then draw_text_transformed(x6,y6+1,string_hash_to_newline(" Unignore"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x0.7) and (faction_defeated[4]=0){ - x6=xx+250;y6=yy+334+272;x7=x6+92;y7=y6+15; - if (turns_ignored[4]<=0){ - draw_set_color(38144);draw_rectangle(x6,y6,x7,y7,0); - draw_set_color(c_black);draw_text_transformed(x6,y6+1,string_hash_to_newline(" Request Audience"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x=1) then draw_text_transformed(x6,y6+1,string_hash_to_newline(" Unignore"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x0.7) and (faction_defeated[5]=0){ - x6=xx+250;y6=yy+334+408;x7=x6+92;y7=y6+15; - if (turns_ignored[5]<=0){ - draw_set_color(38144);draw_rectangle(x6,y6,x7,y7,0); - draw_set_color(c_black);draw_text_transformed(x6,y6+1,string_hash_to_newline(" Request Audience"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x=1) then draw_text_transformed(x6,y6+1,string_hash_to_newline(" Unignore"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x0.7) and (faction_defeated[2]=0){ - x6=xx+250+1010;y6=yy+334;x7=x6+92;y7=y6+15; - if (turns_ignored[6]<=0){ - draw_set_color(38144);draw_rectangle(x6,y6,x7,y7,0); - draw_set_color(c_black);draw_text_transformed(x6,y6+1,string_hash_to_newline(" Request Audience"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x=1) then draw_text_transformed(x6,y6+1,string_hash_to_newline(" Unignore"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x0.7) and (faction_defeated[3]=0){ - x6=xx+250+1010;y6=yy+334+136;x7=x6+92;y7=y6+15; - if (turns_ignored[7]<=0){ - draw_set_color(38144);draw_rectangle(x6,y6,x7,y7,0); - draw_set_color(c_black);draw_text_transformed(x6,y6+1,string_hash_to_newline(" Request Audience"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x=1) then draw_text_transformed(x6,y6+1,string_hash_to_newline(" Unignore"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x0.7) and (faction_defeated[4]=0){ - x6=xx+250+1010;y6=yy+334+272;x7=x6+92;y7=y6+15; - if (turns_ignored[8]<=0){ - draw_set_color(38144);draw_rectangle(x6,y6,x7,y7,0); - draw_set_color(c_black);draw_text_transformed(x6,y6+1,string_hash_to_newline(" Request Audience"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x=1) then draw_text_transformed(x6,y6+1,string_hash_to_newline(" Unignore"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x0.7) and (faction_defeated[5]=0){ - x6=xx+250+1010;y6=yy+334+408;x7=x6+92;y7=y6+15; - if (turns_ignored[10]<=0){ - draw_set_color(38144);draw_rectangle(x6,y6,x7,y7,0); - draw_set_color(c_black);draw_text_transformed(x6,y6+1,string_hash_to_newline(" Request Audience"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x=1) then draw_text_transformed(x6,y6+1,string_hash_to_newline(" Unignore"),0.7,0.7,0); - if (mouse_x>=x6) and (mouse_y>=y6) and (mouse_x0.7) and (faction_defeated[6]=0){ - var fis;fis="[Request Audience]"; - if (turns_ignored[6]>0) then fis=" "; - if (ignore[eFACTION.Eldar]<1) then draw_text_transformed(xx+1199,yy+354,string(fis)+" [Ignore]",0.7,0.7,0); - if (ignore[eFACTION.Eldar]>=1) then draw_text_transformed(xx+1199,yy+354,string(fis)+"[Unignore]",0.7,0.7,0); - } - if (known[eFACTION.Ork]>0.7) and (faction_defeated[7]=0){ - var fis;fis="[Request Audience]"; - if (turns_ignored[7]>0) then fis=" "; - if (ignore[eFACTION.Ork]<1) then draw_text_transformed(xx+1199,yy+490,string(fis)+" [Ignore]",0.7,0.7,0); - if (ignore[eFACTION.Ork]>=1) then draw_text_transformed(xx+1199,yy+490,string(fis)+"[Unignore]",0.7,0.7,0); - } - if (known[eFACTION.Tau]>0.7) and (faction_defeated[8]=0){ - var fis;fis="[Request Audience]"; - if (turns_ignored[8]>0) then fis=" "; - if (ignore[eFACTION.Tau]<1) then draw_text_transformed(xx+1199,yy+631,string(fis)+" [Ignore]",0.7,0.7,0); - if (ignore[eFACTION.Tau]>=1) then draw_text_transformed(xx+1199,yy+631,string(fis)+"[Unignore]",0.7,0.7,0); - } - if (known[eFACTION.Chaos]>0.7) and (faction_defeated[10]=0){ - var fis;fis="[Request Audience]"; - if (turns_ignored[10]>0) then fis=" "; - if (ignore[eFACTION.Chaos]<1) then draw_text_transformed(xx+1199,yy+762,string(fis)+" [Ignore]",0.7,0.7,0); - if (ignore[eFACTION.Chaos]>=1) then draw_text_transformed(xx+1199,yy+762,string(fis)+"[Unignore]",0.7,0.7,0); - }*/ - - - - - - - - /* - faction_leader[0]="";faction_title[0]="";faction_status[0]="";faction_leader[1]="";faction_title[1]="";faction_status[1]=""; - faction_leader[eFACTION.Imperium]="";faction_title[2]="Sector Commander";faction_status[eFACTION.Imperium]="Allied"; - faction_leader[eFACTION.Mechanicus]="";faction_title[3]="Magos";faction_status[eFACTION.Mechanicus]="Allied"; - faction_leader[eFACTION.Inquisition]="";faction_title[4]="Inquisitor Lord";faction_status[eFACTION.Inquisition]="Allied"; - faction_leader[eFACTION.Ecclesiarchy]="";faction_title[5]="Prioress";faction_status[eFACTION.Ecclesiarchy]="Allied"; - faction_leader[eFACTION.Eldar]="";faction_title[6]="Farseer";faction_status[eFACTION.Eldar]="War"; - faction_leader[eFACTION.Ork]="";faction_title[7]="Warboss";faction_status[eFACTION.Ork]="War"; - faction_leader[eFACTION.Tau]="";faction_title[8]="Diplomat";faction_status[eFACTION.Tau]="War"; - faction_leader[eFACTION.Tyranids]="";faction_title[9]="";faction_status[eFACTION.Tyranids]="War"; - faction_leader[eFACTION.Chaos]="";faction_title[10]="Master";faction_status[eFACTION.Chaos]="War"; - */ - - + + #endregion } - xx=__view_get( e__VW.XView, 0 );yy=__view_get( e__VW.YView, 0 ); + xx=__view_get( e__VW.XView, 0 ); + yy=__view_get( e__VW.YView, 0 ); + var _main_slate = diplo_buttons.main_slate + _main_slate.XX = xx+328; + _main_slate.YY = yy+175; + _main_slate.height = 545; - if (menu=20) and (diplomacy<-5) and (diplomacy>-6){ - draw_sprite(spr_rock_bg,0,xx,yy); - // draw_sprite(spr_diplo_splash,diplomacy,xx+916,yy+33); - draw_set_alpha(0.75); - draw_set_color(0); - draw_rectangle(xx+326+16,yy+66,xx+887+16,yy+820,0); - draw_set_alpha(1); - draw_set_color(38144); - draw_rectangle(xx+326+16,yy+66,xx+887+16,yy+820,1); - - var advi,fra;advi="";fra=0; - if (diplomacy=-5.1){advi="apoth";fra=1;} - if (diplomacy=-5.2){advi="chap";fra=2;if (global.chapter_name="Space Wolves") then fra=11;} - if (diplomacy=-5.3){advi="libr";fra=3;if (global.chapter_name="Space Wolves") then fra=10;} - if (diplomacy=-5.4){advi="tech";fra=4;} - if (diplomacy=-5.5){advi="recr";fra=5;} - if (diplomacy=-5.6){advi="flee";fra=6;} - - // draw_sprite(spr_advisors,fra,xx+16,yy+43); - scr_image("advisor/splash",fra+1,xx+16,yy+43,310,828); - draw_set_halign(fa_center); - draw_set_color(38144); - draw_set_font(fnt_40k_30b); - - var fac, fac2, fac3,warning;fac=""; - fac2=string(global.chapter_name)+" (Imperium)";fac3="";warning=0; - - if (advi="flee") then fac="Master of the Fleet "+string(obj_ini.lord_admiral_name); - if (advi="apoth") then fac="Master of the Apothecarion "+string(obj_ini.name[0,4]); - if (advi="chap") then fac="Master of Sanctity "+string(obj_ini.name[0,3]); - if (advi="libr") then fac="Chief "+string(obj_ini.role[100,17])+" "+string(obj_ini.name[0,5]); - if (advi="tech") then fac="Forge Master "+string(obj_ini.name[0,2]); - if (advi="") then fac="First Sergeant "+string(recruiter_name); - - draw_text_transformed(xx+622,yy+66,string_hash_to_newline(string(fac2)),1,1,0); - draw_text_transformed(xx+622,yy+104,string_hash_to_newline(string(fac)),0.6,0.6,0); - - show_stuff=true; - } + if (diplomacy == -1){ + if (!is_struct(character_diplomacy)){ + show_debug_message_adv("no valid diplomacy target"); + diplomacy = 0; + } else { + // draw_sprite(spr_diplo_splash,diplomacy,xx+916,yy+33); + } + } - if (menu=20) and (diplomacy>0){// Diplomacy - Speaking + if (diplomacy>0){// Diplomacy - Speaking var daemon; daemon=false; if (diplomacy>10) and (diplomacy<11) then daemon=true; - draw_sprite(spr_rock_bg,0,xx,yy); // draw_sprite(spr_diplo_splash,diplomacy,xx+916,yy+33); - draw_set_alpha(0.75); - draw_set_color(0); - draw_rectangle(xx+326+16,yy+66,xx+887+16,yy+820,0); - draw_set_alpha(1); - draw_set_color(38144); - draw_rectangle(xx+326+16,yy+66,xx+887+16,yy+820,1); if (diplomacy==10.1){ // if (diplomacy=10.1) then draw_sprite(spr_diplomacy_dae,0,xx+16,yy+43); daemon=true; scr_image("diplomacy_daemon",0,xx+16,yy+43,310,828); show_stuff=false; - if (mouse_x>=xx+360) and (mouse_y>=yy+143) and (mouse_x<=xx+884) and (mouse_y<=yy+180) then warning=1; + if (scr_hit(360,143,884,180)){ + warning=1; + } } if (daemon=false){ - if (diplomacy!=eFACTION.Eldar) then scr_image("diplomacy/splash",diplomacy,xx+16,yy+43,310,828); - if (diplomacy!=eFACTION.Eldar) or ((diplomacy==eFACTION.Eldar) and (faction_gender[eFACTION.Eldar]=1)) then scr_image("diplomacy/splash",diplomacy,xx+16,yy+16,310,828); - if (diplomacy==eFACTION.Eldar) and (faction_gender[eFACTION.Eldar]=2) then scr_image("diplomacy/splash",11,xx+16,yy+16,310,828); - if (diplomacy==eFACTION.Chaos) and (faction_gender[eFACTION.Chaos]=2) then scr_image("diplomacy/splash",12,xx+16,yy+43,310,828); + if (diplomacy!=eFACTION.Eldar){ + scr_image("diplomacy/splash",diplomacy,xx+16,yy+43,310,828); + } + if (diplomacy!=eFACTION.Eldar) or ((diplomacy==eFACTION.Eldar) and (faction_gender[eFACTION.Eldar]=1)){ + scr_image("diplomacy/splash",diplomacy,xx+16,yy+16,310,828); + } + if (diplomacy==eFACTION.Eldar) and (faction_gender[eFACTION.Eldar]=2){ + scr_image("diplomacy/splash",11,xx+16,yy+16,310,828); + } + if (diplomacy==eFACTION.Chaos) and (faction_gender[eFACTION.Chaos]=2){ + scr_image("diplomacy/splash",12,xx+16,yy+43,310,828); + } } - + draw_set_halign(fa_center); - draw_set_color(38144); + draw_set_color(CM_GREEN_COLOR); draw_set_font(fnt_40k_30b); - var fac, fac2, fac3,warning;fac="";fac2=" (Imperium)";fac3="";warning=0; - if (diplomacy>=6) then fac2=""; - + var _diplomacy_faction_name=""; + var _diplomacy_faction_alligience=" (Imperium)"; + var _disposition_rating=""; + + + if (diplomacy>=6){ + _diplomacy_faction_alligience=""; + } - if (diplomacy==eFACTION.Imperium) then fac="Imperium of Man"; - if (diplomacy==eFACTION.Mechanicus) then fac="Adeptus Mechanicus"; - if (diplomacy==eFACTION.Inquisition) then fac="Inquisition"; - if (diplomacy==eFACTION.Ecclesiarchy) then fac="Ecclesiarchy"; - if (diplomacy==eFACTION.Eldar) then fac="Eldar"; - if (diplomacy==eFACTION.Ork) then fac="Orks"; - if (diplomacy==eFACTION.Tau) then fac="Tau Empire"; - if (diplomacy==eFACTION.Chaos) then fac="Heretics"; - if (diplomacy>10) and (diplomacy<11) then fac="Chaos"; + + _diplomacy_faction_name = FACTION_NAMES[diplomacy]; - draw_text_transformed(xx+622,yy+66,string_hash_to_newline(string(fac)),1,1,0); + draw_text_transformed(xx+622,yy+66,_diplomacy_faction_name,1,1,0); - if (daemon=true){ draw_text_transformed(xx+622,yy+104,string_hash_to_newline("The Emmmisary"),0.6,0.6,0);show_stuff=true;}; - if (daemon=false) then draw_text_transformed(xx+622,yy+104,string_hash_to_newline(string(faction_title[diplomacy])+" "+string(faction_leader[diplomacy])+string(fac2)),0.6,0.6,0); + if (daemon=true){ + draw_text_transformed(xx+622,yy+104,"The Emmmisary",0.6,0.6,0); + show_stuff=true; + } else if (daemon=false){ + draw_text_transformed(xx+622,yy+104,$"{faction_title[diplomacy]} {faction_leader[diplomacy]} {_diplomacy_faction_alligience}",0.6,0.6,0); + } draw_set_font(fnt_40k_14); - if (daemon=false){ - fac3="Disposition: "; - if (disposition[diplomacy]<=-20) then fac3+="Hated"; - if (disposition[diplomacy]>-20) and (disposition[diplomacy]<0) then fac3+="Hostile"; - if (disposition[diplomacy]>=0) and (disposition[diplomacy]<10) then fac3+="Suspicious"; - if (disposition[diplomacy]>=10) and (disposition[diplomacy]<20) then fac3+="Uneasy"; - if (disposition[diplomacy]>=20) and (disposition[diplomacy]<40) then fac3+="Neutral"; - if (disposition[diplomacy]>=40) and (disposition[diplomacy]<60) then fac3+="Allies"; - if (disposition[diplomacy]>=60) and (disposition[diplomacy]<80) then fac3+="Close Allies"; - if (disposition[diplomacy]>=80) then fac3+="Battle Brothers"; - fac3+=" ("+string(disposition[diplomacy])+")"; + _disposition_rating=$"Disposition: {faction_disposition_rating_string(diplomacy)} ({disposition[diplomacy]})"; // draw_set_halign(fa_center); - draw_text(xx+622,yy+144,string_hash_to_newline(string(fac3))); + draw_text(xx+622,yy+144,_disposition_rating); scr_draw_rainbow(xx+366,yy+165,xx+871,yy+175,(disposition[diplomacy]/200)+0.5); } - draw_set_color(c_gray);draw_rectangle(xx+366,yy+165,xx+871,yy+175,1); + draw_set_color(c_gray); + draw_rectangle(xx+366,yy+165,xx+871,yy+175,1); show_stuff=true; + _main_slate.draw_with_dimensions(); } - if (warning=1) and (diplomacy>=6){ - var warn; - if (diplomacy<10) and (warning=1) then warn="Consorting with xenos will cause your disposition with the Imperium to lower."; - if (diplomacy>=10) and (warning=1) then warn="Consorting with heretics will cause your disposition with the Imperium to plummet."; - - draw_rectangle(mouse_x-2,mouse_y+20,mouse_x+2+string_width_ext(string_hash_to_newline(string(warn)),-1,600),mouse_y+24+string_height_ext(string_hash_to_newline(string(warn)),-1,600),0); - draw_set_color(38144); - draw_rectangle(mouse_x-2,mouse_y+20,mouse_x+2+string_width_ext(string_hash_to_newline(string(warn)),-1,600),mouse_y+24+string_height_ext(string_hash_to_newline(string(warn)),-1,600),1); - draw_text_ext(mouse_x,mouse_y+22,string_hash_to_newline(string(warn)),-1,600); - } - - if (show_stuff=true){ - draw_set_font(fnt_40k_14);draw_set_alpha(1); - draw_set_color(38144);draw_set_halign(fa_left); - draw_text_ext(xx+336+16,yy+209,string_hash_to_newline(string(diplo_txt)),-1,536); - xx=__view_get( e__VW.XView, 0 );yy=__view_get( e__VW.YView, 0 );draw_set_halign(fa_center); - draw_line(xx+429,yy+710,xx+800,yy+710); - - if (trading=0) and (diplo_option[1]="") and (diplo_option[2]="") and (diplo_option[3]="") and (diplo_option[4]=""){ - draw_set_color(38144); - if ((audience=0) and (force_goodbye=0)) or (faction_justmet=1){ - if (audience=0) and (force_goodbye=0){ - draw_rectangle(xx+442,yy+719,xx+547,yy+738,0); - draw_rectangle(xx+562,yy+719,xx+667,yy+738,0); - draw_rectangle(xx+682,yy+719,xx+787,yy+738,0); - } - - draw_rectangle(xx+442,yy+753,xx+547,yy+772,0); - draw_rectangle(xx+562,yy+753,xx+667,yy+772,0); - if (audience=0) and (force_goodbye=0){draw_rectangle(xx+682,yy+753,xx+787,yy+772,0);} - - if (audience=0) and (force_goodbye=0){draw_rectangle(xx+552,yy+785,xx+677,yy+804,0);}// Declare War? - } - draw_rectangle(xx+818,yy+796,xx+897,yy+815,0); - - draw_set_color(0); - draw_text(xx+442+52,yy+720,string_hash_to_newline("Trade")); - draw_text(xx+562+52,yy+720,string_hash_to_newline("Demand")); - draw_text(xx+682+52,yy+720,string_hash_to_newline("Discuss")); - draw_text(xx+442+52,yy+754,string_hash_to_newline("Denounce")); - draw_text(xx+562+52,yy+754,string_hash_to_newline("Praise")); - draw_text(xx+682+52,yy+754,string_hash_to_newline("Propose Alliance")); - draw_text(xx+614.5,yy+786,string_hash_to_newline("DECLARE WAR")); - draw_text(xx+857.5,yy+797,string_hash_to_newline("Exit")); - - draw_set_alpha(0.2); - if ((audience=0) and (force_goodbye=0)) or (faction_justmet=1){ - var show;show=false;if (faction_justmet=1) then show=true; - - - if (mouse_y>=yy+719) and (mouse_y=xx+442) and (mouse_x=xx+562) and (mouse_x=xx+682) and (mouse_x=yy+753) and (mouse_y=xx+442) and (mouse_x=xx+562) and (mouse_x=xx+682) and (mouse_x=xx+552) and (mouse_y>=yy+785) and (mouse_x<=xx+677) and (mouse_y<=yy+804) then draw_rectangle(xx+552,yy+785,xx+677,yy+804,0); - } - } - if (mouse_x>=xx+818) and (mouse_y>=yy+796) and (mouse_x<=xx+897) and (mouse_y<=yy+815) then draw_rectangle(xx+818,yy+796,xx+897,yy+815,0); - - draw_set_alpha(1); - draw_set_halign(fa_left); - draw_set_color(0); - - - - // draw_line(xx+220,yy+317,xx+592,yy+317); - } - - - // xx=view_xview[0];yy=view_yview[0]; - - - - if (trading=1){ - draw_set_color(38144); - draw_rectangle(xx+342,yy+326,xx+486,yy+673,1);draw_rectangle(xx+343,yy+327,xx+485,yy+672,1);// Left Main Panel - draw_rectangle(xx+504,yy+371,xx+741,yy+641,1);draw_rectangle(xx+505,yy+372,xx+740,yy+640,1);// Center panel - draw_rectangle(xx+759,yy+326,xx+903,yy+673,1);draw_rectangle(xx+760,yy+327,xx+902,yy+672,1);// Right Main Panel - - draw_rectangle(xx+342,yy+326,xx+486,yy+371,1);// Left Title Panel - draw_rectangle(xx+759,yy+326,xx+903,yy+371,1);// Right Title Panel - - draw_set_font(fnt_40k_14b);draw_set_halign(fa_center); - draw_text(xx+411,yy+330,string_hash_to_newline(string(obj_controller.faction[diplomacy])+"#Items")); - draw_text(xx+829,yy+330,string_hash_to_newline(string(global.chapter_name)+"#Items")); - - if (trade_likely!="") then draw_text(xx+623,yy+348,string_hash_to_newline("["+string(trade_likely)+"]")); - - // Buttons - draw_rectangle(xx+510,yy+649,xx+615,yy+668,0);// Clear - draw_rectangle(xx+630,yy+649,xx+735,yy+668,0);// Offer - draw_rectangle(xx+818,yy+796,xx+897,yy+815,0);// Cancel - - draw_set_color(0); - draw_text(xx+562,yy+649,string_hash_to_newline("Clear")); - draw_text(xx+682,yy+649,string_hash_to_newline("Offer")); - draw_text(xx+857.5,yy+797,string_hash_to_newline("Exit")); - - draw_set_alpha(0.2); - if (scr_hit(xx+510,yy+649,xx+615,yy+668)=true) then draw_rectangle(xx+510,yy+649,xx+615,yy+668,0); - if (scr_hit(xx+630,yy+649,xx+735,yy+668)=true) then draw_rectangle(xx+630,yy+649,xx+735,yy+668,0); - if (scr_hit(xx+818,yy+796,xx+897,yy+815)=true) then draw_rectangle(xx+818,yy+796,xx+897,yy+815,0); - draw_set_alpha(1); - - draw_set_halign(fa_left);draw_set_font(fnt_40k_14);draw_set_color(38144); - if (trading_artifact=0){ - draw_set_alpha(1);if (disposition[diplomacy]0){ - draw_set_font(fnt_40k_14b); - draw_text(xx+507,yy+381,string_hash_to_newline(string(obj_controller.faction[diplomacy])+":")); - draw_set_font(fnt_40k_14); - if (trading_artifact=0){ - if (trade_tnum[1]>0) then draw_sprite(spr_cancel_small,0,xx+507,yy+399); - if (trade_tnum[2]>0) then draw_sprite(spr_cancel_small,0,xx+507,yy+419); - if (trade_tnum[3]>0) then draw_sprite(spr_cancel_small,0,xx+507,yy+439); - if (trade_tnum[4]>0) then draw_sprite(spr_cancel_small,0,xx+507,yy+459); - } - if (trade_tnum[1]=1) and (trade_take[1]!="Artifact") then draw_text(xx+530,yy+399,string_hash_to_newline(string(trade_take[1]))); - if (trade_tnum[1]=1) and (trade_take[1]="Artifact") then draw_text(xx+530,yy+399,string_hash_to_newline(string(trade_take[1]))); - // - if (trade_tnum[1]>1) then draw_text(xx+530,yy+399,string_hash_to_newline(string(trade_take[1])+" ("+string(trade_tnum[1])+")")); - if (trade_tnum[2]=1) then draw_text(xx+530,yy+419,string_hash_to_newline(string(trade_take[2]))); - if (trade_tnum[2]>1) then draw_text(xx+530,yy+419,string_hash_to_newline(string(trade_take[2])+" ("+string(trade_tnum[2])+")")); - if (trade_tnum[3]=1) then draw_text(xx+530,yy+439,string_hash_to_newline(string(trade_take[3]))); - if (trade_tnum[3]>1) then draw_text(xx+530,yy+439,string_hash_to_newline(string(trade_take[3])+" ("+string(trade_tnum[3])+")")); - if (trade_tnum[4]=1) then draw_text(xx+530,yy+459,string_hash_to_newline(string(trade_take[4]))); - if (trade_tnum[4]>1) then draw_text(xx+530,yy+459,string_hash_to_newline(string(trade_take[4])+" ("+string(trade_tnum[4])+")")); - } - if (trade_mnum[1]+trade_mnum[2]+trade_mnum[3]+trade_mnum[4]>0){ - draw_set_font(fnt_40k_14b); - draw_text(xx+507,yy+529,string_hash_to_newline(string(global.chapter_name)+":")); - draw_set_font(fnt_40k_14); - if (trade_mnum[1]>0) then draw_sprite(spr_cancel_small,0,xx+507,yy+547); - if (trade_mnum[2]>0) then draw_sprite(spr_cancel_small,0,xx+507,yy+567); - if (trade_mnum[3]>0) then draw_sprite(spr_cancel_small,0,xx+507,yy+587); - if (trade_mnum[4]>0) then draw_sprite(spr_cancel_small,0,xx+507,yy+607); - - if (trade_mnum[1]=1) then draw_text(xx+530,yy+547,string_hash_to_newline(string(trade_give[1]))); - if (trade_mnum[1]>1) then draw_text(xx+530,yy+547,string_hash_to_newline(string(trade_give[1])+" ("+string(trade_mnum[1])+")")); - if (trade_mnum[2]=1) then draw_text(xx+530,yy+567,string_hash_to_newline(string(trade_give[2]))); - if (trade_mnum[2]>1) then draw_text(xx+530,yy+567,string_hash_to_newline(string(trade_give[2])+" ("+string(trade_mnum[2])+")")); - if (trade_mnum[3]=1) then draw_text(xx+530,yy+587,string_hash_to_newline(string(trade_give[3]))); - if (trade_mnum[3]>1) then draw_text(xx+530,yy+587,string_hash_to_newline(string(trade_give[3])+" ("+string(trade_mnum[3])+")")); - if (trade_mnum[4]=1) then draw_text(xx+530,yy+607,string_hash_to_newline(string(trade_give[4]))); - if (trade_mnum[4]>1) then draw_text(xx+530,yy+607,string_hash_to_newline(string(trade_give[4])+" ("+string(trade_mnum[4])+")")); - } - - } - + if (warning=1 || diplomacy>=6){ + var warn; + if (array_contains(XENOS_FACTIONS, diplomacy)){ + warn="Consorting with xenos will cause your disposition with the Imperium to lower."; + } else { + warn="Consorting with heretics will cause your disposition with the Imperium to plummet."; + } + + draw_set_halign(fa_left); + + draw_rectangle(mouse_x-2,mouse_y+20,mouse_x+2+string_width_ext(warn,-1,600),mouse_y+24+string_height_ext(warn,-1,600),0); + draw_set_color(CM_GREEN_COLOR); + draw_rectangle(mouse_x-2,mouse_y+20,mouse_x+2+string_width_ext(warn,-1,600),mouse_y+24+string_height_ext(warn,-1,600),1); + draw_text_ext(mouse_x,mouse_y+22,warn,-1,600); + } - } //scr_dialogue(diplomacy_pathway); basic_diplomacy_screen(); diff --git a/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml b/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml index 250a1b7736..e0e9dc2b4d 100644 --- a/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml +++ b/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml @@ -189,6 +189,9 @@ function dreadnought_sprite_components(component){ "Multi-Melta": spr_dread_plasma_cannon, "Twin Linked Lascannon": spr_dread_lascannon, "Heavy Conversion Beam Projector": spr_dread_plasma_cannon, + "Twin-linked Volkite Culverins":spr_Volkite_Culverins, + "Contemptor CCW":spr_contemptor_CCW, + }; if (struct_exists(components, component)){ return components[$ component] diff --git a/scripts/scr_ui_formation_bars/scr_ui_formation_bars.gml b/scripts/scr_ui_formation_bars/scr_ui_formation_bars.gml index 7489878866..41877760c0 100644 --- a/scripts/scr_ui_formation_bars/scr_ui_formation_bars.gml +++ b/scripts/scr_ui_formation_bars/scr_ui_formation_bars.gml @@ -1,5 +1,6 @@ +/// @mixin function scr_ui_formation_bars() { - ui_formations_data = { + var ui_formations_data = { nbar: 0, abar: 0, te: 4700, @@ -112,6 +113,7 @@ function scr_ui_formation_bars() { } } +/// @mixin function init_combat_bars(bar, ii, formations_data, size, image_index, unit_type) { formations_data.nbar = instance_create(formations_data.x9, formations_data.y9 + temp[formations_data.te], obj_formation_bar); formations_data.nbar.size = size; diff --git a/scripts/scr_ui_manage/scr_ui_manage.gml b/scripts/scr_ui_manage/scr_ui_manage.gml index 018dcc61dc..2d36bffce3 100644 --- a/scripts/scr_ui_manage/scr_ui_manage.gml +++ b/scripts/scr_ui_manage/scr_ui_manage.gml @@ -79,9 +79,8 @@ function load_marines_into_ship(system, ship, units, reload = false) { man_size = 0; man_current = 0; if (reload == false) { - menu = 1; + menu = MENU.Manage; } - cooldown = 8; selecting_ship = -1; if (managing == -1 && obj_controller.selection_data.purpose != "Ship Management") { update_garrison_manage(); @@ -99,7 +98,7 @@ function command_slot_prompt(search_params, role_group_params, purpose, purpose_ purpose: purpose, purpose_code: purpose_code, number: 1, - system: managing, + target_company: managing, feature: "none", planet: 0, selections: [] @@ -127,19 +126,399 @@ function command_slot_draw(xx, yy, slot_text){ } } +function reset_manage_unit_constants(unit){ + try{ + if (is_struct(unit_manage_constants)) { + gc_struct(unit_manage_constants); + delete unit_manage_constants; + } + + unit_manage_constants = {}; + last_unit = [unit.company, unit.marine_number]; + marine_armour[0] = unit.armour(); + fix_right = 0; + equip_data = unit.unit_equipment_data(); + unit_manage_constants.faction_owner = "1"; + if (unit.race() != 1) { + unit_manage_constants.owner = unit.race(); + } + + unit_manage_constants.current_data = last_unit; + + var _damage_res = unit.damage_resistance(); + + //armour + var _data = { + tooltip :$"==Armour==\n {is_struct(equip_data.armour_data) ? equip_data.armour_data.item_tooltip_desc_gen() : ""}", + colour : quality_color(unit.armour_quality), + max_width : 187, + } + + unit_manage_constants.armour_string = new ReactiveString(unit.equipments_qual_string("armour", true), 0,0,_data); + // Sets up the description for the equipement of current marine + + // Gear + + var _data = { + tooltip : $"==Gear==\n{is_struct(equip_data.gear_data) ? equip_data.gear_data.item_tooltip_desc_gen() : ""}", + colour : quality_color(unit.gear_quality), + max_width : 187, + } + + unit_manage_constants.gear_string = new ReactiveString(unit.equipments_qual_string("gear", true), 0,0,_data); + + //mobility + var _data = { + tooltip : $"==Back/Mobilitiy==\n{is_struct(equip_data.mobility_data) ? equip_data.mobility_data.item_tooltip_desc_gen() : ""}", + colour : quality_color(unit.mobility_item_quality), + max_width : 187, + } + + unit_manage_constants.mobi_string = new ReactiveString(unit.equipments_qual_string("mobi", true), 0,0,_data); + + var _data = { + tooltip : $"==First Weapon==\n{is_struct(equip_data.weapon_one_data) ? equip_data.weapon_one_data.item_tooltip_desc_gen() : ""}", + colour : quality_color(unit.weapon_one_quality), + max_width : 187, + } + + unit_manage_constants.wep1_string = new ReactiveString(unit.equipments_qual_string("wep1", true), 0,0,_data); + + //mobility + var _data = { + tooltip : $"==Second Weapon==\n{is_struct(equip_data.weapon_two_data) ? equip_data.weapon_two_data.item_tooltip_desc_gen() : ""}", + colour : quality_color(unit.weapon_two_quality), + max_width : 187, + } + + unit_manage_constants.wep2_string = new ReactiveString(unit.equipments_qual_string("wep2", true), 0,0,_data); + + + // Psyker things + var _psionic = ""; + var _psy_powers_known = unit.powers_known; + var _psy_powers_count = array_length(_psy_powers_known); + var _tooltip = ""; + if (_psy_powers_count > 0) { + _psionic = $"{unit.psionic}/{_psy_powers_count}"; + _tooltip = generate_marine_powers_description_string(unit); + } + + // Corruption + if ((obj_controller.chaos_rating > 0) && (_psionic != "")) { + _psionic = $"{_psionic}\n{max(0, unit.corruption())}% Corruption."; + } + + unit_manage_constants.psy = new LabeledIcon(spr_icon_psyker, _psionic, 0, 0, { + icon_width : 24, + icon_height : 24, + tooltip: $"==Psychic Stats==\n{_tooltip}", + }); + // Damage Resistance + + var _res_tool = "Health damage taken by the marine is reduced by this percentage. This happens after the flat reduction from armor.\n\nContributing factors:\n"; + var equipment_types = ["armour", "weapon_one", "weapon_two", "mobility", "gear"]; + + for (var i = 0; i < array_length(equipment_types); i++) { + var equipment_type = equipment_types[i]; + var dr = 0; + var name = ""; + switch (equipment_type) { + case "armour": + dr = unit.get_armour_data("damage_resistance_mod"); + name = unit.get_armour_data("name"); + break; + case "weapon_one": + dr = unit.get_weapon_one_data("damage_resistance_mod"); + name = unit.get_weapon_one_data("name"); + break; + case "weapon_two": + dr = unit.get_weapon_two_data("damage_resistance_mod"); + name = unit.get_weapon_two_data("name"); + break; + case "mobility": + dr = unit.get_mobility_data("damage_resistance_mod"); + name = unit.get_mobility_data("name"); + break; + case "gear": + dr = unit.get_gear_data("damage_resistance_mod"); + name = unit.get_gear_data("name"); + break; + } + if (dr != 0) { + _res_tool += $"{name}: {dr}%\n"; + } + } + _res_tool += $"CON: {round(unit.constitution / 2)}%" + + unit_manage_constants.damage_res = new LabeledIcon(spr_icon_iron_halo, $"{_damage_res}%",0,0,{ + icon_width : 24, + icon_height : 24, + tooltip: _res_tool, + }) + var _hp_val = $"{round(unit.hp())}/{round(unit.max_health())}"; + var _hp_tool = "A measure of how much punishment the creature can take. Marines can go into the negatives and still survive, but they'll require a bionic to become fighting fit once more.\n\nContributing factors:\n"; + _hp_tool += $"CON: {round(100 * (1 + ((unit.constitution - 40) * 0.025)))}\n"; + + for (var i = 0; i < array_length(equipment_types); i++) { + var equipment_type = equipment_types[i]; + var hp_mod = 0; + var name = ""; + switch (equipment_type) { + case "armour": + hp_mod = unit.get_armour_data("hp_mod"); + name = unit.get_armour_data("name"); + break; + case "weapon_one": + hp_mod = unit.get_weapon_one_data("hp_mod"); + name = unit.get_weapon_one_data("name"); + break; + case "weapon_two": + hp_mod = unit.get_weapon_two_data("hp_mod"); + name = unit.get_weapon_two_data("name"); + break; + case "mobility": + hp_mod = unit.get_mobility_data("hp_mod"); + name = unit.get_mobility_data("name"); + break; + case "gear": + hp_mod = unit.get_gear_data("hp_mod"); + name = unit.get_gear_data("name"); + break; + } + if (hp_mod != 0) { + _hp_tool += $"{name}: {format_number_with_sign(hp_mod)}%\n"; + } + } + + unit_manage_constants.hp = new LabeledIcon(spr_icon_health, _hp_val, 0, 0, { + icon_width : 24, + icon_height : 24, + tooltip: _hp_tool, + }); + + + // ------------------------- + // Armour Rating + // ------------------------- + var _armour_val = $"{unit.armour_calc()}"; + var _armour_tool = "Reduces incoming damage at a flat rate. Certain enemies may attack in ways that may bypass your armor entirely, for example power weapons and some warp sorceries.\n\nContributing factors:\n"; + + for (var i = 0; i < array_length(equipment_types); i++) { + var equipment_type = equipment_types[i]; + var ac = 0; + var name = ""; + switch (equipment_type) { + case "armour": + ac = unit.get_armour_data("armour_value"); + name = unit.get_armour_data("name"); + break; + case "weapon_one": + ac = unit.get_weapon_one_data("armour_value"); + name = unit.get_weapon_one_data("name"); + break; + case "weapon_two": + ac = unit.get_weapon_two_data("armour_value"); + name = unit.get_weapon_two_data("name"); + break; + case "mobility": + ac = unit.get_mobility_data("armour_value"); + name = unit.get_mobility_data("name"); + break; + case "gear": + ac = unit.get_gear_data("armour_value"); + name = unit.get_gear_data("name"); + break; + } + if (ac != 0) { + _armour_tool += $"{name}: {ac}\n"; + } + } + + if (obj_controller.stc_bonus[1] == 5 || obj_controller.stc_bonus[2] == 3) { + _armour_tool += "STC Bonus: x1.05\n"; + } + + unit_manage_constants.armour = new LabeledIcon(spr_icon_shield2, _armour_val, 0, 0, { + icon_width : 24, + icon_height : 24, + tooltip: _armour_tool, + }); + + unit_manage_constants.exp = new LabeledIcon(spr_icon_veteran, string(floor(unit.experience)), 0, 0, { + icon_width : 24, + icon_height : 24, + tooltip: $"==Experience==\nA measurement of how battle-hardened the unit is. Provides various bonuses across the board. Every 15 EXP, a new stat is assigned. Hover over the unit’s stats in the marine profile to see projected growth over time.", + }); + + // Melee Attack + var _melee = unit.melee_attack(); + unit_manage_constants.melee_attack = new LabeledIcon(spr_icon_weapon_skill, $"{round(_melee[0])}", 0, 0, { + icon_width : 24, + icon_height : 24, + tooltip: $"==Melee Attack==\n{_melee[1]}", + colour : unit.encumbered_melee? #bf4040 : CM_GREEN_COLOR + }); + + var _carry = _melee[2]; + unit_manage_constants.melee_burden = new LabeledIcon(spr_icon_weight, $"{_carry[0]}/{_carry[1]}", 0, 0, { + icon_width : 24, + icon_height : 24, + tooltip: $"==Melee Burden==\n{_carry[2]}", + colour : unit.encumbered_melee? #bf4040 : CM_GREEN_COLOR + }); + + // Ranged Attack + var _range = unit.ranged_attack(); + unit_manage_constants.ranged_attack = new LabeledIcon(spr_icon_ballistic_skill, $"{round(_range[0])}", 0, 0, { + icon_width : 24, + icon_height : 24, + tooltip: $"==Ranged Attack==\n{_range[1]}", + colour : unit.encumbered_ranged ? #bf4040 : CM_GREEN_COLOR + }); + + var _carry = _range[2]; + unit_manage_constants.ranged_burden = new LabeledIcon(spr_icon_weight, $"{_carry[0]}/{_carry[1]}", 0, 0, { + icon_width : 24, + icon_height : 24, + tooltip: $"==Ranged Burden==\n{_carry[2]}", + colour : unit.encumbered_ranged? #bf4040 : CM_GREEN_COLOR + }); + + + + // ------------------------- + // Bionics + // ------------------------- + var _bionic_val = $"{unit.bionics}"; + var _bionic_tool = "Bionic Augmentation is something a unit can do to both enhance their capabilities, but also replace a missing limb to get back into the fight."; + _bionic_tool += "\nThere is a limit of 10 Bionic augmentations. After that the damage is so extensive that a marine requires a dreadnought to keep going."; + _bionic_tool += "\nFor everyone else? It's time for the emperor's mercy."; + _bionic_tool += "\n\nCurrent Bionic Augmentations:\n"; + + var _body_parts = ARR_body_parts; + var _body_parts_display = ARR_body_parts_display; + + for (var part = 0; part < array_length(_body_parts); part++) { + if (struct_exists(unit.body[$ _body_parts[part]], "bionic")) { + var part_display = _body_parts_display[part]; + _bionic_tool += $"Bionic {part_display}"; + switch (part_display) { + case "Left Leg": + case "Right Leg": + _bionic_tool += " (CON: +2 STR: +1 DEX: -2)\n"; + break; + case "Left Eye": + case "Right Eye": + _bionic_tool += " (CON: +1 WIS: +1 DEX: +1)\n"; + break; + case "Left Arm": + case "Right Arm": + _bionic_tool += " (CON: +2 STR: +2 WS: -1)\n"; + break; + case "Torso": + _bionic_tool += " (CON: +4 STR: +1 DEX: -1)\n"; + break; + case "Throat": + _bionic_tool += " (CHA: -1)\n"; + break; + case "Jaw": + case "Head": + _bionic_tool += " (CON: +1)\n"; + break; + } + } + } + + unit_manage_constants.bionics = new LabeledIcon(spr_icon_bionics, _bionic_val, 0, 0, { + icon_width : 24, + icon_height : 24, + tooltip: _bionic_tool, + }); + + if (is_struct(unit_manage_image)) { + try { + unit_manage_image.destroy_image(); + } + delete unit_manage_image; + } + + unit_manage_image = unit.draw_unit_image(); + + temp[122] = unit.handle_stat_growth(); + /*if (man[sel]="vehicle"){ + // TODO +}*/ + } catch(_exception){ + //not sure handling with normal method exception could just be a pain here + } +} +function company_specific_management(){ + add_draw_return_values(); + draw_set_font(fnt_40k_30b); + draw_set_halign(fa_center); + draw_set_color(c_gray); // CM_GREEN_COLOR + var _allow_shorts = false; + var _comp = ""; + if (managing > 20) { + _comp = managing - 10; + } else if ((managing >= 1) && (managing <= 10)) { + _company_name = int_to_roman(managing) + " Company"; + _comp = managing; + } else if (managing > 10) { + switch (managing) { + case 11: + _company_name = "Headquarters"; + break; + case 12: + _company_name = "Apothecarion"; + break; + case 13: + _company_name = "Librarium"; + break; + case 14: + _company_name = "Reclusium"; + break; + case 15: + _company_name = "Armamentarium"; + break; + } + } + // Draw the company followed by chapters name + draw_text(800, 74, $"{_company_name}, {global.chapter_name}"); + if (managing <= 10 ) { + var _text_input = management_buttons.company_namer; + + obj_ini.company_title[managing] = _text_input.draw(obj_ini.company_title[managing]); + _allow_shorts = !_text_input.allow_input; + } else { + _allow_shorts = true; + } + if (allow_shortcuts){ + allow_shortcuts = _allow_shorts; + } + pop_draw_return_values() +} + function alternative_manage_views(x1, y1) { + //for some reason management_buttons keeps dying so hopefully this will solve the issue until something better can be found + if (!is_struct(management_buttons)){ + init_manage_buttons(); + } var _squad_button = management_buttons.squad_toggle; _squad_button.update({ x1: x1 + 5, y1: y1 + 6, label: !obj_controller.view_squad && !obj_controller.company_report ? "Squad View" : "Company View", - keystroke: keyboard_check_pressed(ord("S")) + keystroke: keyboard_check_pressed(ord("S")) && allow_shortcuts }); - if (_squad_button.draw(!text_bar)) { - view_squad = !view_squad; - if (view_squad) { - new_company_struct(); + if (company_data.has_squads){ + if (_squad_button.draw(!text_bar)) { + view_squad = !view_squad; + if (view_squad) { + new_company_struct(); + } } } @@ -149,7 +528,7 @@ function alternative_manage_views(x1, y1) { label: !unit_profile ? "Show Profile" : "Hide Profile", x1: _squad_button.x2, y1: _squad_button.y1, - keystroke: keyboard_check_pressed(ord("P")) + keystroke: keyboard_check_pressed(ord("P")) && allow_shortcuts }); if (_profile_toggle.draw(!text_bar)) { unit_profile = !unit_profile; @@ -161,183 +540,90 @@ function alternative_manage_views(x1, y1) { label: !unit_bio ? "Show Bio" : "Hide Bio", x1: _profile_toggle.x2, y1: _profile_toggle.y1, - keystroke: keyboard_check_pressed(ord("B")) + keystroke: keyboard_check_pressed(ord("B")) && allow_shortcuts }); if (bio_toggle.draw(!text_bar)) { unit_bio = !unit_bio; } } } -} + // === Capture Image Button === + var _last_button_x = _squad_button.x2; // default if no profile/bio drawn + var _last_button_y = _squad_button.y1; -/// @mixin -function scr_ui_manage() { - if (combat != 0) { - exit; - } - // This is the draw script for showing the main management screen or individual company screens + // if profile is visible, place after profile toggle + if (!view_squad) { + _last_button_x = management_buttons.profile_toggle.x2; + _last_button_y = management_buttons.profile_toggle.y1; - if ((zoomed == 0) && (menu == 1) && (managing >= 0)) { - if (managing > 0) { - company_manage_actions(); - } - if (!text_bar) { - ui_manage_hotkeys(); + // if bio visible, place after bio toggle + if (unit_profile) { + _last_button_x = management_buttons.bio_toggle.x2; + _last_button_y = management_buttons.bio_toggle.y1; } } - if ((menu == 1) && (managing > 0 || managing < 0)) { - if (!mouse_check_button(mb_left)) { - drag_square = []; - rectangle_action = -1; - } - if (squad_sel_count > 0) { - squad_sel_count--; - } - if (squad_sel_count == 0) { - squad_sel = -1; - squad_sel_action = -1; - } - if (man_size < 1) { - selecting_location = ""; - selecting_ship = -1; - selecting_planet = 0; - man_size = 0; - } - var unit, x1, x2, x3, y1, y2, y3, text; - var tooltip_text = "", bionic_tooltip = "", tooltip_drawing = []; - var invalid_locations = ["Mechanicus Vessel", "Terra"]; - - var xx = __view_get(e__VW.XView, 0) + 0, yy = __view_get(e__VW.YView, 0) + 0, bb = "", img = 0; - - // Draw BG - draw_set_alpha(1); - draw_sprite(spr_rock_bg, 0, xx, yy); - draw_set_font(fnt_40k_30b); - draw_set_halign(fa_center); - draw_set_color(c_gray); // 38144 - - // Var declarations - var c = 0, fx = "", skin = obj_ini.skin_color; - static stats_displayed = false; - - if (managing > 0) { - if (managing > 20) { - c = managing - 10; - } else if ((managing >= 1) && (managing <= 10)) { - fx = int_to_roman(managing) + " Company"; - c = managing; - } else if (managing > 10) { - switch (managing) { - case 11: - fx = "Headquarters"; - break; - case 12: - fx = "Apothecarion"; - break; - case 13: - fx = "Librarium"; - break; - case 14: - fx = "Reclusium"; - break; - case 15: - fx = "Armamentarium"; - break; - } - } - // Draw the company followed by chapters name - draw_text(xx + 800, yy + 74, string(fx) + ", " + string(global.chapter_name)); - } else if (managing < 0) { - if (struct_exists(selection_data, "purpose")) { - draw_text(xx + 800, yy + 74, $"{selection_data.purpose}"); - } - } - - if (managing <= 10 && managing > 0) { - var bar_wid = 0, click_check, string_h; - draw_set_alpha(0.25); - if (obj_ini.company_title[managing] != "") { - bar_wid = max(400, string_width(obj_ini.company_title[managing])); - } - if (obj_ini.company_title[managing] == "") { - bar_wid = 400; - } - string_h = string_height("LOL"); - draw_rectangle(xx + 800 - (bar_wid / 2), yy + 108, xx + 800 + (bar_wid / 2), yy + 100 + string_h, 1); - click_check = point_and_click([xx + 800 - (bar_wid / 2), yy + 108, xx + 800 + (bar_wid / 2), yy + 100 + string_h]); - obj_cursor.image_index = 0; - text_bar = false; - if (click_check) { - obj_cursor.image_index = 2; - text_bar = true; - keyboard_string = obj_ini.company_title[managing]; - } - draw_set_alpha(1); + var _capture_button = management_buttons.capture_image; + _capture_button.update({ + x1: _last_button_x, + y1: _last_button_y + }); - if ((obj_ini.company_title[managing] != "") || (text_bar > 0)) { - draw_set_font(fnt_fancy); - if ((text_bar == 0) || (text_bar > 31)) { - draw_text(xx + 800, yy + 110, $"''{obj_ini.company_title[managing]} {(text_bar > 0 && text_bar <= 31) ? "|" : ""}'' "); + if (is_struct(obj_controller.unit_focus) && _capture_button.draw(!text_bar)) { + // Capture the sprite frame as PNG + var spr = obj_controller.unit_manage_image.unit_sprite; + var _unit = obj_controller.unit_focus; //unit struct + if (sprite_exists(spr)) { + var w = sprite_get_width(spr); + var h = sprite_get_height(spr); + + // create surface and draw sprite frame 0 + var surf = surface_create(w, h); + surface_set_target(surf); + draw_clear_alpha(c_black, 0); + draw_sprite(spr, 0, 0, 0); + surface_reset_target(); + + // save to local game folder + var base_name = working_directory + $"\\main\\marine_capture_{_unit.name()}_{_unit.marine_number}{_unit.company}"; + var extension = ".png"; + var index = 0; + var path; + + for (var i=0;i<=1000;i++){ // safety limit + path = base_name + string(index) + extension; + if (!file_exists(path)) { + break; } + index++; } - } + surface_save(surf, path); - // var we;we=string_width(string(global.chapter_name)+" "+string(fx))/2; + // cleanup + surface_free(surf); - if (managing > 0) { - // Draw arrows - draw_sprite_ext(spr_arrow, 0, xx + 25, yy + 70, 2, 2, 0, c_white, 1); // Back - draw_sprite_ext(spr_arrow, 0, xx + 429, yy + 70, 2, 2, 0, c_white, 1); // Left - draw_sprite_ext(spr_arrow, 1, xx + 1110, yy + 70, 2, 2, 0, c_white, 1); // Right - } else { - scr_manage_task_selector(); + show_debug_message_adv("Marine image saved to: " + path); } - var right_ui_block = { - x1: xx + 1008, - y1: yy + 141, - w: 568, - h: 681 - }; - right_ui_block.x2 = right_ui_block.x1 + right_ui_block.w; - right_ui_block.y2 = right_ui_block.y1 + right_ui_block.h; - - var actions_block = { - x1: right_ui_block.x1, - y1: yy + 520, - w: 569, - h: 302 - }; - actions_block.x2 = actions_block.x1 + actions_block.w; - actions_block.y2 = actions_block.y1 + actions_block.h; - - draw_sprite_stretched(spr_data_slate_back, 0, actions_block.x1, actions_block.y1, actions_block.w, actions_block.h); - draw_rectangle_color_simple(actions_block.x1, actions_block.y1, actions_block.x2, actions_block.y2, 1, c_gray); - draw_rectangle_color_simple(actions_block.x1 + 1, actions_block.y1 + 1, actions_block.x2 - 1, actions_block.y2 - 1, 1, c_black); - draw_rectangle_color_simple(actions_block.x1 + 2, actions_block.y1 + 2, actions_block.x2 - 2, actions_block.y2 - 2, 1, c_gray); + } +} - //TODO remove if no longer needed - /*var unit_view_block = { - x1: right_ui_block.x1, - y1: yy + 140, - w: 571, - h: 380, - }; - unit_view_block.x2 = unit_view_block.x1 + unit_view_block.w; - unit_view_block.y2 = unit_view_block.y1 + unit_view_block.h;*/ - draw_set_color(c_white); - draw_sprite_stretched(spr_data_slate_back, 0, xx + 1008 - 1, yy + 140, 572, 378); - // draw_sprite_stretched(spr_data_slate_border, 0, xx+1008-1, yy+140, 572, 378); Old Location - // draw_rectangle_color_simple(xx+1007, yy+140, xx+1579, yy+519, 0, c_white, 0.05); - draw_rectangle_color_simple(xx + 1007, yy + 140, xx + 1579, yy + 519, 0, 5998382, 0.05); - // Swap between squad view and normal view +function draw_sprite_and_unit_equip_data(){ + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + // Swap between squad view and normal view + company_data.unit_ui_panel.inside_method = function(){ + var _unit_tooltips = []; draw_set_color(c_gray); + var xx = company_data.unit_ui_panel.XX; + var yy = company_data.unit_ui_panel.YY; // draw_line(xx+1005,yy+519,xx+1576,yy+519); draw_set_font(fnt_40k_14b); - var cn = obj_controller; - if (instance_exists(cn) && is_struct(temp[120])) { - var selected_unit = temp[120]; //unit struct + if (is_struct(obj_controller.unit_focus)) { + var selected_unit = obj_controller.unit_focus; //unit struct + if (!array_equals([selected_unit.company, selected_unit.marine_number], unit_manage_constants.current_data)){ + reset_manage_unit_constants(selected_unit); + } ///tooltip_text stacks hover over type tooltips into an array and draws them last so as not to create drawing order issues draw_set_color(c_red); var no_other_instances = !instance_exists(obj_temp3) && !instance_exists(obj_popup); @@ -348,7 +634,7 @@ function scr_ui_manage() { _allow_alternative_views = selection_data.purpose_code == "manage"; } if (_allow_alternative_views) { - alternative_manage_views(right_ui_block.x1 + 5, right_ui_block.y1 + 6); + alternative_manage_views(xx + 5, yy + 6); } if (!_allow_alternative_views) { @@ -356,37 +642,37 @@ function scr_ui_manage() { } //TODO Implement company report /*var x6=x5+string_width(stat_tool_tip_text)+4; - var y6=y5+string_height(stat_tool_tip_text)+2; - draw_unit_buttons([x5,y5,x6,y6], stat_tool_tip_text,[1,1],c_red); - if (company_data!={}){ - array_push(tooltip_drawing, ["click or press R to show Company Report", [x5,y5,x6,y6]]); - if ((keyboard_check_pressed(ord("R"))|| (point_in_rectangle(mouse_x, mouse_y,x5,y5,x6,y6) && mouse_check_button_pressed(mb_left))) && !instance_exists(obj_temp3) && !instance_exists(obj_popup)){ - view_squad =false; - unit_profile=false; - company_report = !company_report; - } - }else{ - draw_set_alpha(0.5); - draw_set_color(c_black); - draw_rectangle(x5,y5,x6,y6,0); - draw_set_alpha(1); - } - */ + var y6=y5+string_height(stat_tool_tip_text)+2; + draw_unit_buttons([x5,y5,x6,y6], stat_tool_tip_text,[1,1],c_red); + if (company_data!={}){ + array_push(company_data.tooltip_drawing, ["click or press R to show Company Report", [x5,y5,x6,y6]]); + if ((keyboard_check_pressed(ord("R"))|| (point_in_rectangle(mouse_x, mouse_y,x5,y5,x6,y6) && mouse_check_button_pressed(mb_left))) && !instance_exists(obj_temp3) && !instance_exists(obj_popup)){ + view_squad =false; + unit_profile=false; + company_report = !company_report; + } + }else{ + draw_set_alpha(0.5); + draw_set_color(c_black); + draw_rectangle(x5,y5,x6,y6,0); + draw_set_alpha(1); + } + */ // Draw unit image draw_set_color(c_white); - if (is_struct(temp[121])) { - temp[121].draw(xx + 1328, yy + 250); + if (is_struct(obj_controller.unit_manage_image)) { + obj_controller.unit_manage_image.draw(xx + 320, yy + 109); } //TODO implement tooltip explaining potential loyalty hit of demoting a sgt // Sergeant promotion button - if (view_squad && company_data != {}) { + if (view_squad && company_data.has_squads) { if (company_data.cur_squad != 0) { var cur_squad = company_data.grab_current_squad(); var sgt_possible = cur_squad.type != "command_squad" && !selected_unit.IsSpecialist(SPECIALISTS_SQUAD_LEADERS); if (selected_unit != cur_squad.squad_leader) { - if (point_and_click(draw_unit_buttons([xx + 1208 + 50, yy + 210 + 260], "Make Sgt", [1, 1], #50a076, , , sgt_possible ? 1 : 0.5)) && sgt_possible) { + if (point_and_click(draw_unit_buttons([xx + 200 + 50, yy + 329], "Make Sgt", [1, 1], #50a076, , , sgt_possible ? 1 : 0.5)) && sgt_possible) { cur_squad.change_sgt(selected_unit); } } @@ -399,8 +685,8 @@ function scr_ui_manage() { // Draw unit name and role var _name_box = { - x1: xx + 1410, - y1: yy + 177, + x1: xx + 402, + y1: yy + 36, text1: "", text2: "", text3: selected_unit.name() @@ -423,249 +709,221 @@ function scr_ui_manage() { draw_set_font(fnt_40k_30b); draw_text_transformed_outline(_name_box.x1, _name_box.y3, _name_box.text3, 0.7, 0.7, 0); + // Draw unit info draw_set_font(fnt_40k_14); // Left side of the screen draw_set_halign(fa_left); - var x_left = xx + 1030; + var x_left = xx + 22; // Equipment - var armour = selected_unit.armour(); - if (armour != "") { - text = selected_unit.equipments_qual_string("armour", true); - tooltip_text = cn.temp[103]; - x1 = x_left; - y1 = yy + 320; - x2 = x1 + string_width_ext(text, -1, 187); - y2 = y1 + string_height_ext(text, -1, 187); - draw_set_alpha(1); - draw_text_ext_outline(x1, y1, text, -1, 187, 0, quality_color(selected_unit.armour_quality)); - array_push(tooltip_drawing, [tooltip_text, [x1, y1, x2, y2], "Armour"]); - } + var _armour = unit_manage_constants.armour_string; - var gear = selected_unit.gear(); - if (selected_unit.gear() != "") { - text = selected_unit.equipments_qual_string("gear", true); - tooltip_text = cn.temp[105]; - x1 = x_left; - y1 = yy + 446; - x2 = x1 + string_width_ext(text, -1, 187); - y2 = y1 + string_height_ext(text, -1, 187); - draw_text_ext_outline(x1, y1, text, -1, 187, 0, quality_color(selected_unit.gear_quality)); - array_push(tooltip_drawing, [tooltip_text, [x1, y1, x2, y2], "Gear"]); - } + _armour.update({x1:x_left, y1 :yy + 179}); - var mobi = selected_unit.mobility_item(); - if (mobi != "") { - text = selected_unit.equipments_qual_string("mobi", true); - tooltip_text = cn.temp[107]; - x1 = x_left; - y1 = yy + 467; - x2 = x1 + string_width_ext(text, -1, 187); - y2 = y1 + string_height_ext(text, -1, 187); - draw_text_ext_outline(x1, y1, text, -1, 187, 0, quality_color(selected_unit.mobility_item_quality)); - array_push(tooltip_drawing, [tooltip_text, [x1, y1, x2, y2], "Back/Mobilitiy"]); - } + _armour.draw(); - var wep1 = selected_unit.weapon_one(); - if (wep1 != "") { - text = selected_unit.equipments_qual_string("wep1", true); - tooltip_text = cn.temp[109]; - x1 = x_left; - y1 = yy + 345; - x2 = x1 + string_width_ext(text, -1, 187); - y2 = y1 + string_height_ext(text, -1, 187); - draw_text_ext_outline(x1, y1, text, -1, 187, 0, quality_color(selected_unit.weapon_one_quality)); - array_push(tooltip_drawing, [tooltip_text, [x1, y1, x2, y2], "First Weapon"]); - } + var _gear = unit_manage_constants.gear_string; + + _gear.update({x1:x_left, y1 :yy + 305}); + + _gear.draw(); - var wep2 = selected_unit.weapon_two(); - if (wep2 != "") { - text = selected_unit.equipments_qual_string("wep2", true); - tooltip_text = cn.temp[111]; - x1 = x_left; - y1 = yy + 395; - x2 = x1 + string_width_ext(text, -1, 187); - y2 = y1 + string_height_ext(text, -1, 187); - draw_text_ext_outline(x1, y1, text, -1, 187, 0, quality_color(selected_unit.weapon_two_quality)); - array_push(tooltip_drawing, [tooltip_text, [x1, y1, x2, y2], "Second Weapon"]); - } + + var _mobi = unit_manage_constants.mobi_string; + + _mobi.update({x1:x_left, y1 :yy + 326}); + + _mobi.draw(); + + + var _wep1 = unit_manage_constants.wep1_string; + + _wep1.update({x1:x_left, y1 :yy + 204}); + + _wep1.draw(); + + + var _wep2 = unit_manage_constants.wep2_string; + + _wep2.update({x1:x_left, y1 :yy + 254}); + + _wep2.draw(); // Stats - // Bionics tracker - if (cn.temp[128] != "") { - text = cn.temp[128]; - tooltip_text = cn.temp[129]; - x1 = x_left + 110; - y1 = yy + 208; - x2 = x1 + string_width(text); - y2 = y1 + string_height(text); - x3 = x1 - 26; - y3 = y1 - 4; - - draw_sprite_stretched(spr_icon_bionics, 0, x3, y3, 24, 24); - draw_text_outline(x1, y1, text); - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Bionics Installed"]); - } + // Bionics trackers + unit_manage_constants.bionics.update({ + x1 : x_left+84, + y1 : yy+63, + }); + unit_manage_constants.bionics.draw(); - // Armour Rating - if (cn.temp[126] != "") { - text = cn.temp[126]; - tooltip_text = cn.temp[127]; - x1 = x_left + 20; - y1 = yy + 232; - x2 = x1 + string_width(text); - y2 = y1 + string_height(text); - x3 = x1 - 26; - y3 = y1 - 4; - draw_sprite_stretched(spr_icon_shield2, 0, x3, y3, 24, 24); - draw_text_outline(x1, y1, text); - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Armour Rating"]); - } + unit_manage_constants.armour.update({ + x1 : x_left-6, + y1 : yy+87, + }); + unit_manage_constants.armour.draw(); - // Health - if (cn.temp[124] != "") { - text = cn.temp[124]; - tooltip_text = cn.temp[125]; - x1 = x_left + 20; - y1 = yy + 208; - x2 = x1 + string_width(text); - y2 = y1 + string_height(text); - x3 = x1 - 26; - y3 = y1 - 4; - draw_sprite_stretched(spr_icon_health, 0, x3, y3, 24, 24); - draw_text_outline(x1, y1, text); - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Health"]); - } + unit_manage_constants.hp.update({ + x1 : x_left-6, + y1 : yy + 63, + }); + unit_manage_constants.hp.draw(); // Experience - if (cn.temp[113] != "") { - text = cn.temp[113]; - tooltip_text = "A measureme of how battle-hardened the unit is. Provides a lot of various bonuses across the board."; - x1 = x_left + 20; - y1 = yy + 184; - x2 = x1 + string_width(text); - y2 = y1 + string_height(text); - x3 = x1 - 26; - y3 = y1 - 4; - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Experience"]); - draw_sprite_stretched(spr_icon_veteran, 0, x_left - 6, yy + 180, 24, 24); - draw_text_outline(x1, y1, text); - } + unit_manage_constants.exp.update({ + x1 : x_left-6, + y1 : yy + 39, + }); + unit_manage_constants.exp.draw(); - if (cn.temp[118] != "") { - text = cn.temp[118]; // Damage Resistance - tooltip_text = cn.temp[130]; - x1 = x_left + 110; - y1 = yy + 232; - x2 = x1 + string_width(text); - y2 = y1 + string_height(text); - x3 = x1 - 26; - y3 = y1 - 4; - draw_sprite_stretched(spr_icon_iron_halo, 0, x3, y3, 24, 24); - draw_text_outline(x1, y1, text); - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Damage Resistance"]); - } + unit_manage_constants.damage_res.update({ + x1 : x_left+84, + y1: yy+87, + }); - // Psyker things - if (cn.temp[119] != "") { - text = cn.temp[119]; - tooltip_text = cn.temp[123]; - x1 = x_left + 110; - y1 = yy + 184; - x2 = x1 + string_width(text); - y2 = y1 + string_height(text); - x3 = x1 - 26; - y3 = y1 - 4; - draw_sprite_stretched(spr_icon_psyker, 0, x3, y3, 24, 24); - draw_text_outline(x1, y1, text); - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Psychic Stats"]); - } + unit_manage_constants.damage_res.draw(); - if (is_array(cn.temp[117])) { - text = $"{round(cn.temp[116][0])}"; // melee attack - tooltip_text = string(cn.temp[116][1]); - x1 = x_left + 20; - y1 = yy + 256; - x2 = x1 + string_width(text); - y2 = y1 + string_height(text); - if (selected_unit.encumbered_melee) { - draw_set_color(#bf4040); - //tooltip_text+="\nencumbered" - } - x3 = x1 - 26; - y3 = y1 - 4; - draw_sprite_stretched(spr_icon_weapon_skill, 0, x3, y3, 24, 24); - draw_text_outline(x1, y1, text); - draw_set_color(line_color); - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Melee Attack"]); - } + // Psyker things - if (is_array(cn.temp[117])) { - text = $"{round(cn.temp[117][0])}"; // ranged attack - tooltip_text = string(cn.temp[117][1]); - x1 = x_left + 20; - y1 = yy + 280; - x2 = x1 + string_width(text); - y2 = y1 + string_height(text); - if (selected_unit.encumbered_ranged) { - draw_set_color(#bf4040); - } - x3 = x1 - 26; - y3 = y1 - 4; - draw_sprite_stretched(spr_icon_ballistic_skill, 0, x3, y3, 24, 24); - draw_text_outline(x1, y1, text); - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Ranged Attack"]); - draw_set_color(line_color); - } + if (array_length(selected_unit.powers_known)){ + unit_manage_constants.psy.update({ + x1 : x_left+84, + y1: yy+39, + }); - if (is_array(cn.temp[116])) { - carry_data = cn.temp[116][2]; - var carry_string = $"{carry_data[0]}/{carry_data[1]}"; // Melee Burden - x1 = x_left + 110; - y1 = yy + 256; - x2 = x1 + string_width(carry_string); - y2 = y1 + string_height(carry_string); - if (selected_unit.encumbered_melee) { - draw_set_color(#bf4040); - } - x3 = x1 - 26; - y3 = y1 - 4; - draw_sprite_stretched(spr_icon_weight, 0, x3, y3, 24, 24); - draw_text_outline(x1, y1, carry_string); - tooltip_text = carry_data[2]; - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Melee Burden"]); - draw_set_color(line_color); + unit_manage_constants.psy.draw(); } - if (is_array(cn.temp[117])) { - carry_data = cn.temp[117][2]; - var carry_string = $"{carry_data[0]}/{carry_data[1]}"; // Ranged Burden - x1 = x_left + 110; - y1 = yy + 280; - x2 = x1 + string_width(carry_string); - y2 = y1 + string_height(carry_string); - if (selected_unit.encumbered_ranged) { - draw_set_color(#bf4040); - } - x3 = x1 - 26; - y3 = y1 - 4; - draw_sprite_stretched(spr_icon_weight, 0, x3, y3, 24, 24); - draw_text_outline(x1, y1, carry_string); - tooltip_text = carry_data[2]; - array_push(tooltip_drawing, [tooltip_text, [x3, y1, x2, y2], "Ranged Burden"]); - draw_set_color(line_color); - } + unit_manage_constants.melee_attack.update({ + x1 : x_left-6, + y1: yy+111, + }); + + unit_manage_constants.melee_attack.draw(); + + unit_manage_constants.ranged_attack.update({ + x1 : x_left-6, + y1: yy+135, + }); + + unit_manage_constants.ranged_attack.draw(); + + unit_manage_constants.melee_burden.update({ + x1 : x_left+84, + y1: yy+111, + }); + + unit_manage_constants.melee_burden.draw(); + + + unit_manage_constants.ranged_burden.update({ + x1 : x_left+84, + y1: yy+135, + }); + + unit_manage_constants.ranged_burden.draw(); + + } + setup_tooltip_list(_unit_tooltips) + } + if (!instance_exists(obj_popup)){ + company_data.unit_ui_panel.draw_with_dimensions(); + } +} +/// @mixin +function scr_ui_manage() { + if (combat != 0) { + exit; + } + // This is the draw script for showing the main management screen or individual company screens + + if ((zoomed == 0) && (menu == 1) && (managing >= 0)) { + if (managing > 0) { + company_manage_actions(); + } + if (allow_shortcuts) { + ui_manage_hotkeys(); + } + } + + if ((menu == 1) && (managing > 0 || managing < 0)) { + if (!mouse_check_button(mb_left)) { + drag_square = []; + rectangle_action = -1; + } + if (squad_sel_count > 0) { + squad_sel_count--; + } + if (squad_sel_count == 0) { + squad_sel = -1; + squad_sel_action = -1; + } + if (man_size < 1) { + reset_manage_selections(); + } + var unit, x1, x2, x3, y1, y2, y3, text; + var tooltip_text = "", bionic_tooltip = ""; + company_data.tooltip_drawing = []; + var xx = __view_get(e__VW.XView, 0) + 0, yy = __view_get(e__VW.YView, 0) + 0, bb = "", img = 0; + + // Draw BG + draw_set_alpha(1); + draw_sprite(spr_rock_bg, 0, xx, yy); + draw_set_font(fnt_40k_30b); + draw_set_halign(fa_center); + draw_set_color(c_gray); // CM_GREEN_COLOR + + // Var declarations + var c = 0, _company_name = "", skin = obj_ini.skin_color; + static stats_displayed = false; - // Animated scanline - draw_animated_scanline(xx + 1013, yy + 140 + 4, 558, 368); - draw_sprite_stretched(spr_data_slate_border, 0, xx + 1008 - 1, yy + 140, 572, 378); + if (managing < 0) { + if (struct_exists(selection_data, "purpose")) { + draw_text(xx + 800, yy + 74, $"{selection_data.purpose}"); + } + if (selection_data.select_type == MissionSelectType.Squads){ + view_squad = true; + } } draw_set_font(fnt_40k_14); - draw_set_halign(fa_left); + + if (managing >= 0) { + // Draw arrows + draw_sprite_ext(spr_arrow, 0, xx + 25, yy + 70, 2, 2, 0, c_white, 1); // Back + draw_sprite_ext(spr_arrow, 0, xx + 429, yy + 70, 2, 2, 0, c_white, 1); // Left + draw_sprite_ext(spr_arrow, 1, xx + 1110, yy + 70, 2, 2, 0, c_white, 1); // Right + } + right_ui_block = { + x1: xx + 1008, + y1: yy + 141, + w: 568, + h: 681 + }; + right_ui_block.x2 = right_ui_block.x1 + right_ui_block.w; + right_ui_block.y2 = right_ui_block.y1 + right_ui_block.h; + + actions_block = { + x1: right_ui_block.x1, + y1: yy + 520, + w: 569, + h: 302 + }; + actions_block.x2 = actions_block.x1 + actions_block.w; + actions_block.y2 = actions_block.y1 + actions_block.h; + + draw_sprite_stretched(spr_data_slate_back, 0, actions_block.x1, actions_block.y1, actions_block.w, actions_block.h); + draw_rectangle_color_simple(actions_block.x1, actions_block.y1, actions_block.x2, actions_block.y2, 1, c_gray); + draw_rectangle_color_simple(actions_block.x1 + 1, actions_block.y1 + 1, actions_block.x2 - 1, actions_block.y2 - 1, 1, c_black); + draw_rectangle_color_simple(actions_block.x1 + 2, actions_block.y1 + 2, actions_block.x2 - 2, actions_block.y2 - 2, 1, c_gray); + + + draw_set_color(c_white); // Back + + draw_set_halign(fa_left); var top = man_current, sel = top, temp1 = "", temp2 = "", temp3 = "", temp4 = "", temp5 = ""; // Var creation @@ -741,7 +999,7 @@ function scr_ui_manage() { }, { search_params: { - companies: [managing, 0] + companies: [managing, 0], }, role_group_params: { group: [SPECIALISTS_APOTHECARIES, false, false], @@ -755,7 +1013,7 @@ function scr_ui_manage() { }, { search_params: { - companies: [managing, 0] + companies: [managing, 0], }, role_group_params: { group: [SPECIALISTS_TECHS, false, false], @@ -794,7 +1052,7 @@ function scr_ui_manage() { man_count = 0; var _command_slots_data = get_command_slots_data(); - + draw_set_font(fnt_40k_14); if (managing > 0 && managing <= 10) { for (var r = 0; r < array_length(_command_slots_data); r++) { var role = _command_slots_data[r]; @@ -812,15 +1070,20 @@ function scr_ui_manage() { } } + var _only_display_selected = (instance_exists(obj_popup) && (obj_popup.type == 5 || obj_popup.type == 5.1 || obj_popup.type == 6)); for (var i = 0; i < max(0, repetitions); i++) { - + draw_set_font(fnt_40k_14); if (sel >= array_length(display_unit)) { break; } - while ((man[sel] == "hide") && (sel < array_length(display_unit) - 1)) { + + while ((sel <= array_length(display_unit) - 1) && (man[sel] == "hide" || (man_sel[sel] != 1 && _only_display_selected))) { sel += 1; } - if (scr_draw_management_unit(sel, yy, xx) == "continue") { + if (sel >= array_length(display_unit)) { + break; + } + if (scr_draw_management_unit(sel, yy, xx, true, _only_display_selected) == "continue") { sel++; i--; continue; @@ -872,7 +1135,7 @@ function scr_ui_manage() { /* draw_set_color(c_black);draw_rectangle(xx+25,yy+400,xx+600,yy+417,0); - draw_set_color(38144);draw_rectangle(xx+25,yy+400,xx+600,yy+417,1); + draw_set_color(CM_GREEN_COLOR);draw_rectangle(xx+25,yy+400,xx+600,yy+417,1); draw_line(xx+160,yy+400,xx+160,yy+417); draw_line(xx+304,yy+400,xx+304,yy+417); draw_line(xx+448,yy+400,xx+448,yy+417); @@ -882,342 +1145,20 @@ function scr_ui_manage() { */ yy += 8; - //TODO handle recursively - if ((!obj_controller.unit_profile) && (!stats_displayed)) { - var sel_loading = obj_controller.selecting_ship; - //draws hover over tooltips - function gen_tooltip(tooltip_array) { - for (var i = 0; i < array_length(tooltip_array); i++) { - var tooltip = tooltip_array[i]; - if (scr_hit(tooltip[1][0], tooltip[1][1], tooltip[1][2], tooltip[1][3])) { - tooltip_draw(tooltip[0]); - } - } - } - gen_tooltip(potential_tooltip); - gen_tooltip(promotion_tooltip); - gen_tooltip(health_tooltip); - - // Draw interaction and selection buttons - yy -= 8; - draw_set_font(fnt_40k_14b); - draw_set_color(#50a076); - var button = new UnitButtonObject(); - - button.h = 15; - button.x1 = right_ui_block.x1 + 1; - button.y1 = right_ui_block.y2 - 6 - 30; - button.x2 = button.x1 + 128; - button.y2 = button.y1 + button.h; - // Load/Unload to ship button - button.label = "Load"; - var load_unload_possible = man_size > 0; - - button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("L")); - button.tooltip = "Press Shift L"; - if (load_unload_possible) { - button.alpha = 1; - if (sel_loading == -1) { - if (button.draw()) { - load_selection(); - } - } else if (sel_loading != -1) { - button.label = "Unload"; - if (button.draw()) { - unload_selection(); // Unload - ask for planet confirmation - } - } - } else { - button.alpha = 0.5; - button.draw(false); - } - - button.move("down", true); - - button.label = "Reload"; - //button.keystroke = (keyboard_check(vk_shift) && (keyboard_check_pressed(ord("F")))); - if (instance_exists(cn) && is_struct(temp[120])) { - button.tooltip = $"{temp[120].last_ship.name}"; //Press Shift F"; - } - reload_possible = man_size > 0 && sel_loading == -1; - if (reload_possible) { - button.alpha = 1; - if (button.draw()) { - scr_company_load(selecting_location); - load_marines_into_ship(selecting_location, sh_ide, display_unit, true); - } - } else { - button.alpha = 0.5; - button.draw(false); - } - - button.h = 30; - button.x1 = right_ui_block.x1 + 26; - button.y1 = right_ui_block.y2 - 6 - 30; - button.x2 = button.x1 + button.w; - button.y2 = button.y1 + button.h; - button.move("right", true); - - // // Re equip button - button.label = "Re-equip"; - var equip_possible = !array_contains(invalid_locations, selecting_location) && man_size > 0; - - button.alpha = equip_possible ? 1 : 0.5; - button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("E")); - button.tooltip = "Press Shift E"; - - if (button.draw() && equip_possible) { - equip_selection(); - } - - button.move("right"); - - // // Promote button - button.label = "Promote"; - - button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("P")); - button.tooltip = "Press Shift P"; - - var promote_possible = sel_promoting > 0 && !array_contains(invalid_locations, selecting_location) && man_size > 0; - button.alpha = promote_possible ? 1 : 0.5; - if (button.draw()) { - if (promote_possible) { - if ((sel_promoting == 1) && (instance_number(obj_popup) == 0)) { - var pip = instance_create(0, 0, obj_popup); - pip.type = 5; - pip.company = managing; - - var god = 0, nuuum = 0; - for (var f = 0; f < array_length(display_unit); f++) { - if ((ma_promote[f] >= 1 || is_specialist(ma_role[f], SPECIALISTS_RANK_AND_FILE) || is_specialist(ma_role[f], SPECIALISTS_SQUAD_LEADERS)) && man_sel[f] == 1) { - nuuum += 1; - if (pip.min_exp == 0) { - pip.min_exp = ma_exp[f]; - } - pip.min_exp = min(ma_exp[f], pip.min_exp); - } - if ((god == 0) && (ma_promote[f] >= 1) && (man_sel[f] == 1)) { - god = 1; - pip.unit_role = ma_role[f]; - } - } - if (nuuum > 1) { - pip.unit_role = "Marines"; - } - pip.units = nuuum; - } - } - } - button.move("right", true); - - // // Put in jail button - button.label = "Jail"; - button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("J")); - button.tooltip = "Press Shift J"; - - var jail_possible = man_size > 0; - button.alpha = jail_possible ? 1 : 0.5; - if (button.draw()) { - if (jail_possible) { - jail_selection(); - } - } - button.x1 += button.w + button.h_gap; - button.x2 += button.w + button.h_gap; - // // Add bionics button - button.label = "Add Bionics"; - button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("B")); - button.tooltip = "Press Shift B"; - var bionics_possible = man_size > 0; - button.alpha = bionics_possible ? 1 : 0.5; - if (button.draw()) { - if (bionics_possible) { - add_bionics_selection(); - } - } - - button.move("up", true); - - button.move("left", true, 4); - - // // Designate as boarder unit - button.label = "Set Boarder"; - button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("Q")); - button.tooltip = "Press Shift Q"; - var boarder_possible = sel_loading != -1 && man_size > 0; - button.alpha = boarder_possible ? 1 : 0.5; - if (button.draw() && boarder_possible) { - if (boarder_possible) { - toggle_selection_borders(); - } - } - button.move("right", true); - - // // Reset changes button - button.label = "Reset"; - button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("R")); - button.tooltip = "Press Shift R"; - var reset_possible = !array_contains(invalid_locations, selecting_location) && man_size > 0; - if (reset_possible) { - button.alpha = 1; - if (button.draw()) { - reset_selection_equipment(); - } - } else { - button.alpha = 0.5; - button.draw(false); - } - - button.move("right", true); - - // // Transfer to another company button - button.label = "Transfer"; - button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("T")); - button.tooltip = "Press Shift T"; - var transfer_possible = !array_contains(invalid_locations, selecting_location) && man_size > 0; - if (transfer_possible) { - button.alpha = 1; - if (button.draw()) { - transfer_selection(); - } - } else { - button.alpha = 0.5; - button.draw(false); - } - - button.move("right", true); - button.label = "Move Ship"; - button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("M")); - button.tooltip = "Press Shift M"; - var moveship_possible = !array_contains(invalid_locations, selecting_location) && man_size > 0 && selecting_ship > -1; - if (moveship_possible) { - button.alpha = 1; - if (button.draw()) { - load_selection(); - } - } else { - button.alpha = 0.5; - button.draw(false); - } - - button.move("right", true); - - button.label = "Add Tag"; - button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("F")); - button.tooltip = "Coming soon"; //Press Shift F"; - tag_possible = man_size > 0; - tag_possible = false; - button.alpha = 0.5; - if (tag_possible) { - button.alpha = 1; - if (button.draw()) { - load_selection(); - } - } else { - button.alpha = 0.5; - button.draw(false); - } - - if (sel_uni[1] != "") { - // How much space the selected unit takes - draw_set_font(fnt_40k_30b); - draw_text_transformed(actions_block.x1 + 26, actions_block.y1 + 6, $"Selection: {man_size} space", 0.5, 0.5, 0); - // List of selected units - draw_set_font(fnt_40k_14); - draw_text_ext(actions_block.x1 + 26, actions_block.y1 + 30, selecting_dudes, -1, 550); - // Options for the selected unit - // draw_set_font(fnt_40k_30b); - // draw_text_transformed(actions_block.x1 + 4, actions_block.x1 + 64,"Options:",0.5,0.5,0); - - // Select all units button - - button.move("up", true, 4.15); - - button.move("left", true, 4); - - button.label = "Select All"; - button.tooltip = ""; - button.keystroke = false; - button.alpha = 1; - if (button.draw()) { - cooldown = 8; - // scr_load_all(loading); //not sure whether loading was intentional or not - sel_all = "all"; - } - - button.move("right", true, 1); - button.label = "Filter Mode"; - button.alpha = filter_mode ? 1 : 0.5; - if (button.draw()) { - filter_mode = !filter_mode; - } - - button.move("left", true, 1); - // Select all infantry button - button.y1 += button.h + button.v_gap + 4; - button.h /= 1.4; - button.w = 128; - button.x2 = button.x1 + button.w; - button.y2 = button.y1 + button.h; - var inf_button_pos = [button.x1, button.y1, button.x2, button.y2]; - button.label = "All Infantry"; - button.alpha = 1; - button.font = fnt_40k_12; - draw_set_font(fnt_40k_12); - if (button.draw()) { - sel_all = "man"; - } - // Select infantry type buttons - for (var i = 1; i <= 8; i++) { - if (sel_uni[i] != "") { - button.move("right", true); - if (i == 4) { - button.move("left", true, 4); - button.move("down", true); - } - button.label = string_truncate(sel_uni[i], 126); - button.alpha = 1; - if (button.draw()) { - sel_all = sel_uni[i]; - } - } - } - } - - // Select all vehicles button - if (sel_veh[1] != "") { - button.x1 = inf_button_pos[0]; - button.x2 = inf_button_pos[2]; - button.y1 = inf_button_pos[1] + (button.h + button.v_gap) * 2 + 4; - button.y2 = button.y1 + button.h; - button.label = "All Vehicles"; - button.alpha = 1; - if (button.draw()) { - sel_all = "vehicle"; - } - // Select vehicle type buttons - for (var i = 1; i <= 8; i++) { - if (sel_veh[i] != "") { - button.move("right", true); - if (i == 4) { - button.move("left", true, 4); - button.move("down", true); - } - button.label = string_truncate(sel_veh[i], 126); - button.alpha = 1; - if (button.draw()) { - sel_all = sel_veh[i]; - } - } - } - } + var _draw_selec_buttons = !obj_controller.unit_profile && !stats_displayed; + if (_draw_selec_buttons && instance_exists(obj_popup)){ + _draw_selec_buttons = obj_popup.type != POPUP_TYPE.EQUIP; + } + if (_draw_selec_buttons) { + draw_manage_selection_buttons(xx, yy); } draw_set_color(#3f7e5d); scr_scrollbar(974, 172, 1005, 790, 34, man_max, man_current); } - if (is_struct(cn.temp[120])) { - if ((cn.temp[120].name() != "") && (cn.temp[120].race() != 0)) { + if (instance_exists(obj_controller) && is_struct(obj_controller.unit_focus)) { + var selected_unit = obj_controller.unit_focus; + if ((selected_unit.name() != "") && (selected_unit.race() != 0)) { draw_set_alpha(1); var xx = __view_get(e__VW.XView, 0) + 0, yy = __view_get(e__VW.YView, 0) + 0; if ((obj_controller.unit_profile) && !instance_exists(obj_popup)) { @@ -1233,21 +1174,15 @@ function scr_ui_manage() { if (managing > 10) { view_squad = false; unit_profile = false; - } else if (company_data != {}) { + } else if (company_data.has_squads) { + unit_profile = true; company_data.draw_squad_view(); } } } } } - var tip, coords; - for (var i = 0; i < array_length(tooltip_drawing); i++) { - tip = tooltip_drawing[i]; - coords = tip[1]; - if (scr_hit(coords)) { - tooltip_draw(tip[0], 350, , , , tip[2]); - } - } + setup_tooltip_list(company_data.tooltip_drawing); } else if (menu == 30 && (managing > 0 || managing == -1)) { // Load to ships @@ -1263,7 +1198,7 @@ function scr_ui_manage() { draw_sprite(spr_rock_bg, 0, xx, yy); draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); - draw_set_color(c_gray); // 38144 + draw_set_color(c_gray); // CM_GREEN_COLOR // Draw Title var c = 0, fx = ""; @@ -1317,7 +1252,7 @@ function scr_ui_manage() { if (point_and_click([xx + 25, yy + 70, xx + 70, yy + 140])) { man_size = 0; man_current = 0; - menu = 1; + menu = MENU.Manage;; } var top, temp1 = "", temp2 = "", temp3 = "", temp4 = "", temp5 = ""; @@ -1342,11 +1277,11 @@ function scr_ui_manage() { draw_rectangle(main_rect[0], main_rect[1], main_rect[2], main_rect[3], 0); draw_set_color(c_gray); draw_rectangle(xx + 25, yy + 64, xx + 974, yy + 85, 1); - draw_text_transformed(xx + 27, yy + 66, string_hash_to_newline(string(temp1)), 1, 1, 0); - draw_text_transformed(xx + 27.5, yy + 66.5, string_hash_to_newline(string(temp1)), 1, 1, 0); - draw_text_transformed(xx + 364, yy + 66, string_hash_to_newline(string(temp2)), 1, 1, 0); - draw_text_transformed(xx + 580, yy + 66, string_hash_to_newline(string(temp3)), 1, 1, 0); - draw_text_transformed(xx + 730, yy + 66, string_hash_to_newline(string(temp4)), 1, 1, 0); + draw_text_transformed(xx + 27, yy + 66, temp1, 1, 1, 0); + draw_text_transformed(xx + 27.5, yy + 66.5, temp1, 1, 1, 0); + draw_text_transformed(xx + 364, yy + 66, string(temp2), 1, 1, 0); + draw_text_transformed(xx + 580, yy + 66, string(temp3), 1, 1, 0); + draw_text_transformed(xx + 730, yy + 66, string(temp4), 1, 1, 0); if (point_and_click(main_rect)) { load_marines_into_ship(selecting_location, sel, display_unit); } @@ -1365,3 +1300,310 @@ function scr_ui_manage() { scr_scrollbar(974, 172, 1005, 790, 34, ship_max, ship_current); } } + + +function draw_manage_selection_buttons(xx,yy){ + var sel_loading = obj_controller.selecting_ship; + var _non_control_loc = location_out_of_player_control(selecting_location); + //draws hover over tooltips + function gen_tooltip(tooltip_array) { + for (var i = 0; i < array_length(tooltip_array); i++) { + var tooltip = tooltip_array[i]; + if (scr_hit(tooltip[1][0], tooltip[1][1], tooltip[1][2], tooltip[1][3])) { + tooltip_draw(tooltip[0]); + } + } + } + gen_tooltip(potential_tooltip); + gen_tooltip(promotion_tooltip); + gen_tooltip(health_tooltip); + + // Draw interaction and selection buttons + yy -= 8; + draw_set_font(fnt_40k_14b); + draw_set_color(#50a076); + var button = new UnitButtonObject(); + + button.h = 15; + button.x1 = right_ui_block.x1 + 1; + button.y1 = right_ui_block.y2 - 6 - 30; + button.x2 = button.x1 + 128; + button.y2 = button.y1 + button.h; + // Load/Unload to ship button + button.label = "Load"; + var load_unload_possible = man_size > 0; + + button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("L")); + button.tooltip = "Press Shift L"; + if (load_unload_possible) { + button.alpha = 1; + if (sel_loading == -1) { + if (button.draw()) { + load_selection(); + } + } else if (sel_loading != -1) { + button.label = "Unload"; + if (button.draw()) { + unload_selection(); // Unload - ask for planet confirmation + } + } + } else { + button.alpha = 0.5; + button.draw(false); + } + + button.move("down", true); + + button.label = "Reload"; + //button.keystroke = (keyboard_check(vk_shift) && (keyboard_check_pressed(ord("F")))); + if (instance_exists(obj_controller) && is_struct(obj_controller.unit_focus)) { + var selected_unit = obj_controller.unit_focus; + button.tooltip = $"{selected_unit.last_ship.name}"; //Press Shift F"; + } + reload_possible = man_size > 0 && sel_loading == -1; + if (reload_possible) { + button.alpha = 1; + if (button.draw()) { + scr_company_load(selecting_location); + load_marines_into_ship(selecting_location, sh_ide, display_unit, true); + } + } else { + button.alpha = 0.5; + button.draw(false); + } + + button.h = 30; + button.x1 = right_ui_block.x1 + 26; + button.y1 = right_ui_block.y2 - 6 - 30; + button.x2 = button.x1 + button.w; + button.y2 = button.y1 + button.h; + button.move("right", true); + + // // Re equip button + button.label = "Re-equip"; + var equip_possible = !_non_control_loc && man_size > 0; + + button.alpha = equip_possible ? 1 : 0.5; + button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("E")); + button.tooltip = "Press Shift E"; + + if (button.draw() && equip_possible) { + set_up_equip_popup(); + } + + button.move("right"); + + // // Promote button + button.label = "Promote"; + + button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("P")); + button.tooltip = "Press Shift P"; + + var promote_possible = sel_promoting > 0 && !_non_control_loc && man_size > 0; + button.alpha = promote_possible ? 1 : 0.5; + if (button.draw()) { + if (promote_possible) { + setup_promotion_popup(); + } + } + button.move("right", true); + + // // Put in jail button + button.label = "Jail"; + button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("J")); + button.tooltip = "Press Shift J"; + + var jail_possible = man_size > 0; + button.alpha = jail_possible ? 1 : 0.5; + if (button.draw()) { + if (jail_possible) { + jail_selection(); + } + } + button.x1 += button.w + button.h_gap; + button.x2 += button.w + button.h_gap; + // // Add bionics button + button.label = "Add Bionics"; + button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("B")); + button.tooltip = "Press Shift B"; + var bionics_possible = man_size > 0; + button.alpha = bionics_possible ? 1 : 0.5; + if (button.draw()) { + if (bionics_possible) { + add_bionics_selection(); + } + } + + button.move("up", true); + + button.move("left", true, 4); + + // // Designate as boarder unit + button.label = "Set Boarder"; + button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("Q")); + button.tooltip = "Press Shift Q"; + var boarder_possible = sel_loading != -1 && man_size > 0; + button.alpha = boarder_possible ? 1 : 0.5; + if (button.draw() && boarder_possible) { + if (boarder_possible) { + toggle_selection_borders(); + } + } + button.move("right", true); + + // // Reset changes button + button.label = "Reset"; + button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("R")); + button.tooltip = "Press Shift R"; + var reset_possible = !_non_control_loc && man_size > 0; + if (reset_possible) { + button.alpha = 1; + if (button.draw()) { + reset_selection_equipment(); + } + } else { + button.alpha = 0.5; + button.draw(false); + } + + button.move("right", true); + + // // Transfer to another company button + button.label = "Transfer"; + button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("T")); + button.tooltip = "Press Shift T"; + var transfer_possible = !_non_control_loc && man_size > 0; + if (transfer_possible) { + button.alpha = 1; + if (button.draw()) { + set_up_transfer_popup(); + } + } else { + button.alpha = 0.5; + button.draw(false); + } + + button.move("right", true); + button.label = "Move Ship"; + button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("M")); + button.tooltip = "Press Shift M"; + var moveship_possible = !_non_control_loc && man_size > 0 && selecting_ship > -1; + if (moveship_possible) { + button.alpha = 1; + if (button.draw()) { + load_selection(); + } + } else { + button.alpha = 0.5; + button.draw(false); + } + + button.move("right", true); + + button.label = "Manage Tags"; + button.keystroke = keyboard_check(vk_shift) && keyboard_check_pressed(ord("F")); + button.tooltip = "Press Shift F" //Press Shift F"; + button.alpha = 0.5; + + button.alpha = 1; + if (button.draw()) { + if (!instance_exists(obj_popup)){ + set_up_tag_manager(); + } else if (obj_popup.type == POPUP_TYPE.ADD_TAGS){ + instance_destroy(obj_popup); + } + } + + if (sel_uni[1] != "") { + // How much space the selected unit takes + draw_set_font(fnt_40k_30b); + draw_text_transformed(actions_block.x1 + 26, actions_block.y1 + 6, $"Selection: {man_size} space", 0.5, 0.5, 0); + // List of selected units + draw_set_font(fnt_40k_14); + draw_text_ext(actions_block.x1 + 26, actions_block.y1 + 30, selecting_dudes, -1, 550); + // Options for the selected unit + // draw_set_font(fnt_40k_30b); + // draw_text_transformed(actions_block.x1 + 4, actions_block.x1 + 64,"Options:",0.5,0.5,0); + + // Select all units button + + button.move("up", true, 4.15); + + button.move("left", true, 4); + + button.label = "Select All"; + button.tooltip = ""; + button.keystroke = false; + button.alpha = 1; + if (button.draw()) { + // scr_load_all(loading); //not sure whether loading was intentional or not + sel_all = "all"; + } + + button.move("right", true, 1); + button.label = "Filter Mode"; + button.alpha = filter_mode ? 1 : 0.5; + if (button.draw()) { + filter_mode = !filter_mode; + } + + button.move("left", true, 1); + // Select all infantry button + button.y1 += button.h + button.v_gap + 4; + button.h /= 1.4; + button.w = 128; + button.x2 = button.x1 + button.w; + button.y2 = button.y1 + button.h; + var inf_button_pos = [button.x1, button.y1, button.x2, button.y2]; + button.label = "All Infantry"; + button.alpha = 1; + button.font = fnt_40k_12; + draw_set_font(fnt_40k_12); + if (button.draw()) { + sel_all = "man"; + } + // Select infantry type buttons + for (var i = 1; i <= 8; i++) { + if (sel_uni[i] != "") { + button.move("right", true); + if (i == 4) { + button.move("left", true, 4); + button.move("down", true); + } + button.label = string_truncate(sel_uni[i], 126); + button.alpha = 1; + if (button.draw()) { + sel_all = sel_uni[i]; + } + } + } + } + + // Select all vehicles button + if (sel_veh[1] != "") { + button.x1 = inf_button_pos[0]; + button.x2 = inf_button_pos[2]; + button.y1 = inf_button_pos[1] + (button.h + button.v_gap) * 2 + 4; + button.y2 = button.y1 + button.h; + button.label = "All Vehicles"; + button.alpha = 1; + if (button.draw()) { + sel_all = "vehicle"; + } + // Select vehicle type buttons + for (var i = 1; i <= 8; i++) { + if (sel_veh[i] != "") { + button.move("right", true); + if (i == 4) { + button.move("left", true, 4); + button.move("down", true); + } + button.label = string_truncate(sel_veh[i], 126); + button.alpha = 1; + if (button.draw()) { + sel_all = sel_veh[i]; + } + } + } + } +} diff --git a/scripts/scr_ui_popup/scr_ui_popup.gml b/scripts/scr_ui_popup/scr_ui_popup.gml index d1dcecbae3..e83fda09b2 100644 --- a/scripts/scr_ui_popup/scr_ui_popup.gml +++ b/scripts/scr_ui_popup/scr_ui_popup.gml @@ -2,8 +2,8 @@ function scr_ui_popup() { // 48,48 over like 256, down to 480-128 if (obj_controller.menu=60){ - var xx,yy; - xx=__view_get( e__VW.XView, 0 )+25;yy=__view_get( e__VW.YView, 0 )+165; + var xx=__view_get( e__VW.XView, 0 )+25; + var yy=__view_get( e__VW.YView, 0 )+165; draw_sprite(spr_popup_large,1,xx,yy); // draw_set_color(0);draw_rectangle(xx+31,yy+29,xx+593,yy+402,0); @@ -13,7 +13,12 @@ function scr_ui_popup() { draw_set_font(fnt_40k_30b); draw_set_halign(fa_center); var planet_upgrades = obj_temp_build.target.p_upgrades[obj_controller.selecting_planet]; - var un_upgraded = 0,arsenal = 0, gene_vault=0,s_base=0,ttitle="",i=0; + var un_upgraded = 0; + var arsenal = 0; + var gene_vault=0; + var s_base=0; + var ttitle=""; + var woob=""; if (planet_feature_bool(planet_upgrades, P_features.Secret_Base)==1){s_base=1} if (planet_feature_bool(planet_upgrades, P_features.Arsenal)==1){arsenal=1} @@ -24,7 +29,7 @@ function scr_ui_popup() { draw_text_transformed(xx + 312, yy + 10, string_hash_to_newline(title), 0.7, 0.7, 0); draw_set_font(fnt_40k_14b); - draw_text(xx + 312, yy + 45, string_hash_to_newline("Select a Secret Lair style.")); + draw_text(xx + 312, yy + 45, "Select a Secret Lair style."); draw_set_halign(fa_left); var styles = [ @@ -91,8 +96,9 @@ function scr_ui_popup() { if (s_base>0){ var search_list =search_planet_features(planet_upgrades, P_features.Secret_Base); if (array_length(search_list) > 0){ - var woob="",secret=true; - var s_base = planet_upgrades[search_list[0]]; + woob=""; + var secret=true; + s_base = planet_upgrades[search_list[0]]; if (s_base.built>obj_controller.turn){ draw_set_font(fnt_40k_14b); draw_text(xx+21,yy+65,string_hash_to_newline($"This feature will be constructed in {s_base.built-obj_controller.turn} months.")); @@ -103,18 +109,20 @@ function scr_ui_popup() { for (r=1;r<13;r++){ alp=1; cost=0; - if (r==1){if (s_base.forge>0) then alp=0.33;cost=1000;butt="Forge";tooltip2="A modest, less elaborate forge able to employ a handful of Astartes or Techpriest.";} - else if (r==2){if (s_base.hippo>0) then alp=0.33;cost=1000;butt="Hippodrome";tooltip2="A moderate sized garage fit to hold, service, and display vehicles.";} - else if (r==3){if (s_base.beastarium>0) then alp=0.33;cost=1000;butt="Beastarium";tooltip2="An enclosure with simulated greenery and foilage meant to hold beasts.";} - else if (r==4){if (s_base.torture>0) then alp=0.33;cost=500;butt="Torture Chamber";tooltip2="Only the best for the best. A room full of torture tools and devices.";} - else if (r==5){if (s_base.narcotics>0) then alp=0.33;cost=500;butt="Narcotics";tooltip2="Several boxes worth of Obscura, Black Lethe, Kyxa... line it up.";} - else if (r==6){if (s_base.relic>0) then alp=10+fuck.relic;cost=500;butt="Relic Room";tooltip2="A room meant for displaying trophies. May be purchased successive times.";} - else if (r==7){if (s_base.cookery>0) then alp=0.33;cost=250;butt="Cookery";tooltip2="A larger, well-stocked cookery, complete with a number of Imperial Chef servants.";} - else if (r==8){if (s_base.vox>0) then alp=0.33;cost=250;butt="Vox Casters";tooltip2="All the bass one could ever imaginably need.";} - else if (r==9){if (s_base.librarium>0) then alp=0.33;cost=250;butt="Librarium";tooltip2="A study fit to hold a staggering amount of tomes and scrolls.";} - else if (r==10){if (s_base.throne>0) then alp=0.33;cost=250;butt="Throne";tooltip2="A massive, ego boosting throne.";} - else if (r==11){if (s_base.stasis>0) then alp=0.33;cost=200;butt="Stasis Pods";tooltip2="Though they start empty, you may capture and display your foes in these.";} - else if (r==12){if (s_base.swimming>0) then alp=0.33;cost=100;butt="Swimming Pool";tooltip2="A large body of water meant for excersize or relaxation.";} + switch(r){ + case 1: if (s_base.forge>0) then alp=0.33;cost=1000;butt="Forge";tooltip2="A modest, less elaborate forge able to employ a handful of Astartes or Techpriest."; break; + case 2: if (s_base.hippo>0) then alp=0.33;cost=1000;butt="Hippodrome";tooltip2="A moderate sized garage fit to hold, service, and display vehicles."; break; + case 3: if (s_base.beastarium>0) then alp=0.33;cost=1000;butt="Beastarium";tooltip2="An enclosure with simulated greenery and foilage meant to hold beasts."; break; + case 4: if (s_base.torture>0) then alp=0.33;cost=500;butt="Torture Chamber";tooltip2="Only the best for the best. A room full of torture tools and devices."; break; + case 5: if (s_base.narcotics>0) then alp=0.33;cost=500;butt="Narcotics";tooltip2="Several boxes worth of Obscura, Black Lethe, Kyxa... line it up."; break; + case 6: if (s_base.relic>0) then alp=10+fuck.relic;cost=500;butt="Relic Room";tooltip2="A room meant for displaying trophies. May be purchased successive times."; break; + case 7: if (s_base.cookery>0) then alp=0.33;cost=250;butt="Cookery";tooltip2="A larger, well-stocked cookery, complete with a number of Imperial Chef servants."; break; + case 8: if (s_base.vox>0) then alp=0.33;cost=250;butt="Vox Casters";tooltip2="All the bass one could ever imaginably need."; break; + case 9: if (s_base.librarium>0) then alp=0.33;cost=250;butt="Librarium";tooltip2="A study fit to hold a staggering amount of tomes and scrolls."; break; + case 10: if (s_base.throne>0) then alp=0.33;cost=250;butt="Throne";tooltip2="A massive, ego boosting throne."; break; + case 11: if (s_base.stasis>0) then alp=0.33;cost=200;butt="Stasis Pods";tooltip2="Though they start empty, you may capture and display your foes in these."; break; + case 12: if (s_base.swimming>0) then alp=0.33;cost=100;butt="Swimming Pool";tooltip2="A large body of water meant for excersize or relaxation."; break; + } tooltip=butt; draw_set_font(fnt_40k_14);draw_set_alpha(alp);draw_set_color(c_gray); @@ -133,21 +141,23 @@ function scr_ui_popup() { tcost=cost; if (scr_click_left()) and (obj_controller.requisition>=tcost) and (alp!=0.33){ obj_controller.requisition-=tcost; - if (r=1){ - s_base.forge=1; - s_base.forge_data = new PlayerForge(); - } - else if (r==2){s_base.hippo=1;} - else if (r==3){s_base.beastarium=1} - else if (r==4){s_base.torture=1} - else if (r==5){s_base.narcotics=1} - else if (r==6){s_base.relic=1} - else if (r==7){s_base.cookery=1} - else if (r==8){s_base.vox=1} - else if (r==9){s_base.librarium=1} - else if (r==10){s_base.throne=1} - else if (r==11){s_base.stasis=1} - else if (r==12){s_base.swimming=1}; + switch(r){ + case 1: + s_base.forge=1; + s_base.forge_data = new PlayerForge(); + break; + case 2: s_base.hippo=1; break; + case 3: s_base.beastarium=1; break; + case 4: s_base.torture=1; break; + case 5: s_base.narcotics=1; break; + case 6: s_base.relic=1; break; + case 7: s_base.cookery=1; break; + case 8: s_base.vox=1; break; + case 9: s_base.librarium=1; break; + case 10: s_base.throne=1; break; + case 11: s_base.stasis=1; break; + case 12: s_base.swimming=1; break; + } } } } @@ -201,31 +211,35 @@ function scr_ui_popup() { if (fuck.target.p_player[obj_controller.selecting_planet]>0) then woob+="Imperial Chefs are currently bustling to and from the kitchen, cooking savory treats and food for those present. "; if (fuck.target.p_player[obj_controller.selecting_planet]=0) then woob+="The Imperial Chefs are mostly idle, making use of the other rooms and facilities. "; } - - if (s_base.stock==1) {woob+=" One of the chambers is hollowed out to display war trophies and gear. ";} - else if (s_base.stock==2){woob+=" One of the chambers holds war trophies from recent conquests. ";} - else if (s_base.stock==3){woob+=" War trophies taken from several Xeno races are displayed in the Relic Room. ";} - else if (s_base.stock==4){woob+=" Your Relic Room contains trophies and skulls, taken from every Xeno race. ";} - else if (s_base.stock==5){woob+=" Your Relic Room contains trophies, skulls, and suits of armour taken from Xenos races. ";} - else if (s_base.stock==6) {woob+=" Your Relic Room contains wargear and suits of armour from all races, several Adeptus Astartes suits included. ";} - else if (s_base.stock==7) {woob+=" One of the chambers holds wargear and suits of armour from all races. A suit of Terminator armour is included, half of the armour taken off to reveal the inner workings.";} - else if (s_base.stock==8) {woob+=" Your Relic Room's trophies, skulls, and armours now spill out into the hallways, such is their number. ";} - else if (s_base.stock==9) { woob+=" Many of the xenos war trophies and suits of armour are placed around the Lair, filling out spare surfaces. ";} - else if (s_base.stock==10) { woob+=" In addition to the many war trophies your Relic Room also has small amounts of gold coins. ";} - else if (s_base.stock==11) { woob+=" In addition to the many war trophies your Relic Room also has small piles of gold coins and clutter. ";} - else if (s_base.stock==12) { woob+=" In addition to the many war trophies your Relic Room also has sizeable piles of gold. ";} - else if (s_base.stock==13) {woob+=" In addition to the many war trophies your Relic Room also has chests and cabinets full of gold. ";} - else if (s_base.stock==14) {woob+=" In addition to the many war trophies your Relic Room also has chests full to the brim of gold and many precious gems. ";} - else if (s_base.stock==15) { woob+=" War trophies, chests of gold, precious gems, your lair has it all. ";} - else if (s_base.stock==16) {woob+=" War trophies, chests of gold, precious gems, your lair has it all, and in abundance. ";} - else if (s_base.stock==17) {woob+=" The abundant gold and gem piles have begun to spill out into the hallway. ";} - else if (s_base.stock==18) { woob+=" The abundant gold and gems spill out into the hallway, your forces idly stepping across it. ";} - else if (s_base.stock==19) { woob+=" A sizeable portion of your lair is carelessly covered in gold coins, objects, and gems. ";} - else if (s_base.stock==20) {woob+=" Much of your lair is carelessly covered in gold coins, objects, and gems. ";} - else if (s_base.stock>=21) and (s_base.stock<25) {woob+=" Your abundant wealth is evident in your lair- every surface and much of the floor smothered by gold or gems. ";} - else if (s_base.stock>=25) and (s_base.stock<30) {woob+=" Gold and gems are everywhere, occasionally attached to the walls and ceiling where able. ";} - else if (s_base.stock>=30) {woob+=" Gold and gems are EVERYWHERE. The main chamber in particular is a sea of gold and gems, especially deep at the corners. In all it is nearly three feet deep. Coins clink and settle as your forces walk through the room. ";} - + switch(s_base.stock){ + case 1: woob+=" One of the chambers is hollowed out to display war trophies and gear. "; break; + case 2: woob+=" One of the chambers holds war trophies from recent conquests. "; break; + case 3: woob+=" War trophies taken from several Xeno races are displayed in the Relic Room. "; break; + case 4: woob+=" Your Relic Room contains trophies and skulls, taken from every Xeno race. "; break; + case 5: woob+=" Your Relic Room contains trophies, skulls, and suits of armour taken from Xenos races. "; break; + case 6: woob+=" Your Relic Room contains wargear and suits of armour from all races, several Adeptus Astartes suits included. "; break; + case 7: woob+=" One of the chambers holds wargear and suits of armour from all races. A suit of Terminator armour is included, half of the armour taken off to reveal the inner workings."; break; + case 8: woob+=" Your Relic Room's trophies, skulls, and armours now spill out into the hallways, such is their number. "; break; + case 9: woob+=" Many of the xenos war trophies and suits of armour are placed around the Lair, filling out spare surfaces. "; break; + case 10: woob+=" In addition to the many war trophies your Relic Room also has small amounts of gold coins. "; break; + case 11: woob+=" In addition to the many war trophies your Relic Room also has small piles of gold coins and clutter. "; break; + case 12: woob+=" In addition to the many war trophies your Relic Room also has sizeable piles of gold. "; break; + case 13: woob+=" In addition to the many war trophies your Relic Room also has chests and cabinets full of gold. "; break; + case 14: woob+=" In addition to the many war trophies your Relic Room also has chests full to the brim of gold and many precious gems. "; break; + case 15: woob+=" War trophies, chests of gold, precious gems, your lair has it all. "; break; + case 16: woob+=" War trophies, chests of gold, precious gems, your lair has it all, and in abundance. "; break; + case 17: woob+=" The abundant gold and gem piles have begun to spill out into the hallway. "; break; + case 18: woob+=" The abundant gold and gems spill out into the hallway, your forces idly stepping across it. "; break; + case 19: woob+=" A sizeable portion of your lair is carelessly covered in gold coins, objects, and gems. "; break; + case 20: woob+=" Much of your lair is carelessly covered in gold coins, objects, and gems. "; break; + case 21: case 22: case 23: case 24: woob+=" Your abundant wealth is evident in your lair- every surface and much of the floor smothered by gold or gems. "; break; + case 25: case 26: case 27: case 28: case 29: woob+=" Gold and gems are everywhere, occasionally attached to the walls and ceiling where able. "; break; + default: + if (s_base.stock >= 30) { + woob+=" Gold and gems are EVERYWHERE. The main chamber in particular is a sea of gold and gems, especially deep at the corners. In all it is nearly three feet deep. Coins clink and settle as your forces walk through the room. "; + } + break; + } if (s_base.forge>0) then woob+=" Your lair has a forge, fit to be used by several astartes at once. "; if (s_base.hippo>0) then woob+=" Your lair has a hippodrome, or garage, that holds luxury vehicles. "; if (s_base.torture>0) then woob+=" One of the rooms is a well-stocked torture chamber. "; @@ -275,8 +289,8 @@ function scr_ui_popup() { } if (planet_feature_bool(planet_upgrades, P_features.Gene_Vault)==1){ var gene_vault = planet_upgrades[search_planet_features(planet_upgrades, P_features.Gene_Vault)[0]]; - if (gene_vault.inquis_hidden == 1) then woob="A large facility with Gene-Vaults and additional spare rooms, this structure safely stores the majority of your Gene-Seed and is ran by servitors. Due to its secret nature you may amass Gene-Seed and Test-Slave Incubators without fear of Inquisition reprisal or taking offense."; - if (gene_vault.inquis_hidden == 0) then woob="A large facility with Gene-Vaults and additional spare rooms, this structure safely stores the majority of your Gene-Seed and is ran by servitors. Since being discovered all the contents are known to the Inquisition. Your Gene-Seed remains protected but you may wish to build a new, secret one."; + if (gene_vault.inquis_hidden == 1) then woob="A large facility with Gene-Vaults and additional spare rooms, this structure safely stores the majority of your Gene-Seed and is ran by servitors. Due to its secret nature you may amass Gene-Seed and Test-Slave Incubators without fear of Inquisition reprisal or taking offense."; + if (gene_vault.inquis_hidden == 0) then woob="A large facility with Gene-Vaults and additional spare rooms, this structure safely stores the majority of your Gene-Seed and is ran by servitors. Since being discovered all the contents are known to the Inquisition. Your Gene-Seed remains protected but you may wish to build a new, secret one."; } if (arsenal!=0) or (gene_vault!=0){ draw_text_ext(xx+21,yy+65,string_hash_to_newline(string(woob)),-1,595); @@ -338,11 +352,8 @@ function scr_ui_popup() { obj_controller.requisition-=4000; } }draw_set_halign(fa_left); - } - - draw_set_font(fnt_40k_30b); draw_set_color(c_gray); draw_rectangle(xx+312-60,yy+388,xx+312+60,yy+420,0); @@ -360,14 +371,8 @@ function scr_ui_popup() { }draw_set_halign(fa_left); } - - - - - if (selected!=0) and (!instance_exists(selected)) then selected=0; - var xx=__view_get( e__VW.XView, 0 )+0; var yy=__view_get( e__VW.YView, 0 )+0; if (zoomed == 0){ @@ -512,34 +517,6 @@ function scr_ui_popup() { tooltip_draw(tool1) } } - } exit; - - - if (mouse_x>=__view_get( e__VW.XView, 0 )+113) and (mouse_y>=__view_get( e__VW.YView, 0 )+4) and (mouse_x<__view_get( e__VW.XView, 0 )+185) and (mouse_y<__view_get( e__VW.YView, 0 )+19) and (zoomed=0){ - var blurp,blurp2,lines,i;blurp="";blurp2="";lines=0;i=0;draw_set_halign(fa_left); - - repeat(20){ - i++;if (loyal_num[i]>1){ - blurp+=string(loyal[i])+": -"+string(loyal_num[i])+"#"; - blurp2+=string(loyal[i])+": #"; - lines++; - } - } - - if (lines>0){ - var wi=183+93; - if (string_count("Irreverance",blurp)>0) then wi+=51; - - draw_set_color(c_black); - draw_rectangle(__view_get( e__VW.XView, 0 )+113,__view_get( e__VW.YView, 0 )+24,__view_get( e__VW.XView, 0 )+wi,__view_get( e__VW.YView, 0 )+30+(lines*10),0); - draw_set_color(38144); - draw_rectangle(__view_get( e__VW.XView, 0 )+113,__view_get( e__VW.YView, 0 )+24,__view_get( e__VW.XView, 0 )+wi,__view_get( e__VW.YView, 0 )+30+(lines*10),1); - - draw_set_font(fnt_info); - draw_text_transformed(__view_get( e__VW.XView, 0 )+24+93,__view_get( e__VW.YView, 0 )+26,string_hash_to_newline(string(blurp)),0.7,0.7,0); - draw_text_transformed(__view_get( e__VW.XView, 0 )+24.5+93,__view_get( e__VW.YView, 0 )+26,string_hash_to_newline(string(blurp2)),0.7,0.7,0); - } - } } diff --git a/scripts/scr_ui_refresh/scr_ui_refresh.gml b/scripts/scr_ui_refresh/scr_ui_refresh.gml index e1338acf45..27dd87feed 100644 --- a/scripts/scr_ui_refresh/scr_ui_refresh.gml +++ b/scripts/scr_ui_refresh/scr_ui_refresh.gml @@ -1,10 +1,7 @@ // Refreshes the UI, reinitializes variables to defaults function scr_ui_refresh() { - man_size = 0; - selecting_location = ""; - selecting_types = ""; - selecting_ship = -1; + reset_manage_selections(); sel_uid = 0; reset_manage_arrays(); @@ -13,4 +10,11 @@ function scr_ui_refresh() { sel_loading = -1; unload = 0; alarm[6] = 7; -} \ No newline at end of file +} +function reset_manage_selections(){ + selecting_location = ""; + selecting_types = ""; + selecting_planet = 0; + selecting_ship = -1; + man_size = 0; +}; \ No newline at end of file diff --git a/scripts/scr_ui_settings/scr_ui_settings.gml b/scripts/scr_ui_settings/scr_ui_settings.gml index 7011a6ee8c..3fd0672d85 100644 --- a/scripts/scr_ui_settings/scr_ui_settings.gml +++ b/scripts/scr_ui_settings/scr_ui_settings.gml @@ -1,966 +1,1065 @@ +/// @mixin function scr_ui_settings() { + var romanNumerals = scr_roman_numerals(); + // Var declaration + var xx, yy; + var tool1 = "", tool2 = ""; + var che = false; + var cx, cy; + var x5 = 0, y5 = 0, x6 = 0; + var too_img = 0; + xx = __view_get(e__VW.XView, 0) + 0; + yy = __view_get(e__VW.YView, 0) + 0; - var romanNumerals=scr_roman_numerals(); - // Var declaration - var xx,yy; - var tool1="",tool2=""; - var che,cx,cy; - var x5=0,y5=0,x6=0; - var too_img=0; - xx=__view_get( e__VW.XView, 0 )+0; - yy=__view_get( e__VW.YView, 0 )+0; - - if (menu>=21) and (menu<=24) then draw_sprite(spr_settings_bg,0,xx,yy); - - if (menu=24) and (formating>0){ - // Reset vars - tool1=""; - tool2=""; - - // Back arrow - draw_sprite_ext(spr_arrow,0,xx+25,yy+70,2,2,0,c_white,1); - - if (scr_hit(xx+25,yy+70,xx+25+64,yy+70+64)=true) and (scr_click_left()){ - with(obj_formation_bar){instance_destroy();} - - menu=21; - if (bat_formation[formating]="") then bat_formation_type[formating]=0; - exit; - } - - draw_set_halign(fa_center); - draw_set_color(c_gray); - draw_set_font(fnt_40k_30b); - - draw_set_alpha(1); - draw_sprite(spr_formation_arrow,0,xx+550,yy+385); - - var bar_wid=0; - draw_set_alpha(0.25); - if (bat_formation[formating]!="") then bar_wid=max(400,string_width(bat_formation[formating])); - if (bat_formation[formating]="") then bar_wid=400; - - if (formating>3) then draw_rectangle(xx+800-(bar_wid/2),yy+66,xx+800+(bar_wid/2),yy+66+string_height("LOL"),1); - obj_cursor.image_index=0; - - if (formating>3) and (obj_cursor.dragging=0){ - if (scr_hit(xx+800-(bar_wid/2),yy+66,xx+800+(bar_wid/2),yy+66+string_height("LOL"))=false) and (scr_click_left()) then text_bar=0; - if (scr_hit(xx+800-(bar_wid/2),yy+66,xx+800+(bar_wid/2),yy+66+string_height("LOL"))=true){ - obj_cursor.image_index=2; - if (scr_click_left()) and (text_bar=0){ - text_bar=1;keyboard_string=bat_formation[formating]; - } - - } - } - draw_set_alpha(1); - if (bat_formation[formating]!="") or (text_bar>0){ - if (formating>3){ - if (text_bar=0) or (text_bar>31) then draw_text(xx+800,yy+66,"''"+string(bat_formation[formating])+"'' "); - if (text_bar>0) and (text_bar<=31) then draw_text(xx+800,yy+66,"''"+string(bat_formation[formating])+"|''"); - } - if (formating<=3) then draw_text(xx+800,yy+66,string(bat_formation[formating])); - } - - draw_set_font(fnt_40k_14);draw_set_halign(fa_left); - - if (bat_formation_type[formating]!=1) then che=1; - if (bat_formation_type[formating]=1) then che=2; - cx=xx+757; - cy=yy+115; - - // Defines the attack command - draw_text(cx,cy,"Attack"); - cx-=35; - cy-=4; - - if (formating<=3) then draw_set_alpha(0.5); - draw_sprite(spr_creation_check,che+1,cx,cy); - draw_set_alpha(1); - // Attack command tool tips - if (scr_hit(cx+31,cy,cx+260,cy+20)=true){ - tool1="Attack"; - tool2="Allows the use of vehicles, and bikes, but prevents this formation from being used during Raids."; + if ((menu >= 21) && (menu <= 24)) { + draw_sprite(spr_settings_bg, 0, xx, yy); + } + + if ((menu == 24) && (formating > 0)) { + // Reset vars + tool1 = ""; + tool2 = ""; + + // Back arrow + draw_sprite_ext(spr_arrow, 0, xx + 25, yy + 70, 2, 2, 0, c_white, 1); + + if ((scr_hit(xx + 25, yy + 70, xx + 25 + 64, yy + 70 + 64) == true) && scr_click_left()) { + with (obj_formation_bar) { + instance_destroy(); + } + + menu = 21; + if (bat_formation[formating] == "") { + bat_formation_type[formating] = 0; + } + exit; + } + + draw_set_halign(fa_center); + draw_set_color(c_gray); + draw_set_font(fnt_40k_30b); + + draw_set_alpha(1); + draw_sprite(spr_formation_arrow, 0, xx + 550, yy + 385); + + var bar_wid = 0; + draw_set_alpha(0.25); + if (bat_formation[formating] != "") { + bar_wid = max(400, string_width(bat_formation[formating])); + } + if (bat_formation[formating] == "") { + bar_wid = 400; + } + + if (formating > 3) { + draw_rectangle(xx + 800 - (bar_wid / 2), yy + 66, xx + 800 + (bar_wid / 2), yy + 66 + string_height("LOL"), 1); + } + obj_cursor.image_index = 0; + + if ((formating > 3) && (obj_cursor.dragging == 0)) { + if (scr_hit([xx + 800 - (bar_wid / 2), yy + 66, xx + 800 + (bar_wid / 2), yy + 66 + string_height("LOL")])) { + obj_cursor.image_index = 2; + if (scr_click_left() && (text_bar == 0)) { + text_bar = 1; + keyboard_string = bat_formation[formating]; + } + } else { + text_bar = 0; + } + } + + draw_set_alpha(1); + if ((bat_formation[formating] != "") || (text_bar > 0)) { + if (formating > 3) { + if ((text_bar == 0) || (text_bar > 31)) { + draw_text(xx + 800, yy + 66, "''" + string(bat_formation[formating]) + "'' "); + } + if ((text_bar > 0) && (text_bar <= 31)) { + draw_text(xx + 800, yy + 66, "''" + string(bat_formation[formating]) + "|''"); + } + } + if (formating <= 3) { + draw_text(xx + 800, yy + 66, string(bat_formation[formating])); + } + } + + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + + if (bat_formation_type[formating] == 1) { + che = true; + } else { + che = false; } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()) and (formating>3){ - var onceh=0; - - if (onceh=0) and ((bat_formation_type[formating]=0) or (bat_formation_type[formating]=2)){ - onceh=1;bat_formation_type[formating]=1; + + cx = xx + 757; + cy = yy + 120; + + // Defines the attack command + var _formation_name = "Attack Formation"; + draw_text(cx, cy, _formation_name); + + cx -= 35; + cy -= 4; + if (formating <= 3) { + draw_set_alpha(0.5); + } + draw_sprite(spr_creation_check, 2 + che, cx, cy); + draw_set_alpha(1); + + // Attack command tool tips + if (scr_hit(cx, cy, cx + string_width(_formation_name), cy + sprite_get_height(spr_creation_check))) { + tool1 = _formation_name; + tool2 = "Can't be used in Raids. Can use any vehicles."; + if (scr_click_left() && formating > 3 && bat_formation_type[formating] != 1) { + bat_formation_type[formating] = 1; scr_ui_formation_bars(); } - } - if (bat_formation_type[formating]!=2) then che=1; - if (bat_formation_type[formating]=2) then che=2; - - // Defines the Raid action - cx=xx+757; - cy=yy+150; - draw_text(cx,cy,"Raid"); - - cx-=35; - cy-=4; - if (formating<=3) then draw_set_alpha(0.5); - draw_sprite(spr_creation_check,che+1,cx,cy); - draw_set_alpha(1); - // Raid action tooltip - if (scr_hit(cx+31,cy,cx+260,cy+20)=true){ - tool1="Raid"; - tool2="Prevents the use of vehicles, and bikes, but allows this formation to be used for Raids."; + } + + if (bat_formation_type[formating] == 2) { + che = true; + } else { + che = false; } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()) and (formating>3){ - var onceh; - onceh=0; - - if (onceh=0) and ((bat_formation_type[formating]=0) or (bat_formation_type[formating]=1)){ - onceh=1; - bat_formation_type[formating]=2; + + // Defines the Raid action + cx = xx + 757; + cy = yy + 155; + _formation_name = "Raid Formation"; + draw_text(cx, cy, _formation_name); + + cx -= 35; + cy -= 4; + if (formating <= 3) { + draw_set_alpha(0.5); + } + draw_sprite(spr_creation_check, 2 + che, cx, cy); + draw_set_alpha(1); + + // Raid action tooltip + if (scr_hit(cx, cy, cx + string_width(_formation_name), cy + sprite_get_height(spr_creation_check))) { + tool1 = _formation_name; + tool2 = "Can only be used in Raids. Prevents the use of all vehicles aside from Dreadnoughts and Land Speeders. Starts in melee."; + if (scr_click_left() && formating > 3 && bat_formation_type[formating] != 2) { + bat_formation_type[formating] = 2; scr_ui_formation_bars(); } - } - - draw_set_color(c_gray); - draw_set_alpha(0.25); - - x5=xx+49; - y5=yy+224; - - for(var i=0; i<10; i++){ - draw_rectangle(x5,y5,x5+38,y5+464,0); - x5+=50; - } - draw_set_alpha(1); - - // Attack Box - if (bat_formation_type[formating]=1){ - draw_rectangle(xx+35,yy+211,xx+1206,yy+703,1); - draw_rectangle(xx+36,yy+212,xx+1205,yy+702,1); - x6=xx+1054; - } - // Raid Box - if (bat_formation_type[formating]=2){ - draw_rectangle(xx+35,yy+211,xx+841,yy+703,1); - draw_rectangle(xx+36,yy+212,xx+840,yy+702,1); - x6=xx+684; - } - - draw_set_alpha(0.25); - // Draw Enemy boxes - draw_set_color(c_red); - y5=yy+224; - for(var i=0; i<3; i++){ - draw_rectangle(x6,y5,x6+38,y5+464,0); - x6+=50; - } - - // Draw Secondary info box - draw_set_alpha(1); - draw_set_color(c_gray); - draw_rectangle(xx+1221,yy+211,xx+1561,yy+703,1); - draw_rectangle(xx+1220,yy+212,xx+1560,yy+702,1); - draw_set_alpha(1); - - draw_set_halign(fa_center); - draw_set_font(fnt_40k_30b); - - // This is where the cursor is changed- needs to be smart and also pass the instance type - tooltip=""; - tooltip_other=""; - - if (collision_point(mouse_x,mouse_y,obj_formation_bar,1,1)) and (obj_cursor.image_index=0) then obj_cursor.image_index=3; - if (!collision_point(mouse_x,mouse_y,obj_formation_bar,1,1)) and (obj_cursor.image_index=3) then obj_cursor.image_index=0; - - if (obj_cursor.image_index=3){ - var theh=instance_position(mouse_x,mouse_y,obj_formation_bar); - if (instance_exists(theh)){ - if (theh.unit_id=1){ - tooltip="Headquarters"; - tooltip2="You and your advisors will be placed within this section. It is strongly advisable you give them backup in this same column."; - } - if (theh.unit_id=2){ - tooltip="Honour Guard"; - tooltip2="Any Honour Guard within your Headquarters will be placed here. The best place for them within the formation depends on loadout."; - } - if (theh.unit_id=3){ - tooltip="Librarians"; - tooltip2="Epistolary, Lexicanum, and Codiciery make up this section. They tend to deal decent damage and offer useful buffs for other units."; - } - if (theh.unit_id=4){ - tooltip="Techmarines"; - tooltip2="Techmarines and their servitors are placed within this block. It is advisable that they are placed near your vehicles and armour."; - } - if (theh.unit_id=5){ - tooltip="Terminators"; - tooltip2="Any Terminators that you may have will be placed here. They can very easily soak lots of damage and dish it back in return."; - } - if (theh.unit_id=6){ - tooltip="Veterans"; - tooltip2="Veterans, the most experienced tacticals of your Chapter, are placed here. Their best position in the formation depends on loadout."; - } - if (theh.unit_id=7){ - tooltip="Tacticals"; - tooltip2="The greater bulk of your Chapter, the tactical marines, go here. Tactical marines may be situated nearly anywhere. Note that Apothecaries and Chaplains without jump-packs will also be placed here."; - } - if (theh.unit_id=8){ - tooltip="Devastators"; - tooltip2="Devastators offer much long ranged firepower. As a result they are best placed in the rear of your formation."; - } - if (theh.unit_id=9){ - tooltip="Assaults"; - tooltip2="Assault marines are damage powerhouses, but tend to be squisher. You may or may not wish for them to be on the front lines. Note that Apothecaries and Chaplains with jump-packs will be placed here."; - } - if (theh.unit_id=10){ - tooltip="Scouts"; - tooltip2="Scouts are not-yet full fledged Astartes. Striking a balance between exposure to the enemy, for experience, and safety is key."; - } - if (theh.unit_id=11){ - tooltip="Dreadnoughts"; - tooltip2="Dreadnoughts are the most durable and tough marines within your chapter. They are best suited for the front lines."; - } - if (theh.unit_id=12){ - tooltip="Hirelings"; - tooltip2="Any and all units that you recieve from other factions are placed within this block."; - } - if (theh.unit_id=13){ - tooltip="Rhinos"; - tooltip2="Rhinos offer protection for units behind them but are not well armoured and lacking in firepower."; - } - if (theh.unit_id=14){ - tooltip="Predators"; - tooltip2="Predators offer protection for units behind them and have a decent amount of long ranged firepower."; - } - if (theh.unit_id=15){ - tooltip="Land Raiders"; - tooltip2="Land Raiders are incredibly tanky war machines that protect rear columns and offer tremendous amounts of firepower. Other super-heavy vehicles will also be placed here."; - } - if (theh.unit_id=16){ - tooltip="Land Speeders"; - tooltip2="Land Speeders are incredibly agile attack vehicles that offer a light highly mobile heavy weapon platform."; - } - if (theh.unit_id=17){ - tooltip="Whirlwinds"; - tooltip2="Whirlwinds are armoured fire-support capable of supporting assaults from a long range safe from enemy retaliation."; - } - too_img=theh.unit_id-1; - } - } - - if (tooltip!=""){ - draw_set_font(fnt_40k_30b); - draw_text_transformed(xx+1398,yy+213,string(tooltip),0.75,0.75,0); - draw_set_font(fnt_40k_14);draw_set_halign(fa_left); - draw_text_ext(xx+1227,yy+565,string(tooltip2),-1,323); - - // draw_sprite(spr_formation_splash,too_img,xx+1271,yy+252); - scr_image("formation",too_img,xx+1271,yy+252,239,297); - } - - - /* - if (tool1!=""){ - draw_set_alpha(1); - draw_set_font(fnt_40k_14);draw_set_halign(fa_left);draw_set_color(0); - draw_rectangle(mouse_x+18,mouse_y+20,mouse_x+string_width_ext(tool2,-1,500)+24,mouse_y+44+string_height_ext(tool2,-1,500),0); - draw_set_color(c_gray); - draw_rectangle(mouse_x+18,mouse_y+20,mouse_x+string_width_ext(tool2,-1,500)+24,mouse_y+44+string_height_ext(tool2,-1,500),1); - draw_set_font(fnt_40k_14b);draw_text(mouse_x+22,mouse_y+22,string(tool1)); - draw_set_font(fnt_40k_14);draw_text_ext(mouse_x+22,mouse_y+42,string(tool2),-1,500); - }*/ - } - - if (menu=23){ - if (settings>0){ - var co=100; - var ide; - ide=settings; - - draw_sprite_ext(spr_arrow,0,xx+25,yy+70,2,2,0,c_white,1);// Back - if (scr_hit(xx+25,yy+70,xx+25+64,yy+70+64)=true) and (scr_click_left()){ - - with(obj_mass_equip){instance_destroy();} - menu=21;exit; - } - - draw_set_halign(fa_center); - draw_set_color(c_gray); - draw_set_font(fnt_40k_30b); - draw_text_transformed(xx+800,yy+66,string(obj_ini.role[100,settings])+" Settings",1,1,0); - - // New: 678,160 - // Old: 444,550 - // Dif: 234,-390 - - draw_set_font(fnt_40k_30b); - draw_set_color(c_gray); + } + + draw_set_color(c_gray); + draw_set_alpha(0.25); + + x5 = xx + 49; + y5 = yy + 224; + + for (var i = 0; i < 10; i++) { + draw_rectangle(x5, y5, x5 + 38, y5 + 464, 0); + x5 += 50; + } + draw_set_alpha(1); + + // Attack Box + if (bat_formation_type[formating] == 1) { + draw_rectangle(xx + 35, yy + 211, xx + 1206, yy + 703, 1); + draw_rectangle(xx + 36, yy + 212, xx + 1205, yy + 702, 1); + x6 = xx + 1054; + } + // Raid Box + if (bat_formation_type[formating] == 2) { + draw_rectangle(xx + 35, yy + 211, xx + 841, yy + 703, 1); + draw_rectangle(xx + 36, yy + 212, xx + 840, yy + 702, 1); + x6 = xx + 684; + } + + draw_set_alpha(0.25); + // Draw Enemy boxes + draw_set_color(c_red); + y5 = yy + 224; + for (var i = 0; i < 3; i++) { + draw_rectangle(x6, y5, x6 + 38, y5 + 464, 0); + x6 += 50; + } + + // Draw Secondary info box + draw_set_alpha(1); + draw_set_color(c_gray); + draw_rectangle(xx + 1221, yy + 211, xx + 1561, yy + 703, 1); + draw_rectangle(xx + 1220, yy + 212, xx + 1560, yy + 702, 1); + draw_set_alpha(1); + + draw_set_halign(fa_center); + draw_set_font(fnt_40k_30b); + + // This is where the cursor is changed- needs to be smart and also pass the instance type + tooltip = ""; + tooltip_other = ""; + + if (collision_point(mouse_x, mouse_y, obj_formation_bar, 1, 1) && (obj_cursor.image_index == 0)) { + obj_cursor.image_index = 3; + } + if ((!collision_point(mouse_x, mouse_y, obj_formation_bar, 1, 1)) && (obj_cursor.image_index == 3)) { + obj_cursor.image_index = 0; + } + + if (obj_cursor.image_index == 3) { + var theh = instance_position(mouse_x, mouse_y, obj_formation_bar); + if (instance_exists(theh)) { + if (theh.unit_id == 1) { + tooltip = "Headquarters"; + tooltip2 = "You and your advisors will be placed within this section. It is strongly advisable you give them backup in this same column."; + } + if (theh.unit_id == 2) { + tooltip = "Honour Guard"; + tooltip2 = "Any Honour Guard within your Headquarters will be placed here. The best place for them within the formation depends on loadout."; + } + if (theh.unit_id == 3) { + tooltip = "Librarians"; + tooltip2 = "Epistolary, Lexicanum, and Codiciery make up this section. They tend to deal decent damage and offer useful buffs for other units."; + } + if (theh.unit_id == 4) { + tooltip = "Techmarines"; + tooltip2 = "Techmarines and their servitors are placed within this block. It is advisable that they are placed near your vehicles and armour."; + } + if (theh.unit_id == 5) { + tooltip = "Terminators"; + tooltip2 = "Any Terminators that you may have will be placed here. They can very easily soak lots of damage and dish it back in return."; + } + if (theh.unit_id == 6) { + tooltip = "Veterans"; + tooltip2 = "Veterans, the most experienced tacticals of your Chapter, are placed here. Their best position in the formation depends on loadout."; + } + if (theh.unit_id == 7) { + tooltip = "Tacticals"; + tooltip2 = "The greater bulk of your Chapter, the tactical marines, go here. Tactical marines may be situated nearly anywhere. Note that Apothecaries and Chaplains without jump-packs will also be placed here."; + } + if (theh.unit_id == 8) { + tooltip = "Devastators"; + tooltip2 = "Devastators offer much long ranged firepower. As a result they are best placed in the rear of your formation."; + } + if (theh.unit_id == 9) { + tooltip = "Assaults"; + tooltip2 = "Assault marines are damage powerhouses, but tend to be squisher. You may or may not wish for them to be on the front lines. Note that Apothecaries and Chaplains with jump-packs will be placed here."; + } + if (theh.unit_id == 10) { + tooltip = "Scouts"; + tooltip2 = "Scouts are not-yet full fledged Astartes. Striking a balance between exposure to the enemy, for experience, and safety is key."; + } + if (theh.unit_id == 11) { + tooltip = "Dreadnoughts"; + tooltip2 = "Dreadnoughts are the most durable and tough marines within your chapter. They are best suited for the front lines."; + } + if (theh.unit_id == 12) { + tooltip = "Hirelings"; + tooltip2 = "Any and all units that you recieve from other factions are placed within this block."; + } + if (theh.unit_id == 13) { + tooltip = "Rhinos"; + tooltip2 = "Rhinos offer protection for units behind them but are not well armoured and lacking in firepower."; + } + if (theh.unit_id == 14) { + tooltip = "Predators"; + tooltip2 = "Predators offer protection for units behind them and have a decent amount of long ranged firepower."; + } + if (theh.unit_id == 15) { + tooltip = "Land Raiders"; + tooltip2 = "Land Raiders are incredibly tanky war machines that protect rear columns and offer tremendous amounts of firepower. Other super-heavy vehicles will also be placed here."; + } + if (theh.unit_id == 16) { + tooltip = "Land Speeders"; + tooltip2 = "Land Speeders are incredibly agile attack vehicles that offer a light highly mobile heavy weapon platform."; + } + if (theh.unit_id == 17) { + tooltip = "Whirlwinds"; + tooltip2 = "Whirlwinds are armoured fire-support capable of supporting assaults from a long range safe from enemy retaliation."; + } + too_img = theh.unit_id - 1; + } + } + + if (tooltip != "") { + draw_set_font(fnt_40k_30b); + draw_text_transformed(xx + 1398, yy + 213, string(tooltip), 0.75, 0.75, 0); + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + draw_text_ext(xx + 1227, yy + 565, string(tooltip2), -1, 323); + + // draw_sprite(spr_formation_splash,too_img,xx+1271,yy+252); + scr_image("formation", too_img, xx + 1271, yy + 252, 239, 297); + } + + if (tool1 != "") { + draw_set_alpha(1); + draw_set_font(fnt_40k_14); draw_set_halign(fa_left); - draw_text_transformed(xx+678,yy+160,obj_ini.role[co,ide],0.6,0.6,0); - var wid,hei; - wid=0; - hei=string_height_ext(string(obj_ini.role[co,ide])+"Q",-1,580)*0.6; - draw_rectangle(xx+678-1,yy+160-1,xx+1056,yy+160+hei,1); - draw_set_color(c_gray); + draw_set_color(0); + draw_rectangle(mouse_x + 18, mouse_y + 20, mouse_x + string_width_ext(tool2, -1, 500) + 24, mouse_y + 44 + string_height_ext(tool2, -1, 500), 0); + draw_set_color(c_gray); + draw_rectangle(mouse_x + 18, mouse_y + 20, mouse_x + string_width_ext(tool2, -1, 500) + 24, mouse_y + 44 + string_height_ext(tool2, -1, 500), 1); draw_set_font(fnt_40k_14b); - draw_set_halign(fa_right); - + draw_text(mouse_x + 22, mouse_y + 22, string(tool1)); + draw_set_font(fnt_40k_14); + draw_text_ext(mouse_x + 22, mouse_y + 42, string(tool2), -1, 500); + } + } + + if (menu == 23) { + if (settings > 0) { + var co = 100; + var ide; + ide = settings; + + draw_sprite_ext(spr_arrow, 0, xx + 25, yy + 70, 2, 2, 0, c_white, 1); // Back + if ((scr_hit(xx + 25, yy + 70, xx + 25 + 64, yy + 70 + 64) == true) && scr_click_left()) { + with (obj_mass_equip) { + instance_destroy(); + } + menu = 21; + exit; + } + + draw_set_halign(fa_center); + draw_set_color(c_gray); + draw_set_font(fnt_40k_30b); + draw_text_transformed(xx + 800, yy + 66, string(obj_ini.role[100, settings]) + " Settings", 1, 1, 0); + + // New: 678,160 + // Old: 444,550 + // Dif: 234,-390 + + draw_set_font(fnt_40k_30b); + draw_set_color(c_gray); + draw_set_halign(fa_left); + draw_text_transformed(xx + 678, yy + 160, obj_ini.role[co, ide], 0.6, 0.6, 0); + var wid, hei; + wid = 0; + hei = string_height_ext(string(obj_ini.role[co, ide]) + "Q", -1, 580) * 0.6; + draw_rectangle(xx + 678 - 1, yy + 160 - 1, xx + 1056, yy + 160 + hei, 1); + draw_set_color(c_gray); + draw_set_font(fnt_40k_14b); + draw_set_halign(fa_right); + var title = ""; var geh = ""; - spacing=22; - x5=xx+830; - y5=yy+207-spacing; - - for (var gg=1; gg<=5; gg++){ - y5+=spacing; - if (gg=1){ - title="Main Weapon: "; - geh=obj_ini.wep1[co,ide]; - } - if (gg=2){ - title="Secondary Weapon: "; - geh=obj_ini.wep2[co,ide]; - } - if (gg=3){ - title="Armour: "; - geh=obj_ini.armour[co,ide]; - } - if (gg=4){ - title="Special Item: "; - geh=obj_ini.gear[co,ide]; - } - if (gg=5){ - title="Mobility Item: "; - geh=obj_ini.mobi[co,ide]; - } - - draw_set_halign(fa_right); - draw_set_color(c_gray); - draw_rectangle(x5,y5,x5-string_width(title),y5+string_height(title)-2,0); - draw_set_color(0);draw_text(x5,y5,string(title)); - - if (scr_hit(x5-string_width(title),y5,x5,y5+string_height(title)-2)=true){ - draw_set_color(c_white); - draw_set_alpha(0.2); - draw_rectangle(x5,y5,x5-string_width(title),y5+string_height(title)-2,0); - - var nep=false; - - if ((obj_ini.armour[co,ide]="Terminator Armour") or (obj_ini.armour[co,ide]="Dreadnought")) and (gg=4) then nep=true; - if (ide=6) and ((gg=3) or (gg=5)) then nep=true; - + spacing = 22; + x5 = xx + 830; + y5 = yy + 207 - spacing; + + for (var gg = 0; gg <= 4; gg++) { + y5 += spacing; + if (gg == 0) { + title = "Main Weapon: "; + geh = obj_ini.wep1[co, ide]; + } + if (gg == 1) { + title = "Secondary Weapon: "; + geh = obj_ini.wep2[co, ide]; + } + if (gg == 2) { + title = "Armour: "; + geh = obj_ini.armour[co, ide]; + } + if (gg == 3) { + title = "Special Item: "; + geh = obj_ini.gear[co, ide]; + } + if (gg == 4) { + title = "Mobility Item: "; + geh = obj_ini.mobi[co, ide]; + } + + draw_set_halign(fa_right); + draw_set_color(c_gray); + draw_rectangle(x5, y5, x5 - string_width(title), y5 + string_height(title) - 2, 0); + draw_set_color(0); + draw_text(x5, y5, string(title)); + + if (scr_hit(x5 - string_width(title), y5, x5, y5 + string_height(title) - 2) == true) { + draw_set_color(c_white); + draw_set_alpha(0.2); + draw_rectangle(x5, y5, x5 - string_width(title), y5 + string_height(title) - 2, 0); + + var nep = false; + + if (((obj_ini.armour[co, ide] == "Terminator Armour") || (obj_ini.armour[co, ide] == "Dreadnought")) && (gg == 3)) { + nep = true; + } + if ((ide == 6) && ((gg == 2) || (gg == 4))) { + nep = true; + } + if (scr_click_left() && !nep) { - - if (obj_mass_equip.tab != 0) { + if (obj_mass_equip.tab != -1) { obj_mass_equip.refresh = true; - } else if (obj_mass_equip.tab == 0) { + } else if (obj_mass_equip.tab == -1) { obj_mass_equip.tab = gg; obj_mass_equip.item_name = []; - var is_hand_slot = (gg == 1 || gg == 2); + var is_hand_slot = gg == 0 || gg == 1; scr_get_item_names( obj_mass_equip.item_name, obj_controller.settings, // eROLE gg, // slot - is_hand_slot ? ( - obj_mass_equip.tab == 1 ? eENGAGEMENT.Ranged : eENGAGEMENT.Melee - ) : eENGAGEMENT.None, + is_hand_slot ? (obj_mass_equip.tab == 0 ? eENGAGEMENT.Ranged : eENGAGEMENT.Melee) : eENGAGEMENT.None, true, // include company standard false, // show all regardless of inventory + ); } } - } - draw_set_alpha(1); - draw_set_color(c_gray); - draw_set_halign(fa_left); - draw_text(x5+5,y5,string(geh)); - } - } - } - - - if (menu=21){ - // Reset vars - tool1=""; - tool2=""; - draw_set_halign(fa_center); - draw_set_color(c_gray); - draw_set_font(fnt_40k_30b); - draw_text_transformed(xx+800,yy+66,string(global.chapter_name)+" Chapter Settings",1,1,0); - draw_text_transformed(xx+800,yy+110,"(Codex Compliant)",0.6,0.6,0); - draw_set_font(fnt_40k_14); - draw_set_halign(fa_left); - - yy-=64; - - - cx = xx + 31; - cy = yy + 203; - che = progenitor_visuals; - draw_sprite(spr_creation_check, che + 2, cx, cy); - - var _option_name = "Progenitor Livery"; - draw_text(cx + 35, cy, _option_name); - - if (scr_hit(cx, cy, cx + string_width(_option_name) + 35, cy + sprite_get_height(spr_creation_check))) { - tool1 = _option_name; - tool2 = "Turned off by default. \nWhen turned on, various unit visuals may change depending on your progenitor chapter."; - if ((scr_click_left())) { - progenitor_visuals = !progenitor_visuals; - - } - } + } + draw_set_alpha(1); + draw_set_color(c_gray); + draw_set_halign(fa_left); + draw_text(x5 + 5, y5, string(geh)); + } + } + } - - draw_text(xx+66,yy+238,"Allow Astartes Transfer"); - che=command_set[1]; - cx=xx+31; - cy=yy+234; - - draw_sprite(spr_creation_check,che+2,cx,cy); - if (scr_hit(cx+31,cy,cx+260,cy+20)=true){ - tool1="Allow Astartes Transfer"; - tool2="Turned off by default. Allows you to transfer Astartes in the same way as vehicles."; - } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh; - onceh=0; - if (onceh=0) and (command_set[1]=0){ - onceh=1; - command_set[1]=1; - } - if (onceh=0) and (command_set[1]=1){ - onceh=1; - command_set[1]=0; - } - } - - draw_text(xx+66,yy+273,"Codex Compliant Organization"); - che=command_set[2]; - cx=xx+31; - cy=yy+269; - - draw_sprite(spr_creation_check,che+2,cx,cy); - if (scr_hit(cx+31,cy,cx+300,cy+20)=true){ - tool1="Codex Compliant Organization"; - tool2="When enabled, marine promotions are limited based on their current company and EXP, overall following the Codex Astartes promotion sequence." + "\n\n" + "When disabled, you can promote marines to any company, from any company, disregarding any EXP requirements." + "\n" + "Terminators, Dreadnoughts and Company Command roles retain EXP requirements however."; - } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[2]=1){ - onceh=1; - command_set[2]=0; - } - if (onceh=0) and (command_set[2]=0){ - onceh=1; - command_set[2]=1; - } - } - - draw_text(xx+66,yy+308,"Modest Livery"); - che=modest_livery; - cx=xx+31; - cy=yy+304; - - draw_sprite(spr_creation_check,che+2,cx,cy); - if (scr_hit(cx+31,cy,cx+300,cy+20)=true){ - tool1="Modest Livery"; - tool2="Turned off by default. Prevents Advantages and Disadvantages from changing the appearances of your marines, effectively disabling any special ornamentation or possible battle wear."; - } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (modest_livery=0){ - onceh=1; - modest_livery=1; - } - if (onceh=0) and (modest_livery=1){ - onceh=1; - modest_livery=0; - } - } + if (menu == 21) { + // Reset vars + tool1 = ""; + tool2 = ""; + draw_set_halign(fa_center); + draw_set_color(c_gray); + draw_set_font(fnt_40k_30b); + draw_text_transformed(xx + 800, yy + 66, string(global.chapter_name) + " Chapter Settings", 1, 1, 0); + draw_text_transformed(xx + 800, yy + 110, "(Codex Compliant)", 0.6, 0.6, 0); + draw_set_font(fnt_40k_14); + draw_set_halign(fa_left); + + yy -= 64; + + cx = xx + 31; + cy = yy + 203; + che = progenitor_visuals; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + var _option_name = "Progenitor Livery"; + draw_text(cx + 35, cy, _option_name); + + if (scr_hit(cx, cy, cx + string_width(_option_name) + 35, cy + sprite_get_height(spr_creation_check))) { + tool1 = _option_name; + tool2 = "Turned off by default. \nWhen turned on, various unit visuals may change depending on your progenitor chapter."; + if (scr_click_left()) { + progenitor_visuals = !progenitor_visuals; + } + } + + draw_text(xx + 66, yy + 238, "Allow Astartes Transfer"); + che = command_set[1]; + cx = xx + 31; + cy = yy + 234; + + draw_sprite(spr_creation_check, che + 2, cx, cy); + if (scr_hit(cx + 31, cy, cx + 260, cy + 20) == true) { + tool1 = "Allow Astartes Transfer"; + tool2 = "Turned off by default. Allows you to transfer Astartes in the same way as vehicles."; + } + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh; + onceh = 0; + if ((onceh == 0) && (command_set[1] == 0)) { + onceh = 1; + command_set[1] = 1; + } + if ((onceh == 0) && (command_set[1] == 1)) { + onceh = 1; + command_set[1] = 0; + } + } + + draw_text(xx + 66, yy + 273, "Codex Compliant Organization"); + che = command_set[2]; + cx = xx + 31; + cy = yy + 269; + + draw_sprite(spr_creation_check, che + 2, cx, cy); + if (scr_hit(cx + 31, cy, cx + 300, cy + 20) == true) { + tool1 = "Codex Compliant Organization"; + tool2 = "When enabled, marine promotions are limited based on their current company and EXP, overall following the Codex Astartes promotion sequence." + "\n\n" + "When disabled, you can promote marines to any company, from any company, disregarding any EXP requirements." + "\n" + "Terminators, Dreadnoughts and Company Command roles retain EXP requirements however."; + } + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; - draw_text(xx+66,yy+343,"Tagged Training"); - che=tagged_training; - cx=xx+31; - cy=yy+339; + if ((onceh == 0) && (command_set[2] == 1)) { + onceh = 1; + command_set[2] = 0; + } + if ((onceh == 0) && (command_set[2] == 0)) { + onceh = 1; + command_set[2] = 1; + } + } + + draw_text(xx + 66, yy + 308, "Modest Livery"); + che = modest_livery; + cx = xx + 31; + cy = yy + 304; - draw_sprite(spr_creation_check,che+2,cx,cy); - if (scr_hit(cx+31,cy,cx+300,cy+20)=true) { - tool1="Tagged training"; - tool2="Turned off by default, makes specialist training select only tagged marines, click on their potential indicators to tag."; + draw_sprite(spr_creation_check, che + 2, cx, cy); + if (scr_hit(cx + 31, cy, cx + 300, cy + 20) == true) { + tool1 = "Modest Livery"; + tool2 = "Turned off by default. Prevents Advantages and Disadvantages from changing the appearances of your marines, effectively disabling any special ornamentation or possible battle wear."; } - if (point_and_click([cx,cy,cx+32,cy+32])) { + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (modest_livery == 0)) { + onceh = 1; + modest_livery = 1; + } + if ((onceh == 0) && (modest_livery == 1)) { + onceh = 1; + modest_livery = 0; + } + } + + draw_text(xx + 66, yy + 343, "Tagged Training"); + che = tagged_training; + cx = xx + 31; + cy = yy + 339; + + draw_sprite(spr_creation_check, che + 2, cx, cy); + if (scr_hit(cx + 31, cy, cx + 300, cy + 20) == true) { + tool1 = "Tagged training"; + tool2 = "Turned off by default, makes specialist training select only tagged marines, click on their potential indicators to tag."; + } + if (point_and_click([cx, cy, cx + 32, cy + 32])) { tagged_training = !tagged_training; } - - yy+=35; - - draw_text(xx+28,yy+332,"Company Command Structure"); - - if (scr_hit(xx+28,yy+332,xx+316,yy+352)=true){ - tool1="Comany Command Structure"; - tool2="The default members of your Company Command."; - } - - draw_text(xx+66,yy+359,"Captain"); - draw_text(xx+66,yy+386,"Standard Bearer"); - draw_text(xx+66,yy+413,"Champion"); - draw_text(xx+66,yy+440,"Chaplain"); - draw_text(xx+66,yy+467,"Apothecary"); - draw_text(xx+66,yy+494,"Librarian"); - draw_text(xx+66,yy+521,"Techmarine"); - - che=command_set[3]; - cx=xx+31; - cy=yy+355; - - draw_sprite(spr_creation_check,che+2,cx,cy); - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[3]=0){ - onceh=1; - command_set[3]=1; - } - if (onceh=0) and (command_set[3]=1){ - onceh=1; - command_set[3]=0; - } - } - - che=command_set[4]; - cx=xx+31; - cy=yy+382; - draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[4]=0){ - onceh=1; - command_set[4]=1; - } - if (onceh=0) and (command_set[4]=1){ - onceh=1; - command_set[4]=0; - } - } - - che=command_set[5]; - cx=xx+31; - cy=yy+409; - draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[5]=0){ - onceh=1; - command_set[5]=1; - } - if (onceh=0) and (command_set[5]=1){ - onceh=1; - command_set[5]=0; - } - } - - che=command_set[6]; - cx=xx+31; - cy=yy+436; - draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[6]=0){ - onceh=1; - command_set[6]=1; - } - if (onceh=0) and (command_set[6]=1){ - onceh=1; - command_set[6]=0; - } - } - - che=command_set[7]; - cx=xx+31; - cy=yy+463; - draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[7]=0){ - onceh=1; - command_set[7]=1; - } - if (onceh=0) and (command_set[7]=1){ - onceh=1; - command_set[7]=0; - } - } - - che=command_set[8]; - cx=xx+31; - cy=yy+490; - draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[8]=0){ - onceh=1; - command_set[8]=1; - } - if (onceh=0) and (command_set[8]=1){ - onceh=1; - command_set[8]=0; - } - } - - che=command_set[9]; - cx=xx+31; - cy=yy+517; - draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[9]=0){ - onceh=1; - command_set[9]=1; - } - if (onceh=0) and (command_set[9]=1){ - onceh=1; - command_set[9]=0; - } - } - - yy-=35; - - draw_text(xx+28,yy+611,"Boarding Objective"); - if (scr_hit(xx+28,yy+611,xx+316,yy+611+20)=true){ - tool1="Boarding Objective"; - tool2="The objective of your Astartes once they board an enemy ship."; - } - - draw_text(xx+66,yy+611+27,"Damage Systems"); - draw_text(xx+86,yy+611+54,"Use Plasma Bombs"); - draw_text(xx+66,yy+611+81,"Commandeer Ship"); - - che=command_set[20]; - cx=xx+31; - cy=yy+611+23;draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx+31,cy,cx+260,cy+20)=true){ - tool1="Damage Systems"; - tool2="Your Astartes will attempt to disable the ship by attacking the ship bridge and systems."; - } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[20]=0){ - onceh=1; - command_set[20]=1; - command_set[22]=0; - } - } - - che=command_set[21]; - cx=xx+51; - cy=yy+611+50; - draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx+31,cy,cx+260,cy+20)=true){ - tool1="Use Plasma Bombs"; - tool2="Your Astartes will use equipped Plasma Bombs to massively damage the boarded ship."; - } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[21]=0) and (command_set[22]=0){ - onceh=1; - command_set[21]=1; - } - if (onceh=0) and (command_set[21]=1){ - onceh=1; - command_set[21]=0; - } - } - - draw_set_alpha(0.5); - che=command_set[22]; - cx=xx+31; - cy=yy+611+77; - draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx+31,cy,cx+260,cy+20)=true){ - tool1="Commandeer Ship"; - tool2="Your Astartes will attempt to commandeer the vessel, to be permenantely used or salvaged."; - } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[22]=0){ - onceh=1; - command_set[22]=1; - command_set[20]=0; - command_set[21]=0; - } - } - draw_set_alpha(1); - - // 59 lower - - if (command_set[22]=1) then draw_set_alpha(0.5); - draw_text(xx+28,yy+747,"Post-Boarding"); - if (scr_hit(xx+28,yy+747,xx+316-150,yy+767)=true){ - tool1="Post-Boarding"; - tool2="What your Boarders will do after achieving their objective. This is disabled if your objective is to Commandeer the enemy ships."; - } - - draw_text(xx+66,yy+747+27,"Board Next Nearest"); - draw_text(xx+86,yy+747+54,"Return and Recuperate"); - - che=command_set[23]; - if (command_set[22]=1) then che=0; - cx=xx+31; - cy=yy+747+23; - draw_sprite(spr_creation_check,che+2,cx,cy); - if (scr_hit(cx+31,cy,cx+260-70,cy+20)=true){ - tool1="Board Next Nearest"; - tool2="After disabling an enemy vessel your Astartes will launch a new boarding mission at the nearest enemy."; - } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[23]=0) and (command_set[22]=0){ - onceh=1; - command_set[23]=1; - command_set[24]=0; - } - } - - che=command_set[24]; - if (command_set[22]=1) then che=0; - cx=xx+51; - cy=yy+747+50; - draw_sprite(spr_creation_check,che+2,cx,cy); - if (scr_hit(cx+31,cy,cx+260-70,cy+20)=true){ - tool1="Return and Recuperate"; - tool2="After disabling an enemy vessel your Astartes will return to their mother vessel and heal."; - } - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[24]=0) and (command_set[22]=0){ - onceh=1; - command_set[24]=1;command_set[23]=0; - } - } - draw_set_alpha(1); - - - xx+=260; - draw_text(xx+28,yy+747,"Automatic Boarding"); - if (scr_hit(xx+28,yy+747,xx+316,yy+767)=true){ - tool1="Automatic Boarding"; - tool2="If checked your ships will launch Boarding teams automatically when an eligible target is in range."; - } - - draw_text(xx+66,yy+747+27,"Battleships"); - draw_text(xx+86,yy+747+54,"Cruisers"); - - che=command_set[25]; - cx=xx+31; - cy=yy+747+23; - - draw_sprite(spr_creation_check,che+2,cx,cy); - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - - if (onceh=0) and (command_set[25]=0){ - onceh=1; - command_set[25]=1; - } - if (onceh=0) and (command_set[25]=1){ - onceh=1; - command_set[25]=0; - } - } - - che=command_set[26]; - cx=xx+51; - cy=yy+747+50; - draw_sprite(spr_creation_check,che+2,cx,cy); - - if (scr_hit(cx,cy,cx+32,cy+32)=true) and (scr_click_left()){ - var onceh=0; - if (onceh=0) and (command_set[26]=0){ - onceh=1; - command_set[26]=1; - } - if (onceh=0) and (command_set[26]=1){ - onceh=1; - command_set[26]=0; - } - } - xx-=260; - yy+=64; - - draw_text(xx+937-341,yy+207,"Battle Formations"); - draw_text(xx+937,yy+207,"Company Settings"); - draw_text(xx+1278,yy+207,"Astartes Role Settings"); - - // Role Settings - var ide,xxx,yyy; - ide=0; - xxx=xx+1277;yyy=yy+250-31; - - for (var derpaderp=1; derpaderp<=14; derpaderp++){ - if (derpaderp=1) then ide=15; - if (derpaderp=2) then ide=14; - if (derpaderp=3) then ide=17; - if (derpaderp=4) then ide=16; - if (derpaderp=5) then ide=5; - if (derpaderp=6) then ide=7; - if (derpaderp=7) then ide=2; - if (derpaderp=8) then ide=4; - if (derpaderp=9) then ide=3; - if (derpaderp=10) then ide=6; - if (derpaderp=11) then ide=8; - if (derpaderp=12) then ide=9; - if (derpaderp=13) then ide=10; - if (derpaderp=14) then ide=12; - - draw_set_alpha(1); - if (obj_ini.race[100,ide]!=0){// Creates mass_equip here - // if (custom<2) then draw_set_alpha(0.5); - yyy+=31; - draw_set_color(c_gray); - draw_rectangle(xxx,yyy,xxx+289,yyy+20,0); - draw_set_color(0); - draw_text(xxx,yyy,obj_ini.role[100,ide]); - if (scr_hit(xxx,yyy,xxx+289,yyy+20)=true){/*if (custom=2) then draw_set_alpha(0.2);if (custom<2) then */ - draw_set_alpha(0.1); - draw_set_color(c_white); - draw_rectangle(xxx,yyy,xxx+289,yyy+20,0); - draw_set_alpha(1); - tool1=string(obj_ini.role[100,ide])+" Settings"; - tool2="Click to open the settings for this unit."; - if (scr_click_left()){ - settings=ide; - menu=23; - with(obj_mass_equip){instance_destroy();} - instance_create(0,0,obj_mass_equip); - } - } - } - } - - xxx=xx+936; - yyy=yy+250-31; - - for (var ides=0; ides<=10; ides++){ - draw_set_alpha(1); - // if (custom<2) then draw_set_alpha(0.5); - yyy+=31;draw_set_color(c_gray);draw_rectangle(xxx,yyy,xxx+289,yyy+20,0); - draw_set_color(0); - - var shw=""; - if (ides=0) then shw="Headquarters"; - if (ides>0) then shw=romanNumerals[ides - 1] + " Company"; - draw_text(xxx,yyy,string(shw)); - - if (scr_hit(xxx,yyy,xxx+289,yyy+20)=true){/*if (custom=2) then draw_set_alpha(0.2);if (custom<2) then */ - draw_set_alpha(0.1); - draw_set_color(c_white); - draw_rectangle(xxx,yyy,xxx+289,yyy+20,0); - draw_set_alpha(1); - tool1=string(shw)+" Settings"; - tool2="Click to open the settings for this company."; - // if (mouse_left>=1) and (cooldown<=0){settings=ides;menu=22;} - } - } - - xxx=xx+936-341; - yyy=yy+250-31; - - for(var i=1; i<=11;i++){ - draw_set_alpha(1); - // if (custom<2) then draw_set_alpha(0.5); - yyy+=31;draw_set_color(c_gray); - - if (bat_formation[i]!="") then draw_rectangle(xxx,yyy,xxx+289,yyy+20,0); - if (i>2){if (bat_formation[i]="") and (bat_formation[i-1]!="") then draw_rectangle(xxx,yyy,xxx+289,yyy+20,0);} - - draw_set_color(0); - - var shw="",isnew=false; - shw=string(bat_formation[i]); - - if (i>3){ - if (bat_formation_type[i]=1) then shw="A] "+string(shw); - if (bat_formation_type[i]=2) then shw="R] "+string(shw); - } - if (i>2){ - if (shw="") and (bat_formation[i-1]!=""){ - isnew=true;shw="(New Formation)"; - } - } - - if (shw!="") or (isnew=true){ - draw_text(xxx,yyy,string(shw)); - if (scr_hit(xxx,yyy,xxx+289,yyy+20)=true){/*if (custom=2) then draw_set_alpha(0.2);if (custom<2) then */ - draw_set_alpha(0.1); - draw_set_color(c_white); - draw_rectangle(xxx,yyy,xxx+289,yyy+20,0); - draw_set_alpha(1); - - if (i<=3) then tool1=string(shw)+" Settings";tool2="Click to open the settings for this formation."; - if (i>3){ - if (bat_formation[i]!=""){ - tool1=string(bat_formation[i])+" Settings"; - tool2="Click to open the settings for this formation."; - } - if (bat_formation[i]=""){ - tool1="New Custom Formation"; - tool2="Click to open and create a new Battle Formation for Ground combat or Raiding."; - } - } - - if (scr_click_left()){ - formating=i; - menu=24; - - scr_ui_formation_bars(); - if (bat_formation[formating]=""){ - bat_formation[formating]="Custom"+string(formating-3); - bat_formation_type[formating]=1; - bat_deva_for[formating]=1; - bat_assa_for[formating]=4; - bat_tact_for[formating]=2; - bat_vete_for[formating]=2; - bat_hire_for[formating]=3; - bat_libr_for[formating]=3; - bat_comm_for[formating]=3; - bat_tech_for[formating]=3; - bat_term_for[formating]=3; - bat_hono_for[formating]=3; - bat_drea_for[formating]=5; - bat_rhin_for[formating]=6; - bat_pred_for[formating]=7; - bat_landraid_for[formating] = 7; - bat_landspee_for[formating] = 4; - bat_whirl_for[formating] = 1; - bat_scou_for[formating]=1; - } - } - } - } - } - - if (tool1!=""){ - tooltip_draw(tool2,,,,,tool1); - } - } + + yy += 35; + + draw_text(xx + 28, yy + 332, "Company Command Structure"); + + if (scr_hit(xx + 28, yy + 332, xx + 316, yy + 352) == true) { + tool1 = "Comany Command Structure"; + tool2 = "The default members of your Company Command."; + } + + draw_text(xx + 66, yy + 359, "Captain"); + draw_text(xx + 66, yy + 386, "Standard Bearer"); + draw_text(xx + 66, yy + 413, "Champion"); + draw_text(xx + 66, yy + 440, "Chaplain"); + draw_text(xx + 66, yy + 467, "Apothecary"); + draw_text(xx + 66, yy + 494, "Librarian"); + draw_text(xx + 66, yy + 521, "Techmarine"); + + che = command_set[3]; + cx = xx + 31; + cy = yy + 355; + + draw_sprite(spr_creation_check, che + 2, cx, cy); + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[3] == 0)) { + onceh = 1; + command_set[3] = 1; + } + if ((onceh == 0) && (command_set[3] == 1)) { + onceh = 1; + command_set[3] = 0; + } + } + + che = command_set[4]; + cx = xx + 31; + cy = yy + 382; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[4] == 0)) { + onceh = 1; + command_set[4] = 1; + } + if ((onceh == 0) && (command_set[4] == 1)) { + onceh = 1; + command_set[4] = 0; + } + } + + che = command_set[5]; + cx = xx + 31; + cy = yy + 409; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[5] == 0)) { + onceh = 1; + command_set[5] = 1; + } + if ((onceh == 0) && (command_set[5] == 1)) { + onceh = 1; + command_set[5] = 0; + } + } + + che = command_set[6]; + cx = xx + 31; + cy = yy + 436; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[6] == 0)) { + onceh = 1; + command_set[6] = 1; + } + if ((onceh == 0) && (command_set[6] == 1)) { + onceh = 1; + command_set[6] = 0; + } + } + + che = command_set[7]; + cx = xx + 31; + cy = yy + 463; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[7] == 0)) { + onceh = 1; + command_set[7] = 1; + } + if ((onceh == 0) && (command_set[7] == 1)) { + onceh = 1; + command_set[7] = 0; + } + } + + che = command_set[8]; + cx = xx + 31; + cy = yy + 490; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[8] == 0)) { + onceh = 1; + command_set[8] = 1; + } + if ((onceh == 0) && (command_set[8] == 1)) { + onceh = 1; + command_set[8] = 0; + } + } + + che = command_set[9]; + cx = xx + 31; + cy = yy + 517; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[9] == 0)) { + onceh = 1; + command_set[9] = 1; + } + if ((onceh == 0) && (command_set[9] == 1)) { + onceh = 1; + command_set[9] = 0; + } + } + + yy -= 35; + + draw_text(xx + 28, yy + 611, "Boarding Objective"); + if (scr_hit(xx + 28, yy + 611, xx + 316, yy + 611 + 20) == true) { + tool1 = "Boarding Objective"; + tool2 = "The objective of your Astartes once they board an enemy ship."; + } + + draw_text(xx + 66, yy + 611 + 27, "Damage Systems"); + draw_text(xx + 86, yy + 611 + 54, "Use Plasma Bombs"); + draw_text(xx + 66, yy + 611 + 81, "Commandeer Ship"); + + che = command_set[20]; + cx = xx + 31; + cy = yy + 611 + 23; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if (scr_hit(cx + 31, cy, cx + 260, cy + 20) == true) { + tool1 = "Damage Systems"; + tool2 = "Your Astartes will attempt to disable the ship by attacking the ship bridge and systems."; + } + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[20] == 0)) { + onceh = 1; + command_set[20] = 1; + command_set[22] = 0; + } + } + + che = command_set[21]; + cx = xx + 51; + cy = yy + 611 + 50; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if (scr_hit(cx + 31, cy, cx + 260, cy + 20) == true) { + tool1 = "Use Plasma Bombs"; + tool2 = "Your Astartes will use equipped Plasma Bombs to massively damage the boarded ship."; + } + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[21] == 0) && (command_set[22] == 0)) { + onceh = 1; + command_set[21] = 1; + } + if ((onceh == 0) && (command_set[21] == 1)) { + onceh = 1; + command_set[21] = 0; + } + } + + draw_set_alpha(0.5); + che = command_set[22]; + cx = xx + 31; + cy = yy + 611 + 77; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if (scr_hit(cx + 31, cy, cx + 260, cy + 20) == true) { + tool1 = "Commandeer Ship"; + tool2 = "Your Astartes will attempt to commandeer the vessel, to be permenantely used or salvaged."; + } + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[22] == 0)) { + onceh = 1; + command_set[22] = 1; + command_set[20] = 0; + command_set[21] = 0; + } + } + draw_set_alpha(1); + + // 59 lower + + if (command_set[22] == 1) { + draw_set_alpha(0.5); + } + draw_text(xx + 28, yy + 747, "Post-Boarding"); + if (scr_hit(xx + 28, yy + 747, xx + 316 - 150, yy + 767) == true) { + tool1 = "Post-Boarding"; + tool2 = "What your Boarders will do after achieving their objective. This is disabled if your objective is to Commandeer the enemy ships."; + } + + draw_text(xx + 66, yy + 747 + 27, "Board Next Nearest"); + draw_text(xx + 86, yy + 747 + 54, "Return and Recuperate"); + + che = command_set[23]; + if (command_set[22] == 1) { + che = 0; + } + cx = xx + 31; + cy = yy + 747 + 23; + draw_sprite(spr_creation_check, che + 2, cx, cy); + if (scr_hit(cx + 31, cy, cx + 260 - 70, cy + 20) == true) { + tool1 = "Board Next Nearest"; + tool2 = "After disabling an enemy vessel your Astartes will launch a new boarding mission at the nearest enemy."; + } + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[23] == 0) && (command_set[22] == 0)) { + onceh = 1; + command_set[23] = 1; + command_set[24] = 0; + } + } + + che = command_set[24]; + if (command_set[22] == 1) { + che = 0; + } + cx = xx + 51; + cy = yy + 747 + 50; + draw_sprite(spr_creation_check, che + 2, cx, cy); + if (scr_hit(cx + 31, cy, cx + 260 - 70, cy + 20) == true) { + tool1 = "Return and Recuperate"; + tool2 = "After disabling an enemy vessel your Astartes will return to their mother vessel and heal."; + } + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[24] == 0) && (command_set[22] == 0)) { + onceh = 1; + command_set[24] = 1; + command_set[23] = 0; + } + } + draw_set_alpha(1); + + xx += 260; + draw_text(xx + 28, yy + 747, "Automatic Boarding"); + if (scr_hit(xx + 28, yy + 747, xx + 316, yy + 767) == true) { + tool1 = "Automatic Boarding"; + tool2 = "If checked your ships will launch Boarding teams automatically when an eligible target is in range."; + } + + draw_text(xx + 66, yy + 747 + 27, "Battleships"); + draw_text(xx + 86, yy + 747 + 54, "Cruisers"); + + che = command_set[25]; + cx = xx + 31; + cy = yy + 747 + 23; + + draw_sprite(spr_creation_check, che + 2, cx, cy); + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + + if ((onceh == 0) && (command_set[25] == 0)) { + onceh = 1; + command_set[25] = 1; + } + if ((onceh == 0) && (command_set[25] == 1)) { + onceh = 1; + command_set[25] = 0; + } + } + + che = command_set[26]; + cx = xx + 51; + cy = yy + 747 + 50; + draw_sprite(spr_creation_check, che + 2, cx, cy); + + if ((scr_hit(cx, cy, cx + 32, cy + 32) == true) && scr_click_left()) { + var onceh = 0; + if ((onceh == 0) && (command_set[26] == 0)) { + onceh = 1; + command_set[26] = 1; + } + if ((onceh == 0) && (command_set[26] == 1)) { + onceh = 1; + command_set[26] = 0; + } + } + xx -= 260; + yy += 64; + + draw_text(xx + 937 - 341, yy + 207, "Battle Formations"); + draw_text(xx + 937, yy + 207, "Company Settings"); + draw_text(xx + 1278, yy + 207, "Astartes Role Settings"); + + // Role Settings + var ide, xxx, yyy; + ide = 0; + xxx = xx + 1277; + yyy = yy + 250 - 31; + + for (var derpaderp = 1; derpaderp <= 14; derpaderp++) { + if (derpaderp == 1) { + ide = 15; + } + if (derpaderp == 2) { + ide = 14; + } + if (derpaderp == 3) { + ide = 17; + } + if (derpaderp == 4) { + ide = 16; + } + if (derpaderp == 5) { + ide = 5; + } + if (derpaderp == 6) { + ide = 7; + } + if (derpaderp == 7) { + ide = 2; + } + if (derpaderp == 8) { + ide = 4; + } + if (derpaderp == 9) { + ide = 3; + } + if (derpaderp == 10) { + ide = 6; + } + if (derpaderp == 11) { + ide = 8; + } + if (derpaderp == 12) { + ide = 9; + } + if (derpaderp == 13) { + ide = 10; + } + if (derpaderp == 14) { + ide = 12; + } + + draw_set_alpha(1); + if (obj_ini.race[100, ide] != 0) { + // Creates mass_equip here + // if (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); + yyy += 31; + draw_set_color(c_gray); + draw_rectangle(xxx, yyy, xxx + 289, yyy + 20, 0); + draw_set_color(0); + draw_text(xxx, yyy, obj_ini.role[100, ide]); + if (scr_hit(xxx, yyy, xxx + 289, yyy + 20) == true) { + /*if (custom==eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.2);if (custom!=eCHAPTER_TYPE.CUSTOM) then */ + draw_set_alpha(0.1); + draw_set_color(c_white); + draw_rectangle(xxx, yyy, xxx + 289, yyy + 20, 0); + draw_set_alpha(1); + tool1 = string(obj_ini.role[100, ide]) + " Settings"; + tool2 = "Click to open the settings for this unit."; + if (scr_click_left()) { + settings = ide; + menu = 23; + with (obj_mass_equip) { + instance_destroy(); + } + instance_create(0, 0, obj_mass_equip); + } + } + } + } + + xxx = xx + 936; + yyy = yy + 250 - 31; + + for (var ides = 0; ides <= 10; ides++) { + draw_set_alpha(1); + // if (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); + yyy += 31; + draw_set_color(c_gray); + draw_rectangle(xxx, yyy, xxx + 289, yyy + 20, 0); + draw_set_color(0); + + var shw = ""; + if (ides == 0) { + shw = "Headquarters"; + } + if (ides > 0) { + shw = romanNumerals[ides - 1] + " Company"; + } + draw_text(xxx, yyy, string(shw)); + + if (scr_hit(xxx, yyy, xxx + 289, yyy + 20) == true) { + /*if (custom==eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.2);if (custom!=eCHAPTER_TYPE.CUSTOM) then */ + draw_set_alpha(0.1); + draw_set_color(c_white); + draw_rectangle(xxx, yyy, xxx + 289, yyy + 20, 0); + draw_set_alpha(1); + tool1 = string(shw) + " Settings"; + tool2 = "Click to open the settings for this company."; + // if (mouse_left>=1) and (cooldown<=0){settings=ides;menu=22;} + } + } + + xxx = xx + 936 - 341; + yyy = yy + 250 - 31; + + for (var i = 1; i <= 11; i++) { + draw_set_alpha(1); + // if (custom!=eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.5); + yyy += 31; + draw_set_color(c_gray); + + if (bat_formation[i] != "") { + draw_rectangle(xxx, yyy, xxx + 289, yyy + 20, 0); + } + if (i > 2) { + if ((bat_formation[i] == "") && (bat_formation[i - 1] != "")) { + draw_rectangle(xxx, yyy, xxx + 289, yyy + 20, 0); + } + } + + draw_set_color(0); + + var shw = "", isnew = false; + shw = string(bat_formation[i]); + + if (i > 3) { + if (bat_formation_type[i] == 1) { + shw = "A] " + string(shw); + } + if (bat_formation_type[i] == 2) { + shw = "R] " + string(shw); + } + } + if (i > 2) { + if ((shw == "") && (bat_formation[i - 1] != "")) { + isnew = true; + shw = "(New Formation)"; + } + } + + if ((shw != "") || (isnew == true)) { + draw_text(xxx, yyy, string(shw)); + if (scr_hit(xxx, yyy, xxx + 289, yyy + 20) == true) { + /*if (custom==eCHAPTER_TYPE.CUSTOM) then draw_set_alpha(0.2);if (custom!=eCHAPTER_TYPE.CUSTOM) then */ + draw_set_alpha(0.1); + draw_set_color(c_white); + draw_rectangle(xxx, yyy, xxx + 289, yyy + 20, 0); + draw_set_alpha(1); + + if (i <= 3) { + tool1 = string(shw) + " Settings"; + } + tool2 = "Click to open the settings for this formation."; + if (i > 3) { + if (bat_formation[i] != "") { + tool1 = string(bat_formation[i]) + " Settings"; + tool2 = "Click to open the settings for this formation."; + } + if (bat_formation[i] == "") { + tool1 = "New Custom Formation"; + tool2 = "Click to open and create a new Battle Formation for Ground combat or Raiding."; + } + } + + if (scr_click_left()) { + formating = i; + menu = 24; + + scr_ui_formation_bars(); + if (bat_formation[formating] == "") { + bat_formation[formating] = "Custom" + string(formating - 3); + bat_formation_type[formating] = 1; + bat_deva_for[formating] = 1; + bat_assa_for[formating] = 4; + bat_tact_for[formating] = 2; + bat_vete_for[formating] = 2; + bat_hire_for[formating] = 3; + bat_libr_for[formating] = 3; + bat_comm_for[formating] = 3; + bat_tech_for[formating] = 3; + bat_term_for[formating] = 3; + bat_hono_for[formating] = 3; + bat_drea_for[formating] = 5; + bat_rhin_for[formating] = 6; + bat_pred_for[formating] = 7; + bat_landraid_for[formating] = 7; + bat_landspee_for[formating] = 4; + bat_whirl_for[formating] = 1; + bat_scou_for[formating] = 1; + } + } + } + } + } + + if (tool1 != "") { + tooltip_draw(tool2,,,,, tool1); + } + } } diff --git a/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml b/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml index 23386f8a3d..1a3130aed6 100644 --- a/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml +++ b/scripts/scr_unit_equip_functions/scr_unit_equip_functions.gml @@ -1,3 +1,4 @@ +// TODO: Merge all update function into one; /// @mixin function scr_update_unit_armour(new_armour, from_armoury = true, to_armoury = true, quality = "any") { var is_artifact = !is_string(new_armour); @@ -108,12 +109,14 @@ function scr_update_unit_armour(new_armour, from_armoury = true, to_armoury = tr if (new_arm_data.has_tag("terminator")) { update_mobility_item(""); } - } - - if (armour() == "Dreadnought") { - is_boarder = false; - update_gear(""); - update_mobility_item(""); + + if (new_arm_data.has_tag("dreadnought")) { + is_boarder = false; + remove_from_squad(); + update_role(obj_ini.role[100][eROLE.Dreadnought]); + update_gear(""); + update_mobility_item(""); + } } update_health(portion * max_health()); @@ -177,7 +180,7 @@ function scr_update_unit_weapon_one(new_weapon, from_armoury = true, to_armoury if (!is_string(weapon_one(true))) { obj_ini.artifact_equipped[weapon_one(true)] = false; } else { - scr_add_item(change_wep, 1, weapon_one_quality, true); + scr_add_item(change_wep, 1, weapon_one_quality); } } else if (!is_string(weapon_one(true))) { delete_artifact(weapon_one(true)); @@ -230,7 +233,7 @@ function scr_update_unit_weapon_two(new_weapon, from_armoury = true, to_armoury if (!is_string(weapon_two(true))) { obj_ini.artifact_equipped[weapon_two(true)] = false; } else { - scr_add_item(change_wep, 1, weapon_two_quality, true); + scr_add_item(change_wep, 1, weapon_two_quality); } } else if (!is_string(weapon_two(true))) { delete_artifact(weapon_two(true)); @@ -291,7 +294,7 @@ function scr_update_unit_gear(new_gear, from_armoury = true, to_armoury = true, if (!is_string(gear(true))) { obj_ini.artifact_equipped[gear(true)] = false; } else { - scr_add_item(change_gear, 1, gear_quality, true); + scr_add_item(change_gear, 1, gear_quality); } } else if (!is_string(gear(true))) { delete_artifact(gear(true)); @@ -314,6 +317,8 @@ function scr_update_unit_gear(new_gear, from_armoury = true, to_armoury = true, return "complete"; } +// TODO: Expand restriction tag checking and error logging to other update functions; +/// @mixin function scr_update_unit_mobility_item(new_mobility_item, from_armoury = true, to_armoury = true, quality = "any") { var is_artifact = !is_string(new_mobility_item); var _old_mobility_item = mobility_item(); @@ -325,48 +330,70 @@ function scr_update_unit_mobility_item(new_mobility_item, from_armoury = true, t new_mobility_item = obj_ini.artifact[artifact_id]; } - var _armour_data = get_armour_data(); - if (is_struct(_armour_data)) { - if (_armour_data.has_tag("terminator")) { - if (!array_contains(["Servo-arm", "Servo-harness", "Conversion Beamer Pack"], new_mobility_item)) { - return "incompatible with terminator"; - } + if (!unequipping) { + var _mobility_data = gear_weapon_data("mobility", new_mobility_item); + if (!is_struct(_mobility_data)) { + log_error($"Failed to equip {new_mobility_item} for {name()} - can't find the item in the item database!"); + return false; } - if (new_mobility_item == "Jump Pack" && !_armour_data.has_tag("power_armour")) { - return "requires power armour"; + + var exp_require = _mobility_data.req_exp; + if (exp_require > experience) { + log_error($"Failed to equip {new_mobility_item} for {name()} - not enough EXP! ({experience}<{exp_require})"); + return false; } - } else { - if (new_mobility_item == "Jump Pack") { - return "requires power armour"; + + var _armour_data = get_armour_data(); + if (is_struct(_armour_data)) { + if (_armour_data.has_tag("terminator") && !_mobility_data.has_tag("terminator")) { + log_error($"Failed to equip {new_mobility_item} for {name()} - can't use with terminator armour! (Current: {armour()})"); + return false; + } else if (!_armour_data.has_tag("terminator") && _mobility_data.has_tag("terminator_only")) { + log_error($"Failed to equip {new_mobility_item} for {name()} - requires terminator armour! (Current: {armour()})"); + return false; + } + + if (_mobility_data.has_tag("power_only") && !_armour_data.has_tag("power_armour")) { + log_error($"Failed to equip {new_mobility_item} for {name()} - requires power armour! (Current: {armour()})"); + return false; + } + } else { + if (new_mobility_item == "Jump Pack") { + log_error($"Failed to equip {new_mobility_item} for {name()} - requires armour!)"); + return false; + } + if (_mobility_data.has_tag("terminator")) { + log_error($"Failed to equip {new_mobility_item} for {name()} - requires terminator armour!"); + return false; + } } } var same_quality = quality == "any" || quality == mobility_item_quality; if (_old_mobility_item == new_mobility_item && same_quality) { - return "no change"; + return true; } + // Have enough items check; if (from_armoury && !is_artifact && !unequipping) { if (scr_item_count(new_mobility_item, quality) > 0) { - var exp_require = gear_weapon_data("weapon", new_mobility_item, "req_exp", false, quality); - if (exp_require > experience) { - return "exp_low"; - } quality = scr_add_item(new_mobility_item, -1, quality); quality = quality != undefined ? quality : "standard"; } else { - return "no_items"; + log_error($"Failed to equip {new_mobility_item} for {name()} - not enough items of {quality} quality!"); + return false; } } else { quality = quality == "any" ? "standard" : quality; } + // Return old items to stockpile; if (_old_mobility_item != "") { if (to_armoury) { if (!is_string(mobility_item(true))) { obj_ini.artifact_equipped[mobility_item(true)] = false; } else { - scr_add_item(_old_mobility_item, 1, mobility_item_quality, true); + scr_add_item(_old_mobility_item, 1, mobility_item_quality); } } else if (!is_string(mobility_item(true))) { delete_artifact(mobility_item(true)); @@ -388,7 +415,7 @@ function scr_update_unit_mobility_item(new_mobility_item, from_armoury = true, t update_health(portion * max_health()); get_unit_size(); - return "complete"; + return true; } @@ -443,5 +470,31 @@ function unit_has_equipped(check_equippment){ return true; } +/*function equipment_has_tag(tag, area){ + var tags = []; + switch (area){ + case "wep1": + tags = get_weapon_one_data("tags"); + break; + case "wep2": + tags = get_weapon_two_data("tags"); + break; + case "mobi": + tags = get_mobility_data("tags"); + break; + case "armour": + tags = get_armour_data("tags"); + break; + case "gear": + tags = get_gear_data("tags"); + break; + } + if (tags == false || !array_length(tags)){ + return false; + } else { + return array_contains(tags, tag); + } +}*/ + diff --git a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml index c8229ff8a5..5069a55bff 100644 --- a/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml +++ b/scripts/scr_unit_quick_find_pane/scr_unit_quick_find_pane.gml @@ -3,6 +3,7 @@ function UnitQuickFindPanel() constructor{ main_panel = new DataSlate(); garrison_log = {}; + ship_count = 0; tab_buttons = { "fleets":new MainMenuButton(spr_ui_but_3, spr_ui_hov_3), "garrisons":new MainMenuButton(spr_ui_but_3, spr_ui_hov_3), @@ -13,70 +14,106 @@ function UnitQuickFindPanel() constructor{ static detail_slate = new DataSlateMKTwo(); view_area = "fleets"; + + static has_troops = function(name){ + return struct_exists(garrison_log, name); + } + + static player_force_stars = function(){ + var _names = struct_get_names(garrison_log); + var _stars = []; + for (var i=0;i-1){ + obj_ini.ship_carrying[unit.ship_location]+=unit.get_unit_size(); + } + } + } + + static evaluate_vehicle_for_garrison_log = function(company, array_slot){ + + var co = company; + var u = array_slot; + + if (obj_ini.veh_race[co][u]==0) then return; + if (obj_ini.veh_wid[co][u]>0){ + unit_location = obj_ini.veh_loc[co][u]; + var _unit = [co, u]; + if (!struct_exists(garrison_log, unit_location)){ + garrison_log[$ unit_location] = { + units:[_unit], + vehicles:1, + garrison:false, + healers:0, + techies:0 + } + } else { + array_push(garrison_log[$ unit_location].units, _unit); + garrison_log[$ unit_location].vehicles++; + } + } else if (obj_ini.veh_lid[co][u]>-1){ + obj_ini.ship_carrying[obj_ini.veh_lid[co][u]]+=scr_unit_size("",obj_ini.veh_role[co][u],true); + } + } + + static update_garrison_log = function(){ try{ for (var i = 0;i-1){ - obj_ini.ship_carrying[unit.ship_location]+=unit.get_unit_size(); - } - } + _unit = fetch_unit([co, u]); + evaluate_unit_for_garrison_log(_unit); } try{ - - for (var u=1;u0){ - unit_location = obj_ini.veh_loc[co][u]; - unit = [co, u]; - if (!struct_exists(garrison_log, unit_location)){ - garrison_log[$ unit_location] = { - units:[unit], - vehicles:1, - garrison:false, - healers:0, - techies:0 - } - } else { - array_push(garrison_log[$ unit_location].units, unit); - garrison_log[$ unit_location].vehicles++; - } - } else if (obj_ini.veh_lid[co][u]>-1){ - obj_ini.ship_carrying[obj_ini.veh_lid[co][u]]+=scr_unit_size("",obj_ini.veh_role[co][u],true); - } + for (var u=0;u0){ if (managing<=10) and (managing!=0){ scr_company_view(managing); - company_data = new CompanyStruct(managing); } if (managing>10) or (managing=0){ scr_special_view(managing); - company_data={}; - } + } + new_company_struct(); cooldown=10; sel_loading=-1; unload=0; @@ -482,59 +538,14 @@ function update_general_manage_view(){ } } - -function transfer_selection(){ - if (instance_number(obj_popup)==0){ - var pip=instance_create(0,0,obj_popup); - pip.type=5.1; - pip.company=managing; - - var god=0,nuuum=0,nuuum2=0,checky=0,check_number=0; - for(var f=1; f1) then pip.unit_role="Marines"; - if (nuuum2>1) then pip.unit_role="Vehicles"; - if (nuuum>0) and (nuuum2>0) then pip.unit_role="Units"; - pip.units=nuuum+nuuum2; - if (nuuum>0) and (check_number>0){ - if (command_set[1]==0){ - cooldown=8000; - with(pip){instance_destroy();} - } - } - } -} - function toggle_selection_borders(){ for(var p=0; p-1) and (obj_ini.loc[unit.company][mar_id]!="Mechanicus Vessel"){ - unit.is_boarder = !unit.is_boarder; + var _unit=display_unit[p]; + var mar_id = _unit.marine_number; + if (_unit.ship_location>-1) and (_unit.controllable()){ + _unit.is_boarder = !_unit.is_boarder; } } } @@ -546,13 +557,13 @@ function add_bionics_selection(){ if (bionics_before>0){ for(var p=0; p=50){ - if (man[f]=="man"){ - allow=false; - break; - } else if(man[f]=="vehicle"){ - if (prev_role != ma_role[f]){ - allow=false; - break; - } - } - } - } - - if (vih>0){ - nuuum+=1; - if (o_wep1=="") and (ma_wep1[f]!="") then o_wep1=ma_wep1[f]; - if (o_wep2=="") and (ma_wep2[f]!="") then o_wep2=ma_wep2[f]; - if (o_armour=="") and (ma_armour[f]!="") then o_armour=ma_armour[f]; - if (o_gear=="") and (ma_gear[f]!="") then o_gear=ma_gear[f]; - if (o_mobi=="") and (ma_mobi[f]!="") then o_mobi=ma_mobi[f]; - - if (ma_wep1[f]=="") then b_wep1+=1; - if (ma_wep2[f]=="") then b_wep2+=1; - if (ma_armour[f]=="") then b_armour+=1; - if (ma_gear[f]=="") then b_gear+=1; - if (ma_mobi[f]=="") then b_mobi+=1; - - if ((o_wep1!="") and (ma_wep1[f]!=o_wep1)) or (b_wep1==1) then o_wep1="Assortment"; - if ((o_wep2!="") and (ma_wep2[f]!=o_wep2)) or (b_wep2==1) then o_wep2="Assortment"; - if ((o_armour!="") and (ma_armour[f]!=o_armour)) or (b_armour==1) then o_armour="Assortment"; - if ((o_gear!="") and (ma_gear[f]!=o_gear)) or (b_gear==1) then o_gear="Assortment"; - if ((o_mobi!="") and (ma_mobi[f]!=o_mobi)) or (b_mobi==1) then o_mobi="Assortment"; - } - } - - if (b_wep1==nuuum) then o_wep1=""; - if (b_wep2==nuuum) then o_wep2=""; - if (b_armour==nuuum) then o_armour=""; - if (b_gear==nuuum) then o_gear=""; - if (b_mobi==nuuum) then o_mobi=""; - - if (vih>0 && man_size>0 && allow){ - - var pip=instance_create(0,0,obj_popup); - pip.type=6; - pip.o_wep1=o_wep1; - pip.o_wep2=o_wep2; - pip.o_armour=o_armour; - pip.o_gear=o_gear; - pip.n_wep1=o_wep1; - pip.n_wep2=o_wep2; - pip.n_armour=o_armour; - pip.n_gear=o_gear; - pip.o_mobi=o_mobi; - pip.n_mobi=o_mobi; - pip.company=managing; - pip.units=nuuum; - - //Forwards vih selection to the vehicle_equipment variable used in mouse_50 obj_popup and weapons_equip script - pip.vehicle_equipment=vih; - } - } -} - function load_selection(){ - if (man_size>0) and (selecting_location!="Terra") and (selecting_location!="Mechanicus Vessel") and (selecting_location!="Lost"){ + if (man_size>0 && !location_out_of_player_control(selecting_location)){ scr_company_load(selecting_location); menu=30; top=1; @@ -702,9 +606,8 @@ function load_selection(){ } function unload_selection(){ - //show_debug_message("{0},{1},{2}",obj_controller.selecting_ship,man_size,selecting_location); - if (man_size>0) and (obj_controller.selecting_ship>=0) and (!instance_exists(obj_star_select)) - and (selecting_location!="Terra" && selecting_location!="Mechanicus Vessel" && selecting_location!="Warp" && selecting_location!="Lost") { + if (man_size>0 && obj_controller.selecting_ship>=0 && !instance_exists(obj_star_select)&& + !location_out_of_player_control(selecting_location) && selecting_location!="Warp"){ cooldown=8000; var boba=0; var unload_star = star_by_name(selecting_location); @@ -733,26 +636,26 @@ function unload_selection(){ } function reset_selection_equipment(){ - var unit; + var _unit; for(var f=0; f-1){ - init_garrison_mission(sel_plan, target, garrison_request); - } - instance_destroy(); - exit; - } - } else if (!loading){ - garrison = new GarrisonForce(target.p_operatives[sel_plan]); - target.garrison = garrison.garrison_force; - feature=""; - buttons_selected=false; - } else if (loading){ - if (sel_plan>0){ - obj_controller.cooldown=8000; - obj_controller.unload=sel_plan; - obj_controller.return_object=target; - obj_controller.return_size=obj_controller.man_size; - with(obj_controller.return_object){// This marks that there are forces upon this planet - p_player[obj_controller.unload]+=obj_controller.man_size; - } - - // 135 ; SPECIAL PLANET CRAP HERE - - // Recon Stuff - var recon=0; - if (has_problem_planet(sel_plan, "recon",target)) then recon=1; - - if (recon==1){ - var arti=instance_create(target.x,target.y,obj_temp7);// Unloading / artifact crap - arti.num=sel_plan; - arti.alarm[0]=1; - arti.loc=obj_controller.selecting_location; - arti.managing=obj_controller.managing; - arti.type="recon"; - - with (arti){ - setup_planet_mission_group() - } - }else if (planet_feature_bool(target.p_feature[sel_plan], P_features.Artifact) == 1) and (recon=0){ - - var artifact=instance_create(target.x,target.y,obj_ground_mission);// Unloading / artifact crap - artifact.num=sel_plan; - artifact.alarm[0]=1; - artifact.loc=obj_controller.selecting_location; - artifact.managing=obj_controller.managing; - - with (artifact){ - setup_planet_mission_group(); - } - } - - // STC Grab - if (planet_feature_bool(target.p_feature[sel_plan], P_features.STC_Fragment) == 1) and (recon=0){ - var tch,mch;frag=0;tch=0;mch=0; - for (var frag=0;frag0){ - var arti=instance_create(target.x,target.y,obj_ground_mission);// Unloading / artifact crap - arti.num=sel_plan; - arti.alarm[0]=1; - arti.loc=obj_controller.selecting_location; - arti.managing=obj_controller.managing; - arti.tch=tch; - arti.mch=mch; - // Right here should pass the man_sel variables - // var frag;frag=-1;repeat(150){frag+=1;arti.man_sel[frag]=obj_controller.man_sel[frag];} - with (arti){ - setup_planet_mission_group(); - } - } - } - - // Ancient Ruins - scr_check_for_ruins_exploration(sel_plan, target); - instance_destroy(); - exit; - } - } - } - } - xxx=159+(i*41); - if (target.craftworld=0) and (target.space_hulk=0){ - var sel_plan = i+1; - var planet_frame=0; - with (target){ - planet_frame = scr_planet_image_numbers(p_type[sel_plan]); - } - draw_sprite_ext(spr_planets,planet_frame,xxx, 287, 1, 1, 0, planet_draw, 0.9) - - draw_set_color(global.star_name_colors[target.p_owner[sel_plan]]); - - draw_text(xxx,255,scr_roman(sel_plan)); - - } + + var _helps = 0; + for (var h=1;h<=_star.planets;h++){ + if (_star.p_halp[h] > 0){ + _helps++; + } + } + _data.help_requests = _helps; + + _data.hover = method(_data,function(){ + tooltip_draw($"View {name}"); + }); + + _data.click_left = method(_data,function(){ + set_map_pan_to_loc(star_id); + }); + + array_push(_help_requests,_data); + } + + static x1 = 1289; + static y1 = 318; + main_panel.XX=x1; + main_panel.YY=y1; + + static entered = function(){ + return main_panel.entered(); + } + + help_table = new Table( + { + row_key_draw : ["name","system_count","help_requests"], + headings : ["System", "Planets", "Planets\nRequesting Help"], + row_data : _help_requests + } + ); + + + + var _navy_fleets = []; + + with (obj_en_fleet){ + if (owner != eFACTION.Imperium || !navy){ + continue; + } + var _guard_percentage = fleet_remaining_guard_ratio() * 100; + + var _data = { + fleet_id : id, + location : "Warp", + remaining_guard :$"{ _guard_percentage }%", + action : trade_goods, + } + if (is_orbiting()){ + _data.location = orbiting.name; + } + + _data.hover = method(_data,function(){ + if (location != "Warp"){ + tooltip_draw($"View fleet at {location}"); + } else { + tooltip_draw($"View fleet"); + } + + }); + + _data.click_left = method(_data, function(){ + set_map_pan_to_loc(fleet_id); + }); + + + array_push(_navy_fleets, _data); + } + + navy_table = new Table( + { + row_key_draw : ["location","remaining_guard"], + headings : ["Location", "Remaining\nGuard"], + row_data : _navy_fleets + }); + + var _forges = []; + + var _columns = []; + var _longest_name = 0; + with (obj_star){ + var _forge = scr_get_planet_with_type(id,"Forge"); + if (_forge > 0){ + var _data = { + system : id, + planet : _forge, + name : planet_numeral_name(_forge), + owner_name : obj_controller.faction[p_owner[_forge]], + owner : p_owner[_forge], + owner_status : obj_controller.faction_status[p_owner[_forge]], + }; + + _data.click_left = method(_data, function(){ + set_map_pan_to_loc(system); + }); + + _data.hover = method(_data,function(){ + tooltip_draw($"click to view {system.name} system"); + + }); + + var _name_length = string_width(_data.name); + if (_name_length > _longest_name){ + _longest_name = _name_length; + } + + array_push(_forges , _data); + } + } + array_push(_columns , _longest_name); + + forges_table = new Table({ + row_key_draw : ["name","owner_name","owner_status"], + headings : ["Name", " Owner ", " Owner\nStatus "], + row_data : _forges, + set_column_widths : _columns, + }); + + places_radio = new RadioSet([ + { + str1 : "Help Requests", + + }, + { + str1 : "Navy Fleets", + + }, + { + str1 :"Forge Worlds", } - if (target.craftworld || target.space_hulk) then obj_controller.selecting_planet=1; - x=target.x; - y=target.y; - } + ]); + + main_panel.inside_method = function(){ + places_radio.update({ + x1: x1 + 30, + y1: y1 + 25, + }); + places_radio.draw(); + + var _new_position = { + x1:x1+40, + y1:y1+50, + y2:y1 + main_panel.height, + } + switch (places_radio.current_selection){ + case 1: + navy_table.update(_new_position); + navy_table.draw(); + break; + case 0: + help_table.update(_new_position); + help_table.draw(); + break; + case 2: + forges_table.update(_new_position); + forges_table.draw(); + break; + } + } + + static draw = function(){ + x1 = main_panel.XX; + y1 = main_panel.YY; + main_panel.draw(,, 0.35, 0.6); + } + + } + diff --git a/scripts/scr_unit_size/scr_unit_size.gml b/scripts/scr_unit_size/scr_unit_size.gml index 0a93b61ff2..7115fb005f 100644 --- a/scripts/scr_unit_size/scr_unit_size.gml +++ b/scripts/scr_unit_size/scr_unit_size.gml @@ -1,12 +1,14 @@ // TODO sizes should really be held in the vehicle's struct function get_vehicle_size_map() { - var vehicle_size_map = ds_map_create(); - vehicle_size_map[? "Rhino"] = 10; - vehicle_size_map[? "Predator"] = 10; - vehicle_size_map[? "Land Raider"] = 20; - vehicle_size_map[? "Land Speeder"] = 5; - vehicle_size_map[? "Whirlwind"] = 10; - vehicle_size_map[? "Harlequin Troupe"] = 5; + var vehicle_size_map = { + "Rhino": 10, + "Predator": 10, + "Land Raider": 20, + "Land Speeder": 5, + "Whirlwind": 10, + "Harlequin Troupe": 5 + }; + return vehicle_size_map; } @@ -28,13 +30,13 @@ function scr_unit_size(armour, role, other_factors, mobility=false) { if (role == obj_ini.role[100][eROLE.ChapterMaster]) { _size++; - } else if (ds_map_exists(vehicle_size_map, role)) { - _size = vehicle_size_map[? role]; + } else if (struct_exists(vehicle_size_map, role)) { + _size = vehicle_size_map[$ role]; } else if (armour=="") { - show_debug_message($"Could not find size for vehicle '{role}'"); + show_debug_message_adv($"Could not find size for vehicle '{role}'"); } - ds_map_destroy(vehicle_size_map); + delete(vehicle_size_map); return (_size); } \ No newline at end of file diff --git a/scripts/scr_unit_spawn_functions/scr_unit_spawn_functions.gml b/scripts/scr_unit_spawn_functions/scr_unit_spawn_functions.gml index a717662d01..c843572bf7 100644 --- a/scripts/scr_unit_spawn_functions/scr_unit_spawn_functions.gml +++ b/scripts/scr_unit_spawn_functions/scr_unit_spawn_functions.gml @@ -186,11 +186,18 @@ function scr_marine_spawn_armour() { ["MK4 Maximus", 1], ["MK3 Iron Armour", 1] ], + ancient_armour: [ + ["MK6 Corvus", 5], + ["MK5 Heresy", 3], + ["MK4 Maximus", 1], + ["MK3 Iron Armour", 1] + ], }; var _terminator_roles_array = [obj_ini.role[100][eROLE.Captain], obj_ini.role[100][eROLE.Champion], obj_ini.role[100][eROLE.Ancient], obj_ini.role[100][eROLE.Chaplain], obj_ini.role[100][eROLE.Apothecary], obj_ini.role[100][eROLE.Librarian], obj_ini.role[100][eROLE.Techmarine]]; - if (_company == 1 && array_contains(_terminator_roles_array, _role)) { + // terminator/tartaros should be decided in scr_initialize_custom + if (_company == 1 && array_contains(_terminator_roles_array, _role) && armour() == "Terminator Armour") { _terminator_armour_roll(_total_score); } else { switch (_role) { @@ -220,7 +227,9 @@ function scr_marine_spawn_armour() { case obj_ini.role[100][eROLE.Devastator]: case obj_ini.role[100][eROLE.Assault]: case obj_ini.role[100][eROLE.Sergeant]: - if (_total_score > 280) { + if(scr_has_adv("Ancient Armoury")){ + update_armour(choose_weighted(_armour_weighted_lists.ancient_armour), false, false); + } else if (_total_score > 280) { update_armour(choose_weighted(_armour_weighted_lists.old_armour), false, false); } else if (_total_score > 180) { update_armour(choose_weighted(_armour_weighted_lists.quality_armour), false, false); @@ -233,6 +242,8 @@ function scr_marine_spawn_armour() { case obj_ini.role[100][eROLE.Techmarine]: if (_total_score > 280) { update_armour("Artificer Armour", false, false); + } else if(scr_has_adv("Ancient Armoury")){ + update_armour(choose_weighted(_armour_weighted_lists.ancient_armour), false, false); } else if (_total_score > 180) { update_armour(choose_weighted(_armour_weighted_lists.quality_armour), false, false); } else if (_total_score > 100) { diff --git a/scripts/scr_unit_traits/scr_unit_traits.gml b/scripts/scr_unit_traits/scr_unit_traits.gml index a75871f757..6e72864a58 100644 --- a/scripts/scr_unit_traits/scr_unit_traits.gml +++ b/scripts/scr_unit_traits/scr_unit_traits.gml @@ -256,7 +256,7 @@ global.astartes_trait_dist = [ "Warp Tainted",[20,1] ] } - ], + ], ["shitty_luck", [99,98], { @@ -267,7 +267,12 @@ global.astartes_trait_dist = [ ], [ "lucky", - [99,98] + [99,98], + { + "advantage":[ + "Great Luck",[3,2] + ] + } ], ["natural_leader", [199,198], diff --git a/scripts/scr_uuid_generate/scr_uuid_generate.gml b/scripts/scr_uuid_generate/scr_uuid_generate.gml index e19427cb8c..4e53a4a0a5 100644 --- a/scripts/scr_uuid_generate/scr_uuid_generate.gml +++ b/scripts/scr_uuid_generate/scr_uuid_generate.gml @@ -53,7 +53,7 @@ function dec_to_hex() { // - Must utilize random or pseudo-random values for all other bits function scr_uuid_generate() { var unix_epoch = function() { - return round(date_second_span(date_create_datetime(1970, 1, 1, 0, 0, 0), date_current_datetime())); + return round(date_second_span(date_create_datetime(1970, 1, 1, 15, 0, 0), date_current_datetime())); } // seed randomness with time and since game start, in microseconds diff --git a/scripts/scr_vehicle_count/scr_vehicle_count.gml b/scripts/scr_vehicle_count/scr_vehicle_count.gml index 1cc616be17..59175fb746 100644 --- a/scripts/scr_vehicle_count/scr_vehicle_count.gml +++ b/scripts/scr_vehicle_count/scr_vehicle_count.gml @@ -5,8 +5,8 @@ function scr_vehicle_count(role, location="") { var _vehicle_count = 0; var _fetch = fetch_deep_array; - for (var j = 0; j < 11; j++) { - for (var i = 1; i <= 100; i++) { + for (var j = 0; j <=obj_ini.companies; j++) { + for (var i = 0; i < array_length(obj_ini.veh_role[j]); i++) { var _array_key = [j, i]; if (_fetch(obj_ini.veh_role, _array_key) != role){ diff --git a/scripts/scr_vehicle_order/scr_vehicle_order.gml b/scripts/scr_vehicle_order/scr_vehicle_order.gml index 75add290f5..8b4c6894df 100644 --- a/scripts/scr_vehicle_order/scr_vehicle_order.gml +++ b/scripts/scr_vehicle_order/scr_vehicle_order.gml @@ -22,7 +22,7 @@ function scr_vehicle_order(company_number) { var temp_race, temp_loc, temp_name, temp_role, temp_wep1, temp_lid, temp_wid, temp_wep2, temp_wep3, temp_upgrade, temp_acc, temp_hp, temp_chaos, temp_uid; // init arrays - for (var i = 0; i < 301; i++) { // TODO why 301? + for (var i = 0; i < array_length(obj_ini.veh_role[company_number]); i++) { temp_race[company_number][i] = 0; temp_loc[company_number][i] = ""; temp_name[company_number][i] = ""; @@ -40,7 +40,7 @@ function scr_vehicle_order(company_number) { } // Check for vehicles - for (var i = 1; i <= 150; i++) { // TODO why 150? + for (var i = 0; i < array_length(obj_ini.veh_role[company_number]); i++) { var _is_vehicle_role = veh_role[company_number][i] = "Rhino" // TODO change to enums/string ids || veh_role[company_number][i] = "Predator" @@ -49,7 +49,6 @@ function scr_vehicle_order(company_number) { || veh_role[company_number][i] = "Land Raider"; if (_is_vehicle_role) { - vehicle_count++; temp_race[company_number, vehicle_count] = veh_race[company_number][i]; temp_loc[company_number, vehicle_count] = veh_loc[company_number][i]; temp_name[company_number, vehicle_count] = veh_name[company_number][i]; @@ -64,13 +63,13 @@ function scr_vehicle_order(company_number) { temp_hp[company_number, vehicle_count] = veh_hp[company_number][i]; temp_chaos[company_number, vehicle_count] = veh_chaos[company_number][i]; temp_uid[company_number, vehicle_count] = veh_uid[company_number][i]; - - reset_vehicle_variable_arrays(company_number,i); + vehicle_count++; } + reset_vehicle_variable_arrays(company_number,i); } // do the ordering - for (var i = 1; i <= vehicle_count; i++) { // TODO why 150? + for (var i = 0; i < vehicle_count; i++) { veh_race[company_number][i] = temp_race[company_number][i]; veh_loc[company_number][i] = temp_loc[company_number][i]; veh_name[company_number][i] = temp_name[company_number][i]; diff --git a/scripts/scr_void_click/scr_void_click.gml b/scripts/scr_void_click/scr_void_click.gml index 556812f7af..95998950f3 100644 --- a/scripts/scr_void_click/scr_void_click.gml +++ b/scripts/scr_void_click/scr_void_click.gml @@ -20,7 +20,7 @@ function scr_void_click() { } - if (instance_exists(obj_star_select)){ + else if (instance_exists(obj_star_select)){ if (obj_controller.selecting_planet>0){// This prevents clicking onto a new star by pressing the buttons or planet panel if (scr_hit(xx+(27*scale),yy+(166*scale),xx+(727*scale),yy+(458*scale))){if (obj_star_select.button1!="") then good=false;} if (scr_hit(xx+(348*scale),yy+(461*scale),xx+(348*scale)+(246*scale),yy+(461*scale)+(26*scale))){if (obj_star_select.button1!="") then good=false;} @@ -28,6 +28,14 @@ function scr_void_click() { if (scr_hit(xx+(348*scale),yy+(517*scale),xx+(348*scale)+(246*scale),yy+(517*scale)+(26*scale))){if (obj_star_select.button3!="") then good=false;} if (scr_hit(xx+(348*scale),yy+(545*scale),xx+(348*scale)+(246*scale),yy+(545*scale)+(26*scale))){if (obj_star_select.button4!="") then good=false;} } + } else { + if (obj_controller.helpful_places!=false){ + if (!instances_exist_any([obj_turn_end,obj_ncombat,obj_fleet,obj_fleet_select,obj_popup,obj_star_select])){ + if (obj_controller.helpful_places.entered()){ + good=false; + } + } + } } if (obj_controller.popup=3){// Prevent hitting through the planet select diff --git a/scripts/scr_weapon/scr_weapon.gml b/scripts/scr_weapon/scr_weapon.gml index c1b8cf8c7b..1c3e96ac2d 100644 --- a/scripts/scr_weapon/scr_weapon.gml +++ b/scripts/scr_weapon/scr_weapon.gml @@ -1,4 +1,308 @@ global.weapons = { + //30k Weapons + //Volkite Pack + "Volkite Culverin": { + "abbreviation": "VolkCul", + "attack": { + "standard": 700, + "master_crafted": 720, + "artifact": 740 + }, + "description": "The only man-portable heavy support Volkite, the Culverin has been a dreaded presence on the battlefields of the 31st millennium, where it would rend Contemptors apart and combust Marines by the dozen. Featuring the greatest range out of the family amongst the other heavier variants, its beam potency is outmatched by all heavier Volkites.", + "melee_hands": 1, + "ranged_hands": 2.5, + "ammo": 4, + "range": 22, + "spli": 12, + "arp": 0, + "tags": ["Volkite", "energy"] + }, + "Volkite Caliver": { + "abbreviation": "VolkCal", + "attack": { + "standard": 550, + "master_crafted": 570, + "artifact": 590 + }, + "description": "Featuring grater range, more precise fire and more stopping fire than the Charger, this is the rifle of the Volkite family, whereas its smaller brother is the assault rifle. A weapon most prominent in Tactical squads of the Great Crusade Legions, its potency is spoken of even those many thousands of years past their height.", + "melee_hands": 1, + "ranged_hands": 2.2, + "ammo": 6, + "range": 16, + "spli": 10, + "arp": 0, + "tags": ["Volkite", "energy"] + }, + "Volkite Charger": { + "abbreviation": "VolkCharg", + "attack": { + "standard": 400, + "master_crafted": 420, + "artifact": 440 + }, + "description": "One of the deadliest of the mainstay weapons in the Imperial arsenal during the Great Crusade. The humble Charger is a thermal ray weapon that deflagrates organic matter, combusting the target in extreme cases. Some variants even arc over multiple targets.", + "melee_hands": 1, + "ranged_hands": 2, + "ammo": 10, + "range": 10, + "spli": 6, + "arp": 0, + "tags": ["Volkite", "energy"] + }, + "Volkite Serpenta": { + "abbreviation": "VolkSerp", + "attack": { + "standard": 250, + "master_crafted": 270, + "artifact": 290 + }, + "description": "The pistol variant of the long-lost Volkite weapon type, the Serpenta was a mainstay of Moritats and often wielded by Centurions of the Legiones Astartes. Now a symbol of status to match its fearsome potency, a sighting of this ancient weapon would send many foes running.", + "melee_hands": 0, + "ranged_hands": 1, + "ammo": 10, + "range": 3, + "spli": 4, + "arp": 0, + "tags": ["Volkite", "energy", "pistol"] + }, + "Twin-linked Volkite Culverins":{ + "abbreviation": "T-LVolkCulv", + "attack": { + "standard": 250, + "master_crafted": 270, + "artifact": 290 + }, + + "description": "Ancient volkite type weaponry usually mounted on vehicles. It features two volkite culverins and is meant for long forgotten contemptor pattern dreadnaught.", + "melee_hands": 0, + "ranged_hands": 1, + "ammo": 10, + "range": 3, + "spli": 4, + "arp": 0, + "tags": ["Volkite", "energy", "dreadnought"] + }, + //Bolt Pack + "Phobos Bolt Pistol": { + "abbreviation": "PhBltPis", + "attack": { + "standard": 38, + "master_crafted": 43, + "artifact": 48 + }, + "description": "The shortened version of the Phobos Bolgun, this pistol like its brother features a .70 bolt and less bulk than its successors. Despite its most venerable origin it features better quality basic components than its modern counterparts but lacks anything more advanced than its simple firing mechanism and basic optics.", + "melee_hands": 0, + "ranged_hands": 1, + "ammo": 20, + "range": 3.5, + "spli": 2, + "arp": 0, + "tags": ["bolt", "pistol"] + }, + "Phobos Bolter": { + "abbreviation": "PhBltr", + "attack": { + "standard": 75, + "master_crafted": 80, + "artifact": 85 + }, + "description": "Created at the conception of the Imperium, this very first bolter pattern features a .70 caliber bolt as opposed to the 41st millennium's standard .75. Its form is far less bulky than the Godwyn, most prevalent in the modern Astartes armouries. Simpler in design in theory but required higher-tech components than what is currently available, so when the Heresy ended and the weaponry was streamlined for less logistical effort, the older patterns, such as the venerable Phobos, were phased out.", + "melee_hands": 1, + "ranged_hands": 2, + "ammo": 20, + "range": 13, + "spli": 3, + "arp": 0, + "tags": ["bolt"] + }, + "Mars Heavy Bolter": { + "abbreviation": "MarsHvyBltr", + "attack": { + "standard": 400, + "master_crafted": 430, + "artifact": 460 + }, + "description": "This is the prototype that turned into the staple of all Heavy Bolter designs. Introduced in early Great Crusade, it was one of the very first heavy support weapons churned out by the forges of Mechanicum.", + "melee_hands": 1, + "ranged_hands": 2.2, + "ammo": 12, + "range": 17, + "spli": 9, + "arp": 1, + "tags": ["heavy_ranged", "bolt"] + }, + "Tigris Combi Bolter": { + "abbreviation": "TigComBltr", + "attack": { + "standard": 100, + "master_crafted": 120, + "artifact": 140 + }, + "description": "During the Great Crusade, there came a need for a hand-held weapon of high rate of fire and respectable firepower that's easy to manufacture. Some Techpriest, or perhaps a Techmarine, put two bolters together and thus the Combi-Bolter was born. Phased out by the Storm Bolter, it is nevertheless a respectable weapon and a relic of more civilised times.", + "melee_hands": 1.1, + "ranged_hands": 1.1, + "ammo": 14, + "range": 19, + "spli": 11, + "arp": 0, + "tags": ["bolt"] + }, + //Plasma Pack + "Ryza Plasma Gun": { + "abbreviation": "RyzPlsmGn", + "attack": { + "standard": 325, + "master_crafted": 350, + "artifact": 375 + }, + "description": "One of many Plasma weapon patterns that came from the famed Forge World of Ryza. With its characteristic purple glow, alongside slight curvatures of the design, the mark of its forgeworld is impossible to miss. Featuring greater range and accuracy as well as pure stopping power, this is a weapon that even Terminators should fear to face.", + "melee_hands": 1, + "ranged_hands": 2, + "ammo": 18, + "range": 14, + "spli": 5, + "arp": 1, + "tags": ["plasma", "energy"] + }, + "Ryza Plasma Pistol": { + "abbreviation": "RyzPlsmPis", + "attack": { + "standard": 145, + "master_crafted": 160, + "artifact": 175 + }, + "description": "The smaller brother of the Ryzan Plasma Gun, it shares its characteristics as well as sleek design and purple glow. Once a regular weapon for Sergeants and some Moritats in the Legiones Astartes, with even some Consuls or Centurions favouring them over Volkites or Disintegrators, the humble Ryzan Plasma Pistol has earned its place as a vaunted relic of any armoury lucky enough to have it.", + "melee_hands": 0, + "ranged_hands": 1, + "ammo": 6, + "range": 4, + "spli": 3, + "arp": 1, + "tags": ["plasma", "energy", "pistol"] + }, + "Mars Plasma Cannon": { + "abbreviation": "MarsPlsmCnn", + "attack": { + "standard": 650, + "master_crafted": 700, + "artifact": 750 //I think that usual 25% increase will be too much for that weapon so applied +150. + }, + "description": "An ancient Plasma Cannon variant born in the bowels of Mother Mars. Once a staple of heavy weapons squads in the time of Legiones Astartes, now a revered relic with power beyond compare with any modern weapons, even those made in the forges of Mars and Ryza in this dark age. Sharing some design and components with Ryzan patterns, it features the same purple glow that makes them so easily distinguishable.", + "melee_hands": 1, + "ranged_hands": 3, + "ammo": 18, + "range": 16, + "spli": 8, + "arp": 1, + "tags": ["plasma", "energy"] + }, + //Melta Pack + "Primus Melta Gun": { + "abbreviation": "PrimMltGn", + "attack": { + "standard": 560, + "master_crafted": 585, + "artifact": 610 + }, + "description": "The Primus MK II Meltagun's origins have been lost to history, but the knowledge of its power and their bearers who served in the Legiones Astartes remains. Some theories have been made to its Ryzan origins due to the curvature of the body, but the famous Forge World denies those claims.", + "melee_hands": 1, + "ranged_hands": 2, + "ammo": 6, + "range": 2.5, + "spli": 2, + "arp": 1, + "tags": ["melta", "energy", "boarding"] + }, + "Proteus Multi-Melta": { + "abbreviation": "ProtMltMelt", + "attack": { + "standard": 1000, + "master_crafted": 1100, + "artifact": 1200 + }, + "description": "This Multi-Melta design originates, like many others used by Legiones Astartes, in the Dark Age of Technology. Deadlier than the current designs fielded by the Space Marine Chapters, it is a relic of both of the zenith of mankind's science and the last moments of the Emperor's true vision.", + "melee_hands": 1, + "ranged_hands": 3, + "ammo": 6, + "range": 4.5, + "spli": 2, + "arp": 1, + "tags": ["melta", "energy", "boarding"] + }, + //Flamer Pack + "Phaestos Flamer": { + "abbreviation": "PhFlmr", + "attack": { + "standard": 430, + "master_crafted": 585, + "artifact": 610 + }, + "description": "The Phaestos-pattern Flamer is a stark reminder of the time where Mankind's future was yet unmolested by the decaying stench of the Horus Heresy. Oddly shaped for the modern users, it is nonetheless not to be underestimated and its potent promethium-fueled flame has burned through armours of unnumbered heroes.", + "melee_hands": 1, + "ranged_hands": 2, + "ammo": 6, + "range": 2.5, + "spli": 6, + "arp": -1, + "tags": ["flame"] //Shouldn't it also feature "boarding"? + }, + //Melee Pack + "Power Scythe": { + "abbreviation": "PwrSct", + "attack": { + "standard": 250, + "master_crafted": 300, + "artifact": 350 + }, + "melee_mod": { + "standard": 1, + "master_crafted": 1.1, + "artifact": 1.2 + }, + "description": "One of many Power Weapon types made in the nascent Imperium, the Power Scythes never truly became a staple of any large force outside of specialist elements, and when even those faded into obscurity or went traitor, the production of the Power Scythes was halted. Since then few remain in Imperial use, and most can be found in hands of foul traitors.", + "melee_hands": 2, + "ranged_hands": 1, + "ammo": 0, + "range": 1, + "spli": 6, + "arp": 1, + "tags": ["power",] + }, + //Laser Pack + "Ryza Lascannon": { + "abbreviation": "RyzLascnn", + "attack": { + "standard": 750, + "master_crafted": 800, + "artifact": 850 + }, + "description": "The Forge World of Ryza is known not only for its mastery of Plasma weaponry, but also for its genius in Las weapon designs. This revered Ryzan Lascannon pattern can be dated to the Great Crusade, and as such it is the pinnacle of its kind as the Imperium was then. A common sight across the Legiones Astartes heavy support squads as well as Solar Auxilia, any Chapter blessed with one should count themselves lucky.", + "melee_hands": 1, + "ranged_hands": 3, + "ammo": 10, + "range": 24, + "spli": 1, + "arp": 1, + "tags": ["heavy_ranged", "las", "energy"] + }, + //misc pack + "Cthon Autocannon": { + "abbreviation": "CthAutocnn", + "attack": { + "standard": 480, + "master_crafted": 520, + "artifact": 560 + }, + "description": "Originating from the Warmaster's homeworld [allegedly untrue] of Cthonia, this Autocannon pattern was the chosen type of this weapon for Terminator Squads throughout the Great Crusade and subsequent Horus Heresy. While later designs may have outshined it in fire rate or range, this remains the hardest hitting autocannon to date, perhaps with the Kalibrax as a strong competitor.", + "melee_hands": 1, + "ranged_hands": 3, + "ammo": 30, + "range": 20, + "spli": 15, + "arp": 1, + "tags": ["heavy_ranged", "dreadnought"] + }, + //40k weapons "Storm Shield": { "description": "Protects twice as well when boarding. A powered shield that must be held with a hand. While powered by the marines armour it shimmers with blue energy.", "abbreviation": "StrmShld", @@ -14,12 +318,12 @@ global.weapons = { }, "melee_hands": 0.75, "ranged_hands": 1, - "tags": ["shield"], + "tags": ["shield","boarding 2"], "hp_mod": { "standard": 30, "master_crafted": 35, "artifact": 40 - }, + } }, "Boarding Shield": { "description": "Protects twice as well when boarding. Used in siege or boarding operations, this shield offers additional protection. It may be used with a 2-handed ranged weapon.", @@ -30,7 +334,7 @@ global.weapons = { "artifact": 6 }, "melee_hands": 0.75, - "tags": ["shield","boarding"], + "tags": ["shield","boarding 3"], "hp_mod": { "standard": 15, "master_crafted": 17.5, @@ -48,33 +352,35 @@ global.weapons = { "melee_hands": 0, "ranged_hands": 0.5, "ammo": 30, - "range": 3.1, - "spli": 1, - "arp": 0, + + "range": 4.1, + "spli": 0, + "arp": 1, "tags": ["pistol", "ancient", "las", "energy"], }, + "Combat Knife": { "abbreviation": "CbKnf", "attack": { - "standard": 25, - "master_crafted": 30, - "artifact": 35 + "standard": 100, + "master_crafted": 125, + "artifact": 150 }, "description": "More of a sword than a knife, this tough and thick blade becomes a deadly weapon in the hand of an Astartes.", "melee_hands": 0, "ranged_hands": 0, "ammo": 0, "range": 1, - "spli": 1, - "arp": 0, + "spli": 2, + "arp": 1, "tags": ["knife"], }, "Chainsword": { "abbreviation": "ChSwrd", "attack": { - "standard": 50, - "master_crafted": 60, - "artifact": 70 + "standard": 150, + "master_crafted": 180, + "artifact": 250 }, "description": "A standard Chainsword. It is popular among Assault Marines due to their raw power while maintaining speed.", "melee_hands": 1, @@ -82,15 +388,15 @@ global.weapons = { "ammo": 0, "range": 1, "spli": 4, - "arp": 0, - "tags": ["chain", "sword"], + "arp": 1, + "tags": ["chain", "sword","savage", "boarding 1"], }, "Chainaxe": { "abbreviation": "ChAxe", "attack": { - "standard": 90, - "master_crafted": 100, - "artifact": 110 + "standard": 175, + "master_crafted": 225, + "artifact": 275 }, "melee_mod": { "standard": 5, @@ -102,9 +408,9 @@ global.weapons = { "ranged_hands": 0, "ammo": 0, "range": 1, - "spli": 6, - "arp": 0, - "tags": ["chain", "axe", "dual"], + "spli": 3, + "arp": 1, + "tags": ["chain", "axe", "dual", "savage", "boarding 2"], }, "Company Standard": { "abbreviation": "CmpStnd", @@ -124,14 +430,16 @@ global.weapons = { "ranged_hands": 1, "range": 1, "spli": 1, + "arp": 1, "tags": ["banner"], + "recovery_chance" : 99, }, "Eviscerator": { "abbreviation": "Evisc", "attack": { - "standard": 180, - "master_crafted": 190, - "artifact": 200 + "standard": 250, + "master_crafted": 300, + "artifact": 350 }, "melee_mod": { "standard": 2, @@ -143,16 +451,16 @@ global.weapons = { "ranged_hands": 1, "ammo": 0, "range": 1, - "spli": 3, - "arp": 1, - "tags": ["chain", "sword"], + "spli": 6, + "arp": 2, + "tags": ["chain", "sword", "savage"], }, "Power Sword": { "abbreviation": "PwrSwrd", "attack": { - "standard": 180, - "master_crafted": 200, - "artifact": 240 + "standard": 225, + "master_crafted": 275, + "artifact": 325 }, "melee_mod": { "standard": 1, @@ -165,16 +473,16 @@ global.weapons = { "ammo": 0, "range": 1, "spli": 4, - "arp": 1, + "arp": 2, "special_properties": ["Parry"], - "tags": ["power", "sword"], + "tags": ["power", "sword", "martial", "boarding 1"], }, "Power Spear": { "abbreviation": "PwrSpear", "attack": { - "standard": 200, - "master_crafted": 220, - "artifact": 260 + "standard": 300, + "master_crafted": 375, + "artifact": 450 }, "melee_mod": { "standard": 1, @@ -186,10 +494,10 @@ global.weapons = { "ranged_hands": 0, "ammo": 0, "range": 1, - "spli": 6, - "arp": 1, + "spli": 3, + "arp": 2, "special_properties": ["Parry"], - "tags": ["power", "spear"], + "tags": ["power", "spear", "martial"], }, "Xenophase Blade": { "abbreviation": "XenoPhs", @@ -216,30 +524,30 @@ global.weapons = { "Chainfist": { "abbreviation": "ChFst", "attack": { - "standard": 550, - "master_crafted": 600, + "standard": 400, + "master_crafted": 550, "artifact": 700 }, "description": "Created by mounting a chainsword to a power fist, this weapon is easily able to carve through armoured bulkheads.", - "melee_hands": 1.25, - "ranged_hands": 1, + "melee_hands": 3, + "ranged_hands": 0, "range": 1, - "spli": 2, - "arp": 1, - "tags": ["power","boarding", "chain", "fist", "dual", "siege"], + "spli": 4, + "tags": ["power","boarding 3", "chain", "fist", "siege", "savage"], + "arp": 3, }, "Lascutter": { "abbreviation": "Lasct", "attack": { - "standard": 100, - "master_crafted": 150, - "artifact": 200 + "standard": 250, + "master_crafted": 300, + "artifact": 425 }, - "description": "Origonally industrial tools used for breaking through bulkheads, this laser weapon is devastating in close combat.", + "description": "Originally industrial tools used for breaking through bulkheads, this laser weapon is devastating in close combat.", "melee_hands": 1, "range": 1, - "arp": 1, - "tags": ["las","boarding", "siege"], + "arp": 4, + "tags": ["las","boarding 3", "siege"], }, "Power Weapon": { "abbreviation": "PwrWpn", @@ -259,15 +567,15 @@ global.weapons = { "ammo": 0, "range": 1, "spli": 3, - "arp": 1, + "arp": 2, "tags": ["power"], }, "Power Axe": { "abbreviation": "PwrAxe", "attack": { - "standard": 190, - "master_crafted": 220, - "artifact": 260 + "standard": 250, + "master_crafted": 300, + "artifact": 350 }, "melee_mod": { "standard": 1, @@ -279,16 +587,40 @@ global.weapons = { "ranged_hands": 0, "ammo": 0, "range": 1, + "spli": 3, + "arp": 2, + "tags": ["power", "axe", "dual","savage", "boarding 2"], + }, + "Omnissian Axe": { + "abbreviation": "OmnAxe", + "attack": { + "standard": 400, + "master_crafted": 450, + "artifact": 550 + }, + "melee_mod": { + "standard": 1, + "master_crafted": 1.1, + "artifact": 1.2 + }, + "description": "A symbol that is equally weapon and holy icon given only to those trained by the Adeptus Mechanicus and have shown their devotion to the Omnissiah in battle.", + "melee_hands": 1.5, + "ranged_hands": 0, + "ammo": 0, + "range": 1, "spli": 5, - "arp": 1, - "tags": ["power", "axe", "dual"], + "arp": 3, + "tags": ["power", "axe", "savage", "boarding 3"], + "specials": { + "combi_tool": 1 + } }, "Executioner Power Axe": { "abbreviation": "ExPwrAxe", "attack": { - "standard": 300, - "master_crafted": 350, - "artifact": 400 + "standard": 800, + "master_crafted": 850, + "artifact": 925 }, "melee_mod": { "standard": 10, @@ -300,15 +632,15 @@ global.weapons = { "ranged_hands": 2, "ammo": 0, "range": 1, - "spli": 2, - "arp": 1, - "tags": ["power", "axe"], + "spli": 5, + "arp": 3, + "tags": ["power", "axe", "martial"], }, "Power Fist": { "abbreviation": "PwrFst", "attack": { - "standard": 450, - "master_crafted": 500, + "standard": 400, + "master_crafted": 450, "artifact": 600 }, "melee_mod": { @@ -322,14 +654,14 @@ global.weapons = { "ammo": 0, "range": 1, "spli": 2, - "arp": 1, - "tags": ["power", "dual", "fist"], + "tags": ["power", "dual", "fist", "savage", "boarding 2"], + "arp": 3, }, "Power Fists": { "abbreviation": "PwrFsts", "attack": { - "standard": 900, - "master_crafted": 1000, + "standard": 800, + "master_crafted": 900, "artifact": 1200 }, "description": "A large, ceramite clad gauntlets surrounded by power energy fields. Though cumbersome to use, they dish out tremendous damage to enemies, leaving very little behind.", @@ -338,8 +670,8 @@ global.weapons = { "ammo": 0, "range": 1, "spli": 4, - "arp": 1, - "tags": ["power", "fist", "pair"], + "tags": ["power", "fist", "pair","savage" ,"boarding 2"], + "arp": 3, }, "Servo-arm(M)": { "abbreviation": "MchArm", @@ -354,14 +686,14 @@ global.weapons = { "ammo": 0, "range": 1, "spli": 2, - "arp": 1, + "arp": 3, "tags": ["siege"], }, "Boltstorm Gauntlet": { "abbreviation": "BlstGnt", "attack": { - "standard": 450, - "master_crafted": 500, + "standard": 400, + "master_crafted": 450, "artifact": 600 }, "description": "The Boltstorm Gauntlet is a Power Fists with an Integrated Bolter, so aside from being reinforced with a crackling power field and able to crush armour, bone and even thick vehicle plating, it is also capable of firing bolts at an astonishing rate", @@ -370,15 +702,15 @@ global.weapons = { "ammo": 0, "range": 1, "spli": 2, - "arp": 1, - "second_profiles": ["Integrated Bolter"], - "tags": ["power", "fist"], + "arp": 3, + "second_profiles": ["Integrated-Bolter"], + "tags": ["power", "fist", "savage", "boarding 2"], }, "Assault Chainfist": { "abbreviation": "AssltChFst", "attack": { - "standard": 550, - "master_crafted": 600, + "standard": 400, + "master_crafted": 550, "artifact": 700 }, "description": "Created by mounting a chainsword to a power fist, this weapon is easily able to carve through armoured bulkheads. Contains an integrated Assault Cannon", @@ -386,16 +718,16 @@ global.weapons = { "ranged_hands": 1, "range": 1, "spli": 2, - "arp": 1, + "arp": 3, "second_profiles": ["Assault Cannon"], - "tags": ["power","boarding", "chain", "fist", "dual", "siege"], + "tags": ["power","boarding 3", "chain", "fist", "dual", "siege"], }, "Lightning Claw": { "abbreviation": "LghtClw", "attack": { - "standard": 450, - "master_crafted": 500, - "artifact": 600 + "standard": 375, + "master_crafted": 425, + "artifact": 575 }, "description": "Lightning claws are specialized close combat weapons with built-in disruptor fields. These lethal claws rip into infantry like butter, bringing terror to the foe.", "melee_hands": 1.1, @@ -403,15 +735,15 @@ global.weapons = { "ammo": 0, "range": 1, "spli": 5, - "arp": 1, - "tags": ["power", "dual", "fist"], + "tags": ["power", "dual", "fist", "boarding 2", "martial"], + "arp": 2, }, "Dreadnought Lightning Claw": { "abbreviation": "LghtClw", "attack": { - "standard": 300, - "master_crafted": 400, - "artifact": 600 + "standard": 600, + "master_crafted": 700, + "artifact": 850 }, "melee_mod": { "standard": 1.2, @@ -424,16 +756,38 @@ global.weapons = { "ammo": 0, "range": 1, "spli": 15, - "arp": 1, + "arp": 3, "maintenance" : 0.1, - "tags": ["power", "vehicle", "dual", "dreadnought", "fist"], + "tags": ["power", "dual", "dreadnought", "fist"], + }, + "Contemptor CCW": { + "abbreviation": "ConCCW", + "attack": { + "standard": 600, + "master_crafted": 700, + "artifact": 850 + }, + "melee_mod": { + "standard": 1.2, + "master_crafted": 1.2, + "artifact": 1.2 + }, + "description": "A specialized Lightning Claw variant designed for Dreadnoughts, these claws are capable of ripping through enemy vehicles and infantry with ease.", + "melee_hands": 5, + "ranged_hands": 0, + "ammo": 0, + "range": 1, + "spli": 15, + "arp": 3, + "maintenance" : 0.1, + "tags": ["power", "dual", "dreadnought", "fist"], }, "Thunder Hammer": { "abbreviation": "ThndHmr", "attack": { - "standard": 650, - "master_crafted": 750, - "artifact": 900 + "standard": 500, + "master_crafted": 600, + "artifact": 750 }, "melee_mod": { "standard": 1.3, @@ -445,18 +799,18 @@ global.weapons = { "ranged_hands": 1, "ammo": 0, "range": 1, - "spli": 10, - "arp": 1, - "tags": ["power", "hammer", "siege"], + "spli": 3, + "arp": 3, "maintenance" : 0.1, "req_exp": 100, + "tags": ["power", "hammer", "siege", "savage", "boarding 2"], }, "Heavy Thunder Hammer": { "abbreviation": "HvyThndHmr", "attack": { - "standard": 975, - "master_crafted": 1125, - "artifact": 1350, + "standard": 700, + "master_crafted": 850, + "artifact": 1000, }, "melee_mod": { "standard": 1.3, @@ -468,18 +822,18 @@ global.weapons = { "ranged_hands": 2, "ammo": 0, "range": 1, - "spli": 15, - "arp": 1, - "tags": ["heavy_melee", "power", "hammer", "siege"], - "maintenance" : 0.1, + "arp": 3, + "spli": 4, + "maintenance" : 0.1, "req_exp": 100, + "tags": ["heavy_melee", "power", "hammer", "siege", "savage"], }, "Power Mace": { "abbreviation": "PwrMace", "attack": { - "standard": 600, - "master_crafted": 700, - "artifact": 800 + "standard": 400, + "master_crafted": 450, + "artifact": 600 }, "melee_mod": { "standard": 1.3, @@ -491,17 +845,17 @@ global.weapons = { "ranged_hands": 2, "ammo": 0, "range": 1, - "spli": 10, - "arp": 1, - "tags": ["power", "mace", "siege"], + "arp": 3, + "spli": 6, + "tags": ["power", "mace", "siege", "savage"], "req_exp": 100, }, "Mace of Absolution": { "abbreviation": "AbsltMace", "attack": { - "standard": 600, - "master_crafted": 700, - "artifact": 800 + "standard": 400, + "master_crafted": 450, + "artifact": 600 }, "melee_mod": { "standard": 1.3, @@ -514,9 +868,9 @@ global.weapons = { "ranged_hands": 2, "ammo": 0, "range": 1, - "spli": 10, - "arp": 1, - "tags": ["power", "mace", "siege", "pious"], + "spli": 6, + "arp": 3, + "tags": ["power", "mace", "siege", "pious", "savage"], "req_exp": 100, }, "Tome": { @@ -537,15 +891,15 @@ global.weapons = { "ammo": 0, "range": 1, "spli": 1, - "arp": 0, - "tags": ["arcane"], + "arp": 1, + "tags": ["arcane", "savage"], }, "Crozius Arcanum": { "abbreviation": "Crzus", "attack": { - "standard": 220, - "master_crafted": 250, - "artifact": 300 + "standard": 250, + "master_crafted": 300, + "artifact": 400 }, "melee_mod": { "standard": 1, @@ -558,15 +912,15 @@ global.weapons = { "ammo": 0, "range": 1, "spli": 4, - "arp": 1, - "tags": ["power", "mace", "pious"], + "arp": 2, + "tags": ["power", "mace", "pious", "savage", "boarding 2"], }, "Relic Blade": { "abbreviation": "RlcBld", "attack": { - "standard": 700, - "master_crafted": 850, - "artifact": 1000 + "standard": 600, + "master_crafted": 750, + "artifact": 900 }, "melee_mod": { "standard": 1, @@ -579,26 +933,60 @@ global.weapons = { "ammo": 0, "range": 1, "spli": 8, - "arp": 1, + "arp": 2, "special_properties": ["Parry"], - "maintenance" : 0.1, - "tags": ["power", "sword"], + "maintenance" : 0.1, + "tags": ["power", "sword", "martial"], + }, "Bolt Pistol": { "abbreviation": "BltPstl", "attack": { - "standard": 30, - "master_crafted": 35, - "artifact": 40 + "standard": 150, + "master_crafted": 175, + "artifact": 200 }, "description": "A smaller, more compact version of the venerable Boltgun. This model is produced in the standard Godwyn pattern.", "melee_hands": 0, "ranged_hands": 1, "ammo": 18, - "range": 3.1, - "spli": 1, - "arp": 0, - "tags": ["bolt", "pistol"], + "range": 4.1, + "spli": 2, + "arp": 1, + "tags": ["bolt", "pistol", "boarding 1"], + }, + "Wrist-Mounted Storm Bolter": { + "abbreviation": "WrstBlt", + "attack": { + "standard": 275, + "master_crafted": 300, + "artifact": 350 + }, + "description": "A smaller, more compact version of the venerable Boltgun. This model is produced in the standard Godwyn pattern.", + "melee_hands": 0, + "ranged_hands": 1, + "ammo": 10, + "range": 4.1, + "spli": 8, + "arp": 1, + "maintenance" : 0.1, + "tags": ["bolt", "pistol", "boarding 2"], + }, + "Shotgun": { + "abbreviation": "Shtgn", + "attack": { + "standard": 250, + "master_crafted": 300, + "artifact": 350 + }, + "description": "An Astartes Shotgun capable of firing slug and other specialist munitions deadly up close but loses effectiveness at range.", + "melee_hands": 0, + "ranged_hands": 1, + "ammo": 10, + "range": 4.1, + "spli": 8, + "arp": 1, + "tags": ["boarding 2"], }, "Webber": { "abbreviation": "Webbr", @@ -613,107 +1001,123 @@ global.weapons = { "ammo": 5, "range": 4.1, "spli": 1, - "arp": 0, + "arp": 1, "tags": ["immobolise"] }, "Grav-Pistol": { "abbreviation": "GrvPstl", "attack": { - "standard": 150, - "master_crafted": 200, - "artifact": 250 + "standard": 250, + "master_crafted": 300, + "artifact": 425 }, "description": "A smaller version of the Grav-Gun which utilises the gravitic reaction principle most commonly seen powering grav-vehicles such as the Land Speeder.", "melee_hands": 0, "ranged_hands": 1, "ammo": 4, - "range": 2.1, + "range": 4.1, "spli": 1, - "arp": 1, + "arp": 4, + "maintenance" : 0.2, "tags": ["grav", "pistol"], - "maintenance" : 0.8, + }, + "Integrated-Grav": { + "abbreviation": "IntGrv", + "attack": { + "standard": 400, + "master_crafted": 450, + "artifact": 600 + }, + "description": "", + "melee_hands": 0, + "ranged_hands": 0, + "ammo": 3, + "range": 5.1, + "spli": 1, + "arp": 4, + "tags": ["grav"] }, "Grav-Gun": { "abbreviation": "GrvGn", "attack": { - "standard": 450, - "master_crafted": 475, - "artifact": 500 + "standard": 400, + "master_crafted": 450, + "artifact": 600 }, "description": "A medium-sized weapon which utilises the gravitic reaction principle most commonly seen powering grav-vehicles such as the Land Speeder.", "melee_hands": 1, "ranged_hands": 2, - "ammo": 4, - "range": 4, + "ammo": 6, + "range": 5, "spli": 3, - "arp": 1, + "arp": 4, "tags": ["grav"], - "maintenance" : 0.1, + "maintenance" : 0.5, }, "Grav-Cannon": { "abbreviation": "GrvCan", "attack": { - "standard": 800, - "master_crafted": 850, - "artifact": 900 + "standard": 600, + "master_crafted": 700, + "artifact": 850 }, "description": "A bigger version of the Grav-Gun which utilises the gravitic reaction principle most commonly seen powering grav-vehicles such as the Land Speeder.", "melee_hands": 1, "ranged_hands": 2, "ammo": 8, - "range": 8, + "range": 6, "spli": 6, - "arp": 1, - "tags": ["grav", "heavy_weapon"], - "maintenance" : 0.2, + "arp": 4, + "tags": ["grav", "heavy_ranged"], + "maintenance" : 0.8, }, "Underslung Bolter": { "abbreviation": "UndBltr", "attack": { - "standard": 60, - "master_crafted": 70, - "artifact": 80 + "standard": 150, + "master_crafted": 200, + "artifact": 300 }, "description": "A compact, secondary Bolter weapon often attached under the barrel of a larger firearm. It allows for rapid fire in close quarters combat.", "melee_hands": 0, "ranged_hands": 1, "ammo": 0, "range": 10, - "spli": 2, - "arp": 0, + "spli": 3, + "arp": 1, "tags": ["bolt", "attached"] }, "Stalker Pattern Bolter": { "abbreviation": "StlkBltr", "attack": { - "standard": 100, - "master_crafted": 110, - "artifact": 120 + "standard": 180, + "master_crafted": 250, + "artifact": 380 }, "description": "The Stalker Bolter is a scoped long-range variant of the standard Bolter. Depending on the specific modifications made by the wielder, the Stalker Bolter can serve as a precision battle rifle or a high-powered sniper weapon.", "melee_hands": 0, "ranged_hands": 2, "ammo": 20, - "range": 15, - "spli": 1, + "range": 16, + "spli": 3, "arp": 1, "tags": ["bolt", "precision"] }, "Bolter": { "abbreviation": "Bltr", "attack": { - "standard": 50, - "master_crafted": 55, - "artifact": 60 + "standard": 150, + "master_crafted": 175, + "artifact": 200 }, "description": "A standard Bolter, a two-handed firearm that launches rocket propelled projectiles that detonate after penetrating the target. It is a versatile and iconic weapon of Adeptus Astartes, their resounding detonations carry the Emperor's Wrath.", "melee_hands": 1, "ranged_hands": 2, "ammo": 16, - "range": 12, - "spli": 3, - "arp": 0, - "tags": ["bolt"] + "range": 10, + "spli": 5, + "arp": 1, + "tags": ["bolt", "boarding 1"] }, "Heavy Flamer": { "abbreviation": "HvyFlmr", @@ -724,27 +1128,27 @@ global.weapons = { }, "description": "A significantly heavier flamer typically utilized on vehicle mounts. To carry them on foot requires Power Armor.", "melee_hands": 1, - "ranged_hands": 2.25, + "ranged_hands": 2, "ammo": 8, - "range": 2, - "spli": 5, - "arp": -1, - "tags": ["flame", "heavy_ranged"] + "range": 4, + "spli": 20, + "arp": 2, + "tags": ["flame", "heavy_ranged", "boarding 3"] }, "CCW Heavy Flamer": { "abbreviation": "CCWHvyFlmr", "attack": { - "standard": 250, - "master_crafted": 275, - "artifact": 300 + "standard": 500, + "master_crafted": 550, + "artifact": 600 }, "description": "A powerful close combat weapon integrated with a flamer. Enemeies rarely expect a dreadnough claw to spew promethium.", "melee_hands": 1, "ranged_hands": 0, "ammo": 6, "range": 2.1, - "spli": 5, - "arp": -1, + "spli": 20, + "arp": 2, "tags": ["dreadnought","heavy_ranged", "flame"] }, "Dreadnought Power Claw": { @@ -758,7 +1162,7 @@ global.weapons = { "melee_hands": 5, "range": 1, "spli": 10, - "arp": 1, + "arp": 4, "tags": ["power", "vehicle", "dual", "dreadnought", "fist"], "maintenance" : 0.1, }, @@ -773,96 +1177,111 @@ global.weapons = { "melee_hands": 5, "range": 1, "spli": 10, - "arp": 1, + "arp": 4, "tags": ["vehicle", "dreadnought", "fist"], "maintenance" : 0.1, }, "Inferno Cannon": { "abbreviation": "InfCann", "attack": { - "standard": 400, - "master_crafted": 440, - "artifact": 480 + "standard": 750, + "master_crafted": 875, + "artifact": 1000 }, "description": "A huge vehicle-mounted flame weapon that fires with explosive force. The reservoir is liable to explode.", - "melee_hands": 0, - "ranged_hands": 3, + "ranged_hands": 5, "ammo": 0, - "range": 3.1, + "range": 4.1, "spli": 20, - "arp": -1, + "arp": 2, "tags": ["vehicle","heavy_ranged", "flame", "dreadnought"] }, + "Integrated-Melta": { + "abbreviation": "IntMlt", + "attack": { + "standard": 400, + "master_crafted": 475, + "artifact": 600 + }, + "description": "", + "melee_hands": 0, + "ranged_hands": 0, + "ammo": 5, + "range": 3.1, + "spli": 1, + "arp": 4, + "tags": ["melta"] + }, "Meltagun": { "abbreviation": "Mltgn", "attack": { - "standard": 450, - "master_crafted": 475, - "artifact": 500 + "standard": 350, + "master_crafted": 425, + "artifact": 550 }, "description": "A loud weapon that roars with fury, this gun vaporizes flesh and armor alike. Due to heat dissipation, it has only a short range.", "melee_hands": 1, "ranged_hands": 2, - "ammo": 4, + "ammo": 6, "range": 2.1, - "spli": 1, - "arp": 1, - "tags": ["melta","boarding"] + "spli": 6, + "arp": 3, + "tags": ["melta","boarding 3"] }, "Multi-Melta": { "abbreviation": "MltMelt", "attack": { - "standard": 800, - "master_crafted": 850, - "artifact": 900 + "standard": 500, + "master_crafted": 600, + "artifact": 700 }, "description": "Though bearing longer range than the Meltagun, this weapon's great size usually restricts it to vehicles though those with Power Armor can carry this cumbersome weapon into battle.", "melee_hands": 1, - "ranged_hands": 2.25, + "ranged_hands": 2, "ammo": 8, "range": 4.1, - "spli": 1, - "arp": 1, - "tags": ["melta", "heavy_ranged", "dreadnought"] + "spli": 10, + "arp": 3, + "tags": ["melta", "heavy_ranged", "dreadnought", "boarding 1"] }, "Plasma Pistol": { "abbreviation": "PlsmPstl", "attack": { - "standard": 115, - "master_crafted": 130, - "artifact": 150 + "standard": 220, + "master_crafted": 270, + "artifact": 320 }, "description": "A pistol variant of the plasma gun, this dangerous-to-use weapon has exceptional armor-piercing capabilities.", "melee_hands": 0, "ranged_hands": 1, - "ammo": 0, - "range": 3.1, - "spli": 1, - "arp": 1, - "tags": ["plasma", "energy", "pistol"] + "ammo": 4, + "range": 5.1, + "spli": 2, + "arp": 3, + "tags": ["plasma", "energy", "pistol", "boarding 1"] }, "Plasma Cutter": { // Basically a dual-linked plasma pistol "abbreviation": "PlsmCt", "attack": { - "standard": 230, - "master_crafted": 260, - "artifact": 300 + "standard": 220, + "master_crafted": 270, + "artifact": 320 }, "description": "While actually intended to be used on the battlefield as a tool to repair damaged war machines, the Plasma Cutter is equally adept at slicing through even terminator armour with its intense, constant beam of superheated plasma.", "melee_hands": 0, "ranged_hands": 0, "ammo": 0, - "range": 3.1, + "range": 4.1, "spli": 1, - "arp": 1, + "arp": 3, "tags": ["plasma", "energy", "pistol"] }, "Infernus Pistol": { "abbreviation": "InfPstl", "attack": { - "standard": 100, - "master_crafted": 110, - "artifact": 120 + "standard": 250, + "master_crafted": 280, + "artifact": 325 }, "description": "The Infernus Pistol is a compact pistol varient of the melta gun. A brutal blast of heat to burn away the The Emperor's foes.", "melee_hands": 0, @@ -870,63 +1289,95 @@ global.weapons = { "ammo": 4, "range": 2.1, "spli": 3, - "arp": 1, - "tags": ["melta", "pistol"] + "arp": 3, + "tags": ["melta", "pistol", "boarding 2"] + }, + "Integrated-Plasma": { + "abbreviation": "IntPls", + "attack": { + "standard": 300, + "master_crafted": 350, + "artifact": 450 + }, + "description": "", + "melee_hands": 0, + "ranged_hands": 0, + "ammo": 6, + "range": 10, + "spli": 4, + "arp": 3, + "tags": ["plasma","energy"] }, "Plasma Gun": { "abbreviation": "PlsmGn", "attack": { - "standard": 250, - "master_crafted": 275, - "artifact": 300 + "standard": 300, + "master_crafted": 350, + "artifact": 450 }, "description": "A two-handed weapon that launches blobs of plasma at the target. They are considered both sacred and dangerous, overheating through rapid firing of the weapon. Overheating can result in detonation of the weapon, killing the wielder.", - "melee_hands": 0, + "melee_hands": 1, "ranged_hands": 2, "ammo": 16, - "range": 12, - "spli": 3, - "arp": 1, - "tags": ["plasma", "energy"] + "range": 10, + "spli": 4, + "arp": 3, + "tags": ["plasma", "energy", "boarding 1"] }, "Plasma Cannon": { "abbreviation": "PlsmCan", "attack": { - "standard": 500, - "master_crafted": 600, + "standard": 450, + "master_crafted": 550, "artifact": 750 }, "description": "A heavy variant of the plasma gun, its power output is significantly higher and its damage capability shows. However, it maintains the overheating risk of the Plasma Gun", "melee_hands": 1, - "ranged_hands": 3, + "ranged_hands": 2, "ammo": 16, - "range": 14, - "spli": 2, - "arp": 1, + "range": 10, + "spli": 8, + "arp": 3, "tags": ["plasma","energy","heavy_ranged", "dreadnought"] }, "Sniper Rifle": { - "abbreviation": "SnprRfl", + "abbreviation": "SnpRfl", "attack": { - "standard": 80, - "master_crafted": 88, - "artifact": 96 + "standard": 180, + "master_crafted": 220, + "artifact": 320 }, - "description": "The Sniper Rifle fires a solid shell over long range and boasts powerful telescopic sights to assist, allowing the user to target enemy weak points and distant foes.", + "description": "A form of Needle sniper rifle. Boasts a powerful telescopic sight that allows the wielder to target enemy weak points and distant foes with extreme accuracy, firing slivers of crystallized toxins.", "melee_hands": 1, "ranged_hands": 2, "ammo": 20, - "range": 18, + "range": 14, "spli": 1, - "arp": 0, + "arp": 1, + "tags": ["precision", "rifle"] + }, + "Deathwatch Sniper Rifle": { + "abbreviation": "DwSnpRfl", + "attack": { + "standard": 250, + "master_crafted": 300, + "artifact": 350 + }, + "description": "A heavy Needler sniper rifle used by the Deathwatch for long-range anti-personnel and anti-materiel work. A highly-respected and revered weapon, it is often selected as the weapon of choice for snipers in many Deathwatch Kill-teams.", + "melee_hands": 1, + "ranged_hands": 2, + "ammo": 20, + "range": 14, + "spli": 1, + "arp": 2, "tags": ["precision", "rifle"] }, "Assault Cannon": { "abbreviation": "AssCann", "attack": { - "standard": 240, - "master_crafted": 264, - "artifact": 288 + "standard": 400, + "master_crafted": 440, + "artifact": 500 }, "description": "A heavy rotary autocannon with a devastating fire rate that can be counted in the hundreds per minute. It is incredibly effective against infantry and light armored targets.", "melee_hands": 2.1, @@ -934,55 +1385,87 @@ global.weapons = { "ammo": 5, "range": 12, "spli": 20, - "arp": 1, - "tags": ["heavy_ranged", "dreadnought"] + "arp": 2, + "tags": ["heavy_ranged", "terminator", "dreadnought"] + }, + "Kheres Assault Cannon": { + "abbreviation": "KhrAssCnn", + "attack": { + "standard": 440, + "master_crafted": 460, + "artifact": 480 + }, + "description": "Forged in the forges of Mars and carried into battle by the mightiest of the Emperor's warriors, the Kheres Assault Cannon is a weapon of devastating reputation. Its rotary barrels roar with unceasing fury, unleashing a deluge of mass-reactive shells that tear through flesh, ceramite, and adamantium alike.", + "melee_hands": 2.1, + "ranged_hands": 3, + "ammo": 5, + "range": 14, + "spli": 20, + "arp": 2, + "tags": ["heavy_ranged", "terminator", "dreadnought", "ancient"] }, "Autocannon": { "abbreviation": "Autocnn", "attack": { - "standard": 380, - "master_crafted": 400, - "artifact": 430 + "standard": 450, + "master_crafted": 500, + "artifact": 600 }, "description": "A rapid-firing weapon able to use a wide variety of ammunition, from mass-reactive explosive to solid shells. It has been found to be incredibly effective against large groups of targets and even Traitor Astartes to an extent.", "melee_hands": 0, - "ranged_hands": 2.25, + "ranged_hands": 2, "ammo": 25, - "range": 18, - "spli": 15, - "arp": 1, - "tags": ["heavy_ranged", "dreadnought"] + "range": 14, + "spli": 12, + "arp": 2, + "tags": ["heavy_ranged","explosive", "dreadnought"] }, "Missile Launcher": { "abbreviation": "MsslLnch", "attack": { - "standard": 250, - "master_crafted": 275, - "artifact": 300 + "standard": 300, + "master_crafted": 350, + "artifact": 425 }, - "description": "This shoulder mounted weapon is capable of firing either armor-piercing or fragmentation rockets. It's ammunition is limited by what the bearer has carried with them.", + "description": "This shoulder fired weapon is capable of firing either armor-piercing or fragmentation rockets. It's ammunition is limited by what the bearer has carried with them.", "melee_hands": 1, "ranged_hands": 2, "ammo": 6, - "range": 24, - "spli": 3, - "arp": 0, - "tags": ["heavy_ranged", "dreadnought"] + "range": 12, + "spli": 10, + "arp": 2, + "tags": ["heavy_ranged","explosive", "dreadnought"] }, - "Lascannon": { - "abbreviation": "Lascnn", + "Cyclone Missile Launcher": { + "abbreviation": "CycLnch", "attack": { "standard": 600, "master_crafted": 700, + "artifact": 950 + }, + "description": "This power pack mounted weapon is capable of unleashing a hail of either armor-piercing or fragmentation rockets. It's ammunition is limited by what the bearer has carried with them.", + "melee_hands": 1, + "ranged_hands": 2, + "ammo": 6, + "range": 8, + "spli": 20, + "arp": 2, + "tags": ["heavy_ranged","explosive"] + }, + "Lascannon": { + "abbreviation": "Lascnn", + "attack": { + "standard": 450, + "master_crafted": 600, "artifact": 900 }, "description": "A formidable laser weapon, the lascannon can pierce most vehicles or power armored targets from a tremendous range. The weapon is known for its reliability in combat.", "melee_hands": 1, - "ranged_hands": 2.25, + "ranged_hands": 2, "ammo": 8, - "range": 24, + "range": 20, "spli": 1, - "arp": 1, + "arp": 4, "tags": ["heavy_ranged", "las", "energy"] }, "Conversion Beam Projector": { @@ -998,47 +1481,63 @@ global.weapons = { "ammo": 1, "range": 20, "spli": 3, - "arp": 1, + "arp": 4, "tags": ["heavy_ranged", "ancient"] }, - "Integrated Bolter": { + "Heavy Conversion Beamer": { + "abbreviation": "HvyCnvBm", + "attack": { + "standard": 500, + "master_crafted": 550, + "artifact": 600 + }, + "description": "An ancient relic of the Dark Age of Technology, the Heavy Conversion Beamer is a marvel of destructive science rarely entrusted to Imperial commanders. This esoteric weapon channels vast reserves of energy into a focused beam of coruscating light, tearing matter apart at the molecular level and converting it into raw energy in a cataclysmic chain reaction. The weapon’s lethality grows with distance — the further its target, the more apocalyptic the discharge. To stand at the far end of a Heavy Conversion Beamer’s wrath is to be annihilated in a searing blaze that leaves nothing but scorched ruin in its wake. Few battlefields have witnessed its fury and remained unchanged, for the weapon is as much a terror to its enemies as a reminder of the Imperium’s dwindling grasp on its most potent technologies.", + "melee_hands": 0, + "ranged_hands": 1, + "ammo": 1, + "range": 20, + "spli": 3, + "arp": 1, + "tags": ["heavy_ranged", "ancient", "dreadnought"] + }, + "Integrated-Bolter": { "abbreviation": "IntgBltr", "attack": { - "standard": 50, - "master_crafted": 55, - "artifact": 60 + "standard": 150, + "master_crafted": 200, + "artifact": 300 }, "description": "A Bolter that can be built directly into the structure of the vehicle, armor, another weapon or Dreadnought. When used as a weapon, it leaves both hands free, allowing to use any, even a twohanded weapon, efficiently.", "melee_hands": 0, "ranged_hands": 0, - "ammo": 20, - "range": 12, - "spli": 4, - "arp": 0, + "ammo": 8, + "range": 10, + "spli": 5, + "arp": 1, "tags": ["bolt"] }, "Twin Linked Heavy Bolter": { "abbreviation": "TwnHvyBltr", "attack": { - "standard": 320, - "master_crafted": 352, - "artifact": 384 + "standard": 450, + "master_crafted": 500, + "artifact": 650 }, "description": "Twin-linked Heavy Bolters are an upgraded version of the standard Heavy Bolter weapon, which is known for its high rate of fire and effectiveness against infantry and light vehicles.", "melee_hands": 0, "ranged_hands": 0, "ammo": 20, "range": 16, - "spli": 9, - "arp": 1, + "spli": 28, + "arp": 2, "tags": ["bolt", "heavy_ranged", "vehicle", "dreadnought"] }, "Twin Linked Lascannon": { "abbreviation": "TwnLascnn", "attack": { - "standard": 600, - "master_crafted": 700, - "artifact": 900 + "standard": 800, + "master_crafted": 900, + "artifact": 1000 }, "description": "The Twin-Linked Lascannons is a powerful anti-armour weapons that fire highly focused and devastating duel energy beams capable of penetrating even the toughest armor.", "melee_hands": 0, @@ -1046,47 +1545,47 @@ global.weapons = { "ammo": 8, "range": 24, "spli": 2, - "arp": 1, + "arp": 4, "tags": ["las", "energy", "heavy_ranged", "vehicle", "dreadnought"] }, "Heavy Bolter": { "abbreviation": "HvyBltr", "attack": { - "standard": 320, - "master_crafted": 352, - "artifact": 384 + "standard": 250, + "master_crafted": 300, + "artifact": 450 }, "description": "The Heavy Bolter is a heavy weapon that fires larger and more powerful bolt shells compared to the standard Bolter.", "melee_hands": 1, - "ranged_hands": 2, + "ranged_hands": 2.2, "ammo": 10, - "range": 16, - "spli": 6, - "arp": 1, + "range": 14, + "spli": 12, + "arp": 2, "tags": ["heavy_ranged", "bolt"] }, "Infernus Heavy Bolter": { "abbreviation": "InfrHvyBltr", "attack": { - "standard": 320, - "master_crafted": 352, - "artifact": 384 + "standard": 250, + "master_crafted": 300, + "artifact": 450 }, "description": "The Deathwatch mag-clamp rare suspensor discs onto their infernus heavy bolters that reduce the weapon’s effective weight considerably. Such weapons are further bolstered by underslung heavy flamers that can incinerate those enemies that make it through the hail of explosive bolts.", "melee_hands": 1, - "ranged_hands": 2, + "ranged_hands": 2.2, "ammo": 10, - "range": 16, - "spli": 6, - "arp": 1, + "range": 14, + "spli": 12, + "arp": 2, "second_profiles": ["Flamer"], "tags": ["heavy_ranged", "combi", "bolt"] }, "Whirlwind Missiles": { "attack": { - "standard": 400, - "master_crafted": 440, - "artifact": 480 + "standard": 600, + "master_crafted": 650, + "artifact": 800 }, "description": "The Whirlwind Missile Launcher is a vehicle-mounted artillery weapon that launches a barrage of powerful missiles at the enemy.", "abbreviation": "WhrlMssl", @@ -1094,20 +1593,29 @@ global.weapons = { "ranged_hands": 0, "ammo": 6, "range": 20, - "spli": 25, - "arp": 1, + "spli": 40, + "arp": 2, "tags": ["vehicle","heavy_ranged", "indirect"] }, "HK Missile": { "abbreviation": "HKMssl", "description": "A single shot hunter killer missile that serves as a powerful anti armour/aircraft deterent.", - "tags": ["HK"] + "attack": { + "standard": 350, + "master_crafted": 400, + "artifact": 450 + }, + "arp": 1, + "range": 50, + "ammo": 1, + "spli": 1, + "tags": ["vehicle"] }, "Twin Linked Heavy Bolter Mount": { "attack": { - "standard": 240, - "master_crafted": 264, - "artifact": 288 + "standard": 450, + "master_crafted": 550, + "artifact": 700 }, "description": "The Twin-linked Heavy Bolters are an upgraded version of the standard Heavy Bolter weapon. They are mounted onto vehicles to create effective fire support platforms.", "abbreviation": "TwnHvyBltr", @@ -1115,15 +1623,15 @@ global.weapons = { "ranged_hands": 0, "ammo": 20, "range": 16, - "spli": 3, - "arp": 1, + "spli": 21, + "arp": 2, "tags": ["vehicle", "dreadnought", "heavy_ranged", "bolt"] }, "Twin Linked Lascannon Mount": { "attack": { - "standard": 250, - "master_crafted": 275, - "artifact": 300 + "standard": 800, + "master_crafted": 900, + "artifact": 1000 }, "description": "The Twin-Lascannons are powerful anti-armour weapons that fire highly focused and devastating energy beams capable of penetrating even the toughest armour. This version is mounted onto vehicles to incease anti-armor capabilities.", "abbreviation": "TwnLascnn", @@ -1131,15 +1639,15 @@ global.weapons = { "ranged_hands": 0, "ammo": 10, "range": 20, - "spli": 3, - "arp": 1, + "spli": 2, + "arp": 4, "tags": ["las", "energy", "vehicle", "heavy_ranged", "dreadnought"] }, "Twin Linked Assault Cannon Mount": { "attack": { - "standard": 240, - "master_crafted": 264, - "artifact": 288 + "standard": 800, + "master_crafted": 900, + "artifact": 1100 }, "description": "A twin mount of rotary autocannons, boasting an incredible rate of fire numbering in the hundreds of shots fired per second.", "abbreviation": "TwnAssCnn", @@ -1147,15 +1655,15 @@ global.weapons = { "ranged_hands": 0, "ammo": 6, "range": 12, - "spli": 30, - "arp": 1, + "spli": 40, + "arp": 2, "tags": ["vehicle","heavy_ranged", "pintle", "dreadnought"] }, "Reaper Autocannon Mount": { "attack": { - "standard": 500, - "master_crafted": 550, - "artifact": 600 + "standard": 700, + "master_crafted": 850, + "artifact": 1000 }, "description": "An archaic twin-linked autocannon design dating back to the Great Crusade. The Reaper Autocannon is effective against infantry and armored targets. This version is mounted onto vehicles.", "abbreviation": "RprAtcnn", @@ -1163,15 +1671,15 @@ global.weapons = { "ranged_hands": 0, "ammo": 25, "range": 15, - "spli": 6, - "arp": 1, + "spli": 24, + "arp": 2, "tags": ["vehicle","heavy_ranged", "pintle"] }, "Quad Linked Heavy Bolter Sponsons": { "attack": { - "standard": 320, - "master_crafted": 352, - "artifact": 384 + "standard": 800, + "master_crafted": 900, + "artifact": 1100 }, "description": "Quad-linked Heavy Bolters are a significantly upgraded version of the standard Heavy Bolter mount; already punishing in a single mount, this quad mount is devastating against a variety of targets.", "abbreviation": "QdHvyBltrs", @@ -1179,15 +1687,15 @@ global.weapons = { "ranged_hands": 0, "ammo": 15, "range": 16, - "spli": 5, - "arp": 1, + "spli": 50, + "arp": 2, "tags": ["bolt","heavy_ranged", "vehicle", "sponson"] }, "Twin Linked Lascannon Sponsons": { "attack": { - "standard": 600, - "master_crafted": 700, - "artifact": 900 + "standard": 800, + "master_crafted": 1000, + "artifact": 1200 }, "description": "The Twin-Linked Lascannons are powerful anti-armour weapons that fire highly focused and devastating energy beams capable of penetrating even the toughest armour. This version is mounted onto the sides of vehicles.", "abbreviation": "TwnLascnns", @@ -1195,15 +1703,15 @@ global.weapons = { "ranged_hands": 0, "ammo": 5, "range": 20, - "spli": 3, - "arp": 1, + "spli": 4, + "arp": 4, "tags": ["las", "energy", "vehicle", "heavy_ranged", "sponson", "twin_linked"] }, "Lascannon Sponsons": { "attack": { - "standard": 500, - "master_crafted": 600, - "artifact": 750 + "standard": 700, + "master_crafted": 850, + "artifact": 1000 }, "description": "Lascannons are powerful anti-armour weapons that fire highly focused and devastating energy beams capable of penetrating even the toughest armour. This version is mounted onto the sides of vehicles.", "abbreviation": "Lscnns", @@ -1211,15 +1719,15 @@ global.weapons = { "ranged_hands": 0, "ammo": 8, "range": 20, - "spli": 1, - "arp": 1, + "spli": 2, + "arp": 4, "tags": ["las", "energy","heavy_ranged", "vehicle", "sponson"] }, "Hurricane Bolter Sponsons": { "attack": { - "standard": 50, - "master_crafted": 55, - "artifact": 60 + "standard": 600, + "master_crafted": 700, + "artifact": 800 }, "description": "Hurricane Bolters are large hex-mount bolter arrays that are able to deliver a withering hail of anti-infantry fire at short ranges. This version is mounted onto the sides of vehicles.", "abbreviation": "HrcBltrs", @@ -1228,105 +1736,105 @@ global.weapons = { "ammo": 10, "range": 10, "spli": 60, - "arp": 0, + "arp": 1, "tags": ["bolt","heavy_ranged", "vehicle", "sponson"] }, "Flamestorm Cannon Sponsons": { "attack": { - "standard": 600, - "master_crafted": 660, - "artifact": 720 + "standard": 750, + "master_crafted": 850, + "artifact": 900 }, "description": "A huge vehicle-mounted flamethrower cannon, the heat produced by this terrifying weapon can melt armoured ceramite.", "abbreviation": "FlmstCnns", "melee_hands": 0, "ranged_hands": 0, "ammo": 6, - "range": 2, - "spli": 3, - "arp": 1, + "range": 4.1, + "spli": 30, + "arp": 3, "tags": ["flame","heavy_ranged", "vehicle", "sponson"] }, "Twin Linked Heavy Flamer Sponsons": { "attack": { - "standard": 500, - "master_crafted": 550, - "artifact": 600 + "standard": 600, + "master_crafted": 750, + "artifact": 900 }, "description": "A twin-linked significantly heavier flamer attached to the sponsons on a vehicle.", "abbreviation": "TwnHvyFlmrs", "melee_hands": 0, "ranged_hands": 0, "ammo": 8, - "range": 2.1, - "spli": 8, - "arp": -1, + "range": 4.1, + "spli": 40, + "arp": 2, "tags": ["flame","heavy_ranged", "vehicle", "dreadnought", "sponson"] }, "Twin Linked Bolters": { "attack": { - "standard": 80, - "master_crafted": 140, - "artifact": 180 + "standard": 275, + "master_crafted": 350, + "artifact": 450 }, "description": "A Twin-linked Bolter consists of two Bolter weapons mounted side by side, typically on a vehicle or a dedicated weapons platform.", "abbreviation": "TwnBltrs", "melee_hands": 1, "ranged_hands": 2, "ammo": 30, - "range": 12, - "spli": 6, - "arp": 0, + "range": 10, + "spli": 10, + "arp": 1, "tags": ["bolt", "vehicle"] }, "Twin Linked Multi-Melta Sponsons": { "abbreviation": "TwnMltMelts", "attack": { - "standard": 800, - "master_crafted": 850, - "artifact": 900 + "standard": 1200, + "master_crafted": 1400, + "artifact": 1650 }, "description": "Though bearing longer range than the Meltagun, this weapon's great size usually restricts it to vehicles. In this case it is mounted to the sponsons on a vehicle.", "melee_hands": 0, "ranged_hands": 0, "ammo": 8, "range": 4.1, - "spli": 2, - "arp": 1, + "spli": 20, + "arp": 4, "tags": ["vehicle","heavy_ranged", "Sponson", "melta"], "maintenance" : 0.05, }, "Twin Linked Volkite Culverin Sponsons": { "abbreviation": "TwnVlkCulvs", "attack": { - "standard": 480, - "master_crafted": 510, - "artifact": 540 + "standard": 950, + "master_crafted": 1150, + "artifact": 1300 }, "description": "An advanced thermal weapon from a bygone era, Volkite Culverins are able to ignite entire formations of enemy forces. In this case it is mounted to the sponsons on a vehicle.", "melee_hands": 0, "ranged_hands": 0, "ammo": 25, "range": 18, - "spli": 9, - "arp": 0, + "spli": 12, + "arp": 3, "tags": ["vehicle","heavy_ranged", "Sponson", "volkite", "ancient"] }, "Heavy Bolter Sponsons": { "abbreviation": "HvyBltrs", "attack": { - "standard": 240, - "master_crafted": 264, - "artifact": 288 + "standard": 450, + "master_crafted": 550, + "artifact": 750 }, "description": "Heavy Bolters are mounted in sponsons. They are known for high rates of fire and effectiveness against infantry and light vehicles.", "melee_hands": 0, "ranged_hands": 0, "ammo": 20, - "range": 16, - "spli": 4, - "arp": 1, - "tags": ["heavy_ranged", "vehicle", "sponson", "bolt"], + "range": 14, + "spli": 28, + "arp": 2, + "tags": ["heavy_ranged", "vehicle", "sponson", "bolt"] }, "Heavy Flamer Sponsons": { "abbreviation": "HvyFlmrs", @@ -1340,9 +1848,9 @@ global.weapons = { "melee_hands": 0, "ranged_hands": 0, "ammo": 8, - "range": 2.1, - "spli": 4, - "arp": -1, + "range": 4.1, + "spli": 40, + "arp": 2, "tags": ["flame","heavy_ranged", "vehicle", "sponson"], "maintenance" : 0.05, }, @@ -1350,67 +1858,67 @@ global.weapons = { "abbreviation": "VlkClvs", "attack": { "standard": 480, - "master_crafted": 528, - "artifact": 576 + "master_crafted": 600, + "artifact": 750 }, "description": "An advanced thermal weapon from a bygone era, Volkite Culverins are able to ignite entire formations of enemy forces. In this case it is mounted to the sponsons on a vehicle.", "melee_hands": 0, "ranged_hands": 0, "ammo": 25, "range": 18, - "spli": 5, - "arp": 1, + "spli": 6, + "arp": 3, "tags": ["vehicle","heavy_ranged", "Sponson", "volkite", "ancient"] }, "Autocannon Turret": { "abbreviation": "Autocnn", "attack": { - "standard": 380, - "master_crafted": 528, - "artifact": 576 + "standard": 600, + "master_crafted": 700, + "artifact": 850 }, "description": "A Predator-compatible turret mounting a reliable all-purpose autocannon capable of doing effective damage to infantry and lightly armored targets.", "melee_hands": 0, "ranged_hands": 0, - "ammo": 25, + "ammo": 18, "range": 18, "spli": 15, - "arp": 0, - "tags": ["vehicle","heavy_ranged", "turret"] + "arp": 2, + "tags": ["vehicle","heavy_ranged","explosive", "turret"] }, "Storm Bolter": { "abbreviation": "StrmBltr", "attack": { - "standard": 80, - "master_crafted": 88, - "artifact": 96 + "standard": 275, + "master_crafted": 300, + "artifact": 350 }, "description": "Compact and double-barreled, this bolt weapon is inaccurate but grants an enormous amount of firepower. Its psychological effect on the enemy should not be understated.", - "melee_hands": 1.1, - "ranged_hands": 1.1, + "melee_hands": 1, + "ranged_hands": 2, "ammo": 10, - "range": 10, - "spli": 6, - "arp": 0, - "tags": ["bolt"], - "maintenance" : 0.03, + "range": 8, + "spli": 8, + "arp": 1, + "maintenance" : 0.03, + "tags": ["bolt", "boarding 2"] + }, "Hand Flamer": { "abbreviation": "HndFlmr", "attack": { - "standard": 125, - "master_crafted": 190, - "artifact": 210 + "standard": 250, + "master_crafted": 300, + "artifact": 450 }, "description": "Along with using a lower-capacity fuel tank it has much reduced range, which makes it suited for assault and close-combat purposes, incinerating foes at short range. The weapon is often used by assault squads.", "melee_hands": 0, "ranged_hands": 1, - "ammo": 2, - "range": 2.1, // Infernus pistol has 2 range, so - "spli": 2, // This should probably be increased to at least 3, but maybe even 5 or 10 - "arp": -1, - "tags": ["pistol", "flame"] //, - // "maintenance" : 0.01, - decide on the value you prefer + "ammo": 4, + "range": 3.1, + "spli": 8, + "arp": 1, + "tags": ["pistol", "flame", "boarding 2"] }, "Flamer": { "abbreviation": "Flmr", @@ -1427,118 +1935,118 @@ global.weapons = { "description": "Blackened at the tip, this weapon unleashes a torrent of burning promethium - all the better to cleanse sin and impurity with.", "melee_hands": 1, "ranged_hands": 2, - "ammo": 4, - "range": 2.1, - "spli": 4, - "arp": -1, - "tags": ["flame"], - "maintenance" : 0.01, + "ammo": 8, + "range": 4.1, + "spli": 14, + "arp": 1, + "maintenance" : 0.01, + "tags": ["flame", "boarding 2"] }, - "Underslung Flamer": { + "Integrated-Flamer": { "attack": { - "standard": 200, - "master_crafted": 220, - "artifact": 240 + "standard": 350, + "master_crafted": 385, + "artifact": 420 }, "description": "", - "abbreviation": "UndrFlmr", + "abbreviation": "IntFlmr", "melee_hands": 0, "ranged_hands": 0, "ammo": 4, - "range": 2.1, - "spli": 3, - "arp": -1, + "range": 4.1, + "spli": 10, + "arp": 1, "tags": ["flame", "attached"] }, "Combiflamer": { "abbreviation": "CmbFlmr", "attack": { - "standard": 100, - "master_crafted": 130, - "artifact": 160 + "standard": 150, + "master_crafted": 175, + "artifact": 200 }, "description": "A standard Bolter with an underbarrel Flamer for expanded tactical utility.", "melee_hands": 1, "ranged_hands": 2, "ammo": 15, "range": 10, - "spli": 3, - "arp": 0, - "second_profiles": ["Flamer"], - "tags": ["combi", "bolt"] + "spli": 5, + "arp": 1, + "second_profiles": ["Integrated-Flamer"], + "tags": ["combi", "bolt", "boarding 2"] }, "Combiplasma": { "abbreviation": "CmbPlsm", "attack": { - "standard": 100, - "master_crafted": 130, - "artifact": 160 + "standard": 150, + "master_crafted": 175, + "artifact": 200 }, "description": "A standard Bolter with an underbarrel Plasma Gun for expanded tactical utility.", "melee_hands": 1, "ranged_hands": 2, - "ammo": 15, + "ammo": 8, "range": 10, - "spli": 3, - "arp": 0, - "second_profiles": ["Plasma Gun"], + "spli": 5, + "arp": 1, + "second_profiles": ["Integrated-Plasma"], "tags": ["combi", "bolt"] }, "Combigrav": { "abbreviation": "CmbGrv", "attack": { - "standard": 100, - "master_crafted": 130, - "artifact": 160 + "standard": 150, + "master_crafted": 175, + "artifact": 200 }, "description": "A standard Bolter with an underbarrel Grav-Gun for expanded tactical utility.", "melee_hands": 1, "ranged_hands": 2, - "ammo": 15, + "ammo": 8, "range": 10, - "spli": 3, - "arp": 0, - "second_profiles": ["Grav-Gun"], + "spli": 5, + "arp": 1, + "second_profiles": ["Integrated-Grav"], "tags": ["combi", "bolt"] }, "Combimelta": { "abbreviation": "CmbMlt", "attack": { - "standard": 100, - "master_crafted": 130, - "artifact": 160 + "standard": 150, + "master_crafted": 175, + "artifact": 200 }, "description": "A standard Bolter with an underbarrel Meltagun for expanded tactical utility.", "melee_hands": 1, "ranged_hands": 2, - "ammo": 15, + "ammo": 8, "range": 10, - "spli": 3, - "arp": 0, - "second_profiles": ["Meltagun"], - "tags": ["combi", "bolt"] + "spli": 5, + "arp": 1, + "second_profiles": ["Integrated-Melta"], + "tags": ["combi", "bolt", "boarding 3"] }, "Incinerator": { "attack": { - "standard": 200, - "master_crafted": 220, - "artifact": 240 + "standard": 500, + "master_crafted": 550, + "artifact": 600 }, "description": "This flamer weapon utilizes psychically-charged promethium and blessed oils concoction to create an azure flame that bypasses psychich protections. It is particularly effective against Daemons and their ilk.", "abbreviation": "Incnrtr", "melee_hands": 1, "ranged_hands": 1, "ammo": 4, - "range": 2.1, - "spli": 3, - "arp": -1, - "tags": ["flame"] + "range": 4.1, + "spli": 20, + "arp": 2, + "tags": ["flame","boarding 3"] }, "Force Staff": { "attack": { - "standard": 200, - "master_crafted": 230, - "artifact": 270 + "standard": 225, + "master_crafted": 270, + "artifact": 350 }, "melee_mod": { "standard": 1, @@ -1551,102 +2059,100 @@ global.weapons = { "ranged_hands": 1, "range": 1, "spli": 5, - "arp": 1, - "tags": ["force" ], + "arp": 2, "specials": { "psychic_amplification": 25 }, "maintenance" : 0.1, + "tags": ["force"] }, "Force Sword": { - "abbreviation": "FrcSwrd", "attack": { - "standard": 180, - "master_crafted": 200, - "artifact": 240 + "standard": 225, + "master_crafted": 270, + "artifact": 350 }, "melee_mod": { "standard": 1, "master_crafted": 1.1, "artifact": 1.2 }, + "abbreviation": "FrcSwrd", "description": "The Force Sword is a psychically-attuned close combat weapon that is only fully effective in the hands of a psyker.", "melee_hands": 1, "ranged_hands": 0, "ammo": 0, "range": 1, "spli": 4, - "arp": 1, + "arp": 2, "special_properties": ["Parry"], - "tags": ["force", "sword"], - "maintenance" : 0.1, + "maintenance" : 0.1, + "tags": ["force", "sword", "martial", "boarding 1"], }, "Force Axe": { - "abbreviation": "FrcAxe", "attack": { - "standard": 190, - "master_crafted": 220, - "artifact": 260 + "standard": 250, + "master_crafted": 300, + "artifact": 375 }, "melee_mod": { "standard": 1, "master_crafted": 1.1, "artifact": 1.2 }, + "abbreviation": "FrcAxe", "description": "The Force Axe is a psychically-attuned close combat weapon that is only fully effective in the hands of a psyker.", "melee_hands": 1, "ranged_hands": 0, "ammo": 0, "range": 1, - "spli": 5, - "arp": 1, + "spli": 3, + "arp": 2, "special_description": "Able to be dual-wielded", - "tags": ["force", "axe", "dual"], + "tags": ["force", "axe", "dual", "savage", "boarding 2"], }, "Twin Linked Lascannon Turret": { "attack": { - "standard": 600, - "master_crafted": 700, - "artifact": 900 + "standard": 1000, + "master_crafted": 1100, + "artifact": 1300 }, "abbreviation": "TwnLscnn", "description": "A Predator-compatible turret mounting a twin-linked lascannon.", - "arp": 1, + "arp": 4, "range": 24, "ammo": 5, - "spli": 2, + "spli": 1, "tags": ["las", "energy", "twin_linked","heavy_ranged", "vehicle", "turret"] }, "Twin Linked Assault Cannon Turret": { "abbreviation": "TwnAssCnn", "attack": { - "standard": 240, - "master_crafted": 264, - "artifact": 288 + "standard": 800, + "master_crafted": 900, + "artifact": 1100 }, "description": "A heavy rotary autocannon with a devastating fire rate that can be counted in the hundreds per minute, in a twin mount. It is incredibly effective against infantry and lightly armored targets.", - "melee_hands": 2.1, - "ranged_hands": 2.25, "ammo": 5, "range": 12, - "spli": 30, - "arp": 1, + "spli": 40, + "arp": 2, "tags": ["heavy_ranged", "twin_linked", "vehicle", "turret"] }, "Flamestorm Cannon Turret": { "abbreviation": "FlmstCnn", "attack": { - "standard": 600, - "master_crafted": 660, - "artifact": 720 + "standard": 700, + "master_crafted": 850, + "artifact": 900 }, "description": "A huge vehicle-mounted flamethrower cannon, the heat produced by this terrifying weapon can melt armoured ceramite.", "melee_hands": 0, "ranged_hands": 0, "ammo": 12, - "range": 2, - "spli": 3, - "arp": 1, + "range": 4.1, + "spli": 25, + "arp": 3, "tags": ["flame","heavy_ranged", "vehicle", "turret"] }, "Magna-Melta Turret": { @@ -1660,25 +2166,24 @@ global.weapons = { "melee_hands": 0, "ranged_hands": 0, "ammo": 6, - "range": 5.1, - "spli": 2, - "arp": 1, + "range": 4.1, + "spli": 20, + "arp": 4, "tags": ["vehicle","heavy_ranged", "turret", "melta"] }, "Plasma Destroyer Turret": { "abbreviation": "PlsmDestr", "attack": { - "standard": 500, - "master_crafted": 600, - "artifact": 750 + "standard": 800, + "master_crafted": 900, + "artifact": 1000 }, "description": "A heavy variant of the plasma gun, its power output is significantly higher and its damage capability shows. However, it is mounted in a tank turret.", "melee_hands": 1, - "ranged_hands": 3, "ammo": 16, "range": 14, - "spli": 3, - "arp": 1, + "spli": 12, + "arp": 4, "tags": ["plasma", "energy","heavy_ranged", "vehicle", "turret"] }, "Heavy Conversion Beam Projector": { @@ -1694,7 +2199,7 @@ global.weapons = { "ammo": 6, "range": 20, "spli": 1, - "arp": 1, + "arp": 4, "tags": ["vehicle","heavy_ranged", "dreadnought", "turret", "ancient"] }, "Neutron Blaster Turret": { @@ -1710,15 +2215,15 @@ global.weapons = { "ammo": 6, "range": 20, "spli": 2, - "arp": 1, + "arp": 4, "tags": ["vehicle","heavy_ranged", "turret"] }, "Volkite Saker Turret": { "abbreviation": "VlkSkr", "attack": { - "standard": 300, - "master_crafted": 333, - "artifact": 375 + "standard": 1000, + "master_crafted": 1150, + "artifact": 1400 }, "description": "An advanced thermal weapon from a bygone era, Volkite sakers are optimized for spreading damage across swaths of enemy troops.", "melee_hands": 0, @@ -1726,7 +2231,7 @@ global.weapons = { "ammo": 25, "range": 18, "spli": 30, - "arp": 0, + "arp": 3, "tags": ["vehicle","heavy_ranged", "turret", "volkite", "ancient"] }, @@ -1743,7 +2248,7 @@ global.weapons = { "ammo": 20, "range": 12, "spli": 3, - "arp": 0, + "arp": 1, "tags": ["las"], "melee_hands": 0, "ranged_hands": 1, @@ -1761,7 +2266,7 @@ global.weapons = { "ammo": 30, "range": 3.1, "spli": 1, - "arp": 0, + "arp": 1, "tags": ["pistol", "las"], }, // Other imperials @@ -1778,7 +2283,7 @@ global.weapons = { "ammo": 16, "range": 10, "spli": 2, - "arp": 0, + "arp": 1, "tags": ["bolt"], "second_profiles": ["Sarissa"] }, @@ -1795,7 +2300,7 @@ global.weapons = { "ammo": 0, "range": 1, "spli": 1, - "arp": 0, + "arp": 1, "tags": ["axe"], }, "Hellrifle": { @@ -1809,7 +2314,7 @@ global.weapons = { "ammo": 10, "range": 20, "spli": 1, - "arp": 0, + "arp": 1, "tags": ["rifle", "arcane"], "ranged_hands": 1, }, @@ -1838,7 +2343,7 @@ global.weapons = { "ammo": 6, "range": 2.1, "spli": 3, - "arp": 0, + "arp": 1, "tags": ["pistol"] }, "Eldar Power Sword": { @@ -1859,7 +2364,7 @@ global.weapons = { "ammo": 0, "range": 1, "spli": 3, - "arp": 1, + "arp": 2, "special_properties": ["Parry"], "tags": ["power", "sword", "elder", "xenos"], }, @@ -1867,9 +2372,9 @@ global.weapons = { "Choppa": { "abbreviation": "Chop", "attack": { - "standard": 28, - "master_crafted": 32, - "artifact": 36 + "standard": 100, + "master_crafted": 125, + "artifact": 200 }, "melee_hands": 1, "range": 1, @@ -1879,15 +2384,15 @@ global.weapons = { "Snazzgun": { "abbreviation": "Snazz", "attack": { - "standard": 80, - "master_crafted": 92, - "artifact": 104 + "standard": 200, + "master_crafted": 230, + "artifact": 280 }, "ranged_hands": 1, "ammo": 20, "range": 3.1, "spli": 3, - "arp": 0, + "arp": 1, "tags": ["rifle"] }, } @@ -1917,18 +2422,28 @@ global.gear = { "abbreviation": "Artfcr", "armour_value": { "standard": 30, - "master_crafted": 34, - "artifact": 38 + "master_crafted": 30, // This is already a custom suit of armor shouldnt Master crafted be its base state? + "artifact": 30 }, "ranged_mod": { - "standard": 5, - "master_crafted": 10, - "artifact": 15 + "standard": 15, + "master_crafted": 20, + "artifact": 25 }, "melee_mod": { - "standard": 10, - "master_crafted": 15, - "artifact": 20 + "standard": 15, + "master_crafted": 20, + "artifact": 25 + }, + "hp_mod":{ + "standard": 15, + "master_crafted": 20, + "artifact": 25 + }, + "damage_resistance_mod": { + "standard": 15, + "master_crafted": 20, + "artifact": 25 }, "description": "A custom suit of power armored created by master artificiers and decorated without compare, this ancient Power Armour is beyond priceless. This suit's history is ancient and its users many.", "tags": ["power_armour"], @@ -1936,9 +2451,9 @@ global.gear = { "Terminator Armour": { "abbreviation": "Indmts", "armour_value": { - "standard": 42, - "master_crafted": 46, - "artifact": 50 + "standard": 30, + "master_crafted": 36, + "artifact": 40 }, "ranged_mod": { "standard": -10, @@ -1946,33 +2461,53 @@ global.gear = { "artifact": 0 }, "melee_mod": { - "standard": 20, - "master_crafted": 25, - "artifact": 30 + "standard": 10, + "master_crafted": 15, + "artifact": 20 + }, + "hp_mod":{ + "standard": 10, + "master_crafted": 15, + "artifact": 20 + }, + "damage_resistance_mod": { + "standard": 0, + "master_crafted": 5, + "artifact": 10 }, "melee_hands": 2, "ranged_hands": 2, "description": "Terminator Armour is the strongest and most powerful armour designed by humanity, available only to the veterans of the Adeptus Astartes. The Indomitus Pattern is the most widespread and versatile pattern as of M41.", "tags": ["terminator"], "req_exp": 100, - "maintenance" : 0.3, + "maintenance" : 1, }, "Dreadnought": { "abbreviation": "Drdnght", "armour_value": { - "standard": 50, - "master_crafted": 55, - "artifact": 60 + "standard": 40, + "master_crafted": 45, + "artifact": 50 }, "ranged_mod": { - "standard": 0, - "master_crafted": 5, // Augmented - "artifact": 10 // Augmented + "standard": -10, + "master_crafted": 0, + "artifact": 10 }, "melee_mod": { - "standard": 0, - "master_crafted": 5, // Augmented - "artifact": 10 // Augmented + "standard": -10, + "master_crafted": 0, + "artifact": 10 + }, + "hp_mod":{ + "standard": 30, + "master_crafted": 35, + "artifact": 50 + }, + "damage_resistance_mod": { + "standard": 20, + "master_crafted": 25, + "artifact": 40 }, "melee_hands": 8, "ranged_hands": 8, @@ -1980,53 +2515,101 @@ global.gear = { "tags": ["dreadnought"], "maintenance" : 1, }, - "Tartaros": { - "abbreviation": "Tartrs", + "Contemptor Dreadnought": { + "abbreviation": "Cntmptr", "armour_value": { - "standard": 42, - "master_crafted": 46, + "standard": 40, + "master_crafted": 45, "artifact": 50 }, "ranged_mod": { - "standard": 0, - "master_crafted": 5, // Augmented - "artifact": 10 // Augmented + "standard": -10, + "master_crafted": 0, + "artifact": 10 }, "melee_mod": { + "standard": -10, + "master_crafted": 0, + "artifact": 10 + }, + "hp_mod":{ + "standard": 30, + "master_crafted": 35, + "artifact": 50 + }, + "damage_resistance_mod": { "standard": 20, "master_crafted": 25, - "artifact": 30 + "artifact": 40 + }, + "melee_hands": 8, + "ranged_hands": 8, + "description": "PLACEHOLDER", + "tags": ["dreadnought", "ancient"], + "maintenance" : 1, + }, + "Tartaros": { + "abbreviation": "Tartrs", + "armour_value": { + "standard": 30, + "master_crafted": 36, + "artifact": 40 + }, + "ranged_mod": { + "standard": 10, + "master_crafted": 15, // Augmented + "artifact": 20 // Augmented + }, + "melee_mod": { + "standard": 10, + "master_crafted": 20, + "artifact": 25 + }, + "hp_mod":{ + "standard": 5, + "master_crafted": 10, + "artifact": 15 }, "melee_hands": 2, "ranged_hands": 2, "description": "This pattern is possibly considered the most advanced form of Terminator Armour, providing greater mobility for the wearer compared to the Indomitus with no loss in durability. In the M41 considered to be incredibly rare with wars being fought to secure more suits.", "tags": ["terminator"], "req_exp": 100, - "maintenance" : 0.5, + "maintenance" : 3, }, - "Cataphractii Pattern Terminator": { + "Cataphractii": { "abbreviation": "Catphr", "armour_value": { - "standard": 42, - "master_crafted": 46, - "artifact": 50 + "standard": 32, + "master_crafted": 38, + "artifact": 42 }, "ranged_mod": { - "standard": 0, - "master_crafted": 5, // Augmented - "artifact": 10 // Augmented + "standard": -5, + "master_crafted": 0, + "artifact": 5 }, "melee_mod": { - "standard": 20, - "master_crafted": 25, - "artifact": 30, + "standard": -5, + "master_crafted": 0, + "artifact": 5 + }, + "hp_mod":{ + "standard": 10, + "master_crafted": 15, + "artifact": 20 + }, + "damage_resistance_mod": { + "standard": 10, + "master_crafted": 15, + "artifact": 20 }, "melee_hands": 2, "ranged_hands": 2, "description": "Among the first issued to the Space Marine Legions. Having additional plating and shield generators installed within the shoulder pads resulted in severe straining of the suit's exoskeleton and reduced the wearer's maneuverability, leading to its decline among some legions.", "tags": ["terminator"], "req_exp": 100, - "maintenance" : 0.75, + "maintenance" : 2.5, }, "Scout Armour": { "abbreviation": "SctArm", @@ -2036,23 +2619,33 @@ global.gear = { "artifact": 14 }, "ranged_mod": { - "standard": 15, - "master_crafted": 20, // Augmented - "artifact": 25 // Augmented + "standard": 10, + "master_crafted": 15, // Augmented + "artifact": 20 // Augmented }, "melee_mod": { "standard": 0, "master_crafted": 5, // Augmented "artifact": 10 // Augmented }, + "hp_mod":{ + "standard": 0, + "master_crafted": 10, + "artifact": 0 + }, + "damage_resistance_mod": { + "standard": 0, + "master_crafted": 10, + "artifact": 0 + }, "description": "A non-powered suit made up of carapace armour and ballistic nylon. Includes biohazard shielding, nutrient feed, and camouflage." }, "MK3 Iron Armour": { "abbreviation": "MK3", "armour_value": { - "standard": 26, - "master_crafted": 29, - "artifact": 32 + "standard": 22, + "master_crafted": 24, + "artifact": 28 }, "ranged_mod": { "standard": -10, @@ -2060,34 +2653,49 @@ global.gear = { "artifact": 0 }, "melee_mod": { + "standard": 10, + "master_crafted": 10, // Augmented + "artifact": 15 // Augmented + }, + "hp_mod":{ + "standard": 10, + "master_crafted": 15, + "artifact": 20 + }, + "damage_resistance_mod": { "standard": 0, - "master_crafted": 5, // Augmented - "artifact": 10 // Augmented + "master_crafted": 5, + "artifact": 10 }, "description": "An ancient set of Power Armor dating back to the early Great Crusade. The Mark III has heavier armor plating but is far heavier then its contemporaries.", "tags": ["power_armour"], - "maintenance" : 0.1, + "maintenance" : 0.3, }, "MK4 Maximus": { "abbreviation": "MK4", "armour_value": { - "standard": 22, - "master_crafted": 25, - "artifact": 28 + "standard": 15, + "master_crafted": 17, + "artifact": 21 }, "ranged_mod": { - "standard": 5, - "master_crafted": 10, - "artifact": 15 + "standard": 10, + "master_crafted": 15, + "artifact": 20 }, "melee_mod": { - "standard": 5, - "master_crafted": 10, // Augmented - "artifact": 15 // Augmented + "standard": 10, + "master_crafted": 15, // Augmented + "artifact": 20 // Augmented + }, + "hp_mod":{ + "standard": 0, + "master_crafted": 5, + "artifact": 10 }, "description": "Power Armor dating back to the end of the Great Crusade. It is considered the pinnacle of Power Armor by some Astartes. However, the components are no longer reproducible, the knowledge having been lost to time.", "tags": ["power_armour"], - "maintenance" : 0.2, + "maintenance" : 0.4, }, "MK5 Heresy": { "abbreviation": "MK5", @@ -2106,6 +2714,16 @@ global.gear = { "master_crafted": 25, "artifact": 30 }, + "hp_mod":{ + "standard": 0, + "master_crafted": 5, + "artifact": 10 + }, + "damage_resistance_mod": { + "standard": -5, + "master_crafted": 0, + "artifact": 5 + }, "description": "A hastily assembled Power Armor that first started appearing during the Horus Heresy to act as a stopgap while new suits were produced and sent to loyalist legions. It excels in close combat but it has limited sensors for ranged combat.", "tags": ["power_armour"], "maintenance" : 0.05, @@ -2115,18 +2733,28 @@ global.gear = { "armour_value": { "standard": 15, "master_crafted": 17, - "artifact": 19 + "artifact": 21 }, "ranged_mod": { - "standard": 15, - "master_crafted": 20, // Augmented - "artifact": 25 // Augmented + "standard": 10, + "master_crafted": 15, // Augmented + "artifact": 30 // Augmented }, "melee_mod": { "standard": 0, "master_crafted": 5, // Augmented "artifact": 10 // Augmented }, + "hp_mod":{ + "standard": -5, + "master_crafted": 0, + "artifact": 5 + }, + "damage_resistance_mod": { + "standard": 0, + "master_crafted": 5, + "artifact": 5 + }, "description": "A suit dating back to the Horus Heresy, first tested by the Raven Guard. It contains boosted olfactory and auditory sensors that increase the ranged accuracy of the wearer. This however makes it more fragile to an extent.", "tags": ["power_armour"], "maintenance" : 0.05, @@ -2134,9 +2762,9 @@ global.gear = { "MK7 Aquila": { "abbreviation": "MK7", "armour_value": { - "standard": 17, - "master_crafted": 19, - "artifact": 21 + "standard": 18, + "master_crafted": 20, + "artifact": 24 }, "ranged_mod": { "standard": 0, @@ -2148,6 +2776,16 @@ global.gear = { "master_crafted": 5, // Augmented "artifact": 10 // Augmented }, + "hp_mod":{ + "standard": 0, + "master_crafted": 5, + "artifact": 10 + }, + "damage_resistance_mod": { + "standard": 0, + "master_crafted": 5, + "artifact": 10 + }, "description": "The most common power armour of the Adeptus Astartes and the only power armour still widely manufactured by the Imperium.", "tags": ["power_armour"], "maintenance" : 0.01, @@ -2155,8 +2793,8 @@ global.gear = { "MK8 Errant": { "abbreviation": "MK8", "armour_value": { - "standard": 22, - "master_crafted": 24, + "standard": 20, + "master_crafted": 22, "artifact": 26 }, "ranged_mod": { @@ -2169,6 +2807,16 @@ global.gear = { "master_crafted": 5, // Augmented "artifact": 10 // Augmented }, + "hp_mod":{ + "standard": 0, + "master_crafted": 5, + "artifact": 10 + }, + "damage_resistance_mod": { + "standard": 0, + "master_crafted": 5, + "artifact": 10 + }, "description": "The newest and most advanced of the standard mark power armours as such production has not yet reached maximum capacity creating a supply shortage while chapters rush to get access to them.", "tags": ["power_armour"], "maintenance" : 0.02, @@ -2258,7 +2906,7 @@ global.gear = { }, "tags": ["vehicle", "Upgrade"], }, -// Hireling Armour + // Hireling Armour // Admech "Skitarii Armour": { "abbreviation": "SkitArm", @@ -2466,7 +3114,7 @@ global.gear = { "ammo": 0, "range": 1, "spli": 1, - "arp": 0, + "arp": 1, "tags": ["vehicle"], }, "Searchlight": { @@ -2519,7 +3167,18 @@ global.gear = { "master_crafted": 30, "artifact": 35 }, - "tags": ["jump"], + "tags": ["power_only", "jump"], + }, + "Serpha Jump Pack": { + "abbreviation": "SphJmpPck", + "special_properties": ["Hammer of Wrath"], + "description": "Once the mainstay of the Legiones Astartes, now the Serpha Pattern Jump Pack is nothing but a sad reminder of these better times and of the terrible atrocities that followed. Mainly used by the Traitors in the modern Imperium, it is nonetheless seen in the Loyalist armouries in which it is prized for its superior energy cells and power cabling, but doesn't provide as reliable of a thruster as, for instance, the most common in the 41st millennium Mark VII Mars Pattern.", + "damage_resistance_mod": { + "standard": 30, + "master_crafted": 35, + "artifact": 40 + }, + "tags": ["power_only", "jump", "ancient"], }, "Heavy Weapons Pack": { "abbreviation": "HvyWpPck", @@ -2529,12 +3188,10 @@ global.gear = { "master_crafted": 10, "artifact": 15 }, - "melee_hands": -1, - "ranged_hands": 1, + "tags": ["bonus_ammo"] }, "Servo-arm": { "abbreviation": "SrvArm", - "special_properties": ["Repairs Vehicles"], "second_profiles": ["Servo-arm(M)"], "description": "A manipulator mechandendrite, also known as a Servo-arm. This artificial limb is a great aid to help trained Techmarines repair damaged vehicles on the battlefield, yet may be used in melee combat, thanks to its considerable crushing power and weight.", "damage_resistance_mod": { @@ -2544,10 +3201,13 @@ global.gear = { }, "melee_hands": -0.25, "ranged_hands": -0.25, + "specials": { + "combi_tool": 1 + }, + "tags": ["terminator"] }, "Servo-harness": { "abbreviation": "SrvHrns", - "special_properties": ["Repairs Vehicles"], "second_profiles": ["Servo-arm(M)", "Servo-arm(M)", "Flamer", "Plasma Cutter"], "description": "A Servo-Harness is a special type of augmetic aid, often used by Chapter's Master of the Forge or his senior Techmarines. It consists of many blessed tools, two Servo-arms and a couple of deadly weapons. With it, one can make battlefield repairs on any vehicle, shore up defences, or even assist his battle-brothers in combat.", "damage_resistance_mod": { @@ -2557,6 +3217,10 @@ global.gear = { }, "melee_hands": -0.5, "ranged_hands": -0.5, + "specials": { + "combi_tool": 2 + }, + "tags": ["terminator"] }, "Conversion Beamer Pack": { "abbreviation": "CnvBmr", @@ -2564,52 +3228,16 @@ global.gear = { "description": "The Conversion Beam Projector is a heavy energy weapon that harnesses advanced technology to project a concentrated beam of destructive energy. Armor detonates as the matter that comproises it is transformed into pure energy.", "melee_hands": -0.5, "ranged_hands": -0.5, + "tags": ["terminator"] + }, + "Cyclone Missile System": { + "abbreviation": "CyclLnch", + "second_profiles": ["Cyclone Missile Launcher"], + "description": "Designed for use with Terminator armour. Valuable for their ability to launch missiles rapidly from the twin racks, this back-mounted missile system also makes up for some of Terminator armour's inflexibility by providing more options in combat.", + "melee_hands": -0.5, + "ranged_hands": -0.5, + "tags": ["terminator_only"] }, - // Add more mobility items as needed... } } - - -/* - - repeat(2){ - // Artifact weapons - if (arti_armour=false){ - - if (string_count("DUB",thawep)>0){attack=floor(attack*1.5);melee_hands+=1;ranged_hands+=1;spli=1;} - if (string_count("Dae",thawep)>0){attack=floor(attack*1.5);amm=-1;} - if (string_count("VOI",thawep)>0){attack=floor(attack*1.2);} - if (string_count("ADAMANTINE",thawep)>0){attack=floor(attack*1.1);} - - if (string_count("MINOR",thawep)>0){attack=floor(attack*0.85);} - if (string_count("MNR",thawep)>0){attack=floor(attack*0.85);} - } - - } - // Vehicle Upgrades - - if (equipment_1="Lucifer Pattern Engine"){statt=5;special_description="";emor=1; - descr="A significant upgrade over the more common patterns of Rhino-chassis engines, these engines provide greater output.";} - - // Vehicle Utility Weapons - if (thawep="HK Missile"){attack=350;arp=1;range=50;ranged_hands+=1;amm=1;spli=1; - descr="A single-use long-range anti-tank missile, this weapon can surgically destroy armoured targets in the opening stages of a battle.";} - - // Land Raider Sponsons - // Predator Turrets - - if (thawep="Twin Linked Assault Cannon Turret"){attack=360;arp=0;range=12;amm=10;spli=1; - descr="A Predator-compatible turret mounting a pair of short range anti-infantry assault cannons. ";} - if (thawep="Flamestorm Cannon Turret"){attack=400;arp=1;range=2.1;amm=12;spli=1; - descr="A Predator-compatible turret housing a huge flamethrower, the heat produced by this terrifying weapon can crack even armoured ceramite. ";} - if (thawep="Magna-Melta Turret"){attack=400;arp=1;range=6;amm=12; - descr="A Predator-compatible turret housing a magna-melta, a devastating short-range anti-tank weapon. ";} - if (thawep="Plasma Destroyer Turret"){attack=350;arp=1;range=15;spli=1; - descr="A Predator-compatible turret housing a plasma destroyer, sometimes called the plasma executioner after the vehicle variants that mount this terrifying anti-armour weapon. ";} - if (thawep="Heavy Conversion Beamer Turret"){attack=750;arp=1;range=25;amm=3;spli=1; - descr="A Predator-compatible turret housing a Heavy Conversion Beam Projector, a heavy energy weapon that turns a target's own matter against it by converting it into destructive energy.";} - if (thawep="Neutron Blaster Turret"){attack=400;arp=1;range=15;amm=10 - descr="A Predator-compatible turret housing a neutron blaster; a weapon from the Dark Age of Technology, this weapon is capable of destroying enemy armour with impunity. ";} - if (thawep="Volkite Saker Turret"){attack=400;arp=0;range=18;amm=50;spli=1; - descr="A Predator-compatible turret housing a Volkite Saker, capable of igniting entire formations of enemy forces with a single sweep. ";} diff --git a/scripts/scr_zoom/scr_zoom.gml b/scripts/scr_zoom/scr_zoom.gml index ca256f2850..79632dc69a 100644 --- a/scripts/scr_zoom/scr_zoom.gml +++ b/scripts/scr_zoom/scr_zoom.gml @@ -2,7 +2,6 @@ global.default_view_width = 1600; global.default_view_height = 900; function scr_zoom() { - // Zooms the view in or out when executed set_zoom_to_default(); if (obj_controller.zoomed) { @@ -70,30 +69,6 @@ function scr_zoom_keys() { } exit; - - global.zoom_level = clamp(global.zoom_level + (((mouse_wheel_down() - mouse_wheel_up())) * 0.1), 0.5, 2); - - //Get current size - var view_w = camera_get_view_width(view_camera[0]); - var view_h = camera_get_view_height(view_camera[0]); - - //Set the rate of interpolation - var rate = 0.2; - - //Get new sizes by interpolating current and target zoomed size - var new_w = lerp(view_w, global.zoom_level * global.default_zoom_width, rate); - var new_h = lerp(view_h, global.zoom_level * global.default_zoom_height, rate); - - //Apply the new size - camera_set_view_size(view_camera[0], new_w, new_h); - - var vpos_x = camera_get_view_x(view_camera[0]); - var vpos_y = camera_get_view_y(view_camera[0]); - - //change coordinates of camera so zoom is centered - var new_x = lerp(vpos_x,vpos_x+(view_w - global.zoom_level * global.default_zoom_width)/2, rate); - var new_y = lerp(vpos_y,vpos_y+(view_h - global.zoom_level * global.default_zoom_height)/2, rate); - } global.zoom_level = 1; diff --git a/shaders/armour_texture/armour_texture.fsh b/shaders/armour_texture/armour_texture.fsh index b4ea1b5d44..cae52b3ed5 100644 --- a/shaders/armour_texture/armour_texture.fsh +++ b/shaders/armour_texture/armour_texture.fsh @@ -12,8 +12,97 @@ uniform int blend; uniform vec3 blend_colour; -vec3 light_or_dark(vec3 m_colour, float shade) { - return vec3((clamp(m_colour.r * shade,0.01,0.99)) , (m_colour.g * shade), m_colour.b * shade); +// === SHADOW AUGMENT: new uniforms === +uniform sampler2D shadow_texture; +uniform int use_shadow; +varying vec2 v_vShadowCoord; + +// === Utility: RGB <-> HSV === +vec3 rgb2hsv(vec3 c) { + vec4 K = vec4(0.0, -1.0/3.0, 2.0/3.0, -1.0); + vec4 p = mix(vec4(c.bg, K.wz), + vec4(c.gb, K.xy), + step(c.b, c.g)); + vec4 q = mix(vec4(p.xyw, c.r), + vec4(c.r, p.yzx), + step(p.x, c.r)); + + float d = q.x - min(q.w, q.y); + float e = 1.0e-10; + return vec3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), + d / (q.x + e), + q.x); +} + +vec3 hsv2rgb(vec3 c) { + vec3 rgb = clamp(abs(mod(c.x*6.0 + vec3(0.0,4.0,2.0), + 6.0) - 3.0) - 1.0, + 0.0, + 1.0); + return c.z * mix(vec3(1.0), rgb, c.y); +} + +// Shortest-path hue interpolation with clamp +float hueMixClamp(float fromHue, float toHue, float t, float maxShift) { + // Compute shortest path delta + float delta = mod((toHue - fromHue + 540.0), 360.0) - 180.0; + + // Clamp delta to maxShift (in degrees) + if (delta > maxShift) delta = maxShift; + if (delta < -maxShift) delta = -maxShift; + + return mod(fromHue + delta * t, 360.0); +} + +vec3 light_or_dark(vec3 m_colour, float shade, float maxHueShift) { + vec3 hsv = rgb2hsv(m_colour); + + float orig_brightness = max(m_colour.r, max(m_colour.g, m_colour.b)); + bool near_black = (orig_brightness < 0.15); // works for 35/255 + + if (shade > 1.0) { + float hue = hsv.x * 360.0; + + if (near_black) { + // Near-black highlight: push toward green-blue (~180°), clamped + hue = hueMixClamp(hue, 180.0, shade - 1.0, 180.0); + hsv.z = clamp(hsv.z * shade, 0.0, 1.0); + hsv.y = clamp(hsv.y * (2.0 - shade), 0.0, 1.0); + hsv.x = hue / 360.0; + + } else { + // Normal highlight: push toward yellow (60°), clamped + hue = hueMixClamp(hue, 60.0, shade - 1.0, maxHueShift); + hsv.z = clamp(hsv.z * shade, 0.0, 1.0); + hsv.y = clamp(hsv.y * (2.0 - shade), 0.0, 1.0); + hsv.x = hue / 360.0; + } + + } else { + // Shadow: push hue toward blue (240°), clamped + float hue = hsv.x * 360.0; + hue = hueMixClamp(hue, 240.0, 1.0 - shade, maxHueShift); + hsv.x = hue / 360.0; + + hsv.z = clamp(hsv.z * shade, 0.0, 1.0); + hsv.y = clamp(hsv.y * (1.0 + (1.0 - shade)), 0.0, 1.0); + } + + vec3 rgb = hsv2rgb(hsv); + + if (!near_black) { + float maxDelta = 0.05; + if (m_colour.r < max(m_colour.g, m_colour.b)) rgb.r = min(rgb.r, max(rgb.g, rgb.b) + maxDelta); + if (m_colour.g < max(m_colour.r, m_colour.b)) rgb.g = min(rgb.g, max(rgb.r, rgb.b) + maxDelta); + if (m_colour.b < max(m_colour.r, m_colour.g)) rgb.b = min(rgb.b, max(rgb.r, rgb.g) + maxDelta); + } + + if (near_black && shade > 1.0) { + float maxRGB = max(rgb.r, max(rgb.g, rgb.b)); + rgb.b = max(rgb.b, maxRGB * 1.1); + } + + return rgb; } void main() { @@ -47,34 +136,38 @@ void main() { } // - if (col.rgb != replace_colour.rgb) { - col.a = 0.0; + vec4 tex_col = texture2D(armour_texture, v_vMaskCoord); + + if (col.rgb != replace_colour.rgb || tex_col.a == 0.0) { + discard; } else { vec4 col_orig = col; - col = texture2D(armour_texture, v_vMaskCoord); - if (col.a != 0.0) { - if (blend == 1) { - col.rgb = col.rgb * blend_colour.rgb; - } - - if (col_orig.a == _128COL) { - col.rgb = light_or_dark(col.rgb, 1.2); - col.a = 1.0; - } else if (col_orig.a == _60COL) { - col.rgb = light_or_dark(col.rgb, 1.4); - col.a = 1.0; - } else if (col_orig.a == _215COL) { - col.rgb = light_or_dark(col.rgb, 0.6); - col.a = 1.0; - } else if (col_orig.a == _160COL) { - col.rgb = light_or_dark(col.rgb, 0.8); - col.a = 1.0; - } - } else { - col = texture2D(gm_BaseTexture, v_vTexcoord); + col = tex_col; + + /*if (blend == 1) { + col.rgb = col.rgb * blend_colour.rgb; + }*/ + if (use_shadow != 1){ + + if (col_orig.a == _128COL){ col.rgb = light_or_dark(col.rgb, 1.2, 85.0); col.a = 1.0; } + else if (col_orig.a == _60COL) { col.rgb = light_or_dark(col.rgb, 1.4, 85.0); col.a = 1.0; } + else if (col_orig.a == _215COL) { col.rgb = light_or_dark(col.rgb,0.6, 85.0); col.a = 1.0; } + else if (col_orig.a == _160COL) { col.rgb = light_or_dark(col.rgb, 0.8, 85.0); col.a = 1.0; } + + } + else if (use_shadow == 1) { + vec4 shadow_col = texture2D(shadow_texture, v_vShadowCoord); + float intensity = shadow_col.r; + + // Remap: 0 = shadow, 0.5 = neutral, 1 = highlight + float shadow_factor = 1.0 + (intensity - 0.5); + + col.rgb = light_or_dark(col.rgb, shadow_factor, 85.0); } + } + gl_FragColor = v_vColour * col; //gl_FragColor = v_vColour * (background_col*texture2D(gm_BaseTexture, v_vTexcoord)); } diff --git a/shaders/armour_texture/armour_texture.vsh b/shaders/armour_texture/armour_texture.vsh index d66d0b0b9b..75ca20a20c 100644 --- a/shaders/armour_texture/armour_texture.vsh +++ b/shaders/armour_texture/armour_texture.vsh @@ -9,6 +9,10 @@ attribute vec2 in_TextureCoord; // (u,v) varying vec2 v_vMaskCoord; uniform vec4 mask_transform; +uniform vec4 In_Shadow_Transform; +varying vec2 v_vShadowCoord; + + varying vec2 v_vTexcoord; varying vec4 v_vColour; @@ -19,5 +23,7 @@ void main() v_vColour = in_Colour; v_vTexcoord = in_TextureCoord; - v_vMaskCoord = v_vTexcoord * mask_transform.zw + mask_transform.xy; + + v_vMaskCoord = in_TextureCoord * mask_transform.zw + mask_transform.xy; + v_vShadowCoord = in_TextureCoord * In_Shadow_Transform.zw + In_Shadow_Transform.xy; } diff --git a/shaders/full_livery_shader/full_livery_shader.fsh b/shaders/full_livery_shader/full_livery_shader.fsh index 70244631ca..ea92c9b01b 100644 --- a/shaders/full_livery_shader/full_livery_shader.fsh +++ b/shaders/full_livery_shader/full_livery_shader.fsh @@ -33,11 +33,100 @@ uniform vec3 weapon_secondary; varying vec2 v_vTexcoord; varying vec4 v_vColour; +// === SHADOW AUGMENT: new uniforms === +uniform sampler2D shadow_texture; +uniform int use_shadow; +varying vec2 v_vShadowCoord; -vec3 light_or_dark(vec3 m_colour, float shade) { - return vec3((clamp(m_colour.r * shade,0.001,0.999)) , (m_colour.g * shade), m_colour.b * shade); +// === Utility: RGB <-> HSV === +vec3 rgb2hsv(vec3 c) { + vec4 K = vec4(0.0, -1.0/3.0, 2.0/3.0, -1.0); + vec4 p = mix(vec4(c.bg, K.wz), + vec4(c.gb, K.xy), + step(c.b, c.g)); + vec4 q = mix(vec4(p.xyw, c.r), + vec4(c.r, p.yzx), + step(p.x, c.r)); + + float d = q.x - min(q.w, q.y); + float e = 1.0e-10; + return vec3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), + d / (q.x + e), + q.x); +} + +vec3 hsv2rgb(vec3 c) { + vec3 rgb = clamp(abs(mod(c.x*6.0 + vec3(0.0,4.0,2.0), + 6.0) - 3.0) - 1.0, + 0.0, + 1.0); + return c.z * mix(vec3(1.0), rgb, c.y); +} + +// Shortest-path hue interpolation with clamp +float hueMixClamp(float fromHue, float toHue, float t, float maxShift) { + // Compute shortest path delta + float delta = mod((toHue - fromHue + 540.0), 360.0) - 180.0; + + // Clamp delta to maxShift (in degrees) + if (delta > maxShift) delta = maxShift; + if (delta < -maxShift) delta = -maxShift; + + return mod(fromHue + delta * t, 360.0); +} + +vec3 light_or_dark(vec3 m_colour, float shade, float maxHueShift) { + vec3 hsv = rgb2hsv(m_colour); + + float orig_brightness = max(m_colour.r, max(m_colour.g, m_colour.b)); + bool near_black = (orig_brightness < 0.15); // works for 35/255 + + if (shade > 1.0) { + float hue = hsv.x * 360.0; + + if (near_black) { + // Near-black highlight: push toward green-blue (~180°), clamped + hue = hueMixClamp(hue, 180.0, shade - 1.0, 180.0); + hsv.z = clamp(hsv.z * shade, 0.0, 1.0); + hsv.y = clamp(hsv.y * (2.0 - shade), 0.0, 1.0); + hsv.x = hue / 360.0; + + } else { + // Normal highlight: push toward yellow (60°), clamped + hue = hueMixClamp(hue, 60.0, shade - 1.0, maxHueShift); + hsv.z = clamp(hsv.z * shade, 0.0, 1.0); + hsv.y = clamp(hsv.y * (2.0 - shade), 0.0, 1.0); + hsv.x = hue / 360.0; + } + + } else { + // Shadow: push hue toward blue (240°), clamped + float hue = hsv.x * 360.0; + hue = hueMixClamp(hue, 240.0, 1.0 - shade, maxHueShift); + hsv.x = hue / 360.0; + + hsv.z = clamp(hsv.z * shade, 0.0, 1.0); + hsv.y = clamp(hsv.y * (1.0 + (1.0 - shade)), 0.0, 1.0); + } + + vec3 rgb = hsv2rgb(hsv); + + if (!near_black) { + float maxDelta = 0.05; + if (m_colour.r < max(m_colour.g, m_colour.b)) rgb.r = min(rgb.r, max(rgb.g, rgb.b) + maxDelta); + if (m_colour.g < max(m_colour.r, m_colour.b)) rgb.g = min(rgb.g, max(rgb.r, rgb.b) + maxDelta); + if (m_colour.b < max(m_colour.r, m_colour.g)) rgb.b = min(rgb.b, max(rgb.r, rgb.g) + maxDelta); + } + + if (near_black && shade > 1.0) { + float maxRGB = max(rgb.r, max(rgb.g, rgb.b)); + rgb.b = max(rgb.b, maxRGB * 1.1); + } + + return rgb; } + void main() { const float _20COL = 20.0 / 255.0; const float _24COL = 24.0 / 255.0; @@ -47,11 +136,9 @@ void main() { const float _84COL = 84.0 / 255.0; const float _104COL = 104.0 / 255.0; const float _112COL = 112.0 / 255.0; - // Attempt to workaround Intel sampling bug const float _127_25COL = 127.25 / 255.0; const float _128COL = 128.0 / 255.0; const float _128_75COL = 128.75 / 255.0; - // const float _130COL = 130.0 / 255.0; const float _135COL = 135.0 / 255.0; const float _138COL = 138.0 / 255.0; @@ -76,92 +163,49 @@ void main() { discard; } - // Intel - if (col_orig.r >= _127_25COL && col_orig.r <= _128_75COL) { - col_orig.r = _128COL; - } - if (col_orig.g >= _127_25COL && col_orig.g <= _128_75COL) { - col_orig.g = _128COL; - } - if (col_orig.b >= _127_25COL && col_orig.b <= _128_75COL) { - col_orig.b = _128COL; - } - if (col_orig.a >= _127_25COL && col_orig.a <= _128_75COL) { - col_orig.a = _128COL; - } - // - vec4 col = col_orig; + // Intel fix + if (col_orig.r >= _127_25COL && col_orig.r <= _128_75COL) { col_orig.r = _128COL; } + if (col_orig.g >= _127_25COL && col_orig.g <= _128_75COL) { col_orig.g = _128COL; } + if (col_orig.b >= _127_25COL && col_orig.b <= _128_75COL) { col_orig.b = _128COL; } + if (col_orig.a >= _127_25COL && col_orig.a <= _128_75COL) { col_orig.a = _128COL; } + vec4 col = col_orig; - if (col.rgb == vec3(0.0, 0.0, _128COL).rgb) { - col.rgb = left_head.rgb; - } else if (col.rgb == vec3(_181COL, 0.0, 1.0).rgb) { - col.rgb = right_backpack.rgb; - } else if (col.rgb == vec3(_104COL, 0.0, _168COL).rgb) { - col.rgb = left_backpack.rgb; - } else if (col.rgb == vec3(0.0, 0.0, 1.0).rgb){ - col.rgb = right_head.rgb; - } else if (col.rgb == vec3(_128COL, _64COL, 1.0).rgb) { - col.rgb = left_muzzle.rgb; - } else if (col.rgb == vec3(_64COL, _128COL, 1.0).rgb) { - col.rgb = right_muzzle.rgb; - } else if (col.rgb == vec3(0.0, 1.0, 0.0).rgb) { - col.rgb = eye_lense.rgb; - } else if (col.rgb == vec3(1.0, _20COL, _147COL).rgb) { - col.rgb = right_chest.rgb; - } else if (col.rgb == vec3(_128COL, 0.0, _128COL).rgb) { - col.rgb = left_chest.rgb; - } else if (col.rgb == vec3(0.0, _128COL, _128COL).rgb) { - col.rgb = right_trim.rgb; - } else if (col.rgb == vec3(1.0, _128COL, 0.0).rgb) { - col.rgb = left_trim.rgb; - } else if (col.rgb == vec3(_135COL, _130COL, _188COL).rgb) { - col.rgb = metallic_trim.rgb; - } else if (col.rgb == vec3(1.0, 1.0, 1.0).rgb) { - col.rgb = right_pauldron.rgb; - } else if (col.rgb == vec3(1.0, 1.0, 0.0).rgb) { - col.rgb = left_pauldron.rgb; - } else if (col.rgb == vec3(0.0, _128COL, 0.0).rgb) { - col.rgb = right_leg_upper.rgb; - } else if (col.rgb == vec3(1.0, _112COL, _170COL).rgb) { - col.rgb = left_leg_upper.rgb; - } else if (col.rgb == vec3(1.0, 0.0, 0.0).rgb) { - col.rgb = left_leg_knee.rgb; - } else if (col.rgb == vec3(_128COL, 0.0, 0.0).rgb) { - col.rgb = left_leg_lower.rgb; - } else if (col.rgb == vec3(_214COL, _194COL, 1.0).rgb) { - col.rgb = right_leg_knee.rgb; - } else if (col.rgb == vec3(_165COL, _84COL, _24COL).rgb) { - col.rgb = right_leg_lower.rgb; - } else if (col.rgb == vec3(_138COL, _218COL, _140COL).rgb) { - col.rgb = right_arm.rgb; - } else if (col.rgb == vec3(_46COL, _169COL, _151COL).rgb) { - col.rgb = right_hand.rgb; - } else if (col.rgb == vec3(1.0, _230COL, _140COL).rgb) { - col.rgb = left_arm.rgb; - } else if (col.rgb == vec3(1.0, _160COL, _112COL).rgb) { - col.rgb = left_hand.rgb; - } else if (col.rgb == vec3(_128COL, _128COL, 0.0)) { - col.rgb = company_marks.rgb; - } else if (col.rgb == vec3(0.0, 1.0, 1.0)) { - col.rgb = weapon_primary.rgb; - } else if (col.rgb == vec3(1.0, 0.0, 1.0)) { - col.rgb = weapon_secondary.rgb; - } + // === Existing replacement logic === + if (col.rgb == vec3(0.0, 0.0, _128COL).rgb) { col.rgb = left_head.rgb; } + else if (col.rgb == vec3(_181COL, 0.0, 1.0).rgb) { col.rgb = right_backpack.rgb; } + else if (col.rgb == vec3(_104COL, 0.0, _168COL).rgb) { col.rgb = left_backpack.rgb; } + else if (col.rgb == vec3(0.0, 0.0, 1.0).rgb){ col.rgb = right_head.rgb; } + else if (col.rgb == vec3(_128COL, _64COL, 1.0).rgb) { col.rgb = left_muzzle.rgb; } + else if (col.rgb == vec3(_64COL, _128COL, 1.0).rgb) { col.rgb = right_muzzle.rgb; } + else if (col.rgb == vec3(0.0, 1.0, 0.0).rgb) { col.rgb = eye_lense.rgb; } + else if (col.rgb == vec3(1.0, _20COL, _147COL).rgb) { col.rgb = right_chest.rgb; } + else if (col.rgb == vec3(_128COL, 0.0, _128COL).rgb) { col.rgb = left_chest.rgb; } + else if (col.rgb == vec3(0.0, _128COL, _128COL).rgb) { col.rgb = right_trim.rgb; } + else if (col.rgb == vec3(1.0, _128COL, 0.0).rgb) { col.rgb = left_trim.rgb; } + else if (col.rgb == vec3(_135COL, _130COL, _188COL).rgb) { col.rgb = metallic_trim.rgb; } + else if (col.rgb == vec3(1.0, 1.0, 1.0).rgb) { col.rgb = right_pauldron.rgb; } + else if (col.rgb == vec3(1.0, 1.0, 0.0).rgb) { col.rgb = left_pauldron.rgb; } + else if (col.rgb == vec3(0.0, _128COL, 0.0).rgb) { col.rgb = right_leg_upper.rgb; } + else if (col.rgb == vec3(1.0, _112COL, _170COL).rgb) { col.rgb = left_leg_upper.rgb; } + else if (col.rgb == vec3(1.0, 0.0, 0.0).rgb) { col.rgb = left_leg_knee.rgb; } + else if (col.rgb == vec3(_128COL, 0.0, 0.0).rgb) { col.rgb = left_leg_lower.rgb; } + else if (col.rgb == vec3(_214COL, _194COL, 1.0).rgb) { col.rgb = right_leg_knee.rgb; } + else if (col.rgb == vec3(_165COL, _84COL, _24COL).rgb) { col.rgb = right_leg_lower.rgb; } + else if (col.rgb == vec3(_138COL, _218COL, _140COL).rgb) { col.rgb = right_arm.rgb; } + else if (col.rgb == vec3(_46COL, _169COL, _151COL).rgb) { col.rgb = right_hand.rgb; } + else if (col.rgb == vec3(1.0, _230COL, _140COL).rgb) { col.rgb = left_arm.rgb; } + else if (col.rgb == vec3(1.0, _160COL, _112COL).rgb) { col.rgb = left_hand.rgb; } + else if (col.rgb == vec3(_128COL, _128COL, 0.0)) { col.rgb = company_marks.rgb; } + else if (col.rgb == vec3(0.0, 1.0, 1.0)) { col.rgb = weapon_primary.rgb; } + else if (col.rgb == vec3(1.0, 0.0, 1.0)) { col.rgb = weapon_secondary.rgb; } - if (col_orig.rgb != col.rgb) { - if (col_orig.a == _128COL){ - col.rgb = light_or_dark(col.rgb, 1.2); - col.a = 1.0; - } else if (col_orig.a == _60COL) { - col.rgb = light_or_dark(col.rgb, 1.4); - col.a = 1.0; - } else if (col_orig.a == _215COL) { - col.rgb = light_or_dark(col.rgb,0.6); - col.a = 1.0; - } else if (col_orig.a == _160COL) { - col.rgb = light_or_dark(col.rgb, 0.8); - col.a = 1.0; + if (use_shadow != 1){ + if (col_orig.rgb != col.rgb) { + if (col_orig.a == _128COL){ col.rgb = light_or_dark(col.rgb, 1.2, 85.0); col.a = 1.0; } + else if (col_orig.a == _60COL) { col.rgb = light_or_dark(col.rgb, 1.4, 85.0); col.a = 1.0; } + else if (col_orig.a == _215COL) { col.rgb = light_or_dark(col.rgb,0.6, 85.0); col.a = 1.0; } + else if (col_orig.a == _160COL) { col.rgb = light_or_dark(col.rgb, 0.8, 85.0); col.a = 1.0; } } } @@ -172,15 +216,22 @@ void main() { const vec3 robes_highlight_2 = vec3(186.0 / 255.0, 165.0 / 255.0, 135.0 / 255.0); const vec3 robes_darkness_2 = vec3(148.0 / 255.0, 132.0 / 255.0, 108.0 / 255.0); if (col.rgb == robes_colour_base.rgb || col.rgb == robes_colour_base_2.rgb) { - col.rgb = light_or_dark(robes_colour_replace , 1.0).rgb; + col.rgb = light_or_dark(robes_colour_replace , 1.0,85.0).rgb; } else if (col.rgb == robes_highlight.rgb || col.rgb == robes_highlight_2.rgb) { - col.rgb = light_or_dark(robes_colour_replace , 1.25).rgb; - //col.rgb = mix(robes_highlight.rgb, robes_colour_replace.rgb, 0.25); + col.rgb = light_or_dark(robes_colour_replace , 1.25,85.0).rgb; } else if (col.rgb == robes_darkness.rgb || col.rgb == robes_darkness_2.rgb) { - //col.rgb = vec3(col.r*0.8, col.g*0.8, col.b*0.8).rgb; - //col.rgb = robes_colour_replace.rgb; - //col.rgb = mix(robes_darkness.rbg, robes_colour_replace.rgb, 0.25); - col.rgb = light_or_dark(robes_colour_replace , 0.75).rgb; + col.rgb = light_or_dark(robes_colour_replace , 0.75,85.0).rgb; + } + + // === SHADOW AUGMENT: artist-friendly highlight/shadow grading === + if (use_shadow == 1 && col_orig.rgb != col.rgb) { + vec4 shadow_col = texture2D(shadow_texture, v_vShadowCoord); + float intensity = shadow_col.r; + + // Remap: 0 = shadow, 0.5 = neutral, 1 = highlight + float shadow_factor = 1.0 + (intensity - 0.5); + + col.rgb = light_or_dark(col.rgb, shadow_factor, 85.0); } gl_FragColor = v_vColour * col; diff --git a/shaders/full_livery_shader/full_livery_shader.vsh b/shaders/full_livery_shader/full_livery_shader.vsh index 3900c20f40..7f626ee01c 100644 --- a/shaders/full_livery_shader/full_livery_shader.vsh +++ b/shaders/full_livery_shader/full_livery_shader.vsh @@ -6,6 +6,10 @@ attribute vec3 in_Position; // (x,y,z) attribute vec4 in_Colour; // (r,g,b,a) attribute vec2 in_TextureCoord; // (u,v) +uniform vec4 In_Shadow_Transform; +varying vec2 v_vShadowCoord; + + varying vec2 v_vTexcoord; varying vec4 v_vColour; @@ -16,4 +20,5 @@ void main() v_vColour = in_Colour; v_vTexcoord = in_TextureCoord; + v_vShadowCoord = v_vTexcoord * In_Shadow_Transform.zw + In_Shadow_Transform.xy; } diff --git a/shaders/right_left_swap_shader/right_left_swap_shader.fsh b/shaders/right_left_swap_shader/right_left_swap_shader.fsh new file mode 100644 index 0000000000..54c2dc4089 --- /dev/null +++ b/shaders/right_left_swap_shader/right_left_swap_shader.fsh @@ -0,0 +1,94 @@ +// Simple passthrough fragment shader +// +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +// === Constants === +// put them in global scope so both main() and remapRightToLeft() can see them +const float _20COL = 20.0 / 255.0; +const float _24COL = 24.0 / 255.0; +const float _46COL = 46.0 / 255.0; +const float _60COL = 60.0 / 255.0; +const float _64COL = 64.0 / 255.0; +const float _84COL = 84.0 / 255.0; +const float _104COL = 104.0 / 255.0; +const float _112COL = 112.0 / 255.0; +const float _127_25COL = 127.25 / 255.0; +const float _128COL = 128.0 / 255.0; +const float _128_75COL = 128.75 / 255.0; +const float _130COL = 130.0 / 255.0; +const float _135COL = 135.0 / 255.0; +const float _138COL = 138.0 / 255.0; +const float _140COL = 140.0 / 255.0; +const float _147COL = 147.0 / 255.0; +const float _151COL = 151.0 / 255.0; +const float _160COL = 160.0 / 255.0; +const float _165COL = 165.0 / 255.0; +const float _168COL = 168.0 / 255.0; +const float _169COL = 169.0 / 255.0; +const float _170COL = 170.0 / 255.0; +const float _181COL = 181.0 / 255.0; +const float _188COL = 188.0 / 255.0; +const float _194COL = 194.0 / 255.0; +const float _214COL = 214.0 / 255.0; +const float _215COL = 215.0 / 255.0; +const float _218COL = 218.0 / 255.0; +const float _230COL = 230.0 / 255.0; + +vec3 remapRightToLeft(vec3 col) { + // === Right → Left body mapping === + if (col == vec3(0.0, 0.0, 1.0)) { // right_head + return vec3(0.0, 0.0, _128COL); // left_head + } + else if (col == vec3(_181COL, 0.0, 1.0)) { // right_backpack + return vec3(_104COL, 0.0, _168COL); // left_backpack + } + else if (col == vec3(_64COL, _128COL, 1.0)) { // right_muzzle + return vec3(_128COL, _64COL, 1.0); // left_muzzle + } + else if (col == vec3(1.0, _20COL, _147COL)) { // right_chest + return vec3(_128COL, 0.0, _128COL); // left_chest + } + else if (col == vec3(0.0, _128COL, _128COL)) { // right_trim + return vec3(1.0, _128COL, 0.0); // left_trim + } + else if (col == vec3(1.0, 1.0, 1.0)) { // right_pauldron + return vec3(1.0, 1.0, 0.0); // left_pauldron + } + else if (col == vec3(0.0, _128COL, 0.0)) { // right_leg_upper + return vec3(1.0, _112COL, _170COL); // left_leg_upper + } + else if (col == vec3(_214COL, _194COL, 1.0)) { // right_leg_knee + return vec3(1.0, 0.0, 0.0); // left_leg_knee + } + else if (col == vec3(_165COL, _84COL, _24COL)) { // right_leg_lower + return vec3(_128COL, 0.0, 0.0); // left_leg_lower + } + else if (col == vec3(_138COL, _218COL, _140COL)) { // right_arm + return vec3(1.0, _230COL, _140COL); // left_arm + } + else if (col == vec3(_46COL, _169COL, _151COL)) { // right_hand + return vec3(1.0, _160COL, _112COL); // left_hand + } + + // If not a right-side color, just return original + return col; +} + +void main() { + vec4 col_orig = texture2D(gm_BaseTexture, v_vTexcoord); + + if (col_orig.rgba == vec4(0.0, 0.0, 0.0, 0.0)) { + discard; + } + + // Intel fix — snap near-128 values to exact 128 + if (col_orig.r >= _127_25COL && col_orig.r <= _128_75COL) { col_orig.r = _128COL; } + if (col_orig.g >= _127_25COL && col_orig.g <= _128_75COL) { col_orig.g = _128COL; } + if (col_orig.b >= _127_25COL && col_orig.b <= _128_75COL) { col_orig.b = _128COL; } + if (col_orig.a >= _127_25COL && col_orig.a <= _128_75COL) { col_orig.a = _128COL; } + + vec4 col = col_orig; + col.rgb = remapRightToLeft(col.rgb); + gl_FragColor = v_vColour * col; +} diff --git a/shaders/right_left_swap_shader/right_left_swap_shader.vsh b/shaders/right_left_swap_shader/right_left_swap_shader.vsh new file mode 100644 index 0000000000..3900c20f40 --- /dev/null +++ b/shaders/right_left_swap_shader/right_left_swap_shader.vsh @@ -0,0 +1,19 @@ +// +// Simple passthrough vertex shader +// +attribute vec3 in_Position; // (x,y,z) +//attribute vec3 in_Normal; // (x,y,z) unused in this shader. +attribute vec4 in_Colour; // (r,g,b,a) +attribute vec2 in_TextureCoord; // (u,v) + +varying vec2 v_vTexcoord; +varying vec4 v_vColour; + +void main() +{ + vec4 object_space_pos = vec4( in_Position.x, in_Position.y, in_Position.z, 1.0); + gl_Position = gm_Matrices[MATRIX_WORLD_VIEW_PROJECTION] * object_space_pos; + + v_vColour = in_Colour; + v_vTexcoord = in_TextureCoord; +} diff --git a/shaders/right_left_swap_shader/right_left_swap_shader.yy b/shaders/right_left_swap_shader/right_left_swap_shader.yy new file mode 100644 index 0000000000..6b47a6a1db --- /dev/null +++ b/shaders/right_left_swap_shader/right_left_swap_shader.yy @@ -0,0 +1,12 @@ +{ + "$GMShader":"", + "%Name":"right_left_swap_shader", + "name":"right_left_swap_shader", + "parent":{ + "name":"Shaders", + "path":"folders/Shaders.yy", + }, + "resourceType":"GMShader", + "resourceVersion":"2.0", + "type":1, +} \ No newline at end of file diff --git a/sounds/snd_battle/snd_battle.yy b/sounds/snd_battle/snd_battle.yy index 6cfc476f98..cc09b7e100 100644 --- a/sounds/snd_battle/snd_battle.yy +++ b/sounds/snd_battle/snd_battle.yy @@ -1,15 +1,17 @@ { - "$GMSound":"", + "$GMSound":"v2", "%Name":"snd_battle", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":3, + "compressionQuality":6, "conversionMode":0, - "duration":164.70705, + "duration":31.423855, + "exportDir":"sounds", "name":"snd_battle", "parent":{ "name":"Themes", @@ -20,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_battle", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_blood/snd_blood.yy b/sounds/snd_blood/snd_blood.yy index 2e9cd4a2a3..f02696aa93 100644 --- a/sounds/snd_blood/snd_blood.yy +++ b/sounds/snd_blood/snd_blood.yy @@ -1,15 +1,17 @@ { - "$GMSound":"", + "$GMSound":"v2", "%Name":"snd_blood", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":3, + "compressionQuality":6, "conversionMode":0, - "duration":120.95194, + "duration":120.9178, + "exportDir":"sounds", "name":"snd_blood", "parent":{ "name":"Themes", @@ -20,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_blood", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_buzz/snd_buzz.yy b/sounds/snd_buzz/snd_buzz.yy index e251b3745e..6748afd4ff 100644 --- a/sounds/snd_buzz/snd_buzz.yy +++ b/sounds/snd_buzz/snd_buzz.yy @@ -1,25 +1,26 @@ { - "$GMSound":"", + "$GMSound":"v2", "%Name":"snd_buzz", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":0, + "compressionQuality":6, "conversionMode":0, - "duration":1.547641, + "duration":1.5426531, + "exportDir":"sounds", "name":"snd_buzz", "parent":{ - "name":"Sounds", - "path":"folders/Sounds.yy", + "name":"UI", + "path":"folders/Sounds/UI.yy", }, "preload":true, "resourceType":"GMSound", "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_buzz", - "type":0, "volume":0.44, } \ No newline at end of file diff --git a/sounds/snd_click/snd_click.yy b/sounds/snd_click/snd_click.yy index 21a69821ab..b3837f0e5e 100644 --- a/sounds/snd_click/snd_click.yy +++ b/sounds/snd_click/snd_click.yy @@ -1,25 +1,26 @@ { - "$GMSound":"", + "$GMSound":"v2", "%Name":"snd_click", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":0, + "compressionQuality":6, "conversionMode":0, - "duration":0.336406, + "duration":0.3314059, + "exportDir":"sounds", "name":"snd_click", "parent":{ - "name":"Sounds", - "path":"folders/Sounds.yy", + "name":"UI", + "path":"folders/Sounds/UI.yy", }, "preload":true, "resourceType":"GMSound", "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_click", - "type":0, "volume":0.13, } \ No newline at end of file diff --git a/sounds/snd_click_small/snd_click_small.yy b/sounds/snd_click_small/snd_click_small.yy index 7351fe51ff..fb155b142d 100644 --- a/sounds/snd_click_small/snd_click_small.yy +++ b/sounds/snd_click_small/snd_click_small.yy @@ -1,25 +1,26 @@ { - "$GMSound":"", + "$GMSound":"v2", "%Name":"snd_click_small", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":0, + "compressionQuality":6, "conversionMode":0, - "duration":0.187857, + "duration":0.18285714, + "exportDir":"sounds", "name":"snd_click_small", "parent":{ - "name":"Sounds", - "path":"folders/Sounds.yy", + "name":"UI", + "path":"folders/Sounds/UI.yy", }, "preload":true, "resourceType":"GMSound", "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_click_small", - "type":0, "volume":0.06, } \ No newline at end of file diff --git a/sounds/snd_defeat/snd_defeat.yy b/sounds/snd_defeat/snd_defeat.yy index 8bd3304dda..b303b0c2af 100644 --- a/sounds/snd_defeat/snd_defeat.yy +++ b/sounds/snd_defeat/snd_defeat.yy @@ -1,15 +1,17 @@ { - "$GMSound":"", + "$GMSound":"v2", "%Name":"snd_defeat", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":3, + "compressionQuality":6, "conversionMode":0, - "duration":267.6556, + "duration":0.0, + "exportDir":"sounds", "name":"snd_defeat", "parent":{ "name":"Themes", @@ -20,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_defeat", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_diboz/snd_diboz.yy b/sounds/snd_diboz/snd_diboz.yy index 9cb28ab2b0..cfc4d8bd6f 100644 --- a/sounds/snd_diboz/snd_diboz.yy +++ b/sounds/snd_diboz/snd_diboz.yy @@ -1,15 +1,17 @@ { - "$GMSound":"", + "$GMSound":"v2", "%Name":"snd_diboz", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":3, + "compressionQuality":6, "conversionMode":0, - "duration":214.39194, + "duration":0.0, + "exportDir":"sounds", "name":"snd_diboz", "parent":{ "name":"Themes", @@ -20,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_diboz", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_end_turn/snd_end_turn.yy b/sounds/snd_end_turn/snd_end_turn.yy index 6b1d427712..7afb4e3689 100644 --- a/sounds/snd_end_turn/snd_end_turn.yy +++ b/sounds/snd_end_turn/snd_end_turn.yy @@ -1,25 +1,26 @@ { - "$GMSound":"", + "$GMSound":"v2", "%Name":"snd_end_turn", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":0, + "compressionQuality":6, "conversionMode":0, - "duration":0.331667, + "duration":0.32666665, + "exportDir":"sounds", "name":"snd_end_turn", "parent":{ - "name":"Sounds", - "path":"folders/Sounds.yy", + "name":"UI", + "path":"folders/Sounds/UI.yy", }, "preload":true, "resourceType":"GMSound", "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_end_turn", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_error/snd_error.yy b/sounds/snd_error/snd_error.yy index 9ad262469b..3b3c192946 100644 --- a/sounds/snd_error/snd_error.yy +++ b/sounds/snd_error/snd_error.yy @@ -1,25 +1,26 @@ { - "$GMSound":"", + "$GMSound":"v2", "%Name":"snd_error", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":0, + "compressionQuality":6, "conversionMode":0, - "duration":0.274388, + "duration":0.26938775, + "exportDir":"sounds", "name":"snd_error", "parent":{ - "name":"Sounds", - "path":"folders/Sounds.yy", + "name":"UI", + "path":"folders/Sounds/UI.yy", }, "preload":true, "resourceType":"GMSound", "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_error", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_identify/snd_identify.yy b/sounds/snd_identify/snd_identify.yy index f656974441..6c9eb11448 100644 --- a/sounds/snd_identify/snd_identify.yy +++ b/sounds/snd_identify/snd_identify.yy @@ -1,25 +1,26 @@ { - "$GMSound":"", + "$GMSound":"v2", "%Name":"snd_identify", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":0, + "compressionQuality":6, "conversionMode":0, - "duration":0.773, + "duration":0.76800454, + "exportDir":"sounds", "name":"snd_identify", "parent":{ - "name":"Sounds", - "path":"folders/Sounds.yy", + "name":"UI", + "path":"folders/Sounds/UI.yy", }, "preload":true, "resourceType":"GMSound", "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_identify", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_legal/snd_legal.yy b/sounds/snd_legal/snd_legal.yy index bc41571086..f3bce2b3c3 100644 --- a/sounds/snd_legal/snd_legal.yy +++ b/sounds/snd_legal/snd_legal.yy @@ -1,15 +1,17 @@ { - "$GMSound":"", + "$GMSound":"v2", "%Name":"snd_legal", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":3, + "compressionQuality":6, "conversionMode":0, - "duration":30.280918, + "duration":30.249727, + "exportDir":"sounds", "name":"snd_legal", "parent":{ "name":"Themes", @@ -20,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_legal", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_postbattle/snd_postbattle.yy b/sounds/snd_postbattle/snd_postbattle.yy index 05a0f422be..32c092a3e0 100644 --- a/sounds/snd_postbattle/snd_postbattle.yy +++ b/sounds/snd_postbattle/snd_postbattle.yy @@ -1,25 +1,26 @@ { - "$GMSound":"", + "$GMSound":"v2", "%Name":"snd_postbattle", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":3, + "compressionQuality":6, "conversionMode":0, - "duration":279.72418, + "duration":137.55646, + "exportDir":"sounds", "name":"snd_postbattle", "parent":{ - "name":"Themes", - "path":"folders/Sounds/Themes.yy", + "name":"Unused", + "path":"folders/Sounds/Unused.yy", }, "preload":true, "resourceType":"GMSound", "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_postbattle", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_prologue/snd_prologue.yy b/sounds/snd_prologue/snd_prologue.yy index ed99240f73..96e43444b8 100644 --- a/sounds/snd_prologue/snd_prologue.yy +++ b/sounds/snd_prologue/snd_prologue.yy @@ -1,15 +1,17 @@ { - "$GMSound":"", + "$GMSound":"v2", "%Name":"snd_prologue", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":3, + "compressionQuality":6, "conversionMode":0, - "duration":146.21767, + "duration":103.17932, + "exportDir":"sounds", "name":"snd_prologue", "parent":{ "name":"Themes", @@ -20,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_prologue", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_redownload/snd_redownload.yy b/sounds/snd_redownload/snd_redownload.yy index 0d9e683d88..3835f36f53 100644 --- a/sounds/snd_redownload/snd_redownload.yy +++ b/sounds/snd_redownload/snd_redownload.yy @@ -1,25 +1,26 @@ { - "$GMSound":"", + "$GMSound":"v2", "%Name":"snd_redownload", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":0, + "compressionQuality":6, "conversionMode":0, - "duration":1.816156, + "duration":1.8111565, + "exportDir":"sounds", "name":"snd_redownload", "parent":{ - "name":"Sounds", - "path":"folders/Sounds.yy", + "name":"Unused", + "path":"folders/Sounds/Unused.yy", }, "preload":true, "resourceType":"GMSound", "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_redownload", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_royal/snd_royal.yy b/sounds/snd_royal/snd_royal.yy index 4c809dba1b..a242f6b95e 100644 --- a/sounds/snd_royal/snd_royal.yy +++ b/sounds/snd_royal/snd_royal.yy @@ -1,15 +1,17 @@ { - "$GMSound":"", + "$GMSound":"v2", "%Name":"snd_royal", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":256, + "channelFormat":1, "compression":3, + "compressionQuality":8, "conversionMode":0, - "duration":179.23112, + "duration":19.401724, + "exportDir":"sounds", "name":"snd_royal", "parent":{ "name":"Themes", @@ -20,6 +22,5 @@ "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_royal", - "type":1, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_stc/snd_stc.yy b/sounds/snd_stc/snd_stc.yy index a8e09fa42d..0db2a12c35 100644 --- a/sounds/snd_stc/snd_stc.yy +++ b/sounds/snd_stc/snd_stc.yy @@ -1,25 +1,26 @@ { - "$GMSound":"", + "$GMSound":"v2", "%Name":"snd_stc", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":192, + "channelFormat":0, "compression":0, + "compressionQuality":6, "conversionMode":0, - "duration":0.597109, + "duration":0.59210885, + "exportDir":"sounds", "name":"snd_stc", "parent":{ - "name":"Sounds", - "path":"folders/Sounds.yy", + "name":"UI", + "path":"folders/Sounds/UI.yy", }, "preload":true, "resourceType":"GMSound", "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_stc", - "type":0, "volume":1.0, } \ No newline at end of file diff --git a/sounds/snd_vode/snd_vode.yy b/sounds/snd_vode/snd_vode.yy index 90c4d541d5..32479d46cc 100644 --- a/sounds/snd_vode/snd_vode.yy +++ b/sounds/snd_vode/snd_vode.yy @@ -1,25 +1,26 @@ { - "$GMSound":"", + "$GMSound":"v2", "%Name":"snd_vode", "audioGroupId":{ "name":"audiogroup_default", "path":"audiogroups/audiogroup_default", }, "bitDepth":1, - "bitRate":256, + "channelFormat":1, "compression":3, + "compressionQuality":8, "conversionMode":0, - "duration":118.42445, + "duration":118.41306, + "exportDir":"sounds", "name":"snd_vode", "parent":{ - "name":"Themes", - "path":"folders/Sounds/Themes.yy", + "name":"Unused", + "path":"folders/Sounds/Unused.yy", }, "preload":true, "resourceType":"GMSound", "resourceVersion":"2.0", "sampleRate":44100, "soundFile":"snd_vode", - "type":1, "volume":1.0, } \ No newline at end of file diff --git a/sprites/Sprite544/Sprite544.yy b/sprites/Sprite544/Sprite544.yy index 1dfd976825..fa0d6fe4c6 100644 --- a/sprites/Sprite544/Sprite544.yy +++ b/sprites/Sprite544/Sprite544.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"Sprite544", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1132b02e-7adf-47d6-ae57-ba65d8120062","name":"1132b02e-7adf-47d6-ae57-ba65d8120062","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1132b02e-7adf-47d6-ae57-ba65d8120062","name":"1132b02e-7adf-47d6-ae57-ba65d8120062","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1132b02e-7adf-47d6-ae57-ba65d8120062","path":"sprites/Sprite544/Sprite544.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fdc6d240-127c-4364-9fb6-649444dd8487","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1132b02e-7adf-47d6-ae57-ba65d8120062","path":"sprites/Sprite544/Sprite544.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fdc6d240-127c-4364-9fb6-649444dd8487","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/bg_space/bg_space.yy b/sprites/bg_space/bg_space.yy index 2168185ce0..9364828d81 100644 --- a/sprites/bg_space/bg_space.yy +++ b/sprites/bg_space/bg_space.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"bg_space", "bboxMode":0, "bbox_bottom":63, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4d748e19-d979-4303-9ae4-0a004dd8159f","name":"4d748e19-d979-4303-9ae4-0a004dd8159f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d748e19-d979-4303-9ae4-0a004dd8159f","name":"4d748e19-d979-4303-9ae4-0a004dd8159f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d748e19-d979-4303-9ae4-0a004dd8159f","path":"sprites/bg_space/bg_space.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5101cb29-0a09-40a1-b6ce-7afb57f5e6d3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d748e19-d979-4303-9ae4-0a004dd8159f","path":"sprites/bg_space/bg_space.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5101cb29-0a09-40a1-b6ce-7afb57f5e6d3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/dsgsdgsdg/dsgsdgsdg.yy b/sprites/dsgsdgsdg/dsgsdgsdg.yy index f676732510..d6dc8acbcd 100644 --- a/sprites/dsgsdgsdg/dsgsdgsdg.yy +++ b/sprites/dsgsdgsdg/dsgsdgsdg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"dsgsdgsdg", "bboxMode":0, "bbox_bottom":27, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8755bf76-0300-447b-98df-32603fd72412","name":"8755bf76-0300-447b-98df-32603fd72412","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7bef077-45bd-4b29-87f0-23e5b72345b7","name":"a7bef077-45bd-4b29-87f0-23e5b72345b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4bbf7791-2c8e-4c3f-926b-d878f6f4173e","name":"4bbf7791-2c8e-4c3f-926b-d878f6f4173e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6da8494-1dc5-4df9-bc4f-c8a33e63f520","name":"a6da8494-1dc5-4df9-bc4f-c8a33e63f520","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f234e3a6-cda2-4f24-bded-b5ac4e868a00","name":"f234e3a6-cda2-4f24-bded-b5ac4e868a00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6a0e8ece-8df5-43c0-811b-5974afa8985f","name":"6a0e8ece-8df5-43c0-811b-5974afa8985f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83ffdcb7-a9bb-4db8-8655-da3f1a455069","name":"83ffdcb7-a9bb-4db8-8655-da3f1a455069","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"804967a3-84c6-4c2d-876f-3f43cced0531","name":"804967a3-84c6-4c2d-876f-3f43cced0531","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f13b59c-96ab-4efb-bc04-a7717cbe81ad","name":"1f13b59c-96ab-4efb-bc04-a7717cbe81ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"23437e1a-64f8-4905-81b8-6ad985ec375b","name":"23437e1a-64f8-4905-81b8-6ad985ec375b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5270eb03-a28b-4811-8da4-46aba283ac46","name":"5270eb03-a28b-4811-8da4-46aba283ac46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ac5d9445-fa47-4f7a-b5c2-8b50c8264015","name":"ac5d9445-fa47-4f7a-b5c2-8b50c8264015","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8755bf76-0300-447b-98df-32603fd72412","name":"8755bf76-0300-447b-98df-32603fd72412","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7bef077-45bd-4b29-87f0-23e5b72345b7","name":"a7bef077-45bd-4b29-87f0-23e5b72345b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4bbf7791-2c8e-4c3f-926b-d878f6f4173e","name":"4bbf7791-2c8e-4c3f-926b-d878f6f4173e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6da8494-1dc5-4df9-bc4f-c8a33e63f520","name":"a6da8494-1dc5-4df9-bc4f-c8a33e63f520","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f234e3a6-cda2-4f24-bded-b5ac4e868a00","name":"f234e3a6-cda2-4f24-bded-b5ac4e868a00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6a0e8ece-8df5-43c0-811b-5974afa8985f","name":"6a0e8ece-8df5-43c0-811b-5974afa8985f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83ffdcb7-a9bb-4db8-8655-da3f1a455069","name":"83ffdcb7-a9bb-4db8-8655-da3f1a455069","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"804967a3-84c6-4c2d-876f-3f43cced0531","name":"804967a3-84c6-4c2d-876f-3f43cced0531","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f13b59c-96ab-4efb-bc04-a7717cbe81ad","name":"1f13b59c-96ab-4efb-bc04-a7717cbe81ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"23437e1a-64f8-4905-81b8-6ad985ec375b","name":"23437e1a-64f8-4905-81b8-6ad985ec375b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5270eb03-a28b-4811-8da4-46aba283ac46","name":"5270eb03-a28b-4811-8da4-46aba283ac46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ac5d9445-fa47-4f7a-b5c2-8b50c8264015","name":"ac5d9445-fa47-4f7a-b5c2-8b50c8264015","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,42 +81,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8755bf76-0300-447b-98df-32603fd72412","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89e5d789-43f1-40b3-b484-6f0542b25f84","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7bef077-45bd-4b29-87f0-23e5b72345b7","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"157d9292-fc11-4643-9069-88002e31eeaa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bbf7791-2c8e-4c3f-926b-d878f6f4173e","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"783a44c2-1a13-40e7-92f1-6f83cf964635","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6da8494-1dc5-4df9-bc4f-c8a33e63f520","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"abff51bf-3172-4302-ab1c-e897bafe9dfa","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f234e3a6-cda2-4f24-bded-b5ac4e868a00","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d01c3f5-d7c1-4183-98b0-440ee78f7efa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a0e8ece-8df5-43c0-811b-5974afa8985f","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9356c993-17af-4903-9f3c-8cc96973e737","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83ffdcb7-a9bb-4db8-8655-da3f1a455069","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be93f187-dff1-468e-be1e-a4c5ffb5f166","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"804967a3-84c6-4c2d-876f-3f43cced0531","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"98d5250e-9736-40ca-8d41-7211dc4caad0","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f13b59c-96ab-4efb-bc04-a7717cbe81ad","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"641d28f8-d111-4a5f-9e8b-47aa6998d58c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"23437e1a-64f8-4905-81b8-6ad985ec375b","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a765f95f-efbd-448b-9b39-38e7f5a6ed5e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5270eb03-a28b-4811-8da4-46aba283ac46","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb36a05f-c433-4722-843c-e8458f605c5f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac5d9445-fa47-4f7a-b5c2-8b50c8264015","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24c3781b-1224-4c93-8cc1-3a5b08e199b5","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8755bf76-0300-447b-98df-32603fd72412","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89e5d789-43f1-40b3-b484-6f0542b25f84","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7bef077-45bd-4b29-87f0-23e5b72345b7","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"157d9292-fc11-4643-9069-88002e31eeaa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bbf7791-2c8e-4c3f-926b-d878f6f4173e","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"783a44c2-1a13-40e7-92f1-6f83cf964635","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6da8494-1dc5-4df9-bc4f-c8a33e63f520","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"abff51bf-3172-4302-ab1c-e897bafe9dfa","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f234e3a6-cda2-4f24-bded-b5ac4e868a00","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d01c3f5-d7c1-4183-98b0-440ee78f7efa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a0e8ece-8df5-43c0-811b-5974afa8985f","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9356c993-17af-4903-9f3c-8cc96973e737","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83ffdcb7-a9bb-4db8-8655-da3f1a455069","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be93f187-dff1-468e-be1e-a4c5ffb5f166","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"804967a3-84c6-4c2d-876f-3f43cced0531","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"98d5250e-9736-40ca-8d41-7211dc4caad0","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f13b59c-96ab-4efb-bc04-a7717cbe81ad","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"641d28f8-d111-4a5f-9e8b-47aa6998d58c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"23437e1a-64f8-4905-81b8-6ad985ec375b","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a765f95f-efbd-448b-9b39-38e7f5a6ed5e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5270eb03-a28b-4811-8da4-46aba283ac46","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb36a05f-c433-4722-843c-e8458f605c5f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac5d9445-fa47-4f7a-b5c2-8b50c8264015","path":"sprites/dsgsdgsdg/dsgsdgsdg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24c3781b-1224-4c93-8cc1-3a5b08e199b5","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/mk7_chest_variants/18394c2c-6406-40fe-8ad1-ee4ebd629435.png b/sprites/mk7_chest_variants/18394c2c-6406-40fe-8ad1-ee4ebd629435.png index 9c8bf8478c..0b1218ec6a 100644 Binary files a/sprites/mk7_chest_variants/18394c2c-6406-40fe-8ad1-ee4ebd629435.png and b/sprites/mk7_chest_variants/18394c2c-6406-40fe-8ad1-ee4ebd629435.png differ diff --git a/sprites/mk7_chest_variants/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee.png b/sprites/mk7_chest_variants/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee.png index a3a45e1a76..3195ee73a4 100644 Binary files a/sprites/mk7_chest_variants/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee.png and b/sprites/mk7_chest_variants/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee.png differ diff --git a/sprites/mk7_chest_variants/layers/18394c2c-6406-40fe-8ad1-ee4ebd629435/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png b/sprites/mk7_chest_variants/layers/18394c2c-6406-40fe-8ad1-ee4ebd629435/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png index 7b5d773b82..3272765d72 100644 Binary files a/sprites/mk7_chest_variants/layers/18394c2c-6406-40fe-8ad1-ee4ebd629435/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png and b/sprites/mk7_chest_variants/layers/18394c2c-6406-40fe-8ad1-ee4ebd629435/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png differ diff --git a/sprites/mk7_chest_variants/layers/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png b/sprites/mk7_chest_variants/layers/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png index 164eb857ef..df653d98c7 100644 Binary files a/sprites/mk7_chest_variants/layers/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png and b/sprites/mk7_chest_variants/layers/25fd73f2-dbb3-4ee5-8201-8fefbe86bbee/afeb1ada-ac9c-4851-8836-ecc4563b7ef0.png differ diff --git a/sprites/mk7_chest_variants/mk7_chest_variants.yy b/sprites/mk7_chest_variants/mk7_chest_variants.yy index 2467f1d624..b3ad9a463c 100644 --- a/sprites/mk7_chest_variants/mk7_chest_variants.yy +++ b/sprites/mk7_chest_variants/mk7_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"mk7_chest_variants", "bboxMode":0, "bbox_bottom":89, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"18394c2c-6406-40fe-8ad1-ee4ebd629435","name":"18394c2c-6406-40fe-8ad1-ee4ebd629435","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"18394c2c-6406-40fe-8ad1-ee4ebd629435","name":"18394c2c-6406-40fe-8ad1-ee4ebd629435","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_Contemptor_Conversion_Beamer/cdc4c2e7-a824-4a45-8406-fe470c6eae31.png b/sprites/spr_Contemptor_Conversion_Beamer/cdc4c2e7-a824-4a45-8406-fe470c6eae31.png new file mode 100644 index 0000000000..acabb491b5 Binary files /dev/null and b/sprites/spr_Contemptor_Conversion_Beamer/cdc4c2e7-a824-4a45-8406-fe470c6eae31.png differ diff --git a/sprites/spr_Contemptor_Conversion_Beamer/layers/cdc4c2e7-a824-4a45-8406-fe470c6eae31/af2cc7f4-f5e3-470f-aa0e-ad3ebfbba808.png b/sprites/spr_Contemptor_Conversion_Beamer/layers/cdc4c2e7-a824-4a45-8406-fe470c6eae31/af2cc7f4-f5e3-470f-aa0e-ad3ebfbba808.png new file mode 100644 index 0000000000..acabb491b5 Binary files /dev/null and b/sprites/spr_Contemptor_Conversion_Beamer/layers/cdc4c2e7-a824-4a45-8406-fe470c6eae31/af2cc7f4-f5e3-470f-aa0e-ad3ebfbba808.png differ diff --git a/sprites/spr_Contemptor_Conversion_Beamer/spr_Contemptor_Conversion_Beamer.yy b/sprites/spr_Contemptor_Conversion_Beamer/spr_Contemptor_Conversion_Beamer.yy new file mode 100644 index 0000000000..183e2441ba --- /dev/null +++ b/sprites/spr_Contemptor_Conversion_Beamer/spr_Contemptor_Conversion_Beamer.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_Contemptor_Conversion_Beamer", + "bboxMode":0, + "bbox_bottom":165, + "bbox_left":196, + "bbox_right":283, + "bbox_top":78, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"cdc4c2e7-a824-4a45-8406-fe470c6eae31","name":"cdc4c2e7-a824-4a45-8406-fe470c6eae31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":250, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"af2cc7f4-f5e3-470f-aa0e-ad3ebfbba808","blendMode":0,"displayName":"default","isLocked":false,"name":"af2cc7f4-f5e3-470f-aa0e-ad3ebfbba808","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_Contemptor_Conversion_Beamer", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"dreadnought", + "path":"folders/Sprites/Marine Viewer/dreadnought.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_Contemptor_Conversion_Beamer", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_Contemptor_Conversion_Beamer", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":250.0, + "seqWidth":306.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdc4c2e7-a824-4a45-8406-fe470c6eae31","path":"sprites/spr_Contemptor_Conversion_Beamer/spr_Contemptor_Conversion_Beamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"227c838d-d979-4091-a8ea-a4389830d2ac","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":61, + "yorigin":18, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":306, +} \ No newline at end of file diff --git a/sprites/spr_Contemptor_assault_cannon/1b47a347-6927-4943-981c-dfba95287448.png b/sprites/spr_Contemptor_assault_cannon/1b47a347-6927-4943-981c-dfba95287448.png new file mode 100644 index 0000000000..0abf346938 Binary files /dev/null and b/sprites/spr_Contemptor_assault_cannon/1b47a347-6927-4943-981c-dfba95287448.png differ diff --git a/sprites/spr_Contemptor_assault_cannon/layers/1b47a347-6927-4943-981c-dfba95287448/719740c0-402f-4dc6-af3e-0d8475287311.png b/sprites/spr_Contemptor_assault_cannon/layers/1b47a347-6927-4943-981c-dfba95287448/719740c0-402f-4dc6-af3e-0d8475287311.png new file mode 100644 index 0000000000..0abf346938 Binary files /dev/null and b/sprites/spr_Contemptor_assault_cannon/layers/1b47a347-6927-4943-981c-dfba95287448/719740c0-402f-4dc6-af3e-0d8475287311.png differ diff --git a/sprites/spr_Contemptor_assault_cannon/spr_Contemptor_assault_cannon.yy b/sprites/spr_Contemptor_assault_cannon/spr_Contemptor_assault_cannon.yy new file mode 100644 index 0000000000..959f799cc9 --- /dev/null +++ b/sprites/spr_Contemptor_assault_cannon/spr_Contemptor_assault_cannon.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_Contemptor_assault_cannon", + "bboxMode":0, + "bbox_bottom":167, + "bbox_left":199, + "bbox_right":280, + "bbox_top":77, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"1b47a347-6927-4943-981c-dfba95287448","name":"1b47a347-6927-4943-981c-dfba95287448","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":250, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"719740c0-402f-4dc6-af3e-0d8475287311","blendMode":0,"displayName":"default","isLocked":false,"name":"719740c0-402f-4dc6-af3e-0d8475287311","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_Contemptor_assault_cannon", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"dreadnought", + "path":"folders/Sprites/Marine Viewer/dreadnought.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_Contemptor_assault_cannon", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_Contemptor_assault_cannon", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":250.0, + "seqWidth":306.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b47a347-6927-4943-981c-dfba95287448","path":"sprites/spr_Contemptor_assault_cannon/spr_Contemptor_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"04d2904f-f8a8-4807-9f2b-0ba94c26d67b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":61, + "yorigin":18, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":306, +} \ No newline at end of file diff --git a/sprites/spr_Volkite_Culverins/d532989d-6b36-48dc-9ccb-1daf433cbb1f.png b/sprites/spr_Volkite_Culverins/d532989d-6b36-48dc-9ccb-1daf433cbb1f.png new file mode 100644 index 0000000000..78ae7850ce Binary files /dev/null and b/sprites/spr_Volkite_Culverins/d532989d-6b36-48dc-9ccb-1daf433cbb1f.png differ diff --git a/sprites/spr_Volkite_Culverins/layers/d532989d-6b36-48dc-9ccb-1daf433cbb1f/1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png b/sprites/spr_Volkite_Culverins/layers/d532989d-6b36-48dc-9ccb-1daf433cbb1f/1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png new file mode 100644 index 0000000000..78ae7850ce Binary files /dev/null and b/sprites/spr_Volkite_Culverins/layers/d532989d-6b36-48dc-9ccb-1daf433cbb1f/1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png differ diff --git a/sprites/spr_Volkite_Culverins/spr_Volkite_Culverins.yy b/sprites/spr_Volkite_Culverins/spr_Volkite_Culverins.yy new file mode 100644 index 0000000000..3d38eddb88 --- /dev/null +++ b/sprites/spr_Volkite_Culverins/spr_Volkite_Culverins.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_Volkite_Culverins", + "bboxMode":0, + "bbox_bottom":173, + "bbox_left":203, + "bbox_right":287, + "bbox_top":77, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"d532989d-6b36-48dc-9ccb-1daf433cbb1f","name":"d532989d-6b36-48dc-9ccb-1daf433cbb1f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":250, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"1f3e5664-e536-47f4-b0bf-214e1fd9c23a","blendMode":0,"displayName":"default","isLocked":false,"name":"1f3e5664-e536-47f4-b0bf-214e1fd9c23a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_Volkite_Culverins", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"dreadnought", + "path":"folders/Sprites/Marine Viewer/dreadnought.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_Volkite_Culverins", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_Volkite_Culverins", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":250.0, + "seqWidth":306.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d532989d-6b36-48dc-9ccb-1daf433cbb1f","path":"sprites/spr_Volkite_Culverins/spr_Volkite_Culverins.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1a3b8ccb-c022-4cad-95b2-9d1f0d2d8c12","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":61, + "yorigin":18, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":306, +} \ No newline at end of file diff --git a/sprites/spr_advisors/spr_advisors.yy b/sprites/spr_advisors/spr_advisors.yy index d11287eb2e..936cbc2346 100644 --- a/sprites/spr_advisors/spr_advisors.yy +++ b/sprites/spr_advisors/spr_advisors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_advisors", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_alpha_backpack/b8e39c4b-d4da-4ef0-8433-a2ff2ec9115a.png b/sprites/spr_alpha_backpack/b8e39c4b-d4da-4ef0-8433-a2ff2ec9115a.png new file mode 100644 index 0000000000..df4ca653ca Binary files /dev/null and b/sprites/spr_alpha_backpack/b8e39c4b-d4da-4ef0-8433-a2ff2ec9115a.png differ diff --git a/sprites/spr_alpha_backpack/layers/b8e39c4b-d4da-4ef0-8433-a2ff2ec9115a/39cb22a8-79fe-4d1d-96c2-78c089342379.png b/sprites/spr_alpha_backpack/layers/b8e39c4b-d4da-4ef0-8433-a2ff2ec9115a/39cb22a8-79fe-4d1d-96c2-78c089342379.png new file mode 100644 index 0000000000..df4ca653ca Binary files /dev/null and b/sprites/spr_alpha_backpack/layers/b8e39c4b-d4da-4ef0-8433-a2ff2ec9115a/39cb22a8-79fe-4d1d-96c2-78c089342379.png differ diff --git a/sprites/spr_alpha_backpack/spr_alpha_backpack.yy b/sprites/spr_alpha_backpack/spr_alpha_backpack.yy new file mode 100644 index 0000000000..17d4f5ba23 --- /dev/null +++ b/sprites/spr_alpha_backpack/spr_alpha_backpack.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_alpha_backpack", + "bboxMode":0, + "bbox_bottom":80, + "bbox_left":26, + "bbox_right":137, + "bbox_top":35, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b8e39c4b-d4da-4ef0-8433-a2ff2ec9115a","name":"b8e39c4b-d4da-4ef0-8433-a2ff2ec9115a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":322, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"39cb22a8-79fe-4d1d-96c2-78c089342379","blendMode":0,"displayName":"default","isLocked":false,"name":"39cb22a8-79fe-4d1d-96c2-78c089342379","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_alpha_backpack", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":9, + "parent":{ + "name":"packs", + "path":"folders/Sprites/Marine Viewer/packs.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_alpha_backpack", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_alpha_backpack", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b8e39c4b-d4da-4ef0-8433-a2ff2ec9115a","path":"sprites/spr_alpha_backpack/spr_alpha_backpack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7584aeaf-ec78-4cb8-871a-d428db5248c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":6, + "yorigin":88, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_angelic_wings/c5bc43cd-b567-4673-92b9-efede7a0b44f.png b/sprites/spr_angelic_wings/c5bc43cd-b567-4673-92b9-efede7a0b44f.png new file mode 100644 index 0000000000..bbee1b088d Binary files /dev/null and b/sprites/spr_angelic_wings/c5bc43cd-b567-4673-92b9-efede7a0b44f.png differ diff --git a/sprites/spr_angelic_wings/layers/c5bc43cd-b567-4673-92b9-efede7a0b44f/0e8b239a-6017-4ba5-8cbe-9353a86768ec.png b/sprites/spr_angelic_wings/layers/c5bc43cd-b567-4673-92b9-efede7a0b44f/0e8b239a-6017-4ba5-8cbe-9353a86768ec.png new file mode 100644 index 0000000000..bbee1b088d Binary files /dev/null and b/sprites/spr_angelic_wings/layers/c5bc43cd-b567-4673-92b9-efede7a0b44f/0e8b239a-6017-4ba5-8cbe-9353a86768ec.png differ diff --git a/sprites/spr_angelic_wings/spr_angelic_wings.yy b/sprites/spr_angelic_wings/spr_angelic_wings.yy new file mode 100644 index 0000000000..e2958b6086 --- /dev/null +++ b/sprites/spr_angelic_wings/spr_angelic_wings.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_angelic_wings", + "bboxMode":0, + "bbox_bottom":203, + "bbox_left":8, + "bbox_right":158, + "bbox_top":37, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":322, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"0e8b239a-6017-4ba5-8cbe-9353a86768ec","blendMode":0,"displayName":"default","isLocked":false,"name":"0e8b239a-6017-4ba5-8cbe-9353a86768ec","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_angelic_wings", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"packs", + "path":"folders/Sprites/Marine Viewer/packs.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_angelic_wings", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_angelic_wings", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","path":"sprites/spr_angelic_wings/spr_angelic_wings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ee2f8787-456f-461c-b7c9-774ea1070012","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":45, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy b/sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy index d857a103e9..e5ad375a7d 100644 --- a/sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy +++ b/sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_apoth_area_pad", "bboxMode":0, "bbox_bottom":156, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9c1e74d7-d741-437f-8db4-140b9955efc9","name":"9c1e74d7-d741-437f-8db4-140b9955efc9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9c1e74d7-d741-437f-8db4-140b9955efc9","name":"9c1e74d7-d741-437f-8db4-140b9955efc9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c1e74d7-d741-437f-8db4-140b9955efc9","path":"sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"77dd214e-9be8-4d2a-a93c-21af64c5dd5b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c1e74d7-d741-437f-8db4-140b9955efc9","path":"sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"77dd214e-9be8-4d2a-a93c-21af64c5dd5b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_apothecary_lights/spr_apothecary_lights.yy b/sprites/spr_apothecary_lights/spr_apothecary_lights.yy index 50310c7048..2673d9502b 100644 --- a/sprites/spr_apothecary_lights/spr_apothecary_lights.yy +++ b/sprites/spr_apothecary_lights/spr_apothecary_lights.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_apothecary_lights", "bboxMode":0, "bbox_bottom":41, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_aquila_colors/spr_aquila_colors.yy b/sprites/spr_aquila_colors/spr_aquila_colors.yy index 40c3214850..43f1d4643e 100644 --- a/sprites/spr_aquila_colors/spr_aquila_colors.yy +++ b/sprites/spr_aquila_colors/spr_aquila_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_aquila_colors", "bboxMode":0, "bbox_bottom":221, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"196b945c-ac20-4bf9-9811-743bb063884e","name":"196b945c-ac20-4bf9-9811-743bb063884e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5843a196-8071-4e10-b21d-45456dffc379","name":"5843a196-8071-4e10-b21d-45456dffc379","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c59acbe-3f7e-44f3-9e87-eeb9bbab01c3","name":"3c59acbe-3f7e-44f3-9e87-eeb9bbab01c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a63829bc-4178-4cf8-8eee-5d1b24d504ec","name":"a63829bc-4178-4cf8-8eee-5d1b24d504ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c0ec601-323c-4e06-be22-41749ffcb84e","name":"3c0ec601-323c-4e06-be22-41749ffcb84e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e31dc7c8-67c0-4bac-92c5-3afa1ac1d7a6","name":"e31dc7c8-67c0-4bac-92c5-3afa1ac1d7a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee592b7e-0742-407c-97d7-4123a8c1992c","name":"ee592b7e-0742-407c-97d7-4123a8c1992c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b10e630c-c99d-4c23-9e0a-46769320b643","name":"b10e630c-c99d-4c23-9e0a-46769320b643","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e437bbdf-1979-4fb7-b411-468a21361f65","name":"e437bbdf-1979-4fb7-b411-468a21361f65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c1df320b-7e47-42b6-b105-390436d863a4","name":"c1df320b-7e47-42b6-b105-390436d863a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea5e3982-0e43-4acb-bf1a-aee426e5af77","name":"ea5e3982-0e43-4acb-bf1a-aee426e5af77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d49d2d69-0fa6-4af5-815f-0e0657860737","name":"d49d2d69-0fa6-4af5-815f-0e0657860737","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f5c722bf-2493-4f9d-8167-67bd3e21811d","name":"f5c722bf-2493-4f9d-8167-67bd3e21811d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e2028e31-ad62-493d-abaa-5f1fcde51501","name":"e2028e31-ad62-493d-abaa-5f1fcde51501","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"196b945c-ac20-4bf9-9811-743bb063884e","name":"196b945c-ac20-4bf9-9811-743bb063884e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5843a196-8071-4e10-b21d-45456dffc379","name":"5843a196-8071-4e10-b21d-45456dffc379","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c59acbe-3f7e-44f3-9e87-eeb9bbab01c3","name":"3c59acbe-3f7e-44f3-9e87-eeb9bbab01c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a63829bc-4178-4cf8-8eee-5d1b24d504ec","name":"a63829bc-4178-4cf8-8eee-5d1b24d504ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c0ec601-323c-4e06-be22-41749ffcb84e","name":"3c0ec601-323c-4e06-be22-41749ffcb84e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e31dc7c8-67c0-4bac-92c5-3afa1ac1d7a6","name":"e31dc7c8-67c0-4bac-92c5-3afa1ac1d7a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee592b7e-0742-407c-97d7-4123a8c1992c","name":"ee592b7e-0742-407c-97d7-4123a8c1992c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b10e630c-c99d-4c23-9e0a-46769320b643","name":"b10e630c-c99d-4c23-9e0a-46769320b643","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e437bbdf-1979-4fb7-b411-468a21361f65","name":"e437bbdf-1979-4fb7-b411-468a21361f65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c1df320b-7e47-42b6-b105-390436d863a4","name":"c1df320b-7e47-42b6-b105-390436d863a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea5e3982-0e43-4acb-bf1a-aee426e5af77","name":"ea5e3982-0e43-4acb-bf1a-aee426e5af77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d49d2d69-0fa6-4af5-815f-0e0657860737","name":"d49d2d69-0fa6-4af5-815f-0e0657860737","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f5c722bf-2493-4f9d-8167-67bd3e21811d","name":"f5c722bf-2493-4f9d-8167-67bd3e21811d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e2028e31-ad62-493d-abaa-5f1fcde51501","name":"e2028e31-ad62-493d-abaa-5f1fcde51501","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"196b945c-ac20-4bf9-9811-743bb063884e","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d92f84e-7fda-4042-8bf3-8d75c183ffbe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5843a196-8071-4e10-b21d-45456dffc379","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1b408a5-f735-431f-a3ae-1ebeca8bd24c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c59acbe-3f7e-44f3-9e87-eeb9bbab01c3","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"28aca0d5-a8be-4d70-941a-590e091741fc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a63829bc-4178-4cf8-8eee-5d1b24d504ec","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b19d1431-4f05-48ff-bb03-2d023179144a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c0ec601-323c-4e06-be22-41749ffcb84e","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb6ac728-e049-4b87-bd77-7eccb8c94350","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e31dc7c8-67c0-4bac-92c5-3afa1ac1d7a6","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4744f839-6997-4671-a498-e0bbbc236cb5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee592b7e-0742-407c-97d7-4123a8c1992c","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b155f6a-092b-4ec9-8a65-5df1ede3ec1a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b10e630c-c99d-4c23-9e0a-46769320b643","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd592ee2-c0db-4e55-9055-b1548d08c069","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e437bbdf-1979-4fb7-b411-468a21361f65","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"921cff8f-fc1c-4753-94b1-813e101db02b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1df320b-7e47-42b6-b105-390436d863a4","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"435242ef-9cd1-4978-b4bc-f15d7ee199bf","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea5e3982-0e43-4acb-bf1a-aee426e5af77","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ac399a32-b604-46e2-b847-b6c4f2e4746a","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d49d2d69-0fa6-4af5-815f-0e0657860737","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"84a891a9-823a-4488-bb53-6370068347c2","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5c722bf-2493-4f9d-8167-67bd3e21811d","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c81bb583-4b9b-4251-8b63-2fc42968eece","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e2028e31-ad62-493d-abaa-5f1fcde51501","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b926782-d210-4324-b763-d9565e01db99","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"196b945c-ac20-4bf9-9811-743bb063884e","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d92f84e-7fda-4042-8bf3-8d75c183ffbe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5843a196-8071-4e10-b21d-45456dffc379","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1b408a5-f735-431f-a3ae-1ebeca8bd24c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c59acbe-3f7e-44f3-9e87-eeb9bbab01c3","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"28aca0d5-a8be-4d70-941a-590e091741fc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a63829bc-4178-4cf8-8eee-5d1b24d504ec","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b19d1431-4f05-48ff-bb03-2d023179144a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c0ec601-323c-4e06-be22-41749ffcb84e","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb6ac728-e049-4b87-bd77-7eccb8c94350","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e31dc7c8-67c0-4bac-92c5-3afa1ac1d7a6","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4744f839-6997-4671-a498-e0bbbc236cb5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee592b7e-0742-407c-97d7-4123a8c1992c","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b155f6a-092b-4ec9-8a65-5df1ede3ec1a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b10e630c-c99d-4c23-9e0a-46769320b643","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd592ee2-c0db-4e55-9055-b1548d08c069","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e437bbdf-1979-4fb7-b411-468a21361f65","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"921cff8f-fc1c-4753-94b1-813e101db02b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1df320b-7e47-42b6-b105-390436d863a4","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"435242ef-9cd1-4978-b4bc-f15d7ee199bf","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea5e3982-0e43-4acb-bf1a-aee426e5af77","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ac399a32-b604-46e2-b847-b6c4f2e4746a","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d49d2d69-0fa6-4af5-815f-0e0657860737","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"84a891a9-823a-4488-bb53-6370068347c2","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5c722bf-2493-4f9d-8167-67bd3e21811d","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c81bb583-4b9b-4251-8b63-2fc42968eece","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e2028e31-ad62-493d-abaa-5f1fcde51501","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b926782-d210-4324-b763-d9565e01db99","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_arrow/spr_arrow.yy b/sprites/spr_arrow/spr_arrow.yy index 727007b913..a15eb37b4d 100644 --- a/sprites/spr_arrow/spr_arrow.yy +++ b/sprites/spr_arrow/spr_arrow.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_arrow", "bboxMode":0, "bbox_bottom":31, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fb5d2731-7edf-4f03-9af3-967453712162","name":"fb5d2731-7edf-4f03-9af3-967453712162","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8a69eefe-952d-46cd-8453-6c8cf24fe7ef","name":"8a69eefe-952d-46cd-8453-6c8cf24fe7ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e54d67b1-caa3-40de-b938-fff90bba2f4d","name":"e54d67b1-caa3-40de-b938-fff90bba2f4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1403322b-e756-41c8-bb4b-47e54d4ca8bd","name":"1403322b-e756-41c8-bb4b-47e54d4ca8bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb5d2731-7edf-4f03-9af3-967453712162","name":"fb5d2731-7edf-4f03-9af3-967453712162","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a69eefe-952d-46cd-8453-6c8cf24fe7ef","name":"8a69eefe-952d-46cd-8453-6c8cf24fe7ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e54d67b1-caa3-40de-b938-fff90bba2f4d","name":"e54d67b1-caa3-40de-b938-fff90bba2f4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1403322b-e756-41c8-bb4b-47e54d4ca8bd","name":"1403322b-e756-41c8-bb4b-47e54d4ca8bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb5d2731-7edf-4f03-9af3-967453712162","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89adf783-a574-4edb-8f59-3b08e65bf585","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a69eefe-952d-46cd-8453-6c8cf24fe7ef","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce331085-eb5b-4228-ac95-f2bffc05336d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e54d67b1-caa3-40de-b938-fff90bba2f4d","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f868074-84fa-4cec-a7ca-8bd2319cf19b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1403322b-e756-41c8-bb4b-47e54d4ca8bd","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"60911368-393b-4d37-8ff6-989e4ccf4777","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb5d2731-7edf-4f03-9af3-967453712162","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89adf783-a574-4edb-8f59-3b08e65bf585","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a69eefe-952d-46cd-8453-6c8cf24fe7ef","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce331085-eb5b-4228-ac95-f2bffc05336d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e54d67b1-caa3-40de-b938-fff90bba2f4d","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f868074-84fa-4cec-a7ca-8bd2319cf19b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1403322b-e756-41c8-bb4b-47e54d4ca8bd","path":"sprites/spr_arrow/spr_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"60911368-393b-4d37-8ff6-989e4ccf4777","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_artifact_button/spr_artifact_button.yy b/sprites/spr_artifact_button/spr_artifact_button.yy index cc016abea8..7c5d1a9b72 100644 --- a/sprites/spr_artifact_button/spr_artifact_button.yy +++ b/sprites/spr_artifact_button/spr_artifact_button.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artifact_button", "bboxMode":0, "bbox_bottom":10, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"82845b71-468a-440c-a932-2862a3476e6d","name":"82845b71-468a-440c-a932-2862a3476e6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb815b57-b7f2-4c4c-a0b7-10dfb52fbd85","name":"bb815b57-b7f2-4c4c-a0b7-10dfb52fbd85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea2e419c-789f-401c-876c-549d09cdb741","name":"ea2e419c-789f-401c-876c-549d09cdb741","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3896f7c7-b6f2-4312-b4a6-5e129b6643a4","name":"3896f7c7-b6f2-4312-b4a6-5e129b6643a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e04a69ea-e9e9-4796-a353-52f152064318","name":"e04a69ea-e9e9-4796-a353-52f152064318","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a2386a43-d1ec-41e4-a61c-722ac93321ac","name":"a2386a43-d1ec-41e4-a61c-722ac93321ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a3531fd-cca3-4e90-8989-6a9743b3b71e","name":"2a3531fd-cca3-4e90-8989-6a9743b3b71e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1957e8d-5996-4d20-aa38-30a7b11a91ac","name":"e1957e8d-5996-4d20-aa38-30a7b11a91ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82845b71-468a-440c-a932-2862a3476e6d","name":"82845b71-468a-440c-a932-2862a3476e6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb815b57-b7f2-4c4c-a0b7-10dfb52fbd85","name":"bb815b57-b7f2-4c4c-a0b7-10dfb52fbd85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea2e419c-789f-401c-876c-549d09cdb741","name":"ea2e419c-789f-401c-876c-549d09cdb741","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3896f7c7-b6f2-4312-b4a6-5e129b6643a4","name":"3896f7c7-b6f2-4312-b4a6-5e129b6643a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e04a69ea-e9e9-4796-a353-52f152064318","name":"e04a69ea-e9e9-4796-a353-52f152064318","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a2386a43-d1ec-41e4-a61c-722ac93321ac","name":"a2386a43-d1ec-41e4-a61c-722ac93321ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a3531fd-cca3-4e90-8989-6a9743b3b71e","name":"2a3531fd-cca3-4e90-8989-6a9743b3b71e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1957e8d-5996-4d20-aa38-30a7b11a91ac","name":"e1957e8d-5996-4d20-aa38-30a7b11a91ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,30 +75,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82845b71-468a-440c-a932-2862a3476e6d","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f957935-db04-43c1-b32e-c2ad43c45291","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb815b57-b7f2-4c4c-a0b7-10dfb52fbd85","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6c3b3b9-aa74-4818-96f8-d3867efdf436","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea2e419c-789f-401c-876c-549d09cdb741","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88a3f009-0cc5-49f5-a65f-925ae42ce303","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3896f7c7-b6f2-4312-b4a6-5e129b6643a4","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f3a3140f-a181-4e8e-84e7-37b88bc3d04d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e04a69ea-e9e9-4796-a353-52f152064318","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef8f81e9-6668-41d7-98ce-946bba9cbbca","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2386a43-d1ec-41e4-a61c-722ac93321ac","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e90413e9-6265-427b-aba4-a327302748db","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a3531fd-cca3-4e90-8989-6a9743b3b71e","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b7297585-09fe-4043-bdf5-614258359ff1","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1957e8d-5996-4d20-aa38-30a7b11a91ac","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e13e2bdf-85b0-4465-96a0-364f599779ae","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82845b71-468a-440c-a932-2862a3476e6d","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f957935-db04-43c1-b32e-c2ad43c45291","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb815b57-b7f2-4c4c-a0b7-10dfb52fbd85","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6c3b3b9-aa74-4818-96f8-d3867efdf436","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea2e419c-789f-401c-876c-549d09cdb741","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88a3f009-0cc5-49f5-a65f-925ae42ce303","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3896f7c7-b6f2-4312-b4a6-5e129b6643a4","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f3a3140f-a181-4e8e-84e7-37b88bc3d04d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e04a69ea-e9e9-4796-a353-52f152064318","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef8f81e9-6668-41d7-98ce-946bba9cbbca","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2386a43-d1ec-41e4-a61c-722ac93321ac","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e90413e9-6265-427b-aba4-a327302748db","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a3531fd-cca3-4e90-8989-6a9743b3b71e","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b7297585-09fe-4043-bdf5-614258359ff1","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1957e8d-5996-4d20-aa38-30a7b11a91ac","path":"sprites/spr_artifact_button/spr_artifact_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e13e2bdf-85b0-4465-96a0-364f599779ae","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_artificer_armour/spr_artificer_armour.yy b/sprites/spr_artificer_armour/spr_artificer_armour.yy index 4aa32c6701..15fd57474a 100644 --- a/sprites/spr_artificer_armour/spr_artificer_armour.yy +++ b/sprites/spr_artificer_armour/spr_artificer_armour.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_armour", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ca4df4be-eb20-4d55-a0eb-1d8fcc0220b9","name":"ca4df4be-eb20-4d55-a0eb-1d8fcc0220b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca4df4be-eb20-4d55-a0eb-1d8fcc0220b9","name":"ca4df4be-eb20-4d55-a0eb-1d8fcc0220b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca4df4be-eb20-4d55-a0eb-1d8fcc0220b9","path":"sprites/spr_artificer_armour/spr_artificer_armour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7cf7d4b-a007-4322-8222-ef43754d18e8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca4df4be-eb20-4d55-a0eb-1d8fcc0220b9","path":"sprites/spr_artificer_armour/spr_artificer_armour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7cf7d4b-a007-4322-8222-ef43754d18e8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_artificer_chest/spr_artificer_chest.yy b/sprites/spr_artificer_chest/spr_artificer_chest.yy index a9e4c3eb8c..75ca80b41e 100644 --- a/sprites/spr_artificer_chest/spr_artificer_chest.yy +++ b/sprites/spr_artificer_chest/spr_artificer_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_chest", "bboxMode":0, "bbox_bottom":90, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_chest/spr_artificer_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"695c24c1-c493-4c97-a688-991bf8fc18c9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_chest/spr_artificer_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb007e86-4f39-43ed-b95a-b530d3d169db","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_chest/spr_artificer_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"695c24c1-c493-4c97-a688-991bf8fc18c9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_chest/spr_artificer_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb007e86-4f39-43ed-b95a-b530d3d169db","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_artificer_colors/spr_artificer_colors.yy b/sprites/spr_artificer_colors/spr_artificer_colors.yy index 012b24f3cf..bf2fb89584 100644 --- a/sprites/spr_artificer_colors/spr_artificer_colors.yy +++ b/sprites/spr_artificer_colors/spr_artificer_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_colors", "bboxMode":0, "bbox_bottom":259, @@ -12,19 +12,19 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"85427dac-93fd-4529-a60d-9d0419649728","name":"85427dac-93fd-4529-a60d-9d0419649728","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"748e63c4-61df-4c2a-86a2-1e54b4923668","name":"748e63c4-61df-4c2a-86a2-1e54b4923668","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ddd4e849-0eba-4c4d-ad0e-4f505fce5db3","name":"ddd4e849-0eba-4c4d-ad0e-4f505fce5db3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0686cdbf-e0a5-4271-82bc-f8770c9f1b56","name":"0686cdbf-e0a5-4271-82bc-f8770c9f1b56","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"18817c48-2122-4764-80af-9e943f35821b","name":"18817c48-2122-4764-80af-9e943f35821b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"81976d8e-48bf-4ed7-8142-69c598967cfc","name":"81976d8e-48bf-4ed7-8142-69c598967cfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"92eb2a7c-d72f-4f7e-9729-dc1edc808464","name":"92eb2a7c-d72f-4f7e-9729-dc1edc808464","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3544a7f-1d6a-425a-a330-32cd5a6858d1","name":"e3544a7f-1d6a-425a-a330-32cd5a6858d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87bf6c6c-2f4a-4883-9191-f602799e9305","name":"87bf6c6c-2f4a-4883-9191-f602799e9305","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8b770cde-e547-4eb9-9b08-961733463dbc","name":"8b770cde-e547-4eb9-9b08-961733463dbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"85427dac-93fd-4529-a60d-9d0419649728","name":"85427dac-93fd-4529-a60d-9d0419649728","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"748e63c4-61df-4c2a-86a2-1e54b4923668","name":"748e63c4-61df-4c2a-86a2-1e54b4923668","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ddd4e849-0eba-4c4d-ad0e-4f505fce5db3","name":"ddd4e849-0eba-4c4d-ad0e-4f505fce5db3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0686cdbf-e0a5-4271-82bc-f8770c9f1b56","name":"0686cdbf-e0a5-4271-82bc-f8770c9f1b56","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"18817c48-2122-4764-80af-9e943f35821b","name":"18817c48-2122-4764-80af-9e943f35821b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"81976d8e-48bf-4ed7-8142-69c598967cfc","name":"81976d8e-48bf-4ed7-8142-69c598967cfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92eb2a7c-d72f-4f7e-9729-dc1edc808464","name":"92eb2a7c-d72f-4f7e-9729-dc1edc808464","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3544a7f-1d6a-425a-a330-32cd5a6858d1","name":"e3544a7f-1d6a-425a-a330-32cd5a6858d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87bf6c6c-2f4a-4883-9191-f602799e9305","name":"87bf6c6c-2f4a-4883-9191-f602799e9305","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8b770cde-e547-4eb9-9b08-961733463dbc","name":"8b770cde-e547-4eb9-9b08-961733463dbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,45 +82,19 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"85427dac-93fd-4529-a60d-9d0419649728","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c7295045-cbef-46f8-a2b8-5509abd297c9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"748e63c4-61df-4c2a-86a2-1e54b4923668","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2539586c-2517-4228-9636-40fa2795a01f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ddd4e849-0eba-4c4d-ad0e-4f505fce5db3","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0a3fc28c-8dfc-4a79-8eb3-a1f49a3d96d4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0686cdbf-e0a5-4271-82bc-f8770c9f1b56","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a6de5f1-2455-49b5-9a97-ee7f015f58fb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ab9517bd-47b3-49eb-895f-885db3de7ff0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"db47a5c3-c0ac-4a80-a05e-7f99ee96c715","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"18817c48-2122-4764-80af-9e943f35821b","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"760fe7ce-e9b0-49c5-8efb-55e99091e83f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"81976d8e-48bf-4ed7-8142-69c598967cfc","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d041acf-d941-47e6-bc2a-247f75db3689","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92eb2a7c-d72f-4f7e-9729-dc1edc808464","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"79f29b73-bcdf-4160-b840-a89a8ca6b9f5","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3544a7f-1d6a-425a-a330-32cd5a6858d1","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"74e7f222-2d83-441b-945a-9a0a5e44f75b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87bf6c6c-2f4a-4883-9191-f602799e9305","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c9c8bf3e-c92a-49b2-82d5-b1910bd4e60a","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b770cde-e547-4eb9-9b08-961733463dbc","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cb83b1e8-da10-42a8-994d-d5b288dd7e7e","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"73dc5802-b53a-49ed-922d-ffcd859fbaa4","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"85427dac-93fd-4529-a60d-9d0419649728","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c7295045-cbef-46f8-a2b8-5509abd297c9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"748e63c4-61df-4c2a-86a2-1e54b4923668","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2539586c-2517-4228-9636-40fa2795a01f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ddd4e849-0eba-4c4d-ad0e-4f505fce5db3","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0a3fc28c-8dfc-4a79-8eb3-a1f49a3d96d4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0686cdbf-e0a5-4271-82bc-f8770c9f1b56","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a6de5f1-2455-49b5-9a97-ee7f015f58fb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ab9517bd-47b3-49eb-895f-885db3de7ff0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"db47a5c3-c0ac-4a80-a05e-7f99ee96c715","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"18817c48-2122-4764-80af-9e943f35821b","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"760fe7ce-e9b0-49c5-8efb-55e99091e83f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"81976d8e-48bf-4ed7-8142-69c598967cfc","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d041acf-d941-47e6-bc2a-247f75db3689","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92eb2a7c-d72f-4f7e-9729-dc1edc808464","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"79f29b73-bcdf-4160-b840-a89a8ca6b9f5","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3544a7f-1d6a-425a-a330-32cd5a6858d1","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"74e7f222-2d83-441b-945a-9a0a5e44f75b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87bf6c6c-2f4a-4883-9191-f602799e9305","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c9c8bf3e-c92a-49b2-82d5-b1910bd4e60a","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b770cde-e547-4eb9-9b08-961733463dbc","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cb83b1e8-da10-42a8-994d-d5b288dd7e7e","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","path":"sprites/spr_artificer_colors/spr_artificer_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"73dc5802-b53a-49ed-922d-ffcd859fbaa4","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_artificer_colors2/spr_artificer_colors2.yy b/sprites/spr_artificer_colors2/spr_artificer_colors2.yy index 0a57964c29..2969d78809 100644 --- a/sprites/spr_artificer_colors2/spr_artificer_colors2.yy +++ b/sprites/spr_artificer_colors2/spr_artificer_colors2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_colors2", "bboxMode":0, "bbox_bottom":259, @@ -12,19 +12,19 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"465b561c-397b-4542-b767-1c1e930f4829","name":"465b561c-397b-4542-b767-1c1e930f4829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"648ca404-0692-44f8-a7ce-917554b0956c","name":"648ca404-0692-44f8-a7ce-917554b0956c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"179c6171-f521-4d22-bdaa-c536459871f4","name":"179c6171-f521-4d22-bdaa-c536459871f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9902c9e6-50d6-48d9-a914-0d284fada227","name":"9902c9e6-50d6-48d9-a914-0d284fada227","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"18817c48-2122-4764-80af-9e943f35821b","name":"18817c48-2122-4764-80af-9e943f35821b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"23b51e59-13ca-4055-88de-7ef59a5f0e17","name":"23b51e59-13ca-4055-88de-7ef59a5f0e17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6a4027a4-3435-4229-85ac-88d88b368d6f","name":"6a4027a4-3435-4229-85ac-88d88b368d6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d0b469e1-5258-4d90-baeb-98e61280e177","name":"d0b469e1-5258-4d90-baeb-98e61280e177","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87bf6c6c-2f4a-4883-9191-f602799e9305","name":"87bf6c6c-2f4a-4883-9191-f602799e9305","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8b770cde-e547-4eb9-9b08-961733463dbc","name":"8b770cde-e547-4eb9-9b08-961733463dbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"465b561c-397b-4542-b767-1c1e930f4829","name":"465b561c-397b-4542-b767-1c1e930f4829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"648ca404-0692-44f8-a7ce-917554b0956c","name":"648ca404-0692-44f8-a7ce-917554b0956c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"179c6171-f521-4d22-bdaa-c536459871f4","name":"179c6171-f521-4d22-bdaa-c536459871f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9902c9e6-50d6-48d9-a914-0d284fada227","name":"9902c9e6-50d6-48d9-a914-0d284fada227","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"18817c48-2122-4764-80af-9e943f35821b","name":"18817c48-2122-4764-80af-9e943f35821b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"23b51e59-13ca-4055-88de-7ef59a5f0e17","name":"23b51e59-13ca-4055-88de-7ef59a5f0e17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6a4027a4-3435-4229-85ac-88d88b368d6f","name":"6a4027a4-3435-4229-85ac-88d88b368d6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d0b469e1-5258-4d90-baeb-98e61280e177","name":"d0b469e1-5258-4d90-baeb-98e61280e177","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87bf6c6c-2f4a-4883-9191-f602799e9305","name":"87bf6c6c-2f4a-4883-9191-f602799e9305","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8b770cde-e547-4eb9-9b08-961733463dbc","name":"8b770cde-e547-4eb9-9b08-961733463dbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -80,45 +80,19 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"465b561c-397b-4542-b767-1c1e930f4829","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"418acf20-555a-45a9-845e-a25d2b24bbd8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"648ca404-0692-44f8-a7ce-917554b0956c","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1c64f280-2ec1-484a-8036-1068377ef27f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"179c6171-f521-4d22-bdaa-c536459871f4","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9bbf352-7a0f-4cc6-9a88-eabc4ff535f4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9902c9e6-50d6-48d9-a914-0d284fada227","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c8d96e2-d035-46d8-a4d5-0203302101a0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd722d5d-1172-4598-b0da-138a518d0047","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"49048c8d-6e33-4837-a2d1-1d77d49a7762","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"18817c48-2122-4764-80af-9e943f35821b","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b671afd-3196-4716-9b7a-0690b7ac935a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"23b51e59-13ca-4055-88de-7ef59a5f0e17","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2aab3d30-2aab-4728-94b8-c74b1f0b3be3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a4027a4-3435-4229-85ac-88d88b368d6f","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"610d0051-7c39-41a4-a26a-f6a8c2e211ff","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0b469e1-5258-4d90-baeb-98e61280e177","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75c7a62a-13d6-40ab-98a0-4bc64be07b71","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87bf6c6c-2f4a-4883-9191-f602799e9305","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca290fe5-3c30-4380-bbdf-283c97fd9c02","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b770cde-e547-4eb9-9b08-961733463dbc","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff4263c0-1f15-4d8d-a3ba-3058bda9198e","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"787b89f0-2491-4d7f-8612-1ca4d9bb8d29","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"465b561c-397b-4542-b767-1c1e930f4829","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"418acf20-555a-45a9-845e-a25d2b24bbd8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"648ca404-0692-44f8-a7ce-917554b0956c","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1c64f280-2ec1-484a-8036-1068377ef27f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"179c6171-f521-4d22-bdaa-c536459871f4","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9bbf352-7a0f-4cc6-9a88-eabc4ff535f4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9902c9e6-50d6-48d9-a914-0d284fada227","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c8d96e2-d035-46d8-a4d5-0203302101a0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5ca32f-41e7-4ae2-b636-7582327fdc12","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd722d5d-1172-4598-b0da-138a518d0047","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed2a9d63-551a-45db-b43f-e2d2a35b2ebe","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"49048c8d-6e33-4837-a2d1-1d77d49a7762","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"18817c48-2122-4764-80af-9e943f35821b","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b671afd-3196-4716-9b7a-0690b7ac935a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"23b51e59-13ca-4055-88de-7ef59a5f0e17","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2aab3d30-2aab-4728-94b8-c74b1f0b3be3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a4027a4-3435-4229-85ac-88d88b368d6f","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"610d0051-7c39-41a4-a26a-f6a8c2e211ff","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0b469e1-5258-4d90-baeb-98e61280e177","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75c7a62a-13d6-40ab-98a0-4bc64be07b71","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87bf6c6c-2f4a-4883-9191-f602799e9305","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca290fe5-3c30-4380-bbdf-283c97fd9c02","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b770cde-e547-4eb9-9b08-961733463dbc","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff4263c0-1f15-4d8d-a3ba-3058bda9198e","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1fdc37f-2ec9-49f1-bf1e-4ca14a6006cf","path":"sprites/spr_artificer_colors2/spr_artificer_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"787b89f0-2491-4d7f-8612-1ca4d9bb8d29","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy b/sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy index e995554587..be59453338 100644 --- a/sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy +++ b/sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_left_leg", "bboxMode":0, "bbox_bottom":219, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84d1fd56-e3fe-4d4a-b85d-b17fbd92c442","name":"84d1fd56-e3fe-4d4a-b85d-b17fbd92c442","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84d1fd56-e3fe-4d4a-b85d-b17fbd92c442","name":"84d1fd56-e3fe-4d4a-b85d-b17fbd92c442","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e67f81b-7a32-423e-a9c1-8dbb4c623cdb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84d1fd56-e3fe-4d4a-b85d-b17fbd92c442","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de31f64a-c770-4c2c-8a6e-c95869e6e2ad","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a8897713-942a-4b66-b8df-16e16d0b47f1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e67f81b-7a32-423e-a9c1-8dbb4c623cdb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84d1fd56-e3fe-4d4a-b85d-b17fbd92c442","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de31f64a-c770-4c2c-8a6e-c95869e6e2ad","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_left_leg/spr_artificer_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a8897713-942a-4b66-b8df-16e16d0b47f1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_artificer_left_pad/spr_artificer_left_pad.yy b/sprites/spr_artificer_left_pad/spr_artificer_left_pad.yy index 687cf1c5b1..909640bbac 100644 --- a/sprites/spr_artificer_left_pad/spr_artificer_left_pad.yy +++ b/sprites/spr_artificer_left_pad/spr_artificer_left_pad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_left_pad", "bboxMode":0, "bbox_bottom":73, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_left_pad/spr_artificer_left_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e614f69-695e-4467-975d-63cc4537dd4e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_left_pad/spr_artificer_left_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e614f69-695e-4467-975d-63cc4537dd4e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy b/sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy index 2b3575fb27..6312841e78 100644 --- a/sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy +++ b/sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_left_trim", "bboxMode":0, "bbox_bottom":80, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93d3e203-1853-43a1-81a7-e0bed288b71e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_left_trim/spr_artificer_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93d3e203-1853-43a1-81a7-e0bed288b71e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_artificer_mouth/spr_artificer_mouth.yy b/sprites/spr_artificer_mouth/spr_artificer_mouth.yy index 221262a13e..39ec654dea 100644 --- a/sprites/spr_artificer_mouth/spr_artificer_mouth.yy +++ b/sprites/spr_artificer_mouth/spr_artificer_mouth.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_mouth", "bboxMode":0, "bbox_bottom":42, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"645cbee8-c921-4d89-9cd1-7e859021bce5","name":"645cbee8-c921-4d89-9cd1-7e859021bce5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a29e8d58-a798-4e3d-9915-8364431faf43","name":"a29e8d58-a798-4e3d-9915-8364431faf43","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"645cbee8-c921-4d89-9cd1-7e859021bce5","name":"645cbee8-c921-4d89-9cd1-7e859021bce5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a29e8d58-a798-4e3d-9915-8364431faf43","name":"a29e8d58-a798-4e3d-9915-8364431faf43","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"645cbee8-c921-4d89-9cd1-7e859021bce5","path":"sprites/spr_artificer_mouth/spr_artificer_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c3e5a235-58e3-4689-bd3c-820bf57833f7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a29e8d58-a798-4e3d-9915-8364431faf43","path":"sprites/spr_artificer_mouth/spr_artificer_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c5ab1e7b-d255-41bc-b0a4-e686c2fe235c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"645cbee8-c921-4d89-9cd1-7e859021bce5","path":"sprites/spr_artificer_mouth/spr_artificer_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c3e5a235-58e3-4689-bd3c-820bf57833f7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a29e8d58-a798-4e3d-9915-8364431faf43","path":"sprites/spr_artificer_mouth/spr_artificer_mouth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c5ab1e7b-d255-41bc-b0a4-e686c2fe235c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy b/sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy index b7bd20b87f..84749e3865 100644 --- a/sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy +++ b/sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_right_leg", "bboxMode":0, "bbox_bottom":219, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e5fe53bf-41cc-4895-8b67-8696999ebf0d","name":"e5fe53bf-41cc-4895-8b67-8696999ebf0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e5fe53bf-41cc-4895-8b67-8696999ebf0d","name":"e5fe53bf-41cc-4895-8b67-8696999ebf0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"971af348-e201-4d93-8133-17abb7dc7f61","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5fe53bf-41cc-4895-8b67-8696999ebf0d","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef9ef794-b513-4f2c-af7c-384d9108b2de","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f77fe365-151f-4f76-aaa3-1324e7402ba7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f315ebe-0e5d-40f9-85c2-c3e24833c89d","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"971af348-e201-4d93-8133-17abb7dc7f61","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5fe53bf-41cc-4895-8b67-8696999ebf0d","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef9ef794-b513-4f2c-af7c-384d9108b2de","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_right_leg/spr_artificer_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f77fe365-151f-4f76-aaa3-1324e7402ba7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_artificer_thorax/spr_artificer_thorax.yy b/sprites/spr_artificer_thorax/spr_artificer_thorax.yy index 60ae20ab59..7d0c374e60 100644 --- a/sprites/spr_artificer_thorax/spr_artificer_thorax.yy +++ b/sprites/spr_artificer_thorax/spr_artificer_thorax.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_artificer_thorax", "bboxMode":0, "bbox_bottom":187, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b62d8341-5361-46e5-9c5c-b0dda1433d6d","name":"b62d8341-5361-46e5-9c5c-b0dda1433d6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fd88342-b482-465c-a602-eeb5aa891585","name":"5fd88342-b482-465c-a602-eeb5aa891585","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b62d8341-5361-46e5-9c5c-b0dda1433d6d","name":"b62d8341-5361-46e5-9c5c-b0dda1433d6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_thorax/spr_artificer_thorax.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f3e1a5ab-78e2-4acc-b609-c4d89a4edb47","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b62d8341-5361-46e5-9c5c-b0dda1433d6d","path":"sprites/spr_artificer_thorax/spr_artificer_thorax.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f6000eb1-261a-407f-8d01-43f3a113dae5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fd88342-b482-465c-a602-eeb5aa891585","path":"sprites/spr_artificer_thorax/spr_artificer_thorax.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f3e1a5ab-78e2-4acc-b609-c4d89a4edb47","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b62d8341-5361-46e5-9c5c-b0dda1433d6d","path":"sprites/spr_artificer_thorax/spr_artificer_thorax.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6000eb1-261a-407f-8d01-43f3a113dae5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_assault_ram/spr_assault_ram.yy b/sprites/spr_assault_ram/spr_assault_ram.yy index 5961be80bd..d39d0c0e4f 100644 --- a/sprites/spr_assault_ram/spr_assault_ram.yy +++ b/sprites/spr_assault_ram/spr_assault_ram.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_assault_ram", "bboxMode":0, "bbox_bottom":19, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d34fb461-e740-4b3d-8790-5d8bc721165b","name":"d34fb461-e740-4b3d-8790-5d8bc721165b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d34fb461-e740-4b3d-8790-5d8bc721165b","name":"d34fb461-e740-4b3d-8790-5d8bc721165b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d34fb461-e740-4b3d-8790-5d8bc721165b","path":"sprites/spr_assault_ram/spr_assault_ram.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2a4e024b-73cf-4acd-a21d-1f37789ba2f0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d34fb461-e740-4b3d-8790-5d8bc721165b","path":"sprites/spr_assault_ram/spr_assault_ram.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2a4e024b-73cf-4acd-a21d-1f37789ba2f0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_attacked/spr_attacked.yy b/sprites/spr_attacked/spr_attacked.yy index 763a8431fa..02b64a6be0 100644 --- a/sprites/spr_attacked/spr_attacked.yy +++ b/sprites/spr_attacked/spr_attacked.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_attacked", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_azreal/spr_azreal.yy b/sprites/spr_azreal/spr_azreal.yy index 03eca4d09e..151ffe8278 100644 --- a/sprites/spr_azreal/spr_azreal.yy +++ b/sprites/spr_azreal/spr_azreal.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_azreal", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"be71ab82-be2b-4ced-8f5d-75413b0dbf6c","name":"be71ab82-be2b-4ced-8f5d-75413b0dbf6c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be71ab82-be2b-4ced-8f5d-75413b0dbf6c","name":"be71ab82-be2b-4ced-8f5d-75413b0dbf6c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be71ab82-be2b-4ced-8f5d-75413b0dbf6c","path":"sprites/spr_azreal/spr_azreal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6c71c3f-69e6-4c4d-9a42-9cff9ba784da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be71ab82-be2b-4ced-8f5d-75413b0dbf6c","path":"sprites/spr_azreal/spr_azreal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6c71c3f-69e6-4c4d-9a42-9cff9ba784da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy b/sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy index 504eed4f25..d82294c854 100644 --- a/sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy +++ b/sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ba_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c6b4deb7-05a7-44f9-8dd8-30aceb23465b","name":"c6b4deb7-05a7-44f9-8dd8-30aceb23465b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8cdc5a48-06f4-49f2-91fd-6384f83f3a1a","name":"8cdc5a48-06f4-49f2-91fd-6384f83f3a1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c6b4deb7-05a7-44f9-8dd8-30aceb23465b","name":"c6b4deb7-05a7-44f9-8dd8-30aceb23465b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8cdc5a48-06f4-49f2-91fd-6384f83f3a1a","name":"8cdc5a48-06f4-49f2-91fd-6384f83f3a1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c6b4deb7-05a7-44f9-8dd8-30aceb23465b","path":"sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a167912-84a6-4e1c-9daa-41e4b7d1aa32","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cdc5a48-06f4-49f2-91fd-6384f83f3a1a","path":"sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4cb102e8-fb3e-443e-ba38-700d8f8fc742","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c6b4deb7-05a7-44f9-8dd8-30aceb23465b","path":"sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a167912-84a6-4e1c-9daa-41e4b7d1aa32","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cdc5a48-06f4-49f2-91fd-6384f83f3a1a","path":"sprites/spr_ba_mk5_helm/spr_ba_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4cb102e8-fb3e-443e-ba38-700d8f8fc742","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy b/sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy index adb831719e..c623e7d0af 100644 --- a/sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy +++ b/sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ba_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e7e81da2-bb99-4fe9-b4a1-6e83dea28947","name":"e7e81da2-bb99-4fe9-b4a1-6e83dea28947","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"363aa087-5772-41b1-9084-0db7a73b44e2","name":"363aa087-5772-41b1-9084-0db7a73b44e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7e81da2-bb99-4fe9-b4a1-6e83dea28947","name":"e7e81da2-bb99-4fe9-b4a1-6e83dea28947","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"363aa087-5772-41b1-9084-0db7a73b44e2","name":"363aa087-5772-41b1-9084-0db7a73b44e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7e81da2-bb99-4fe9-b4a1-6e83dea28947","path":"sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d52b85e0-19df-4047-8486-1c0bd1726b78","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"363aa087-5772-41b1-9084-0db7a73b44e2","path":"sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c45d87c6-51bb-4ae7-b263-53dc3ef0475a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7e81da2-bb99-4fe9-b4a1-6e83dea28947","path":"sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d52b85e0-19df-4047-8486-1c0bd1726b78","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"363aa087-5772-41b1-9084-0db7a73b44e2","path":"sprites/spr_ba_mk6_helm/spr_ba_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c45d87c6-51bb-4ae7-b263-53dc3ef0475a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy b/sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy index 1172ef4f63..5577b1c306 100644 --- a/sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy +++ b/sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ba_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"36e9d046-4f4d-44a7-8c95-ac46a9430767","name":"36e9d046-4f4d-44a7-8c95-ac46a9430767","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1efc778a-1151-49d9-9505-d60929b94eb6","name":"1efc778a-1151-49d9-9505-d60929b94eb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"36e9d046-4f4d-44a7-8c95-ac46a9430767","name":"36e9d046-4f4d-44a7-8c95-ac46a9430767","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1efc778a-1151-49d9-9505-d60929b94eb6","name":"1efc778a-1151-49d9-9505-d60929b94eb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"36e9d046-4f4d-44a7-8c95-ac46a9430767","path":"sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"13c117b6-5761-431e-8458-7954910203fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1efc778a-1151-49d9-9505-d60929b94eb6","path":"sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d751d70-9f65-4be1-9d47-be440a07a2dc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"36e9d046-4f4d-44a7-8c95-ac46a9430767","path":"sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"13c117b6-5761-431e-8458-7954910203fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1efc778a-1151-49d9-9505-d60929b94eb6","path":"sprites/spr_ba_mk7_helm/spr_ba_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d751d70-9f65-4be1-9d47-be440a07a2dc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_backpack_fastening/spr_backpack_fastening.yy b/sprites/spr_backpack_fastening/spr_backpack_fastening.yy index f1402144de..a3f0db958b 100644 --- a/sprites/spr_backpack_fastening/spr_backpack_fastening.yy +++ b/sprites/spr_backpack_fastening/spr_backpack_fastening.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_backpack_fastening", "bboxMode":0, "bbox_bottom":89, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","name":"25fd73f2-dbb3-4ee5-8201-8fefbe86bbee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy b/sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy index 2db9be8abf..85a5eac270 100644 --- a/sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy +++ b/sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ballistic_skill_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f6b84ce9-b4d1-4e70-a1b0-b86de4228a4b","name":"f6b84ce9-b4d1-4e70-a1b0-b86de4228a4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f6b84ce9-b4d1-4e70-a1b0-b86de4228a4b","name":"f6b84ce9-b4d1-4e70-a1b0-b86de4228a4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6b84ce9-b4d1-4e70-a1b0-b86de4228a4b","path":"sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"154608a6-0aee-4e03-9bae-f9a473358190","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6b84ce9-b4d1-4e70-a1b0-b86de4228a4b","path":"sprites/spr_ballistic_skill_icon/spr_ballistic_skill_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"154608a6-0aee-4e03-9bae-f9a473358190","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bar/spr_bar.yy b/sprites/spr_bar/spr_bar.yy index 4bb389bfca..e59bb29c9e 100644 --- a/sprites/spr_bar/spr_bar.yy +++ b/sprites/spr_bar/spr_bar.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bar", "bboxMode":0, "bbox_bottom":8, @@ -12,17 +12,17 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bbcc8782-2c91-4f9b-abf9-9bb3f01af507","name":"bbcc8782-2c91-4f9b-abf9-9bb3f01af507","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3302719a-4210-42be-8e5e-4c4c74dc2684","name":"3302719a-4210-42be-8e5e-4c4c74dc2684","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"97cf455e-c535-4150-bd71-17600daaa1f2","name":"97cf455e-c535-4150-bd71-17600daaa1f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e23f1d0-a331-45bc-a4dd-7d9bfe67069c","name":"8e23f1d0-a331-45bc-a4dd-7d9bfe67069c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"54e6c28f-437e-4703-a403-18ac521b732b","name":"54e6c28f-437e-4703-a403-18ac521b732b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cfa6023b-0247-4a6f-8c89-bd04eecc031f","name":"cfa6023b-0247-4a6f-8c89-bd04eecc031f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72b201ea-3f14-4dfa-b59c-047d86cadfb6","name":"72b201ea-3f14-4dfa-b59c-047d86cadfb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"22be5222-6191-4d42-917d-3d11768353fa","name":"22be5222-6191-4d42-917d-3d11768353fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01d90c30-8886-416a-ba21-919ecb4c6aca","name":"01d90c30-8886-416a-ba21-919ecb4c6aca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be26eb8f-03aa-4445-804d-252d0aa43715","name":"be26eb8f-03aa-4445-804d-252d0aa43715","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c38f130f-b02b-4962-9d09-5aa09b23d15c","name":"c38f130f-b02b-4962-9d09-5aa09b23d15c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bbcc8782-2c91-4f9b-abf9-9bb3f01af507","name":"bbcc8782-2c91-4f9b-abf9-9bb3f01af507","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3302719a-4210-42be-8e5e-4c4c74dc2684","name":"3302719a-4210-42be-8e5e-4c4c74dc2684","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"97cf455e-c535-4150-bd71-17600daaa1f2","name":"97cf455e-c535-4150-bd71-17600daaa1f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e23f1d0-a331-45bc-a4dd-7d9bfe67069c","name":"8e23f1d0-a331-45bc-a4dd-7d9bfe67069c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"54e6c28f-437e-4703-a403-18ac521b732b","name":"54e6c28f-437e-4703-a403-18ac521b732b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfa6023b-0247-4a6f-8c89-bd04eecc031f","name":"cfa6023b-0247-4a6f-8c89-bd04eecc031f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72b201ea-3f14-4dfa-b59c-047d86cadfb6","name":"72b201ea-3f14-4dfa-b59c-047d86cadfb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"22be5222-6191-4d42-917d-3d11768353fa","name":"22be5222-6191-4d42-917d-3d11768353fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01d90c30-8886-416a-ba21-919ecb4c6aca","name":"01d90c30-8886-416a-ba21-919ecb4c6aca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be26eb8f-03aa-4445-804d-252d0aa43715","name":"be26eb8f-03aa-4445-804d-252d0aa43715","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c38f130f-b02b-4962-9d09-5aa09b23d15c","name":"c38f130f-b02b-4962-9d09-5aa09b23d15c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -78,39 +78,17 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbcc8782-2c91-4f9b-abf9-9bb3f01af507","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c7c88e2a-d9af-48cc-b9b7-ebaeed3cc7e8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3302719a-4210-42be-8e5e-4c4c74dc2684","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a427b94e-125b-46fa-ac68-4c3c7b54f6e6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"97cf455e-c535-4150-bd71-17600daaa1f2","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"48a9c317-f79d-4e3d-a5b9-ffef444d5440","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e23f1d0-a331-45bc-a4dd-7d9bfe67069c","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15f5e9cc-3527-4d88-a022-6309400497b9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"54e6c28f-437e-4703-a403-18ac521b732b","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c672d436-07aa-46c2-8835-2ff6ed88e590","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfa6023b-0247-4a6f-8c89-bd04eecc031f","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"81d8575c-958a-468a-8d75-4326025485c2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72b201ea-3f14-4dfa-b59c-047d86cadfb6","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd9ad9df-9dcd-4fa2-8635-d057fb59ca05","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22be5222-6191-4d42-917d-3d11768353fa","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97d5005b-dc82-4234-a57e-83fcf89a8367","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01d90c30-8886-416a-ba21-919ecb4c6aca","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de31e3cd-7862-4bc7-a908-b61aa13ff288","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be26eb8f-03aa-4445-804d-252d0aa43715","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f353cd00-f561-4ef0-be2e-492afdb075c7","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c38f130f-b02b-4962-9d09-5aa09b23d15c","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"afbe37a3-9160-4c8d-b66d-1b8072efb354","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbcc8782-2c91-4f9b-abf9-9bb3f01af507","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c7c88e2a-d9af-48cc-b9b7-ebaeed3cc7e8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3302719a-4210-42be-8e5e-4c4c74dc2684","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a427b94e-125b-46fa-ac68-4c3c7b54f6e6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"97cf455e-c535-4150-bd71-17600daaa1f2","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"48a9c317-f79d-4e3d-a5b9-ffef444d5440","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e23f1d0-a331-45bc-a4dd-7d9bfe67069c","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15f5e9cc-3527-4d88-a022-6309400497b9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"54e6c28f-437e-4703-a403-18ac521b732b","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c672d436-07aa-46c2-8835-2ff6ed88e590","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfa6023b-0247-4a6f-8c89-bd04eecc031f","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"81d8575c-958a-468a-8d75-4326025485c2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72b201ea-3f14-4dfa-b59c-047d86cadfb6","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd9ad9df-9dcd-4fa2-8635-d057fb59ca05","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"22be5222-6191-4d42-917d-3d11768353fa","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97d5005b-dc82-4234-a57e-83fcf89a8367","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01d90c30-8886-416a-ba21-919ecb4c6aca","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de31e3cd-7862-4bc7-a908-b61aa13ff288","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be26eb8f-03aa-4445-804d-252d0aa43715","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f353cd00-f561-4ef0-be2e-492afdb075c7","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c38f130f-b02b-4962-9d09-5aa09b23d15c","path":"sprites/spr_bar/spr_bar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"afbe37a3-9160-4c8d-b66d-1b8072efb354","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bare_eyes/spr_bare_eyes.yy b/sprites/spr_bare_eyes/spr_bare_eyes.yy index de92df7564..3856f73830 100644 --- a/sprites/spr_bare_eyes/spr_bare_eyes.yy +++ b/sprites/spr_bare_eyes/spr_bare_eyes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_eyes", "bboxMode":0, "bbox_bottom":30, @@ -12,33 +12,33 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"03df2bbb-ad5c-4d77-a3d8-85bdbd716370","name":"03df2bbb-ad5c-4d77-a3d8-85bdbd716370","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b23399d2-885b-4e52-9425-1430efdac15c","name":"b23399d2-885b-4e52-9425-1430efdac15c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c52fea3f-9cca-453d-9dc7-4f3993d646ab","name":"c52fea3f-9cca-453d-9dc7-4f3993d646ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c15b49bc-cb52-4b19-a2b8-0d981c68f81e","name":"c15b49bc-cb52-4b19-a2b8-0d981c68f81e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c8b9800-aa82-4ef9-8378-7aae5b22d978","name":"3c8b9800-aa82-4ef9-8378-7aae5b22d978","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4641795-bc68-4aea-9bf8-1d787da51bfb","name":"d4641795-bc68-4aea-9bf8-1d787da51bfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7c5a85a-fcea-4d1d-875d-b46180e5d031","name":"a7c5a85a-fcea-4d1d-875d-b46180e5d031","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"141c28d7-61a8-472f-8c69-f9b3bbd5603f","name":"141c28d7-61a8-472f-8c69-f9b3bbd5603f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1ec9262d-499a-4e8e-8738-7c9af50a3456","name":"1ec9262d-499a-4e8e-8738-7c9af50a3456","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5984ae02-2aa0-4125-bbff-7087e26c4885","name":"5984ae02-2aa0-4125-bbff-7087e26c4885","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a0b0960d-8f13-4171-bde3-d5b23ed1d4d1","name":"a0b0960d-8f13-4171-bde3-d5b23ed1d4d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ef928e4-ca53-4022-8cd3-6632c830d299","name":"3ef928e4-ca53-4022-8cd3-6632c830d299","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"106250b4-2149-4340-a00c-40eaf198e58d","name":"106250b4-2149-4340-a00c-40eaf198e58d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"61b28c6f-47b5-4197-9cc1-fdc37c13847f","name":"61b28c6f-47b5-4197-9cc1-fdc37c13847f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87416d86-eb61-4546-b546-ecc00c22e2af","name":"87416d86-eb61-4546-b546-ecc00c22e2af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bf57ffb6-65c6-4867-8588-10a3fbd83874","name":"bf57ffb6-65c6-4867-8588-10a3fbd83874","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4a365f9-02c7-4529-ba9a-3f5ba26d5dd2","name":"f4a365f9-02c7-4529-ba9a-3f5ba26d5dd2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6874fc7-471a-40a2-8490-c42c5bc0b865","name":"a6874fc7-471a-40a2-8490-c42c5bc0b865","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d0deed7-1711-4cbc-b385-04f084f99ee5","name":"1d0deed7-1711-4cbc-b385-04f084f99ee5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c603b973-5145-4114-bbd7-9f6aa44a7894","name":"c603b973-5145-4114-bbd7-9f6aa44a7894","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"32010768-5b4e-46ed-b4fe-183911e34ccf","name":"32010768-5b4e-46ed-b4fe-183911e34ccf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40df5e82-3b35-4d36-821a-686df40a235b","name":"40df5e82-3b35-4d36-821a-686df40a235b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f2f0d39e-e4ac-41c5-8bf1-0e12224fa35b","name":"f2f0d39e-e4ac-41c5-8bf1-0e12224fa35b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9f3c5ed3-83e9-4c7d-b1b5-60443a0f27d0","name":"9f3c5ed3-83e9-4c7d-b1b5-60443a0f27d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76cf9b89-627b-40a0-aeb5-8008bcb552d1","name":"76cf9b89-627b-40a0-aeb5-8008bcb552d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0f93f46f-c41e-44c9-9919-dbe1e6340707","name":"0f93f46f-c41e-44c9-9919-dbe1e6340707","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e52b856-813d-428a-80fb-8910534444c6","name":"8e52b856-813d-428a-80fb-8910534444c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03df2bbb-ad5c-4d77-a3d8-85bdbd716370","name":"03df2bbb-ad5c-4d77-a3d8-85bdbd716370","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b23399d2-885b-4e52-9425-1430efdac15c","name":"b23399d2-885b-4e52-9425-1430efdac15c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c52fea3f-9cca-453d-9dc7-4f3993d646ab","name":"c52fea3f-9cca-453d-9dc7-4f3993d646ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c15b49bc-cb52-4b19-a2b8-0d981c68f81e","name":"c15b49bc-cb52-4b19-a2b8-0d981c68f81e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c8b9800-aa82-4ef9-8378-7aae5b22d978","name":"3c8b9800-aa82-4ef9-8378-7aae5b22d978","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4641795-bc68-4aea-9bf8-1d787da51bfb","name":"d4641795-bc68-4aea-9bf8-1d787da51bfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7c5a85a-fcea-4d1d-875d-b46180e5d031","name":"a7c5a85a-fcea-4d1d-875d-b46180e5d031","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"141c28d7-61a8-472f-8c69-f9b3bbd5603f","name":"141c28d7-61a8-472f-8c69-f9b3bbd5603f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ec9262d-499a-4e8e-8738-7c9af50a3456","name":"1ec9262d-499a-4e8e-8738-7c9af50a3456","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5984ae02-2aa0-4125-bbff-7087e26c4885","name":"5984ae02-2aa0-4125-bbff-7087e26c4885","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a0b0960d-8f13-4171-bde3-d5b23ed1d4d1","name":"a0b0960d-8f13-4171-bde3-d5b23ed1d4d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ef928e4-ca53-4022-8cd3-6632c830d299","name":"3ef928e4-ca53-4022-8cd3-6632c830d299","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"106250b4-2149-4340-a00c-40eaf198e58d","name":"106250b4-2149-4340-a00c-40eaf198e58d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61b28c6f-47b5-4197-9cc1-fdc37c13847f","name":"61b28c6f-47b5-4197-9cc1-fdc37c13847f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87416d86-eb61-4546-b546-ecc00c22e2af","name":"87416d86-eb61-4546-b546-ecc00c22e2af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bf57ffb6-65c6-4867-8588-10a3fbd83874","name":"bf57ffb6-65c6-4867-8588-10a3fbd83874","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4a365f9-02c7-4529-ba9a-3f5ba26d5dd2","name":"f4a365f9-02c7-4529-ba9a-3f5ba26d5dd2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6874fc7-471a-40a2-8490-c42c5bc0b865","name":"a6874fc7-471a-40a2-8490-c42c5bc0b865","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d0deed7-1711-4cbc-b385-04f084f99ee5","name":"1d0deed7-1711-4cbc-b385-04f084f99ee5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c603b973-5145-4114-bbd7-9f6aa44a7894","name":"c603b973-5145-4114-bbd7-9f6aa44a7894","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"32010768-5b4e-46ed-b4fe-183911e34ccf","name":"32010768-5b4e-46ed-b4fe-183911e34ccf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40df5e82-3b35-4d36-821a-686df40a235b","name":"40df5e82-3b35-4d36-821a-686df40a235b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2f0d39e-e4ac-41c5-8bf1-0e12224fa35b","name":"f2f0d39e-e4ac-41c5-8bf1-0e12224fa35b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f3c5ed3-83e9-4c7d-b1b5-60443a0f27d0","name":"9f3c5ed3-83e9-4c7d-b1b5-60443a0f27d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76cf9b89-627b-40a0-aeb5-8008bcb552d1","name":"76cf9b89-627b-40a0-aeb5-8008bcb552d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0f93f46f-c41e-44c9-9919-dbe1e6340707","name":"0f93f46f-c41e-44c9-9919-dbe1e6340707","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e52b856-813d-428a-80fb-8910534444c6","name":"8e52b856-813d-428a-80fb-8910534444c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -96,87 +96,33 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03df2bbb-ad5c-4d77-a3d8-85bdbd716370","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c81bcea-d38b-442d-a69f-be896cbb50b2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b23399d2-885b-4e52-9425-1430efdac15c","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd06f395-6ed4-4701-8544-4f74f92c6f19","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c52fea3f-9cca-453d-9dc7-4f3993d646ab","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"765c16b2-97cd-4595-bd87-26f7048c4b2f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c15b49bc-cb52-4b19-a2b8-0d981c68f81e","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f4ae759-db5b-467c-9269-cb8e01585675","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c8b9800-aa82-4ef9-8378-7aae5b22d978","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed01b266-bc05-43af-98da-1959625f8a9f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4641795-bc68-4aea-9bf8-1d787da51bfb","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f03545df-39ea-4c2b-abc7-b4df402f493e","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7c5a85a-fcea-4d1d-875d-b46180e5d031","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9971f75-eca3-4942-9521-4c3e86f95439","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"141c28d7-61a8-472f-8c69-f9b3bbd5603f","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"65966837-8206-40a6-9c84-64b7940b744b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ec9262d-499a-4e8e-8738-7c9af50a3456","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b95c184e-c58c-4348-966d-1ddad172e997","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5984ae02-2aa0-4125-bbff-7087e26c4885","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c190832-c4c3-4fc8-9750-3016efb90aa8","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a0b0960d-8f13-4171-bde3-d5b23ed1d4d1","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf8ba618-66cf-4127-b25f-455c2366907c","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ef928e4-ca53-4022-8cd3-6632c830d299","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"12c14c85-7c7d-413e-93d8-80f14d25fd62","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"106250b4-2149-4340-a00c-40eaf198e58d","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5dc898a8-aa4f-461e-8d45-843dcace698a","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61b28c6f-47b5-4197-9cc1-fdc37c13847f","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24c05389-c167-4188-b220-45c8a2d20891","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87416d86-eb61-4546-b546-ecc00c22e2af","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11cc4c2d-a5d1-41d2-8c9c-3ba048bce167","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf57ffb6-65c6-4867-8588-10a3fbd83874","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2e7ea3e-8cb8-4025-b70b-14fbc68045f4","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4a365f9-02c7-4529-ba9a-3f5ba26d5dd2","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e21b2e24-e072-4f5c-901c-a76303bde380","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6874fc7-471a-40a2-8490-c42c5bc0b865","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6db00525-6cce-4697-a8c2-975f3072022f","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d0deed7-1711-4cbc-b385-04f084f99ee5","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d398ad08-143f-433b-8ed0-41f5bc74fdfe","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c603b973-5145-4114-bbd7-9f6aa44a7894","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b9f16053-1ed5-45af-963f-6d1cbcb6e9ef","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"32010768-5b4e-46ed-b4fe-183911e34ccf","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7f36fbf-2d00-4e38-8b01-02e8e0015f09","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40df5e82-3b35-4d36-821a-686df40a235b","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9ff424d5-8526-4f58-9b4e-362fb6efd862","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f0d39e-e4ac-41c5-8bf1-0e12224fa35b","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fa22bee3-2d88-43e8-a1b9-eb43d51d2eff","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f3c5ed3-83e9-4c7d-b1b5-60443a0f27d0","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0abdb200-5367-42cc-b7b7-371e9a129713","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76cf9b89-627b-40a0-aeb5-8008bcb552d1","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3cee5a3c-5451-4f63-8b98-47284939f629","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f93f46f-c41e-44c9-9919-dbe1e6340707","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7d535f0-de41-4255-bb5c-e04616064be7","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e52b856-813d-428a-80fb-8910534444c6","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8158fd96-ddc4-41bb-845b-34f6b6d3e30d","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03df2bbb-ad5c-4d77-a3d8-85bdbd716370","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c81bcea-d38b-442d-a69f-be896cbb50b2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b23399d2-885b-4e52-9425-1430efdac15c","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd06f395-6ed4-4701-8544-4f74f92c6f19","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c52fea3f-9cca-453d-9dc7-4f3993d646ab","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"765c16b2-97cd-4595-bd87-26f7048c4b2f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c15b49bc-cb52-4b19-a2b8-0d981c68f81e","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f4ae759-db5b-467c-9269-cb8e01585675","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c8b9800-aa82-4ef9-8378-7aae5b22d978","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed01b266-bc05-43af-98da-1959625f8a9f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4641795-bc68-4aea-9bf8-1d787da51bfb","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f03545df-39ea-4c2b-abc7-b4df402f493e","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7c5a85a-fcea-4d1d-875d-b46180e5d031","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9971f75-eca3-4942-9521-4c3e86f95439","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"141c28d7-61a8-472f-8c69-f9b3bbd5603f","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"65966837-8206-40a6-9c84-64b7940b744b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ec9262d-499a-4e8e-8738-7c9af50a3456","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b95c184e-c58c-4348-966d-1ddad172e997","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5984ae02-2aa0-4125-bbff-7087e26c4885","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c190832-c4c3-4fc8-9750-3016efb90aa8","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a0b0960d-8f13-4171-bde3-d5b23ed1d4d1","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf8ba618-66cf-4127-b25f-455c2366907c","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ef928e4-ca53-4022-8cd3-6632c830d299","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"12c14c85-7c7d-413e-93d8-80f14d25fd62","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"106250b4-2149-4340-a00c-40eaf198e58d","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5dc898a8-aa4f-461e-8d45-843dcace698a","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61b28c6f-47b5-4197-9cc1-fdc37c13847f","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24c05389-c167-4188-b220-45c8a2d20891","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87416d86-eb61-4546-b546-ecc00c22e2af","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11cc4c2d-a5d1-41d2-8c9c-3ba048bce167","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf57ffb6-65c6-4867-8588-10a3fbd83874","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2e7ea3e-8cb8-4025-b70b-14fbc68045f4","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4a365f9-02c7-4529-ba9a-3f5ba26d5dd2","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e21b2e24-e072-4f5c-901c-a76303bde380","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6874fc7-471a-40a2-8490-c42c5bc0b865","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6db00525-6cce-4697-a8c2-975f3072022f","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d0deed7-1711-4cbc-b385-04f084f99ee5","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d398ad08-143f-433b-8ed0-41f5bc74fdfe","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c603b973-5145-4114-bbd7-9f6aa44a7894","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b9f16053-1ed5-45af-963f-6d1cbcb6e9ef","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"32010768-5b4e-46ed-b4fe-183911e34ccf","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7f36fbf-2d00-4e38-8b01-02e8e0015f09","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40df5e82-3b35-4d36-821a-686df40a235b","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9ff424d5-8526-4f58-9b4e-362fb6efd862","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f0d39e-e4ac-41c5-8bf1-0e12224fa35b","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fa22bee3-2d88-43e8-a1b9-eb43d51d2eff","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f3c5ed3-83e9-4c7d-b1b5-60443a0f27d0","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0abdb200-5367-42cc-b7b7-371e9a129713","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76cf9b89-627b-40a0-aeb5-8008bcb552d1","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3cee5a3c-5451-4f63-8b98-47284939f629","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f93f46f-c41e-44c9-9919-dbe1e6340707","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7d535f0-de41-4255-bb5c-e04616064be7","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e52b856-813d-428a-80fb-8910534444c6","path":"sprites/spr_bare_eyes/spr_bare_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8158fd96-ddc4-41bb-845b-34f6b6d3e30d","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy b/sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy index c75d5a5864..f141f72808 100644 --- a/sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy +++ b/sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_head_facial_hair", "bboxMode":0, "bbox_bottom":105, @@ -12,59 +12,59 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e6edda0a-94ef-4ab5-bf36-de28c022edd0","name":"e6edda0a-94ef-4ab5-bf36-de28c022edd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59c1ef31-735a-41e9-8751-c0917393ceba","name":"59c1ef31-735a-41e9-8751-c0917393ceba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fe47c7c6-f0cc-4337-b749-5641c896e825","name":"fe47c7c6-f0cc-4337-b749-5641c896e825","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4265cc35-d65c-4c91-b427-d0267766b28b","name":"4265cc35-d65c-4c91-b427-d0267766b28b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f22d5e6e-e8d6-4e57-9e3c-7dbafa638897","name":"f22d5e6e-e8d6-4e57-9e3c-7dbafa638897","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d631d5c-7e26-4075-bec1-bf519e78533f","name":"1d631d5c-7e26-4075-bec1-bf519e78533f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d2f5106-91f4-4236-af24-be2d545ec8ad","name":"7d2f5106-91f4-4236-af24-be2d545ec8ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fd34e62d-4a19-4366-ab5c-063069352d39","name":"fd34e62d-4a19-4366-ab5c-063069352d39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ce920b9b-4f0b-49a8-b51c-b07365ab1a3d","name":"ce920b9b-4f0b-49a8-b51c-b07365ab1a3d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84be56f9-976e-4bdf-b684-160b72c63473","name":"84be56f9-976e-4bdf-b684-160b72c63473","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca62d7ba-307a-453f-9ddd-b572a27c67c5","name":"ca62d7ba-307a-453f-9ddd-b572a27c67c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"50efae71-3499-4dc0-b4aa-37dec1af841b","name":"50efae71-3499-4dc0-b4aa-37dec1af841b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a680f49-2f17-40e6-b24c-9cefb1016f0f","name":"3a680f49-2f17-40e6-b24c-9cefb1016f0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f9808fc2-29dc-4df5-bed5-51e20d21261e","name":"f9808fc2-29dc-4df5-bed5-51e20d21261e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"119401c9-2466-48e8-b092-e7bec7b54345","name":"119401c9-2466-48e8-b092-e7bec7b54345","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5f2896fb-a65c-47fb-ada7-4aebbf35fa60","name":"5f2896fb-a65c-47fb-ada7-4aebbf35fa60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"edf5d09d-e228-4916-9506-2b42e7c87c1d","name":"edf5d09d-e228-4916-9506-2b42e7c87c1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"07a12172-16e3-47ec-8381-bcb4e17a5fea","name":"07a12172-16e3-47ec-8381-bcb4e17a5fea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"adc2ed6b-5442-4475-99f4-190d7eb468e9","name":"adc2ed6b-5442-4475-99f4-190d7eb468e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a26d347c-d4ce-40b0-be4f-fbcfbb8b0aa0","name":"a26d347c-d4ce-40b0-be4f-fbcfbb8b0aa0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fe1b4884-bbcb-472e-9a22-cb2b147cb41d","name":"fe1b4884-bbcb-472e-9a22-cb2b147cb41d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"453ab56d-103e-412a-9a04-455992c9348b","name":"453ab56d-103e-412a-9a04-455992c9348b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"60da470d-ee25-4544-8db1-3ae06a6aca3e","name":"60da470d-ee25-4544-8db1-3ae06a6aca3e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"52d6be61-5261-4311-a0c1-07e935c25df6","name":"52d6be61-5261-4311-a0c1-07e935c25df6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"19d5b278-59bb-4d28-8e5b-ff9fb08320d9","name":"19d5b278-59bb-4d28-8e5b-ff9fb08320d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"33f45c33-d49f-42e5-bc56-232649f96c22","name":"33f45c33-d49f-42e5-bc56-232649f96c22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b95d2cc2-0851-4928-9313-3f253a76a4bc","name":"b95d2cc2-0851-4928-9313-3f253a76a4bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f9592d5-b51d-41c8-94be-37e388fe4b9a","name":"1f9592d5-b51d-41c8-94be-37e388fe4b9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9a229b65-bd47-405a-ae89-b0782bc61f79","name":"9a229b65-bd47-405a-ae89-b0782bc61f79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca70a07a-98c3-4408-a54c-2ba37e348e45","name":"ca70a07a-98c3-4408-a54c-2ba37e348e45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59c10dbe-11d0-4440-89bd-b39c2bae2164","name":"59c10dbe-11d0-4440-89bd-b39c2bae2164","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f5b93dc-9e53-44d1-b999-74cd6aa4f829","name":"1f5b93dc-9e53-44d1-b999-74cd6aa4f829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87cd986b-a055-4223-9044-fcf525bb0602","name":"87cd986b-a055-4223-9044-fcf525bb0602","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"37f5b913-0b99-4f38-9252-88800edb3655","name":"37f5b913-0b99-4f38-9252-88800edb3655","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"064b9d94-d8c7-40c4-83a4-66abb9d81082","name":"064b9d94-d8c7-40c4-83a4-66abb9d81082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73d9098d-abca-4da7-b713-85f9fdde4c08","name":"73d9098d-abca-4da7-b713-85f9fdde4c08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"026245f0-7593-46b8-a3c4-eece1626f779","name":"026245f0-7593-46b8-a3c4-eece1626f779","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2afb7a0e-f9ca-4f5e-aa3d-4b651bbbab12","name":"2afb7a0e-f9ca-4f5e-aa3d-4b651bbbab12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7c5a60e2-d9e8-4785-b99f-e3f21993069e","name":"7c5a60e2-d9e8-4785-b99f-e3f21993069e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"171a2df4-0da9-4780-92c6-e774fa7d5fbb","name":"171a2df4-0da9-4780-92c6-e774fa7d5fbb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c5005de7-88f9-4690-b2d0-75a4a3bbcf71","name":"c5005de7-88f9-4690-b2d0-75a4a3bbcf71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ca665ee-1c72-40a2-a808-42fcca32e642","name":"6ca665ee-1c72-40a2-a808-42fcca32e642","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9707ff5c-3e17-4c3a-a8af-b30c40afda13","name":"9707ff5c-3e17-4c3a-a8af-b30c40afda13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e73a1e60-7dda-4a3d-9536-b173e171a3f8","name":"e73a1e60-7dda-4a3d-9536-b173e171a3f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6a161d00-5bea-4f52-86ee-a91a16e20bf2","name":"6a161d00-5bea-4f52-86ee-a91a16e20bf2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dbb51051-fd69-48a0-bdb9-1edb54a517d9","name":"dbb51051-fd69-48a0-bdb9-1edb54a517d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"de7d6148-126b-4524-8b72-bfe5da178758","name":"de7d6148-126b-4524-8b72-bfe5da178758","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cb94ed63-672f-4c13-adfc-827c1574c939","name":"cb94ed63-672f-4c13-adfc-827c1574c939","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c99613e9-341f-4d82-a5e7-8d7f91be79ce","name":"c99613e9-341f-4d82-a5e7-8d7f91be79ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"82379a9d-a84d-4519-a7f8-d41902a4cde0","name":"82379a9d-a84d-4519-a7f8-d41902a4cde0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2e5d8e1a-0e6d-4a62-ba7e-81120ab8becf","name":"2e5d8e1a-0e6d-4a62-ba7e-81120ab8becf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d214730-8933-4eba-a5ad-da582ae142f9","name":"7d214730-8933-4eba-a5ad-da582ae142f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9a0d46f0-3f7c-4d1f-851e-7f8585cc3f4b","name":"9a0d46f0-3f7c-4d1f-851e-7f8585cc3f4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e6edda0a-94ef-4ab5-bf36-de28c022edd0","name":"e6edda0a-94ef-4ab5-bf36-de28c022edd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59c1ef31-735a-41e9-8751-c0917393ceba","name":"59c1ef31-735a-41e9-8751-c0917393ceba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fe47c7c6-f0cc-4337-b749-5641c896e825","name":"fe47c7c6-f0cc-4337-b749-5641c896e825","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4265cc35-d65c-4c91-b427-d0267766b28b","name":"4265cc35-d65c-4c91-b427-d0267766b28b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f22d5e6e-e8d6-4e57-9e3c-7dbafa638897","name":"f22d5e6e-e8d6-4e57-9e3c-7dbafa638897","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d631d5c-7e26-4075-bec1-bf519e78533f","name":"1d631d5c-7e26-4075-bec1-bf519e78533f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d2f5106-91f4-4236-af24-be2d545ec8ad","name":"7d2f5106-91f4-4236-af24-be2d545ec8ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd34e62d-4a19-4366-ab5c-063069352d39","name":"fd34e62d-4a19-4366-ab5c-063069352d39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce920b9b-4f0b-49a8-b51c-b07365ab1a3d","name":"ce920b9b-4f0b-49a8-b51c-b07365ab1a3d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84be56f9-976e-4bdf-b684-160b72c63473","name":"84be56f9-976e-4bdf-b684-160b72c63473","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca62d7ba-307a-453f-9ddd-b572a27c67c5","name":"ca62d7ba-307a-453f-9ddd-b572a27c67c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"50efae71-3499-4dc0-b4aa-37dec1af841b","name":"50efae71-3499-4dc0-b4aa-37dec1af841b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a680f49-2f17-40e6-b24c-9cefb1016f0f","name":"3a680f49-2f17-40e6-b24c-9cefb1016f0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9808fc2-29dc-4df5-bed5-51e20d21261e","name":"f9808fc2-29dc-4df5-bed5-51e20d21261e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"119401c9-2466-48e8-b092-e7bec7b54345","name":"119401c9-2466-48e8-b092-e7bec7b54345","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5f2896fb-a65c-47fb-ada7-4aebbf35fa60","name":"5f2896fb-a65c-47fb-ada7-4aebbf35fa60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"edf5d09d-e228-4916-9506-2b42e7c87c1d","name":"edf5d09d-e228-4916-9506-2b42e7c87c1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07a12172-16e3-47ec-8381-bcb4e17a5fea","name":"07a12172-16e3-47ec-8381-bcb4e17a5fea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"adc2ed6b-5442-4475-99f4-190d7eb468e9","name":"adc2ed6b-5442-4475-99f4-190d7eb468e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a26d347c-d4ce-40b0-be4f-fbcfbb8b0aa0","name":"a26d347c-d4ce-40b0-be4f-fbcfbb8b0aa0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fe1b4884-bbcb-472e-9a22-cb2b147cb41d","name":"fe1b4884-bbcb-472e-9a22-cb2b147cb41d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"453ab56d-103e-412a-9a04-455992c9348b","name":"453ab56d-103e-412a-9a04-455992c9348b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"60da470d-ee25-4544-8db1-3ae06a6aca3e","name":"60da470d-ee25-4544-8db1-3ae06a6aca3e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52d6be61-5261-4311-a0c1-07e935c25df6","name":"52d6be61-5261-4311-a0c1-07e935c25df6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"19d5b278-59bb-4d28-8e5b-ff9fb08320d9","name":"19d5b278-59bb-4d28-8e5b-ff9fb08320d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"33f45c33-d49f-42e5-bc56-232649f96c22","name":"33f45c33-d49f-42e5-bc56-232649f96c22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b95d2cc2-0851-4928-9313-3f253a76a4bc","name":"b95d2cc2-0851-4928-9313-3f253a76a4bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f9592d5-b51d-41c8-94be-37e388fe4b9a","name":"1f9592d5-b51d-41c8-94be-37e388fe4b9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9a229b65-bd47-405a-ae89-b0782bc61f79","name":"9a229b65-bd47-405a-ae89-b0782bc61f79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca70a07a-98c3-4408-a54c-2ba37e348e45","name":"ca70a07a-98c3-4408-a54c-2ba37e348e45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59c10dbe-11d0-4440-89bd-b39c2bae2164","name":"59c10dbe-11d0-4440-89bd-b39c2bae2164","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f5b93dc-9e53-44d1-b999-74cd6aa4f829","name":"1f5b93dc-9e53-44d1-b999-74cd6aa4f829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87cd986b-a055-4223-9044-fcf525bb0602","name":"87cd986b-a055-4223-9044-fcf525bb0602","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"37f5b913-0b99-4f38-9252-88800edb3655","name":"37f5b913-0b99-4f38-9252-88800edb3655","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"064b9d94-d8c7-40c4-83a4-66abb9d81082","name":"064b9d94-d8c7-40c4-83a4-66abb9d81082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73d9098d-abca-4da7-b713-85f9fdde4c08","name":"73d9098d-abca-4da7-b713-85f9fdde4c08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"026245f0-7593-46b8-a3c4-eece1626f779","name":"026245f0-7593-46b8-a3c4-eece1626f779","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2afb7a0e-f9ca-4f5e-aa3d-4b651bbbab12","name":"2afb7a0e-f9ca-4f5e-aa3d-4b651bbbab12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7c5a60e2-d9e8-4785-b99f-e3f21993069e","name":"7c5a60e2-d9e8-4785-b99f-e3f21993069e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"171a2df4-0da9-4780-92c6-e774fa7d5fbb","name":"171a2df4-0da9-4780-92c6-e774fa7d5fbb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5005de7-88f9-4690-b2d0-75a4a3bbcf71","name":"c5005de7-88f9-4690-b2d0-75a4a3bbcf71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ca665ee-1c72-40a2-a808-42fcca32e642","name":"6ca665ee-1c72-40a2-a808-42fcca32e642","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9707ff5c-3e17-4c3a-a8af-b30c40afda13","name":"9707ff5c-3e17-4c3a-a8af-b30c40afda13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e73a1e60-7dda-4a3d-9536-b173e171a3f8","name":"e73a1e60-7dda-4a3d-9536-b173e171a3f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6a161d00-5bea-4f52-86ee-a91a16e20bf2","name":"6a161d00-5bea-4f52-86ee-a91a16e20bf2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbb51051-fd69-48a0-bdb9-1edb54a517d9","name":"dbb51051-fd69-48a0-bdb9-1edb54a517d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de7d6148-126b-4524-8b72-bfe5da178758","name":"de7d6148-126b-4524-8b72-bfe5da178758","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cb94ed63-672f-4c13-adfc-827c1574c939","name":"cb94ed63-672f-4c13-adfc-827c1574c939","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c99613e9-341f-4d82-a5e7-8d7f91be79ce","name":"c99613e9-341f-4d82-a5e7-8d7f91be79ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82379a9d-a84d-4519-a7f8-d41902a4cde0","name":"82379a9d-a84d-4519-a7f8-d41902a4cde0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2e5d8e1a-0e6d-4a62-ba7e-81120ab8becf","name":"2e5d8e1a-0e6d-4a62-ba7e-81120ab8becf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d214730-8933-4eba-a5ad-da582ae142f9","name":"7d214730-8933-4eba-a5ad-da582ae142f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9a0d46f0-3f7c-4d1f-851e-7f8585cc3f4b","name":"9a0d46f0-3f7c-4d1f-851e-7f8585cc3f4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -122,165 +122,59 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6edda0a-94ef-4ab5-bf36-de28c022edd0","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9e51da4-06de-4b0f-92d4-077865cabe5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59c1ef31-735a-41e9-8751-c0917393ceba","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf388989-1ec2-4a21-830d-07b0905766be","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe47c7c6-f0cc-4337-b749-5641c896e825","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"641d15bb-071d-4744-b25e-d1f56af61040","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4265cc35-d65c-4c91-b427-d0267766b28b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"700ade0a-a863-403d-afe5-c9eef47e66ea","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f22d5e6e-e8d6-4e57-9e3c-7dbafa638897","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05fca8e1-2c17-4b6f-922a-2c36b32b228e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d631d5c-7e26-4075-bec1-bf519e78533f","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d143f15a-7aaa-4a24-903f-cceda28a0e85","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d2f5106-91f4-4236-af24-be2d545ec8ad","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"08e5c378-5300-49db-a001-3b0cef540331","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd34e62d-4a19-4366-ab5c-063069352d39","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe404bdd-7af8-48a5-989e-e8d59bb707d6","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce920b9b-4f0b-49a8-b51c-b07365ab1a3d","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9ccf2321-f229-4fea-99d8-6ade77f9c840","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84be56f9-976e-4bdf-b684-160b72c63473","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"92265152-e73f-44cc-8d31-a4fbe12c16e4","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca62d7ba-307a-453f-9ddd-b572a27c67c5","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b4cec6f-f300-4c95-9fac-ba0fab36e37e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"50efae71-3499-4dc0-b4aa-37dec1af841b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ed3b162-394c-441e-8bbd-2700ad92168a","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a680f49-2f17-40e6-b24c-9cefb1016f0f","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02668362-7c95-400e-b1ec-dfec011a3fd0","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9808fc2-29dc-4df5-bed5-51e20d21261e","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"285f3c33-4fc3-4afb-ba39-cf685a883954","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"119401c9-2466-48e8-b092-e7bec7b54345","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad987105-bdde-4846-ae7e-6f0aa2e3cd4b","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f2896fb-a65c-47fb-ada7-4aebbf35fa60","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7acca3ce-8a1e-45a4-993d-bd2972a5677b","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"edf5d09d-e228-4916-9506-2b42e7c87c1d","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5763102d-e9f8-4746-8d16-e8dd6e4459d7","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07a12172-16e3-47ec-8381-bcb4e17a5fea","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40547070-6c65-41d9-be86-8f60b05389f7","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"adc2ed6b-5442-4475-99f4-190d7eb468e9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d78d2e7f-cd05-452c-a017-9df68175bf2f","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a26d347c-d4ce-40b0-be4f-fbcfbb8b0aa0","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d6f7e9b-92fd-47be-bb05-5744f87afdc7","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe1b4884-bbcb-472e-9a22-cb2b147cb41d","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f152782c-8280-4280-8bbe-9dc1ec5b501f","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"453ab56d-103e-412a-9a04-455992c9348b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9f83625d-4429-4933-b1c7-b645ff2f0935","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"60da470d-ee25-4544-8db1-3ae06a6aca3e","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8a2ac66c-c54b-431e-8bf8-0e9e9e57d113","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d6be61-5261-4311-a0c1-07e935c25df6","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b5d3e828-d5c1-4b40-b8c4-01dea53cdbdd","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"19d5b278-59bb-4d28-8e5b-ff9fb08320d9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b42a971c-8eb3-465d-9554-77d966f8883e","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"33f45c33-d49f-42e5-bc56-232649f96c22","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1c1ab60b-7140-47a9-b9f3-489e03bd587f","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b95d2cc2-0851-4928-9313-3f253a76a4bc","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"279c4898-51eb-4445-8427-f3fd36c0d771","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f9592d5-b51d-41c8-94be-37e388fe4b9a","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34843b68-25e9-4618-87fb-27befa7d8950","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a229b65-bd47-405a-ae89-b0782bc61f79","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4cdefec0-28e0-4132-aa41-dbf875fd0ee3","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca70a07a-98c3-4408-a54c-2ba37e348e45","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"03dc0c18-282e-4127-9776-a50b0b9d63b7","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59c10dbe-11d0-4440-89bd-b39c2bae2164","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7cf473b-0620-4a60-a611-97c142cc3921","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f5b93dc-9e53-44d1-b999-74cd6aa4f829","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c862511f-777e-4228-b5d9-ad63167f469d","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87cd986b-a055-4223-9044-fcf525bb0602","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c30dee50-e036-4082-bf98-678411575281","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"37f5b913-0b99-4f38-9252-88800edb3655","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5248466-f8de-4b09-b63f-c54e557a0bf6","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"064b9d94-d8c7-40c4-83a4-66abb9d81082","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1322a47f-b05f-484b-903f-6f53fa5df61e","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73d9098d-abca-4da7-b713-85f9fdde4c08","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a23f7d20-edad-4aaf-8284-aa2179360d89","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"026245f0-7593-46b8-a3c4-eece1626f779","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"568d7249-b9e4-4592-b88c-d64728c0fdf3","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2afb7a0e-f9ca-4f5e-aa3d-4b651bbbab12","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd40d942-2f16-4672-98e1-4333d460eae1","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c5a60e2-d9e8-4785-b99f-e3f21993069e","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"064dc774-30b8-4ae4-927b-64a7cd392163","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"171a2df4-0da9-4780-92c6-e774fa7d5fbb","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"43374b2a-1d56-40b8-88f6-0d2337a7e332","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5005de7-88f9-4690-b2d0-75a4a3bbcf71","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dbe8a5cd-9a8e-4dbc-8849-aca2be9b6d6f","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ca665ee-1c72-40a2-a808-42fcca32e642","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"736fb870-e235-4855-ba59-bdef16c1c6c6","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9707ff5c-3e17-4c3a-a8af-b30c40afda13","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d86f54fc-a41e-4c60-abaa-8f374bdade4d","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e73a1e60-7dda-4a3d-9536-b173e171a3f8","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"87060c2c-392d-4ae5-bbf0-f76c9f362ff5","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a161d00-5bea-4f52-86ee-a91a16e20bf2","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"504ef4f9-372d-4b40-bd45-8cc00259adfd","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb51051-fd69-48a0-bdb9-1edb54a517d9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af335c6d-90cb-41d4-84a1-a5e6b1434eb4","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de7d6148-126b-4524-8b72-bfe5da178758","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d20052d-7d8d-41d1-9caa-06505d709cf0","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cb94ed63-672f-4c13-adfc-827c1574c939","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aadd3b16-c7fc-4fe8-a4d0-13d4d5797092","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c99613e9-341f-4d82-a5e7-8d7f91be79ce","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"461ee071-0dbe-44e4-a384-0554a46f3d37","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82379a9d-a84d-4519-a7f8-d41902a4cde0","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cde633d7-5cdb-49de-87e1-827180deaf68","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e5d8e1a-0e6d-4a62-ba7e-81120ab8becf","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d92e8f53-7441-405b-a5cb-9f11f7b42020","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d214730-8933-4eba-a5ad-da582ae142f9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe38f50e-9a9c-415b-8de8-9607847a49e5","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a0d46f0-3f7c-4d1f-851e-7f8585cc3f4b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe39eedd-8bec-44b3-9a4d-3349c0c598d8","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6edda0a-94ef-4ab5-bf36-de28c022edd0","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9e51da4-06de-4b0f-92d4-077865cabe5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59c1ef31-735a-41e9-8751-c0917393ceba","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf388989-1ec2-4a21-830d-07b0905766be","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe47c7c6-f0cc-4337-b749-5641c896e825","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"641d15bb-071d-4744-b25e-d1f56af61040","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4265cc35-d65c-4c91-b427-d0267766b28b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"700ade0a-a863-403d-afe5-c9eef47e66ea","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f22d5e6e-e8d6-4e57-9e3c-7dbafa638897","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05fca8e1-2c17-4b6f-922a-2c36b32b228e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d631d5c-7e26-4075-bec1-bf519e78533f","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d143f15a-7aaa-4a24-903f-cceda28a0e85","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d2f5106-91f4-4236-af24-be2d545ec8ad","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08e5c378-5300-49db-a001-3b0cef540331","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd34e62d-4a19-4366-ab5c-063069352d39","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe404bdd-7af8-48a5-989e-e8d59bb707d6","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce920b9b-4f0b-49a8-b51c-b07365ab1a3d","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9ccf2321-f229-4fea-99d8-6ade77f9c840","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84be56f9-976e-4bdf-b684-160b72c63473","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"92265152-e73f-44cc-8d31-a4fbe12c16e4","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca62d7ba-307a-453f-9ddd-b572a27c67c5","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b4cec6f-f300-4c95-9fac-ba0fab36e37e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"50efae71-3499-4dc0-b4aa-37dec1af841b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ed3b162-394c-441e-8bbd-2700ad92168a","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a680f49-2f17-40e6-b24c-9cefb1016f0f","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02668362-7c95-400e-b1ec-dfec011a3fd0","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9808fc2-29dc-4df5-bed5-51e20d21261e","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"285f3c33-4fc3-4afb-ba39-cf685a883954","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"119401c9-2466-48e8-b092-e7bec7b54345","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad987105-bdde-4846-ae7e-6f0aa2e3cd4b","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f2896fb-a65c-47fb-ada7-4aebbf35fa60","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7acca3ce-8a1e-45a4-993d-bd2972a5677b","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"edf5d09d-e228-4916-9506-2b42e7c87c1d","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5763102d-e9f8-4746-8d16-e8dd6e4459d7","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07a12172-16e3-47ec-8381-bcb4e17a5fea","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40547070-6c65-41d9-be86-8f60b05389f7","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"adc2ed6b-5442-4475-99f4-190d7eb468e9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d78d2e7f-cd05-452c-a017-9df68175bf2f","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a26d347c-d4ce-40b0-be4f-fbcfbb8b0aa0","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d6f7e9b-92fd-47be-bb05-5744f87afdc7","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe1b4884-bbcb-472e-9a22-cb2b147cb41d","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f152782c-8280-4280-8bbe-9dc1ec5b501f","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"453ab56d-103e-412a-9a04-455992c9348b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f83625d-4429-4933-b1c7-b645ff2f0935","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"60da470d-ee25-4544-8db1-3ae06a6aca3e","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8a2ac66c-c54b-431e-8bf8-0e9e9e57d113","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d6be61-5261-4311-a0c1-07e935c25df6","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b5d3e828-d5c1-4b40-b8c4-01dea53cdbdd","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"19d5b278-59bb-4d28-8e5b-ff9fb08320d9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b42a971c-8eb3-465d-9554-77d966f8883e","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"33f45c33-d49f-42e5-bc56-232649f96c22","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1c1ab60b-7140-47a9-b9f3-489e03bd587f","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b95d2cc2-0851-4928-9313-3f253a76a4bc","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"279c4898-51eb-4445-8427-f3fd36c0d771","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f9592d5-b51d-41c8-94be-37e388fe4b9a","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34843b68-25e9-4618-87fb-27befa7d8950","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a229b65-bd47-405a-ae89-b0782bc61f79","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4cdefec0-28e0-4132-aa41-dbf875fd0ee3","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca70a07a-98c3-4408-a54c-2ba37e348e45","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"03dc0c18-282e-4127-9776-a50b0b9d63b7","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59c10dbe-11d0-4440-89bd-b39c2bae2164","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7cf473b-0620-4a60-a611-97c142cc3921","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f5b93dc-9e53-44d1-b999-74cd6aa4f829","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c862511f-777e-4228-b5d9-ad63167f469d","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87cd986b-a055-4223-9044-fcf525bb0602","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c30dee50-e036-4082-bf98-678411575281","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"37f5b913-0b99-4f38-9252-88800edb3655","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5248466-f8de-4b09-b63f-c54e557a0bf6","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"064b9d94-d8c7-40c4-83a4-66abb9d81082","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1322a47f-b05f-484b-903f-6f53fa5df61e","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73d9098d-abca-4da7-b713-85f9fdde4c08","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a23f7d20-edad-4aaf-8284-aa2179360d89","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"026245f0-7593-46b8-a3c4-eece1626f779","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"568d7249-b9e4-4592-b88c-d64728c0fdf3","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2afb7a0e-f9ca-4f5e-aa3d-4b651bbbab12","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd40d942-2f16-4672-98e1-4333d460eae1","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c5a60e2-d9e8-4785-b99f-e3f21993069e","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"064dc774-30b8-4ae4-927b-64a7cd392163","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"171a2df4-0da9-4780-92c6-e774fa7d5fbb","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"43374b2a-1d56-40b8-88f6-0d2337a7e332","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5005de7-88f9-4690-b2d0-75a4a3bbcf71","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dbe8a5cd-9a8e-4dbc-8849-aca2be9b6d6f","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ca665ee-1c72-40a2-a808-42fcca32e642","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"736fb870-e235-4855-ba59-bdef16c1c6c6","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9707ff5c-3e17-4c3a-a8af-b30c40afda13","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d86f54fc-a41e-4c60-abaa-8f374bdade4d","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e73a1e60-7dda-4a3d-9536-b173e171a3f8","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87060c2c-392d-4ae5-bbf0-f76c9f362ff5","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a161d00-5bea-4f52-86ee-a91a16e20bf2","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"504ef4f9-372d-4b40-bd45-8cc00259adfd","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb51051-fd69-48a0-bdb9-1edb54a517d9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af335c6d-90cb-41d4-84a1-a5e6b1434eb4","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de7d6148-126b-4524-8b72-bfe5da178758","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d20052d-7d8d-41d1-9caa-06505d709cf0","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cb94ed63-672f-4c13-adfc-827c1574c939","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aadd3b16-c7fc-4fe8-a4d0-13d4d5797092","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c99613e9-341f-4d82-a5e7-8d7f91be79ce","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"461ee071-0dbe-44e4-a384-0554a46f3d37","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82379a9d-a84d-4519-a7f8-d41902a4cde0","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cde633d7-5cdb-49de-87e1-827180deaf68","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e5d8e1a-0e6d-4a62-ba7e-81120ab8becf","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d92e8f53-7441-405b-a5cb-9f11f7b42020","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d214730-8933-4eba-a5ad-da582ae142f9","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe38f50e-9a9c-415b-8de8-9607847a49e5","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a0d46f0-3f7c-4d1f-851e-7f8585cc3f4b","path":"sprites/spr_bare_head_facial_hair/spr_bare_head_facial_hair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe39eedd-8bec-44b3-9a4d-3349c0c598d8","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy b/sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy index e7e79610be..aa5ebfebc5 100644 --- a/sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy +++ b/sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_head_facial_hair_colourable", "bboxMode":0, "bbox_bottom":63, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7dcbfd8c-30e4-4244-9d8f-2da673c3c624","name":"7dcbfd8c-30e4-4244-9d8f-2da673c3c624","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"789a65e4-c488-4ee9-a598-5ead885fa298","name":"789a65e4-c488-4ee9-a598-5ead885fa298","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a22c72ec-3334-4ac3-9d76-cd6f78aa94ad","name":"a22c72ec-3334-4ac3-9d76-cd6f78aa94ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26323f47-b73b-4297-ba10-09aae76121a2","name":"26323f47-b73b-4297-ba10-09aae76121a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"25f3c04a-21a5-4eed-ae96-bac303387033","name":"25f3c04a-21a5-4eed-ae96-bac303387033","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a952d6ec-8732-4b76-aad5-568ff548a743","name":"a952d6ec-8732-4b76-aad5-568ff548a743","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7c16add8-7098-4881-88ed-ebb334520439","name":"7c16add8-7098-4881-88ed-ebb334520439","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73d446e5-adf7-4e92-9af5-33c5cbd38662","name":"73d446e5-adf7-4e92-9af5-33c5cbd38662","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72ddc6f3-ea56-494b-ab07-e01e5c6a49e5","name":"72ddc6f3-ea56-494b-ab07-e01e5c6a49e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9828331d-007f-4b69-ae4f-3eaf82a38cb8","name":"9828331d-007f-4b69-ae4f-3eaf82a38cb8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7dcbfd8c-30e4-4244-9d8f-2da673c3c624","name":"7dcbfd8c-30e4-4244-9d8f-2da673c3c624","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"789a65e4-c488-4ee9-a598-5ead885fa298","name":"789a65e4-c488-4ee9-a598-5ead885fa298","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a22c72ec-3334-4ac3-9d76-cd6f78aa94ad","name":"a22c72ec-3334-4ac3-9d76-cd6f78aa94ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26323f47-b73b-4297-ba10-09aae76121a2","name":"26323f47-b73b-4297-ba10-09aae76121a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25f3c04a-21a5-4eed-ae96-bac303387033","name":"25f3c04a-21a5-4eed-ae96-bac303387033","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a952d6ec-8732-4b76-aad5-568ff548a743","name":"a952d6ec-8732-4b76-aad5-568ff548a743","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7c16add8-7098-4881-88ed-ebb334520439","name":"7c16add8-7098-4881-88ed-ebb334520439","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73d446e5-adf7-4e92-9af5-33c5cbd38662","name":"73d446e5-adf7-4e92-9af5-33c5cbd38662","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72ddc6f3-ea56-494b-ab07-e01e5c6a49e5","name":"72ddc6f3-ea56-494b-ab07-e01e5c6a49e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9828331d-007f-4b69-ae4f-3eaf82a38cb8","name":"9828331d-007f-4b69-ae4f-3eaf82a38cb8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,36 +79,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dcbfd8c-30e4-4244-9d8f-2da673c3c624","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04123629-2eb4-4cd7-839e-f1c2322f04e7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"789a65e4-c488-4ee9-a598-5ead885fa298","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aa37aa36-f8ed-47fc-95c7-cf5d6633ad2c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a22c72ec-3334-4ac3-9d76-cd6f78aa94ad","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25893de7-0896-49a2-98eb-655453e3aa96","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26323f47-b73b-4297-ba10-09aae76121a2","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0de8cd1b-564a-4c59-9af5-431760147f8b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25f3c04a-21a5-4eed-ae96-bac303387033","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"322ea2fd-c6d4-4eaf-9844-0d68a14ea771","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a952d6ec-8732-4b76-aad5-568ff548a743","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0196999-ef32-46a6-9de5-97e517754e8f","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c16add8-7098-4881-88ed-ebb334520439","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f822b6ac-ef23-4c11-ab68-15caed055570","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73d446e5-adf7-4e92-9af5-33c5cbd38662","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9808dc33-8917-4ac1-b19b-2d671fd026ab","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72ddc6f3-ea56-494b-ab07-e01e5c6a49e5","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4bcadfc-516b-48e6-9b5f-ff5824903353","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9828331d-007f-4b69-ae4f-3eaf82a38cb8","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"32cfe44f-5526-44af-9e2e-5f7f9d73d419","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dcbfd8c-30e4-4244-9d8f-2da673c3c624","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04123629-2eb4-4cd7-839e-f1c2322f04e7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"789a65e4-c488-4ee9-a598-5ead885fa298","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aa37aa36-f8ed-47fc-95c7-cf5d6633ad2c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a22c72ec-3334-4ac3-9d76-cd6f78aa94ad","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25893de7-0896-49a2-98eb-655453e3aa96","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26323f47-b73b-4297-ba10-09aae76121a2","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0de8cd1b-564a-4c59-9af5-431760147f8b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25f3c04a-21a5-4eed-ae96-bac303387033","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"322ea2fd-c6d4-4eaf-9844-0d68a14ea771","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a952d6ec-8732-4b76-aad5-568ff548a743","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0196999-ef32-46a6-9de5-97e517754e8f","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c16add8-7098-4881-88ed-ebb334520439","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f822b6ac-ef23-4c11-ab68-15caed055570","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73d446e5-adf7-4e92-9af5-33c5cbd38662","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9808dc33-8917-4ac1-b19b-2d671fd026ab","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72ddc6f3-ea56-494b-ab07-e01e5c6a49e5","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4bcadfc-516b-48e6-9b5f-ff5824903353","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9828331d-007f-4b69-ae4f-3eaf82a38cb8","path":"sprites/spr_bare_head_facial_hair_colourable/spr_bare_head_facial_hair_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"32cfe44f-5526-44af-9e2e-5f7f9d73d419","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bare_heads/spr_bare_heads.yy b/sprites/spr_bare_heads/spr_bare_heads.yy index 92212b645c..db6fdf7e38 100644 --- a/sprites/spr_bare_heads/spr_bare_heads.yy +++ b/sprites/spr_bare_heads/spr_bare_heads.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_heads", "bboxMode":0, "bbox_bottom":44, @@ -12,51 +12,51 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"05289283-cf3c-49ba-978c-c5705e259221","name":"05289283-cf3c-49ba-978c-c5705e259221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"269de542-29d3-4e95-861d-ee5e4396f389","name":"269de542-29d3-4e95-861d-ee5e4396f389","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1413a945-9705-40c0-8532-72c7463a559a","name":"1413a945-9705-40c0-8532-72c7463a559a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2fc152dc-0248-4a49-86fa-8bf6e49def31","name":"2fc152dc-0248-4a49-86fa-8bf6e49def31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d204018f-27e8-4e54-b5e7-d50899ede96c","name":"d204018f-27e8-4e54-b5e7-d50899ede96c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d33ea45-2c2f-4276-adbe-04ebf5db4080","name":"7d33ea45-2c2f-4276-adbe-04ebf5db4080","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4c551fcd-30cd-4f8b-b420-ce1a36673dac","name":"4c551fcd-30cd-4f8b-b420-ce1a36673dac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"44032114-1f2f-47cd-a4a6-1421600214cd","name":"44032114-1f2f-47cd-a4a6-1421600214cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eeaf5887-2715-4e95-9063-c97aabdd28e1","name":"eeaf5887-2715-4e95-9063-c97aabdd28e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"caca9d43-9453-48f3-b26f-5e8be74ea6f8","name":"caca9d43-9453-48f3-b26f-5e8be74ea6f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da05b69a-1448-41be-90c3-5cfbba0a8721","name":"da05b69a-1448-41be-90c3-5cfbba0a8721","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0dd93d11-13c8-444c-8261-6b5733f8b58b","name":"0dd93d11-13c8-444c-8261-6b5733f8b58b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"66369c74-4a0c-4542-bc5d-554d6e83c25a","name":"66369c74-4a0c-4542-bc5d-554d6e83c25a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"85cdef35-b9f6-48e7-b907-843a160b1fc7","name":"85cdef35-b9f6-48e7-b907-843a160b1fc7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b6f81ed7-7136-4422-835e-a2c3546f1548","name":"b6f81ed7-7136-4422-835e-a2c3546f1548","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"842d94d2-94ff-4452-951a-eea2822aea1b","name":"842d94d2-94ff-4452-951a-eea2822aea1b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"136b448f-cab9-4502-ab49-211dae6baa0b","name":"136b448f-cab9-4502-ab49-211dae6baa0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"42f039f6-9ecd-4222-9b4c-17793d4d2f5d","name":"42f039f6-9ecd-4222-9b4c-17793d4d2f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"caf154c5-d8d8-498a-9695-3b4adc97fe74","name":"caf154c5-d8d8-498a-9695-3b4adc97fe74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6cacd7b9-2fb0-44d2-bb6a-c439104f2f54","name":"6cacd7b9-2fb0-44d2-bb6a-c439104f2f54","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2407b5d3-1513-4a94-9fa9-12f20669831f","name":"2407b5d3-1513-4a94-9fa9-12f20669831f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"743472f3-6863-4abe-bf55-bbeff76aaf00","name":"743472f3-6863-4abe-bf55-bbeff76aaf00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6f343e60-f82b-408e-a5e0-1b3078ccf0f2","name":"6f343e60-f82b-408e-a5e0-1b3078ccf0f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb678b5e-7fc5-4837-b753-9f3dbadc87a0","name":"fb678b5e-7fc5-4837-b753-9f3dbadc87a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e607018-2fee-4472-af53-adf27c701121","name":"8e607018-2fee-4472-af53-adf27c701121","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ffc63594-ebb2-47ba-8083-be578882d2b4","name":"ffc63594-ebb2-47ba-8083-be578882d2b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2f939735-055a-4eeb-a48a-ba21f7ecf19b","name":"2f939735-055a-4eeb-a48a-ba21f7ecf19b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d7bbf94c-6658-40a3-a353-9ae9f765ea80","name":"d7bbf94c-6658-40a3-a353-9ae9f765ea80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e4a4822c-f0ee-4a45-a579-46a46d4c4a3a","name":"e4a4822c-f0ee-4a45-a579-46a46d4c4a3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"004d1c23-13a6-463e-8b53-7a4ab648f6a3","name":"004d1c23-13a6-463e-8b53-7a4ab648f6a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e705a700-72b0-45e8-abc0-902b0b6b5480","name":"e705a700-72b0-45e8-abc0-902b0b6b5480","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"447ef73d-fd8d-4b8e-b9f8-f4f42d32fe9a","name":"447ef73d-fd8d-4b8e-b9f8-f4f42d32fe9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"05d7a269-8f5f-416d-a32e-01ecadc03df9","name":"05d7a269-8f5f-416d-a32e-01ecadc03df9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a19ab7b7-1525-4f22-b385-3c6a5556bebf","name":"a19ab7b7-1525-4f22-b385-3c6a5556bebf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb1a5dde-af7a-43f8-aac7-5657258cc742","name":"bb1a5dde-af7a-43f8-aac7-5657258cc742","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"412496f6-a833-4a5b-a839-cdf54c804bd9","name":"412496f6-a833-4a5b-a839-cdf54c804bd9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"34af844a-9bf2-4670-92b2-5b8742d19f45","name":"34af844a-9bf2-4670-92b2-5b8742d19f45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1456b2a-3264-4d4d-9613-e0e84a4b8d80","name":"e1456b2a-3264-4d4d-9613-e0e84a4b8d80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f250301d-3a8b-45be-a367-c659a8172e53","name":"f250301d-3a8b-45be-a367-c659a8172e53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cc3c809d-f17c-4b1d-813f-7fda90d89c1a","name":"cc3c809d-f17c-4b1d-813f-7fda90d89c1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7b7e265-024b-4a01-9527-6c6fb8015a37","name":"a7b7e265-024b-4a01-9527-6c6fb8015a37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"defe2a73-dc9a-4ac9-b679-75dd0fa37037","name":"defe2a73-dc9a-4ac9-b679-75dd0fa37037","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05289283-cf3c-49ba-978c-c5705e259221","name":"05289283-cf3c-49ba-978c-c5705e259221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"269de542-29d3-4e95-861d-ee5e4396f389","name":"269de542-29d3-4e95-861d-ee5e4396f389","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1413a945-9705-40c0-8532-72c7463a559a","name":"1413a945-9705-40c0-8532-72c7463a559a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2fc152dc-0248-4a49-86fa-8bf6e49def31","name":"2fc152dc-0248-4a49-86fa-8bf6e49def31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d204018f-27e8-4e54-b5e7-d50899ede96c","name":"d204018f-27e8-4e54-b5e7-d50899ede96c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d33ea45-2c2f-4276-adbe-04ebf5db4080","name":"7d33ea45-2c2f-4276-adbe-04ebf5db4080","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4c551fcd-30cd-4f8b-b420-ce1a36673dac","name":"4c551fcd-30cd-4f8b-b420-ce1a36673dac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"44032114-1f2f-47cd-a4a6-1421600214cd","name":"44032114-1f2f-47cd-a4a6-1421600214cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eeaf5887-2715-4e95-9063-c97aabdd28e1","name":"eeaf5887-2715-4e95-9063-c97aabdd28e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"caca9d43-9453-48f3-b26f-5e8be74ea6f8","name":"caca9d43-9453-48f3-b26f-5e8be74ea6f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da05b69a-1448-41be-90c3-5cfbba0a8721","name":"da05b69a-1448-41be-90c3-5cfbba0a8721","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0dd93d11-13c8-444c-8261-6b5733f8b58b","name":"0dd93d11-13c8-444c-8261-6b5733f8b58b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"66369c74-4a0c-4542-bc5d-554d6e83c25a","name":"66369c74-4a0c-4542-bc5d-554d6e83c25a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"85cdef35-b9f6-48e7-b907-843a160b1fc7","name":"85cdef35-b9f6-48e7-b907-843a160b1fc7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6f81ed7-7136-4422-835e-a2c3546f1548","name":"b6f81ed7-7136-4422-835e-a2c3546f1548","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"842d94d2-94ff-4452-951a-eea2822aea1b","name":"842d94d2-94ff-4452-951a-eea2822aea1b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"136b448f-cab9-4502-ab49-211dae6baa0b","name":"136b448f-cab9-4502-ab49-211dae6baa0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42f039f6-9ecd-4222-9b4c-17793d4d2f5d","name":"42f039f6-9ecd-4222-9b4c-17793d4d2f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"caf154c5-d8d8-498a-9695-3b4adc97fe74","name":"caf154c5-d8d8-498a-9695-3b4adc97fe74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6cacd7b9-2fb0-44d2-bb6a-c439104f2f54","name":"6cacd7b9-2fb0-44d2-bb6a-c439104f2f54","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2407b5d3-1513-4a94-9fa9-12f20669831f","name":"2407b5d3-1513-4a94-9fa9-12f20669831f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"743472f3-6863-4abe-bf55-bbeff76aaf00","name":"743472f3-6863-4abe-bf55-bbeff76aaf00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f343e60-f82b-408e-a5e0-1b3078ccf0f2","name":"6f343e60-f82b-408e-a5e0-1b3078ccf0f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb678b5e-7fc5-4837-b753-9f3dbadc87a0","name":"fb678b5e-7fc5-4837-b753-9f3dbadc87a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e607018-2fee-4472-af53-adf27c701121","name":"8e607018-2fee-4472-af53-adf27c701121","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ffc63594-ebb2-47ba-8083-be578882d2b4","name":"ffc63594-ebb2-47ba-8083-be578882d2b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2f939735-055a-4eeb-a48a-ba21f7ecf19b","name":"2f939735-055a-4eeb-a48a-ba21f7ecf19b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d7bbf94c-6658-40a3-a353-9ae9f765ea80","name":"d7bbf94c-6658-40a3-a353-9ae9f765ea80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4a4822c-f0ee-4a45-a579-46a46d4c4a3a","name":"e4a4822c-f0ee-4a45-a579-46a46d4c4a3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"004d1c23-13a6-463e-8b53-7a4ab648f6a3","name":"004d1c23-13a6-463e-8b53-7a4ab648f6a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e705a700-72b0-45e8-abc0-902b0b6b5480","name":"e705a700-72b0-45e8-abc0-902b0b6b5480","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"447ef73d-fd8d-4b8e-b9f8-f4f42d32fe9a","name":"447ef73d-fd8d-4b8e-b9f8-f4f42d32fe9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05d7a269-8f5f-416d-a32e-01ecadc03df9","name":"05d7a269-8f5f-416d-a32e-01ecadc03df9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a19ab7b7-1525-4f22-b385-3c6a5556bebf","name":"a19ab7b7-1525-4f22-b385-3c6a5556bebf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb1a5dde-af7a-43f8-aac7-5657258cc742","name":"bb1a5dde-af7a-43f8-aac7-5657258cc742","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"412496f6-a833-4a5b-a839-cdf54c804bd9","name":"412496f6-a833-4a5b-a839-cdf54c804bd9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"34af844a-9bf2-4670-92b2-5b8742d19f45","name":"34af844a-9bf2-4670-92b2-5b8742d19f45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1456b2a-3264-4d4d-9613-e0e84a4b8d80","name":"e1456b2a-3264-4d4d-9613-e0e84a4b8d80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f250301d-3a8b-45be-a367-c659a8172e53","name":"f250301d-3a8b-45be-a367-c659a8172e53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cc3c809d-f17c-4b1d-813f-7fda90d89c1a","name":"cc3c809d-f17c-4b1d-813f-7fda90d89c1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7b7e265-024b-4a01-9527-6c6fb8015a37","name":"a7b7e265-024b-4a01-9527-6c6fb8015a37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"defe2a73-dc9a-4ac9-b679-75dd0fa37037","name":"defe2a73-dc9a-4ac9-b679-75dd0fa37037","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -114,141 +114,51 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3e4d7ee5-ad96-4f30-95ce-a0c9a3b9d069","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01840bc3-1dc1-4799-907f-aabc1736c261","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97fd8b82-375e-49a4-8987-8b2491eb1baf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05289283-cf3c-49ba-978c-c5705e259221","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2318329d-6aab-4533-bdaa-e7805e9b15b4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"269de542-29d3-4e95-861d-ee5e4396f389","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"31ad97ec-9da0-47a5-90e1-a9b26393e96d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1413a945-9705-40c0-8532-72c7463a559a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7f6b8d0-aa60-4dee-85bd-ae56f29450b4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2fc152dc-0248-4a49-86fa-8bf6e49def31","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"74fb959e-3e19-48c0-b3a6-bd546e1a8e75","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d204018f-27e8-4e54-b5e7-d50899ede96c","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"73952404-cb8b-464a-a7aa-3aa9b9c4587d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d33ea45-2c2f-4276-adbe-04ebf5db4080","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f261bef-12bf-4b37-a300-434041e3b5d6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c551fcd-30cd-4f8b-b420-ce1a36673dac","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca614523-7c89-4120-abe1-58169c8f4267","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"44032114-1f2f-47cd-a4a6-1421600214cd","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1be6cd38-e67c-4068-814e-8bc76c469ef6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeaf5887-2715-4e95-9063-c97aabdd28e1","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"08fed482-516f-4bc4-8e62-df1f5ddd2378","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"caca9d43-9453-48f3-b26f-5e8be74ea6f8","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8bd26df5-8feb-4ab1-92a1-c82b9a377ddc","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da05b69a-1448-41be-90c3-5cfbba0a8721","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b674b5aa-b71a-4987-991f-ad9fed6243bd","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0dd93d11-13c8-444c-8261-6b5733f8b58b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"484adcfc-055b-4bd2-8a69-7f6ef1845733","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66369c74-4a0c-4542-bc5d-554d6e83c25a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89e92372-ddc8-41c5-ba42-a8f62dcc9fc6","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"85cdef35-b9f6-48e7-b907-843a160b1fc7","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34a79fa8-8079-48f2-97c2-cf5597257626","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6f81ed7-7136-4422-835e-a2c3546f1548","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0a6ad9ef-c588-41b9-96f4-dea51b324aef","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"842d94d2-94ff-4452-951a-eea2822aea1b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"179fdf05-ab39-44b0-9d53-3601823644d4","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"136b448f-cab9-4502-ab49-211dae6baa0b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4040dc72-745d-4e35-a7c5-f65e7aab043c","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42f039f6-9ecd-4222-9b4c-17793d4d2f5d","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b87e4893-54e4-4e14-b3de-7cbc4ad4573d","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"caf154c5-d8d8-498a-9695-3b4adc97fe74","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cca6dcf-ec65-406d-843c-6e1ae18bb3c0","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cacd7b9-2fb0-44d2-bb6a-c439104f2f54","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33695af1-3f1f-4235-aaad-4394a9c7faef","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2407b5d3-1513-4a94-9fa9-12f20669831f","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"afbc04d4-7e38-410d-ba02-ce4314cd47ce","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"743472f3-6863-4abe-bf55-bbeff76aaf00","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"723f7c79-4e5f-46df-9c78-5a799c698654","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f343e60-f82b-408e-a5e0-1b3078ccf0f2","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0a9d1567-0b32-43d8-8f0a-310c6728a8a6","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb678b5e-7fc5-4837-b753-9f3dbadc87a0","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"859ae0fb-8969-4e1a-8d91-823ea7f0702a","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e607018-2fee-4472-af53-adf27c701121","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"20532cfd-03ba-4a9d-a019-6ced8cf9b990","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ffc63594-ebb2-47ba-8083-be578882d2b4","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b4ecb63b-a763-486b-8037-2ff47f6b2caa","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f939735-055a-4eeb-a48a-ba21f7ecf19b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90a1faf0-f01f-4e58-ba2e-202426528474","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7bbf94c-6658-40a3-a353-9ae9f765ea80","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7d032d3-ee82-4e9d-a158-09122b739dd5","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a4822c-f0ee-4a45-a579-46a46d4c4a3a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05424da7-a46c-451d-b736-9880cc9bd9b8","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"004d1c23-13a6-463e-8b53-7a4ab648f6a3","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"221a454d-8e8c-440a-b4dd-bf887912c319","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e705a700-72b0-45e8-abc0-902b0b6b5480","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"256e01ac-92a5-4b00-b924-f737ba60a369","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"447ef73d-fd8d-4b8e-b9f8-f4f42d32fe9a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eb40438e-c2f8-4710-a5c7-6b5baba67f2d","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05d7a269-8f5f-416d-a32e-01ecadc03df9","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dfd1e5f3-169b-43c3-8fa1-39b1b2a0f46b","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a19ab7b7-1525-4f22-b385-3c6a5556bebf","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b06c89f-a1e5-4676-84a3-e775f1fbe9ea","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb1a5dde-af7a-43f8-aac7-5657258cc742","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"423f94d0-193c-4ce2-9ab4-81d6e5dd7eaf","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"412496f6-a833-4a5b-a839-cdf54c804bd9","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eb8d528c-67fa-4f2d-8ce6-a5666d349c91","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"34af844a-9bf2-4670-92b2-5b8742d19f45","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01e51592-6bd6-474b-977d-824df4e2bf22","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1456b2a-3264-4d4d-9613-e0e84a4b8d80","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a78d6371-2bc1-40ac-875b-c103a08506e5","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f250301d-3a8b-45be-a367-c659a8172e53","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eb51533d-c39b-4638-9aa5-2edf96f2546c","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cc3c809d-f17c-4b1d-813f-7fda90d89c1a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"695b5b5d-17d0-4d8f-bf1e-853a0daaea94","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7b7e265-024b-4a01-9527-6c6fb8015a37","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d6300bb-f4d2-4f29-88f7-d55305e9750e","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"defe2a73-dc9a-4ac9-b679-75dd0fa37037","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad65432a-03b3-44aa-bb4d-66a7218859bb","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3e4d7ee5-ad96-4f30-95ce-a0c9a3b9d069","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01840bc3-1dc1-4799-907f-aabc1736c261","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97fd8b82-375e-49a4-8987-8b2491eb1baf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05289283-cf3c-49ba-978c-c5705e259221","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2318329d-6aab-4533-bdaa-e7805e9b15b4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"269de542-29d3-4e95-861d-ee5e4396f389","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"31ad97ec-9da0-47a5-90e1-a9b26393e96d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1413a945-9705-40c0-8532-72c7463a559a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7f6b8d0-aa60-4dee-85bd-ae56f29450b4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2fc152dc-0248-4a49-86fa-8bf6e49def31","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"74fb959e-3e19-48c0-b3a6-bd546e1a8e75","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d204018f-27e8-4e54-b5e7-d50899ede96c","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"73952404-cb8b-464a-a7aa-3aa9b9c4587d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d33ea45-2c2f-4276-adbe-04ebf5db4080","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f261bef-12bf-4b37-a300-434041e3b5d6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c551fcd-30cd-4f8b-b420-ce1a36673dac","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca614523-7c89-4120-abe1-58169c8f4267","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"44032114-1f2f-47cd-a4a6-1421600214cd","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1be6cd38-e67c-4068-814e-8bc76c469ef6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeaf5887-2715-4e95-9063-c97aabdd28e1","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08fed482-516f-4bc4-8e62-df1f5ddd2378","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"caca9d43-9453-48f3-b26f-5e8be74ea6f8","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8bd26df5-8feb-4ab1-92a1-c82b9a377ddc","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da05b69a-1448-41be-90c3-5cfbba0a8721","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b674b5aa-b71a-4987-991f-ad9fed6243bd","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0dd93d11-13c8-444c-8261-6b5733f8b58b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"484adcfc-055b-4bd2-8a69-7f6ef1845733","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66369c74-4a0c-4542-bc5d-554d6e83c25a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89e92372-ddc8-41c5-ba42-a8f62dcc9fc6","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"85cdef35-b9f6-48e7-b907-843a160b1fc7","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34a79fa8-8079-48f2-97c2-cf5597257626","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6f81ed7-7136-4422-835e-a2c3546f1548","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0a6ad9ef-c588-41b9-96f4-dea51b324aef","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"842d94d2-94ff-4452-951a-eea2822aea1b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"179fdf05-ab39-44b0-9d53-3601823644d4","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"136b448f-cab9-4502-ab49-211dae6baa0b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4040dc72-745d-4e35-a7c5-f65e7aab043c","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"42f039f6-9ecd-4222-9b4c-17793d4d2f5d","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b87e4893-54e4-4e14-b3de-7cbc4ad4573d","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"caf154c5-d8d8-498a-9695-3b4adc97fe74","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cca6dcf-ec65-406d-843c-6e1ae18bb3c0","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cacd7b9-2fb0-44d2-bb6a-c439104f2f54","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33695af1-3f1f-4235-aaad-4394a9c7faef","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2407b5d3-1513-4a94-9fa9-12f20669831f","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"afbc04d4-7e38-410d-ba02-ce4314cd47ce","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"743472f3-6863-4abe-bf55-bbeff76aaf00","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"723f7c79-4e5f-46df-9c78-5a799c698654","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f343e60-f82b-408e-a5e0-1b3078ccf0f2","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0a9d1567-0b32-43d8-8f0a-310c6728a8a6","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb678b5e-7fc5-4837-b753-9f3dbadc87a0","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"859ae0fb-8969-4e1a-8d91-823ea7f0702a","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e607018-2fee-4472-af53-adf27c701121","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"20532cfd-03ba-4a9d-a019-6ced8cf9b990","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ffc63594-ebb2-47ba-8083-be578882d2b4","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b4ecb63b-a763-486b-8037-2ff47f6b2caa","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f939735-055a-4eeb-a48a-ba21f7ecf19b","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90a1faf0-f01f-4e58-ba2e-202426528474","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7bbf94c-6658-40a3-a353-9ae9f765ea80","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7d032d3-ee82-4e9d-a158-09122b739dd5","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a4822c-f0ee-4a45-a579-46a46d4c4a3a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05424da7-a46c-451d-b736-9880cc9bd9b8","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"004d1c23-13a6-463e-8b53-7a4ab648f6a3","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"221a454d-8e8c-440a-b4dd-bf887912c319","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e705a700-72b0-45e8-abc0-902b0b6b5480","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"256e01ac-92a5-4b00-b924-f737ba60a369","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"447ef73d-fd8d-4b8e-b9f8-f4f42d32fe9a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eb40438e-c2f8-4710-a5c7-6b5baba67f2d","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05d7a269-8f5f-416d-a32e-01ecadc03df9","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dfd1e5f3-169b-43c3-8fa1-39b1b2a0f46b","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a19ab7b7-1525-4f22-b385-3c6a5556bebf","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b06c89f-a1e5-4676-84a3-e775f1fbe9ea","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb1a5dde-af7a-43f8-aac7-5657258cc742","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"423f94d0-193c-4ce2-9ab4-81d6e5dd7eaf","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"412496f6-a833-4a5b-a839-cdf54c804bd9","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eb8d528c-67fa-4f2d-8ce6-a5666d349c91","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"34af844a-9bf2-4670-92b2-5b8742d19f45","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01e51592-6bd6-474b-977d-824df4e2bf22","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1456b2a-3264-4d4d-9613-e0e84a4b8d80","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a78d6371-2bc1-40ac-875b-c103a08506e5","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f250301d-3a8b-45be-a367-c659a8172e53","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eb51533d-c39b-4638-9aa5-2edf96f2546c","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cc3c809d-f17c-4b1d-813f-7fda90d89c1a","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"695b5b5d-17d0-4d8f-bf1e-853a0daaea94","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7b7e265-024b-4a01-9527-6c6fb8015a37","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d6300bb-f4d2-4f29-88f7-d55305e9750e","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"defe2a73-dc9a-4ac9-b679-75dd0fa37037","path":"sprites/spr_bare_heads/spr_bare_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad65432a-03b3-44aa-bb4d-66a7218859bb","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy b/sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy index 705df661cf..0d2e1be36c 100644 --- a/sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy +++ b/sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_heads_colourable", "bboxMode":0, "bbox_bottom":206, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"05289283-cf3c-49ba-978c-c5705e259221","name":"05289283-cf3c-49ba-978c-c5705e259221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"269de542-29d3-4e95-861d-ee5e4396f389","name":"269de542-29d3-4e95-861d-ee5e4396f389","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6df39139-d1b2-4f8f-ac68-8603285c55b8","name":"6df39139-d1b2-4f8f-ac68-8603285c55b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05289283-cf3c-49ba-978c-c5705e259221","name":"05289283-cf3c-49ba-978c-c5705e259221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"269de542-29d3-4e95-861d-ee5e4396f389","name":"269de542-29d3-4e95-861d-ee5e4396f389","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6df39139-d1b2-4f8f-ac68-8603285c55b8","name":"6df39139-d1b2-4f8f-ac68-8603285c55b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,24 +75,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3e4d7ee5-ad96-4f30-95ce-a0c9a3b9d069","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01840bc3-1dc1-4799-907f-aabc1736c261","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97fd8b82-375e-49a4-8987-8b2491eb1baf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05289283-cf3c-49ba-978c-c5705e259221","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2318329d-6aab-4533-bdaa-e7805e9b15b4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"269de542-29d3-4e95-861d-ee5e4396f389","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"31ad97ec-9da0-47a5-90e1-a9b26393e96d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6df39139-d1b2-4f8f-ac68-8603285c55b8","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f158a15-d382-450f-824b-5ca1b02ddec7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0394d2c-1519-4705-9cfa-bff1e4d0bce1","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3e4d7ee5-ad96-4f30-95ce-a0c9a3b9d069","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1f4af0d-ab7c-4e9c-b66b-c6b0d3b0711e","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01840bc3-1dc1-4799-907f-aabc1736c261","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70f17ac-4a82-47d2-b564-0f99c4b3b3ec","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97fd8b82-375e-49a4-8987-8b2491eb1baf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05289283-cf3c-49ba-978c-c5705e259221","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2318329d-6aab-4533-bdaa-e7805e9b15b4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"269de542-29d3-4e95-861d-ee5e4396f389","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"31ad97ec-9da0-47a5-90e1-a9b26393e96d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6df39139-d1b2-4f8f-ac68-8603285c55b8","path":"sprites/spr_bare_heads_colourable/spr_bare_heads_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f158a15-d382-450f-824b-5ca1b02ddec7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bare_neck_colourable/spr_bare_neck_colourable.yy b/sprites/spr_bare_neck_colourable/spr_bare_neck_colourable.yy index 7470485f59..54b0d33b20 100644 --- a/sprites/spr_bare_neck_colourable/spr_bare_neck_colourable.yy +++ b/sprites/spr_bare_neck_colourable/spr_bare_neck_colourable.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_neck_colourable", "bboxMode":0, "bbox_bottom":46, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a839b615-ebae-4696-951c-cd29fb507e1f","name":"a839b615-ebae-4696-951c-cd29fb507e1f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a839b615-ebae-4696-951c-cd29fb507e1f","name":"a839b615-ebae-4696-951c-cd29fb507e1f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a839b615-ebae-4696-951c-cd29fb507e1f","path":"sprites/spr_bare_neck_colourable/spr_bare_neck_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4555296-60a6-4309-a491-1f0a03b9e441","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a839b615-ebae-4696-951c-cd29fb507e1f","path":"sprites/spr_bare_neck_colourable/spr_bare_neck_colourable.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4555296-60a6-4309-a491-1f0a03b9e441","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bare_necks/spr_bare_necks.yy b/sprites/spr_bare_necks/spr_bare_necks.yy index 999c353881..881a3ec792 100644 --- a/sprites/spr_bare_necks/spr_bare_necks.yy +++ b/sprites/spr_bare_necks/spr_bare_necks.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bare_necks", "bboxMode":0, "bbox_bottom":44, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a839b615-ebae-4696-951c-cd29fb507e1f","name":"a839b615-ebae-4696-951c-cd29fb507e1f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"10e61cb9-19c1-4412-9af9-4c6b32200233","name":"10e61cb9-19c1-4412-9af9-4c6b32200233","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c81351d7-a31f-453c-94a1-ae7599f9959c","name":"c81351d7-a31f-453c-94a1-ae7599f9959c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9975d9c5-6a1f-405e-8013-5d7b117d30e6","name":"9975d9c5-6a1f-405e-8013-5d7b117d30e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"18722739-19a0-49d8-90fb-349ab76d829b","name":"18722739-19a0-49d8-90fb-349ab76d829b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"779641b4-cff6-4e2e-a2af-81ee601e5cea","name":"779641b4-cff6-4e2e-a2af-81ee601e5cea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"217090ee-986a-4bde-9f6d-67271a13c19f","name":"217090ee-986a-4bde-9f6d-67271a13c19f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15035d1a-aee3-47c2-9966-61275a3c69d8","name":"15035d1a-aee3-47c2-9966-61275a3c69d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a839b615-ebae-4696-951c-cd29fb507e1f","name":"a839b615-ebae-4696-951c-cd29fb507e1f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"10e61cb9-19c1-4412-9af9-4c6b32200233","name":"10e61cb9-19c1-4412-9af9-4c6b32200233","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c81351d7-a31f-453c-94a1-ae7599f9959c","name":"c81351d7-a31f-453c-94a1-ae7599f9959c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9975d9c5-6a1f-405e-8013-5d7b117d30e6","name":"9975d9c5-6a1f-405e-8013-5d7b117d30e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"18722739-19a0-49d8-90fb-349ab76d829b","name":"18722739-19a0-49d8-90fb-349ab76d829b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"779641b4-cff6-4e2e-a2af-81ee601e5cea","name":"779641b4-cff6-4e2e-a2af-81ee601e5cea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"217090ee-986a-4bde-9f6d-67271a13c19f","name":"217090ee-986a-4bde-9f6d-67271a13c19f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15035d1a-aee3-47c2-9966-61275a3c69d8","name":"15035d1a-aee3-47c2-9966-61275a3c69d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,30 +77,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a839b615-ebae-4696-951c-cd29fb507e1f","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4555296-60a6-4309-a491-1f0a03b9e441","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"10e61cb9-19c1-4412-9af9-4c6b32200233","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b60ae687-354e-4c5c-834c-7287e0f3a24d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c81351d7-a31f-453c-94a1-ae7599f9959c","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"17bc3897-bae6-4611-9e55-2407195f25ae","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9975d9c5-6a1f-405e-8013-5d7b117d30e6","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b54d4c04-eeba-4a3f-8eeb-11669bfb8b46","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"18722739-19a0-49d8-90fb-349ab76d829b","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8166ac73-ec7c-4031-b95e-3a4e7b0fd6e3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"779641b4-cff6-4e2e-a2af-81ee601e5cea","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f6981172-9a50-4d39-89ec-ca61a7e575ec","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"217090ee-986a-4bde-9f6d-67271a13c19f","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"07c385d7-248c-483f-88a3-f8e67aabb43a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15035d1a-aee3-47c2-9966-61275a3c69d8","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"752217ee-cefe-46c7-8d2e-887e1bd6d850","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a839b615-ebae-4696-951c-cd29fb507e1f","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4555296-60a6-4309-a491-1f0a03b9e441","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"10e61cb9-19c1-4412-9af9-4c6b32200233","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b60ae687-354e-4c5c-834c-7287e0f3a24d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c81351d7-a31f-453c-94a1-ae7599f9959c","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"17bc3897-bae6-4611-9e55-2407195f25ae","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9975d9c5-6a1f-405e-8013-5d7b117d30e6","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b54d4c04-eeba-4a3f-8eeb-11669bfb8b46","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"18722739-19a0-49d8-90fb-349ab76d829b","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8166ac73-ec7c-4031-b95e-3a4e7b0fd6e3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"779641b4-cff6-4e2e-a2af-81ee601e5cea","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6981172-9a50-4d39-89ec-ca61a7e575ec","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"217090ee-986a-4bde-9f6d-67271a13c19f","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"07c385d7-248c-483f-88a3-f8e67aabb43a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15035d1a-aee3-47c2-9966-61275a3c69d8","path":"sprites/spr_bare_necks/spr_bare_necks.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"752217ee-cefe-46c7-8d2e-887e1bd6d850","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_battle_block/spr_battle_block.yy b/sprites/spr_battle_block/spr_battle_block.yy index a48aa3d60d..a4b8f147fb 100644 --- a/sprites/spr_battle_block/spr_battle_block.yy +++ b/sprites/spr_battle_block/spr_battle_block.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_battle_block", "bboxMode":0, "bbox_bottom":9, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"90700d4c-3d98-40e3-bbb8-2e75f976206d","name":"90700d4c-3d98-40e3-bbb8-2e75f976206d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"faefc140-3c2a-4012-bbff-44f978c3c07e","name":"faefc140-3c2a-4012-bbff-44f978c3c07e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90700d4c-3d98-40e3-bbb8-2e75f976206d","name":"90700d4c-3d98-40e3-bbb8-2e75f976206d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"faefc140-3c2a-4012-bbff-44f978c3c07e","name":"faefc140-3c2a-4012-bbff-44f978c3c07e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90700d4c-3d98-40e3-bbb8-2e75f976206d","path":"sprites/spr_battle_block/spr_battle_block.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33ca9eef-ac9a-488d-af7d-8e082ec7bf1b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"faefc140-3c2a-4012-bbff-44f978c3c07e","path":"sprites/spr_battle_block/spr_battle_block.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a7a7785-395a-41b1-ab12-a686d6b0bd9c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90700d4c-3d98-40e3-bbb8-2e75f976206d","path":"sprites/spr_battle_block/spr_battle_block.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33ca9eef-ac9a-488d-af7d-8e082ec7bf1b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"faefc140-3c2a-4012-bbff-44f978c3c07e","path":"sprites/spr_battle_block/spr_battle_block.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a7a7785-395a-41b1-ab12-a686d6b0bd9c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_battle_block2/spr_battle_block2.yy b/sprites/spr_battle_block2/spr_battle_block2.yy index 837ffe6cac..97c49b63d1 100644 --- a/sprites/spr_battle_block2/spr_battle_block2.yy +++ b/sprites/spr_battle_block2/spr_battle_block2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_battle_block2", "bboxMode":0, "bbox_bottom":9, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5c31e164-e605-49ac-aa68-77d99485eb89","name":"5c31e164-e605-49ac-aa68-77d99485eb89","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c31e164-e605-49ac-aa68-77d99485eb89","name":"5c31e164-e605-49ac-aa68-77d99485eb89","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c31e164-e605-49ac-aa68-77d99485eb89","path":"sprites/spr_battle_block2/spr_battle_block2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"72908395-beb8-49ac-a394-f574a467b190","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c31e164-e605-49ac-aa68-77d99485eb89","path":"sprites/spr_battle_block2/spr_battle_block2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"72908395-beb8-49ac-a394-f574a467b190","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_beakie_colors/spr_beakie_colors.yy b/sprites/spr_beakie_colors/spr_beakie_colors.yy index 444f3a1260..91665e1a48 100644 --- a/sprites/spr_beakie_colors/spr_beakie_colors.yy +++ b/sprites/spr_beakie_colors/spr_beakie_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_beakie_colors", "bboxMode":0, "bbox_bottom":222, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6f028b25-2b7f-4a92-97fa-294e9891ef1a","name":"6f028b25-2b7f-4a92-97fa-294e9891ef1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"43de8c67-ec68-4742-9ab1-0a85f1441487","name":"43de8c67-ec68-4742-9ab1-0a85f1441487","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0985c171-a295-4621-a616-d603ed590110","name":"0985c171-a295-4621-a616-d603ed590110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"50e8a95a-2b31-419d-8021-35eb7015de98","name":"50e8a95a-2b31-419d-8021-35eb7015de98","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1a21d3ef-a16b-44cd-baf3-c5e63b7b53b1","name":"1a21d3ef-a16b-44cd-baf3-c5e63b7b53b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1a89e1b5-01cf-4665-a005-932e861784e6","name":"1a89e1b5-01cf-4665-a005-932e861784e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3387d0cf-df62-431c-b623-f5f1f9e26e51","name":"3387d0cf-df62-431c-b623-f5f1f9e26e51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"91a314d9-a0bd-43fb-a6e7-232a813cb40a","name":"91a314d9-a0bd-43fb-a6e7-232a813cb40a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ce203156-ae0e-4ead-91b9-728e91d5d262","name":"ce203156-ae0e-4ead-91b9-728e91d5d262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7e135c3-4c81-4b7d-a819-423c7200c598","name":"a7e135c3-4c81-4b7d-a819-423c7200c598","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b679b25-536b-48e2-ac36-f3a2b1f66e2d","name":"2b679b25-536b-48e2-ac36-f3a2b1f66e2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c02a4cc6-33ce-47ae-b8c6-16514c505fe1","name":"c02a4cc6-33ce-47ae-b8c6-16514c505fe1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"254c1638-b8ea-4bc0-926a-23dcf4a1617e","name":"254c1638-b8ea-4bc0-926a-23dcf4a1617e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d5dd366-5b56-4644-bb08-49b0548cb1b7","name":"7d5dd366-5b56-4644-bb08-49b0548cb1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f028b25-2b7f-4a92-97fa-294e9891ef1a","name":"6f028b25-2b7f-4a92-97fa-294e9891ef1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"43de8c67-ec68-4742-9ab1-0a85f1441487","name":"43de8c67-ec68-4742-9ab1-0a85f1441487","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0985c171-a295-4621-a616-d603ed590110","name":"0985c171-a295-4621-a616-d603ed590110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"50e8a95a-2b31-419d-8021-35eb7015de98","name":"50e8a95a-2b31-419d-8021-35eb7015de98","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1a21d3ef-a16b-44cd-baf3-c5e63b7b53b1","name":"1a21d3ef-a16b-44cd-baf3-c5e63b7b53b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1a89e1b5-01cf-4665-a005-932e861784e6","name":"1a89e1b5-01cf-4665-a005-932e861784e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3387d0cf-df62-431c-b623-f5f1f9e26e51","name":"3387d0cf-df62-431c-b623-f5f1f9e26e51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"91a314d9-a0bd-43fb-a6e7-232a813cb40a","name":"91a314d9-a0bd-43fb-a6e7-232a813cb40a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce203156-ae0e-4ead-91b9-728e91d5d262","name":"ce203156-ae0e-4ead-91b9-728e91d5d262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7e135c3-4c81-4b7d-a819-423c7200c598","name":"a7e135c3-4c81-4b7d-a819-423c7200c598","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b679b25-536b-48e2-ac36-f3a2b1f66e2d","name":"2b679b25-536b-48e2-ac36-f3a2b1f66e2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c02a4cc6-33ce-47ae-b8c6-16514c505fe1","name":"c02a4cc6-33ce-47ae-b8c6-16514c505fe1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"254c1638-b8ea-4bc0-926a-23dcf4a1617e","name":"254c1638-b8ea-4bc0-926a-23dcf4a1617e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d5dd366-5b56-4644-bb08-49b0548cb1b7","name":"7d5dd366-5b56-4644-bb08-49b0548cb1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f028b25-2b7f-4a92-97fa-294e9891ef1a","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"42a24f5f-59b0-4238-87c4-74423a626f08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"43de8c67-ec68-4742-9ab1-0a85f1441487","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09b63fe3-5ad2-4c11-9e06-aca436bd5c31","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0985c171-a295-4621-a616-d603ed590110","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"369c16d4-95d2-44dc-8656-2f5eef632f50","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"50e8a95a-2b31-419d-8021-35eb7015de98","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec20f9e4-cfed-4dff-9e3a-79aa1717a8e2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a21d3ef-a16b-44cd-baf3-c5e63b7b53b1","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16538e15-b065-4274-bd4b-1a1cf8b3e275","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a89e1b5-01cf-4665-a005-932e861784e6","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c3835093-5675-4489-b5dd-a6504749e7b3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3387d0cf-df62-431c-b623-f5f1f9e26e51","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af6197f9-dab9-40b3-bbe5-7278167a301f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"91a314d9-a0bd-43fb-a6e7-232a813cb40a","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"caf28f26-50fe-4772-9a62-311acb7db68f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce203156-ae0e-4ead-91b9-728e91d5d262","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9da9649-d7c7-4cfc-8f0e-efbaaa577fc8","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7e135c3-4c81-4b7d-a819-423c7200c598","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af6479d9-20ed-41d7-890d-7629734863ed","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b679b25-536b-48e2-ac36-f3a2b1f66e2d","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"675de54e-cf05-4de3-9eed-8770315e6bc9","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c02a4cc6-33ce-47ae-b8c6-16514c505fe1","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21fac7cd-71b6-46cb-9853-e22bf5cdd7f1","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"254c1638-b8ea-4bc0-926a-23dcf4a1617e","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f14edaaa-a8a9-472f-9eae-725540b9923d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5dd366-5b56-4644-bb08-49b0548cb1b7","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cff6cd61-580b-4057-8302-b364bf2a3387","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f028b25-2b7f-4a92-97fa-294e9891ef1a","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"42a24f5f-59b0-4238-87c4-74423a626f08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"43de8c67-ec68-4742-9ab1-0a85f1441487","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09b63fe3-5ad2-4c11-9e06-aca436bd5c31","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0985c171-a295-4621-a616-d603ed590110","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"369c16d4-95d2-44dc-8656-2f5eef632f50","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"50e8a95a-2b31-419d-8021-35eb7015de98","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec20f9e4-cfed-4dff-9e3a-79aa1717a8e2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a21d3ef-a16b-44cd-baf3-c5e63b7b53b1","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16538e15-b065-4274-bd4b-1a1cf8b3e275","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a89e1b5-01cf-4665-a005-932e861784e6","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c3835093-5675-4489-b5dd-a6504749e7b3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3387d0cf-df62-431c-b623-f5f1f9e26e51","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af6197f9-dab9-40b3-bbe5-7278167a301f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"91a314d9-a0bd-43fb-a6e7-232a813cb40a","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"caf28f26-50fe-4772-9a62-311acb7db68f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce203156-ae0e-4ead-91b9-728e91d5d262","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9da9649-d7c7-4cfc-8f0e-efbaaa577fc8","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7e135c3-4c81-4b7d-a819-423c7200c598","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af6479d9-20ed-41d7-890d-7629734863ed","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b679b25-536b-48e2-ac36-f3a2b1f66e2d","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"675de54e-cf05-4de3-9eed-8770315e6bc9","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c02a4cc6-33ce-47ae-b8c6-16514c505fe1","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21fac7cd-71b6-46cb-9853-e22bf5cdd7f1","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"254c1638-b8ea-4bc0-926a-23dcf4a1617e","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f14edaaa-a8a9-472f-9eae-725540b9923d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5dd366-5b56-4644-bb08-49b0548cb1b7","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cff6cd61-580b-4057-8302-b364bf2a3387","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_binders_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_binders_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png new file mode 100644 index 0000000000..eb713baadf Binary files /dev/null and b/sprites/spr_binders_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png differ diff --git a/sprites/spr_binders_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_binders_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000..eb713baadf Binary files /dev/null and b/sprites/spr_binders_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_binders_belt/spr_binders_belt.yy b/sprites/spr_binders_belt/spr_binders_belt.yy new file mode 100644 index 0000000000..418b7a9bf0 --- /dev/null +++ b/sprites/spr_binders_belt/spr_binders_belt.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_binders_belt", + "bboxMode":0, + "bbox_bottom":114, + "bbox_left":56, + "bbox_right":107, + "bbox_top":82, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"468e0a30-2dea-45bc-a7bd-4b115f803d2d","blendMode":0,"displayName":"default","isLocked":false,"name":"468e0a30-2dea-45bc-a7bd-4b115f803d2d","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_binders_belt", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"mk_7_complex", + "path":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_binders_belt", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_binders_belt", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_binders_belt/spr_binders_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"68badb9c-da79-4a80-b8c4-f9962a02da21","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":-2, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":164, +} \ No newline at end of file diff --git a/sprites/spr_binders_robe/c00a412a-a9bc-45ec-9142-9d8a013a975a.png b/sprites/spr_binders_robe/c00a412a-a9bc-45ec-9142-9d8a013a975a.png new file mode 100644 index 0000000000..8d854d697f Binary files /dev/null and b/sprites/spr_binders_robe/c00a412a-a9bc-45ec-9142-9d8a013a975a.png differ diff --git a/sprites/spr_binders_robe/layers/c00a412a-a9bc-45ec-9142-9d8a013a975a/0b5e7fba-d4a1-441e-a726-f45a72c56663.png b/sprites/spr_binders_robe/layers/c00a412a-a9bc-45ec-9142-9d8a013a975a/0b5e7fba-d4a1-441e-a726-f45a72c56663.png new file mode 100644 index 0000000000..8d854d697f Binary files /dev/null and b/sprites/spr_binders_robe/layers/c00a412a-a9bc-45ec-9142-9d8a013a975a/0b5e7fba-d4a1-441e-a726-f45a72c56663.png differ diff --git a/sprites/spr_binders_robe/spr_binders_robe.yy b/sprites/spr_binders_robe/spr_binders_robe.yy new file mode 100644 index 0000000000..e67a6a359f --- /dev/null +++ b/sprites/spr_binders_robe/spr_binders_robe.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_binders_robe", + "bboxMode":0, + "bbox_bottom":203, + "bbox_left":49, + "bbox_right":116, + "bbox_top":44, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"0b5e7fba-d4a1-441e-a726-f45a72c56663","blendMode":0,"displayName":"default","isLocked":false,"name":"0b5e7fba-d4a1-441e-a726-f45a72c56663","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_binders_robe", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"gear", + "path":"folders/Sprites/Marine Viewer/gear.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_binders_robe", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_binders_robe", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","path":"sprites/spr_binders_robe/spr_binders_robe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3cdc5249-b43e-47ef-9b3e-594c53429273","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_binders_robes/spr_binders_robes.yy b/sprites/spr_binders_robes/spr_binders_robes.yy index 2d4691cd82..2ad79d3a66 100644 --- a/sprites/spr_binders_robes/spr_binders_robes.yy +++ b/sprites/spr_binders_robes/spr_binders_robes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_binders_robes", "bboxMode":0, "bbox_bottom":227, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"98625b1b-c315-421f-942a-61723f81b005","name":"98625b1b-c315-421f-942a-61723f81b005","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea737237-f34b-4a88-a92f-5d553e4e2b87","name":"ea737237-f34b-4a88-a92f-5d553e4e2b87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"98625b1b-c315-421f-942a-61723f81b005","name":"98625b1b-c315-421f-942a-61723f81b005","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea737237-f34b-4a88-a92f-5d553e4e2b87","name":"ea737237-f34b-4a88-a92f-5d553e4e2b87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_bio_fighter/spr_bio_fighter.yy b/sprites/spr_bio_fighter/spr_bio_fighter.yy index b90f4af45b..048078906a 100644 --- a/sprites/spr_bio_fighter/spr_bio_fighter.yy +++ b/sprites/spr_bio_fighter/spr_bio_fighter.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bio_fighter", "bboxMode":0, "bbox_bottom":13, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d9871f1f-1396-4b9d-a077-beafe9c94a26","name":"d9871f1f-1396-4b9d-a077-beafe9c94a26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9871f1f-1396-4b9d-a077-beafe9c94a26","name":"d9871f1f-1396-4b9d-a077-beafe9c94a26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9871f1f-1396-4b9d-a077-beafe9c94a26","path":"sprites/spr_bio_fighter/spr_bio_fighter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f007a16a-62b9-4292-8ca8-4710f976a9b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9871f1f-1396-4b9d-a077-beafe9c94a26","path":"sprites/spr_bio_fighter/spr_bio_fighter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f007a16a-62b9-4292-8ca8-4710f976a9b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy b/sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy index baa11aa58d..c7141e238c 100644 --- a/sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy +++ b/sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_eye_2", "bboxMode":0, "bbox_bottom":34, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f4fa1aac-6951-45c2-aa9a-7e44eeed2306","name":"f4fa1aac-6951-45c2-aa9a-7e44eeed2306","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84fee39f-d943-4d5c-96eb-328cb7868960","name":"84fee39f-d943-4d5c-96eb-328cb7868960","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"51e35673-dadd-418d-9abc-e9615a475fbc","name":"51e35673-dadd-418d-9abc-e9615a475fbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4fa1aac-6951-45c2-aa9a-7e44eeed2306","name":"f4fa1aac-6951-45c2-aa9a-7e44eeed2306","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84fee39f-d943-4d5c-96eb-328cb7868960","name":"84fee39f-d943-4d5c-96eb-328cb7868960","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"51e35673-dadd-418d-9abc-e9615a475fbc","name":"51e35673-dadd-418d-9abc-e9615a475fbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4fa1aac-6951-45c2-aa9a-7e44eeed2306","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ae9abc3-6ed5-48ee-a250-e22f7819bc3d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0bb6848f-08b4-4c6c-8690-c266abe32bfe","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b99fe40-f32c-46ac-8d18-1e2ce6e66e1a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"51e35673-dadd-418d-9abc-e9615a475fbc","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9dca493b-9343-4366-b291-b370bbb8d3f2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4fa1aac-6951-45c2-aa9a-7e44eeed2306","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ae9abc3-6ed5-48ee-a250-e22f7819bc3d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bb6848f-08b4-4c6c-8690-c266abe32bfe","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b99fe40-f32c-46ac-8d18-1e2ce6e66e1a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"51e35673-dadd-418d-9abc-e9615a475fbc","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9dca493b-9343-4366-b291-b370bbb8d3f2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy b/sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy index f5e7894542..fab01acf82 100644 --- a/sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy +++ b/sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_left_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1760fafc-7f34-4184-937c-64a145f1e4e9","name":"1760fafc-7f34-4184-937c-64a145f1e4e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd829f66-11dc-4ec3-b718-e71b936e0974","name":"cd829f66-11dc-4ec3-b718-e71b936e0974","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1760fafc-7f34-4184-937c-64a145f1e4e9","name":"1760fafc-7f34-4184-937c-64a145f1e4e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd829f66-11dc-4ec3-b718-e71b936e0974","name":"cd829f66-11dc-4ec3-b718-e71b936e0974","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1760fafc-7f34-4184-937c-64a145f1e4e9","path":"sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5976c9a5-8277-4050-b34d-34f2d872e4da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd829f66-11dc-4ec3-b718-e71b936e0974","path":"sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cbf2a21-7ada-41e5-903e-cd67592bac46","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1760fafc-7f34-4184-937c-64a145f1e4e9","path":"sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5976c9a5-8277-4050-b34d-34f2d872e4da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd829f66-11dc-4ec3-b718-e71b936e0974","path":"sprites/spr_bionic_left_arm/spr_bionic_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cbf2a21-7ada-41e5-903e-cd67592bac46","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy b/sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy index 60861c0587..a80f650345 100644 --- a/sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy +++ b/sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_left_eyes", "bboxMode":0, "bbox_bottom":39, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84fee39f-d943-4d5c-96eb-328cb7868960","name":"84fee39f-d943-4d5c-96eb-328cb7868960","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84fee39f-d943-4d5c-96eb-328cb7868960","name":"84fee39f-d943-4d5c-96eb-328cb7868960","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b28cdb8f-d22c-4a36-ae78-60b9bfaa06d7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e755fe34-01b8-43ee-9b7b-6853fc630075","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d55ecb9-522e-4979-9234-e8bcd8048c58","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b28cdb8f-d22c-4a36-ae78-60b9bfaa06d7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e755fe34-01b8-43ee-9b7b-6853fc630075","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_left_eyes/spr_bionic_left_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d55ecb9-522e-4979-9234-e8bcd8048c58","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy b/sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy index 7ea789e6aa..115597837a 100644 --- a/sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy +++ b/sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_leg_left", "bboxMode":0, "bbox_bottom":220, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ebd16397-c391-4646-97de-e5dab06667d2","name":"ebd16397-c391-4646-97de-e5dab06667d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ebd16397-c391-4646-97de-e5dab06667d2","name":"ebd16397-c391-4646-97de-e5dab06667d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d79241c0-c856-44b5-b854-c037f49cf072","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"903563e8-77b8-4ba8-a310-59f152994e37","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebd16397-c391-4646-97de-e5dab06667d2","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d0f98b2-cc58-4c1a-8cc3-096abb41e602","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d79241c0-c856-44b5-b854-c037f49cf072","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"903563e8-77b8-4ba8-a310-59f152994e37","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebd16397-c391-4646-97de-e5dab06667d2","path":"sprites/spr_bionic_leg_left/spr_bionic_leg_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d0f98b2-cc58-4c1a-8cc3-096abb41e602","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy b/sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy index bcc7ff1275..a44fdf52ab 100644 --- a/sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy +++ b/sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_leg_right", "bboxMode":0, "bbox_bottom":220, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6de5a7b9-986a-41e8-8905-0d12deee68f2","name":"6de5a7b9-986a-41e8-8905-0d12deee68f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6de5a7b9-986a-41e8-8905-0d12deee68f2","name":"6de5a7b9-986a-41e8-8905-0d12deee68f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ad3a1f0-7df5-4ad7-b3ca-26ba15d59820","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"83fe762c-855d-4486-97e8-4c7acfd8438b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6de5a7b9-986a-41e8-8905-0d12deee68f2","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce7840e9-414a-4d55-adfe-7c61246bd61b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ad3a1f0-7df5-4ad7-b3ca-26ba15d59820","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ebb396-c9a2-4dee-8713-c40196833bd1","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"83fe762c-855d-4486-97e8-4c7acfd8438b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6de5a7b9-986a-41e8-8905-0d12deee68f2","path":"sprites/spr_bionic_leg_right/spr_bionic_leg_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce7840e9-414a-4d55-adfe-7c61246bd61b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy b/sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy index 567bb7cbee..53f0635d51 100644 --- a/sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy +++ b/sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_right_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1760fafc-7f34-4184-937c-64a145f1e4e9","name":"1760fafc-7f34-4184-937c-64a145f1e4e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd829f66-11dc-4ec3-b718-e71b936e0974","name":"cd829f66-11dc-4ec3-b718-e71b936e0974","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1760fafc-7f34-4184-937c-64a145f1e4e9","name":"1760fafc-7f34-4184-937c-64a145f1e4e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd829f66-11dc-4ec3-b718-e71b936e0974","name":"cd829f66-11dc-4ec3-b718-e71b936e0974","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1760fafc-7f34-4184-937c-64a145f1e4e9","path":"sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f40b0403-9c6e-4050-94b1-3fdb07c4949b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd829f66-11dc-4ec3-b718-e71b936e0974","path":"sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"84ded38f-b057-4586-aeaf-f434c1ad998f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1760fafc-7f34-4184-937c-64a145f1e4e9","path":"sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f40b0403-9c6e-4050-94b1-3fdb07c4949b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd829f66-11dc-4ec3-b718-e71b936e0974","path":"sprites/spr_bionic_right_arm/spr_bionic_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"84ded38f-b057-4586-aeaf-f434c1ad998f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy b/sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy index c7cfcf7cae..8741cfd6ea 100644 --- a/sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy +++ b/sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionic_right_eyes", "bboxMode":0, "bbox_bottom":39, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84fee39f-d943-4d5c-96eb-328cb7868960","name":"84fee39f-d943-4d5c-96eb-328cb7868960","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84fee39f-d943-4d5c-96eb-328cb7868960","name":"84fee39f-d943-4d5c-96eb-328cb7868960","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"63faba23-bea0-4293-b76a-0c67b3efa44c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9cf283c-8a9c-4047-9850-5cc548a2862a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f39a3fed-6e36-4af6-82d2-1ab2c62e00f7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a76b1d9-a84c-419f-a5f5-375da469c28a","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"63faba23-bea0-4293-b76a-0c67b3efa44c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84fee39f-d943-4d5c-96eb-328cb7868960","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9cf283c-8a9c-4047-9850-5cc548a2862a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae4bbb98-d515-4b56-bf1a-35a210a7ddde","path":"sprites/spr_bionic_right_eyes/spr_bionic_right_eyes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f39a3fed-6e36-4af6-82d2-1ab2c62e00f7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bionics_arm/spr_bionics_arm.yy b/sprites/spr_bionics_arm/spr_bionics_arm.yy index 45ab7db89b..f064197d79 100644 --- a/sprites/spr_bionics_arm/spr_bionics_arm.yy +++ b/sprites/spr_bionics_arm/spr_bionics_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ca6b9c8e-84ec-4086-a7ba-d2990de3b060","name":"ca6b9c8e-84ec-4086-a7ba-d2990de3b060","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d3462996-9ddf-47bc-81b0-e2fde6cd6446","name":"d3462996-9ddf-47bc-81b0-e2fde6cd6446","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca6b9c8e-84ec-4086-a7ba-d2990de3b060","name":"ca6b9c8e-84ec-4086-a7ba-d2990de3b060","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d3462996-9ddf-47bc-81b0-e2fde6cd6446","name":"d3462996-9ddf-47bc-81b0-e2fde6cd6446","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca6b9c8e-84ec-4086-a7ba-d2990de3b060","path":"sprites/spr_bionics_arm/spr_bionics_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7fa16835-de7d-4daf-bd0e-a27f3a6472fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3462996-9ddf-47bc-81b0-e2fde6cd6446","path":"sprites/spr_bionics_arm/spr_bionics_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca31ccd2-4d61-4c0a-9fd5-104aa9778ae0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca6b9c8e-84ec-4086-a7ba-d2990de3b060","path":"sprites/spr_bionics_arm/spr_bionics_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7fa16835-de7d-4daf-bd0e-a27f3a6472fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3462996-9ddf-47bc-81b0-e2fde6cd6446","path":"sprites/spr_bionics_arm/spr_bionics_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca31ccd2-4d61-4c0a-9fd5-104aa9778ae0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy b/sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy index 39d5ac74d9..4102df37d1 100644 --- a/sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy +++ b/sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_arm_2", "bboxMode":0, "bbox_bottom":125, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bab2ac30-c835-4ecd-96bc-27157d7aa3be","name":"bab2ac30-c835-4ecd-96bc-27157d7aa3be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84a7b5b5-20ae-4ce6-97aa-ab04171d8b21","name":"84a7b5b5-20ae-4ce6-97aa-ab04171d8b21","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bab2ac30-c835-4ecd-96bc-27157d7aa3be","name":"bab2ac30-c835-4ecd-96bc-27157d7aa3be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84a7b5b5-20ae-4ce6-97aa-ab04171d8b21","name":"84a7b5b5-20ae-4ce6-97aa-ab04171d8b21","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bab2ac30-c835-4ecd-96bc-27157d7aa3be","path":"sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"147f2087-0542-4803-98c7-8a60024455c8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84a7b5b5-20ae-4ce6-97aa-ab04171d8b21","path":"sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6dd4a812-1889-4907-8903-6fd2b0b91f00","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bab2ac30-c835-4ecd-96bc-27157d7aa3be","path":"sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"147f2087-0542-4803-98c7-8a60024455c8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84a7b5b5-20ae-4ce6-97aa-ab04171d8b21","path":"sprites/spr_bionics_arm_2/spr_bionics_arm_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6dd4a812-1889-4907-8903-6fd2b0b91f00","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bionics_eye/spr_bionics_eye.yy b/sprites/spr_bionics_eye/spr_bionics_eye.yy index 43396fbe4f..d890e57aeb 100644 --- a/sprites/spr_bionics_eye/spr_bionics_eye.yy +++ b/sprites/spr_bionics_eye/spr_bionics_eye.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_eye", "bboxMode":0, "bbox_bottom":39, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c4118479-ad65-4797-9dc7-4bd95085c46f","name":"c4118479-ad65-4797-9dc7-4bd95085c46f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"232f1278-69c8-4504-9f7e-4c192ac2f04c","name":"232f1278-69c8-4504-9f7e-4c192ac2f04c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4118479-ad65-4797-9dc7-4bd95085c46f","name":"c4118479-ad65-4797-9dc7-4bd95085c46f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"232f1278-69c8-4504-9f7e-4c192ac2f04c","name":"232f1278-69c8-4504-9f7e-4c192ac2f04c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4118479-ad65-4797-9dc7-4bd95085c46f","path":"sprites/spr_bionics_eye/spr_bionics_eye.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4595b332-c57a-4482-a884-d1a6ad5806bf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"232f1278-69c8-4504-9f7e-4c192ac2f04c","path":"sprites/spr_bionics_eye/spr_bionics_eye.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e8ba3139-eb69-4a04-9836-dc377c2636e9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4118479-ad65-4797-9dc7-4bd95085c46f","path":"sprites/spr_bionics_eye/spr_bionics_eye.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4595b332-c57a-4482-a884-d1a6ad5806bf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"232f1278-69c8-4504-9f7e-4c192ac2f04c","path":"sprites/spr_bionics_eye/spr_bionics_eye.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e8ba3139-eb69-4a04-9836-dc377c2636e9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bionics_hand/spr_bionics_hand.yy b/sprites/spr_bionics_hand/spr_bionics_hand.yy index 1c02cba130..13d8a91eff 100644 --- a/sprites/spr_bionics_hand/spr_bionics_hand.yy +++ b/sprites/spr_bionics_hand/spr_bionics_hand.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_hand", "bboxMode":0, "bbox_bottom":125, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"13bc6f12-bba8-46c4-ab50-4dd56958c339","name":"13bc6f12-bba8-46c4-ab50-4dd56958c339","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"524c80bc-1e15-469e-9b11-4bd1d380f832","name":"524c80bc-1e15-469e-9b11-4bd1d380f832","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3251dc9b-140d-4210-81f0-08269c9ee883","name":"3251dc9b-140d-4210-81f0-08269c9ee883","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c09d4ac8-a76f-4774-9dbf-8875bf53357c","name":"c09d4ac8-a76f-4774-9dbf-8875bf53357c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"13bc6f12-bba8-46c4-ab50-4dd56958c339","name":"13bc6f12-bba8-46c4-ab50-4dd56958c339","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"524c80bc-1e15-469e-9b11-4bd1d380f832","name":"524c80bc-1e15-469e-9b11-4bd1d380f832","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3251dc9b-140d-4210-81f0-08269c9ee883","name":"3251dc9b-140d-4210-81f0-08269c9ee883","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c09d4ac8-a76f-4774-9dbf-8875bf53357c","name":"c09d4ac8-a76f-4774-9dbf-8875bf53357c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"13bc6f12-bba8-46c4-ab50-4dd56958c339","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b5fb66c1-2f70-48d8-900b-b6b549811246","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"524c80bc-1e15-469e-9b11-4bd1d380f832","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f3ca57d-c1de-4060-aeb4-275750b6a67a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3251dc9b-140d-4210-81f0-08269c9ee883","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cdb2fb2c-def4-4dd8-8e26-1e9bf1cbe534","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c09d4ac8-a76f-4774-9dbf-8875bf53357c","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9a492e7-f52c-494d-b84c-492208d0a6de","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"13bc6f12-bba8-46c4-ab50-4dd56958c339","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b5fb66c1-2f70-48d8-900b-b6b549811246","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"524c80bc-1e15-469e-9b11-4bd1d380f832","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f3ca57d-c1de-4060-aeb4-275750b6a67a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3251dc9b-140d-4210-81f0-08269c9ee883","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cdb2fb2c-def4-4dd8-8e26-1e9bf1cbe534","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c09d4ac8-a76f-4774-9dbf-8875bf53357c","path":"sprites/spr_bionics_hand/spr_bionics_hand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9a492e7-f52c-494d-b84c-492208d0a6de","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bionics_leg/spr_bionics_leg.yy b/sprites/spr_bionics_leg/spr_bionics_leg.yy index 4a186a9614..ec9566884b 100644 --- a/sprites/spr_bionics_leg/spr_bionics_leg.yy +++ b/sprites/spr_bionics_leg/spr_bionics_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_leg", "bboxMode":0, "bbox_bottom":220, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2b6a12b6-8f7f-4f99-93ca-e45b7b7d9f87","name":"2b6a12b6-8f7f-4f99-93ca-e45b7b7d9f87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"037b7aa6-3db4-46e2-9268-9dd87fd7170f","name":"037b7aa6-3db4-46e2-9268-9dd87fd7170f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fcf2c4da-a1bf-4ed3-97ec-3c104e8d26e8","name":"fcf2c4da-a1bf-4ed3-97ec-3c104e8d26e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"05cfd13f-fb2b-476c-aaaf-198e5b14a328","name":"05cfd13f-fb2b-476c-aaaf-198e5b14a328","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b6a12b6-8f7f-4f99-93ca-e45b7b7d9f87","name":"2b6a12b6-8f7f-4f99-93ca-e45b7b7d9f87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"037b7aa6-3db4-46e2-9268-9dd87fd7170f","name":"037b7aa6-3db4-46e2-9268-9dd87fd7170f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fcf2c4da-a1bf-4ed3-97ec-3c104e8d26e8","name":"fcf2c4da-a1bf-4ed3-97ec-3c104e8d26e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05cfd13f-fb2b-476c-aaaf-198e5b14a328","name":"05cfd13f-fb2b-476c-aaaf-198e5b14a328","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b6a12b6-8f7f-4f99-93ca-e45b7b7d9f87","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ab1a0e3-0e69-498b-b0c2-7a6f01a212cf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"037b7aa6-3db4-46e2-9268-9dd87fd7170f","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b7625488-b76b-470f-849d-aea986f91ce5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcf2c4da-a1bf-4ed3-97ec-3c104e8d26e8","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"76192087-4067-4351-a0e7-5c820764bff6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05cfd13f-fb2b-476c-aaaf-198e5b14a328","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c28eae0-67f3-4379-847c-4fdaf6168b58","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b6a12b6-8f7f-4f99-93ca-e45b7b7d9f87","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ab1a0e3-0e69-498b-b0c2-7a6f01a212cf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"037b7aa6-3db4-46e2-9268-9dd87fd7170f","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b7625488-b76b-470f-849d-aea986f91ce5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcf2c4da-a1bf-4ed3-97ec-3c104e8d26e8","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76192087-4067-4351-a0e7-5c820764bff6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05cfd13f-fb2b-476c-aaaf-198e5b14a328","path":"sprites/spr_bionics_leg/spr_bionics_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c28eae0-67f3-4379-847c-4fdaf6168b58","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy b/sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy index 93b21d99cc..e7c3294ac6 100644 --- a/sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy +++ b/sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_leg_2", "bboxMode":0, "bbox_bottom":212, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"60344010-666c-4587-8df7-3a7b00650211","name":"60344010-666c-4587-8df7-3a7b00650211","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3eda6fcd-5322-48bd-a288-7a10c092106d","name":"3eda6fcd-5322-48bd-a288-7a10c092106d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c017214-77b0-4045-82a3-7f4f38b750dc","name":"2c017214-77b0-4045-82a3-7f4f38b750dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8bce95c-eb80-4f7b-90e4-fb0ca15fdf45","name":"e8bce95c-eb80-4f7b-90e4-fb0ca15fdf45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"60344010-666c-4587-8df7-3a7b00650211","name":"60344010-666c-4587-8df7-3a7b00650211","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3eda6fcd-5322-48bd-a288-7a10c092106d","name":"3eda6fcd-5322-48bd-a288-7a10c092106d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c017214-77b0-4045-82a3-7f4f38b750dc","name":"2c017214-77b0-4045-82a3-7f4f38b750dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8bce95c-eb80-4f7b-90e4-fb0ca15fdf45","name":"e8bce95c-eb80-4f7b-90e4-fb0ca15fdf45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"60344010-666c-4587-8df7-3a7b00650211","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f7862ff-d90c-486b-a1ea-580889f2e702","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3eda6fcd-5322-48bd-a288-7a10c092106d","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"59645d06-f0ba-4d6a-bd64-c870a41a5ed9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c017214-77b0-4045-82a3-7f4f38b750dc","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f67e883-b80f-45b5-88f9-efa0ba50734c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8bce95c-eb80-4f7b-90e4-fb0ca15fdf45","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"df5f15df-c503-4f47-a424-f2230c7190bf","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"60344010-666c-4587-8df7-3a7b00650211","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f7862ff-d90c-486b-a1ea-580889f2e702","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3eda6fcd-5322-48bd-a288-7a10c092106d","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"59645d06-f0ba-4d6a-bd64-c870a41a5ed9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c017214-77b0-4045-82a3-7f4f38b750dc","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f67e883-b80f-45b5-88f9-efa0ba50734c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8bce95c-eb80-4f7b-90e4-fb0ca15fdf45","path":"sprites/spr_bionics_leg_2/spr_bionics_leg_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df5f15df-c503-4f47-a424-f2230c7190bf","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy b/sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy index 72549cc9cb..94b80688fa 100644 --- a/sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy +++ b/sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bionics_leg_3", "bboxMode":0, "bbox_bottom":220, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb567c2d-04fc-42a7-bb87-f6e8146da773","name":"bb567c2d-04fc-42a7-bb87-f6e8146da773","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"890e2fc7-04e5-4e3d-97ac-186f06befa10","name":"890e2fc7-04e5-4e3d-97ac-186f06befa10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d997f30c-b766-4e52-864e-db00fa825f91","name":"d997f30c-b766-4e52-864e-db00fa825f91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb567c2d-04fc-42a7-bb87-f6e8146da773","name":"bb567c2d-04fc-42a7-bb87-f6e8146da773","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"890e2fc7-04e5-4e3d-97ac-186f06befa10","name":"890e2fc7-04e5-4e3d-97ac-186f06befa10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d997f30c-b766-4e52-864e-db00fa825f91","name":"d997f30c-b766-4e52-864e-db00fa825f91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c7b887ab-6c36-4a5a-9cc4-6fdc73de936d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb567c2d-04fc-42a7-bb87-f6e8146da773","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0b074909-58d0-49b2-8d3b-3d8acb2ef00d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"890e2fc7-04e5-4e3d-97ac-186f06befa10","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e6711864-48f4-4b55-8517-81694b5cb9c5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d997f30c-b766-4e52-864e-db00fa825f91","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"74663002-2056-4f5e-bb5d-27715081c24d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4c6abe2-0da6-47f8-ac18-5323c3571f34","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c7b887ab-6c36-4a5a-9cc4-6fdc73de936d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb567c2d-04fc-42a7-bb87-f6e8146da773","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b074909-58d0-49b2-8d3b-3d8acb2ef00d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"890e2fc7-04e5-4e3d-97ac-186f06befa10","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e6711864-48f4-4b55-8517-81694b5cb9c5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d997f30c-b766-4e52-864e-db00fa825f91","path":"sprites/spr_bionics_leg_3/spr_bionics_leg_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"74663002-2056-4f5e-bb5d-27715081c24d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_blank/bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4.png b/sprites/spr_blank/bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4.png new file mode 100644 index 0000000000..f9de873a62 Binary files /dev/null and b/sprites/spr_blank/bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4.png differ diff --git a/sprites/spr_blank/layers/bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4/1b6c16d6-080f-4ab6-96e2-f5318628c178.png b/sprites/spr_blank/layers/bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4/1b6c16d6-080f-4ab6-96e2-f5318628c178.png new file mode 100644 index 0000000000..f9de873a62 Binary files /dev/null and b/sprites/spr_blank/layers/bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4/1b6c16d6-080f-4ab6-96e2-f5318628c178.png differ diff --git a/sprites/spr_blank/spr_blank.yy b/sprites/spr_blank/spr_blank.yy new file mode 100644 index 0000000000..32f634c19f --- /dev/null +++ b/sprites/spr_blank/spr_blank.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_blank", + "bboxMode":0, + "bbox_bottom":0, + "bbox_left":0, + "bbox_right":0, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4","name":"bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":64, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"1b6c16d6-080f-4ab6-96e2-f5318628c178","blendMode":0,"displayName":"default","isLocked":false,"name":"1b6c16d6-080f-4ab6-96e2-f5318628c178","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_blank", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"Sprites", + "path":"folders/Sprites.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_blank", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_blank", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":64.0, + "seqWidth":64.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfc59ee2-c8b5-4e18-9d19-92ee0b8805a4","path":"sprites/spr_blank/spr_blank.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"01fdc18f-a97b-4a62-9359-98655fe497a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":64, +} \ No newline at end of file diff --git a/sprites/spr_blog/spr_blog.yy b/sprites/spr_blog/spr_blog.yy index 78ac8d53f3..dda850d0cb 100644 --- a/sprites/spr_blog/spr_blog.yy +++ b/sprites/spr_blog/spr_blog.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_blog", "bboxMode":0, "bbox_bottom":30, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c21a34a6-d266-489b-b6a0-0c679cf27c53","name":"c21a34a6-d266-489b-b6a0-0c679cf27c53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"535cb6f7-000e-4721-b110-366ed91586fd","name":"535cb6f7-000e-4721-b110-366ed91586fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1737e307-e897-4a65-b4ff-3850b60e5c0f","name":"1737e307-e897-4a65-b4ff-3850b60e5c0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5c1dd916-65c6-44a6-8216-c61a794efc5f","name":"5c1dd916-65c6-44a6-8216-c61a794efc5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af7d273a-ba8d-42e2-83aa-5765bdc967cd","name":"af7d273a-ba8d-42e2-83aa-5765bdc967cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e75f6379-f9ab-4772-8498-c4af5688e3f3","name":"e75f6379-f9ab-4772-8498-c4af5688e3f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c21a34a6-d266-489b-b6a0-0c679cf27c53","name":"c21a34a6-d266-489b-b6a0-0c679cf27c53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"535cb6f7-000e-4721-b110-366ed91586fd","name":"535cb6f7-000e-4721-b110-366ed91586fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1737e307-e897-4a65-b4ff-3850b60e5c0f","name":"1737e307-e897-4a65-b4ff-3850b60e5c0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c1dd916-65c6-44a6-8216-c61a794efc5f","name":"5c1dd916-65c6-44a6-8216-c61a794efc5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af7d273a-ba8d-42e2-83aa-5765bdc967cd","name":"af7d273a-ba8d-42e2-83aa-5765bdc967cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e75f6379-f9ab-4772-8498-c4af5688e3f3","name":"e75f6379-f9ab-4772-8498-c4af5688e3f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,6 +68,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":31.0, + "seqWidth":80.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_bolt/spr_bolt.yy b/sprites/spr_bolt/spr_bolt.yy index e6fc210f27..ce1992edda 100644 --- a/sprites/spr_bolt/spr_bolt.yy +++ b/sprites/spr_bolt/spr_bolt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bolt", "bboxMode":0, "bbox_bottom":2, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8c00fc9d-fed0-48e6-a2d5-417aea46f55c","name":"8c00fc9d-fed0-48e6-a2d5-417aea46f55c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c00fc9d-fed0-48e6-a2d5-417aea46f55c","name":"8c00fc9d-fed0-48e6-a2d5-417aea46f55c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c00fc9d-fed0-48e6-a2d5-417aea46f55c","path":"sprites/spr_bolt/spr_bolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea9cdec0-668a-4734-bc7f-753703846553","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c00fc9d-fed0-48e6-a2d5-417aea46f55c","path":"sprites/spr_bolt/spr_bolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea9cdec0-668a-4734-bc7f-753703846553","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy b/sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy index 87480ad35a..73db77ccf8 100644 --- a/sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy +++ b/sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bonding_studs_left", "bboxMode":0, "bbox_bottom":75, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34a5702d-932b-4320-bbce-57b6f082d8a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_bonding_studs_left/spr_bonding_studs_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34a5702d-932b-4320-bbce-57b6f082d8a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bonding_studs_right/spr_bonding_studs_right.yy b/sprites/spr_bonding_studs_right/spr_bonding_studs_right.yy index 6b808a95a5..dc911f05c4 100644 --- a/sprites/spr_bonding_studs_right/spr_bonding_studs_right.yy +++ b/sprites/spr_bonding_studs_right/spr_bonding_studs_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bonding_studs_right", "bboxMode":0, "bbox_bottom":75, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_bonding_studs_right/spr_bonding_studs_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44c9fff8-d58f-4c90-8b67-a07f3503bcbc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_bonding_studs_right/spr_bonding_studs_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44c9fff8-d58f-4c90-8b67-a07f3503bcbc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_build_tiny/spr_build_tiny.yy b/sprites/spr_build_tiny/spr_build_tiny.yy index 4b0188c8b3..3e89d9e539 100644 --- a/sprites/spr_build_tiny/spr_build_tiny.yy +++ b/sprites/spr_build_tiny/spr_build_tiny.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_build_tiny", "bboxMode":0, "bbox_bottom":11, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f686ba29-c495-47b6-96c4-6b5468d59af7","name":"f686ba29-c495-47b6-96c4-6b5468d59af7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f686ba29-c495-47b6-96c4-6b5468d59af7","name":"f686ba29-c495-47b6-96c4-6b5468d59af7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f686ba29-c495-47b6-96c4-6b5468d59af7","path":"sprites/spr_build_tiny/spr_build_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aac88065-ea52-440a-b15d-0d3ef7afe71d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f686ba29-c495-47b6-96c4-6b5468d59af7","path":"sprites/spr_build_tiny/spr_build_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aac88065-ea52-440a-b15d-0d3ef7afe71d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_build_tiny2/spr_build_tiny2.yy b/sprites/spr_build_tiny2/spr_build_tiny2.yy index 970a51d785..0e47262850 100644 --- a/sprites/spr_build_tiny2/spr_build_tiny2.yy +++ b/sprites/spr_build_tiny2/spr_build_tiny2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_build_tiny2", "bboxMode":0, "bbox_bottom":8, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9d1a8d8b-70be-47f6-837a-efd47e9c2ec6","name":"9d1a8d8b-70be-47f6-837a-efd47e9c2ec6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9d1a8d8b-70be-47f6-837a-efd47e9c2ec6","name":"9d1a8d8b-70be-47f6-837a-efd47e9c2ec6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d1a8d8b-70be-47f6-837a-efd47e9c2ec6","path":"sprites/spr_build_tiny2/spr_build_tiny2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"410d66a0-8e76-417d-9ea2-f2fe32992cd3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d1a8d8b-70be-47f6-837a-efd47e9c2ec6","path":"sprites/spr_build_tiny2/spr_build_tiny2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"410d66a0-8e76-417d-9ea2-f2fe32992cd3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_bullet/spr_bullet.yy b/sprites/spr_bullet/spr_bullet.yy index 1191ea3fbe..42497f9c7e 100644 --- a/sprites/spr_bullet/spr_bullet.yy +++ b/sprites/spr_bullet/spr_bullet.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_bullet", "bboxMode":0, "bbox_bottom":2, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fe27e772-3e3f-4bd9-be7a-3a79d13d2b5d","name":"fe27e772-3e3f-4bd9-be7a-3a79d13d2b5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6de1eedf-abcf-424b-93fe-14592661e895","name":"6de1eedf-abcf-424b-93fe-14592661e895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eff37c53-b20a-4fcb-aad0-818a35b97ba6","name":"eff37c53-b20a-4fcb-aad0-818a35b97ba6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fe27e772-3e3f-4bd9-be7a-3a79d13d2b5d","name":"fe27e772-3e3f-4bd9-be7a-3a79d13d2b5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6de1eedf-abcf-424b-93fe-14592661e895","name":"6de1eedf-abcf-424b-93fe-14592661e895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eff37c53-b20a-4fcb-aad0-818a35b97ba6","name":"eff37c53-b20a-4fcb-aad0-818a35b97ba6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe27e772-3e3f-4bd9-be7a-3a79d13d2b5d","path":"sprites/spr_bullet/spr_bullet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45638394-e5b8-4100-b8c3-1634e9bc5c81","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6de1eedf-abcf-424b-93fe-14592661e895","path":"sprites/spr_bullet/spr_bullet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a649a5af-7279-4169-b998-8fb3c780fd6d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eff37c53-b20a-4fcb-aad0-818a35b97ba6","path":"sprites/spr_bullet/spr_bullet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a20e31ba-472e-430d-9792-a2c545e10bbc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe27e772-3e3f-4bd9-be7a-3a79d13d2b5d","path":"sprites/spr_bullet/spr_bullet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45638394-e5b8-4100-b8c3-1634e9bc5c81","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6de1eedf-abcf-424b-93fe-14592661e895","path":"sprites/spr_bullet/spr_bullet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a649a5af-7279-4169-b998-8fb3c780fd6d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eff37c53-b20a-4fcb-aad0-818a35b97ba6","path":"sprites/spr_bullet/spr_bullet.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a20e31ba-472e-430d-9792-a2c545e10bbc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_buy_tiny/f686ba29-c495-47b6-96c4-6b5468d59af7.png b/sprites/spr_buy_tiny/f686ba29-c495-47b6-96c4-6b5468d59af7.png new file mode 100644 index 0000000000..b775f77840 Binary files /dev/null and b/sprites/spr_buy_tiny/f686ba29-c495-47b6-96c4-6b5468d59af7.png differ diff --git a/sprites/spr_buy_tiny/layers/f686ba29-c495-47b6-96c4-6b5468d59af7/d98ba5e0-da02-48fb-8024-c2401b6f0f84.png b/sprites/spr_buy_tiny/layers/f686ba29-c495-47b6-96c4-6b5468d59af7/d98ba5e0-da02-48fb-8024-c2401b6f0f84.png new file mode 100644 index 0000000000..94bdb6ed96 Binary files /dev/null and b/sprites/spr_buy_tiny/layers/f686ba29-c495-47b6-96c4-6b5468d59af7/d98ba5e0-da02-48fb-8024-c2401b6f0f84.png differ diff --git a/sprites/spr_buy_tiny/spr_buy_tiny.yy b/sprites/spr_buy_tiny/spr_buy_tiny.yy new file mode 100644 index 0000000000..37bb71e84e --- /dev/null +++ b/sprites/spr_buy_tiny/spr_buy_tiny.yy @@ -0,0 +1,91 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_buy_tiny", + "bboxMode":0, + "bbox_bottom":11, + "bbox_left":0, + "bbox_right":44, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"f686ba29-c495-47b6-96c4-6b5468d59af7","name":"f686ba29-c495-47b6-96c4-6b5468d59af7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":12, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"d98ba5e0-da02-48fb-8024-c2401b6f0f84","blendMode":0,"displayName":"default","isLocked":false,"name":"d98ba5e0-da02-48fb-8024-c2401b6f0f84","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_buy_tiny", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"UI", + "path":"folders/Sprites/UI.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f686ba29-c495-47b6-96c4-6b5468d59af7","path":"sprites/spr_buy_tiny/spr_buy_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aac88065-ea52-440a-b15d-0d3ef7afe71d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":{ + "x":0.0, + "y":0.0, + }, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":45, +} \ No newline at end of file diff --git a/sprites/spr_cancel_small/spr_cancel_small.yy b/sprites/spr_cancel_small/spr_cancel_small.yy index 9dc9d44db6..9a8a06aa5f 100644 --- a/sprites/spr_cancel_small/spr_cancel_small.yy +++ b/sprites/spr_cancel_small/spr_cancel_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cancel_small", "bboxMode":0, "bbox_bottom":13, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"84a93b9a-ecde-4873-9a50-4138e49231ca","name":"84a93b9a-ecde-4873-9a50-4138e49231ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84a93b9a-ecde-4873-9a50-4138e49231ca","name":"84a93b9a-ecde-4873-9a50-4138e49231ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84a93b9a-ecde-4873-9a50-4138e49231ca","path":"sprites/spr_cancel_small/spr_cancel_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d1749b9-d177-422d-9166-d1a804565eff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84a93b9a-ecde-4873-9a50-4138e49231ca","path":"sprites/spr_cancel_small/spr_cancel_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d1749b9-d177-422d-9166-d1a804565eff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_cannon/spr_cannon.yy b/sprites/spr_cannon/spr_cannon.yy index 0310106cd0..bd808ff3a3 100644 --- a/sprites/spr_cannon/spr_cannon.yy +++ b/sprites/spr_cannon/spr_cannon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cannon", "bboxMode":0, "bbox_bottom":13, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7b7fcd5f-3ad7-487a-a68b-e4b1052ff451","name":"7b7fcd5f-3ad7-487a-a68b-e4b1052ff451","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b7fcd5f-3ad7-487a-a68b-e4b1052ff451","name":"7b7fcd5f-3ad7-487a-a68b-e4b1052ff451","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b7fcd5f-3ad7-487a-a68b-e4b1052ff451","path":"sprites/spr_cannon/spr_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c4311aff-cbe8-42e9-ac4c-135ec61e9da0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b7fcd5f-3ad7-487a-a68b-e4b1052ff451","path":"sprites/spr_cannon/spr_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c4311aff-cbe8-42e9-ac4c-135ec61e9da0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_carrion_breath/spr_carrion_breath.yy b/sprites/spr_carrion_breath/spr_carrion_breath.yy index b57ad3630a..cf693cf2aa 100644 --- a/sprites/spr_carrion_breath/spr_carrion_breath.yy +++ b/sprites/spr_carrion_breath/spr_carrion_breath.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_carrion_breath", "bboxMode":2, "bbox_bottom":29, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6750780f-1054-460d-8534-ef05f39652a5","name":"6750780f-1054-460d-8534-ef05f39652a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5d93c6e-321c-4b45-8c74-27062a51f937","name":"d5d93c6e-321c-4b45-8c74-27062a51f937","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"edb5de84-7769-44fc-a7a2-b69ace679703","name":"edb5de84-7769-44fc-a7a2-b69ace679703","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"23bb4ffb-9c50-4874-af96-0db2f84173f0","name":"23bb4ffb-9c50-4874-af96-0db2f84173f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a480e5a9-b2d4-4187-bdba-78339048d27d","name":"a480e5a9-b2d4-4187-bdba-78339048d27d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6fbe2862-9270-452c-af95-3885be5369b3","name":"6fbe2862-9270-452c-af95-3885be5369b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6bac9509-a9b3-4b5f-9358-51155c2ec9ef","name":"6bac9509-a9b3-4b5f-9358-51155c2ec9ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b5f9d8cd-db5e-48be-8b21-f93f34c7181b","name":"b5f9d8cd-db5e-48be-8b21-f93f34c7181b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6750780f-1054-460d-8534-ef05f39652a5","name":"6750780f-1054-460d-8534-ef05f39652a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5d93c6e-321c-4b45-8c74-27062a51f937","name":"d5d93c6e-321c-4b45-8c74-27062a51f937","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"edb5de84-7769-44fc-a7a2-b69ace679703","name":"edb5de84-7769-44fc-a7a2-b69ace679703","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"23bb4ffb-9c50-4874-af96-0db2f84173f0","name":"23bb4ffb-9c50-4874-af96-0db2f84173f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a480e5a9-b2d4-4187-bdba-78339048d27d","name":"a480e5a9-b2d4-4187-bdba-78339048d27d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6fbe2862-9270-452c-af95-3885be5369b3","name":"6fbe2862-9270-452c-af95-3885be5369b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6bac9509-a9b3-4b5f-9358-51155c2ec9ef","name":"6bac9509-a9b3-4b5f-9358-51155c2ec9ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b5f9d8cd-db5e-48be-8b21-f93f34c7181b","name":"b5f9d8cd-db5e-48be-8b21-f93f34c7181b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,30 +77,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6750780f-1054-460d-8534-ef05f39652a5","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97ea9318-53ef-49e0-89c5-c2ea9e886dc8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5d93c6e-321c-4b45-8c74-27062a51f937","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"345f2606-0535-4182-8706-2014078efd82","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"edb5de84-7769-44fc-a7a2-b69ace679703","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2906b15e-3441-47bc-9ead-01a0de054fa7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"23bb4ffb-9c50-4874-af96-0db2f84173f0","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"27171884-cf39-4f0f-9a51-96155167b8b3","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480e5a9-b2d4-4187-bdba-78339048d27d","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d57c8a1-baa7-4e00-95c0-6e4c17d377b3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6fbe2862-9270-452c-af95-3885be5369b3","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d591bf65-f35d-48b5-b870-798b67ff028a","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6bac9509-a9b3-4b5f-9358-51155c2ec9ef","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d29850b-8b6a-45c1-9a4b-7e31c63c4c9e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5f9d8cd-db5e-48be-8b21-f93f34c7181b","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7486d265-51e5-4c9d-a0f7-51c056f4dec3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6750780f-1054-460d-8534-ef05f39652a5","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97ea9318-53ef-49e0-89c5-c2ea9e886dc8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5d93c6e-321c-4b45-8c74-27062a51f937","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"345f2606-0535-4182-8706-2014078efd82","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"edb5de84-7769-44fc-a7a2-b69ace679703","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2906b15e-3441-47bc-9ead-01a0de054fa7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"23bb4ffb-9c50-4874-af96-0db2f84173f0","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"27171884-cf39-4f0f-9a51-96155167b8b3","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480e5a9-b2d4-4187-bdba-78339048d27d","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d57c8a1-baa7-4e00-95c0-6e4c17d377b3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6fbe2862-9270-452c-af95-3885be5369b3","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d591bf65-f35d-48b5-b870-798b67ff028a","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6bac9509-a9b3-4b5f-9358-51155c2ec9ef","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d29850b-8b6a-45c1-9a4b-7e31c63c4c9e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5f9d8cd-db5e-48be-8b21-f93f34c7181b","path":"sprites/spr_carrion_breath/spr_carrion_breath.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7486d265-51e5-4c9d-a0f7-51c056f4dec3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_cata_belt/0fe6bbd7-15a9-4a87-9edd-9a8370587e1e.png b/sprites/spr_cata_belt/0fe6bbd7-15a9-4a87-9edd-9a8370587e1e.png new file mode 100644 index 0000000000..6d26ac3387 Binary files /dev/null and b/sprites/spr_cata_belt/0fe6bbd7-15a9-4a87-9edd-9a8370587e1e.png differ diff --git a/sprites/spr_cata_belt/layers/0fe6bbd7-15a9-4a87-9edd-9a8370587e1e/4f697124-68fb-4fd2-9223-aaf62235ab77.png b/sprites/spr_cata_belt/layers/0fe6bbd7-15a9-4a87-9edd-9a8370587e1e/4f697124-68fb-4fd2-9223-aaf62235ab77.png new file mode 100644 index 0000000000..6d26ac3387 Binary files /dev/null and b/sprites/spr_cata_belt/layers/0fe6bbd7-15a9-4a87-9edd-9a8370587e1e/4f697124-68fb-4fd2-9223-aaf62235ab77.png differ diff --git a/sprites/spr_cata_belt/spr_cata_belt.yy b/sprites/spr_cata_belt/spr_cata_belt.yy new file mode 100644 index 0000000000..ff32a3ce58 --- /dev/null +++ b/sprites/spr_cata_belt/spr_cata_belt.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_belt", + "bboxMode":0, + "bbox_bottom":112, + "bbox_left":59, + "bbox_right":111, + "bbox_top":97, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"0fe6bbd7-15a9-4a87-9edd-9a8370587e1e","name":"0fe6bbd7-15a9-4a87-9edd-9a8370587e1e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"4f697124-68fb-4fd2-9223-aaf62235ab77","blendMode":0,"displayName":"default","isLocked":false,"name":"4f697124-68fb-4fd2-9223-aaf62235ab77","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_belt", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_belt", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_belt", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0fe6bbd7-15a9-4a87-9edd-9a8370587e1e","path":"sprites/spr_cata_belt/spr_cata_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"65692ebc-8c79-4a8e-9c99-8784ebfb2a34","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_complex/2583c501-d4e3-4285-b210-347ae21d5657.png b/sprites/spr_cata_complex/2583c501-d4e3-4285-b210-347ae21d5657.png new file mode 100644 index 0000000000..f8b6ff4184 Binary files /dev/null and b/sprites/spr_cata_complex/2583c501-d4e3-4285-b210-347ae21d5657.png differ diff --git a/sprites/spr_cata_complex/layers/2583c501-d4e3-4285-b210-347ae21d5657/1c6df36d-e885-4b8f-a400-731ba5f7a89f.png b/sprites/spr_cata_complex/layers/2583c501-d4e3-4285-b210-347ae21d5657/1c6df36d-e885-4b8f-a400-731ba5f7a89f.png new file mode 100644 index 0000000000..f8b6ff4184 Binary files /dev/null and b/sprites/spr_cata_complex/layers/2583c501-d4e3-4285-b210-347ae21d5657/1c6df36d-e885-4b8f-a400-731ba5f7a89f.png differ diff --git a/sprites/spr_cata_complex/spr_cata_complex.yy b/sprites/spr_cata_complex/spr_cata_complex.yy new file mode 100644 index 0000000000..2b3d81b69e --- /dev/null +++ b/sprites/spr_cata_complex/spr_cata_complex.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_complex", + "bboxMode":0, + "bbox_bottom":169, + "bbox_left":14, + "bbox_right":156, + "bbox_top":6, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"2583c501-d4e3-4285-b210-347ae21d5657","name":"2583c501-d4e3-4285-b210-347ae21d5657","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"1c6df36d-e885-4b8f-a400-731ba5f7a89f","blendMode":0,"displayName":"default","isLocked":false,"name":"1c6df36d-e885-4b8f-a400-731ba5f7a89f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_complex", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_complex", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_complex", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2583c501-d4e3-4285-b210-347ae21d5657","path":"sprites/spr_cata_complex/spr_cata_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d4d335e1-2dbe-493a-ac0e-28104bb3d6e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_cowl_trim/eacd6626-c655-4103-80b3-501d635dbecc.png b/sprites/spr_cata_cowl_trim/eacd6626-c655-4103-80b3-501d635dbecc.png new file mode 100644 index 0000000000..57eeb84234 Binary files /dev/null and b/sprites/spr_cata_cowl_trim/eacd6626-c655-4103-80b3-501d635dbecc.png differ diff --git a/sprites/spr_cata_cowl_trim/layers/eacd6626-c655-4103-80b3-501d635dbecc/19bbd962-0cda-4b64-9afc-f12938f1660e.png b/sprites/spr_cata_cowl_trim/layers/eacd6626-c655-4103-80b3-501d635dbecc/19bbd962-0cda-4b64-9afc-f12938f1660e.png new file mode 100644 index 0000000000..57eeb84234 Binary files /dev/null and b/sprites/spr_cata_cowl_trim/layers/eacd6626-c655-4103-80b3-501d635dbecc/19bbd962-0cda-4b64-9afc-f12938f1660e.png differ diff --git a/sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy b/sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy new file mode 100644 index 0000000000..f1f9293844 --- /dev/null +++ b/sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_cowl_trim", + "bboxMode":0, + "bbox_bottom":43, + "bbox_left":57, + "bbox_right":113, + "bbox_top":6, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"eacd6626-c655-4103-80b3-501d635dbecc","name":"eacd6626-c655-4103-80b3-501d635dbecc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"19bbd962-0cda-4b64-9afc-f12938f1660e","blendMode":0,"displayName":"default","isLocked":false,"name":"19bbd962-0cda-4b64-9afc-f12938f1660e","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_cowl_trim", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_cowl_trim", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_cowl_trim", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eacd6626-c655-4103-80b3-501d635dbecc","path":"sprites/spr_cata_cowl_trim/spr_cata_cowl_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"dd9d5e2a-e1f0-4998-93af-4d70aa530ab5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_cowl_trim_1/eacd6626-c655-4103-80b3-501d635dbecc.png b/sprites/spr_cata_cowl_trim_1/eacd6626-c655-4103-80b3-501d635dbecc.png new file mode 100644 index 0000000000..8d0e60d400 Binary files /dev/null and b/sprites/spr_cata_cowl_trim_1/eacd6626-c655-4103-80b3-501d635dbecc.png differ diff --git a/sprites/spr_cata_cowl_trim_1/layers/eacd6626-c655-4103-80b3-501d635dbecc/19bbd962-0cda-4b64-9afc-f12938f1660e.png b/sprites/spr_cata_cowl_trim_1/layers/eacd6626-c655-4103-80b3-501d635dbecc/19bbd962-0cda-4b64-9afc-f12938f1660e.png new file mode 100644 index 0000000000..8d0e60d400 Binary files /dev/null and b/sprites/spr_cata_cowl_trim_1/layers/eacd6626-c655-4103-80b3-501d635dbecc/19bbd962-0cda-4b64-9afc-f12938f1660e.png differ diff --git a/sprites/spr_cata_cowl_trim_1/spr_cata_cowl_trim_1.yy b/sprites/spr_cata_cowl_trim_1/spr_cata_cowl_trim_1.yy new file mode 100644 index 0000000000..7524737d02 --- /dev/null +++ b/sprites/spr_cata_cowl_trim_1/spr_cata_cowl_trim_1.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_cowl_trim_1", + "bboxMode":0, + "bbox_bottom":43, + "bbox_left":57, + "bbox_right":113, + "bbox_top":7, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"eacd6626-c655-4103-80b3-501d635dbecc","name":"eacd6626-c655-4103-80b3-501d635dbecc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"19bbd962-0cda-4b64-9afc-f12938f1660e","blendMode":0,"displayName":"default","isLocked":false,"name":"19bbd962-0cda-4b64-9afc-f12938f1660e","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_cowl_trim_1", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_cowl_trim", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_cowl_trim", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eacd6626-c655-4103-80b3-501d635dbecc","path":"sprites/spr_cata_cowl_trim_1/spr_cata_cowl_trim_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"dd9d5e2a-e1f0-4998-93af-4d70aa530ab5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_gorget/d14dc785-21d1-4e15-ad83-2b38fa9a79f7.png b/sprites/spr_cata_gorget/d14dc785-21d1-4e15-ad83-2b38fa9a79f7.png new file mode 100644 index 0000000000..513e7f4ddd Binary files /dev/null and b/sprites/spr_cata_gorget/d14dc785-21d1-4e15-ad83-2b38fa9a79f7.png differ diff --git a/sprites/spr_cata_gorget/layers/d14dc785-21d1-4e15-ad83-2b38fa9a79f7/fe0dd4fc-c973-4418-9c16-c69e04260f36.png b/sprites/spr_cata_gorget/layers/d14dc785-21d1-4e15-ad83-2b38fa9a79f7/fe0dd4fc-c973-4418-9c16-c69e04260f36.png new file mode 100644 index 0000000000..513e7f4ddd Binary files /dev/null and b/sprites/spr_cata_gorget/layers/d14dc785-21d1-4e15-ad83-2b38fa9a79f7/fe0dd4fc-c973-4418-9c16-c69e04260f36.png differ diff --git a/sprites/spr_cata_gorget/spr_cata_gorget.yy b/sprites/spr_cata_gorget/spr_cata_gorget.yy new file mode 100644 index 0000000000..9443230e1b --- /dev/null +++ b/sprites/spr_cata_gorget/spr_cata_gorget.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_gorget", + "bboxMode":0, + "bbox_bottom":71, + "bbox_left":56, + "bbox_right":114, + "bbox_top":39, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"d14dc785-21d1-4e15-ad83-2b38fa9a79f7","name":"d14dc785-21d1-4e15-ad83-2b38fa9a79f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"fe0dd4fc-c973-4418-9c16-c69e04260f36","blendMode":0,"displayName":"default","isLocked":false,"name":"fe0dd4fc-c973-4418-9c16-c69e04260f36","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_gorget", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_gorget", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_gorget", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d14dc785-21d1-4e15-ad83-2b38fa9a79f7","path":"sprites/spr_cata_gorget/spr_cata_gorget.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9025f767-32aa-41d1-b84d-9c8e405bc766","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_head/cc1bb055-3092-4530-9edd-694aca0796a7.png b/sprites/spr_cata_head/cc1bb055-3092-4530-9edd-694aca0796a7.png new file mode 100644 index 0000000000..739891140e Binary files /dev/null and b/sprites/spr_cata_head/cc1bb055-3092-4530-9edd-694aca0796a7.png differ diff --git a/sprites/spr_cata_head/df8d27d6-66e9-4750-b0dc-950fe74d3e9f.png b/sprites/spr_cata_head/df8d27d6-66e9-4750-b0dc-950fe74d3e9f.png new file mode 100644 index 0000000000..c169997e73 Binary files /dev/null and b/sprites/spr_cata_head/df8d27d6-66e9-4750-b0dc-950fe74d3e9f.png differ diff --git a/sprites/spr_cata_head/layers/cc1bb055-3092-4530-9edd-694aca0796a7/1875f065-a467-43e5-b1cb-779c58891acc.png b/sprites/spr_cata_head/layers/cc1bb055-3092-4530-9edd-694aca0796a7/1875f065-a467-43e5-b1cb-779c58891acc.png new file mode 100644 index 0000000000..739891140e Binary files /dev/null and b/sprites/spr_cata_head/layers/cc1bb055-3092-4530-9edd-694aca0796a7/1875f065-a467-43e5-b1cb-779c58891acc.png differ diff --git a/sprites/spr_cata_head/layers/df8d27d6-66e9-4750-b0dc-950fe74d3e9f/1875f065-a467-43e5-b1cb-779c58891acc.png b/sprites/spr_cata_head/layers/df8d27d6-66e9-4750-b0dc-950fe74d3e9f/1875f065-a467-43e5-b1cb-779c58891acc.png new file mode 100644 index 0000000000..c169997e73 Binary files /dev/null and b/sprites/spr_cata_head/layers/df8d27d6-66e9-4750-b0dc-950fe74d3e9f/1875f065-a467-43e5-b1cb-779c58891acc.png differ diff --git a/sprites/spr_cata_head/spr_cata_head.yy b/sprites/spr_cata_head/spr_cata_head.yy new file mode 100644 index 0000000000..e8bc23672f --- /dev/null +++ b/sprites/spr_cata_head/spr_cata_head.yy @@ -0,0 +1,96 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_head", + "bboxMode":0, + "bbox_bottom":38, + "bbox_left":67, + "bbox_right":103, + "bbox_top":14, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"cc1bb055-3092-4530-9edd-694aca0796a7","name":"cc1bb055-3092-4530-9edd-694aca0796a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df8d27d6-66e9-4750-b0dc-950fe74d3e9f","name":"df8d27d6-66e9-4750-b0dc-950fe74d3e9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"1875f065-a467-43e5-b1cb-779c58891acc","blendMode":0,"displayName":"default","isLocked":false,"name":"1875f065-a467-43e5-b1cb-779c58891acc","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_head", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_head", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_head", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cc1bb055-3092-4530-9edd-694aca0796a7","path":"sprites/spr_cata_head/spr_cata_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"069ee915-10c4-4346-a73b-1cf1afb569e8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df8d27d6-66e9-4750-b0dc-950fe74d3e9f","path":"sprites/spr_cata_head/spr_cata_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"eb49f865-1ead-49e0-8353-ad11bf319dda","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_heavy_toe_left/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f.png b/sprites/spr_cata_heavy_toe_left/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f.png new file mode 100644 index 0000000000..af06873a05 Binary files /dev/null and b/sprites/spr_cata_heavy_toe_left/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f.png differ diff --git a/sprites/spr_cata_heavy_toe_left/layers/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f/b190c650-f0be-4b86-9abb-b96698d6b9ef.png b/sprites/spr_cata_heavy_toe_left/layers/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f/b190c650-f0be-4b86-9abb-b96698d6b9ef.png new file mode 100644 index 0000000000..af06873a05 Binary files /dev/null and b/sprites/spr_cata_heavy_toe_left/layers/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f/b190c650-f0be-4b86-9abb-b96698d6b9ef.png differ diff --git a/sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy b/sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy new file mode 100644 index 0000000000..7ca1326d69 --- /dev/null +++ b/sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_heavy_toe_left", + "bboxMode":0, + "bbox_bottom":230, + "bbox_left":104, + "bbox_right":151, + "bbox_top":221, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"8bcf2914-6d8f-4dbe-bdee-bd24eba4637f","name":"8bcf2914-6d8f-4dbe-bdee-bd24eba4637f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"b190c650-f0be-4b86-9abb-b96698d6b9ef","blendMode":0,"displayName":"default","isLocked":false,"name":"b190c650-f0be-4b86-9abb-b96698d6b9ef","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_heavy_toe_left", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_heavy_toe_left", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_heavy_toe_left", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8bcf2914-6d8f-4dbe-bdee-bd24eba4637f","path":"sprites/spr_cata_heavy_toe_left/spr_cata_heavy_toe_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a8eb0e58-24d5-4dad-989b-5d0e545d216e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_heavy_toe_right/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f.png b/sprites/spr_cata_heavy_toe_right/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f.png new file mode 100644 index 0000000000..9a6c928a87 Binary files /dev/null and b/sprites/spr_cata_heavy_toe_right/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f.png differ diff --git a/sprites/spr_cata_heavy_toe_right/layers/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f/b190c650-f0be-4b86-9abb-b96698d6b9ef.png b/sprites/spr_cata_heavy_toe_right/layers/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f/b190c650-f0be-4b86-9abb-b96698d6b9ef.png new file mode 100644 index 0000000000..9a6c928a87 Binary files /dev/null and b/sprites/spr_cata_heavy_toe_right/layers/8bcf2914-6d8f-4dbe-bdee-bd24eba4637f/b190c650-f0be-4b86-9abb-b96698d6b9ef.png differ diff --git a/sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy b/sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy new file mode 100644 index 0000000000..f58b24d997 --- /dev/null +++ b/sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_heavy_toe_right", + "bboxMode":0, + "bbox_bottom":230, + "bbox_left":15, + "bbox_right":62, + "bbox_top":221, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"8bcf2914-6d8f-4dbe-bdee-bd24eba4637f","name":"8bcf2914-6d8f-4dbe-bdee-bd24eba4637f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"b190c650-f0be-4b86-9abb-b96698d6b9ef","blendMode":0,"displayName":"default","isLocked":false,"name":"b190c650-f0be-4b86-9abb-b96698d6b9ef","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_heavy_toe_right", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_heavy_toe_right", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_heavy_toe_right", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8bcf2914-6d8f-4dbe-bdee-bd24eba4637f","path":"sprites/spr_cata_heavy_toe_right/spr_cata_heavy_toe_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a8eb0e58-24d5-4dad-989b-5d0e545d216e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_left_arm/376c95d6-eabe-4c9b-b707-0d65fbbf0454.png b/sprites/spr_cata_left_arm/376c95d6-eabe-4c9b-b707-0d65fbbf0454.png new file mode 100644 index 0000000000..0baca51e9e Binary files /dev/null and b/sprites/spr_cata_left_arm/376c95d6-eabe-4c9b-b707-0d65fbbf0454.png differ diff --git a/sprites/spr_cata_left_arm/layers/376c95d6-eabe-4c9b-b707-0d65fbbf0454/97c3abbf-8ea9-4634-b6cd-e3687ebbebb5.png b/sprites/spr_cata_left_arm/layers/376c95d6-eabe-4c9b-b707-0d65fbbf0454/97c3abbf-8ea9-4634-b6cd-e3687ebbebb5.png new file mode 100644 index 0000000000..0baca51e9e Binary files /dev/null and b/sprites/spr_cata_left_arm/layers/376c95d6-eabe-4c9b-b707-0d65fbbf0454/97c3abbf-8ea9-4634-b6cd-e3687ebbebb5.png differ diff --git a/sprites/spr_cata_left_arm/spr_cata_left_arm.yy b/sprites/spr_cata_left_arm/spr_cata_left_arm.yy new file mode 100644 index 0000000000..c15011f2d9 --- /dev/null +++ b/sprites/spr_cata_left_arm/spr_cata_left_arm.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_left_arm", + "bboxMode":0, + "bbox_bottom":115, + "bbox_left":122, + "bbox_right":162, + "bbox_top":59, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"376c95d6-eabe-4c9b-b707-0d65fbbf0454","name":"376c95d6-eabe-4c9b-b707-0d65fbbf0454","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"97c3abbf-8ea9-4634-b6cd-e3687ebbebb5","blendMode":0,"displayName":"default","isLocked":false,"name":"97c3abbf-8ea9-4634-b6cd-e3687ebbebb5","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_left_arm", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_left_arm", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_left_arm", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"376c95d6-eabe-4c9b-b707-0d65fbbf0454","path":"sprites/spr_cata_left_arm/spr_cata_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e66bc47f-42d9-4c67-ada4-f9e8c4151c7d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_left_armtrim/1decac37-9470-4e2d-996d-51927189e93e.png b/sprites/spr_cata_left_armtrim/1decac37-9470-4e2d-996d-51927189e93e.png new file mode 100644 index 0000000000..e3d59895a8 Binary files /dev/null and b/sprites/spr_cata_left_armtrim/1decac37-9470-4e2d-996d-51927189e93e.png differ diff --git a/sprites/spr_cata_left_armtrim/layers/1decac37-9470-4e2d-996d-51927189e93e/fd443310-bc6c-42e5-a251-16624f2f84bf.png b/sprites/spr_cata_left_armtrim/layers/1decac37-9470-4e2d-996d-51927189e93e/fd443310-bc6c-42e5-a251-16624f2f84bf.png new file mode 100644 index 0000000000..e3d59895a8 Binary files /dev/null and b/sprites/spr_cata_left_armtrim/layers/1decac37-9470-4e2d-996d-51927189e93e/fd443310-bc6c-42e5-a251-16624f2f84bf.png differ diff --git a/sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy b/sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy new file mode 100644 index 0000000000..d012351b9c --- /dev/null +++ b/sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_left_armtrim", + "bboxMode":0, + "bbox_bottom":94, + "bbox_left":135, + "bbox_right":156, + "bbox_top":78, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"1decac37-9470-4e2d-996d-51927189e93e","name":"1decac37-9470-4e2d-996d-51927189e93e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"fd443310-bc6c-42e5-a251-16624f2f84bf","blendMode":0,"displayName":"default","isLocked":false,"name":"fd443310-bc6c-42e5-a251-16624f2f84bf","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_left_armtrim", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_left_armtrim", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_left_armtrim", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1decac37-9470-4e2d-996d-51927189e93e","path":"sprites/spr_cata_left_armtrim/spr_cata_left_armtrim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d1589904-03a8-4827-ac74-26acce06d111","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_left_knee/7d4772f4-ee86-4983-82a3-4b22204b7345.png b/sprites/spr_cata_left_knee/7d4772f4-ee86-4983-82a3-4b22204b7345.png new file mode 100644 index 0000000000..bf38a7dca6 Binary files /dev/null and b/sprites/spr_cata_left_knee/7d4772f4-ee86-4983-82a3-4b22204b7345.png differ diff --git a/sprites/spr_cata_left_knee/layers/7d4772f4-ee86-4983-82a3-4b22204b7345/98c531ee-b2a0-4680-8f1d-9a3271f11bf3.png b/sprites/spr_cata_left_knee/layers/7d4772f4-ee86-4983-82a3-4b22204b7345/98c531ee-b2a0-4680-8f1d-9a3271f11bf3.png new file mode 100644 index 0000000000..bf38a7dca6 Binary files /dev/null and b/sprites/spr_cata_left_knee/layers/7d4772f4-ee86-4983-82a3-4b22204b7345/98c531ee-b2a0-4680-8f1d-9a3271f11bf3.png differ diff --git a/sprites/spr_cata_left_knee/spr_cata_left_knee.yy b/sprites/spr_cata_left_knee/spr_cata_left_knee.yy new file mode 100644 index 0000000000..47dcca1349 --- /dev/null +++ b/sprites/spr_cata_left_knee/spr_cata_left_knee.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_left_knee", + "bboxMode":0, + "bbox_bottom":187, + "bbox_left":98, + "bbox_right":139, + "bbox_top":142, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"7d4772f4-ee86-4983-82a3-4b22204b7345","name":"7d4772f4-ee86-4983-82a3-4b22204b7345","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"98c531ee-b2a0-4680-8f1d-9a3271f11bf3","blendMode":0,"displayName":"default","isLocked":false,"name":"98c531ee-b2a0-4680-8f1d-9a3271f11bf3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_left_knee", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_left_knee", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_left_knee", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d4772f4-ee86-4983-82a3-4b22204b7345","path":"sprites/spr_cata_left_knee/spr_cata_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b1247465-eefa-4366-af6b-4a8eb1b39fb4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_left_leg/30845d03-5630-4ea2-b874-e43d1c591f74.png b/sprites/spr_cata_left_leg/30845d03-5630-4ea2-b874-e43d1c591f74.png new file mode 100644 index 0000000000..886aff4abf Binary files /dev/null and b/sprites/spr_cata_left_leg/30845d03-5630-4ea2-b874-e43d1c591f74.png differ diff --git a/sprites/spr_cata_left_leg/layers/30845d03-5630-4ea2-b874-e43d1c591f74/c2171e14-c3fe-4232-ba2e-e302118f9cc4.png b/sprites/spr_cata_left_leg/layers/30845d03-5630-4ea2-b874-e43d1c591f74/c2171e14-c3fe-4232-ba2e-e302118f9cc4.png new file mode 100644 index 0000000000..886aff4abf Binary files /dev/null and b/sprites/spr_cata_left_leg/layers/30845d03-5630-4ea2-b874-e43d1c591f74/c2171e14-c3fe-4232-ba2e-e302118f9cc4.png differ diff --git a/sprites/spr_cata_left_leg/spr_cata_left_leg.yy b/sprites/spr_cata_left_leg/spr_cata_left_leg.yy new file mode 100644 index 0000000000..1089d93a5c --- /dev/null +++ b/sprites/spr_cata_left_leg/spr_cata_left_leg.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_left_leg", + "bboxMode":0, + "bbox_bottom":230, + "bbox_left":98, + "bbox_right":155, + "bbox_top":122, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"30845d03-5630-4ea2-b874-e43d1c591f74","name":"30845d03-5630-4ea2-b874-e43d1c591f74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"c2171e14-c3fe-4232-ba2e-e302118f9cc4","blendMode":0,"displayName":"default","isLocked":false,"name":"c2171e14-c3fe-4232-ba2e-e302118f9cc4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_left_leg", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_left_leg", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_left_leg", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"30845d03-5630-4ea2-b874-e43d1c591f74","path":"sprites/spr_cata_left_leg/spr_cata_left_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"47dd624a-04c1-4e99-81c2-ea31115a7ba0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_left_trim/1ce219cb-5d0f-4940-a300-ebea3cf690d4.png b/sprites/spr_cata_left_trim/1ce219cb-5d0f-4940-a300-ebea3cf690d4.png new file mode 100644 index 0000000000..371022e2b1 Binary files /dev/null and b/sprites/spr_cata_left_trim/1ce219cb-5d0f-4940-a300-ebea3cf690d4.png differ diff --git a/sprites/spr_cata_left_trim/layers/1ce219cb-5d0f-4940-a300-ebea3cf690d4/6fa1b1c6-652f-4092-84b5-fe6e33490587.png b/sprites/spr_cata_left_trim/layers/1ce219cb-5d0f-4940-a300-ebea3cf690d4/6fa1b1c6-652f-4092-84b5-fe6e33490587.png new file mode 100644 index 0000000000..371022e2b1 Binary files /dev/null and b/sprites/spr_cata_left_trim/layers/1ce219cb-5d0f-4940-a300-ebea3cf690d4/6fa1b1c6-652f-4092-84b5-fe6e33490587.png differ diff --git a/sprites/spr_cata_left_trim/spr_cata_left_trim.yy b/sprites/spr_cata_left_trim/spr_cata_left_trim.yy new file mode 100644 index 0000000000..c694010f41 --- /dev/null +++ b/sprites/spr_cata_left_trim/spr_cata_left_trim.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_left_trim", + "bboxMode":0, + "bbox_bottom":49, + "bbox_left":123, + "bbox_right":151, + "bbox_top":24, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"1ce219cb-5d0f-4940-a300-ebea3cf690d4","name":"1ce219cb-5d0f-4940-a300-ebea3cf690d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"6fa1b1c6-652f-4092-84b5-fe6e33490587","blendMode":0,"displayName":"default","isLocked":false,"name":"6fa1b1c6-652f-4092-84b5-fe6e33490587","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_left_trim", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_left_trim", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_left_trim", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ce219cb-5d0f-4940-a300-ebea3cf690d4","path":"sprites/spr_cata_left_trim/spr_cata_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2b86d343-2fe9-46af-bdad-24dcbffe8ffc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_left_trim_1/fcefc333-2e12-4b76-a889-59ee344320c8.png b/sprites/spr_cata_left_trim_1/fcefc333-2e12-4b76-a889-59ee344320c8.png new file mode 100644 index 0000000000..011827e5a6 Binary files /dev/null and b/sprites/spr_cata_left_trim_1/fcefc333-2e12-4b76-a889-59ee344320c8.png differ diff --git a/sprites/spr_cata_left_trim_1/layers/fcefc333-2e12-4b76-a889-59ee344320c8/5ec3c800-6eb0-42fd-bd91-f666b756bab3.png b/sprites/spr_cata_left_trim_1/layers/fcefc333-2e12-4b76-a889-59ee344320c8/5ec3c800-6eb0-42fd-bd91-f666b756bab3.png new file mode 100644 index 0000000000..011827e5a6 Binary files /dev/null and b/sprites/spr_cata_left_trim_1/layers/fcefc333-2e12-4b76-a889-59ee344320c8/5ec3c800-6eb0-42fd-bd91-f666b756bab3.png differ diff --git a/sprites/spr_cata_left_trim_1/spr_cata_left_trim_1.yy b/sprites/spr_cata_left_trim_1/spr_cata_left_trim_1.yy new file mode 100644 index 0000000000..ee5ad0779b --- /dev/null +++ b/sprites/spr_cata_left_trim_1/spr_cata_left_trim_1.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_left_trim_1", + "bboxMode":0, + "bbox_bottom":91, + "bbox_left":101, + "bbox_right":123, + "bbox_top":8, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"fcefc333-2e12-4b76-a889-59ee344320c8","name":"fcefc333-2e12-4b76-a889-59ee344320c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"5ec3c800-6eb0-42fd-bd91-f666b756bab3","blendMode":0,"displayName":"default","isLocked":false,"name":"5ec3c800-6eb0-42fd-bd91-f666b756bab3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_left_trim_1", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_left_trim_1", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_left_trim_1", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcefc333-2e12-4b76-a889-59ee344320c8","path":"sprites/spr_cata_left_trim_1/spr_cata_left_trim_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fa1c653e-09fe-4222-8748-5168e956a722","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_left_trim_2/3089b56b-6212-4848-9073-c4e15cbc81bb.png b/sprites/spr_cata_left_trim_2/3089b56b-6212-4848-9073-c4e15cbc81bb.png new file mode 100644 index 0000000000..19336ab121 Binary files /dev/null and b/sprites/spr_cata_left_trim_2/3089b56b-6212-4848-9073-c4e15cbc81bb.png differ diff --git a/sprites/spr_cata_left_trim_2/layers/3089b56b-6212-4848-9073-c4e15cbc81bb/dfc1dfcf-f929-412a-ae9d-ce4a40087c21.png b/sprites/spr_cata_left_trim_2/layers/3089b56b-6212-4848-9073-c4e15cbc81bb/dfc1dfcf-f929-412a-ae9d-ce4a40087c21.png new file mode 100644 index 0000000000..19336ab121 Binary files /dev/null and b/sprites/spr_cata_left_trim_2/layers/3089b56b-6212-4848-9073-c4e15cbc81bb/dfc1dfcf-f929-412a-ae9d-ce4a40087c21.png differ diff --git a/sprites/spr_cata_left_trim_2/spr_cata_left_trim_2.yy b/sprites/spr_cata_left_trim_2/spr_cata_left_trim_2.yy new file mode 100644 index 0000000000..7e2fb31f50 --- /dev/null +++ b/sprites/spr_cata_left_trim_2/spr_cata_left_trim_2.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_left_trim_2", + "bboxMode":0, + "bbox_bottom":59, + "bbox_left":118, + "bbox_right":152, + "bbox_top":31, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"3089b56b-6212-4848-9073-c4e15cbc81bb","name":"3089b56b-6212-4848-9073-c4e15cbc81bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"dfc1dfcf-f929-412a-ae9d-ce4a40087c21","blendMode":0,"displayName":"default","isLocked":false,"name":"dfc1dfcf-f929-412a-ae9d-ce4a40087c21","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_left_trim_2", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_left_trim_2", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_left_trim_2", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3089b56b-6212-4848-9073-c4e15cbc81bb","path":"sprites/spr_cata_left_trim_2/spr_cata_left_trim_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c305edf8-9d2a-4e6f-9195-bb6b63279ba9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_right_arm/198a5162-01ac-4f12-b555-ac903faa3333.png b/sprites/spr_cata_right_arm/198a5162-01ac-4f12-b555-ac903faa3333.png new file mode 100644 index 0000000000..cd37c09aab Binary files /dev/null and b/sprites/spr_cata_right_arm/198a5162-01ac-4f12-b555-ac903faa3333.png differ diff --git a/sprites/spr_cata_right_arm/layers/198a5162-01ac-4f12-b555-ac903faa3333/6ea35a9b-5413-463e-8b97-7147b7812bc6.png b/sprites/spr_cata_right_arm/layers/198a5162-01ac-4f12-b555-ac903faa3333/6ea35a9b-5413-463e-8b97-7147b7812bc6.png new file mode 100644 index 0000000000..cd37c09aab Binary files /dev/null and b/sprites/spr_cata_right_arm/layers/198a5162-01ac-4f12-b555-ac903faa3333/6ea35a9b-5413-463e-8b97-7147b7812bc6.png differ diff --git a/sprites/spr_cata_right_arm/spr_cata_right_arm.yy b/sprites/spr_cata_right_arm/spr_cata_right_arm.yy new file mode 100644 index 0000000000..c0f3d6322d --- /dev/null +++ b/sprites/spr_cata_right_arm/spr_cata_right_arm.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_right_arm", + "bboxMode":0, + "bbox_bottom":115, + "bbox_left":9, + "bbox_right":48, + "bbox_top":59, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"198a5162-01ac-4f12-b555-ac903faa3333","name":"198a5162-01ac-4f12-b555-ac903faa3333","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"6ea35a9b-5413-463e-8b97-7147b7812bc6","blendMode":0,"displayName":"default","isLocked":false,"name":"6ea35a9b-5413-463e-8b97-7147b7812bc6","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_right_arm", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_right_arm", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_right_arm", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"198a5162-01ac-4f12-b555-ac903faa3333","path":"sprites/spr_cata_right_arm/spr_cata_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4599239b-9184-4224-9fc1-5f0c6a6b142e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_right_armtrim/82ee5036-1316-4e81-a955-2242e5aa54af.png b/sprites/spr_cata_right_armtrim/82ee5036-1316-4e81-a955-2242e5aa54af.png new file mode 100644 index 0000000000..c141ab28e3 Binary files /dev/null and b/sprites/spr_cata_right_armtrim/82ee5036-1316-4e81-a955-2242e5aa54af.png differ diff --git a/sprites/spr_cata_right_armtrim/layers/82ee5036-1316-4e81-a955-2242e5aa54af/d1b71949-8ac8-4430-9cf8-a761461c4666.png b/sprites/spr_cata_right_armtrim/layers/82ee5036-1316-4e81-a955-2242e5aa54af/d1b71949-8ac8-4430-9cf8-a761461c4666.png new file mode 100644 index 0000000000..c141ab28e3 Binary files /dev/null and b/sprites/spr_cata_right_armtrim/layers/82ee5036-1316-4e81-a955-2242e5aa54af/d1b71949-8ac8-4430-9cf8-a761461c4666.png differ diff --git a/sprites/spr_cata_right_armtrim/spr_cata_right_armtrim.yy b/sprites/spr_cata_right_armtrim/spr_cata_right_armtrim.yy new file mode 100644 index 0000000000..0cc79ef559 --- /dev/null +++ b/sprites/spr_cata_right_armtrim/spr_cata_right_armtrim.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_right_armtrim", + "bboxMode":0, + "bbox_bottom":93, + "bbox_left":14, + "bbox_right":35, + "bbox_top":77, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"82ee5036-1316-4e81-a955-2242e5aa54af","name":"82ee5036-1316-4e81-a955-2242e5aa54af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"d1b71949-8ac8-4430-9cf8-a761461c4666","blendMode":0,"displayName":"default","isLocked":false,"name":"d1b71949-8ac8-4430-9cf8-a761461c4666","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_right_armtrim", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_right_armtrim", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_right_armtrim", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82ee5036-1316-4e81-a955-2242e5aa54af","path":"sprites/spr_cata_right_armtrim/spr_cata_right_armtrim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bfea0ffe-8e22-470b-a22d-d49be049e96c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_right_knee/494700cd-feb1-4f66-81c1-4dfc8f378e20.png b/sprites/spr_cata_right_knee/494700cd-feb1-4f66-81c1-4dfc8f378e20.png new file mode 100644 index 0000000000..649e3de1f3 Binary files /dev/null and b/sprites/spr_cata_right_knee/494700cd-feb1-4f66-81c1-4dfc8f378e20.png differ diff --git a/sprites/spr_cata_right_knee/layers/494700cd-feb1-4f66-81c1-4dfc8f378e20/7122732c-409f-4f69-9ad0-33318d42dfe5.png b/sprites/spr_cata_right_knee/layers/494700cd-feb1-4f66-81c1-4dfc8f378e20/7122732c-409f-4f69-9ad0-33318d42dfe5.png new file mode 100644 index 0000000000..649e3de1f3 Binary files /dev/null and b/sprites/spr_cata_right_knee/layers/494700cd-feb1-4f66-81c1-4dfc8f378e20/7122732c-409f-4f69-9ad0-33318d42dfe5.png differ diff --git a/sprites/spr_cata_right_knee/spr_cata_right_knee.yy b/sprites/spr_cata_right_knee/spr_cata_right_knee.yy new file mode 100644 index 0000000000..898983ebd3 --- /dev/null +++ b/sprites/spr_cata_right_knee/spr_cata_right_knee.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_right_knee", + "bboxMode":0, + "bbox_bottom":187, + "bbox_left":31, + "bbox_right":72, + "bbox_top":142, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"494700cd-feb1-4f66-81c1-4dfc8f378e20","name":"494700cd-feb1-4f66-81c1-4dfc8f378e20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"7122732c-409f-4f69-9ad0-33318d42dfe5","blendMode":0,"displayName":"default","isLocked":false,"name":"7122732c-409f-4f69-9ad0-33318d42dfe5","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_right_knee", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_right_knee", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_right_knee", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"494700cd-feb1-4f66-81c1-4dfc8f378e20","path":"sprites/spr_cata_right_knee/spr_cata_right_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"84d653df-e281-4206-9baa-69963a44556a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_right_leg/ecf75db7-6223-4712-8157-c822a10e1617.png b/sprites/spr_cata_right_leg/ecf75db7-6223-4712-8157-c822a10e1617.png new file mode 100644 index 0000000000..2b64eae7b7 Binary files /dev/null and b/sprites/spr_cata_right_leg/ecf75db7-6223-4712-8157-c822a10e1617.png differ diff --git a/sprites/spr_cata_right_leg/layers/ecf75db7-6223-4712-8157-c822a10e1617/f2501eb8-3d15-489b-9adf-21790df0d78a.png b/sprites/spr_cata_right_leg/layers/ecf75db7-6223-4712-8157-c822a10e1617/f2501eb8-3d15-489b-9adf-21790df0d78a.png new file mode 100644 index 0000000000..2b64eae7b7 Binary files /dev/null and b/sprites/spr_cata_right_leg/layers/ecf75db7-6223-4712-8157-c822a10e1617/f2501eb8-3d15-489b-9adf-21790df0d78a.png differ diff --git a/sprites/spr_cata_right_leg/spr_cata_right_leg.yy b/sprites/spr_cata_right_leg/spr_cata_right_leg.yy new file mode 100644 index 0000000000..1ca580df7d --- /dev/null +++ b/sprites/spr_cata_right_leg/spr_cata_right_leg.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_right_leg", + "bboxMode":0, + "bbox_bottom":230, + "bbox_left":15, + "bbox_right":72, + "bbox_top":122, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"ecf75db7-6223-4712-8157-c822a10e1617","name":"ecf75db7-6223-4712-8157-c822a10e1617","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"f2501eb8-3d15-489b-9adf-21790df0d78a","blendMode":0,"displayName":"default","isLocked":false,"name":"f2501eb8-3d15-489b-9adf-21790df0d78a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_right_leg", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_right_leg", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_right_leg", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecf75db7-6223-4712-8157-c822a10e1617","path":"sprites/spr_cata_right_leg/spr_cata_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fcd28e0a-0fb2-4958-b925-f032588cfc06","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_right_trim/1ce219cb-5d0f-4940-a300-ebea3cf690d4.png b/sprites/spr_cata_right_trim/1ce219cb-5d0f-4940-a300-ebea3cf690d4.png new file mode 100644 index 0000000000..d447b9011e Binary files /dev/null and b/sprites/spr_cata_right_trim/1ce219cb-5d0f-4940-a300-ebea3cf690d4.png differ diff --git a/sprites/spr_cata_right_trim/layers/1ce219cb-5d0f-4940-a300-ebea3cf690d4/6fa1b1c6-652f-4092-84b5-fe6e33490587.png b/sprites/spr_cata_right_trim/layers/1ce219cb-5d0f-4940-a300-ebea3cf690d4/6fa1b1c6-652f-4092-84b5-fe6e33490587.png new file mode 100644 index 0000000000..d447b9011e Binary files /dev/null and b/sprites/spr_cata_right_trim/layers/1ce219cb-5d0f-4940-a300-ebea3cf690d4/6fa1b1c6-652f-4092-84b5-fe6e33490587.png differ diff --git a/sprites/spr_cata_right_trim/spr_cata_right_trim.yy b/sprites/spr_cata_right_trim/spr_cata_right_trim.yy new file mode 100644 index 0000000000..ccb2ccc755 --- /dev/null +++ b/sprites/spr_cata_right_trim/spr_cata_right_trim.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_right_trim", + "bboxMode":0, + "bbox_bottom":49, + "bbox_left":15, + "bbox_right":43, + "bbox_top":24, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"1ce219cb-5d0f-4940-a300-ebea3cf690d4","name":"1ce219cb-5d0f-4940-a300-ebea3cf690d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"6fa1b1c6-652f-4092-84b5-fe6e33490587","blendMode":0,"displayName":"default","isLocked":false,"name":"6fa1b1c6-652f-4092-84b5-fe6e33490587","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_right_trim", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_right_trim", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_right_trim", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ce219cb-5d0f-4940-a300-ebea3cf690d4","path":"sprites/spr_cata_right_trim/spr_cata_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2b86d343-2fe9-46af-bdad-24dcbffe8ffc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":6, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_right_trim_1/fcefc333-2e12-4b76-a889-59ee344320c8.png b/sprites/spr_cata_right_trim_1/fcefc333-2e12-4b76-a889-59ee344320c8.png new file mode 100644 index 0000000000..4d5f8e4ef9 Binary files /dev/null and b/sprites/spr_cata_right_trim_1/fcefc333-2e12-4b76-a889-59ee344320c8.png differ diff --git a/sprites/spr_cata_right_trim_1/layers/fcefc333-2e12-4b76-a889-59ee344320c8/5ec3c800-6eb0-42fd-bd91-f666b756bab3.png b/sprites/spr_cata_right_trim_1/layers/fcefc333-2e12-4b76-a889-59ee344320c8/5ec3c800-6eb0-42fd-bd91-f666b756bab3.png new file mode 100644 index 0000000000..4d5f8e4ef9 Binary files /dev/null and b/sprites/spr_cata_right_trim_1/layers/fcefc333-2e12-4b76-a889-59ee344320c8/5ec3c800-6eb0-42fd-bd91-f666b756bab3.png differ diff --git a/sprites/spr_cata_right_trim_1/spr_cata_right_trim_1.yy b/sprites/spr_cata_right_trim_1/spr_cata_right_trim_1.yy new file mode 100644 index 0000000000..af76f455cf --- /dev/null +++ b/sprites/spr_cata_right_trim_1/spr_cata_right_trim_1.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_right_trim_1", + "bboxMode":0, + "bbox_bottom":91, + "bbox_left":43, + "bbox_right":65, + "bbox_top":8, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"fcefc333-2e12-4b76-a889-59ee344320c8","name":"fcefc333-2e12-4b76-a889-59ee344320c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"5ec3c800-6eb0-42fd-bd91-f666b756bab3","blendMode":0,"displayName":"default","isLocked":false,"name":"5ec3c800-6eb0-42fd-bd91-f666b756bab3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_right_trim_1", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_right_trim", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_right_trim", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcefc333-2e12-4b76-a889-59ee344320c8","path":"sprites/spr_cata_right_trim_1/spr_cata_right_trim_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fa1c653e-09fe-4222-8748-5168e956a722","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_right_trim_2/3089b56b-6212-4848-9073-c4e15cbc81bb.png b/sprites/spr_cata_right_trim_2/3089b56b-6212-4848-9073-c4e15cbc81bb.png new file mode 100644 index 0000000000..e7380e52b5 Binary files /dev/null and b/sprites/spr_cata_right_trim_2/3089b56b-6212-4848-9073-c4e15cbc81bb.png differ diff --git a/sprites/spr_cata_right_trim_2/layers/3089b56b-6212-4848-9073-c4e15cbc81bb/dfc1dfcf-f929-412a-ae9d-ce4a40087c21.png b/sprites/spr_cata_right_trim_2/layers/3089b56b-6212-4848-9073-c4e15cbc81bb/dfc1dfcf-f929-412a-ae9d-ce4a40087c21.png new file mode 100644 index 0000000000..e7380e52b5 Binary files /dev/null and b/sprites/spr_cata_right_trim_2/layers/3089b56b-6212-4848-9073-c4e15cbc81bb/dfc1dfcf-f929-412a-ae9d-ce4a40087c21.png differ diff --git a/sprites/spr_cata_right_trim_2/spr_cata_right_trim_2.yy b/sprites/spr_cata_right_trim_2/spr_cata_right_trim_2.yy new file mode 100644 index 0000000000..b91014cb6f --- /dev/null +++ b/sprites/spr_cata_right_trim_2/spr_cata_right_trim_2.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_right_trim_2", + "bboxMode":0, + "bbox_bottom":59, + "bbox_left":14, + "bbox_right":48, + "bbox_top":31, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"3089b56b-6212-4848-9073-c4e15cbc81bb","name":"3089b56b-6212-4848-9073-c4e15cbc81bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"dfc1dfcf-f929-412a-ae9d-ce4a40087c21","blendMode":0,"displayName":"default","isLocked":false,"name":"dfc1dfcf-f929-412a-ae9d-ce4a40087c21","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_right_trim_2", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_right_trim", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_right_trim", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3089b56b-6212-4848-9073-c4e15cbc81bb","path":"sprites/spr_cata_right_trim_2/spr_cata_right_trim_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c305edf8-9d2a-4e6f-9195-bb6b63279ba9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_shoulder_hanging_leather_left/3fd7e1d5-a9ff-4d84-9e7c-928d601d5549.png b/sprites/spr_cata_shoulder_hanging_leather_left/3fd7e1d5-a9ff-4d84-9e7c-928d601d5549.png new file mode 100644 index 0000000000..a401b891d9 Binary files /dev/null and b/sprites/spr_cata_shoulder_hanging_leather_left/3fd7e1d5-a9ff-4d84-9e7c-928d601d5549.png differ diff --git a/sprites/spr_cata_shoulder_hanging_leather_left/layers/3fd7e1d5-a9ff-4d84-9e7c-928d601d5549/12a0ccfa-f3e3-4373-b076-5c445ab4fffe.png b/sprites/spr_cata_shoulder_hanging_leather_left/layers/3fd7e1d5-a9ff-4d84-9e7c-928d601d5549/12a0ccfa-f3e3-4373-b076-5c445ab4fffe.png new file mode 100644 index 0000000000..a401b891d9 Binary files /dev/null and b/sprites/spr_cata_shoulder_hanging_leather_left/layers/3fd7e1d5-a9ff-4d84-9e7c-928d601d5549/12a0ccfa-f3e3-4373-b076-5c445ab4fffe.png differ diff --git a/sprites/spr_cata_shoulder_hanging_leather_left/spr_cata_shoulder_hanging_leather_left.yy b/sprites/spr_cata_shoulder_hanging_leather_left/spr_cata_shoulder_hanging_leather_left.yy new file mode 100644 index 0000000000..31dc8b678a --- /dev/null +++ b/sprites/spr_cata_shoulder_hanging_leather_left/spr_cata_shoulder_hanging_leather_left.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_shoulder_hanging_leather_left", + "bboxMode":0, + "bbox_bottom":86, + "bbox_left":122, + "bbox_right":159, + "bbox_top":47, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"3fd7e1d5-a9ff-4d84-9e7c-928d601d5549","name":"3fd7e1d5-a9ff-4d84-9e7c-928d601d5549","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"12a0ccfa-f3e3-4373-b076-5c445ab4fffe","blendMode":0,"displayName":"default","isLocked":false,"name":"12a0ccfa-f3e3-4373-b076-5c445ab4fffe","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_shoulder_hanging_leather_left", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_shoulder_hanging_leather_left", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_shoulder_hanging_leather_left", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3fd7e1d5-a9ff-4d84-9e7c-928d601d5549","path":"sprites/spr_cata_shoulder_hanging_leather_left/spr_cata_shoulder_hanging_leather_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f201e4eb-30df-45e3-9a5b-90a48b734e8a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_shoulder_hanging_leather_left_tips/3d17787f-c1c2-47db-992e-a221a37550a1.png b/sprites/spr_cata_shoulder_hanging_leather_left_tips/3d17787f-c1c2-47db-992e-a221a37550a1.png new file mode 100644 index 0000000000..367a2892d2 Binary files /dev/null and b/sprites/spr_cata_shoulder_hanging_leather_left_tips/3d17787f-c1c2-47db-992e-a221a37550a1.png differ diff --git a/sprites/spr_cata_shoulder_hanging_leather_left_tips/layers/3d17787f-c1c2-47db-992e-a221a37550a1/89d15f31-c097-44dc-98f3-b3d5ed35463c.png b/sprites/spr_cata_shoulder_hanging_leather_left_tips/layers/3d17787f-c1c2-47db-992e-a221a37550a1/89d15f31-c097-44dc-98f3-b3d5ed35463c.png new file mode 100644 index 0000000000..367a2892d2 Binary files /dev/null and b/sprites/spr_cata_shoulder_hanging_leather_left_tips/layers/3d17787f-c1c2-47db-992e-a221a37550a1/89d15f31-c097-44dc-98f3-b3d5ed35463c.png differ diff --git a/sprites/spr_cata_shoulder_hanging_leather_left_tips/spr_cata_shoulder_hanging_leather_left_tips.yy b/sprites/spr_cata_shoulder_hanging_leather_left_tips/spr_cata_shoulder_hanging_leather_left_tips.yy new file mode 100644 index 0000000000..e91bbf2fe7 --- /dev/null +++ b/sprites/spr_cata_shoulder_hanging_leather_left_tips/spr_cata_shoulder_hanging_leather_left_tips.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_shoulder_hanging_leather_left_tips", + "bboxMode":0, + "bbox_bottom":90, + "bbox_left":122, + "bbox_right":162, + "bbox_top":65, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"3d17787f-c1c2-47db-992e-a221a37550a1","name":"3d17787f-c1c2-47db-992e-a221a37550a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"89d15f31-c097-44dc-98f3-b3d5ed35463c","blendMode":0,"displayName":"default","isLocked":false,"name":"89d15f31-c097-44dc-98f3-b3d5ed35463c","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_shoulder_hanging_leather_left_tips", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_shoulder_hanging_leather_left_tips", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_shoulder_hanging_leather_left_tips", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d17787f-c1c2-47db-992e-a221a37550a1","path":"sprites/spr_cata_shoulder_hanging_leather_left_tips/spr_cata_shoulder_hanging_leather_left_tips.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bdcc1b80-0078-4aeb-ac8e-225dc22f11b4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_shoulder_hanging_leather_right/0eb5da06-be9b-42af-a45c-5652a70e0363.png b/sprites/spr_cata_shoulder_hanging_leather_right/0eb5da06-be9b-42af-a45c-5652a70e0363.png new file mode 100644 index 0000000000..3335148897 Binary files /dev/null and b/sprites/spr_cata_shoulder_hanging_leather_right/0eb5da06-be9b-42af-a45c-5652a70e0363.png differ diff --git a/sprites/spr_cata_shoulder_hanging_leather_right/layers/0eb5da06-be9b-42af-a45c-5652a70e0363/240582c2-092d-40fa-9caa-ea64c5a2fc69.png b/sprites/spr_cata_shoulder_hanging_leather_right/layers/0eb5da06-be9b-42af-a45c-5652a70e0363/240582c2-092d-40fa-9caa-ea64c5a2fc69.png new file mode 100644 index 0000000000..3335148897 Binary files /dev/null and b/sprites/spr_cata_shoulder_hanging_leather_right/layers/0eb5da06-be9b-42af-a45c-5652a70e0363/240582c2-092d-40fa-9caa-ea64c5a2fc69.png differ diff --git a/sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy b/sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy new file mode 100644 index 0000000000..a16d4ff808 --- /dev/null +++ b/sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_shoulder_hanging_leather_right", + "bboxMode":0, + "bbox_bottom":90, + "bbox_left":8, + "bbox_right":48, + "bbox_top":65, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"0eb5da06-be9b-42af-a45c-5652a70e0363","name":"0eb5da06-be9b-42af-a45c-5652a70e0363","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"240582c2-092d-40fa-9caa-ea64c5a2fc69","blendMode":0,"displayName":"default","isLocked":false,"name":"240582c2-092d-40fa-9caa-ea64c5a2fc69","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_shoulder_hanging_leather_right", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_shoulder_hanging_leather_right", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_shoulder_hanging_leather_right", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0eb5da06-be9b-42af-a45c-5652a70e0363","path":"sprites/spr_cata_shoulder_hanging_leather_right/spr_cata_shoulder_hanging_leather_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"75c64297-842d-4cd1-b9fd-698ef5956138","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_shoulder_hanging_leather_right_tips/41e731d1-cd8b-487b-9fdf-14ab2b776dfd.png b/sprites/spr_cata_shoulder_hanging_leather_right_tips/41e731d1-cd8b-487b-9fdf-14ab2b776dfd.png new file mode 100644 index 0000000000..ff635b0545 Binary files /dev/null and b/sprites/spr_cata_shoulder_hanging_leather_right_tips/41e731d1-cd8b-487b-9fdf-14ab2b776dfd.png differ diff --git a/sprites/spr_cata_shoulder_hanging_leather_right_tips/layers/41e731d1-cd8b-487b-9fdf-14ab2b776dfd/e023583f-d2bf-40b8-b5a8-2e634d2b7358.png b/sprites/spr_cata_shoulder_hanging_leather_right_tips/layers/41e731d1-cd8b-487b-9fdf-14ab2b776dfd/e023583f-d2bf-40b8-b5a8-2e634d2b7358.png new file mode 100644 index 0000000000..8b42ee644e Binary files /dev/null and b/sprites/spr_cata_shoulder_hanging_leather_right_tips/layers/41e731d1-cd8b-487b-9fdf-14ab2b776dfd/e023583f-d2bf-40b8-b5a8-2e634d2b7358.png differ diff --git a/sprites/spr_cata_shoulder_hanging_leather_right_tips/spr_cata_shoulder_hanging_leather_right_tips.yy b/sprites/spr_cata_shoulder_hanging_leather_right_tips/spr_cata_shoulder_hanging_leather_right_tips.yy new file mode 100644 index 0000000000..ae1f30fe90 --- /dev/null +++ b/sprites/spr_cata_shoulder_hanging_leather_right_tips/spr_cata_shoulder_hanging_leather_right_tips.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_shoulder_hanging_leather_right_tips", + "bboxMode":0, + "bbox_bottom":86, + "bbox_left":11, + "bbox_right":48, + "bbox_top":47, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"41e731d1-cd8b-487b-9fdf-14ab2b776dfd","name":"41e731d1-cd8b-487b-9fdf-14ab2b776dfd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"e023583f-d2bf-40b8-b5a8-2e634d2b7358","blendMode":0,"displayName":"default","isLocked":false,"name":"e023583f-d2bf-40b8-b5a8-2e634d2b7358","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_shoulder_hanging_leather_right_tips", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_shoulder_hanging_leather_right_tips", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_shoulder_hanging_leather_right_tips", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41e731d1-cd8b-487b-9fdf-14ab2b776dfd","path":"sprites/spr_cata_shoulder_hanging_leather_right_tips/spr_cata_shoulder_hanging_leather_right_tips.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"83ebed24-9ba0-43c8-9a9c-6b4290f7c2df","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_shoulder_hanging_mail_left/96228507-c627-413d-8026-6a20c334f5e5.png b/sprites/spr_cata_shoulder_hanging_mail_left/96228507-c627-413d-8026-6a20c334f5e5.png new file mode 100644 index 0000000000..cd6a0acd6a Binary files /dev/null and b/sprites/spr_cata_shoulder_hanging_mail_left/96228507-c627-413d-8026-6a20c334f5e5.png differ diff --git a/sprites/spr_cata_shoulder_hanging_mail_left/layers/96228507-c627-413d-8026-6a20c334f5e5/2a3cced8-cb88-494c-a915-5cc072e4ee2c.png b/sprites/spr_cata_shoulder_hanging_mail_left/layers/96228507-c627-413d-8026-6a20c334f5e5/2a3cced8-cb88-494c-a915-5cc072e4ee2c.png new file mode 100644 index 0000000000..cd6a0acd6a Binary files /dev/null and b/sprites/spr_cata_shoulder_hanging_mail_left/layers/96228507-c627-413d-8026-6a20c334f5e5/2a3cced8-cb88-494c-a915-5cc072e4ee2c.png differ diff --git a/sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy b/sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy new file mode 100644 index 0000000000..dda4ca964f --- /dev/null +++ b/sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_shoulder_hanging_mail_left", + "bboxMode":0, + "bbox_bottom":87, + "bbox_left":122, + "bbox_right":160, + "bbox_top":48, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"96228507-c627-413d-8026-6a20c334f5e5","name":"96228507-c627-413d-8026-6a20c334f5e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"2a3cced8-cb88-494c-a915-5cc072e4ee2c","blendMode":0,"displayName":"default","isLocked":false,"name":"2a3cced8-cb88-494c-a915-5cc072e4ee2c","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_shoulder_hanging_mail_left", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_shoulder_hanging_mail_left", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_shoulder_hanging_mail_left", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96228507-c627-413d-8026-6a20c334f5e5","path":"sprites/spr_cata_shoulder_hanging_mail_left/spr_cata_shoulder_hanging_mail_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f0fc2abe-dfd7-4f83-800f-3700b431f400","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_shoulder_hanging_mail_right/9d7300ff-3623-424a-9eaa-57079cf97c42.png b/sprites/spr_cata_shoulder_hanging_mail_right/9d7300ff-3623-424a-9eaa-57079cf97c42.png new file mode 100644 index 0000000000..dcb8096093 Binary files /dev/null and b/sprites/spr_cata_shoulder_hanging_mail_right/9d7300ff-3623-424a-9eaa-57079cf97c42.png differ diff --git a/sprites/spr_cata_shoulder_hanging_mail_right/layers/9d7300ff-3623-424a-9eaa-57079cf97c42/c6dc1f20-2c5f-4f34-bb86-be21f432927c.png b/sprites/spr_cata_shoulder_hanging_mail_right/layers/9d7300ff-3623-424a-9eaa-57079cf97c42/c6dc1f20-2c5f-4f34-bb86-be21f432927c.png new file mode 100644 index 0000000000..dcb8096093 Binary files /dev/null and b/sprites/spr_cata_shoulder_hanging_mail_right/layers/9d7300ff-3623-424a-9eaa-57079cf97c42/c6dc1f20-2c5f-4f34-bb86-be21f432927c.png differ diff --git a/sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy b/sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy new file mode 100644 index 0000000000..34df763b9e --- /dev/null +++ b/sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_shoulder_hanging_mail_right", + "bboxMode":0, + "bbox_bottom":87, + "bbox_left":10, + "bbox_right":48, + "bbox_top":48, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"9d7300ff-3623-424a-9eaa-57079cf97c42","name":"9d7300ff-3623-424a-9eaa-57079cf97c42","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"c6dc1f20-2c5f-4f34-bb86-be21f432927c","blendMode":0,"displayName":"default","isLocked":false,"name":"c6dc1f20-2c5f-4f34-bb86-be21f432927c","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_shoulder_hanging_mail_right", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_shoulder_hanging_mail_right", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_shoulder_hanging_mail_right", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d7300ff-3623-424a-9eaa-57079cf97c42","path":"sprites/spr_cata_shoulder_hanging_mail_right/spr_cata_shoulder_hanging_mail_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"931584ff-4240-467d-9557-240c64a7aecb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_tabbard_leather/b7da30c6-2b5e-4677-92fb-c840f62bb6b0.png b/sprites/spr_cata_tabbard_leather/b7da30c6-2b5e-4677-92fb-c840f62bb6b0.png new file mode 100644 index 0000000000..f3c4fd08f5 Binary files /dev/null and b/sprites/spr_cata_tabbard_leather/b7da30c6-2b5e-4677-92fb-c840f62bb6b0.png differ diff --git a/sprites/spr_cata_tabbard_leather/layers/b7da30c6-2b5e-4677-92fb-c840f62bb6b0/f7e76e87-6037-4a79-b25a-e22e28f39da2.png b/sprites/spr_cata_tabbard_leather/layers/b7da30c6-2b5e-4677-92fb-c840f62bb6b0/f7e76e87-6037-4a79-b25a-e22e28f39da2.png new file mode 100644 index 0000000000..f3c4fd08f5 Binary files /dev/null and b/sprites/spr_cata_tabbard_leather/layers/b7da30c6-2b5e-4677-92fb-c840f62bb6b0/f7e76e87-6037-4a79-b25a-e22e28f39da2.png differ diff --git a/sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy b/sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy new file mode 100644 index 0000000000..dc1c882114 --- /dev/null +++ b/sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_tabbard_leather", + "bboxMode":0, + "bbox_bottom":166, + "bbox_left":72, + "bbox_right":98, + "bbox_top":112, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b7da30c6-2b5e-4677-92fb-c840f62bb6b0","name":"b7da30c6-2b5e-4677-92fb-c840f62bb6b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"f7e76e87-6037-4a79-b25a-e22e28f39da2","blendMode":0,"displayName":"default","isLocked":false,"name":"f7e76e87-6037-4a79-b25a-e22e28f39da2","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_tabbard_leather", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_tabbard_leather", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_tabbard_leather", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7da30c6-2b5e-4677-92fb-c840f62bb6b0","path":"sprites/spr_cata_tabbard_leather/spr_cata_tabbard_leather.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c2da563d-1a99-41bc-9c06-51e9619bf7a0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_tabbard_leather_hangings/16ff2f35-0659-40fa-be7a-7a2942a2c47e.png b/sprites/spr_cata_tabbard_leather_hangings/16ff2f35-0659-40fa-be7a-7a2942a2c47e.png new file mode 100644 index 0000000000..332485bdee Binary files /dev/null and b/sprites/spr_cata_tabbard_leather_hangings/16ff2f35-0659-40fa-be7a-7a2942a2c47e.png differ diff --git a/sprites/spr_cata_tabbard_leather_hangings/layers/16ff2f35-0659-40fa-be7a-7a2942a2c47e/a8907230-deee-4373-af6a-ec8ca94f1d81.png b/sprites/spr_cata_tabbard_leather_hangings/layers/16ff2f35-0659-40fa-be7a-7a2942a2c47e/a8907230-deee-4373-af6a-ec8ca94f1d81.png new file mode 100644 index 0000000000..332485bdee Binary files /dev/null and b/sprites/spr_cata_tabbard_leather_hangings/layers/16ff2f35-0659-40fa-be7a-7a2942a2c47e/a8907230-deee-4373-af6a-ec8ca94f1d81.png differ diff --git a/sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy b/sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy new file mode 100644 index 0000000000..0d99c6f84e --- /dev/null +++ b/sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_tabbard_leather_hangings", + "bboxMode":0, + "bbox_bottom":170, + "bbox_left":72, + "bbox_right":98, + "bbox_top":163, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"16ff2f35-0659-40fa-be7a-7a2942a2c47e","name":"16ff2f35-0659-40fa-be7a-7a2942a2c47e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"a8907230-deee-4373-af6a-ec8ca94f1d81","blendMode":0,"displayName":"default","isLocked":false,"name":"a8907230-deee-4373-af6a-ec8ca94f1d81","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_tabbard_leather_hangings", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_tabbard_leather_hangings", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_tabbard_leather_hangings", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16ff2f35-0659-40fa-be7a-7a2942a2c47e","path":"sprites/spr_cata_tabbard_leather_hangings/spr_cata_tabbard_leather_hangings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"64be6f6e-7313-418a-a91f-e3568f378b03","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_cata_tabbard_mail/00c36dff-f59c-419f-acac-bf30655b425b.png b/sprites/spr_cata_tabbard_mail/00c36dff-f59c-419f-acac-bf30655b425b.png new file mode 100644 index 0000000000..f3c17eb354 Binary files /dev/null and b/sprites/spr_cata_tabbard_mail/00c36dff-f59c-419f-acac-bf30655b425b.png differ diff --git a/sprites/spr_cata_tabbard_mail/layers/00c36dff-f59c-419f-acac-bf30655b425b/fdea6507-202f-42a0-9579-5d12967ccbdb.png b/sprites/spr_cata_tabbard_mail/layers/00c36dff-f59c-419f-acac-bf30655b425b/fdea6507-202f-42a0-9579-5d12967ccbdb.png new file mode 100644 index 0000000000..f3c17eb354 Binary files /dev/null and b/sprites/spr_cata_tabbard_mail/layers/00c36dff-f59c-419f-acac-bf30655b425b/fdea6507-202f-42a0-9579-5d12967ccbdb.png differ diff --git a/sprites/spr_cata_tabbard_mail/spr_cata_tabbard_mail.yy b/sprites/spr_cata_tabbard_mail/spr_cata_tabbard_mail.yy new file mode 100644 index 0000000000..3819453e21 --- /dev/null +++ b/sprites/spr_cata_tabbard_mail/spr_cata_tabbard_mail.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_cata_tabbard_mail", + "bboxMode":0, + "bbox_bottom":167, + "bbox_left":72, + "bbox_right":98, + "bbox_top":112, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"00c36dff-f59c-419f-acac-bf30655b425b","name":"00c36dff-f59c-419f-acac-bf30655b425b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"fdea6507-202f-42a0-9579-5d12967ccbdb","blendMode":0,"displayName":"default","isLocked":false,"name":"fdea6507-202f-42a0-9579-5d12967ccbdb","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cata_tabbard_mail", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"cata_complex", + "path":"folders/Sprites/Marine Viewer/body_types/cata_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cata_tabbard_mail", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cata_tabbard_mail", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00c36dff-f59c-419f-acac-bf30655b425b","path":"sprites/spr_cata_tabbard_mail/spr_cata_tabbard_mail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6b7ccbf8-79af-453d-b7a3-0d2465ae44b4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":8, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy b/sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy index d25b8f4ed6..3a0f8aa071 100644 --- a/sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy +++ b/sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chain_mail_tabbard", "bboxMode":0, "bbox_bottom":162, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_chain_mail_tabbard/spr_chain_mail_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_chap_area_pad/spr_chap_area_pad.yy b/sprites/spr_chap_area_pad/spr_chap_area_pad.yy index 1025c38ac0..dd340a9e5d 100644 --- a/sprites/spr_chap_area_pad/spr_chap_area_pad.yy +++ b/sprites/spr_chap_area_pad/spr_chap_area_pad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chap_area_pad", "bboxMode":0, "bbox_bottom":157, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fb3c5253-6479-490f-ba64-9bcf144ab6fb","name":"fb3c5253-6479-490f-ba64-9bcf144ab6fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb3c5253-6479-490f-ba64-9bcf144ab6fb","name":"fb3c5253-6479-490f-ba64-9bcf144ab6fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb3c5253-6479-490f-ba64-9bcf144ab6fb","path":"sprites/spr_chap_area_pad/spr_chap_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c38c46a-1684-4748-b935-42318fc441bf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb3c5253-6479-490f-ba64-9bcf144ab6fb","path":"sprites/spr_chap_area_pad/spr_chap_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c38c46a-1684-4748-b935-42318fc441bf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_chap_trim_left/spr_chap_trim_left.yy b/sprites/spr_chap_trim_left/spr_chap_trim_left.yy index 9487c28502..f045189e15 100644 --- a/sprites/spr_chap_trim_left/spr_chap_trim_left.yy +++ b/sprites/spr_chap_trim_left/spr_chap_trim_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chap_trim_left", "bboxMode":0, "bbox_bottom":81, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_chap_trim_left/spr_chap_trim_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"36e4efa0-90a0-493b-8711-c38b72c203e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_chap_trim_left/spr_chap_trim_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36e4efa0-90a0-493b-8711-c38b72c203e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_chap_trim_right/spr_chap_trim_right.yy b/sprites/spr_chap_trim_right/spr_chap_trim_right.yy index a95be39464..a2452224a5 100644 --- a/sprites/spr_chap_trim_right/spr_chap_trim_right.yy +++ b/sprites/spr_chap_trim_right/spr_chap_trim_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chap_trim_right", "bboxMode":0, "bbox_bottom":81, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_chap_trim_right/spr_chap_trim_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"36e4efa0-90a0-493b-8711-c38b72c203e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","path":"sprites/spr_chap_trim_right/spr_chap_trim_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36e4efa0-90a0-493b-8711-c38b72c203e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_chaplain_helm/spr_chaplain_helm.yy b/sprites/spr_chaplain_helm/spr_chaplain_helm.yy index 29cf66f657..fe35859c50 100644 --- a/sprites/spr_chaplain_helm/spr_chaplain_helm.yy +++ b/sprites/spr_chaplain_helm/spr_chaplain_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chaplain_helm", "bboxMode":0, "bbox_bottom":44, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"570e9798-a363-4113-a62f-3329e557f4cf","name":"570e9798-a363-4113-a62f-3329e557f4cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"570e9798-a363-4113-a62f-3329e557f4cf","name":"570e9798-a363-4113-a62f-3329e557f4cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_chaplain_term_helm/86934807-ea9a-4216-8308-41baa548c8fa.png b/sprites/spr_chaplain_term_helm/86934807-ea9a-4216-8308-41baa548c8fa.png index e46c21e9e2..f910321a3b 100644 Binary files a/sprites/spr_chaplain_term_helm/86934807-ea9a-4216-8308-41baa548c8fa.png and b/sprites/spr_chaplain_term_helm/86934807-ea9a-4216-8308-41baa548c8fa.png differ diff --git a/sprites/spr_chaplain_term_helm/layers/86934807-ea9a-4216-8308-41baa548c8fa/ae0c933d-af58-4bf7-b86c-2e064499e4ff.png b/sprites/spr_chaplain_term_helm/layers/86934807-ea9a-4216-8308-41baa548c8fa/ae0c933d-af58-4bf7-b86c-2e064499e4ff.png index 304fe427bd..f910321a3b 100644 Binary files a/sprites/spr_chaplain_term_helm/layers/86934807-ea9a-4216-8308-41baa548c8fa/ae0c933d-af58-4bf7-b86c-2e064499e4ff.png and b/sprites/spr_chaplain_term_helm/layers/86934807-ea9a-4216-8308-41baa548c8fa/ae0c933d-af58-4bf7-b86c-2e064499e4ff.png differ diff --git a/sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy b/sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy index 67f9fdc13c..ec9d402c9c 100644 --- a/sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy +++ b/sprites/spr_chaplain_term_helm/spr_chaplain_term_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chaplain_term_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"86934807-ea9a-4216-8308-41baa548c8fa","name":"86934807-ea9a-4216-8308-41baa548c8fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"86934807-ea9a-4216-8308-41baa548c8fa","name":"86934807-ea9a-4216-8308-41baa548c8fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -23,7 +23,7 @@ ], "name":"spr_chaplain_term_helm", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"helms", "path":"folders/Sprites/Marine Viewer/helms.yy", @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":0, + "xorigin":-8, "yorigin":0, }, "swatchColours":null, diff --git a/sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy b/sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy index 75e57ec16f..04079072d6 100644 --- a/sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy +++ b/sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chaplain_wolf_helm", "bboxMode":0, "bbox_bottom":48, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","path":"sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75c80c2d-38d0-4554-92d8-e2e94a2ad19e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","path":"sprites/spr_chaplain_wolf_helm/spr_chaplain_wolf_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75c80c2d-38d0-4554-92d8-e2e94a2ad19e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy b/sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy index 5b6e364e68..2af21ed81c 100644 --- a/sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy +++ b/sprites/spr_chaplain_wolfterm_helm/spr_chaplain_wolfterm_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_chaplain_wolfterm_helm", "bboxMode":0, "bbox_bottom":44, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","name":"f2f04903-70d2-4526-bee9-08bfa83c5f9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_charisma_icon/spr_charisma_icon.yy b/sprites/spr_charisma_icon/spr_charisma_icon.yy index c7b143ab1e..920914801a 100644 --- a/sprites/spr_charisma_icon/spr_charisma_icon.yy +++ b/sprites/spr_charisma_icon/spr_charisma_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_charisma_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4e272a50-68af-439b-86d3-167d72d6a28b","name":"4e272a50-68af-439b-86d3-167d72d6a28b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4e272a50-68af-439b-86d3-167d72d6a28b","name":"4e272a50-68af-439b-86d3-167d72d6a28b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e272a50-68af-439b-86d3-167d72d6a28b","path":"sprites/spr_charisma_icon/spr_charisma_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"244ffbba-ba6f-4417-9adc-cb55077bbbf4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e272a50-68af-439b-86d3-167d72d6a28b","path":"sprites/spr_charisma_icon/spr_charisma_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"244ffbba-ba6f-4417-9adc-cb55077bbbf4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_checker_texture/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png b/sprites/spr_checker_texture/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png index 0c7b0dd3dc..8ecf8e9f25 100644 Binary files a/sprites/spr_checker_texture/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png and b/sprites/spr_checker_texture/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png differ diff --git a/sprites/spr_checker_texture/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png b/sprites/spr_checker_texture/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png index 0c7b0dd3dc..19bf6388b1 100644 Binary files a/sprites/spr_checker_texture/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png and b/sprites/spr_checker_texture/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png differ diff --git a/sprites/spr_checker_texture/spr_checker_texture.yy b/sprites/spr_checker_texture/spr_checker_texture.yy index 58da2000eb..3cb1256c79 100644 --- a/sprites/spr_checker_texture/spr_checker_texture.yy +++ b/sprites/spr_checker_texture/spr_checker_texture.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_checker_texture", "bboxMode":0, "bbox_bottom":179, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":true, "frames":[ - {"$GMSpriteFrame":"","%Name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,6 +82,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":180.0, + "seqWidth":180.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_checker_texture_small/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png b/sprites/spr_checker_texture_small/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png new file mode 100644 index 0000000000..3f3a8fcd9b Binary files /dev/null and b/sprites/spr_checker_texture_small/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png differ diff --git a/sprites/spr_checker_texture_small/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png b/sprites/spr_checker_texture_small/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png new file mode 100644 index 0000000000..3f3a8fcd9b Binary files /dev/null and b/sprites/spr_checker_texture_small/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png differ diff --git a/sprites/spr_checker_texture_small/spr_checker_texture_small.yy b/sprites/spr_checker_texture_small/spr_checker_texture_small.yy new file mode 100644 index 0000000000..9a86f5fc88 --- /dev/null +++ b/sprites/spr_checker_texture_small/spr_checker_texture_small.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_checker_texture_small", + "bboxMode":0, + "bbox_bottom":179, + "bbox_left":0, + "bbox_right":179, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":true, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":180, + "HTile":true, + "layers":[ + {"$GMImageLayer":"","%Name":"ef1f92c3-6086-487a-a4a8-c38f6098016b","blendMode":0,"displayName":"default","isLocked":false,"name":"ef1f92c3-6086-487a-a4a8-c38f6098016b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_checker_texture_small", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":0, + "parent":{ + "name":"textures", + "path":"folders/Sprites/Marine Viewer/textures.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_checker_texture_small", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_checker_texture_small", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":180.0, + "seqWidth":180.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_checker_texture_small/spr_checker_texture_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1e6e1650-2926-4786-b31b-bbc04b9c7746","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":true, + "width":180, +} \ No newline at end of file diff --git a/sprites/spr_clear_checker/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png b/sprites/spr_clear_checker/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png new file mode 100644 index 0000000000..0dbed72ae2 Binary files /dev/null and b/sprites/spr_clear_checker/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png differ diff --git a/sprites/spr_clear_checker/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png b/sprites/spr_clear_checker/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png new file mode 100644 index 0000000000..19bf6388b1 Binary files /dev/null and b/sprites/spr_clear_checker/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png differ diff --git a/sprites/spr_clear_checker/spr_clear_checker.yy b/sprites/spr_clear_checker/spr_clear_checker.yy new file mode 100644 index 0000000000..b3ddab2f6b --- /dev/null +++ b/sprites/spr_clear_checker/spr_clear_checker.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_clear_checker", + "bboxMode":0, + "bbox_bottom":179, + "bbox_left":0, + "bbox_right":179, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":true, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":180, + "HTile":true, + "layers":[ + {"$GMImageLayer":"","%Name":"ef1f92c3-6086-487a-a4a8-c38f6098016b","blendMode":0,"displayName":"default","isLocked":false,"name":"ef1f92c3-6086-487a-a4a8-c38f6098016b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_clear_checker", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":0, + "parent":{ + "name":"textures", + "path":"folders/Sprites/Marine Viewer/textures.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_clear_checker", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_clear_checker", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":180.0, + "seqWidth":180.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_clear_checker/spr_clear_checker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1e6e1650-2926-4786-b31b-bbc04b9c7746","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":true, + "width":180, +} \ No newline at end of file diff --git a/sprites/spr_cloak_cloth/spr_cloak_cloth.yy b/sprites/spr_cloak_cloth/spr_cloak_cloth.yy index abbfaf3025..fdff1a38c9 100644 --- a/sprites/spr_cloak_cloth/spr_cloak_cloth.yy +++ b/sprites/spr_cloak_cloth/spr_cloak_cloth.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cloak_cloth", "bboxMode":0, "bbox_bottom":212, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_cloak_cloth/spr_cloak_cloth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9facd769-5509-4fb6-8e77-cadc247917bb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_cloak_cloth/spr_cloak_cloth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9facd769-5509-4fb6-8e77-cadc247917bb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_cloak_fur/spr_cloak_fur.yy b/sprites/spr_cloak_fur/spr_cloak_fur.yy index bfba41d1a2..c0c86cff59 100644 --- a/sprites/spr_cloak_fur/spr_cloak_fur.yy +++ b/sprites/spr_cloak_fur/spr_cloak_fur.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cloak_fur", "bboxMode":0, "bbox_bottom":216, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_cloak_image_0/spr_cloak_image_0.yy b/sprites/spr_cloak_image_0/spr_cloak_image_0.yy index 19ef9445b2..a7ae8826a7 100644 --- a/sprites/spr_cloak_image_0/spr_cloak_image_0.yy +++ b/sprites/spr_cloak_image_0/spr_cloak_image_0.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cloak_image_0", "bboxMode":0, "bbox_bottom":213, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c72801d7-56dd-43d1-b640-7693f208ed61","name":"c72801d7-56dd-43d1-b640-7693f208ed61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"213d39c2-a47f-41a9-9d8c-91f0d170c2ca","name":"213d39c2-a47f-41a9-9d8c-91f0d170c2ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee7bc50b-e97a-4f13-9212-715ceeb5628f","name":"ee7bc50b-e97a-4f13-9212-715ceeb5628f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"82e364e5-8083-4ceb-b0e3-26fa3dacab4d","name":"82e364e5-8083-4ceb-b0e3-26fa3dacab4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"004e9cd8-7bda-477f-a4bf-51afa86eacde","name":"004e9cd8-7bda-477f-a4bf-51afa86eacde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c72801d7-56dd-43d1-b640-7693f208ed61","name":"c72801d7-56dd-43d1-b640-7693f208ed61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"213d39c2-a47f-41a9-9d8c-91f0d170c2ca","name":"213d39c2-a47f-41a9-9d8c-91f0d170c2ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee7bc50b-e97a-4f13-9212-715ceeb5628f","name":"ee7bc50b-e97a-4f13-9212-715ceeb5628f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82e364e5-8083-4ceb-b0e3-26fa3dacab4d","name":"82e364e5-8083-4ceb-b0e3-26fa3dacab4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"004e9cd8-7bda-477f-a4bf-51afa86eacde","name":"004e9cd8-7bda-477f-a4bf-51afa86eacde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c72801d7-56dd-43d1-b640-7693f208ed61","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9e16542-ea41-470d-8d85-ec4af04648aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"213d39c2-a47f-41a9-9d8c-91f0d170c2ca","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41456926-78d1-4b71-9ecf-24beb63ed9d6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee7bc50b-e97a-4f13-9212-715ceeb5628f","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d3cf5ee-ba23-4311-af2e-588e1972e447","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82e364e5-8083-4ceb-b0e3-26fa3dacab4d","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"897d121f-764b-4f0f-9d2a-5d8e558a373e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"004e9cd8-7bda-477f-a4bf-51afa86eacde","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"07b0b8b6-ea9e-4a9b-badf-51f3f9c76286","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c72801d7-56dd-43d1-b640-7693f208ed61","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9e16542-ea41-470d-8d85-ec4af04648aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"213d39c2-a47f-41a9-9d8c-91f0d170c2ca","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41456926-78d1-4b71-9ecf-24beb63ed9d6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee7bc50b-e97a-4f13-9212-715ceeb5628f","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d3cf5ee-ba23-4311-af2e-588e1972e447","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82e364e5-8083-4ceb-b0e3-26fa3dacab4d","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"897d121f-764b-4f0f-9d2a-5d8e558a373e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"004e9cd8-7bda-477f-a4bf-51afa86eacde","path":"sprites/spr_cloak_image_0/spr_cloak_image_0.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"07b0b8b6-ea9e-4a9b-badf-51f3f9c76286","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_cloak_image_1/spr_cloak_image_1.yy b/sprites/spr_cloak_image_1/spr_cloak_image_1.yy index 3134e9982f..90a1f8eb24 100644 --- a/sprites/spr_cloak_image_1/spr_cloak_image_1.yy +++ b/sprites/spr_cloak_image_1/spr_cloak_image_1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cloak_image_1", "bboxMode":0, "bbox_bottom":194, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"86655c3b-40c5-4949-ad48-c902d6771b28","name":"86655c3b-40c5-4949-ad48-c902d6771b28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d6e5b376-dfdd-447d-8e4c-6275371cf2f3","name":"d6e5b376-dfdd-447d-8e4c-6275371cf2f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"383ca815-1d27-4a01-b20c-0c72c2beab37","name":"383ca815-1d27-4a01-b20c-0c72c2beab37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"86655c3b-40c5-4949-ad48-c902d6771b28","name":"86655c3b-40c5-4949-ad48-c902d6771b28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d6e5b376-dfdd-447d-8e4c-6275371cf2f3","name":"d6e5b376-dfdd-447d-8e4c-6275371cf2f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"383ca815-1d27-4a01-b20c-0c72c2beab37","name":"383ca815-1d27-4a01-b20c-0c72c2beab37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"86655c3b-40c5-4949-ad48-c902d6771b28","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53deed36-8fc2-4957-aa50-c5a14669fa21","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6e5b376-dfdd-447d-8e4c-6275371cf2f3","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05edf084-44f9-43af-8927-dc2cce5941a3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"383ca815-1d27-4a01-b20c-0c72c2beab37","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8fd4e74c-80c9-49f1-92ad-c6977e052f9b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"86655c3b-40c5-4949-ad48-c902d6771b28","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53deed36-8fc2-4957-aa50-c5a14669fa21","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6e5b376-dfdd-447d-8e4c-6275371cf2f3","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05edf084-44f9-43af-8927-dc2cce5941a3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"383ca815-1d27-4a01-b20c-0c72c2beab37","path":"sprites/spr_cloak_image_1/spr_cloak_image_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8fd4e74c-80c9-49f1-92ad-c6977e052f9b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_cloak_scale/spr_cloak_scale.yy b/sprites/spr_cloak_scale/spr_cloak_scale.yy index bf8d28bc7a..9c6072e0fc 100644 --- a/sprites/spr_cloak_scale/spr_cloak_scale.yy +++ b/sprites/spr_cloak_scale/spr_cloak_scale.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cloak_scale", "bboxMode":0, "bbox_bottom":212, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a25ab997-78d1-493d-8c42-60f772947082","name":"a25ab997-78d1-493d-8c42-60f772947082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a25ab997-78d1-493d-8c42-60f772947082","name":"a25ab997-78d1-493d-8c42-60f772947082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_cloak_scale/spr_cloak_scale.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44d03fd0-264d-4713-9b5e-2a0894c5b4dd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a25ab997-78d1-493d-8c42-60f772947082","path":"sprites/spr_cloak_scale/spr_cloak_scale.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"993b3549-1db6-49f3-ab15-bca44e2ab03a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_cloak_scale/spr_cloak_scale.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44d03fd0-264d-4713-9b5e-2a0894c5b4dd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a25ab997-78d1-493d-8c42-60f772947082","path":"sprites/spr_cloak_scale/spr_cloak_scale.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"993b3549-1db6-49f3-ab15-bca44e2ab03a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy b/sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy index 7cb028bf21..b7dcac5ebf 100644 --- a/sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy +++ b/sprites/spr_cloth_tabbard/spr_cloth_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cloth_tabbard", "bboxMode":0, "bbox_bottom":230, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a4969c4d-bb32-4b93-8aed-93bd969a4101","name":"a4969c4d-bb32-4b93-8aed-93bd969a4101","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a4969c4d-bb32-4b93-8aed-93bd969a4101","name":"a4969c4d-bb32-4b93-8aed-93bd969a4101","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_clothing_colors/spr_clothing_colors.yy b/sprites/spr_clothing_colors/spr_clothing_colors.yy index 0032082988..8fe794b712 100644 --- a/sprites/spr_clothing_colors/spr_clothing_colors.yy +++ b/sprites/spr_clothing_colors/spr_clothing_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_clothing_colors", "bboxMode":0, "bbox_bottom":224, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6c1ac744-e669-4c51-96ac-bbe8eea6bfae","name":"6c1ac744-e669-4c51-96ac-bbe8eea6bfae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d158eb91-f130-4e16-af39-30aac05cb488","name":"d158eb91-f130-4e16-af39-30aac05cb488","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"342e62ff-f04a-428e-a2d9-8233602655b8","name":"342e62ff-f04a-428e-a2d9-8233602655b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8e914c6-8ce3-4abc-93ca-2420808bf57e","name":"e8e914c6-8ce3-4abc-93ca-2420808bf57e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"28a52a45-1899-4218-b532-41887f1818c7","name":"28a52a45-1899-4218-b532-41887f1818c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"772e8755-978f-4592-8a42-f82683e16608","name":"772e8755-978f-4592-8a42-f82683e16608","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6c1ac744-e669-4c51-96ac-bbe8eea6bfae","name":"6c1ac744-e669-4c51-96ac-bbe8eea6bfae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d158eb91-f130-4e16-af39-30aac05cb488","name":"d158eb91-f130-4e16-af39-30aac05cb488","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"342e62ff-f04a-428e-a2d9-8233602655b8","name":"342e62ff-f04a-428e-a2d9-8233602655b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8e914c6-8ce3-4abc-93ca-2420808bf57e","name":"e8e914c6-8ce3-4abc-93ca-2420808bf57e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"28a52a45-1899-4218-b532-41887f1818c7","name":"28a52a45-1899-4218-b532-41887f1818c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"772e8755-978f-4592-8a42-f82683e16608","name":"772e8755-978f-4592-8a42-f82683e16608","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,6 +68,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_cm_specialty/spr_cm_specialty.yy b/sprites/spr_cm_specialty/spr_cm_specialty.yy index e48463382e..364bf12cad 100644 --- a/sprites/spr_cm_specialty/spr_cm_specialty.yy +++ b/sprites/spr_cm_specialty/spr_cm_specialty.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cm_specialty", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_cog_pinion/spr_cog_pinion.yy b/sprites/spr_cog_pinion/spr_cog_pinion.yy index 28990eaf2d..f744442557 100644 --- a/sprites/spr_cog_pinion/spr_cog_pinion.yy +++ b/sprites/spr_cog_pinion/spr_cog_pinion.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cog_pinion", "bboxMode":0, "bbox_bottom":60, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dbf9f8bc-8396-410a-a23d-6e209fe61c76","name":"dbf9f8bc-8396-410a-a23d-6e209fe61c76","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbf9f8bc-8396-410a-a23d-6e209fe61c76","name":"dbf9f8bc-8396-410a-a23d-6e209fe61c76","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbf9f8bc-8396-410a-a23d-6e209fe61c76","path":"sprites/spr_cog_pinion/spr_cog_pinion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b66f1b8b-ed80-487e-a66d-21dcb51e53e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbf9f8bc-8396-410a-a23d-6e209fe61c76","path":"sprites/spr_cog_pinion/spr_cog_pinion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b66f1b8b-ed80-487e-a66d-21dcb51e53e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_combat_shield_bottom_part/0ca30034-8ae6-44ea-ab2a-6277d1920908.png b/sprites/spr_combat_shield_bottom_part/0ca30034-8ae6-44ea-ab2a-6277d1920908.png new file mode 100644 index 0000000000..8d5f84a1a4 Binary files /dev/null and b/sprites/spr_combat_shield_bottom_part/0ca30034-8ae6-44ea-ab2a-6277d1920908.png differ diff --git a/sprites/spr_combat_shield_bottom_part/587d63a4-32c8-4617-9c28-59a8a099c2c1.png b/sprites/spr_combat_shield_bottom_part/587d63a4-32c8-4617-9c28-59a8a099c2c1.png new file mode 100644 index 0000000000..cf3e380af8 Binary files /dev/null and b/sprites/spr_combat_shield_bottom_part/587d63a4-32c8-4617-9c28-59a8a099c2c1.png differ diff --git a/sprites/spr_combat_shield_bottom_part/layers/0ca30034-8ae6-44ea-ab2a-6277d1920908/5cc2322f-a426-43f4-bc78-5cc25edf9210.png b/sprites/spr_combat_shield_bottom_part/layers/0ca30034-8ae6-44ea-ab2a-6277d1920908/5cc2322f-a426-43f4-bc78-5cc25edf9210.png new file mode 100644 index 0000000000..8d5f84a1a4 Binary files /dev/null and b/sprites/spr_combat_shield_bottom_part/layers/0ca30034-8ae6-44ea-ab2a-6277d1920908/5cc2322f-a426-43f4-bc78-5cc25edf9210.png differ diff --git a/sprites/spr_combat_shield_bottom_part/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png b/sprites/spr_combat_shield_bottom_part/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png new file mode 100644 index 0000000000..cf3e380af8 Binary files /dev/null and b/sprites/spr_combat_shield_bottom_part/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png differ diff --git a/sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy b/sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy new file mode 100644 index 0000000000..06b31e8c60 --- /dev/null +++ b/sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy @@ -0,0 +1,96 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_combat_shield_bottom_part", + "bboxMode":0, + "bbox_bottom":220, + "bbox_left":7, + "bbox_right":72, + "bbox_top":189, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"0ca30034-8ae6-44ea-ab2a-6277d1920908","name":"0ca30034-8ae6-44ea-ab2a-6277d1920908","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"5cc2322f-a426-43f4-bc78-5cc25edf9210","blendMode":0,"displayName":"default","isLocked":false,"name":"5cc2322f-a426-43f4-bc78-5cc25edf9210","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_combat_shield_bottom_part", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"gear", + "path":"folders/Sprites/Marine Viewer/gear.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_combat_shield_bottom_part", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_combat_shield_bottom_part", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ca30034-8ae6-44ea-ab2a-6277d1920908","path":"sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6a05f034-da34-4cbc-9334-b13b05307598","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","path":"sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"75d1f4bf-959e-4143-bae9-859b4f9af86d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_company_title/spr_company_title.yy b/sprites/spr_company_title/spr_company_title.yy index b9f24f95c9..adc402ee74 100644 --- a/sprites/spr_company_title/spr_company_title.yy +++ b/sprites/spr_company_title/spr_company_title.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_company_title", "bboxMode":0, "bbox_bottom":3, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"96f4818d-2abf-4dbb-9091-dda8c16f8d91","name":"96f4818d-2abf-4dbb-9091-dda8c16f8d91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"78cdfbff-e2ab-4284-a510-7bd46996352c","name":"78cdfbff-e2ab-4284-a510-7bd46996352c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0c92f00f-18d5-4e3e-95a5-d2e445da36ff","name":"0c92f00f-18d5-4e3e-95a5-d2e445da36ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb1570f7-dfce-415e-a264-421464e1321a","name":"bb1570f7-dfce-415e-a264-421464e1321a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40f0521b-75e7-4e26-b6c8-de7784fefbbc","name":"40f0521b-75e7-4e26-b6c8-de7784fefbbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96f4818d-2abf-4dbb-9091-dda8c16f8d91","name":"96f4818d-2abf-4dbb-9091-dda8c16f8d91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"78cdfbff-e2ab-4284-a510-7bd46996352c","name":"78cdfbff-e2ab-4284-a510-7bd46996352c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0c92f00f-18d5-4e3e-95a5-d2e445da36ff","name":"0c92f00f-18d5-4e3e-95a5-d2e445da36ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb1570f7-dfce-415e-a264-421464e1321a","name":"bb1570f7-dfce-415e-a264-421464e1321a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40f0521b-75e7-4e26-b6c8-de7784fefbbc","name":"40f0521b-75e7-4e26-b6c8-de7784fefbbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -67,6 +67,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":4.0, + "seqWidth":107.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_constitution_icon/spr_constitution_icon.yy b/sprites/spr_constitution_icon/spr_constitution_icon.yy index ee704700f7..a0c67818de 100644 --- a/sprites/spr_constitution_icon/spr_constitution_icon.yy +++ b/sprites/spr_constitution_icon/spr_constitution_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_constitution_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2ede6373-6324-4bbd-80e1-d93621f9e4fa","name":"2ede6373-6324-4bbd-80e1-d93621f9e4fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2ede6373-6324-4bbd-80e1-d93621f9e4fa","name":"2ede6373-6324-4bbd-80e1-d93621f9e4fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ede6373-6324-4bbd-80e1-d93621f9e4fa","path":"sprites/spr_constitution_icon/spr_constitution_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1193a06e-7496-4d5b-a172-a3b16075b9a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ede6373-6324-4bbd-80e1-d93621f9e4fa","path":"sprites/spr_constitution_icon/spr_constitution_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1193a06e-7496-4d5b-a172-a3b16075b9a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_contemptor_CCW/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e.png b/sprites/spr_contemptor_CCW/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e.png new file mode 100644 index 0000000000..d0f4a7d105 Binary files /dev/null and b/sprites/spr_contemptor_CCW/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e.png differ diff --git a/sprites/spr_contemptor_CCW/layers/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e/be470e13-bbeb-41d1-ae61-263c91abbae3.png b/sprites/spr_contemptor_CCW/layers/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e/be470e13-bbeb-41d1-ae61-263c91abbae3.png new file mode 100644 index 0000000000..d0f4a7d105 Binary files /dev/null and b/sprites/spr_contemptor_CCW/layers/8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e/be470e13-bbeb-41d1-ae61-263c91abbae3.png differ diff --git a/sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy b/sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy new file mode 100644 index 0000000000..3ea3c2fdea --- /dev/null +++ b/sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_contemptor_CCW", + "bboxMode":0, + "bbox_bottom":173, + "bbox_left":34, + "bbox_right":159, + "bbox_top":84, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e","name":"8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":250, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"be470e13-bbeb-41d1-ae61-263c91abbae3","blendMode":0,"displayName":"default","isLocked":false,"name":"be470e13-bbeb-41d1-ae61-263c91abbae3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_contemptor_CCW", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"dreadnought", + "path":"folders/Sprites/Marine Viewer/dreadnought.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_contemptor_CCW", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_contemptor_CCW", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":250.0, + "seqWidth":306.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c0bf9aa-b172-4cd7-b1a7-076d9fd90f9e","path":"sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6e2b8255-80d9-44fb-90a8-fd804243ca38","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":61, + "yorigin":18, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":306, +} \ No newline at end of file diff --git a/sprites/spr_contemptor_chasis_colors/d55f9e41-41e0-43bd-b40c-86d963212769.png b/sprites/spr_contemptor_chasis_colors/d55f9e41-41e0-43bd-b40c-86d963212769.png new file mode 100644 index 0000000000..0dbe722fa3 Binary files /dev/null and b/sprites/spr_contemptor_chasis_colors/d55f9e41-41e0-43bd-b40c-86d963212769.png differ diff --git a/sprites/spr_contemptor_chasis_colors/layers/d55f9e41-41e0-43bd-b40c-86d963212769/c511d01c-c558-46fa-b06f-82950d47dfc4.png b/sprites/spr_contemptor_chasis_colors/layers/d55f9e41-41e0-43bd-b40c-86d963212769/c511d01c-c558-46fa-b06f-82950d47dfc4.png new file mode 100644 index 0000000000..0dbe722fa3 Binary files /dev/null and b/sprites/spr_contemptor_chasis_colors/layers/d55f9e41-41e0-43bd-b40c-86d963212769/c511d01c-c558-46fa-b06f-82950d47dfc4.png differ diff --git a/sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy b/sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy new file mode 100644 index 0000000000..77b1b3efe9 --- /dev/null +++ b/sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_contemptor_chasis_colors", + "bboxMode":0, + "bbox_bottom":249, + "bbox_left":72, + "bbox_right":243, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"d55f9e41-41e0-43bd-b40c-86d963212769","name":"d55f9e41-41e0-43bd-b40c-86d963212769","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":250, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"c511d01c-c558-46fa-b06f-82950d47dfc4","blendMode":0,"displayName":"default","isLocked":false,"name":"c511d01c-c558-46fa-b06f-82950d47dfc4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_contemptor_chasis_colors", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"dreadnought", + "path":"folders/Sprites/Marine Viewer/dreadnought.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_contemptor_chasis_colors", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_contemptor_chasis_colors", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":250.0, + "seqWidth":306.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d55f9e41-41e0-43bd-b40c-86d963212769","path":"sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"84faeb3a-e305-44d2-80c7-0e9bacc81e82","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":61, + "yorigin":18, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":306, +} \ No newline at end of file diff --git a/sprites/spr_contemptor_head_colors/74c01830-4218-44ae-aa3d-aba9109cecc2.png b/sprites/spr_contemptor_head_colors/74c01830-4218-44ae-aa3d-aba9109cecc2.png new file mode 100644 index 0000000000..1adb141291 Binary files /dev/null and b/sprites/spr_contemptor_head_colors/74c01830-4218-44ae-aa3d-aba9109cecc2.png differ diff --git a/sprites/spr_contemptor_head_colors/layers/74c01830-4218-44ae-aa3d-aba9109cecc2/b113086c-f660-4cc2-bbdb-b89f64979d6b.png b/sprites/spr_contemptor_head_colors/layers/74c01830-4218-44ae-aa3d-aba9109cecc2/b113086c-f660-4cc2-bbdb-b89f64979d6b.png new file mode 100644 index 0000000000..1adb141291 Binary files /dev/null and b/sprites/spr_contemptor_head_colors/layers/74c01830-4218-44ae-aa3d-aba9109cecc2/b113086c-f660-4cc2-bbdb-b89f64979d6b.png differ diff --git a/sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy b/sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy new file mode 100644 index 0000000000..c2ae9398f7 --- /dev/null +++ b/sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_contemptor_head_colors", + "bboxMode":0, + "bbox_bottom":47, + "bbox_left":143, + "bbox_right":172, + "bbox_top":29, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"74c01830-4218-44ae-aa3d-aba9109cecc2","name":"74c01830-4218-44ae-aa3d-aba9109cecc2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":250, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"b113086c-f660-4cc2-bbdb-b89f64979d6b","blendMode":0,"displayName":"default","isLocked":false,"name":"b113086c-f660-4cc2-bbdb-b89f64979d6b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_contemptor_head_colors", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"dreadnought", + "path":"folders/Sprites/Marine Viewer/dreadnought.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_contemptor_head_colors", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_contemptor_head_colors", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":250.0, + "seqWidth":306.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74c01830-4218-44ae-aa3d-aba9109cecc2","path":"sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"54d5695e-8560-4098-8bd1-1686b108adbb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":61, + "yorigin":18, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":306, +} \ No newline at end of file diff --git a/sprites/spr_craftworld/spr_craftworld.yy b/sprites/spr_craftworld/spr_craftworld.yy index 9b36786628..01c5f46600 100644 --- a/sprites/spr_craftworld/spr_craftworld.yy +++ b/sprites/spr_craftworld/spr_craftworld.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_craftworld", "bboxMode":0, "bbox_bottom":26, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"83cd9b31-9641-44c6-b4cb-497f9df594f3","name":"83cd9b31-9641-44c6-b4cb-497f9df594f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83cd9b31-9641-44c6-b4cb-497f9df594f3","name":"83cd9b31-9641-44c6-b4cb-497f9df594f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83cd9b31-9641-44c6-b4cb-497f9df594f3","path":"sprites/spr_craftworld/spr_craftworld.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9944b635-d444-4e75-8014-13b87418629f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83cd9b31-9641-44c6-b4cb-497f9df594f3","path":"sprites/spr_craftworld/spr_craftworld.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9944b635-d444-4e75-8014-13b87418629f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_creation_arrow/spr_creation_arrow.yy b/sprites/spr_creation_arrow/spr_creation_arrow.yy index 28bdb853c6..0b73d14549 100644 --- a/sprites/spr_creation_arrow/spr_creation_arrow.yy +++ b/sprites/spr_creation_arrow/spr_creation_arrow.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_arrow", "bboxMode":0, "bbox_bottom":63, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9ecbaa2-edb3-4c4d-ba86-a8e3e96db360","name":"a9ecbaa2-edb3-4c4d-ba86-a8e3e96db360","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1bd104b8-0ce5-4184-8054-9e99c49d194c","name":"1bd104b8-0ce5-4184-8054-9e99c49d194c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"42c6f263-877a-4591-beb7-d81925f4e4ed","name":"42c6f263-877a-4591-beb7-d81925f4e4ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8ebf4f8f-adac-4ef3-ad25-9775343b2245","name":"8ebf4f8f-adac-4ef3-ad25-9775343b2245","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"39637d47-757f-4595-84d8-5beaa78f7c74","name":"39637d47-757f-4595-84d8-5beaa78f7c74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9ecbaa2-edb3-4c4d-ba86-a8e3e96db360","name":"a9ecbaa2-edb3-4c4d-ba86-a8e3e96db360","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1bd104b8-0ce5-4184-8054-9e99c49d194c","name":"1bd104b8-0ce5-4184-8054-9e99c49d194c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42c6f263-877a-4591-beb7-d81925f4e4ed","name":"42c6f263-877a-4591-beb7-d81925f4e4ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8ebf4f8f-adac-4ef3-ad25-9775343b2245","name":"8ebf4f8f-adac-4ef3-ad25-9775343b2245","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39637d47-757f-4595-84d8-5beaa78f7c74","name":"39637d47-757f-4595-84d8-5beaa78f7c74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ecbaa2-edb3-4c4d-ba86-a8e3e96db360","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aff50e4e-5c01-4754-8871-c150741bb49a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1bd104b8-0ce5-4184-8054-9e99c49d194c","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"23464b9c-d1f0-454d-84da-d8e4cd32faf6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42c6f263-877a-4591-beb7-d81925f4e4ed","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"58c19629-922a-40bf-a3f8-3d971641ebc3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ebf4f8f-adac-4ef3-ad25-9775343b2245","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7eaa6082-50a0-4252-9d17-3267ce434f68","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39637d47-757f-4595-84d8-5beaa78f7c74","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0044680-b4da-481c-af80-7eeb1010fe14","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9ecbaa2-edb3-4c4d-ba86-a8e3e96db360","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aff50e4e-5c01-4754-8871-c150741bb49a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1bd104b8-0ce5-4184-8054-9e99c49d194c","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"23464b9c-d1f0-454d-84da-d8e4cd32faf6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"42c6f263-877a-4591-beb7-d81925f4e4ed","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"58c19629-922a-40bf-a3f8-3d971641ebc3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ebf4f8f-adac-4ef3-ad25-9775343b2245","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7eaa6082-50a0-4252-9d17-3267ce434f68","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39637d47-757f-4595-84d8-5beaa78f7c74","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0044680-b4da-481c-af80-7eeb1010fe14","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_creation_check/spr_creation_check.yy b/sprites/spr_creation_check/spr_creation_check.yy index afdd034a24..be967ad76d 100644 --- a/sprites/spr_creation_check/spr_creation_check.yy +++ b/sprites/spr_creation_check/spr_creation_check.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_check", "bboxMode":0, "bbox_bottom":27, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9d98e5fc-a42f-46f5-b533-fdf7b0b23a28","name":"9d98e5fc-a42f-46f5-b533-fdf7b0b23a28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c23faa1-9d33-420c-abee-14a54a948dbf","name":"2c23faa1-9d33-420c-abee-14a54a948dbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca7f8ca0-feb4-496b-8a91-057f2a1bfc90","name":"ca7f8ca0-feb4-496b-8a91-057f2a1bfc90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"254f0303-cebd-476e-b05b-d23837a0eb42","name":"254f0303-cebd-476e-b05b-d23837a0eb42","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9d98e5fc-a42f-46f5-b533-fdf7b0b23a28","name":"9d98e5fc-a42f-46f5-b533-fdf7b0b23a28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c23faa1-9d33-420c-abee-14a54a948dbf","name":"2c23faa1-9d33-420c-abee-14a54a948dbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca7f8ca0-feb4-496b-8a91-057f2a1bfc90","name":"ca7f8ca0-feb4-496b-8a91-057f2a1bfc90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"254f0303-cebd-476e-b05b-d23837a0eb42","name":"254f0303-cebd-476e-b05b-d23837a0eb42","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -66,6 +66,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_creation_existing/spr_creation_existing.yy b/sprites/spr_creation_existing/spr_creation_existing.yy index 4a609c8c64..7fb651473a 100644 --- a/sprites/spr_creation_existing/spr_creation_existing.yy +++ b/sprites/spr_creation_existing/spr_creation_existing.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_existing", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a4702d8d-c480-4c59-a45d-afd7fa7a086d","name":"a4702d8d-c480-4c59-a45d-afd7fa7a086d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a4702d8d-c480-4c59-a45d-afd7fa7a086d","name":"a4702d8d-c480-4c59-a45d-afd7fa7a086d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_creation_founding/spr_creation_founding.yy b/sprites/spr_creation_founding/spr_creation_founding.yy index fb8bb756dd..dce7c3976c 100644 --- a/sprites/spr_creation_founding/spr_creation_founding.yy +++ b/sprites/spr_creation_founding/spr_creation_founding.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_founding", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"469027c1-a05e-49c8-975f-f88b2b836a4c","name":"469027c1-a05e-49c8-975f-f88b2b836a4c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"469027c1-a05e-49c8-975f-f88b2b836a4c","name":"469027c1-a05e-49c8-975f-f88b2b836a4c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_creation_icon/spr_creation_icon.yy b/sprites/spr_creation_icon/spr_creation_icon.yy index 2596154da5..f7427da1c3 100644 --- a/sprites/spr_creation_icon/spr_creation_icon.yy +++ b/sprites/spr_creation_icon/spr_creation_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_icon", "bboxMode":0, "bbox_bottom":47, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9585cc92-d70a-45fd-bc25-8c9a240671d4","name":"9585cc92-d70a-45fd-bc25-8c9a240671d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9585cc92-d70a-45fd-bc25-8c9a240671d4","name":"9585cc92-d70a-45fd-bc25-8c9a240671d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9585cc92-d70a-45fd-bc25-8c9a240671d4","path":"sprites/spr_creation_icon/spr_creation_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e242762-9b45-4c27-89d9-881110ad528e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9585cc92-d70a-45fd-bc25-8c9a240671d4","path":"sprites/spr_creation_icon/spr_creation_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e242762-9b45-4c27-89d9-881110ad528e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_creation_nosplash/spr_creation_nosplash.yy b/sprites/spr_creation_nosplash/spr_creation_nosplash.yy index 353cc1a331..55025f904f 100644 --- a/sprites/spr_creation_nosplash/spr_creation_nosplash.yy +++ b/sprites/spr_creation_nosplash/spr_creation_nosplash.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_nosplash", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_creation_other/380cd3fb-d188-44e1-8e61-f3d7c0c8f526.png b/sprites/spr_creation_other/380cd3fb-d188-44e1-8e61-f3d7c0c8f526.png new file mode 100644 index 0000000000..0e27e2d795 Binary files /dev/null and b/sprites/spr_creation_other/380cd3fb-d188-44e1-8e61-f3d7c0c8f526.png differ diff --git a/sprites/spr_creation_other/layers/380cd3fb-d188-44e1-8e61-f3d7c0c8f526/d07f3659-6442-4004-bcfa-c2f9ad3619bf.png b/sprites/spr_creation_other/layers/380cd3fb-d188-44e1-8e61-f3d7c0c8f526/d07f3659-6442-4004-bcfa-c2f9ad3619bf.png new file mode 100644 index 0000000000..0e27e2d795 Binary files /dev/null and b/sprites/spr_creation_other/layers/380cd3fb-d188-44e1-8e61-f3d7c0c8f526/d07f3659-6442-4004-bcfa-c2f9ad3619bf.png differ diff --git a/sprites/spr_creation_other/spr_creation_other.yy b/sprites/spr_creation_other/spr_creation_other.yy index 20ca4c2e9b..5ef35ea548 100644 --- a/sprites/spr_creation_other/spr_creation_other.yy +++ b/sprites/spr_creation_other/spr_creation_other.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_other", "bboxMode":0, "bbox_bottom":0, @@ -11,7 +11,9 @@ "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, - "frames":[], + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"380cd3fb-d188-44e1-8e61-f3d7c0c8f526","name":"380cd3fb-d188-44e1-8e61-f3d7c0c8f526","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], "gridX":0, "gridY":0, "height":32, @@ -47,7 +49,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":0.0, + "length":1.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -61,16 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ - {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"380cd3fb-d188-44e1-8e61-f3d7c0c8f526","path":"sprites/spr_creation_other/spr_creation_other.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"34ff5991-1f2a-4119-96ef-8708bf533169","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, diff --git a/sprites/spr_creation_slate/6d4b0fe4-2d29-43cc-9838-317bd93abc41.png b/sprites/spr_creation_slate/6d4b0fe4-2d29-43cc-9838-317bd93abc41.png new file mode 100644 index 0000000000..0e27e2d795 Binary files /dev/null and b/sprites/spr_creation_slate/6d4b0fe4-2d29-43cc-9838-317bd93abc41.png differ diff --git a/sprites/spr_creation_slate/layers/6d4b0fe4-2d29-43cc-9838-317bd93abc41/edca4948-39ec-4e5f-ab97-4d1d7c174675.png b/sprites/spr_creation_slate/layers/6d4b0fe4-2d29-43cc-9838-317bd93abc41/edca4948-39ec-4e5f-ab97-4d1d7c174675.png new file mode 100644 index 0000000000..0e27e2d795 Binary files /dev/null and b/sprites/spr_creation_slate/layers/6d4b0fe4-2d29-43cc-9838-317bd93abc41/edca4948-39ec-4e5f-ab97-4d1d7c174675.png differ diff --git a/sprites/spr_creation_slate/spr_creation_slate.yy b/sprites/spr_creation_slate/spr_creation_slate.yy index 3abb41bb38..a2ea85d73b 100644 --- a/sprites/spr_creation_slate/spr_creation_slate.yy +++ b/sprites/spr_creation_slate/spr_creation_slate.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_creation_slate", "bboxMode":0, "bbox_bottom":0, @@ -11,7 +11,9 @@ "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, - "frames":[], + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"6d4b0fe4-2d29-43cc-9838-317bd93abc41","name":"6d4b0fe4-2d29-43cc-9838-317bd93abc41","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], "gridX":0, "gridY":0, "height":32, @@ -47,7 +49,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":0.0, + "length":1.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -61,16 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ - {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d4b0fe4-2d29-43cc-9838-317bd93abc41","path":"sprites/spr_creation_slate/spr_creation_slate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"64935b0e-41d4-4c0f-9837-488dd1953f08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, diff --git a/sprites/spr_credits_bg/spr_credits_bg.yy b/sprites/spr_credits_bg/spr_credits_bg.yy index dcab269967..bc9f0baea7 100644 --- a/sprites/spr_credits_bg/spr_credits_bg.yy +++ b/sprites/spr_credits_bg/spr_credits_bg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_credits_bg", "bboxMode":0, "bbox_bottom":643, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bcc7bf7f-47a7-4f62-90a0-a1941b3838da","name":"bcc7bf7f-47a7-4f62-90a0-a1941b3838da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bcc7bf7f-47a7-4f62-90a0-a1941b3838da","name":"bcc7bf7f-47a7-4f62-90a0-a1941b3838da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bcc7bf7f-47a7-4f62-90a0-a1941b3838da","path":"sprites/spr_credits_bg/spr_credits_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"61b3a396-5457-4d32-9cd2-2909f55558cf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bcc7bf7f-47a7-4f62-90a0-a1941b3838da","path":"sprites/spr_credits_bg/spr_credits_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"61b3a396-5457-4d32-9cd2-2909f55558cf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_crusader/spr_crusader.yy b/sprites/spr_crusader/spr_crusader.yy index 889a668ca3..59fb6c58e9 100644 --- a/sprites/spr_crusader/spr_crusader.yy +++ b/sprites/spr_crusader/spr_crusader.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_crusader", "bboxMode":0, "bbox_bottom":231, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4aa0655a-ad7e-41fb-acc5-995c3f821926","name":"4aa0655a-ad7e-41fb-acc5-995c3f821926","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4aa0655a-ad7e-41fb-acc5-995c3f821926","name":"4aa0655a-ad7e-41fb-acc5-995c3f821926","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4aa0655a-ad7e-41fb-acc5-995c3f821926","path":"sprites/spr_crusader/spr_crusader.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5f31e49a-6006-4538-8379-bb4041c1a227","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4aa0655a-ad7e-41fb-acc5-995c3f821926","path":"sprites/spr_crusader/spr_crusader.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5f31e49a-6006-4538-8379-bb4041c1a227","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_crux_belt_fancy/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4.png b/sprites/spr_crux_belt_fancy/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4.png new file mode 100644 index 0000000000..ebc56a0275 Binary files /dev/null and b/sprites/spr_crux_belt_fancy/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4.png differ diff --git a/sprites/spr_crux_belt_fancy/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png b/sprites/spr_crux_belt_fancy/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png new file mode 100644 index 0000000000..455cdef75d Binary files /dev/null and b/sprites/spr_crux_belt_fancy/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1.png differ diff --git a/sprites/spr_crux_belt_fancy/layers/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4/a3482820-22c0-4934-a6c1-87b382d13fad.png b/sprites/spr_crux_belt_fancy/layers/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4/a3482820-22c0-4934-a6c1-87b382d13fad.png new file mode 100644 index 0000000000..ebc56a0275 Binary files /dev/null and b/sprites/spr_crux_belt_fancy/layers/8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4/a3482820-22c0-4934-a6c1-87b382d13fad.png differ diff --git a/sprites/spr_crux_belt_fancy/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png b/sprites/spr_crux_belt_fancy/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png new file mode 100644 index 0000000000..455cdef75d Binary files /dev/null and b/sprites/spr_crux_belt_fancy/layers/bb6b8e74-ce86-4f55-a05a-63c120b9dfb1/7d1b6c03-f7ec-4403-8b30-9c53ab5a127d.png differ diff --git a/sprites/spr_crux_belt_fancy/spr_crux_belt_fancy.yy b/sprites/spr_crux_belt_fancy/spr_crux_belt_fancy.yy new file mode 100644 index 0000000000..97b9ce2caf --- /dev/null +++ b/sprites/spr_crux_belt_fancy/spr_crux_belt_fancy.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_crux_belt_fancy", + "bboxMode":0, + "bbox_bottom":110, + "bbox_left":3, + "bbox_right":109, + "bbox_top":21, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"a3482820-22c0-4934-a6c1-87b382d13fad","blendMode":0,"displayName":"default","isLocked":false,"name":"a3482820-22c0-4934-a6c1-87b382d13fad","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_crux_belt_fancy", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"specialist", + "path":"folders/Sprites/Marine Viewer/body_types/specialist.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_crux_belt_fancy", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_crux_belt_fancy", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","path":"sprites/spr_crux_belt_fancy/spr_crux_belt_fancy.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9b724e95-f10f-4ea0-888a-549bb453f7be","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":-2, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_crux_on_chain/spr_crux_on_chain.yy b/sprites/spr_crux_on_chain/spr_crux_on_chain.yy index 66d4d2b3d8..cee60c04dc 100644 --- a/sprites/spr_crux_on_chain/spr_crux_on_chain.yy +++ b/sprites/spr_crux_on_chain/spr_crux_on_chain.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_crux_on_chain", "bboxMode":0, "bbox_bottom":35, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy b/sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy index d7840ee2df..827bcebff8 100644 --- a/sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy +++ b/sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cthonian_tabbard", "bboxMode":0, "bbox_bottom":169, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_cursor/spr_cursor.yy b/sprites/spr_cursor/spr_cursor.yy index ab459a78e6..968b16b175 100644 --- a/sprites/spr_cursor/spr_cursor.yy +++ b/sprites/spr_cursor/spr_cursor.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_cursor", "bboxMode":0, "bbox_bottom":31, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"93ff084c-a13e-45b0-95ec-cc841cc02089","name":"93ff084c-a13e-45b0-95ec-cc841cc02089","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f02125fa-0440-4c76-bafb-a3e04a5d13e7","name":"f02125fa-0440-4c76-bafb-a3e04a5d13e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4c07a38-bb56-4dd9-8b02-741295614559","name":"d4c07a38-bb56-4dd9-8b02-741295614559","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"25b1bbac-cb87-44b3-9e9a-cf087f58b5fb","name":"25b1bbac-cb87-44b3-9e9a-cf087f58b5fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"437349a9-fdd1-438f-bfe1-5c0b7137503f","name":"437349a9-fdd1-438f-bfe1-5c0b7137503f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93ff084c-a13e-45b0-95ec-cc841cc02089","name":"93ff084c-a13e-45b0-95ec-cc841cc02089","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f02125fa-0440-4c76-bafb-a3e04a5d13e7","name":"f02125fa-0440-4c76-bafb-a3e04a5d13e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4c07a38-bb56-4dd9-8b02-741295614559","name":"d4c07a38-bb56-4dd9-8b02-741295614559","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25b1bbac-cb87-44b3-9e9a-cf087f58b5fb","name":"25b1bbac-cb87-44b3-9e9a-cf087f58b5fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"437349a9-fdd1-438f-bfe1-5c0b7137503f","name":"437349a9-fdd1-438f-bfe1-5c0b7137503f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -67,6 +67,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_cyclone_launcher/8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50.png b/sprites/spr_cyclone_launcher/8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50.png new file mode 100644 index 0000000000..28214710a8 Binary files /dev/null and b/sprites/spr_cyclone_launcher/8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50.png differ diff --git a/sprites/spr_cyclone_launcher/layers/8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50/0f31cf23-d758-4aec-a384-f40c841e8042.png b/sprites/spr_cyclone_launcher/layers/8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50/0f31cf23-d758-4aec-a384-f40c841e8042.png new file mode 100644 index 0000000000..817864684d Binary files /dev/null and b/sprites/spr_cyclone_launcher/layers/8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50/0f31cf23-d758-4aec-a384-f40c841e8042.png differ diff --git a/sprites/spr_cyclone_launcher/spr_cyclone_launcher.yy b/sprites/spr_cyclone_launcher/spr_cyclone_launcher.yy new file mode 100644 index 0000000000..f3df275762 --- /dev/null +++ b/sprites/spr_cyclone_launcher/spr_cyclone_launcher.yy @@ -0,0 +1,90 @@ +{ + "$GMSprite":"", + "%Name":"spr_cyclone_launcher", + "bboxMode":0, + "bbox_bottom":56, + "bbox_left":18, + "bbox_right":162, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","name":"69575369-6061-47a6-b608-894dae3a1efd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":262, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"0f31cf23-d758-4aec-a384-f40c841e8042","blendMode":0,"displayName":"default","isLocked":false,"name":"0f31cf23-d758-4aec-a384-f40c841e8042","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_cyclone_launcher", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"packs", + "path":"folders/Sprites/Marine Viewer/packs.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_cyclone_launcher", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_cyclone_launcher", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","path":"sprites/spr_cyclone_launcher/spr_cyclone_launcher.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f0c1f3a8-3480-46bb-990e-e40fbdd3727f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":7, + "yorigin":45, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_da_backpack/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec.png b/sprites/spr_da_backpack/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec.png index d02cd42edc..5790390130 100644 Binary files a/sprites/spr_da_backpack/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec.png and b/sprites/spr_da_backpack/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec.png differ diff --git a/sprites/spr_da_backpack/69575369-6061-47a6-b608-894dae3a1efd.png b/sprites/spr_da_backpack/69575369-6061-47a6-b608-894dae3a1efd.png index ff2657fd3a..3793af5659 100644 Binary files a/sprites/spr_da_backpack/69575369-6061-47a6-b608-894dae3a1efd.png and b/sprites/spr_da_backpack/69575369-6061-47a6-b608-894dae3a1efd.png differ diff --git a/sprites/spr_da_backpack/layers/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec/25a3433d-721c-49ce-8a7a-3513cf831ef5.png b/sprites/spr_da_backpack/layers/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec/25a3433d-721c-49ce-8a7a-3513cf831ef5.png index d02cd42edc..5790390130 100644 Binary files a/sprites/spr_da_backpack/layers/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec/25a3433d-721c-49ce-8a7a-3513cf831ef5.png and b/sprites/spr_da_backpack/layers/66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec/25a3433d-721c-49ce-8a7a-3513cf831ef5.png differ diff --git a/sprites/spr_da_backpack/layers/69575369-6061-47a6-b608-894dae3a1efd/25a3433d-721c-49ce-8a7a-3513cf831ef5.png b/sprites/spr_da_backpack/layers/69575369-6061-47a6-b608-894dae3a1efd/25a3433d-721c-49ce-8a7a-3513cf831ef5.png index ff2657fd3a..3793af5659 100644 Binary files a/sprites/spr_da_backpack/layers/69575369-6061-47a6-b608-894dae3a1efd/25a3433d-721c-49ce-8a7a-3513cf831ef5.png and b/sprites/spr_da_backpack/layers/69575369-6061-47a6-b608-894dae3a1efd/25a3433d-721c-49ce-8a7a-3513cf831ef5.png differ diff --git a/sprites/spr_da_backpack/spr_da_backpack.yy b/sprites/spr_da_backpack/spr_da_backpack.yy index c85b36121c..cbf3770847 100644 --- a/sprites/spr_da_backpack/spr_da_backpack.yy +++ b/sprites/spr_da_backpack/spr_da_backpack.yy @@ -1,23 +1,23 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_backpack", "bboxMode":0, - "bbox_bottom":131, + "bbox_bottom":176, "bbox_left":29, "bbox_right":135, - "bbox_top":8, + "bbox_top":53, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"69575369-6061-47a6-b608-894dae3a1efd","name":"69575369-6061-47a6-b608-894dae3a1efd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec","name":"66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"69575369-6061-47a6-b608-894dae3a1efd","name":"69575369-6061-47a6-b608-894dae3a1efd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec","name":"66d4ebbb-311f-4ed4-9ab0-84b9e5a937ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, - "height":232, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"25a3433d-721c-49ce-8a7a-3513cf831ef5","blendMode":0,"displayName":"default","isLocked":false,"name":"25a3433d-721c-49ce-8a7a-3513cf831ef5","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -80,7 +82,7 @@ "visibleRange":null, "volume":1.0, "xorigin":6, - "yorigin":43, + "yorigin":88, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_da_chaplain/spr_da_chaplain.yy b/sprites/spr_da_chaplain/spr_da_chaplain.yy index 5986824bc5..2641ff734a 100644 --- a/sprites/spr_da_chaplain/spr_da_chaplain.yy +++ b/sprites/spr_da_chaplain/spr_da_chaplain.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_chaplain", "bboxMode":0, "bbox_bottom":271, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e272da8e-cbd6-4de2-b426-7882050bc848","name":"e272da8e-cbd6-4de2-b426-7882050bc848","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e272da8e-cbd6-4de2-b426-7882050bc848","name":"e272da8e-cbd6-4de2-b426-7882050bc848","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","path":"sprites/spr_da_chaplain/spr_da_chaplain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d688a83-8bf0-4015-b759-75440d2fbe17","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e272da8e-cbd6-4de2-b426-7882050bc848","path":"sprites/spr_da_chaplain/spr_da_chaplain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d37791a9-d620-476c-b2b9-21b4fe0725c2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","path":"sprites/spr_da_chaplain/spr_da_chaplain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d688a83-8bf0-4015-b759-75440d2fbe17","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e272da8e-cbd6-4de2-b426-7882050bc848","path":"sprites/spr_da_chaplain/spr_da_chaplain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d37791a9-d620-476c-b2b9-21b4fe0725c2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_mk3/spr_da_mk3.yy b/sprites/spr_da_mk3/spr_da_mk3.yy index 0b673521a2..5e6cdab340 100644 --- a/sprites/spr_da_mk3/spr_da_mk3.yy +++ b/sprites/spr_da_mk3/spr_da_mk3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk3", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a5ee9f18-d254-483d-a4b5-87d779418f8f","name":"a5ee9f18-d254-483d-a4b5-87d779418f8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a5ee9f18-d254-483d-a4b5-87d779418f8f","name":"a5ee9f18-d254-483d-a4b5-87d779418f8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5ee9f18-d254-483d-a4b5-87d779418f8f","path":"sprites/spr_da_mk3/spr_da_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"258893f5-a03a-409e-a6d0-db68c35ccba3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a5ee9f18-d254-483d-a4b5-87d779418f8f","path":"sprites/spr_da_mk3/spr_da_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"258893f5-a03a-409e-a6d0-db68c35ccba3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_mk4/spr_da_mk4.yy b/sprites/spr_da_mk4/spr_da_mk4.yy index 80a5d4af12..efbbe4e690 100644 --- a/sprites/spr_da_mk4/spr_da_mk4.yy +++ b/sprites/spr_da_mk4/spr_da_mk4.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk4", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","path":"sprites/spr_da_mk4/spr_da_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b603de2e-b512-4261-b663-ca5d8450e16a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","path":"sprites/spr_da_mk4/spr_da_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b603de2e-b512-4261-b663-ca5d8450e16a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_mk5/spr_da_mk5.yy b/sprites/spr_da_mk5/spr_da_mk5.yy index 0a3cb6ea7e..57f6ee9ef3 100644 --- a/sprites/spr_da_mk5/spr_da_mk5.yy +++ b/sprites/spr_da_mk5/spr_da_mk5.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk5", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","path":"sprites/spr_da_mk5/spr_da_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9f4649d7-b028-4d37-90e3-df01c9857d86","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","path":"sprites/spr_da_mk5/spr_da_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f4649d7-b028-4d37-90e3-df01c9857d86","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy b/sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy index 49d26993fc..55b3ba2d39 100644 --- a/sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy +++ b/sprites/spr_da_mk5_helm_crests/spr_da_mk5_helm_crests.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk5_helm_crests", "bboxMode":0, "bbox_bottom":68, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bab500e1-62e8-42cc-afd7-17f69a8aebe4","name":"bab500e1-62e8-42cc-afd7-17f69a8aebe4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bab500e1-62e8-42cc-afd7-17f69a8aebe4","name":"bab500e1-62e8-42cc-afd7-17f69a8aebe4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_da_mk6/spr_da_mk6.yy b/sprites/spr_da_mk6/spr_da_mk6.yy index 1cb1b13137..2f56cd3e0c 100644 --- a/sprites/spr_da_mk6/spr_da_mk6.yy +++ b/sprites/spr_da_mk6/spr_da_mk6.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk6", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"22ea0f2e-ee1c-4fe9-9761-120ae1e9021c","name":"22ea0f2e-ee1c-4fe9-9761-120ae1e9021c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"22ea0f2e-ee1c-4fe9-9761-120ae1e9021c","name":"22ea0f2e-ee1c-4fe9-9761-120ae1e9021c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22ea0f2e-ee1c-4fe9-9761-120ae1e9021c","path":"sprites/spr_da_mk6/spr_da_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"779c61ca-aaa6-4a5a-9127-3972d4dfdcc4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"22ea0f2e-ee1c-4fe9-9761-120ae1e9021c","path":"sprites/spr_da_mk6/spr_da_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"779c61ca-aaa6-4a5a-9127-3972d4dfdcc4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_mk6_helm_crests/dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c.png b/sprites/spr_da_mk6_helm_crests/dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c.png index fbc00612ca..c3530458a6 100644 Binary files a/sprites/spr_da_mk6_helm_crests/dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c.png and b/sprites/spr_da_mk6_helm_crests/dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c.png differ diff --git a/sprites/spr_da_mk6_helm_crests/layers/dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c/89065597-920b-4d9f-8c26-3b28108bf116.png b/sprites/spr_da_mk6_helm_crests/layers/dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c/89065597-920b-4d9f-8c26-3b28108bf116.png index fbc00612ca..61aad66a92 100644 Binary files a/sprites/spr_da_mk6_helm_crests/layers/dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c/89065597-920b-4d9f-8c26-3b28108bf116.png and b/sprites/spr_da_mk6_helm_crests/layers/dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c/89065597-920b-4d9f-8c26-3b28108bf116.png differ diff --git a/sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy b/sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy index a82744707e..1dd8a852c0 100644 --- a/sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy +++ b/sprites/spr_da_mk6_helm_crests/spr_da_mk6_helm_crests.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk6_helm_crests", "bboxMode":0, "bbox_bottom":69, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c","name":"dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c","name":"dcf40f5c-7b10-4fc2-b3e9-b5a4e0e1ed2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_da_mk7/spr_da_mk7.yy b/sprites/spr_da_mk7/spr_da_mk7.yy index 6227af8ae1..08d7a6f381 100644 --- a/sprites/spr_da_mk7/spr_da_mk7.yy +++ b/sprites/spr_da_mk7/spr_da_mk7.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk7", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","path":"sprites/spr_da_mk7/spr_da_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d688a83-8bf0-4015-b759-75440d2fbe17","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0449b92b-f3fb-4a20-b797-758f6f8aaa47","path":"sprites/spr_da_mk7/spr_da_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d688a83-8bf0-4015-b759-75440d2fbe17","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy b/sprites/spr_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy index 2e10747a52..e4c36bbabb 100644 --- a/sprites/spr_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy +++ b/sprites/spr_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk7_helm_crests", "bboxMode":0, "bbox_bottom":68, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cda0631b-4b73-4260-b34b-8633c9c58cd7","name":"cda0631b-4b73-4260-b34b-8633c9c58cd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cda0631b-4b73-4260-b34b-8633c9c58cd7","name":"cda0631b-4b73-4260-b34b-8633c9c58cd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cda0631b-4b73-4260-b34b-8633c9c58cd7","path":"sprites/spr_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f7805ed-f659-46c4-a40b-416e685b204a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cda0631b-4b73-4260-b34b-8633c9c58cd7","path":"sprites/spr_da_mk7_helm_crests/spr_da_mk7_helm_crests.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f7805ed-f659-46c4-a40b-416e685b204a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_mk8/spr_da_mk8.yy b/sprites/spr_da_mk8/spr_da_mk8.yy index 2f03a1bb17..426cd47da6 100644 --- a/sprites/spr_da_mk8/spr_da_mk8.yy +++ b/sprites/spr_da_mk8/spr_da_mk8.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_mk8", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e438d604-8c59-4821-832d-754219b528c5","name":"e438d604-8c59-4821-832d-754219b528c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e438d604-8c59-4821-832d-754219b528c5","name":"e438d604-8c59-4821-832d-754219b528c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e438d604-8c59-4821-832d-754219b528c5","path":"sprites/spr_da_mk8/spr_da_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"174c4894-2487-4c8d-b39a-a2eab3b34e5a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e438d604-8c59-4821-832d-754219b528c5","path":"sprites/spr_da_mk8/spr_da_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"174c4894-2487-4c8d-b39a-a2eab3b34e5a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_da_standard/spr_da_standard.yy b/sprites/spr_da_standard/spr_da_standard.yy index 770b8fc90f..2634ca954c 100644 --- a/sprites/spr_da_standard/spr_da_standard.yy +++ b/sprites/spr_da_standard/spr_da_standard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_standard", "bboxMode":0, "bbox_bottom":271, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5141ac0b-5807-4383-83b9-fc6d775c3aa0","name":"5141ac0b-5807-4383-83b9-fc6d775c3aa0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"47247ed9-3260-4acb-b4c1-288195f3c451","name":"47247ed9-3260-4acb-b4c1-288195f3c451","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15710c01-0df5-4aec-b31b-d7d0ac595350","name":"15710c01-0df5-4aec-b31b-d7d0ac595350","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b9d4fc97-14aa-4e28-b0fb-161752a43977","name":"b9d4fc97-14aa-4e28-b0fb-161752a43977","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5141ac0b-5807-4383-83b9-fc6d775c3aa0","name":"5141ac0b-5807-4383-83b9-fc6d775c3aa0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"47247ed9-3260-4acb-b4c1-288195f3c451","name":"47247ed9-3260-4acb-b4c1-288195f3c451","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15710c01-0df5-4aec-b31b-d7d0ac595350","name":"15710c01-0df5-4aec-b31b-d7d0ac595350","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b9d4fc97-14aa-4e28-b0fb-161752a43977","name":"b9d4fc97-14aa-4e28-b0fb-161752a43977","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -66,6 +66,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_da_term_honor/spr_da_term_honor.yy b/sprites/spr_da_term_honor/spr_da_term_honor.yy index e5fcc33aad..08b9e9a28c 100644 --- a/sprites/spr_da_term_honor/spr_da_term_honor.yy +++ b/sprites/spr_da_term_honor/spr_da_term_honor.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_da_term_honor", "bboxMode":0, "bbox_bottom":259, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"25fdb7ca-9d7a-4b69-9b1f-7fccbe707fef","name":"25fdb7ca-9d7a-4b69-9b1f-7fccbe707fef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25fdb7ca-9d7a-4b69-9b1f-7fccbe707fef","name":"25fdb7ca-9d7a-4b69-9b1f-7fccbe707fef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25fdb7ca-9d7a-4b69-9b1f-7fccbe707fef","path":"sprites/spr_da_term_honor/spr_da_term_honor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b7e699cf-9a38-4551-a237-e45bd89b7588","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25fdb7ca-9d7a-4b69-9b1f-7fccbe707fef","path":"sprites/spr_da_term_honor/spr_da_term_honor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b7e699cf-9a38-4551-a237-e45bd89b7588","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_dante/spr_dante.yy b/sprites/spr_dante/spr_dante.yy index 3dce631a4f..b383a52e1d 100644 --- a/sprites/spr_dante/spr_dante.yy +++ b/sprites/spr_dante/spr_dante.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dante", "bboxMode":0, "bbox_bottom":271, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0024397e-7810-4cfc-ba22-e2e1fb13fd23","name":"0024397e-7810-4cfc-ba22-e2e1fb13fd23","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"754d992e-880a-48ed-a32f-479e3a508eb4","name":"754d992e-880a-48ed-a32f-479e3a508eb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0024397e-7810-4cfc-ba22-e2e1fb13fd23","name":"0024397e-7810-4cfc-ba22-e2e1fb13fd23","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"754d992e-880a-48ed-a32f-479e3a508eb4","name":"754d992e-880a-48ed-a32f-479e3a508eb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0024397e-7810-4cfc-ba22-e2e1fb13fd23","path":"sprites/spr_dante/spr_dante.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"18010e8a-678b-42a7-bfcf-f2e3d9ce1f5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"754d992e-880a-48ed-a32f-479e3a508eb4","path":"sprites/spr_dante/spr_dante.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"735be12e-4a1f-4be0-8e8a-72d55dfb055a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0024397e-7810-4cfc-ba22-e2e1fb13fd23","path":"sprites/spr_dante/spr_dante.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"18010e8a-678b-42a7-bfcf-f2e3d9ce1f5e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"754d992e-880a-48ed-a32f-479e3a508eb4","path":"sprites/spr_dante/spr_dante.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"735be12e-4a1f-4be0-8e8a-72d55dfb055a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_darkstar/spr_darkstar.yy b/sprites/spr_darkstar/spr_darkstar.yy index 87490de944..d368628be8 100644 --- a/sprites/spr_darkstar/spr_darkstar.yy +++ b/sprites/spr_darkstar/spr_darkstar.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_darkstar", "bboxMode":0, "bbox_bottom":23, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b43d577f-22aa-4ea5-ae5a-10ce05aca294","name":"b43d577f-22aa-4ea5-ae5a-10ce05aca294","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b43d577f-22aa-4ea5-ae5a-10ce05aca294","name":"b43d577f-22aa-4ea5-ae5a-10ce05aca294","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b43d577f-22aa-4ea5-ae5a-10ce05aca294","path":"sprites/spr_darkstar/spr_darkstar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8421169a-a485-4ec6-8eac-6922bce9d1c4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b43d577f-22aa-4ea5-ae5a-10ce05aca294","path":"sprites/spr_darkstar/spr_darkstar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8421169a-a485-4ec6-8eac-6922bce9d1c4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_data_slate/spr_data_slate.yy b/sprites/spr_data_slate/spr_data_slate.yy index e256f5e5f7..f2aede4936 100644 --- a/sprites/spr_data_slate/spr_data_slate.yy +++ b/sprites/spr_data_slate/spr_data_slate.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_data_slate", "bboxMode":0, "bbox_bottom":859, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bd12575d-6936-47ed-b150-8734d5c98140","name":"bd12575d-6936-47ed-b150-8734d5c98140","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd12575d-6936-47ed-b150-8734d5c98140","name":"bd12575d-6936-47ed-b150-8734d5c98140","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":860.0, + "seqWidth":850.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_data_slate_back/spr_data_slate_back.yy b/sprites/spr_data_slate_back/spr_data_slate_back.yy index 6c66bb7c87..587e11486b 100644 --- a/sprites/spr_data_slate_back/spr_data_slate_back.yy +++ b/sprites/spr_data_slate_back/spr_data_slate_back.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_data_slate_back", "bboxMode":0, "bbox_bottom":828, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2e9c4567-f36d-4e75-b4e7-bb07392211bb","name":"2e9c4567-f36d-4e75-b4e7-bb07392211bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2e9c4567-f36d-4e75-b4e7-bb07392211bb","name":"2e9c4567-f36d-4e75-b4e7-bb07392211bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":829.0, + "seqWidth":789.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_data_slate_border/88d208ab-efc3-4c8a-a23a-ac1685249362.png b/sprites/spr_data_slate_border/88d208ab-efc3-4c8a-a23a-ac1685249362.png index ef74d6130c..7cc0e67e07 100644 Binary files a/sprites/spr_data_slate_border/88d208ab-efc3-4c8a-a23a-ac1685249362.png and b/sprites/spr_data_slate_border/88d208ab-efc3-4c8a-a23a-ac1685249362.png differ diff --git a/sprites/spr_data_slate_border/layers/88d208ab-efc3-4c8a-a23a-ac1685249362/0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png b/sprites/spr_data_slate_border/layers/88d208ab-efc3-4c8a-a23a-ac1685249362/0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png index ef74d6130c..7cc0e67e07 100644 Binary files a/sprites/spr_data_slate_border/layers/88d208ab-efc3-4c8a-a23a-ac1685249362/0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png and b/sprites/spr_data_slate_border/layers/88d208ab-efc3-4c8a-a23a-ac1685249362/0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png differ diff --git a/sprites/spr_data_slate_border/spr_data_slate_border.yy b/sprites/spr_data_slate_border/spr_data_slate_border.yy index 4555e9ecfc..de6a44a80a 100644 --- a/sprites/spr_data_slate_border/spr_data_slate_border.yy +++ b/sprites/spr_data_slate_border/spr_data_slate_border.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_data_slate_border", "bboxMode":0, "bbox_bottom":377, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"88d208ab-efc3-4c8a-a23a-ac1685249362","name":"88d208ab-efc3-4c8a-a23a-ac1685249362","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"88d208ab-efc3-4c8a-a23a-ac1685249362","name":"88d208ab-efc3-4c8a-a23a-ac1685249362","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":378.0, + "seqWidth":572.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_data_slate_corner_decoration/88d208ab-efc3-4c8a-a23a-ac1685249362.png b/sprites/spr_data_slate_corner_decoration/88d208ab-efc3-4c8a-a23a-ac1685249362.png new file mode 100644 index 0000000000..e12271d973 Binary files /dev/null and b/sprites/spr_data_slate_corner_decoration/88d208ab-efc3-4c8a-a23a-ac1685249362.png differ diff --git a/sprites/spr_data_slate_corner_decoration/layers/88d208ab-efc3-4c8a-a23a-ac1685249362/0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png b/sprites/spr_data_slate_corner_decoration/layers/88d208ab-efc3-4c8a-a23a-ac1685249362/0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png new file mode 100644 index 0000000000..e12271d973 Binary files /dev/null and b/sprites/spr_data_slate_corner_decoration/layers/88d208ab-efc3-4c8a-a23a-ac1685249362/0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png differ diff --git a/sprites/spr_data_slate_corner_decoration/spr_data_slate_corner_decoration.yy b/sprites/spr_data_slate_corner_decoration/spr_data_slate_corner_decoration.yy new file mode 100644 index 0000000000..2817066adf --- /dev/null +++ b/sprites/spr_data_slate_corner_decoration/spr_data_slate_corner_decoration.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_data_slate_corner_decoration", + "bboxMode":0, + "bbox_bottom":119, + "bbox_left":0, + "bbox_right":69, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"88d208ab-efc3-4c8a-a23a-ac1685249362","name":"88d208ab-efc3-4c8a-a23a-ac1685249362","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":120, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"0c20ae10-2b03-43f4-b05e-7cb2256d0b71","blendMode":0,"displayName":"default","isLocked":false,"name":"0c20ae10-2b03-43f4-b05e-7cb2256d0b71","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_data_slate_corner_decoration", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"Menu and Load", + "path":"folders/Sprites/UI/New UI/Menu and Load.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_data_slate_corner_decoration", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_data_slate_corner_decoration", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":120.0, + "seqWidth":70.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88d208ab-efc3-4c8a-a23a-ac1685249362","path":"sprites/spr_data_slate_corner_decoration/spr_data_slate_corner_decoration.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"04c63da1-0ff3-4f5f-96b4-c76aef79bd9a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":70, +} \ No newline at end of file diff --git a/sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy b/sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy index bfdb7ee8ac..8b5782b525 100644 --- a/sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy +++ b/sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_death_watch_pauldron", "bboxMode":0, "bbox_bottom":81, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8604f68b-a9c9-477e-b0f3-18963a9cc31b","name":"8604f68b-a9c9-477e-b0f3-18963a9cc31b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8604f68b-a9c9-477e-b0f3-18963a9cc31b","name":"8604f68b-a9c9-477e-b0f3-18963a9cc31b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8604f68b-a9c9-477e-b0f3-18963a9cc31b","path":"sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c53b218d-2649-41ad-9510-ce18d3e5a066","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8604f68b-a9c9-477e-b0f3-18963a9cc31b","path":"sprites/spr_death_watch_pauldron/spr_death_watch_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c53b218d-2649-41ad-9510-ce18d3e5a066","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_def_fortress/spr_def_fortress.yy b/sprites/spr_def_fortress/spr_def_fortress.yy index 48e7c7dcc6..b9b4f4e64c 100644 --- a/sprites/spr_def_fortress/spr_def_fortress.yy +++ b/sprites/spr_def_fortress/spr_def_fortress.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_def_fortress", "bboxMode":0, "bbox_bottom":197, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"23245670-12d5-4564-b1cd-3e211f4759ee","name":"23245670-12d5-4564-b1cd-3e211f4759ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"23245670-12d5-4564-b1cd-3e211f4759ee","name":"23245670-12d5-4564-b1cd-3e211f4759ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"23245670-12d5-4564-b1cd-3e211f4759ee","path":"sprites/spr_def_fortress/spr_def_fortress.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"539bfc66-9e13-47a9-bc6b-04eb863d414c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"23245670-12d5-4564-b1cd-3e211f4759ee","path":"sprites/spr_def_fortress/spr_def_fortress.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"539bfc66-9e13-47a9-bc6b-04eb863d414c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_def_mine/spr_def_mine.yy b/sprites/spr_def_mine/spr_def_mine.yy index bad7b25aad..ba09c26879 100644 --- a/sprites/spr_def_mine/spr_def_mine.yy +++ b/sprites/spr_def_mine/spr_def_mine.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_def_mine", "bboxMode":0, "bbox_bottom":25, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"eaf1e60e-46d5-463d-a018-b4e125ff4ea6","name":"eaf1e60e-46d5-463d-a018-b4e125ff4ea6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eaf1e60e-46d5-463d-a018-b4e125ff4ea6","name":"eaf1e60e-46d5-463d-a018-b4e125ff4ea6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eaf1e60e-46d5-463d-a018-b4e125ff4ea6","path":"sprites/spr_def_mine/spr_def_mine.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c159f5b5-8ad3-4668-b912-034b5e40ad50","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eaf1e60e-46d5-463d-a018-b4e125ff4ea6","path":"sprites/spr_def_mine/spr_def_mine.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c159f5b5-8ad3-4668-b912-034b5e40ad50","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_def_platform/spr_def_platform.yy b/sprites/spr_def_platform/spr_def_platform.yy index f8a78b268f..3c1c6dccbf 100644 --- a/sprites/spr_def_platform/spr_def_platform.yy +++ b/sprites/spr_def_platform/spr_def_platform.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_def_platform", "bboxMode":0, "bbox_bottom":91, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bd12ab43-022b-4eab-981d-4a8b8c39c45b","name":"bd12ab43-022b-4eab-981d-4a8b8c39c45b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14e79ae3-9c81-49ff-a724-5e42de204bcc","name":"14e79ae3-9c81-49ff-a724-5e42de204bcc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd12ab43-022b-4eab-981d-4a8b8c39c45b","name":"bd12ab43-022b-4eab-981d-4a8b8c39c45b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14e79ae3-9c81-49ff-a724-5e42de204bcc","name":"14e79ae3-9c81-49ff-a724-5e42de204bcc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd12ab43-022b-4eab-981d-4a8b8c39c45b","path":"sprites/spr_def_platform/spr_def_platform.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2dc1bad0-3e40-4590-9fd4-1d94ce34fdbe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14e79ae3-9c81-49ff-a724-5e42de204bcc","path":"sprites/spr_def_platform/spr_def_platform.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f275dea5-fa7f-42a5-9fec-73f2afc1fb5f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd12ab43-022b-4eab-981d-4a8b8c39c45b","path":"sprites/spr_def_platform/spr_def_platform.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2dc1bad0-3e40-4590-9fd4-1d94ce34fdbe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14e79ae3-9c81-49ff-a724-5e42de204bcc","path":"sprites/spr_def_platform/spr_def_platform.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f275dea5-fa7f-42a5-9fec-73f2afc1fb5f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_def_silo/spr_def_silo.yy b/sprites/spr_def_silo/spr_def_silo.yy index 2549042c60..bbafa79d6d 100644 --- a/sprites/spr_def_silo/spr_def_silo.yy +++ b/sprites/spr_def_silo/spr_def_silo.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_def_silo", "bboxMode":0, "bbox_bottom":58, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7f111d4c-3265-4ac5-a3a9-e3d88ef3e186","name":"7f111d4c-3265-4ac5-a3a9-e3d88ef3e186","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"de1096fe-c23d-43f0-9807-62742c84084b","name":"de1096fe-c23d-43f0-9807-62742c84084b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f111d4c-3265-4ac5-a3a9-e3d88ef3e186","name":"7f111d4c-3265-4ac5-a3a9-e3d88ef3e186","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de1096fe-c23d-43f0-9807-62742c84084b","name":"de1096fe-c23d-43f0-9807-62742c84084b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f111d4c-3265-4ac5-a3a9-e3d88ef3e186","path":"sprites/spr_def_silo/spr_def_silo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4dfb3ef-0876-40fa-8404-b9ecc154bfea","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de1096fe-c23d-43f0-9807-62742c84084b","path":"sprites/spr_def_silo/spr_def_silo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7a32dcc3-df90-41f1-8031-e6461e6dcb78","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f111d4c-3265-4ac5-a3a9-e3d88ef3e186","path":"sprites/spr_def_silo/spr_def_silo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4dfb3ef-0876-40fa-8404-b9ecc154bfea","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de1096fe-c23d-43f0-9807-62742c84084b","path":"sprites/spr_def_silo/spr_def_silo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7a32dcc3-df90-41f1-8031-e6461e6dcb78","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_def_station/spr_def_station.yy b/sprites/spr_def_station/spr_def_station.yy index 073afc8d2e..fef3136c86 100644 --- a/sprites/spr_def_station/spr_def_station.yy +++ b/sprites/spr_def_station/spr_def_station.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_def_station", "bboxMode":0, "bbox_bottom":256, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1880d60f-1274-4df4-9de7-dc3d9065b580","name":"1880d60f-1274-4df4-9de7-dc3d9065b580","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c5c8cdca-ef37-46fc-beed-8f70ac8916c0","name":"c5c8cdca-ef37-46fc-beed-8f70ac8916c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1880d60f-1274-4df4-9de7-dc3d9065b580","name":"1880d60f-1274-4df4-9de7-dc3d9065b580","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5c8cdca-ef37-46fc-beed-8f70ac8916c0","name":"c5c8cdca-ef37-46fc-beed-8f70ac8916c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1880d60f-1274-4df4-9de7-dc3d9065b580","path":"sprites/spr_def_station/spr_def_station.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c925c395-3a2a-43b0-829c-8aa0a3297397","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5c8cdca-ef37-46fc-beed-8f70ac8916c0","path":"sprites/spr_def_station/spr_def_station.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c708788-308a-43bb-bfc6-993ff62d3837","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1880d60f-1274-4df4-9de7-dc3d9065b580","path":"sprites/spr_def_station/spr_def_station.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c925c395-3a2a-43b0-829c-8aa0a3297397","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5c8cdca-ef37-46fc-beed-8f70ac8916c0","path":"sprites/spr_def_station/spr_def_station.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c708788-308a-43bb-bfc6-993ff62d3837","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_defeat/b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6.png b/sprites/spr_defeat/b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6.png new file mode 100644 index 0000000000..da96d18e57 Binary files /dev/null and b/sprites/spr_defeat/b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6.png differ diff --git a/sprites/spr_defeat/layers/b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6/5f8a8902-d3e2-4d02-bd8e-3552df863e7d.png b/sprites/spr_defeat/layers/b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6/5f8a8902-d3e2-4d02-bd8e-3552df863e7d.png new file mode 100644 index 0000000000..da96d18e57 Binary files /dev/null and b/sprites/spr_defeat/layers/b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6/5f8a8902-d3e2-4d02-bd8e-3552df863e7d.png differ diff --git a/sprites/spr_defeat/spr_defeat.yy b/sprites/spr_defeat/spr_defeat.yy index 97bea62156..eb5ff4c72a 100644 --- a/sprites/spr_defeat/spr_defeat.yy +++ b/sprites/spr_defeat/spr_defeat.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_defeat", "bboxMode":0, "bbox_bottom":0, @@ -11,7 +11,9 @@ "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, - "frames":[], + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6","name":"b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], "gridX":0, "gridY":0, "height":32, @@ -47,7 +49,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":0.0, + "length":1.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -61,16 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ - {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b39b5ff0-3a40-4c08-84c7-d1d9c6dd0bb6","path":"sprites/spr_defeat/spr_defeat.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b24613cb-a809-41ee-8f18-3c1cb6d12596","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, diff --git a/sprites/spr_dev_pack_complex/e5637504-add9-474b-ae10-1e954d497810.png b/sprites/spr_dev_pack_complex/e5637504-add9-474b-ae10-1e954d497810.png index d3f7ae6e88..fba68c8909 100644 Binary files a/sprites/spr_dev_pack_complex/e5637504-add9-474b-ae10-1e954d497810.png and b/sprites/spr_dev_pack_complex/e5637504-add9-474b-ae10-1e954d497810.png differ diff --git a/sprites/spr_dev_pack_complex/ee39ecff-a565-42aa-99f0-f549f95bc5a0.png b/sprites/spr_dev_pack_complex/ee39ecff-a565-42aa-99f0-f549f95bc5a0.png index c9b1bee2cc..4b43a481f9 100644 Binary files a/sprites/spr_dev_pack_complex/ee39ecff-a565-42aa-99f0-f549f95bc5a0.png and b/sprites/spr_dev_pack_complex/ee39ecff-a565-42aa-99f0-f549f95bc5a0.png differ diff --git a/sprites/spr_dev_pack_complex/layers/e5637504-add9-474b-ae10-1e954d497810/330f878c-cc0f-48bf-a507-68961e6c03cd.png b/sprites/spr_dev_pack_complex/layers/e5637504-add9-474b-ae10-1e954d497810/330f878c-cc0f-48bf-a507-68961e6c03cd.png index d3f7ae6e88..fba68c8909 100644 Binary files a/sprites/spr_dev_pack_complex/layers/e5637504-add9-474b-ae10-1e954d497810/330f878c-cc0f-48bf-a507-68961e6c03cd.png and b/sprites/spr_dev_pack_complex/layers/e5637504-add9-474b-ae10-1e954d497810/330f878c-cc0f-48bf-a507-68961e6c03cd.png differ diff --git a/sprites/spr_dev_pack_complex/layers/ee39ecff-a565-42aa-99f0-f549f95bc5a0/330f878c-cc0f-48bf-a507-68961e6c03cd.png b/sprites/spr_dev_pack_complex/layers/ee39ecff-a565-42aa-99f0-f549f95bc5a0/330f878c-cc0f-48bf-a507-68961e6c03cd.png index c9b1bee2cc..4b43a481f9 100644 Binary files a/sprites/spr_dev_pack_complex/layers/ee39ecff-a565-42aa-99f0-f549f95bc5a0/330f878c-cc0f-48bf-a507-68961e6c03cd.png and b/sprites/spr_dev_pack_complex/layers/ee39ecff-a565-42aa-99f0-f549f95bc5a0/330f878c-cc0f-48bf-a507-68961e6c03cd.png differ diff --git a/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy b/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy index 55db1cae2c..9f17104391 100644 --- a/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy +++ b/sprites/spr_dev_pack_complex/spr_dev_pack_complex.yy @@ -1,30 +1,30 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dev_pack_complex", "bboxMode":0, - "bbox_bottom":37, - "bbox_left":54, - "bbox_right":113, - "bbox_top":5, + "bbox_bottom":79, + "bbox_left":53, + "bbox_right":112, + "bbox_top":47, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e5637504-add9-474b-ae10-1e954d497810","name":"e5637504-add9-474b-ae10-1e954d497810","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e5637504-add9-474b-ae10-1e954d497810","name":"e5637504-add9-474b-ae10-1e954d497810","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","name":"ee39ecff-a565-42aa-99f0-f549f95bc5a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, - "height":272, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"330f878c-cc0f-48bf-a507-68961e6c03cd","blendMode":0,"displayName":"default","isLocked":false,"name":"330f878c-cc0f-48bf-a507-68961e6c03cd","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"spr_dev_pack_complex", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"packs", "path":"folders/Sprites/Marine Viewer/packs.yy", @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -80,7 +82,7 @@ "visibleRange":null, "volume":1.0, "xorigin":0, - "yorigin":0, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_dexterity_icon/spr_dexterity_icon.yy b/sprites/spr_dexterity_icon/spr_dexterity_icon.yy index 0fb4d36fd1..3ee45dacc8 100644 --- a/sprites/spr_dexterity_icon/spr_dexterity_icon.yy +++ b/sprites/spr_dexterity_icon/spr_dexterity_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dexterity_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"72380957-5d55-49f3-b4e3-508d5dbb6d00","name":"72380957-5d55-49f3-b4e3-508d5dbb6d00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72380957-5d55-49f3-b4e3-508d5dbb6d00","name":"72380957-5d55-49f3-b4e3-508d5dbb6d00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72380957-5d55-49f3-b4e3-508d5dbb6d00","path":"sprites/spr_dexterity_icon/spr_dexterity_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"da010a98-a2f9-458b-a116-8597036ab0da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72380957-5d55-49f3-b4e3-508d5dbb6d00","path":"sprites/spr_dexterity_icon/spr_dexterity_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"da010a98-a2f9-458b-a116-8597036ab0da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_diplo_symbols/spr_diplo_symbols.yy b/sprites/spr_diplo_symbols/spr_diplo_symbols.yy index b0f2fc6326..784b881581 100644 --- a/sprites/spr_diplo_symbols/spr_diplo_symbols.yy +++ b/sprites/spr_diplo_symbols/spr_diplo_symbols.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_diplo_symbols", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fda16fa0-8879-4880-89c9-291a29fb0c52","name":"fda16fa0-8879-4880-89c9-291a29fb0c52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fda16fa0-8879-4880-89c9-291a29fb0c52","name":"fda16fa0-8879-4880-89c9-291a29fb0c52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fda16fa0-8879-4880-89c9-291a29fb0c52","path":"sprites/spr_diplo_symbols/spr_diplo_symbols.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"72ff1aef-2dc9-47ed-9330-e4c9b0a19f25","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fda16fa0-8879-4880-89c9-291a29fb0c52","path":"sprites/spr_diplo_symbols/spr_diplo_symbols.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"72ff1aef-2dc9-47ed-9330-e4c9b0a19f25","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_diplomacy/spr_diplomacy.yy b/sprites/spr_diplomacy/spr_diplomacy.yy index 139b3cd2d2..734d9b6b9a 100644 --- a/sprites/spr_diplomacy/spr_diplomacy.yy +++ b/sprites/spr_diplomacy/spr_diplomacy.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_diplomacy", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fb3a0c1a-def3-42b3-a47d-3ec190e1fe26","name":"fb3a0c1a-def3-42b3-a47d-3ec190e1fe26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb3a0c1a-def3-42b3-a47d-3ec190e1fe26","name":"fb3a0c1a-def3-42b3-a47d-3ec190e1fe26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb3a0c1a-def3-42b3-a47d-3ec190e1fe26","path":"sprites/spr_diplomacy/spr_diplomacy.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4bef5314-fc44-4b55-a31e-ee6aa92644d7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb3a0c1a-def3-42b3-a47d-3ec190e1fe26","path":"sprites/spr_diplomacy/spr_diplomacy.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4bef5314-fc44-4b55-a31e-ee6aa92644d7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_diplomacy_dae/spr_diplomacy_dae.yy b/sprites/spr_diplomacy_dae/spr_diplomacy_dae.yy index 7f7e84d2f6..b312415227 100644 --- a/sprites/spr_diplomacy_dae/spr_diplomacy_dae.yy +++ b/sprites/spr_diplomacy_dae/spr_diplomacy_dae.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_diplomacy_dae", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy b/sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy index 3c13c8f19f..1182b310ed 100644 --- a/sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy +++ b/sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_diplomacy_defeated", "bboxMode":0, "bbox_bottom":134, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"39a16db0-92fa-4a76-a4fc-8cefdae29f99","name":"39a16db0-92fa-4a76-a4fc-8cefdae29f99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f990f8b1-15d2-4cb2-85e5-e703056ed314","name":"f990f8b1-15d2-4cb2-85e5-e703056ed314","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39a16db0-92fa-4a76-a4fc-8cefdae29f99","name":"39a16db0-92fa-4a76-a4fc-8cefdae29f99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f990f8b1-15d2-4cb2-85e5-e703056ed314","name":"f990f8b1-15d2-4cb2-85e5-e703056ed314","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39a16db0-92fa-4a76-a4fc-8cefdae29f99","path":"sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"113de565-3347-4ba9-a429-944ab523401a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f990f8b1-15d2-4cb2-85e5-e703056ed314","path":"sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9c5ad43-458c-4b6e-b249-fe27b121fe77","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39a16db0-92fa-4a76-a4fc-8cefdae29f99","path":"sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"113de565-3347-4ba9-a429-944ab523401a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f990f8b1-15d2-4cb2-85e5-e703056ed314","path":"sprites/spr_diplomacy_defeated/spr_diplomacy_defeated.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9c5ad43-458c-4b6e-b249-fe27b121fe77","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_diplomacy_med/spr_diplomacy_med.yy b/sprites/spr_diplomacy_med/spr_diplomacy_med.yy index fb684ed344..48178eb7ff 100644 --- a/sprites/spr_diplomacy_med/spr_diplomacy_med.yy +++ b/sprites/spr_diplomacy_med/spr_diplomacy_med.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_diplomacy_med", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_diplomacy_small/spr_diplomacy_small.yy b/sprites/spr_diplomacy_small/spr_diplomacy_small.yy index 8379c53be8..b40fe04f1c 100644 --- a/sprites/spr_diplomacy_small/spr_diplomacy_small.yy +++ b/sprites/spr_diplomacy_small/spr_diplomacy_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_diplomacy_small", "bboxMode":0, "bbox_bottom":91, @@ -12,32 +12,32 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9940dbb9-37e6-49ff-9486-8bdc6f1fa18b","name":"9940dbb9-37e6-49ff-9486-8bdc6f1fa18b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4bf2c5a-953e-4a35-a7ff-6104340d515b","name":"f4bf2c5a-953e-4a35-a7ff-6104340d515b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ecb01531-30bd-40bb-a7cc-bd92c96be4a8","name":"ecb01531-30bd-40bb-a7cc-bd92c96be4a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ff99cdcc-d64f-427c-a83b-275e40048c32","name":"ff99cdcc-d64f-427c-a83b-275e40048c32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84bfc2f3-7265-467d-8e3f-7851f1b68610","name":"84bfc2f3-7265-467d-8e3f-7851f1b68610","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"24a6d32e-ccbd-4397-a172-d278dcefba9f","name":"24a6d32e-ccbd-4397-a172-d278dcefba9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b720ae6-a874-4f15-8f10-08bc8977565d","name":"9b720ae6-a874-4f15-8f10-08bc8977565d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8768affd-210f-4599-a66f-d92b2d96b1ed","name":"8768affd-210f-4599-a66f-d92b2d96b1ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b778d70b-d15c-4a9e-8c5f-be6246171dcd","name":"b778d70b-d15c-4a9e-8c5f-be6246171dcd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1796e494-fbdb-4cba-a597-0c8321551ddb","name":"1796e494-fbdb-4cba-a597-0c8321551ddb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bd45751d-0894-4683-80f5-d9de3c061267","name":"bd45751d-0894-4683-80f5-d9de3c061267","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"18bc22b2-400a-420f-b5f9-b9fe6f650b92","name":"18bc22b2-400a-420f-b5f9-b9fe6f650b92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"842debcc-6e09-4044-9702-e7854d66c082","name":"842debcc-6e09-4044-9702-e7854d66c082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ba87bb7f-c0e7-46fb-bc7f-588289056d8b","name":"ba87bb7f-c0e7-46fb-bc7f-588289056d8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a02b2199-d741-4f8d-94a3-8993f7243413","name":"a02b2199-d741-4f8d-94a3-8993f7243413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cfa97e36-6750-492e-9513-0d6dc63f65e6","name":"cfa97e36-6750-492e-9513-0d6dc63f65e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f60734f-d864-4d70-9671-9347730d4968","name":"4f60734f-d864-4d70-9671-9347730d4968","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7bbafba5-9e46-4f42-86ec-f99e5e9cf94f","name":"7bbafba5-9e46-4f42-86ec-f99e5e9cf94f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb0b728d-f7dd-4865-9b71-0e0a0e78f8bf","name":"bb0b728d-f7dd-4865-9b71-0e0a0e78f8bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6b18a4c0-1fec-438e-be84-b3a071fe534d","name":"6b18a4c0-1fec-438e-be84-b3a071fe534d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ff69f07-5621-4b1b-b866-9f7a17e9f866","name":"6ff69f07-5621-4b1b-b866-9f7a17e9f866","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"41523fae-8d00-45f7-91c0-098ba44809ad","name":"41523fae-8d00-45f7-91c0-098ba44809ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"987e13a6-8503-4772-be19-fbd2e8c933e8","name":"987e13a6-8503-4772-be19-fbd2e8c933e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76b35d93-850c-46b2-a59c-7d0826fca4de","name":"76b35d93-850c-46b2-a59c-7d0826fca4de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"143ba5a6-39ab-4bb0-8072-de20032a63b8","name":"143ba5a6-39ab-4bb0-8072-de20032a63b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26be20f7-13d1-40af-bf88-335cb829fbd7","name":"26be20f7-13d1-40af-bf88-335cb829fbd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9940dbb9-37e6-49ff-9486-8bdc6f1fa18b","name":"9940dbb9-37e6-49ff-9486-8bdc6f1fa18b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4bf2c5a-953e-4a35-a7ff-6104340d515b","name":"f4bf2c5a-953e-4a35-a7ff-6104340d515b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ecb01531-30bd-40bb-a7cc-bd92c96be4a8","name":"ecb01531-30bd-40bb-a7cc-bd92c96be4a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ff99cdcc-d64f-427c-a83b-275e40048c32","name":"ff99cdcc-d64f-427c-a83b-275e40048c32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84bfc2f3-7265-467d-8e3f-7851f1b68610","name":"84bfc2f3-7265-467d-8e3f-7851f1b68610","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"24a6d32e-ccbd-4397-a172-d278dcefba9f","name":"24a6d32e-ccbd-4397-a172-d278dcefba9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b720ae6-a874-4f15-8f10-08bc8977565d","name":"9b720ae6-a874-4f15-8f10-08bc8977565d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8768affd-210f-4599-a66f-d92b2d96b1ed","name":"8768affd-210f-4599-a66f-d92b2d96b1ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b778d70b-d15c-4a9e-8c5f-be6246171dcd","name":"b778d70b-d15c-4a9e-8c5f-be6246171dcd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1796e494-fbdb-4cba-a597-0c8321551ddb","name":"1796e494-fbdb-4cba-a597-0c8321551ddb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd45751d-0894-4683-80f5-d9de3c061267","name":"bd45751d-0894-4683-80f5-d9de3c061267","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"18bc22b2-400a-420f-b5f9-b9fe6f650b92","name":"18bc22b2-400a-420f-b5f9-b9fe6f650b92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"842debcc-6e09-4044-9702-e7854d66c082","name":"842debcc-6e09-4044-9702-e7854d66c082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba87bb7f-c0e7-46fb-bc7f-588289056d8b","name":"ba87bb7f-c0e7-46fb-bc7f-588289056d8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a02b2199-d741-4f8d-94a3-8993f7243413","name":"a02b2199-d741-4f8d-94a3-8993f7243413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfa97e36-6750-492e-9513-0d6dc63f65e6","name":"cfa97e36-6750-492e-9513-0d6dc63f65e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f60734f-d864-4d70-9671-9347730d4968","name":"4f60734f-d864-4d70-9671-9347730d4968","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7bbafba5-9e46-4f42-86ec-f99e5e9cf94f","name":"7bbafba5-9e46-4f42-86ec-f99e5e9cf94f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb0b728d-f7dd-4865-9b71-0e0a0e78f8bf","name":"bb0b728d-f7dd-4865-9b71-0e0a0e78f8bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6b18a4c0-1fec-438e-be84-b3a071fe534d","name":"6b18a4c0-1fec-438e-be84-b3a071fe534d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ff69f07-5621-4b1b-b866-9f7a17e9f866","name":"6ff69f07-5621-4b1b-b866-9f7a17e9f866","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41523fae-8d00-45f7-91c0-098ba44809ad","name":"41523fae-8d00-45f7-91c0-098ba44809ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"987e13a6-8503-4772-be19-fbd2e8c933e8","name":"987e13a6-8503-4772-be19-fbd2e8c933e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76b35d93-850c-46b2-a59c-7d0826fca4de","name":"76b35d93-850c-46b2-a59c-7d0826fca4de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"143ba5a6-39ab-4bb0-8072-de20032a63b8","name":"143ba5a6-39ab-4bb0-8072-de20032a63b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26be20f7-13d1-40af-bf88-335cb829fbd7","name":"26be20f7-13d1-40af-bf88-335cb829fbd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,84 +93,32 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9940dbb9-37e6-49ff-9486-8bdc6f1fa18b","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f75b63e8-6408-4fd8-935a-8c241d9cfb86","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4bf2c5a-953e-4a35-a7ff-6104340d515b","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c7cc5333-a527-4a1e-a25c-57e43253aff8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecb01531-30bd-40bb-a7cc-bd92c96be4a8","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"851c9c45-b2ad-4ef0-901b-715805824ec0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff99cdcc-d64f-427c-a83b-275e40048c32","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a086ae35-fed0-4713-9839-c9ce03938eda","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84bfc2f3-7265-467d-8e3f-7851f1b68610","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f31f467-f107-430c-a284-25206dfdb48a","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"24a6d32e-ccbd-4397-a172-d278dcefba9f","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"30f57c31-14f4-4fd9-b084-1c10d1821403","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b720ae6-a874-4f15-8f10-08bc8977565d","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad9451d1-a16d-40bf-8623-1ef350d24a82","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8768affd-210f-4599-a66f-d92b2d96b1ed","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba7ce834-e7b8-4877-9670-c10dc7a069cd","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b778d70b-d15c-4a9e-8c5f-be6246171dcd","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eaf67672-272f-4c9f-9802-6f9a8bb258a2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1796e494-fbdb-4cba-a597-0c8321551ddb","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a4d9aca-5bc7-4bf8-8e7d-761728455c6c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd45751d-0894-4683-80f5-d9de3c061267","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"762af360-72e5-4b4a-b319-5ef94e05b9d6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"18bc22b2-400a-420f-b5f9-b9fe6f650b92","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ab1b985c-383c-45ed-a4e9-ff77b56bf092","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"842debcc-6e09-4044-9702-e7854d66c082","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ff5618f-d818-4bd1-a55e-2ab577d95325","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba87bb7f-c0e7-46fb-bc7f-588289056d8b","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bcd4bcf4-3cd9-4ad6-9deb-e13abd133c99","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a02b2199-d741-4f8d-94a3-8993f7243413","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54c0028c-5eb6-44ed-87ad-a7eaad4450fe","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfa97e36-6750-492e-9513-0d6dc63f65e6","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bd5ab63-0977-4c73-a597-228dd904be45","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f60734f-d864-4d70-9671-9347730d4968","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b920a0ec-5d65-499d-ab2f-b1a3f239a393","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7bbafba5-9e46-4f42-86ec-f99e5e9cf94f","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d77a80a-ae0f-43a7-a33f-673cd0c0185c","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb0b728d-f7dd-4865-9b71-0e0a0e78f8bf","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"094f851c-afcf-4a18-be9d-d0dea044cc1c","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b18a4c0-1fec-438e-be84-b3a071fe534d","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce4bb606-a9f3-43e9-b8dc-61542e324508","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ff69f07-5621-4b1b-b866-9f7a17e9f866","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"515cfdb5-5fdb-4aa9-b8af-39aea30d2a6d","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41523fae-8d00-45f7-91c0-098ba44809ad","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"df5073fb-39ad-4afc-b52e-e63f17d720c2","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"987e13a6-8503-4772-be19-fbd2e8c933e8","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5c700c0d-b5c5-46fb-9b04-1372b4a696fd","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76b35d93-850c-46b2-a59c-7d0826fca4de","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec7285bb-1d51-4d01-b78b-41a351480650","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"143ba5a6-39ab-4bb0-8072-de20032a63b8","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2283803-f7b3-40a4-bb08-84279bc535f0","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26be20f7-13d1-40af-bf88-335cb829fbd7","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37834455-fe8c-4f23-a23f-cdbbc6b747cd","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9940dbb9-37e6-49ff-9486-8bdc6f1fa18b","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f75b63e8-6408-4fd8-935a-8c241d9cfb86","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4bf2c5a-953e-4a35-a7ff-6104340d515b","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c7cc5333-a527-4a1e-a25c-57e43253aff8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecb01531-30bd-40bb-a7cc-bd92c96be4a8","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"851c9c45-b2ad-4ef0-901b-715805824ec0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff99cdcc-d64f-427c-a83b-275e40048c32","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a086ae35-fed0-4713-9839-c9ce03938eda","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84bfc2f3-7265-467d-8e3f-7851f1b68610","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f31f467-f107-430c-a284-25206dfdb48a","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"24a6d32e-ccbd-4397-a172-d278dcefba9f","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"30f57c31-14f4-4fd9-b084-1c10d1821403","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b720ae6-a874-4f15-8f10-08bc8977565d","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad9451d1-a16d-40bf-8623-1ef350d24a82","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8768affd-210f-4599-a66f-d92b2d96b1ed","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba7ce834-e7b8-4877-9670-c10dc7a069cd","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b778d70b-d15c-4a9e-8c5f-be6246171dcd","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eaf67672-272f-4c9f-9802-6f9a8bb258a2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1796e494-fbdb-4cba-a597-0c8321551ddb","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a4d9aca-5bc7-4bf8-8e7d-761728455c6c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd45751d-0894-4683-80f5-d9de3c061267","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"762af360-72e5-4b4a-b319-5ef94e05b9d6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"18bc22b2-400a-420f-b5f9-b9fe6f650b92","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ab1b985c-383c-45ed-a4e9-ff77b56bf092","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"842debcc-6e09-4044-9702-e7854d66c082","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ff5618f-d818-4bd1-a55e-2ab577d95325","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba87bb7f-c0e7-46fb-bc7f-588289056d8b","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bcd4bcf4-3cd9-4ad6-9deb-e13abd133c99","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a02b2199-d741-4f8d-94a3-8993f7243413","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54c0028c-5eb6-44ed-87ad-a7eaad4450fe","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfa97e36-6750-492e-9513-0d6dc63f65e6","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bd5ab63-0977-4c73-a597-228dd904be45","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f60734f-d864-4d70-9671-9347730d4968","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b920a0ec-5d65-499d-ab2f-b1a3f239a393","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7bbafba5-9e46-4f42-86ec-f99e5e9cf94f","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d77a80a-ae0f-43a7-a33f-673cd0c0185c","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb0b728d-f7dd-4865-9b71-0e0a0e78f8bf","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"094f851c-afcf-4a18-be9d-d0dea044cc1c","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b18a4c0-1fec-438e-be84-b3a071fe534d","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce4bb606-a9f3-43e9-b8dc-61542e324508","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ff69f07-5621-4b1b-b866-9f7a17e9f866","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"515cfdb5-5fdb-4aa9-b8af-39aea30d2a6d","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41523fae-8d00-45f7-91c0-098ba44809ad","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df5073fb-39ad-4afc-b52e-e63f17d720c2","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"987e13a6-8503-4772-be19-fbd2e8c933e8","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c700c0d-b5c5-46fb-9b04-1372b4a696fd","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76b35d93-850c-46b2-a59c-7d0826fca4de","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec7285bb-1d51-4d01-b78b-41a351480650","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"143ba5a6-39ab-4bb0-8072-de20032a63b8","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2283803-f7b3-40a4-bb08-84279bc535f0","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26be20f7-13d1-40af-bf88-335cb829fbd7","path":"sprites/spr_diplomacy_small/spr_diplomacy_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37834455-fe8c-4f23-a23f-cdbbc6b747cd","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_disposition/spr_disposition.yy b/sprites/spr_disposition/spr_disposition.yy index 4fa1e7d56a..3e46eedd86 100644 --- a/sprites/spr_disposition/spr_disposition.yy +++ b/sprites/spr_disposition/spr_disposition.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_disposition", "bboxMode":0, "bbox_bottom":8, @@ -12,28 +12,28 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"98e30133-46fe-47e3-b840-29fad38e4046","name":"98e30133-46fe-47e3-b840-29fad38e4046","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4a1bae03-d0b8-4e97-9e1f-06a28b19863b","name":"4a1bae03-d0b8-4e97-9e1f-06a28b19863b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"89e72e63-9c6f-4ced-a4e9-7eafbf05906b","name":"89e72e63-9c6f-4ced-a4e9-7eafbf05906b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"23692a93-9284-430d-baf2-97ce30befd3c","name":"23692a93-9284-430d-baf2-97ce30befd3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6457a2b0-b232-42f6-b269-41b793c88c29","name":"6457a2b0-b232-42f6-b269-41b793c88c29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4e98f601-9348-46e0-8c2d-3cf992a07b36","name":"4e98f601-9348-46e0-8c2d-3cf992a07b36","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f1cf2b7-204b-468e-8ddd-d7a8a421d90a","name":"7f1cf2b7-204b-468e-8ddd-d7a8a421d90a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b62884fe-9fd0-4d99-a1ea-d78f8b30131d","name":"b62884fe-9fd0-4d99-a1ea-d78f8b30131d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c456454b-266f-4845-92b3-fe78a77b5f11","name":"c456454b-266f-4845-92b3-fe78a77b5f11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"50a520f2-ab62-4d44-8e98-bc1b66d6ce48","name":"50a520f2-ab62-4d44-8e98-bc1b66d6ce48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fe61e55e-ff7b-4888-b7d8-18f1db9b016d","name":"fe61e55e-ff7b-4888-b7d8-18f1db9b016d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6cec14b6-7d08-417c-9754-89bd1feef423","name":"6cec14b6-7d08-417c-9754-89bd1feef423","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b3ca1561-0b50-4df6-b5a4-a161f39c6127","name":"b3ca1561-0b50-4df6-b5a4-a161f39c6127","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2032628d-1554-485a-9851-79380ea8c0af","name":"2032628d-1554-485a-9851-79380ea8c0af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2bba48ba-b958-4d17-881b-f4119f16ff48","name":"2bba48ba-b958-4d17-881b-f4119f16ff48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"57ddaffd-0411-40df-8a37-ce60e94719ce","name":"57ddaffd-0411-40df-8a37-ce60e94719ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a759712-7df3-4cfb-b0f7-ddebefc241fa","name":"3a759712-7df3-4cfb-b0f7-ddebefc241fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"46c88fea-7ccd-4eef-8de8-dc26b47c9109","name":"46c88fea-7ccd-4eef-8de8-dc26b47c9109","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"edb2a834-38c3-4d86-85e6-8daa4ef49dcf","name":"edb2a834-38c3-4d86-85e6-8daa4ef49dcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b8c364d-c27e-4300-9c45-4fb611dd516c","name":"9b8c364d-c27e-4300-9c45-4fb611dd516c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ad1394d-0162-448a-a3de-4d57b18384f6","name":"3ad1394d-0162-448a-a3de-4d57b18384f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0bf7710b-469f-4222-8082-d46c95bcc888","name":"0bf7710b-469f-4222-8082-d46c95bcc888","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"98e30133-46fe-47e3-b840-29fad38e4046","name":"98e30133-46fe-47e3-b840-29fad38e4046","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a1bae03-d0b8-4e97-9e1f-06a28b19863b","name":"4a1bae03-d0b8-4e97-9e1f-06a28b19863b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89e72e63-9c6f-4ced-a4e9-7eafbf05906b","name":"89e72e63-9c6f-4ced-a4e9-7eafbf05906b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"23692a93-9284-430d-baf2-97ce30befd3c","name":"23692a93-9284-430d-baf2-97ce30befd3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6457a2b0-b232-42f6-b269-41b793c88c29","name":"6457a2b0-b232-42f6-b269-41b793c88c29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4e98f601-9348-46e0-8c2d-3cf992a07b36","name":"4e98f601-9348-46e0-8c2d-3cf992a07b36","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f1cf2b7-204b-468e-8ddd-d7a8a421d90a","name":"7f1cf2b7-204b-468e-8ddd-d7a8a421d90a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b62884fe-9fd0-4d99-a1ea-d78f8b30131d","name":"b62884fe-9fd0-4d99-a1ea-d78f8b30131d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c456454b-266f-4845-92b3-fe78a77b5f11","name":"c456454b-266f-4845-92b3-fe78a77b5f11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"50a520f2-ab62-4d44-8e98-bc1b66d6ce48","name":"50a520f2-ab62-4d44-8e98-bc1b66d6ce48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fe61e55e-ff7b-4888-b7d8-18f1db9b016d","name":"fe61e55e-ff7b-4888-b7d8-18f1db9b016d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6cec14b6-7d08-417c-9754-89bd1feef423","name":"6cec14b6-7d08-417c-9754-89bd1feef423","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b3ca1561-0b50-4df6-b5a4-a161f39c6127","name":"b3ca1561-0b50-4df6-b5a4-a161f39c6127","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2032628d-1554-485a-9851-79380ea8c0af","name":"2032628d-1554-485a-9851-79380ea8c0af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2bba48ba-b958-4d17-881b-f4119f16ff48","name":"2bba48ba-b958-4d17-881b-f4119f16ff48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"57ddaffd-0411-40df-8a37-ce60e94719ce","name":"57ddaffd-0411-40df-8a37-ce60e94719ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a759712-7df3-4cfb-b0f7-ddebefc241fa","name":"3a759712-7df3-4cfb-b0f7-ddebefc241fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"46c88fea-7ccd-4eef-8de8-dc26b47c9109","name":"46c88fea-7ccd-4eef-8de8-dc26b47c9109","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"edb2a834-38c3-4d86-85e6-8daa4ef49dcf","name":"edb2a834-38c3-4d86-85e6-8daa4ef49dcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b8c364d-c27e-4300-9c45-4fb611dd516c","name":"9b8c364d-c27e-4300-9c45-4fb611dd516c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ad1394d-0162-448a-a3de-4d57b18384f6","name":"3ad1394d-0162-448a-a3de-4d57b18384f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0bf7710b-469f-4222-8082-d46c95bcc888","name":"0bf7710b-469f-4222-8082-d46c95bcc888","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -89,72 +89,28 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"98e30133-46fe-47e3-b840-29fad38e4046","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"77fd7703-68b9-4b17-b87c-9a217e1f2d98","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a1bae03-d0b8-4e97-9e1f-06a28b19863b","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"008ad391-f7d8-4511-8376-7de988cd4316","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89e72e63-9c6f-4ced-a4e9-7eafbf05906b","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b92a002-0fb0-4dce-9519-02f34929fa34","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"23692a93-9284-430d-baf2-97ce30befd3c","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9215cf60-abf3-42f5-86a6-669aecc3e5f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6457a2b0-b232-42f6-b269-41b793c88c29","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9a1902d-ddaa-4465-b49d-564439690bbe","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e98f601-9348-46e0-8c2d-3cf992a07b36","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c85bf11-f619-47c7-ab3a-dbd3fa760bb0","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f1cf2b7-204b-468e-8ddd-d7a8a421d90a","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"119dc5f6-6819-4377-950e-e5663e9e9faf","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b62884fe-9fd0-4d99-a1ea-d78f8b30131d","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b38a6d72-8cdc-4847-942a-6be7f90c4e45","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c456454b-266f-4845-92b3-fe78a77b5f11","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"52ff60ab-3cae-494a-9534-fdd3ed0c4c5e","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"50a520f2-ab62-4d44-8e98-bc1b66d6ce48","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"07258c63-32b7-4f34-ae51-71bbc786a856","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe61e55e-ff7b-4888-b7d8-18f1db9b016d","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c443e957-0cb5-4580-822f-ff6c8e32d32c","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cec14b6-7d08-417c-9754-89bd1feef423","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f5058280-aa43-4444-803b-a7621d50ec00","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3ca1561-0b50-4df6-b5a4-a161f39c6127","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3221a8f6-7bba-4b56-aefc-826443490000","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2032628d-1554-485a-9851-79380ea8c0af","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dba8ee29-3953-4f6a-85d7-e54c29a680ad","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bba48ba-b958-4d17-881b-f4119f16ff48","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cbc6114f-fbdb-4422-b7c5-867f2c3906a1","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57ddaffd-0411-40df-8a37-ce60e94719ce","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd607404-6ab6-4e77-8746-644f2ec07f47","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a759712-7df3-4cfb-b0f7-ddebefc241fa","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a8f7fb3a-4f32-441d-9963-e1f6ac0deb18","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46c88fea-7ccd-4eef-8de8-dc26b47c9109","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"83bdd252-06da-4f80-b7c5-d87247746b99","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"edb2a834-38c3-4d86-85e6-8daa4ef49dcf","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a658f724-5748-44e3-b708-ccfffd354e31","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b8c364d-c27e-4300-9c45-4fb611dd516c","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90fc49f7-308d-49b1-8326-6f61b5b679b5","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ad1394d-0162-448a-a3de-4d57b18384f6","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"49487973-214c-4270-ab8e-f02320ce50c1","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0bf7710b-469f-4222-8082-d46c95bcc888","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25be9ac4-d1a8-469c-8efa-71bf890408a4","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"98e30133-46fe-47e3-b840-29fad38e4046","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"77fd7703-68b9-4b17-b87c-9a217e1f2d98","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a1bae03-d0b8-4e97-9e1f-06a28b19863b","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"008ad391-f7d8-4511-8376-7de988cd4316","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89e72e63-9c6f-4ced-a4e9-7eafbf05906b","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b92a002-0fb0-4dce-9519-02f34929fa34","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"23692a93-9284-430d-baf2-97ce30befd3c","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9215cf60-abf3-42f5-86a6-669aecc3e5f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6457a2b0-b232-42f6-b269-41b793c88c29","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9a1902d-ddaa-4465-b49d-564439690bbe","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e98f601-9348-46e0-8c2d-3cf992a07b36","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c85bf11-f619-47c7-ab3a-dbd3fa760bb0","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f1cf2b7-204b-468e-8ddd-d7a8a421d90a","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"119dc5f6-6819-4377-950e-e5663e9e9faf","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b62884fe-9fd0-4d99-a1ea-d78f8b30131d","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b38a6d72-8cdc-4847-942a-6be7f90c4e45","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c456454b-266f-4845-92b3-fe78a77b5f11","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"52ff60ab-3cae-494a-9534-fdd3ed0c4c5e","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"50a520f2-ab62-4d44-8e98-bc1b66d6ce48","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"07258c63-32b7-4f34-ae51-71bbc786a856","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fe61e55e-ff7b-4888-b7d8-18f1db9b016d","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c443e957-0cb5-4580-822f-ff6c8e32d32c","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cec14b6-7d08-417c-9754-89bd1feef423","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f5058280-aa43-4444-803b-a7621d50ec00","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3ca1561-0b50-4df6-b5a4-a161f39c6127","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3221a8f6-7bba-4b56-aefc-826443490000","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2032628d-1554-485a-9851-79380ea8c0af","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dba8ee29-3953-4f6a-85d7-e54c29a680ad","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bba48ba-b958-4d17-881b-f4119f16ff48","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cbc6114f-fbdb-4422-b7c5-867f2c3906a1","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"57ddaffd-0411-40df-8a37-ce60e94719ce","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd607404-6ab6-4e77-8746-644f2ec07f47","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a759712-7df3-4cfb-b0f7-ddebefc241fa","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a8f7fb3a-4f32-441d-9963-e1f6ac0deb18","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"46c88fea-7ccd-4eef-8de8-dc26b47c9109","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"83bdd252-06da-4f80-b7c5-d87247746b99","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"edb2a834-38c3-4d86-85e6-8daa4ef49dcf","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a658f724-5748-44e3-b708-ccfffd354e31","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b8c364d-c27e-4300-9c45-4fb611dd516c","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90fc49f7-308d-49b1-8326-6f61b5b679b5","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ad1394d-0162-448a-a3de-4d57b18384f6","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"49487973-214c-4270-ab8e-f02320ce50c1","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0bf7710b-469f-4222-8082-d46c95bcc888","path":"sprites/spr_disposition/spr_disposition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25be9ac4-d1a8-469c-8efa-71bf890408a4","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_disposition_small/spr_disposition_small.yy b/sprites/spr_disposition_small/spr_disposition_small.yy index a503dd38b4..7ad3a04694 100644 --- a/sprites/spr_disposition_small/spr_disposition_small.yy +++ b/sprites/spr_disposition_small/spr_disposition_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_disposition_small", "bboxMode":0, "bbox_bottom":8, @@ -12,26 +12,26 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"265ceb15-4b8f-4dc9-a884-5dcda1fe699c","name":"265ceb15-4b8f-4dc9-a884-5dcda1fe699c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a2f2dcc-2dc9-4455-a25a-f8101ce83a5d","name":"2a2f2dcc-2dc9-4455-a25a-f8101ce83a5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da8c652b-5cd4-4a77-82fb-c4e5ddf12bcb","name":"da8c652b-5cd4-4a77-82fb-c4e5ddf12bcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14e2bb36-0557-44c7-adc4-29fd8416ae52","name":"14e2bb36-0557-44c7-adc4-29fd8416ae52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb0286e5-715d-48cd-ae8d-55cc23aa8338","name":"bb0286e5-715d-48cd-ae8d-55cc23aa8338","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"94e48fa1-3322-45ba-92cf-f110f2459f0c","name":"94e48fa1-3322-45ba-92cf-f110f2459f0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0c040a23-c32e-44fa-9fcd-d9d73c08aae1","name":"0c040a23-c32e-44fa-9fcd-d9d73c08aae1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b28fff07-5ae9-4bd1-83ec-d132ebe19539","name":"b28fff07-5ae9-4bd1-83ec-d132ebe19539","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ccd4090d-a362-4e5a-ae92-93f64fd8f6eb","name":"ccd4090d-a362-4e5a-ae92-93f64fd8f6eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6afb8843-a801-4150-bc19-748f64616e10","name":"6afb8843-a801-4150-bc19-748f64616e10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e008a202-76e4-4962-a956-7a8b9821ad70","name":"e008a202-76e4-4962-a956-7a8b9821ad70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d85dac91-f7e9-4bd7-b6fd-785c29834763","name":"d85dac91-f7e9-4bd7-b6fd-785c29834763","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca49fe1f-56fa-4fc1-afc2-e9800609be80","name":"ca49fe1f-56fa-4fc1-afc2-e9800609be80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3f2bfa1c-4599-4db1-b938-6b2ef778ad28","name":"3f2bfa1c-4599-4db1-b938-6b2ef778ad28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"abc1f8ae-d1a3-4d6c-8ee3-5bd5f8787746","name":"abc1f8ae-d1a3-4d6c-8ee3-5bd5f8787746","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"088f95db-0409-472a-97f2-bc8310ee706f","name":"088f95db-0409-472a-97f2-bc8310ee706f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"202f3a87-4a57-4f10-a8cb-da641e276729","name":"202f3a87-4a57-4f10-a8cb-da641e276729","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c9e74c28-ba7e-48b8-b057-aa75cf9c695d","name":"c9e74c28-ba7e-48b8-b057-aa75cf9c695d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bfe18a47-5559-4a67-9b4a-bcbe2f79dee6","name":"bfe18a47-5559-4a67-9b4a-bcbe2f79dee6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d713f514-9693-4f7f-b0c0-f6019b536321","name":"d713f514-9693-4f7f-b0c0-f6019b536321","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"265ceb15-4b8f-4dc9-a884-5dcda1fe699c","name":"265ceb15-4b8f-4dc9-a884-5dcda1fe699c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a2f2dcc-2dc9-4455-a25a-f8101ce83a5d","name":"2a2f2dcc-2dc9-4455-a25a-f8101ce83a5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da8c652b-5cd4-4a77-82fb-c4e5ddf12bcb","name":"da8c652b-5cd4-4a77-82fb-c4e5ddf12bcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14e2bb36-0557-44c7-adc4-29fd8416ae52","name":"14e2bb36-0557-44c7-adc4-29fd8416ae52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb0286e5-715d-48cd-ae8d-55cc23aa8338","name":"bb0286e5-715d-48cd-ae8d-55cc23aa8338","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"94e48fa1-3322-45ba-92cf-f110f2459f0c","name":"94e48fa1-3322-45ba-92cf-f110f2459f0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0c040a23-c32e-44fa-9fcd-d9d73c08aae1","name":"0c040a23-c32e-44fa-9fcd-d9d73c08aae1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b28fff07-5ae9-4bd1-83ec-d132ebe19539","name":"b28fff07-5ae9-4bd1-83ec-d132ebe19539","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ccd4090d-a362-4e5a-ae92-93f64fd8f6eb","name":"ccd4090d-a362-4e5a-ae92-93f64fd8f6eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6afb8843-a801-4150-bc19-748f64616e10","name":"6afb8843-a801-4150-bc19-748f64616e10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e008a202-76e4-4962-a956-7a8b9821ad70","name":"e008a202-76e4-4962-a956-7a8b9821ad70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d85dac91-f7e9-4bd7-b6fd-785c29834763","name":"d85dac91-f7e9-4bd7-b6fd-785c29834763","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca49fe1f-56fa-4fc1-afc2-e9800609be80","name":"ca49fe1f-56fa-4fc1-afc2-e9800609be80","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f2bfa1c-4599-4db1-b938-6b2ef778ad28","name":"3f2bfa1c-4599-4db1-b938-6b2ef778ad28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"abc1f8ae-d1a3-4d6c-8ee3-5bd5f8787746","name":"abc1f8ae-d1a3-4d6c-8ee3-5bd5f8787746","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"088f95db-0409-472a-97f2-bc8310ee706f","name":"088f95db-0409-472a-97f2-bc8310ee706f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"202f3a87-4a57-4f10-a8cb-da641e276729","name":"202f3a87-4a57-4f10-a8cb-da641e276729","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9e74c28-ba7e-48b8-b057-aa75cf9c695d","name":"c9e74c28-ba7e-48b8-b057-aa75cf9c695d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bfe18a47-5559-4a67-9b4a-bcbe2f79dee6","name":"bfe18a47-5559-4a67-9b4a-bcbe2f79dee6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d713f514-9693-4f7f-b0c0-f6019b536321","name":"d713f514-9693-4f7f-b0c0-f6019b536321","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,6 +82,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":12.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -149,10 +151,7 @@ },"Disabled":false,"id":"b8e98a57-b0f0-4f37-ba00-4a66bb6db318","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, diff --git a/sprites/spr_dread_assault_cannon/ca9af1f8-d9c1-4f87-b306-8aaff6acf541.png b/sprites/spr_dread_assault_cannon/ca9af1f8-d9c1-4f87-b306-8aaff6acf541.png deleted file mode 100644 index f2bc367bc2..0000000000 Binary files a/sprites/spr_dread_assault_cannon/ca9af1f8-d9c1-4f87-b306-8aaff6acf541.png and /dev/null differ diff --git a/sprites/spr_dread_assault_cannon/dd7d5c23-a6af-4857-8741-b07293907895.png b/sprites/spr_dread_assault_cannon/dd7d5c23-a6af-4857-8741-b07293907895.png deleted file mode 100644 index a92a9c65d0..0000000000 Binary files a/sprites/spr_dread_assault_cannon/dd7d5c23-a6af-4857-8741-b07293907895.png and /dev/null differ diff --git a/sprites/spr_dread_assault_cannon/layers/ca9af1f8-d9c1-4f87-b306-8aaff6acf541/5f4f0795-cb93-46e3-9a51-5771616e403f.png b/sprites/spr_dread_assault_cannon/layers/ca9af1f8-d9c1-4f87-b306-8aaff6acf541/5f4f0795-cb93-46e3-9a51-5771616e403f.png deleted file mode 100644 index 3758dd29be..0000000000 Binary files a/sprites/spr_dread_assault_cannon/layers/ca9af1f8-d9c1-4f87-b306-8aaff6acf541/5f4f0795-cb93-46e3-9a51-5771616e403f.png and /dev/null differ diff --git a/sprites/spr_dread_assault_cannon/layers/ca9af1f8-d9c1-4f87-b306-8aaff6acf541/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_assault_cannon/layers/ca9af1f8-d9c1-4f87-b306-8aaff6acf541/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index 189fecdf4d..0000000000 Binary files a/sprites/spr_dread_assault_cannon/layers/ca9af1f8-d9c1-4f87-b306-8aaff6acf541/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ diff --git a/sprites/spr_dread_assault_cannon/layers/dd7d5c23-a6af-4857-8741-b07293907895/5f4f0795-cb93-46e3-9a51-5771616e403f.png b/sprites/spr_dread_assault_cannon/layers/dd7d5c23-a6af-4857-8741-b07293907895/5f4f0795-cb93-46e3-9a51-5771616e403f.png deleted file mode 100644 index a92a9c65d0..0000000000 Binary files a/sprites/spr_dread_assault_cannon/layers/dd7d5c23-a6af-4857-8741-b07293907895/5f4f0795-cb93-46e3-9a51-5771616e403f.png and /dev/null differ diff --git a/sprites/spr_dread_assault_cannon/layers/dd7d5c23-a6af-4857-8741-b07293907895/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_assault_cannon/layers/dd7d5c23-a6af-4857-8741-b07293907895/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index 189fecdf4d..0000000000 Binary files a/sprites/spr_dread_assault_cannon/layers/dd7d5c23-a6af-4857-8741-b07293907895/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ diff --git a/sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy b/sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy index 76a03f50df..58efcb6ac7 100644 --- a/sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy +++ b/sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy @@ -1,10 +1,10 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_assault_cannon", "bboxMode":0, "bbox_bottom":147, "bbox_left":25, - "bbox_right":183, + "bbox_right":182, "bbox_top":50, "collisionKind":1, "collisionTolerance":0, @@ -12,10 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c84e228f-f302-4ca0-ac09-90b28770fca7","name":"c84e228f-f302-4ca0-ac09-90b28770fca7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dd7d5c23-a6af-4857-8741-b07293907895","name":"dd7d5c23-a6af-4857-8741-b07293907895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca9af1f8-d9c1-4f87-b306-8aaff6acf541","name":"ca9af1f8-d9c1-4f87-b306-8aaff6acf541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ad2a58f-8454-4fc8-9d66-a796634adeca","name":"3ad2a58f-8454-4fc8-9d66-a796634adeca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c84e228f-f302-4ca0-ac09-90b28770fca7","name":"c84e228f-f302-4ca0-ac09-90b28770fca7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ad2a58f-8454-4fc8-9d66-a796634adeca","name":"3ad2a58f-8454-4fc8-9d66-a796634adeca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -53,7 +51,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":4.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -67,6 +65,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,15 +75,9 @@ {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c84e228f-f302-4ca0-ac09-90b28770fca7","path":"sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"67b44acf-1538-46ea-b63a-b708f7af59df","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd7d5c23-a6af-4857-8741-b07293907895","path":"sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f524085d-2d17-489f-8e0d-f55c64069e77","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca9af1f8-d9c1-4f87-b306-8aaff6acf541","path":"sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"59917853-4104-45d6-a027-7f36bdb206d7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ad2a58f-8454-4fc8-9d66-a796634adeca","path":"sprites/spr_dread_assault_cannon/spr_dread_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d3ba6aa-ccf9-4708-858a-ec292b2c1b52","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"2d3ba6aa-ccf9-4708-858a-ec292b2c1b52","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_dread_autocannon/430ba383-8c34-4c5c-a443-2005ddb354ff.png b/sprites/spr_dread_autocannon/430ba383-8c34-4c5c-a443-2005ddb354ff.png deleted file mode 100644 index bd8d3dc7fe..0000000000 Binary files a/sprites/spr_dread_autocannon/430ba383-8c34-4c5c-a443-2005ddb354ff.png and /dev/null differ diff --git a/sprites/spr_dread_autocannon/6692383a-0d7e-4194-998f-fc3bf2067f77.png b/sprites/spr_dread_autocannon/6692383a-0d7e-4194-998f-fc3bf2067f77.png deleted file mode 100644 index 9353d317b6..0000000000 Binary files a/sprites/spr_dread_autocannon/6692383a-0d7e-4194-998f-fc3bf2067f77.png and /dev/null differ diff --git a/sprites/spr_dread_autocannon/layers/430ba383-8c34-4c5c-a443-2005ddb354ff/9093f3a1-b3fd-4c9b-af10-612dea29d004.png b/sprites/spr_dread_autocannon/layers/430ba383-8c34-4c5c-a443-2005ddb354ff/9093f3a1-b3fd-4c9b-af10-612dea29d004.png deleted file mode 100644 index bd8d3dc7fe..0000000000 Binary files a/sprites/spr_dread_autocannon/layers/430ba383-8c34-4c5c-a443-2005ddb354ff/9093f3a1-b3fd-4c9b-af10-612dea29d004.png and /dev/null differ diff --git a/sprites/spr_dread_autocannon/layers/6692383a-0d7e-4194-998f-fc3bf2067f77/9093f3a1-b3fd-4c9b-af10-612dea29d004.png b/sprites/spr_dread_autocannon/layers/6692383a-0d7e-4194-998f-fc3bf2067f77/9093f3a1-b3fd-4c9b-af10-612dea29d004.png deleted file mode 100644 index 9353d317b6..0000000000 Binary files a/sprites/spr_dread_autocannon/layers/6692383a-0d7e-4194-998f-fc3bf2067f77/9093f3a1-b3fd-4c9b-af10-612dea29d004.png and /dev/null differ diff --git a/sprites/spr_dread_autocannon/spr_dread_autocannon.yy b/sprites/spr_dread_autocannon/spr_dread_autocannon.yy index 898adf19c6..543c67b764 100644 --- a/sprites/spr_dread_autocannon/spr_dread_autocannon.yy +++ b/sprites/spr_dread_autocannon/spr_dread_autocannon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_autocannon", "bboxMode":0, "bbox_bottom":135, @@ -12,10 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"745b9ec2-90a6-4381-a7d8-db8fb386297b","name":"745b9ec2-90a6-4381-a7d8-db8fb386297b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"430ba383-8c34-4c5c-a443-2005ddb354ff","name":"430ba383-8c34-4c5c-a443-2005ddb354ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6692383a-0d7e-4194-998f-fc3bf2067f77","name":"6692383a-0d7e-4194-998f-fc3bf2067f77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2567bd58-d13d-4cd9-9979-937b4d54e288","name":"2567bd58-d13d-4cd9-9979-937b4d54e288","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"745b9ec2-90a6-4381-a7d8-db8fb386297b","name":"745b9ec2-90a6-4381-a7d8-db8fb386297b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2567bd58-d13d-4cd9-9979-937b4d54e288","name":"2567bd58-d13d-4cd9-9979-937b4d54e288","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -52,7 +50,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":4.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -66,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -74,15 +74,9 @@ {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"745b9ec2-90a6-4381-a7d8-db8fb386297b","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"7320a661-0b33-46b9-b0be-0961bc655444","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"430ba383-8c34-4c5c-a443-2005ddb354ff","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bce7996c-812d-45ff-9c6e-22f2033544fa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6692383a-0d7e-4194-998f-fc3bf2067f77","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b3edbe84-c124-4a89-a211-f745d8629411","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2567bd58-d13d-4cd9-9979-937b4d54e288","path":"sprites/spr_dread_autocannon/spr_dread_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a239dd57-a41e-4c43-b5f5-aad2886cf134","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"a239dd57-a41e-4c43-b5f5-aad2886cf134","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_dread_claw/c66f97c4-ce8b-427b-8ab0-baac7d95dda9.png b/sprites/spr_dread_claw/c66f97c4-ce8b-427b-8ab0-baac7d95dda9.png deleted file mode 100644 index e36bcc888a..0000000000 Binary files a/sprites/spr_dread_claw/c66f97c4-ce8b-427b-8ab0-baac7d95dda9.png and /dev/null differ diff --git a/sprites/spr_dread_claw/edc36065-c8cc-48b7-b999-6a9a9665befa.png b/sprites/spr_dread_claw/edc36065-c8cc-48b7-b999-6a9a9665befa.png deleted file mode 100644 index 6fdaf272c3..0000000000 Binary files a/sprites/spr_dread_claw/edc36065-c8cc-48b7-b999-6a9a9665befa.png and /dev/null differ diff --git a/sprites/spr_dread_claw/layers/c66f97c4-ce8b-427b-8ab0-baac7d95dda9/0a188212-4756-437d-9b06-5ec78990fa63.png b/sprites/spr_dread_claw/layers/c66f97c4-ce8b-427b-8ab0-baac7d95dda9/0a188212-4756-437d-9b06-5ec78990fa63.png deleted file mode 100644 index e36bcc888a..0000000000 Binary files a/sprites/spr_dread_claw/layers/c66f97c4-ce8b-427b-8ab0-baac7d95dda9/0a188212-4756-437d-9b06-5ec78990fa63.png and /dev/null differ diff --git a/sprites/spr_dread_claw/layers/edc36065-c8cc-48b7-b999-6a9a9665befa/0a188212-4756-437d-9b06-5ec78990fa63.png b/sprites/spr_dread_claw/layers/edc36065-c8cc-48b7-b999-6a9a9665befa/0a188212-4756-437d-9b06-5ec78990fa63.png deleted file mode 100644 index 6fdaf272c3..0000000000 Binary files a/sprites/spr_dread_claw/layers/edc36065-c8cc-48b7-b999-6a9a9665befa/0a188212-4756-437d-9b06-5ec78990fa63.png and /dev/null differ diff --git a/sprites/spr_dread_claw/spr_dread_claw.yy b/sprites/spr_dread_claw/spr_dread_claw.yy index 400750c5c9..b67900d3ad 100644 --- a/sprites/spr_dread_claw/spr_dread_claw.yy +++ b/sprites/spr_dread_claw/spr_dread_claw.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_claw", "bboxMode":0, "bbox_bottom":149, @@ -12,10 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6a74ce9f-a9b4-4216-a14f-8b9414602232","name":"6a74ce9f-a9b4-4216-a14f-8b9414602232","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c66f97c4-ce8b-427b-8ab0-baac7d95dda9","name":"c66f97c4-ce8b-427b-8ab0-baac7d95dda9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"edc36065-c8cc-48b7-b999-6a9a9665befa","name":"edc36065-c8cc-48b7-b999-6a9a9665befa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6a74ce9f-a9b4-4216-a14f-8b9414602232","name":"6a74ce9f-a9b4-4216-a14f-8b9414602232","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -52,7 +50,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":4.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -66,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -74,15 +74,9 @@ {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a74ce9f-a9b4-4216-a14f-8b9414602232","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"e51b6ab0-7a20-42e1-859c-46c98a0c8824","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c66f97c4-ce8b-427b-8ab0-baac7d95dda9","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5bbf0289-d424-4550-98ad-5047fc11962b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"edc36065-c8cc-48b7-b999-6a9a9665befa","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45d4f37f-74f6-48b1-bcf2-2712507cc7b1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57ec1b81-3fc4-4e51-a911-7dce140119ae","path":"sprites/spr_dread_claw/spr_dread_claw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75935d55-a225-48aa-b539-a41d7fac776a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"75935d55-a225-48aa-b539-a41d7fac776a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_dread_colors/spr_dread_colors.yy b/sprites/spr_dread_colors/spr_dread_colors.yy index 1e4dfe3d22..69345b196f 100644 --- a/sprites/spr_dread_colors/spr_dread_colors.yy +++ b/sprites/spr_dread_colors/spr_dread_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_colors", "bboxMode":0, "bbox_bottom":188, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"361fe342-cd6d-494f-8a77-1f154dcaeba8","name":"361fe342-cd6d-494f-8a77-1f154dcaeba8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"708b2730-d6a6-47d6-bff4-80924a61a262","name":"708b2730-d6a6-47d6-bff4-80924a61a262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d165c00f-8a0b-4d33-80a1-9d57b2540446","name":"d165c00f-8a0b-4d33-80a1-9d57b2540446","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4cca7a25-d5e6-4e39-8323-49026e09fcaf","name":"4cca7a25-d5e6-4e39-8323-49026e09fcaf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2bad7f29-a2ae-422e-b6a3-8448166aeab1","name":"2bad7f29-a2ae-422e-b6a3-8448166aeab1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d955ed23-b03e-46e7-91c2-8fb8d923f972","name":"d955ed23-b03e-46e7-91c2-8fb8d923f972","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"361fe342-cd6d-494f-8a77-1f154dcaeba8","name":"361fe342-cd6d-494f-8a77-1f154dcaeba8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"708b2730-d6a6-47d6-bff4-80924a61a262","name":"708b2730-d6a6-47d6-bff4-80924a61a262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d165c00f-8a0b-4d33-80a1-9d57b2540446","name":"d165c00f-8a0b-4d33-80a1-9d57b2540446","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4cca7a25-d5e6-4e39-8323-49026e09fcaf","name":"4cca7a25-d5e6-4e39-8323-49026e09fcaf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2bad7f29-a2ae-422e-b6a3-8448166aeab1","name":"2bad7f29-a2ae-422e-b6a3-8448166aeab1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d955ed23-b03e-46e7-91c2-8fb8d923f972","name":"d955ed23-b03e-46e7-91c2-8fb8d923f972","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"361fe342-cd6d-494f-8a77-1f154dcaeba8","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f942abc3-6b58-4c8f-a9d3-1d0117658510","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"708b2730-d6a6-47d6-bff4-80924a61a262","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"633b449f-a51c-493a-80e5-354707b65443","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d165c00f-8a0b-4d33-80a1-9d57b2540446","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70848c74-dde7-4d5e-bc82-e5af29cb121d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4cca7a25-d5e6-4e39-8323-49026e09fcaf","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf3cc946-ed66-4919-816d-eee08c339e11","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bad7f29-a2ae-422e-b6a3-8448166aeab1","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d29c0bec-ce6b-4407-bdce-02cf253ac864","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d955ed23-b03e-46e7-91c2-8fb8d923f972","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e763d81-9898-48c2-aca9-36d0533365e4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"361fe342-cd6d-494f-8a77-1f154dcaeba8","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f942abc3-6b58-4c8f-a9d3-1d0117658510","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"708b2730-d6a6-47d6-bff4-80924a61a262","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"633b449f-a51c-493a-80e5-354707b65443","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d165c00f-8a0b-4d33-80a1-9d57b2540446","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70848c74-dde7-4d5e-bc82-e5af29cb121d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4cca7a25-d5e6-4e39-8323-49026e09fcaf","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf3cc946-ed66-4919-816d-eee08c339e11","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bad7f29-a2ae-422e-b6a3-8448166aeab1","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d29c0bec-ce6b-4407-bdce-02cf253ac864","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d955ed23-b03e-46e7-91c2-8fb8d923f972","path":"sprites/spr_dread_colors/spr_dread_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e763d81-9898-48c2-aca9-36d0533365e4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_dread_heavy_bolter/9fa15ed7-cd79-4acd-83d9-95ecf0be332f.png b/sprites/spr_dread_heavy_bolter/9fa15ed7-cd79-4acd-83d9-95ecf0be332f.png deleted file mode 100644 index 369fc954b1..0000000000 Binary files a/sprites/spr_dread_heavy_bolter/9fa15ed7-cd79-4acd-83d9-95ecf0be332f.png and /dev/null differ diff --git a/sprites/spr_dread_heavy_bolter/b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6.png b/sprites/spr_dread_heavy_bolter/b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6.png deleted file mode 100644 index e68b69e23c..0000000000 Binary files a/sprites/spr_dread_heavy_bolter/b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6.png and /dev/null differ diff --git a/sprites/spr_dread_heavy_bolter/layers/9fa15ed7-cd79-4acd-83d9-95ecf0be332f/8032ff11-29ed-4780-ac80-92b6e1c5e7aa.png b/sprites/spr_dread_heavy_bolter/layers/9fa15ed7-cd79-4acd-83d9-95ecf0be332f/8032ff11-29ed-4780-ac80-92b6e1c5e7aa.png deleted file mode 100644 index 369fc954b1..0000000000 Binary files a/sprites/spr_dread_heavy_bolter/layers/9fa15ed7-cd79-4acd-83d9-95ecf0be332f/8032ff11-29ed-4780-ac80-92b6e1c5e7aa.png and /dev/null differ diff --git a/sprites/spr_dread_heavy_bolter/layers/b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6/8032ff11-29ed-4780-ac80-92b6e1c5e7aa.png b/sprites/spr_dread_heavy_bolter/layers/b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6/8032ff11-29ed-4780-ac80-92b6e1c5e7aa.png deleted file mode 100644 index e68b69e23c..0000000000 Binary files a/sprites/spr_dread_heavy_bolter/layers/b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6/8032ff11-29ed-4780-ac80-92b6e1c5e7aa.png and /dev/null differ diff --git a/sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy b/sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy index a22073c890..6c9899737d 100644 --- a/sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy +++ b/sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_heavy_bolter", "bboxMode":0, "bbox_bottom":161, @@ -12,10 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0e84c437-f0a8-4de3-a069-030fbbde3c3a","name":"0e84c437-f0a8-4de3-a069-030fbbde3c3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9fa15ed7-cd79-4acd-83d9-95ecf0be332f","name":"9fa15ed7-cd79-4acd-83d9-95ecf0be332f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6","name":"b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d244aeeb-dbac-49cb-ba6a-cc8c95d420f4","name":"d244aeeb-dbac-49cb-ba6a-cc8c95d420f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0e84c437-f0a8-4de3-a069-030fbbde3c3a","name":"0e84c437-f0a8-4de3-a069-030fbbde3c3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d244aeeb-dbac-49cb-ba6a-cc8c95d420f4","name":"d244aeeb-dbac-49cb-ba6a-cc8c95d420f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -52,7 +50,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":4.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -66,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -74,15 +74,9 @@ {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e84c437-f0a8-4de3-a069-030fbbde3c3a","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"8cfd5cb7-7f48-45c5-a00f-8787ce85d23c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fa15ed7-cd79-4acd-83d9-95ecf0be332f","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"908060ba-7006-42e9-940d-3639378698fe","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9dd1c82-3f7f-4a18-864f-e78a4b0ed9d6","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d2fa763-d40a-4434-8aa5-af95172f89f6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d244aeeb-dbac-49cb-ba6a-cc8c95d420f4","path":"sprites/spr_dread_heavy_bolter/spr_dread_heavy_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54b9f603-c68d-4b23-8069-73471fba2d1c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"54b9f603-c68d-4b23-8069-73471fba2d1c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_dread_iron_clad/eb254b9d-bb2c-41f8-9e62-ad9069c99560.png b/sprites/spr_dread_iron_clad/eb254b9d-bb2c-41f8-9e62-ad9069c99560.png deleted file mode 100644 index e39b6ca84c..0000000000 Binary files a/sprites/spr_dread_iron_clad/eb254b9d-bb2c-41f8-9e62-ad9069c99560.png and /dev/null differ diff --git a/sprites/spr_dread_iron_clad/f5bd9088-45e5-4695-a241-41e7835f44fd.png b/sprites/spr_dread_iron_clad/f5bd9088-45e5-4695-a241-41e7835f44fd.png deleted file mode 100644 index 3119a98c1e..0000000000 Binary files a/sprites/spr_dread_iron_clad/f5bd9088-45e5-4695-a241-41e7835f44fd.png and /dev/null differ diff --git a/sprites/spr_dread_iron_clad/layers/eb254b9d-bb2c-41f8-9e62-ad9069c99560/750c31f7-7377-4a6c-809a-4f9444c3a1e7.png b/sprites/spr_dread_iron_clad/layers/eb254b9d-bb2c-41f8-9e62-ad9069c99560/750c31f7-7377-4a6c-809a-4f9444c3a1e7.png deleted file mode 100644 index e39b6ca84c..0000000000 Binary files a/sprites/spr_dread_iron_clad/layers/eb254b9d-bb2c-41f8-9e62-ad9069c99560/750c31f7-7377-4a6c-809a-4f9444c3a1e7.png and /dev/null differ diff --git a/sprites/spr_dread_iron_clad/layers/eb254b9d-bb2c-41f8-9e62-ad9069c99560/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_iron_clad/layers/eb254b9d-bb2c-41f8-9e62-ad9069c99560/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index 5bda11e038..0000000000 Binary files a/sprites/spr_dread_iron_clad/layers/eb254b9d-bb2c-41f8-9e62-ad9069c99560/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ diff --git a/sprites/spr_dread_iron_clad/layers/f5bd9088-45e5-4695-a241-41e7835f44fd/750c31f7-7377-4a6c-809a-4f9444c3a1e7.png b/sprites/spr_dread_iron_clad/layers/f5bd9088-45e5-4695-a241-41e7835f44fd/750c31f7-7377-4a6c-809a-4f9444c3a1e7.png deleted file mode 100644 index 3119a98c1e..0000000000 Binary files a/sprites/spr_dread_iron_clad/layers/f5bd9088-45e5-4695-a241-41e7835f44fd/750c31f7-7377-4a6c-809a-4f9444c3a1e7.png and /dev/null differ diff --git a/sprites/spr_dread_iron_clad/layers/f5bd9088-45e5-4695-a241-41e7835f44fd/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_iron_clad/layers/f5bd9088-45e5-4695-a241-41e7835f44fd/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index 5bda11e038..0000000000 Binary files a/sprites/spr_dread_iron_clad/layers/f5bd9088-45e5-4695-a241-41e7835f44fd/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ diff --git a/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy b/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy index 1ee90b23ef..de449dec94 100644 --- a/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy +++ b/sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_iron_clad", "bboxMode":0, "bbox_bottom":126, @@ -12,10 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"659ee02b-897e-4104-b145-c359f7650d83","name":"659ee02b-897e-4104-b145-c359f7650d83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f5bd9088-45e5-4695-a241-41e7835f44fd","name":"f5bd9088-45e5-4695-a241-41e7835f44fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eb254b9d-bb2c-41f8-9e62-ad9069c99560","name":"eb254b9d-bb2c-41f8-9e62-ad9069c99560","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"659ee02b-897e-4104-b145-c359f7650d83","name":"659ee02b-897e-4104-b145-c359f7650d83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -53,7 +51,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":4.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -67,6 +65,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,15 +75,9 @@ {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"659ee02b-897e-4104-b145-c359f7650d83","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"72055c78-d5f9-4d35-b4fc-ac4f508fc051","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5bd9088-45e5-4695-a241-41e7835f44fd","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"311b9778-22a9-486c-8c7a-3869c6e64ad1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb254b9d-bb2c-41f8-9e62-ad9069c99560","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21ebe3ac-2d0b-4143-a037-736b0c94f029","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e9f2a9c-b557-4f1c-96d7-58994bd08c54","path":"sprites/spr_dread_iron_clad/spr_dread_iron_clad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"adc99ac7-ddb8-4694-8730-7920aea8ffb2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"adc99ac7-ddb8-4694-8730-7920aea8ffb2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_dread_lascannon/48994d0c-01f0-441c-9383-c0eafe9cae39.png b/sprites/spr_dread_lascannon/48994d0c-01f0-441c-9383-c0eafe9cae39.png deleted file mode 100644 index 936b86fe3e..0000000000 Binary files a/sprites/spr_dread_lascannon/48994d0c-01f0-441c-9383-c0eafe9cae39.png and /dev/null differ diff --git a/sprites/spr_dread_lascannon/fc539d0b-b559-4265-95a9-df8bac65ea2b.png b/sprites/spr_dread_lascannon/fc539d0b-b559-4265-95a9-df8bac65ea2b.png deleted file mode 100644 index e0a62c0c9e..0000000000 Binary files a/sprites/spr_dread_lascannon/fc539d0b-b559-4265-95a9-df8bac65ea2b.png and /dev/null differ diff --git a/sprites/spr_dread_lascannon/layers/48994d0c-01f0-441c-9383-c0eafe9cae39/1d4cccd9-bb49-4325-8933-45f465f70841.png b/sprites/spr_dread_lascannon/layers/48994d0c-01f0-441c-9383-c0eafe9cae39/1d4cccd9-bb49-4325-8933-45f465f70841.png deleted file mode 100644 index 936b86fe3e..0000000000 Binary files a/sprites/spr_dread_lascannon/layers/48994d0c-01f0-441c-9383-c0eafe9cae39/1d4cccd9-bb49-4325-8933-45f465f70841.png and /dev/null differ diff --git a/sprites/spr_dread_lascannon/layers/48994d0c-01f0-441c-9383-c0eafe9cae39/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_lascannon/layers/48994d0c-01f0-441c-9383-c0eafe9cae39/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index 70e3813055..0000000000 Binary files a/sprites/spr_dread_lascannon/layers/48994d0c-01f0-441c-9383-c0eafe9cae39/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ diff --git a/sprites/spr_dread_lascannon/layers/fc539d0b-b559-4265-95a9-df8bac65ea2b/1d4cccd9-bb49-4325-8933-45f465f70841.png b/sprites/spr_dread_lascannon/layers/fc539d0b-b559-4265-95a9-df8bac65ea2b/1d4cccd9-bb49-4325-8933-45f465f70841.png deleted file mode 100644 index e0a62c0c9e..0000000000 Binary files a/sprites/spr_dread_lascannon/layers/fc539d0b-b559-4265-95a9-df8bac65ea2b/1d4cccd9-bb49-4325-8933-45f465f70841.png and /dev/null differ diff --git a/sprites/spr_dread_lascannon/layers/fc539d0b-b559-4265-95a9-df8bac65ea2b/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_lascannon/layers/fc539d0b-b559-4265-95a9-df8bac65ea2b/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index 70e3813055..0000000000 Binary files a/sprites/spr_dread_lascannon/layers/fc539d0b-b559-4265-95a9-df8bac65ea2b/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ diff --git a/sprites/spr_dread_lascannon/spr_dread_lascannon.yy b/sprites/spr_dread_lascannon/spr_dread_lascannon.yy index fc10174dc1..f0dc36e09c 100644 --- a/sprites/spr_dread_lascannon/spr_dread_lascannon.yy +++ b/sprites/spr_dread_lascannon/spr_dread_lascannon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_lascannon", "bboxMode":0, "bbox_bottom":147, @@ -12,10 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7a4dd223-f227-41f5-b68a-f206094e2789","name":"7a4dd223-f227-41f5-b68a-f206094e2789","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"48994d0c-01f0-441c-9383-c0eafe9cae39","name":"48994d0c-01f0-441c-9383-c0eafe9cae39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fc539d0b-b559-4265-95a9-df8bac65ea2b","name":"fc539d0b-b559-4265-95a9-df8bac65ea2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"243e4946-be2b-4339-b336-5253d6514685","name":"243e4946-be2b-4339-b336-5253d6514685","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a4dd223-f227-41f5-b68a-f206094e2789","name":"7a4dd223-f227-41f5-b68a-f206094e2789","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"243e4946-be2b-4339-b336-5253d6514685","name":"243e4946-be2b-4339-b336-5253d6514685","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -53,7 +51,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":4.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -67,6 +65,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,15 +75,9 @@ {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a4dd223-f227-41f5-b68a-f206094e2789","path":"sprites/spr_dread_lascannon/spr_dread_lascannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"4c67a973-13fd-4cc5-9173-7d7899f31e93","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48994d0c-01f0-441c-9383-c0eafe9cae39","path":"sprites/spr_dread_lascannon/spr_dread_lascannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"07736577-6138-4e0a-8b8c-d34946402720","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc539d0b-b559-4265-95a9-df8bac65ea2b","path":"sprites/spr_dread_lascannon/spr_dread_lascannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c4264f38-ca9a-4c52-a7c2-46e73fb40e5d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"243e4946-be2b-4339-b336-5253d6514685","path":"sprites/spr_dread_lascannon/spr_dread_lascannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"79b47047-c38c-4291-9d1d-bcd6d2aa31ac","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"79b47047-c38c-4291-9d1d-bcd6d2aa31ac","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_dread_missile/098fd89a-d321-4251-b0f3-70132fea3997.png b/sprites/spr_dread_missile/098fd89a-d321-4251-b0f3-70132fea3997.png deleted file mode 100644 index 85c907add0..0000000000 Binary files a/sprites/spr_dread_missile/098fd89a-d321-4251-b0f3-70132fea3997.png and /dev/null differ diff --git a/sprites/spr_dread_missile/7fa6bc12-162e-4538-92df-3bc73caec0ee.png b/sprites/spr_dread_missile/7fa6bc12-162e-4538-92df-3bc73caec0ee.png deleted file mode 100644 index 4295cdcab0..0000000000 Binary files a/sprites/spr_dread_missile/7fa6bc12-162e-4538-92df-3bc73caec0ee.png and /dev/null differ diff --git a/sprites/spr_dread_missile/layers/098fd89a-d321-4251-b0f3-70132fea3997/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_missile/layers/098fd89a-d321-4251-b0f3-70132fea3997/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index 8833551f74..0000000000 Binary files a/sprites/spr_dread_missile/layers/098fd89a-d321-4251-b0f3-70132fea3997/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ diff --git a/sprites/spr_dread_missile/layers/098fd89a-d321-4251-b0f3-70132fea3997/c8fad8b0-70d6-45c8-a8ed-2c1e3cb3673e.png b/sprites/spr_dread_missile/layers/098fd89a-d321-4251-b0f3-70132fea3997/c8fad8b0-70d6-45c8-a8ed-2c1e3cb3673e.png deleted file mode 100644 index 85c907add0..0000000000 Binary files a/sprites/spr_dread_missile/layers/098fd89a-d321-4251-b0f3-70132fea3997/c8fad8b0-70d6-45c8-a8ed-2c1e3cb3673e.png and /dev/null differ diff --git a/sprites/spr_dread_missile/layers/7fa6bc12-162e-4538-92df-3bc73caec0ee/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_missile/layers/7fa6bc12-162e-4538-92df-3bc73caec0ee/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index 5bda11e038..0000000000 Binary files a/sprites/spr_dread_missile/layers/7fa6bc12-162e-4538-92df-3bc73caec0ee/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ diff --git a/sprites/spr_dread_missile/layers/7fa6bc12-162e-4538-92df-3bc73caec0ee/c8fad8b0-70d6-45c8-a8ed-2c1e3cb3673e.png b/sprites/spr_dread_missile/layers/7fa6bc12-162e-4538-92df-3bc73caec0ee/c8fad8b0-70d6-45c8-a8ed-2c1e3cb3673e.png deleted file mode 100644 index 4295cdcab0..0000000000 Binary files a/sprites/spr_dread_missile/layers/7fa6bc12-162e-4538-92df-3bc73caec0ee/c8fad8b0-70d6-45c8-a8ed-2c1e3cb3673e.png and /dev/null differ diff --git a/sprites/spr_dread_missile/spr_dread_missile.yy b/sprites/spr_dread_missile/spr_dread_missile.yy index 95f234ff3a..a9d95edff0 100644 --- a/sprites/spr_dread_missile/spr_dread_missile.yy +++ b/sprites/spr_dread_missile/spr_dread_missile.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_missile", "bboxMode":0, "bbox_bottom":128, @@ -12,10 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"737d52a6-df9c-4e48-8622-c0b852027c2f","name":"737d52a6-df9c-4e48-8622-c0b852027c2f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7fa6bc12-162e-4538-92df-3bc73caec0ee","name":"7fa6bc12-162e-4538-92df-3bc73caec0ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"098fd89a-d321-4251-b0f3-70132fea3997","name":"098fd89a-d321-4251-b0f3-70132fea3997","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b88af3eb-d9a5-46d6-aae2-0ca08fd69c1c","name":"b88af3eb-d9a5-46d6-aae2-0ca08fd69c1c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"737d52a6-df9c-4e48-8622-c0b852027c2f","name":"737d52a6-df9c-4e48-8622-c0b852027c2f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b88af3eb-d9a5-46d6-aae2-0ca08fd69c1c","name":"b88af3eb-d9a5-46d6-aae2-0ca08fd69c1c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -53,7 +51,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":4.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -67,6 +65,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,15 +75,9 @@ {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"737d52a6-df9c-4e48-8622-c0b852027c2f","path":"sprites/spr_dread_missile/spr_dread_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"91868ede-eed2-47ff-a436-f5de3e22a7b1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fa6bc12-162e-4538-92df-3bc73caec0ee","path":"sprites/spr_dread_missile/spr_dread_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1b75f6f-5c00-4e75-9ad1-3dd22e2756af","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"098fd89a-d321-4251-b0f3-70132fea3997","path":"sprites/spr_dread_missile/spr_dread_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41ff1a87-5f14-4f20-bf2a-9faa2e5e734e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b88af3eb-d9a5-46d6-aae2-0ca08fd69c1c","path":"sprites/spr_dread_missile/spr_dread_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"76bea7ed-ee53-46d6-a834-7d3967e4c4ce","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"76bea7ed-ee53-46d6-a834-7d3967e4c4ce","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_dread_plasma_cannon/76458a7c-df41-4efe-ac58-2273c4d3e898.png b/sprites/spr_dread_plasma_cannon/76458a7c-df41-4efe-ac58-2273c4d3e898.png deleted file mode 100644 index abfda67832..0000000000 Binary files a/sprites/spr_dread_plasma_cannon/76458a7c-df41-4efe-ac58-2273c4d3e898.png and /dev/null differ diff --git a/sprites/spr_dread_plasma_cannon/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3.png b/sprites/spr_dread_plasma_cannon/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3.png deleted file mode 100644 index ef4e22db81..0000000000 Binary files a/sprites/spr_dread_plasma_cannon/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3.png and /dev/null differ diff --git a/sprites/spr_dread_plasma_cannon/layers/76458a7c-df41-4efe-ac58-2273c4d3e898/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_plasma_cannon/layers/76458a7c-df41-4efe-ac58-2273c4d3e898/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index aa8e541292..0000000000 Binary files a/sprites/spr_dread_plasma_cannon/layers/76458a7c-df41-4efe-ac58-2273c4d3e898/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ diff --git a/sprites/spr_dread_plasma_cannon/layers/76458a7c-df41-4efe-ac58-2273c4d3e898/ccd559cd-c323-4e0f-b733-5bf644ca1b41.png b/sprites/spr_dread_plasma_cannon/layers/76458a7c-df41-4efe-ac58-2273c4d3e898/ccd559cd-c323-4e0f-b733-5bf644ca1b41.png deleted file mode 100644 index abfda67832..0000000000 Binary files a/sprites/spr_dread_plasma_cannon/layers/76458a7c-df41-4efe-ac58-2273c4d3e898/ccd559cd-c323-4e0f-b733-5bf644ca1b41.png and /dev/null differ diff --git a/sprites/spr_dread_plasma_cannon/layers/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png b/sprites/spr_dread_plasma_cannon/layers/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png deleted file mode 100644 index aa8e541292..0000000000 Binary files a/sprites/spr_dread_plasma_cannon/layers/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3/818626e5-59b3-4a3c-9f1b-002f98b5e6d3.png and /dev/null differ diff --git a/sprites/spr_dread_plasma_cannon/layers/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3/ccd559cd-c323-4e0f-b733-5bf644ca1b41.png b/sprites/spr_dread_plasma_cannon/layers/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3/ccd559cd-c323-4e0f-b733-5bf644ca1b41.png deleted file mode 100644 index ef4e22db81..0000000000 Binary files a/sprites/spr_dread_plasma_cannon/layers/e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3/ccd559cd-c323-4e0f-b733-5bf644ca1b41.png and /dev/null differ diff --git a/sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy b/sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy index d66ffdb671..50576110a7 100644 --- a/sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy +++ b/sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dread_plasma_cannon", "bboxMode":0, "bbox_bottom":147, @@ -12,10 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6b155309-549e-4057-b0c0-b879145278ee","name":"6b155309-549e-4057-b0c0-b879145278ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3","name":"e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76458a7c-df41-4efe-ac58-2273c4d3e898","name":"76458a7c-df41-4efe-ac58-2273c4d3e898","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3df31b55-fa5a-4b05-995b-1cfbf07f3692","name":"3df31b55-fa5a-4b05-995b-1cfbf07f3692","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6b155309-549e-4057-b0c0-b879145278ee","name":"6b155309-549e-4057-b0c0-b879145278ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3df31b55-fa5a-4b05-995b-1cfbf07f3692","name":"3df31b55-fa5a-4b05-995b-1cfbf07f3692","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -53,7 +51,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":4.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -67,6 +65,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,15 +75,9 @@ {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b155309-549e-4057-b0c0-b879145278ee","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"9e899125-e7fc-420b-992c-b1a32e23760d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1bf2ef8-95a8-4a6c-8464-f7b44f6675a3","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0979e353-07ec-4650-8616-9e9829617ba8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76458a7c-df41-4efe-ac58-2273c4d3e898","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc68c8a5-de96-40f2-94eb-1182554da373","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3df31b55-fa5a-4b05-995b-1cfbf07f3692","path":"sprites/spr_dread_plasma_cannon/spr_dread_plasma_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d2733b9-23ec-4b2e-8af3-44b12da58cf6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"6d2733b9-23ec-4b2e-8af3-44b12da58cf6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy b/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy index b8bcd22279..c2897e614c 100644 --- a/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy +++ b/sprites/spr_dreadnought_chasis_colors/spr_dreadnought_chasis_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dreadnought_chasis_colors", "bboxMode":0, "bbox_bottom":207, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy b/sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy index db4048c15e..fed4ab70d6 100644 --- a/sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy +++ b/sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dreadnought_complex", "bboxMode":0, "bbox_bottom":207, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"aabebdae-4337-4746-b7cf-292919a40ce4","name":"aabebdae-4337-4746-b7cf-292919a40ce4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aabebdae-4337-4746-b7cf-292919a40ce4","name":"aabebdae-4337-4746-b7cf-292919a40ce4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,15 +71,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aabebdae-4337-4746-b7cf-292919a40ce4","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"65bae6f8-d3e2-4194-bb96-1b9a164e1363","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6dd38061-8f30-4017-9c12-2a438b531089","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af61cb93-84de-4fd7-8b9f-571f6d621427","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aabebdae-4337-4746-b7cf-292919a40ce4","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"65bae6f8-d3e2-4194-bb96-1b9a164e1363","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"113b3a46-7ce2-45a1-87a5-79b52a0f3314","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6dd38061-8f30-4017-9c12-2a438b531089","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"643bbde4-1fea-4393-8d81-fd6c3ced5272","path":"sprites/spr_dreadnought_complex/spr_dreadnought_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af61cb93-84de-4fd7-8b9f-571f6d621427","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy b/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy index cf7d17e80e..084ec74435 100644 --- a/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy +++ b/sprites/spr_dreadnought_decorations/spr_dreadnought_decorations.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_dreadnought_decorations", "bboxMode":0, "bbox_bottom":98, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"69e1b091-39fa-466c-90b9-3f95c7e9c166","name":"69e1b091-39fa-466c-90b9-3f95c7e9c166","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b4ca3de8-8303-4af4-9873-ba8290935271","name":"b4ca3de8-8303-4af4-9873-ba8290935271","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"69e1b091-39fa-466c-90b9-3f95c7e9c166","name":"69e1b091-39fa-466c-90b9-3f95c7e9c166","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","name":"8033e364-cf92-46f9-ab1d-5c89b6ac7bd4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b4ca3de8-8303-4af4-9873-ba8290935271","name":"b4ca3de8-8303-4af4-9873-ba8290935271","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -65,6 +65,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":197.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_eldar_hire/spr_eldar_hire.yy b/sprites/spr_eldar_hire/spr_eldar_hire.yy index 4b188788c5..9cd2d8e462 100644 --- a/sprites/spr_eldar_hire/spr_eldar_hire.yy +++ b/sprites/spr_eldar_hire/spr_eldar_hire.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_eldar_hire", "bboxMode":0, "bbox_bottom":231, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fcce8b7b-d159-475d-aeba-afbc8d91bd88","name":"fcce8b7b-d159-475d-aeba-afbc8d91bd88","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cfdb2e30-1c91-4238-8b6f-4b1e16f1ff9f","name":"cfdb2e30-1c91-4238-8b6f-4b1e16f1ff9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fcce8b7b-d159-475d-aeba-afbc8d91bd88","name":"fcce8b7b-d159-475d-aeba-afbc8d91bd88","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfdb2e30-1c91-4238-8b6f-4b1e16f1ff9f","name":"cfdb2e30-1c91-4238-8b6f-4b1e16f1ff9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcce8b7b-d159-475d-aeba-afbc8d91bd88","path":"sprites/spr_eldar_hire/spr_eldar_hire.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"726d2a74-104c-4f7b-9aa9-94384a3016da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfdb2e30-1c91-4238-8b6f-4b1e16f1ff9f","path":"sprites/spr_eldar_hire/spr_eldar_hire.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c601feea-f73e-4b85-9b2e-6dff6fbdc36a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcce8b7b-d159-475d-aeba-afbc8d91bd88","path":"sprites/spr_eldar_hire/spr_eldar_hire.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"726d2a74-104c-4f7b-9aa9-94384a3016da","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfdb2e30-1c91-4238-8b6f-4b1e16f1ff9f","path":"sprites/spr_eldar_hire/spr_eldar_hire.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c601feea-f73e-4b85-9b2e-6dff6fbdc36a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_errant_colors/spr_errant_colors.yy b/sprites/spr_errant_colors/spr_errant_colors.yy index a3d10eb2ce..dbb1c44ec9 100644 --- a/sprites/spr_errant_colors/spr_errant_colors.yy +++ b/sprites/spr_errant_colors/spr_errant_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_errant_colors", "bboxMode":0, "bbox_bottom":220, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9544e4ca-8deb-4023-9e28-01c84f22df16","name":"9544e4ca-8deb-4023-9e28-01c84f22df16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a10b8352-7ebd-4760-a267-f798c056d29b","name":"a10b8352-7ebd-4760-a267-f798c056d29b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a13b51ac-8465-4bd9-aa02-a3b1ca560d5a","name":"a13b51ac-8465-4bd9-aa02-a3b1ca560d5a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb6be082-0971-43b9-adc2-1e913811792c","name":"fb6be082-0971-43b9-adc2-1e913811792c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d9e37e7d-57f0-4303-beb4-89e0af9b3c98","name":"d9e37e7d-57f0-4303-beb4-89e0af9b3c98","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c3e99394-9ba0-49af-b3f2-ef587fe31d2e","name":"c3e99394-9ba0-49af-b3f2-ef587fe31d2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fa550e91-d624-4e98-9f5c-b27a5ab79b7e","name":"fa550e91-d624-4e98-9f5c-b27a5ab79b7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"81780b9c-0152-4ef1-b48c-9d32528bfbce","name":"81780b9c-0152-4ef1-b48c-9d32528bfbce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"46302f6a-d029-4696-be8d-80565fe68ad6","name":"46302f6a-d029-4696-be8d-80565fe68ad6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5804db76-68ed-45cb-a1b6-6e69f28a82de","name":"5804db76-68ed-45cb-a1b6-6e69f28a82de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"29cafcd6-1452-4dc1-ae23-e39fc4da0a04","name":"29cafcd6-1452-4dc1-ae23-e39fc4da0a04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f2e4413-c5e8-4d53-b8a6-7af03ccb43fb","name":"1f2e4413-c5e8-4d53-b8a6-7af03ccb43fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eaf461bb-883a-4c3e-b1ab-da51ab9cebba","name":"eaf461bb-883a-4c3e-b1ab-da51ab9cebba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5e134dab-8a69-4cf9-8b68-08b8e35d4e0b","name":"5e134dab-8a69-4cf9-8b68-08b8e35d4e0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9544e4ca-8deb-4023-9e28-01c84f22df16","name":"9544e4ca-8deb-4023-9e28-01c84f22df16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a10b8352-7ebd-4760-a267-f798c056d29b","name":"a10b8352-7ebd-4760-a267-f798c056d29b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a13b51ac-8465-4bd9-aa02-a3b1ca560d5a","name":"a13b51ac-8465-4bd9-aa02-a3b1ca560d5a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb6be082-0971-43b9-adc2-1e913811792c","name":"fb6be082-0971-43b9-adc2-1e913811792c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9e37e7d-57f0-4303-beb4-89e0af9b3c98","name":"d9e37e7d-57f0-4303-beb4-89e0af9b3c98","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c3e99394-9ba0-49af-b3f2-ef587fe31d2e","name":"c3e99394-9ba0-49af-b3f2-ef587fe31d2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fa550e91-d624-4e98-9f5c-b27a5ab79b7e","name":"fa550e91-d624-4e98-9f5c-b27a5ab79b7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"81780b9c-0152-4ef1-b48c-9d32528bfbce","name":"81780b9c-0152-4ef1-b48c-9d32528bfbce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"46302f6a-d029-4696-be8d-80565fe68ad6","name":"46302f6a-d029-4696-be8d-80565fe68ad6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5804db76-68ed-45cb-a1b6-6e69f28a82de","name":"5804db76-68ed-45cb-a1b6-6e69f28a82de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"29cafcd6-1452-4dc1-ae23-e39fc4da0a04","name":"29cafcd6-1452-4dc1-ae23-e39fc4da0a04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f2e4413-c5e8-4d53-b8a6-7af03ccb43fb","name":"1f2e4413-c5e8-4d53-b8a6-7af03ccb43fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eaf461bb-883a-4c3e-b1ab-da51ab9cebba","name":"eaf461bb-883a-4c3e-b1ab-da51ab9cebba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5e134dab-8a69-4cf9-8b68-08b8e35d4e0b","name":"5e134dab-8a69-4cf9-8b68-08b8e35d4e0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9544e4ca-8deb-4023-9e28-01c84f22df16","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"386c1cd2-14c2-4486-b4b8-8bf0c2eef1e7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a10b8352-7ebd-4760-a267-f798c056d29b","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a708a2b1-f744-4e46-b7c0-527418a862aa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a13b51ac-8465-4bd9-aa02-a3b1ca560d5a","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b25944be-5eba-494a-b10a-2809827e3a27","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb6be082-0971-43b9-adc2-1e913811792c","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2967068b-c211-47ce-bc52-8fdaa30a3cd2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9e37e7d-57f0-4303-beb4-89e0af9b3c98","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be148d13-3b3f-4248-bd42-e6363882155f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3e99394-9ba0-49af-b3f2-ef587fe31d2e","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4fe5d94c-5588-45d5-8ad1-110fb67d26ec","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa550e91-d624-4e98-9f5c-b27a5ab79b7e","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0888e933-4c29-4190-b7fd-a30231124397","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"81780b9c-0152-4ef1-b48c-9d32528bfbce","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"539c145b-3fd4-4b1e-8292-e3cff3c2f037","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46302f6a-d029-4696-be8d-80565fe68ad6","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4b754efb-eeb3-4086-8b5d-22878e235bea","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5804db76-68ed-45cb-a1b6-6e69f28a82de","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"67744f2d-aa0e-42d6-bef0-0259800b2442","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"29cafcd6-1452-4dc1-ae23-e39fc4da0a04","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94da88c6-5ce0-4357-ba9a-8b10c81594b3","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f2e4413-c5e8-4d53-b8a6-7af03ccb43fb","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"afddc36c-cbe5-4855-9ad8-1d0b1b349b3a","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eaf461bb-883a-4c3e-b1ab-da51ab9cebba","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed65ebcd-beaf-4643-b94d-1ad4638917d3","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e134dab-8a69-4cf9-8b68-08b8e35d4e0b","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45a581ba-1236-44d3-8e79-b8ad3c1b25bb","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9544e4ca-8deb-4023-9e28-01c84f22df16","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"386c1cd2-14c2-4486-b4b8-8bf0c2eef1e7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a10b8352-7ebd-4760-a267-f798c056d29b","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a708a2b1-f744-4e46-b7c0-527418a862aa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a13b51ac-8465-4bd9-aa02-a3b1ca560d5a","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b25944be-5eba-494a-b10a-2809827e3a27","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb6be082-0971-43b9-adc2-1e913811792c","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2967068b-c211-47ce-bc52-8fdaa30a3cd2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9e37e7d-57f0-4303-beb4-89e0af9b3c98","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be148d13-3b3f-4248-bd42-e6363882155f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3e99394-9ba0-49af-b3f2-ef587fe31d2e","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4fe5d94c-5588-45d5-8ad1-110fb67d26ec","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa550e91-d624-4e98-9f5c-b27a5ab79b7e","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0888e933-4c29-4190-b7fd-a30231124397","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"81780b9c-0152-4ef1-b48c-9d32528bfbce","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"539c145b-3fd4-4b1e-8292-e3cff3c2f037","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"46302f6a-d029-4696-be8d-80565fe68ad6","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4b754efb-eeb3-4086-8b5d-22878e235bea","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5804db76-68ed-45cb-a1b6-6e69f28a82de","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67744f2d-aa0e-42d6-bef0-0259800b2442","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"29cafcd6-1452-4dc1-ae23-e39fc4da0a04","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94da88c6-5ce0-4357-ba9a-8b10c81594b3","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f2e4413-c5e8-4d53-b8a6-7af03ccb43fb","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"afddc36c-cbe5-4855-9ad8-1d0b1b349b3a","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eaf461bb-883a-4c3e-b1ab-da51ab9cebba","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed65ebcd-beaf-4643-b94d-1ad4638917d3","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e134dab-8a69-4cf9-8b68-08b8e35d4e0b","path":"sprites/spr_errant_colors/spr_errant_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45a581ba-1236-44d3-8e79-b8ad3c1b25bb","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_explosion/spr_explosion.yy b/sprites/spr_explosion/spr_explosion.yy index 5a06964558..df2e8e7255 100644 --- a/sprites/spr_explosion/spr_explosion.yy +++ b/sprites/spr_explosion/spr_explosion.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_explosion", "bboxMode":0, "bbox_bottom":63, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"887be1d2-b4d1-4eb4-8873-be5a4a077ddd","name":"887be1d2-b4d1-4eb4-8873-be5a4a077ddd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"52116bac-6671-4450-a26f-440a7edd7c27","name":"52116bac-6671-4450-a26f-440a7edd7c27","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"921a2f53-1d9c-40c8-ba85-1c445565f64f","name":"921a2f53-1d9c-40c8-ba85-1c445565f64f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5d404122-5c02-46b9-b517-35a17f961896","name":"5d404122-5c02-46b9-b517-35a17f961896","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"31e4d6de-a635-4c43-9e1e-e4607138a682","name":"31e4d6de-a635-4c43-9e1e-e4607138a682","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e6aec035-57d4-4eb2-be16-cf484e396e35","name":"e6aec035-57d4-4eb2-be16-cf484e396e35","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc87f3f2-ac65-4454-8e89-30f2d18e5b5a","name":"dc87f3f2-ac65-4454-8e89-30f2d18e5b5a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"887be1d2-b4d1-4eb4-8873-be5a4a077ddd","name":"887be1d2-b4d1-4eb4-8873-be5a4a077ddd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52116bac-6671-4450-a26f-440a7edd7c27","name":"52116bac-6671-4450-a26f-440a7edd7c27","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"921a2f53-1d9c-40c8-ba85-1c445565f64f","name":"921a2f53-1d9c-40c8-ba85-1c445565f64f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5d404122-5c02-46b9-b517-35a17f961896","name":"5d404122-5c02-46b9-b517-35a17f961896","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31e4d6de-a635-4c43-9e1e-e4607138a682","name":"31e4d6de-a635-4c43-9e1e-e4607138a682","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e6aec035-57d4-4eb2-be16-cf484e396e35","name":"e6aec035-57d4-4eb2-be16-cf484e396e35","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc87f3f2-ac65-4454-8e89-30f2d18e5b5a","name":"dc87f3f2-ac65-4454-8e89-30f2d18e5b5a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,27 +74,13 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"887be1d2-b4d1-4eb4-8873-be5a4a077ddd","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d343002-ffe7-4204-9371-9333e1ad1463","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52116bac-6671-4450-a26f-440a7edd7c27","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6e32fb8-aafa-4330-a230-eb6d6ebf6d18","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"921a2f53-1d9c-40c8-ba85-1c445565f64f","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9c9185f-adc9-4b49-a5c7-cb6048c7c149","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d404122-5c02-46b9-b517-35a17f961896","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cc47f108-00a0-401d-ad1a-4ca916d1d003","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31e4d6de-a635-4c43-9e1e-e4607138a682","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee749173-6e75-41f7-b09b-6a307e207eb9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6aec035-57d4-4eb2-be16-cf484e396e35","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45d0bfc3-134e-4498-bcf0-f52e7f60b493","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc87f3f2-ac65-4454-8e89-30f2d18e5b5a","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e3586009-fe9f-4ffd-ae6b-5306a1bbaa08","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"887be1d2-b4d1-4eb4-8873-be5a4a077ddd","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d343002-ffe7-4204-9371-9333e1ad1463","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52116bac-6671-4450-a26f-440a7edd7c27","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6e32fb8-aafa-4330-a230-eb6d6ebf6d18","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"921a2f53-1d9c-40c8-ba85-1c445565f64f","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9c9185f-adc9-4b49-a5c7-cb6048c7c149","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d404122-5c02-46b9-b517-35a17f961896","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cc47f108-00a0-401d-ad1a-4ca916d1d003","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31e4d6de-a635-4c43-9e1e-e4607138a682","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee749173-6e75-41f7-b09b-6a307e207eb9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6aec035-57d4-4eb2-be16-cf484e396e35","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45d0bfc3-134e-4498-bcf0-f52e7f60b493","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc87f3f2-ac65-4454-8e89-30f2d18e5b5a","path":"sprites/spr_explosion/spr_explosion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e3586009-fe9f-4ffd-ae6b-5306a1bbaa08","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_explosion2/spr_explosion2.yy b/sprites/spr_explosion2/spr_explosion2.yy index 571661e618..a8272afb7c 100644 --- a/sprites/spr_explosion2/spr_explosion2.yy +++ b/sprites/spr_explosion2/spr_explosion2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_explosion2", "bboxMode":0, "bbox_bottom":58, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"43b12e48-9dfa-4fd8-9ddd-d75cff1a2ebc","name":"43b12e48-9dfa-4fd8-9ddd-d75cff1a2ebc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8fbfaa3b-f551-49b7-bfb5-7e6695535cca","name":"8fbfaa3b-f551-49b7-bfb5-7e6695535cca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"53813458-5892-4cba-add6-692b75a62bfd","name":"53813458-5892-4cba-add6-692b75a62bfd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f03fe6a2-62ce-4b45-865d-f36a459f9006","name":"f03fe6a2-62ce-4b45-865d-f36a459f9006","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a020d709-a27c-4940-94b7-3db43987f480","name":"a020d709-a27c-4940-94b7-3db43987f480","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8be1ae36-7446-4a8c-8fdb-e81d26896657","name":"8be1ae36-7446-4a8c-8fdb-e81d26896657","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d9dbd6c5-a512-441b-93a2-e7367660ba60","name":"d9dbd6c5-a512-441b-93a2-e7367660ba60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea86ef52-23c7-48c9-bae4-11b9edf4e0ee","name":"ea86ef52-23c7-48c9-bae4-11b9edf4e0ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dae59a24-ed41-46c2-9f66-c11a2476034d","name":"dae59a24-ed41-46c2-9f66-c11a2476034d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3f0c1a50-0a4e-4569-827a-c126660a5e09","name":"3f0c1a50-0a4e-4569-827a-c126660a5e09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e4a4ee6e-2696-47ca-8535-7319ab09575c","name":"e4a4ee6e-2696-47ca-8535-7319ab09575c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f40d66fc-aca3-45de-819a-57f86935a083","name":"f40d66fc-aca3-45de-819a-57f86935a083","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3823df8b-b54d-42bc-8208-8403c945b4d7","name":"3823df8b-b54d-42bc-8208-8403c945b4d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e45b252c-a2f1-4447-a61b-29b3c77e1f8b","name":"e45b252c-a2f1-4447-a61b-29b3c77e1f8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"43b12e48-9dfa-4fd8-9ddd-d75cff1a2ebc","name":"43b12e48-9dfa-4fd8-9ddd-d75cff1a2ebc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8fbfaa3b-f551-49b7-bfb5-7e6695535cca","name":"8fbfaa3b-f551-49b7-bfb5-7e6695535cca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"53813458-5892-4cba-add6-692b75a62bfd","name":"53813458-5892-4cba-add6-692b75a62bfd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f03fe6a2-62ce-4b45-865d-f36a459f9006","name":"f03fe6a2-62ce-4b45-865d-f36a459f9006","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a020d709-a27c-4940-94b7-3db43987f480","name":"a020d709-a27c-4940-94b7-3db43987f480","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8be1ae36-7446-4a8c-8fdb-e81d26896657","name":"8be1ae36-7446-4a8c-8fdb-e81d26896657","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9dbd6c5-a512-441b-93a2-e7367660ba60","name":"d9dbd6c5-a512-441b-93a2-e7367660ba60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea86ef52-23c7-48c9-bae4-11b9edf4e0ee","name":"ea86ef52-23c7-48c9-bae4-11b9edf4e0ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dae59a24-ed41-46c2-9f66-c11a2476034d","name":"dae59a24-ed41-46c2-9f66-c11a2476034d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f0c1a50-0a4e-4569-827a-c126660a5e09","name":"3f0c1a50-0a4e-4569-827a-c126660a5e09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4a4ee6e-2696-47ca-8535-7319ab09575c","name":"e4a4ee6e-2696-47ca-8535-7319ab09575c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f40d66fc-aca3-45de-819a-57f86935a083","name":"f40d66fc-aca3-45de-819a-57f86935a083","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3823df8b-b54d-42bc-8208-8403c945b4d7","name":"3823df8b-b54d-42bc-8208-8403c945b4d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e45b252c-a2f1-4447-a61b-29b3c77e1f8b","name":"e45b252c-a2f1-4447-a61b-29b3c77e1f8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"43b12e48-9dfa-4fd8-9ddd-d75cff1a2ebc","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c810941-adf2-44d7-b828-12e25ba61f1f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fbfaa3b-f551-49b7-bfb5-7e6695535cca","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff1bf792-86f8-46d9-971f-6ac7a81a4667","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"53813458-5892-4cba-add6-692b75a62bfd","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"097c430e-5373-4508-9bc5-c70457884bfa","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f03fe6a2-62ce-4b45-865d-f36a459f9006","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89224419-71a8-41fb-9e1d-be020176082e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a020d709-a27c-4940-94b7-3db43987f480","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b760c522-b6ec-4a8d-b44f-3a586e9ec463","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8be1ae36-7446-4a8c-8fdb-e81d26896657","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"10c2c640-a3ba-403b-911f-b91bd70d9f39","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9dbd6c5-a512-441b-93a2-e7367660ba60","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2574f08-e44e-4e87-a54a-5ef93553c660","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea86ef52-23c7-48c9-bae4-11b9edf4e0ee","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5f65995c-2bc8-47bb-a944-0ece5f4ca61a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dae59a24-ed41-46c2-9f66-c11a2476034d","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"20b715b7-bbe7-45bf-a13b-61f9b5ddd203","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f0c1a50-0a4e-4569-827a-c126660a5e09","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88279162-524b-4420-950d-25d8c41ad2d5","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a4ee6e-2696-47ca-8535-7319ab09575c","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b2de496d-cd1a-49a4-a738-3c158e6957b2","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f40d66fc-aca3-45de-819a-57f86935a083","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21c8508e-3350-402a-8c86-6e16f0b2c05c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3823df8b-b54d-42bc-8208-8403c945b4d7","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"80954673-ffc9-4083-b687-7dc6ce0848ed","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e45b252c-a2f1-4447-a61b-29b3c77e1f8b","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a8df266-eb69-44d0-a7dc-ac3177820f19","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"43b12e48-9dfa-4fd8-9ddd-d75cff1a2ebc","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c810941-adf2-44d7-b828-12e25ba61f1f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fbfaa3b-f551-49b7-bfb5-7e6695535cca","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff1bf792-86f8-46d9-971f-6ac7a81a4667","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"53813458-5892-4cba-add6-692b75a62bfd","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"097c430e-5373-4508-9bc5-c70457884bfa","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f03fe6a2-62ce-4b45-865d-f36a459f9006","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89224419-71a8-41fb-9e1d-be020176082e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a020d709-a27c-4940-94b7-3db43987f480","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b760c522-b6ec-4a8d-b44f-3a586e9ec463","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8be1ae36-7446-4a8c-8fdb-e81d26896657","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"10c2c640-a3ba-403b-911f-b91bd70d9f39","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9dbd6c5-a512-441b-93a2-e7367660ba60","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2574f08-e44e-4e87-a54a-5ef93553c660","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea86ef52-23c7-48c9-bae4-11b9edf4e0ee","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5f65995c-2bc8-47bb-a944-0ece5f4ca61a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dae59a24-ed41-46c2-9f66-c11a2476034d","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"20b715b7-bbe7-45bf-a13b-61f9b5ddd203","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f0c1a50-0a4e-4569-827a-c126660a5e09","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88279162-524b-4420-950d-25d8c41ad2d5","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a4ee6e-2696-47ca-8535-7319ab09575c","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b2de496d-cd1a-49a4-a738-3c158e6957b2","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f40d66fc-aca3-45de-819a-57f86935a083","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21c8508e-3350-402a-8c86-6e16f0b2c05c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3823df8b-b54d-42bc-8208-8403c945b4d7","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"80954673-ffc9-4083-b687-7dc6ce0848ed","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e45b252c-a2f1-4447-a61b-29b3c77e1f8b","path":"sprites/spr_explosion2/spr_explosion2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a8df266-eb69-44d0-a7dc-ac3177820f19","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_explosion3/spr_explosion3.yy b/sprites/spr_explosion3/spr_explosion3.yy index 66f4ed915b..01e7ba1419 100644 --- a/sprites/spr_explosion3/spr_explosion3.yy +++ b/sprites/spr_explosion3/spr_explosion3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_explosion3", "bboxMode":0, "bbox_bottom":61, @@ -12,30 +12,30 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cdb9009b-964f-4f86-97a6-ef04dfa531f3","name":"cdb9009b-964f-4f86-97a6-ef04dfa531f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"28f82647-071a-4f36-ae13-d60316fe3e33","name":"28f82647-071a-4f36-ae13-d60316fe3e33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"69434878-27a3-43c9-a142-030800af28a0","name":"69434878-27a3-43c9-a142-030800af28a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0e27773-82e9-4037-92ee-618cf73c2ab5","name":"e0e27773-82e9-4037-92ee-618cf73c2ab5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"86b3f9bb-4c89-45f3-a214-af8bd09062cc","name":"86b3f9bb-4c89-45f3-a214-af8bd09062cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"68ffd8e7-768a-4a82-9232-b73b91a84636","name":"68ffd8e7-768a-4a82-9232-b73b91a84636","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d48b1389-5756-4855-ab12-c1241aa6f60f","name":"d48b1389-5756-4855-ab12-c1241aa6f60f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a9126f5e-1a48-4e77-beca-704e7f9601d2","name":"a9126f5e-1a48-4e77-beca-704e7f9601d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bd6e2025-c9c7-4cf3-a338-698e297625c8","name":"bd6e2025-c9c7-4cf3-a338-698e297625c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d12afd48-f2f8-48ca-8da9-3e1801b163a2","name":"d12afd48-f2f8-48ca-8da9-3e1801b163a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8c54c27c-5496-4211-9a7b-73d135706816","name":"8c54c27c-5496-4211-9a7b-73d135706816","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fec35f73-7d3f-4c9d-98c4-344fe943acce","name":"fec35f73-7d3f-4c9d-98c4-344fe943acce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01e32b7e-586e-4248-8217-3e73ed7473e4","name":"01e32b7e-586e-4248-8217-3e73ed7473e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"20d20aef-1e77-458b-92ac-29ccf3b6e98c","name":"20d20aef-1e77-458b-92ac-29ccf3b6e98c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5e227fe6-8e4e-4c7c-a7df-1e86182dd9ca","name":"5e227fe6-8e4e-4c7c-a7df-1e86182dd9ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e9bc688a-fc0f-469c-b5e2-918cf4cf3aa9","name":"e9bc688a-fc0f-469c-b5e2-918cf4cf3aa9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fa807211-ee0a-4630-a1f3-f0f72baa5218","name":"fa807211-ee0a-4630-a1f3-f0f72baa5218","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f9e664c7-cd78-4c20-9311-cd3eaf57941e","name":"f9e664c7-cd78-4c20-9311-cd3eaf57941e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6607dda3-f79a-402a-9e7d-f703a294a940","name":"6607dda3-f79a-402a-9e7d-f703a294a940","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83638e2b-500f-4aac-9ac7-70d4c605d40d","name":"83638e2b-500f-4aac-9ac7-70d4c605d40d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b18e7bab-cc4a-4ed7-b00b-1ed5d704253d","name":"b18e7bab-cc4a-4ed7-b00b-1ed5d704253d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7b870110-a292-4c4f-a99c-defb8c5854a9","name":"7b870110-a292-4c4f-a99c-defb8c5854a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eb596ac8-aaaf-4d76-9c62-0496de1da788","name":"eb596ac8-aaaf-4d76-9c62-0496de1da788","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4927e668-61af-4c28-9c28-857835e7f1c2","name":"4927e668-61af-4c28-9c28-857835e7f1c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cdb9009b-964f-4f86-97a6-ef04dfa531f3","name":"cdb9009b-964f-4f86-97a6-ef04dfa531f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"28f82647-071a-4f36-ae13-d60316fe3e33","name":"28f82647-071a-4f36-ae13-d60316fe3e33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"69434878-27a3-43c9-a142-030800af28a0","name":"69434878-27a3-43c9-a142-030800af28a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0e27773-82e9-4037-92ee-618cf73c2ab5","name":"e0e27773-82e9-4037-92ee-618cf73c2ab5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"86b3f9bb-4c89-45f3-a214-af8bd09062cc","name":"86b3f9bb-4c89-45f3-a214-af8bd09062cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"68ffd8e7-768a-4a82-9232-b73b91a84636","name":"68ffd8e7-768a-4a82-9232-b73b91a84636","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d48b1389-5756-4855-ab12-c1241aa6f60f","name":"d48b1389-5756-4855-ab12-c1241aa6f60f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9126f5e-1a48-4e77-beca-704e7f9601d2","name":"a9126f5e-1a48-4e77-beca-704e7f9601d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd6e2025-c9c7-4cf3-a338-698e297625c8","name":"bd6e2025-c9c7-4cf3-a338-698e297625c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d12afd48-f2f8-48ca-8da9-3e1801b163a2","name":"d12afd48-f2f8-48ca-8da9-3e1801b163a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c54c27c-5496-4211-9a7b-73d135706816","name":"8c54c27c-5496-4211-9a7b-73d135706816","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fec35f73-7d3f-4c9d-98c4-344fe943acce","name":"fec35f73-7d3f-4c9d-98c4-344fe943acce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01e32b7e-586e-4248-8217-3e73ed7473e4","name":"01e32b7e-586e-4248-8217-3e73ed7473e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"20d20aef-1e77-458b-92ac-29ccf3b6e98c","name":"20d20aef-1e77-458b-92ac-29ccf3b6e98c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5e227fe6-8e4e-4c7c-a7df-1e86182dd9ca","name":"5e227fe6-8e4e-4c7c-a7df-1e86182dd9ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9bc688a-fc0f-469c-b5e2-918cf4cf3aa9","name":"e9bc688a-fc0f-469c-b5e2-918cf4cf3aa9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fa807211-ee0a-4630-a1f3-f0f72baa5218","name":"fa807211-ee0a-4630-a1f3-f0f72baa5218","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9e664c7-cd78-4c20-9311-cd3eaf57941e","name":"f9e664c7-cd78-4c20-9311-cd3eaf57941e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6607dda3-f79a-402a-9e7d-f703a294a940","name":"6607dda3-f79a-402a-9e7d-f703a294a940","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83638e2b-500f-4aac-9ac7-70d4c605d40d","name":"83638e2b-500f-4aac-9ac7-70d4c605d40d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b18e7bab-cc4a-4ed7-b00b-1ed5d704253d","name":"b18e7bab-cc4a-4ed7-b00b-1ed5d704253d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b870110-a292-4c4f-a99c-defb8c5854a9","name":"7b870110-a292-4c4f-a99c-defb8c5854a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eb596ac8-aaaf-4d76-9c62-0496de1da788","name":"eb596ac8-aaaf-4d76-9c62-0496de1da788","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4927e668-61af-4c28-9c28-857835e7f1c2","name":"4927e668-61af-4c28-9c28-857835e7f1c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -91,78 +91,30 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdb9009b-964f-4f86-97a6-ef04dfa531f3","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f03ffb87-14fc-4f87-85cf-a6d051f7812d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28f82647-071a-4f36-ae13-d60316fe3e33","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24d5fce8-7a8a-4e11-bc6d-d3eaa0b68410","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"69434878-27a3-43c9-a142-030800af28a0","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8082a40f-310e-4d18-bfc7-d8dea00b48d4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0e27773-82e9-4037-92ee-618cf73c2ab5","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9445442-5b49-46c9-b812-4c1b446e05b2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"86b3f9bb-4c89-45f3-a214-af8bd09062cc","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b3f59c0-8a0d-4f2e-ab81-c18dd6d7e186","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"68ffd8e7-768a-4a82-9232-b73b91a84636","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"56c993d9-9b07-4059-ade7-062c11c5c9cb","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d48b1389-5756-4855-ab12-c1241aa6f60f","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c08d36ad-d315-4755-9a00-73e0c73cd90b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9126f5e-1a48-4e77-beca-704e7f9601d2","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b93ae72c-c88e-477e-9902-cf0806092381","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd6e2025-c9c7-4cf3-a338-698e297625c8","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a0309e7a-14a7-48d1-8611-cc44719abc08","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d12afd48-f2f8-48ca-8da9-3e1801b163a2","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05c8cdac-c9c0-4c04-bb34-3890bde38674","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c54c27c-5496-4211-9a7b-73d135706816","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"649915e4-7305-4034-a7de-6ca77c662585","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fec35f73-7d3f-4c9d-98c4-344fe943acce","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf8de3a4-34ed-4d16-b9b7-213eba118837","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01e32b7e-586e-4248-8217-3e73ed7473e4","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb4de27d-a01b-451a-9011-1e5e9187525d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"20d20aef-1e77-458b-92ac-29ccf3b6e98c","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b42c446-cab6-4af5-8876-1cef1e78351a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e227fe6-8e4e-4c7c-a7df-1e86182dd9ca","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dec73924-4b9e-41b7-81f3-cc442bc95a3b","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9bc688a-fc0f-469c-b5e2-918cf4cf3aa9","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f41c7b93-28e5-40a2-91cc-cc113447d5bd","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa807211-ee0a-4630-a1f3-f0f72baa5218","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d81c94c-397c-46a4-a1b3-f3c989a15d0f","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9e664c7-cd78-4c20-9311-cd3eaf57941e","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f396343f-a798-4da4-8330-11b7631b54b8","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6607dda3-f79a-402a-9e7d-f703a294a940","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"add2276b-8895-48a1-9bb7-4b4863899549","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83638e2b-500f-4aac-9ac7-70d4c605d40d","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a65238b6-c1d4-4151-9d9f-3fcd36df9635","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b18e7bab-cc4a-4ed7-b00b-1ed5d704253d","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a0703b80-f85b-4ce5-a71b-497f5d433421","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b870110-a292-4c4f-a99c-defb8c5854a9","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02ccfd46-b64f-48d9-8bc7-e9776e097890","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb596ac8-aaaf-4d76-9c62-0496de1da788","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7c509de9-78bf-4741-98c4-3edd92af9d06","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4927e668-61af-4c28-9c28-857835e7f1c2","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b45e1ad1-5605-4f37-9ba1-0739e0a8a14c","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdb9009b-964f-4f86-97a6-ef04dfa531f3","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f03ffb87-14fc-4f87-85cf-a6d051f7812d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"28f82647-071a-4f36-ae13-d60316fe3e33","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24d5fce8-7a8a-4e11-bc6d-d3eaa0b68410","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"69434878-27a3-43c9-a142-030800af28a0","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8082a40f-310e-4d18-bfc7-d8dea00b48d4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0e27773-82e9-4037-92ee-618cf73c2ab5","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9445442-5b49-46c9-b812-4c1b446e05b2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"86b3f9bb-4c89-45f3-a214-af8bd09062cc","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b3f59c0-8a0d-4f2e-ab81-c18dd6d7e186","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"68ffd8e7-768a-4a82-9232-b73b91a84636","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"56c993d9-9b07-4059-ade7-062c11c5c9cb","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d48b1389-5756-4855-ab12-c1241aa6f60f","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c08d36ad-d315-4755-9a00-73e0c73cd90b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9126f5e-1a48-4e77-beca-704e7f9601d2","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b93ae72c-c88e-477e-9902-cf0806092381","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd6e2025-c9c7-4cf3-a338-698e297625c8","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a0309e7a-14a7-48d1-8611-cc44719abc08","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d12afd48-f2f8-48ca-8da9-3e1801b163a2","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05c8cdac-c9c0-4c04-bb34-3890bde38674","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c54c27c-5496-4211-9a7b-73d135706816","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"649915e4-7305-4034-a7de-6ca77c662585","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fec35f73-7d3f-4c9d-98c4-344fe943acce","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf8de3a4-34ed-4d16-b9b7-213eba118837","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01e32b7e-586e-4248-8217-3e73ed7473e4","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb4de27d-a01b-451a-9011-1e5e9187525d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"20d20aef-1e77-458b-92ac-29ccf3b6e98c","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b42c446-cab6-4af5-8876-1cef1e78351a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e227fe6-8e4e-4c7c-a7df-1e86182dd9ca","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dec73924-4b9e-41b7-81f3-cc442bc95a3b","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9bc688a-fc0f-469c-b5e2-918cf4cf3aa9","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f41c7b93-28e5-40a2-91cc-cc113447d5bd","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa807211-ee0a-4630-a1f3-f0f72baa5218","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d81c94c-397c-46a4-a1b3-f3c989a15d0f","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9e664c7-cd78-4c20-9311-cd3eaf57941e","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f396343f-a798-4da4-8330-11b7631b54b8","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6607dda3-f79a-402a-9e7d-f703a294a940","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"add2276b-8895-48a1-9bb7-4b4863899549","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83638e2b-500f-4aac-9ac7-70d4c605d40d","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a65238b6-c1d4-4151-9d9f-3fcd36df9635","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b18e7bab-cc4a-4ed7-b00b-1ed5d704253d","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a0703b80-f85b-4ce5-a71b-497f5d433421","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b870110-a292-4c4f-a99c-defb8c5854a9","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02ccfd46-b64f-48d9-8bc7-e9776e097890","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb596ac8-aaaf-4d76-9c62-0496de1da788","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7c509de9-78bf-4741-98c4-3edd92af9d06","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4927e668-61af-4c28-9c28-857835e7f1c2","path":"sprites/spr_explosion3/spr_explosion3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b45e1ad1-5605-4f37-9ba1-0739e0a8a14c","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_explosion_plas/spr_explosion_plas.yy b/sprites/spr_explosion_plas/spr_explosion_plas.yy index 9937ac694f..746a35bfbe 100644 --- a/sprites/spr_explosion_plas/spr_explosion_plas.yy +++ b/sprites/spr_explosion_plas/spr_explosion_plas.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_explosion_plas", "bboxMode":0, "bbox_bottom":63, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9af5cc74-0bb8-4194-b438-d88f8009f92c","name":"9af5cc74-0bb8-4194-b438-d88f8009f92c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8f187ecd-65dd-43d4-aa8b-f7a07d7fde6b","name":"8f187ecd-65dd-43d4-aa8b-f7a07d7fde6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7cb41b4a-624f-48ca-9fd5-1d46f869948a","name":"7cb41b4a-624f-48ca-9fd5-1d46f869948a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"89de85bd-5a7e-481e-bff7-b7855cfc1526","name":"89de85bd-5a7e-481e-bff7-b7855cfc1526","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3edf782d-d066-403d-b693-9dd1ebd579d9","name":"3edf782d-d066-403d-b693-9dd1ebd579d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"49b89a69-6b56-48c5-9311-b42f3fdbb2de","name":"49b89a69-6b56-48c5-9311-b42f3fdbb2de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9f249bfd-e297-460c-9f3e-42e085e4218e","name":"9f249bfd-e297-460c-9f3e-42e085e4218e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9af5cc74-0bb8-4194-b438-d88f8009f92c","name":"9af5cc74-0bb8-4194-b438-d88f8009f92c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8f187ecd-65dd-43d4-aa8b-f7a07d7fde6b","name":"8f187ecd-65dd-43d4-aa8b-f7a07d7fde6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7cb41b4a-624f-48ca-9fd5-1d46f869948a","name":"7cb41b4a-624f-48ca-9fd5-1d46f869948a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89de85bd-5a7e-481e-bff7-b7855cfc1526","name":"89de85bd-5a7e-481e-bff7-b7855cfc1526","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3edf782d-d066-403d-b693-9dd1ebd579d9","name":"3edf782d-d066-403d-b693-9dd1ebd579d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"49b89a69-6b56-48c5-9311-b42f3fdbb2de","name":"49b89a69-6b56-48c5-9311-b42f3fdbb2de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f249bfd-e297-460c-9f3e-42e085e4218e","name":"9f249bfd-e297-460c-9f3e-42e085e4218e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,27 +74,13 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9af5cc74-0bb8-4194-b438-d88f8009f92c","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff02a50d-6084-408c-9078-187ce0b830fc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f187ecd-65dd-43d4-aa8b-f7a07d7fde6b","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba260f64-12d5-4a3a-92d5-4c9b126f6084","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cb41b4a-624f-48ca-9fd5-1d46f869948a","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c56f37df-cce4-4716-9c34-4a8b4e1ae6a3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89de85bd-5a7e-481e-bff7-b7855cfc1526","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e5800a07-8496-49bd-8ff8-1a69e21ecf11","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3edf782d-d066-403d-b693-9dd1ebd579d9","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5afa515-8687-43a8-8f04-39e9b27fb0fa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"49b89a69-6b56-48c5-9311-b42f3fdbb2de","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4b6f5ae4-9b9d-4012-9d6a-387ab7e0bd01","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f249bfd-e297-460c-9f3e-42e085e4218e","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a319f899-f3d0-4b64-9869-6965563b4843","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9af5cc74-0bb8-4194-b438-d88f8009f92c","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff02a50d-6084-408c-9078-187ce0b830fc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f187ecd-65dd-43d4-aa8b-f7a07d7fde6b","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba260f64-12d5-4a3a-92d5-4c9b126f6084","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cb41b4a-624f-48ca-9fd5-1d46f869948a","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c56f37df-cce4-4716-9c34-4a8b4e1ae6a3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89de85bd-5a7e-481e-bff7-b7855cfc1526","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e5800a07-8496-49bd-8ff8-1a69e21ecf11","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3edf782d-d066-403d-b693-9dd1ebd579d9","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5afa515-8687-43a8-8f04-39e9b27fb0fa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"49b89a69-6b56-48c5-9311-b42f3fdbb2de","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4b6f5ae4-9b9d-4012-9d6a-387ab7e0bd01","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f249bfd-e297-460c-9f3e-42e085e4218e","path":"sprites/spr_explosion_plas/spr_explosion_plas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a319f899-f3d0-4b64-9869-6965563b4843","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_facial_colors/spr_facial_colors.yy b/sprites/spr_facial_colors/spr_facial_colors.yy index 6a55b9fa92..c9c16e19f5 100644 --- a/sprites/spr_facial_colors/spr_facial_colors.yy +++ b/sprites/spr_facial_colors/spr_facial_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_facial_colors", "bboxMode":0, "bbox_bottom":70, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"64f02c8a-c899-45df-b03c-b6a1394a32bc","name":"64f02c8a-c899-45df-b03c-b6a1394a32bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b2fd1690-ad2e-4dea-913f-7440f3207956","name":"b2fd1690-ad2e-4dea-913f-7440f3207956","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1a80c47-aa27-4b86-b39a-6bf091f60626","name":"d1a80c47-aa27-4b86-b39a-6bf091f60626","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e07c49c2-0bb4-43a5-b9f4-9f6d929f2848","name":"e07c49c2-0bb4-43a5-b9f4-9f6d929f2848","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"27ff1bb9-a65a-4ae2-a37c-613c0ccc07d2","name":"27ff1bb9-a65a-4ae2-a37c-613c0ccc07d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7a0af901-a520-42bd-b1ac-947b53d45c39","name":"7a0af901-a520-42bd-b1ac-947b53d45c39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64f02c8a-c899-45df-b03c-b6a1394a32bc","name":"64f02c8a-c899-45df-b03c-b6a1394a32bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b2fd1690-ad2e-4dea-913f-7440f3207956","name":"b2fd1690-ad2e-4dea-913f-7440f3207956","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1a80c47-aa27-4b86-b39a-6bf091f60626","name":"d1a80c47-aa27-4b86-b39a-6bf091f60626","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e07c49c2-0bb4-43a5-b9f4-9f6d929f2848","name":"e07c49c2-0bb4-43a5-b9f4-9f6d929f2848","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"27ff1bb9-a65a-4ae2-a37c-613c0ccc07d2","name":"27ff1bb9-a65a-4ae2-a37c-613c0ccc07d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a0af901-a520-42bd-b1ac-947b53d45c39","name":"7a0af901-a520-42bd-b1ac-947b53d45c39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,6 +68,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_faction_icons/spr_faction_icons.yy b/sprites/spr_faction_icons/spr_faction_icons.yy index e610646fcd..f0fd9ed434 100644 --- a/sprites/spr_faction_icons/spr_faction_icons.yy +++ b/sprites/spr_faction_icons/spr_faction_icons.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_faction_icons", "bboxMode":0, "bbox_bottom":57, @@ -12,22 +12,22 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"458ae16e-c6e8-45b5-b056-9c021caa006d","name":"458ae16e-c6e8-45b5-b056-9c021caa006d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"42355dbb-212b-40b0-bebd-21530e2fa783","name":"42355dbb-212b-40b0-bebd-21530e2fa783","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1e240158-bc5c-4162-85c8-a39ec678cea5","name":"1e240158-bc5c-4162-85c8-a39ec678cea5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"458ae16e-c6e8-45b5-b056-9c021caa006d","name":"458ae16e-c6e8-45b5-b056-9c021caa006d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42355dbb-212b-40b0-bebd-21530e2fa783","name":"42355dbb-212b-40b0-bebd-21530e2fa783","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1e240158-bc5c-4162-85c8-a39ec678cea5","name":"1e240158-bc5c-4162-85c8-a39ec678cea5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -78,59 +78,29 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":64.0, + "seqWidth":64.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d70ecb5d-690b-460c-8ca5-89d5cfba7807","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44cd17a1-e6c0-4ede-9f27-59cd285845e7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2de99ab3-2c6e-4ff1-92a0-84baaab0a45f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b0c9adc-db88-4f02-8ca9-61a9f1bdbde7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3601bbbe-f76d-4c96-a08a-26c7d2ef5caa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"458ae16e-c6e8-45b5-b056-9c021caa006d","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b392962f-07ba-432b-abfa-1dec5bd977a7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c4d8139e-197d-4160-a6b5-347132c816f9","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a98c5de5-4d16-4f57-b456-ef1225e54944","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d43e6fe-7e95-486f-8263-a8289c543acd","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69aeaeeb-f959-4064-a75b-c0bae2a8a8ab","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42355dbb-212b-40b0-bebd-21530e2fa783","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90297261-4eaa-4d25-a826-308e4e5e31f8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2b25933-4999-4026-826e-25784a625769","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ba1e06a-ef6e-46c3-ab25-b4a119bd66ce","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff58b031-e3a5-4d1c-913f-930259b4bada","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"82df5ccb-69b1-4fe1-8a7b-a9df60a5bd39","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1e240158-bc5c-4162-85c8-a39ec678cea5","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04a8b061-b249-427b-bf65-b350329c1cbb","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e31ef791-2dcc-4e57-bb94-85e8d0f6684c","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d70ecb5d-690b-460c-8ca5-89d5cfba7807","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da1147b4-25e5-43ff-9cb6-1b9630a91188","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44cd17a1-e6c0-4ede-9f27-59cd285845e7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a5a2538-7f5a-4ef5-809d-3efb68056895","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2de99ab3-2c6e-4ff1-92a0-84baaab0a45f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbd273df-a4ac-45f0-9567-d25b0554cae3","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b0c9adc-db88-4f02-8ca9-61a9f1bdbde7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"641ce88d-47a2-4ef5-a453-26c175c3fa47","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3601bbbe-f76d-4c96-a08a-26c7d2ef5caa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"458ae16e-c6e8-45b5-b056-9c021caa006d","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b392962f-07ba-432b-abfa-1dec5bd977a7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ee41cc1-6d74-46f1-a5b1-c464997a8b9c","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c4d8139e-197d-4160-a6b5-347132c816f9","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f13a3c9b-197b-483a-bf2b-7e73d0652796","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a98c5de5-4d16-4f57-b456-ef1225e54944","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a18ea534-1e88-4162-bc9a-ff5a1fc5dae9","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d43e6fe-7e95-486f-8263-a8289c543acd","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1811e86f-6b19-46af-bbac-ae5e34b7ac4a","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69aeaeeb-f959-4064-a75b-c0bae2a8a8ab","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"42355dbb-212b-40b0-bebd-21530e2fa783","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90297261-4eaa-4d25-a826-308e4e5e31f8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d55163e-830f-4b75-8aa6-a7cc7f3f4d58","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2b25933-4999-4026-826e-25784a625769","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"835c1eb9-c457-41aa-a6f7-5be0ddf0a2fd","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ba1e06a-ef6e-46c3-ab25-b4a119bd66ce","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c5ddf71-da02-4c9f-80cb-601ae5fb04aa","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff58b031-e3a5-4d1c-913f-930259b4bada","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a6c7016-0ed2-48ab-b4d5-d6ed24c11c13","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82df5ccb-69b1-4fe1-8a7b-a9df60a5bd39","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1e240158-bc5c-4162-85c8-a39ec678cea5","path":"sprites/spr_faction_icons/spr_faction_icons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04a8b061-b249-427b-bf65-b350329c1cbb","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_faith_icon/spr_faith_icon.yy b/sprites/spr_faith_icon/spr_faith_icon.yy index 987a7f439b..623283f47f 100644 --- a/sprites/spr_faith_icon/spr_faith_icon.yy +++ b/sprites/spr_faith_icon/spr_faith_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_faith_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"342d5d1f-0155-42cd-9e08-666c4dfea64d","name":"342d5d1f-0155-42cd-9e08-666c4dfea64d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"342d5d1f-0155-42cd-9e08-666c4dfea64d","name":"342d5d1f-0155-42cd-9e08-666c4dfea64d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"342d5d1f-0155-42cd-9e08-666c4dfea64d","path":"sprites/spr_faith_icon/spr_faith_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4f0876cf-f608-41c0-bf42-e8b8d393ae12","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"342d5d1f-0155-42cd-9e08-666c4dfea64d","path":"sprites/spr_faith_icon/spr_faith_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4f0876cf-f608-41c0-bf42-e8b8d393ae12","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_fast_forward/spr_fast_forward.yy b/sprites/spr_fast_forward/spr_fast_forward.yy index 56627276c6..4ac20167ff 100644 --- a/sprites/spr_fast_forward/spr_fast_forward.yy +++ b/sprites/spr_fast_forward/spr_fast_forward.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fast_forward", "bboxMode":0, "bbox_bottom":31, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9bb0dfea-9450-4c2a-9c48-dd711892de4d","name":"9bb0dfea-9450-4c2a-9c48-dd711892de4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9bb0dfea-9450-4c2a-9c48-dd711892de4d","name":"9bb0dfea-9450-4c2a-9c48-dd711892de4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9bb0dfea-9450-4c2a-9c48-dd711892de4d","path":"sprites/spr_fast_forward/spr_fast_forward.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"463e807f-9e8d-43a8-90e0-01654427ed84","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9bb0dfea-9450-4c2a-9c48-dd711892de4d","path":"sprites/spr_fast_forward/spr_fast_forward.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"463e807f-9e8d-43a8-90e0-01654427ed84","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_fighta/spr_fighta.yy b/sprites/spr_fighta/spr_fighta.yy index 1ce514d420..7d03e55433 100644 --- a/sprites/spr_fighta/spr_fighta.yy +++ b/sprites/spr_fighta/spr_fighta.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fighta", "bboxMode":0, "bbox_bottom":20, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8c4e5f6e-c044-43b9-84a2-20412778de5a","name":"8c4e5f6e-c044-43b9-84a2-20412778de5a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c4e5f6e-c044-43b9-84a2-20412778de5a","name":"8c4e5f6e-c044-43b9-84a2-20412778de5a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c4e5f6e-c044-43b9-84a2-20412778de5a","path":"sprites/spr_fighta/spr_fighta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1fa7cfcf-9b37-4a7d-ae1b-3fbb0aa84cff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c4e5f6e-c044-43b9-84a2-20412778de5a","path":"sprites/spr_fighta/spr_fighta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1fa7cfcf-9b37-4a7d-ae1b-3fbb0aa84cff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_flame/spr_flame.yy b/sprites/spr_flame/spr_flame.yy index 751be7fa2b..741063e030 100644 --- a/sprites/spr_flame/spr_flame.yy +++ b/sprites/spr_flame/spr_flame.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_flame", "bboxMode":2, "bbox_bottom":29, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3ccdc751-66fc-446f-aabe-8d34a8ed10bb","name":"3ccdc751-66fc-446f-aabe-8d34a8ed10bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14afd175-9af1-4620-b14e-66b195d01ab9","name":"14afd175-9af1-4620-b14e-66b195d01ab9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e56ffdd9-a9de-45f7-8b8c-afd2bc69d8b8","name":"e56ffdd9-a9de-45f7-8b8c-afd2bc69d8b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"86db4960-a6df-46e6-a9fe-01c0a03bcb2c","name":"86db4960-a6df-46e6-a9fe-01c0a03bcb2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3ea2f2d-e1d0-4cad-8dab-ab313e276e81","name":"e3ea2f2d-e1d0-4cad-8dab-ab313e276e81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ecf0913-2c5b-43a3-9070-1303d915e40e","name":"6ecf0913-2c5b-43a3-9070-1303d915e40e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c43b5d2a-6aef-4155-9414-f5945d0f9dda","name":"c43b5d2a-6aef-4155-9414-f5945d0f9dda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6f97135-aed8-409d-a36f-e432c5ad62f8","name":"a6f97135-aed8-409d-a36f-e432c5ad62f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ccdc751-66fc-446f-aabe-8d34a8ed10bb","name":"3ccdc751-66fc-446f-aabe-8d34a8ed10bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14afd175-9af1-4620-b14e-66b195d01ab9","name":"14afd175-9af1-4620-b14e-66b195d01ab9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e56ffdd9-a9de-45f7-8b8c-afd2bc69d8b8","name":"e56ffdd9-a9de-45f7-8b8c-afd2bc69d8b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"86db4960-a6df-46e6-a9fe-01c0a03bcb2c","name":"86db4960-a6df-46e6-a9fe-01c0a03bcb2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3ea2f2d-e1d0-4cad-8dab-ab313e276e81","name":"e3ea2f2d-e1d0-4cad-8dab-ab313e276e81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ecf0913-2c5b-43a3-9070-1303d915e40e","name":"6ecf0913-2c5b-43a3-9070-1303d915e40e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c43b5d2a-6aef-4155-9414-f5945d0f9dda","name":"c43b5d2a-6aef-4155-9414-f5945d0f9dda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6f97135-aed8-409d-a36f-e432c5ad62f8","name":"a6f97135-aed8-409d-a36f-e432c5ad62f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,30 +77,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ccdc751-66fc-446f-aabe-8d34a8ed10bb","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c31b035-9dd2-4571-8e92-3abdb0dcecb2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14afd175-9af1-4620-b14e-66b195d01ab9","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b3432aa-c967-4f4c-9bee-ac65e5e10262","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e56ffdd9-a9de-45f7-8b8c-afd2bc69d8b8","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f73ff78e-f298-404c-a03a-257e6e0e6c56","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"86db4960-a6df-46e6-a9fe-01c0a03bcb2c","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f84d6149-6b95-4fe0-aeb4-b9b19b53dcd2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3ea2f2d-e1d0-4cad-8dab-ab313e276e81","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"197060ec-b1f9-44ac-8f1b-3533517607be","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ecf0913-2c5b-43a3-9070-1303d915e40e","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff1de936-a8ea-489a-af27-1b9f944b9195","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c43b5d2a-6aef-4155-9414-f5945d0f9dda","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f535a69d-b886-4e19-94cd-6d09228e4d7e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6f97135-aed8-409d-a36f-e432c5ad62f8","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb641164-0c29-47cd-98e1-d3c1c812868d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ccdc751-66fc-446f-aabe-8d34a8ed10bb","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c31b035-9dd2-4571-8e92-3abdb0dcecb2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14afd175-9af1-4620-b14e-66b195d01ab9","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b3432aa-c967-4f4c-9bee-ac65e5e10262","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e56ffdd9-a9de-45f7-8b8c-afd2bc69d8b8","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f73ff78e-f298-404c-a03a-257e6e0e6c56","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"86db4960-a6df-46e6-a9fe-01c0a03bcb2c","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f84d6149-6b95-4fe0-aeb4-b9b19b53dcd2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3ea2f2d-e1d0-4cad-8dab-ab313e276e81","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"197060ec-b1f9-44ac-8f1b-3533517607be","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ecf0913-2c5b-43a3-9070-1303d915e40e","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff1de936-a8ea-489a-af27-1b9f944b9195","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c43b5d2a-6aef-4155-9414-f5945d0f9dda","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f535a69d-b886-4e19-94cd-6d09228e4d7e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6f97135-aed8-409d-a36f-e432c5ad62f8","path":"sprites/spr_flame/spr_flame.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb641164-0c29-47cd-98e1-d3c1c812868d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_flame2/spr_flame2.yy b/sprites/spr_flame2/spr_flame2.yy index 8ef57a4cb0..808d94a5b4 100644 --- a/sprites/spr_flame2/spr_flame2.yy +++ b/sprites/spr_flame2/spr_flame2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_flame2", "bboxMode":2, "bbox_bottom":29, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1b984331-f6d8-4bc2-b9f7-deda0e06e17e","name":"1b984331-f6d8-4bc2-b9f7-deda0e06e17e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c7d9b2d-8aa3-43b1-bf72-4754457ccf85","name":"3c7d9b2d-8aa3-43b1-bf72-4754457ccf85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c119acae-8e5a-49ea-bd61-a3ab4e20ad45","name":"c119acae-8e5a-49ea-bd61-a3ab4e20ad45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af333edf-6007-47d6-95c3-007dfa1df6f1","name":"af333edf-6007-47d6-95c3-007dfa1df6f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"77aa35ef-3558-42f5-8eb2-8c6919d12615","name":"77aa35ef-3558-42f5-8eb2-8c6919d12615","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ed78f26-9a75-4840-a210-528819aaa311","name":"3ed78f26-9a75-4840-a210-528819aaa311","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8bf2cf3d-c570-43f9-b54b-8033b3e65a2b","name":"8bf2cf3d-c570-43f9-b54b-8033b3e65a2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dd4c7ac3-d6af-4766-af34-de65311b5e00","name":"dd4c7ac3-d6af-4766-af34-de65311b5e00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b984331-f6d8-4bc2-b9f7-deda0e06e17e","name":"1b984331-f6d8-4bc2-b9f7-deda0e06e17e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c7d9b2d-8aa3-43b1-bf72-4754457ccf85","name":"3c7d9b2d-8aa3-43b1-bf72-4754457ccf85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c119acae-8e5a-49ea-bd61-a3ab4e20ad45","name":"c119acae-8e5a-49ea-bd61-a3ab4e20ad45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af333edf-6007-47d6-95c3-007dfa1df6f1","name":"af333edf-6007-47d6-95c3-007dfa1df6f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"77aa35ef-3558-42f5-8eb2-8c6919d12615","name":"77aa35ef-3558-42f5-8eb2-8c6919d12615","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ed78f26-9a75-4840-a210-528819aaa311","name":"3ed78f26-9a75-4840-a210-528819aaa311","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8bf2cf3d-c570-43f9-b54b-8033b3e65a2b","name":"8bf2cf3d-c570-43f9-b54b-8033b3e65a2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd4c7ac3-d6af-4766-af34-de65311b5e00","name":"dd4c7ac3-d6af-4766-af34-de65311b5e00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,30 +77,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b984331-f6d8-4bc2-b9f7-deda0e06e17e","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3b33f81-54f2-43f9-b23c-fa822d0e83d4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c7d9b2d-8aa3-43b1-bf72-4754457ccf85","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3c3a04a7-ff72-40b9-8c55-cc9a1a4d22f3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c119acae-8e5a-49ea-bd61-a3ab4e20ad45","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ae67ab58-4666-4c9e-9f41-aa05391d5398","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af333edf-6007-47d6-95c3-007dfa1df6f1","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c2e034a5-03dd-488f-b460-f6f96fd22eb2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"77aa35ef-3558-42f5-8eb2-8c6919d12615","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05a3ebe7-7bee-41cb-8d55-33eec1f714f3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ed78f26-9a75-4840-a210-528819aaa311","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6c09481-c282-4c9a-b834-35c505049808","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8bf2cf3d-c570-43f9-b54b-8033b3e65a2b","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dbedd24f-98b9-4a11-99fe-69d2066f15fd","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd4c7ac3-d6af-4766-af34-de65311b5e00","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"96fa7221-c449-4ef0-8ce2-c7567bd3e44e","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b984331-f6d8-4bc2-b9f7-deda0e06e17e","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3b33f81-54f2-43f9-b23c-fa822d0e83d4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c7d9b2d-8aa3-43b1-bf72-4754457ccf85","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3c3a04a7-ff72-40b9-8c55-cc9a1a4d22f3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c119acae-8e5a-49ea-bd61-a3ab4e20ad45","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ae67ab58-4666-4c9e-9f41-aa05391d5398","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af333edf-6007-47d6-95c3-007dfa1df6f1","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c2e034a5-03dd-488f-b460-f6f96fd22eb2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"77aa35ef-3558-42f5-8eb2-8c6919d12615","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05a3ebe7-7bee-41cb-8d55-33eec1f714f3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ed78f26-9a75-4840-a210-528819aaa311","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6c09481-c282-4c9a-b834-35c505049808","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8bf2cf3d-c570-43f9-b54b-8033b3e65a2b","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dbedd24f-98b9-4a11-99fe-69d2066f15fd","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd4c7ac3-d6af-4766-af34-de65311b5e00","path":"sprites/spr_flame2/spr_flame2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"96fa7221-c449-4ef0-8ce2-c7567bd3e44e","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_flamer_new/spr_flamer_new.yy b/sprites/spr_flamer_new/spr_flamer_new.yy index 09faf1047b..de677568b7 100644 --- a/sprites/spr_flamer_new/spr_flamer_new.yy +++ b/sprites/spr_flamer_new/spr_flamer_new.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_flamer_new", "bboxMode":0, "bbox_bottom":113, @@ -12,27 +12,27 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3be5fc3c-f934-416b-9fba-e8a6a78a5f2c","name":"3be5fc3c-f934-416b-9fba-e8a6a78a5f2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"900c5d6c-a9a6-4d64-9d7d-6db2beff72d6","name":"900c5d6c-a9a6-4d64-9d7d-6db2beff72d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"761eefee-a078-4b95-aeb7-cbe4004c0025","name":"761eefee-a078-4b95-aeb7-cbe4004c0025","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"30d37538-6ee7-40b1-b686-40375b62edcf","name":"30d37538-6ee7-40b1-b686-40375b62edcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14c810b2-4cfc-4037-80f5-ea54a35dfc1c","name":"14c810b2-4cfc-4037-80f5-ea54a35dfc1c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a72f2ddc-8a6b-45ac-8be0-83d713adea6e","name":"a72f2ddc-8a6b-45ac-8be0-83d713adea6e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e18f82cd-e032-469f-8dee-fe82f06a40ee","name":"e18f82cd-e032-469f-8dee-fe82f06a40ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4b8d0af8-713a-49b7-aa9a-72b17ed67f50","name":"4b8d0af8-713a-49b7-aa9a-72b17ed67f50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"33c4768e-5707-456d-b1a7-7d304b79d8f5","name":"33c4768e-5707-456d-b1a7-7d304b79d8f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"527762a2-ae2f-42c5-bbe1-7e8e15799959","name":"527762a2-ae2f-42c5-bbe1-7e8e15799959","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b203eec-68cd-4703-a483-5cdce413011e","name":"2b203eec-68cd-4703-a483-5cdce413011e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1208e1d4-789d-4473-8c10-1c8003e04ee5","name":"1208e1d4-789d-4473-8c10-1c8003e04ee5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b6370bbd-af61-4b6c-b08a-afe89cb64d88","name":"b6370bbd-af61-4b6c-b08a-afe89cb64d88","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b704a9f-b4ab-40c9-a3f3-243c0e9a73f1","name":"3b704a9f-b4ab-40c9-a3f3-243c0e9a73f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d7508a11-afe6-4d42-9021-77b8885dd408","name":"d7508a11-afe6-4d42-9021-77b8885dd408","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"70abc107-ab83-4789-86d8-51113339f174","name":"70abc107-ab83-4789-86d8-51113339f174","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9fd61129-92d1-4072-8e6d-a946b36afcfc","name":"9fd61129-92d1-4072-8e6d-a946b36afcfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6c6d034d-9d21-49b0-b93c-f4a6b3def45e","name":"6c6d034d-9d21-49b0-b93c-f4a6b3def45e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01751f85-11b9-4c41-9460-0374d62bd7ae","name":"01751f85-11b9-4c41-9460-0374d62bd7ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b6a80603-94ff-4a9a-b473-1b2df3b6b8c1","name":"b6a80603-94ff-4a9a-b473-1b2df3b6b8c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"28bcce15-60d9-4378-a728-9c720c2ffaa1","name":"28bcce15-60d9-4378-a728-9c720c2ffaa1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3be5fc3c-f934-416b-9fba-e8a6a78a5f2c","name":"3be5fc3c-f934-416b-9fba-e8a6a78a5f2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"900c5d6c-a9a6-4d64-9d7d-6db2beff72d6","name":"900c5d6c-a9a6-4d64-9d7d-6db2beff72d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"761eefee-a078-4b95-aeb7-cbe4004c0025","name":"761eefee-a078-4b95-aeb7-cbe4004c0025","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"30d37538-6ee7-40b1-b686-40375b62edcf","name":"30d37538-6ee7-40b1-b686-40375b62edcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14c810b2-4cfc-4037-80f5-ea54a35dfc1c","name":"14c810b2-4cfc-4037-80f5-ea54a35dfc1c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a72f2ddc-8a6b-45ac-8be0-83d713adea6e","name":"a72f2ddc-8a6b-45ac-8be0-83d713adea6e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e18f82cd-e032-469f-8dee-fe82f06a40ee","name":"e18f82cd-e032-469f-8dee-fe82f06a40ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b8d0af8-713a-49b7-aa9a-72b17ed67f50","name":"4b8d0af8-713a-49b7-aa9a-72b17ed67f50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"33c4768e-5707-456d-b1a7-7d304b79d8f5","name":"33c4768e-5707-456d-b1a7-7d304b79d8f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"527762a2-ae2f-42c5-bbe1-7e8e15799959","name":"527762a2-ae2f-42c5-bbe1-7e8e15799959","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b203eec-68cd-4703-a483-5cdce413011e","name":"2b203eec-68cd-4703-a483-5cdce413011e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1208e1d4-789d-4473-8c10-1c8003e04ee5","name":"1208e1d4-789d-4473-8c10-1c8003e04ee5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6370bbd-af61-4b6c-b08a-afe89cb64d88","name":"b6370bbd-af61-4b6c-b08a-afe89cb64d88","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b704a9f-b4ab-40c9-a3f3-243c0e9a73f1","name":"3b704a9f-b4ab-40c9-a3f3-243c0e9a73f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d7508a11-afe6-4d42-9021-77b8885dd408","name":"d7508a11-afe6-4d42-9021-77b8885dd408","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"70abc107-ab83-4789-86d8-51113339f174","name":"70abc107-ab83-4789-86d8-51113339f174","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9fd61129-92d1-4072-8e6d-a946b36afcfc","name":"9fd61129-92d1-4072-8e6d-a946b36afcfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6c6d034d-9d21-49b0-b93c-f4a6b3def45e","name":"6c6d034d-9d21-49b0-b93c-f4a6b3def45e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01751f85-11b9-4c41-9460-0374d62bd7ae","name":"01751f85-11b9-4c41-9460-0374d62bd7ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6a80603-94ff-4a9a-b473-1b2df3b6b8c1","name":"b6a80603-94ff-4a9a-b473-1b2df3b6b8c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"28bcce15-60d9-4378-a728-9c720c2ffaa1","name":"28bcce15-60d9-4378-a728-9c720c2ffaa1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -90,69 +90,27 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3be5fc3c-f934-416b-9fba-e8a6a78a5f2c","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ef1a9d3-3154-4e88-88c0-3a2673985ba8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"900c5d6c-a9a6-4d64-9d7d-6db2beff72d6","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d3a007a-6992-43c4-adab-80302d987450","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"761eefee-a078-4b95-aeb7-cbe4004c0025","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f517dfd-7dc8-4c61-8e83-1cd65b2751d7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"30d37538-6ee7-40b1-b686-40375b62edcf","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c8016ec-c767-40e1-bd9c-8561c21ae50e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14c810b2-4cfc-4037-80f5-ea54a35dfc1c","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f90cd282-b3dc-47aa-8643-8e6436075eca","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a72f2ddc-8a6b-45ac-8be0-83d713adea6e","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"760db19f-5863-4118-b636-76df78b253b7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e18f82cd-e032-469f-8dee-fe82f06a40ee","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"010bc769-578c-46aa-bee2-0570802b712c","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b8d0af8-713a-49b7-aa9a-72b17ed67f50","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4833e8bc-594b-4306-b2d1-d89b8de18b10","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"33c4768e-5707-456d-b1a7-7d304b79d8f5","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f14d596d-e04d-4edc-90b2-5c86dfe1e529","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"527762a2-ae2f-42c5-bbe1-7e8e15799959","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc4bf285-6aea-4e6a-ad13-45e4808cfc66","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b203eec-68cd-4703-a483-5cdce413011e","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"199fc9e1-df58-417a-9789-47db90f740d4","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1208e1d4-789d-4473-8c10-1c8003e04ee5","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9ccd1782-80ad-4c30-8c54-616e26de9228","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6370bbd-af61-4b6c-b08a-afe89cb64d88","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9c6c2b0-f920-40f3-8ab3-d7573d2dda8a","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b704a9f-b4ab-40c9-a3f3-243c0e9a73f1","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ff30df4-e685-47a7-9606-51ca71ce9cda","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7508a11-afe6-4d42-9021-77b8885dd408","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f44de32-3a46-4236-883f-3d122c424869","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"70abc107-ab83-4789-86d8-51113339f174","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"00f57f51-bf79-429c-8f73-fc072656da5e","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fd61129-92d1-4072-8e6d-a946b36afcfc","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2aea8f53-12be-450b-a342-57473f71cd92","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6c6d034d-9d21-49b0-b93c-f4a6b3def45e","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b16ded8a-a9c5-4ae0-adbd-5bce33f26e43","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01751f85-11b9-4c41-9460-0374d62bd7ae","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b21669d-1950-4afd-9a97-93a07b2c3c7f","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6a80603-94ff-4a9a-b473-1b2df3b6b8c1","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38e1cf94-596e-4c67-9834-606e358858c3","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28bcce15-60d9-4378-a728-9c720c2ffaa1","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e70953da-f7e6-4c0e-bd0c-a1821a4a4d21","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3be5fc3c-f934-416b-9fba-e8a6a78a5f2c","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ef1a9d3-3154-4e88-88c0-3a2673985ba8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"900c5d6c-a9a6-4d64-9d7d-6db2beff72d6","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d3a007a-6992-43c4-adab-80302d987450","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"761eefee-a078-4b95-aeb7-cbe4004c0025","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f517dfd-7dc8-4c61-8e83-1cd65b2751d7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"30d37538-6ee7-40b1-b686-40375b62edcf","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c8016ec-c767-40e1-bd9c-8561c21ae50e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14c810b2-4cfc-4037-80f5-ea54a35dfc1c","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f90cd282-b3dc-47aa-8643-8e6436075eca","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a72f2ddc-8a6b-45ac-8be0-83d713adea6e","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"760db19f-5863-4118-b636-76df78b253b7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e18f82cd-e032-469f-8dee-fe82f06a40ee","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"010bc769-578c-46aa-bee2-0570802b712c","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b8d0af8-713a-49b7-aa9a-72b17ed67f50","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4833e8bc-594b-4306-b2d1-d89b8de18b10","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"33c4768e-5707-456d-b1a7-7d304b79d8f5","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f14d596d-e04d-4edc-90b2-5c86dfe1e529","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"527762a2-ae2f-42c5-bbe1-7e8e15799959","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc4bf285-6aea-4e6a-ad13-45e4808cfc66","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b203eec-68cd-4703-a483-5cdce413011e","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"199fc9e1-df58-417a-9789-47db90f740d4","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1208e1d4-789d-4473-8c10-1c8003e04ee5","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9ccd1782-80ad-4c30-8c54-616e26de9228","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6370bbd-af61-4b6c-b08a-afe89cb64d88","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9c6c2b0-f920-40f3-8ab3-d7573d2dda8a","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b704a9f-b4ab-40c9-a3f3-243c0e9a73f1","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ff30df4-e685-47a7-9606-51ca71ce9cda","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7508a11-afe6-4d42-9021-77b8885dd408","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f44de32-3a46-4236-883f-3d122c424869","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"70abc107-ab83-4789-86d8-51113339f174","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"00f57f51-bf79-429c-8f73-fc072656da5e","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fd61129-92d1-4072-8e6d-a946b36afcfc","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2aea8f53-12be-450b-a342-57473f71cd92","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6c6d034d-9d21-49b0-b93c-f4a6b3def45e","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b16ded8a-a9c5-4ae0-adbd-5bce33f26e43","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01751f85-11b9-4c41-9460-0374d62bd7ae","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b21669d-1950-4afd-9a97-93a07b2c3c7f","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6a80603-94ff-4a9a-b473-1b2df3b6b8c1","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38e1cf94-596e-4c67-9834-606e358858c3","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"28bcce15-60d9-4378-a728-9c720c2ffaa1","path":"sprites/spr_flamer_new/spr_flamer_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e70953da-f7e6-4c0e-bd0c-a1821a4a4d21","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_fleet_alert/spr_fleet_alert.yy b/sprites/spr_fleet_alert/spr_fleet_alert.yy index a63b853bb5..2becca5d33 100644 --- a/sprites/spr_fleet_alert/spr_fleet_alert.yy +++ b/sprites/spr_fleet_alert/spr_fleet_alert.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_alert", "bboxMode":0, "bbox_bottom":65, @@ -12,34 +12,34 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3509c403-4a42-4dbf-92f7-560c8127d7a4","name":"3509c403-4a42-4dbf-92f7-560c8127d7a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40b6fe6f-15f9-432c-8c3f-ff992acc31d0","name":"40b6fe6f-15f9-432c-8c3f-ff992acc31d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"95bc9f54-030d-4fe5-b022-ed084c5bde29","name":"95bc9f54-030d-4fe5-b022-ed084c5bde29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1b868bf-e07e-4504-9be4-050c777e2959","name":"d1b868bf-e07e-4504-9be4-050c777e2959","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"99d73fc9-3d98-4ff9-b8ac-c0c643b60fff","name":"99d73fc9-3d98-4ff9-b8ac-c0c643b60fff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8cd2dcc8-c818-467b-8b55-a1aa784707fc","name":"8cd2dcc8-c818-467b-8b55-a1aa784707fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f18ca31-d1b6-41b4-98c8-14e2ee900f8f","name":"7f18ca31-d1b6-41b4-98c8-14e2ee900f8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"16841a42-f578-4d0f-bc53-345e26a4309d","name":"16841a42-f578-4d0f-bc53-345e26a4309d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bfdf43a6-c842-49fb-b161-ba27246384f4","name":"bfdf43a6-c842-49fb-b161-ba27246384f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d55e1739-d36d-4487-a702-b89fa087184e","name":"d55e1739-d36d-4487-a702-b89fa087184e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"44b7382e-2196-405b-bee8-29c85e8f23ed","name":"44b7382e-2196-405b-bee8-29c85e8f23ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3db612ae-e3aa-4aef-9e4e-8e2a362855b1","name":"3db612ae-e3aa-4aef-9e4e-8e2a362855b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0abe3892-4dff-4baa-b14c-eb85368af891","name":"0abe3892-4dff-4baa-b14c-eb85368af891","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7b193357-84c6-4399-a900-b24b88446930","name":"7b193357-84c6-4399-a900-b24b88446930","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ae2db314-7ff4-460f-b597-1f330bfee00a","name":"ae2db314-7ff4-460f-b597-1f330bfee00a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fdebd2ad-cdc0-4305-8152-dd34dd2638f2","name":"fdebd2ad-cdc0-4305-8152-dd34dd2638f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"380032a1-f564-49dd-bbf9-04391109226e","name":"380032a1-f564-49dd-bbf9-04391109226e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af9f51dd-77c9-4714-9cc9-f69c4b41221a","name":"af9f51dd-77c9-4714-9cc9-f69c4b41221a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0d869733-1346-401e-90c3-26ce45631ab2","name":"0d869733-1346-401e-90c3-26ce45631ab2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3bed14ed-d8ef-4e2f-9d71-6eb1ce5ddb34","name":"3bed14ed-d8ef-4e2f-9d71-6eb1ce5ddb34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"54ed6dd8-3b46-458d-9ef9-ddb84f9b5a53","name":"54ed6dd8-3b46-458d-9ef9-ddb84f9b5a53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f6b57a76-8e15-4e08-95a1-00acfc2ed262","name":"f6b57a76-8e15-4e08-95a1-00acfc2ed262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7897ba67-28c3-4c9c-bd97-6211f4a079d0","name":"7897ba67-28c3-4c9c-bd97-6211f4a079d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"43ab2ecd-3983-4f57-9fc8-1ccaea47fc2c","name":"43ab2ecd-3983-4f57-9fc8-1ccaea47fc2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"78291903-2783-4041-82d8-cc072217aca3","name":"78291903-2783-4041-82d8-cc072217aca3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eb46993b-2b1d-4fc6-8811-78656a1d129c","name":"eb46993b-2b1d-4fc6-8811-78656a1d129c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a8642eb0-3023-4113-b13b-ff8a8c11386f","name":"a8642eb0-3023-4113-b13b-ff8a8c11386f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"455ba3a1-1a6c-4908-866d-4dd8b3104bfb","name":"455ba3a1-1a6c-4908-866d-4dd8b3104bfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3509c403-4a42-4dbf-92f7-560c8127d7a4","name":"3509c403-4a42-4dbf-92f7-560c8127d7a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40b6fe6f-15f9-432c-8c3f-ff992acc31d0","name":"40b6fe6f-15f9-432c-8c3f-ff992acc31d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95bc9f54-030d-4fe5-b022-ed084c5bde29","name":"95bc9f54-030d-4fe5-b022-ed084c5bde29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1b868bf-e07e-4504-9be4-050c777e2959","name":"d1b868bf-e07e-4504-9be4-050c777e2959","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"99d73fc9-3d98-4ff9-b8ac-c0c643b60fff","name":"99d73fc9-3d98-4ff9-b8ac-c0c643b60fff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8cd2dcc8-c818-467b-8b55-a1aa784707fc","name":"8cd2dcc8-c818-467b-8b55-a1aa784707fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f18ca31-d1b6-41b4-98c8-14e2ee900f8f","name":"7f18ca31-d1b6-41b4-98c8-14e2ee900f8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"16841a42-f578-4d0f-bc53-345e26a4309d","name":"16841a42-f578-4d0f-bc53-345e26a4309d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bfdf43a6-c842-49fb-b161-ba27246384f4","name":"bfdf43a6-c842-49fb-b161-ba27246384f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d55e1739-d36d-4487-a702-b89fa087184e","name":"d55e1739-d36d-4487-a702-b89fa087184e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"44b7382e-2196-405b-bee8-29c85e8f23ed","name":"44b7382e-2196-405b-bee8-29c85e8f23ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3db612ae-e3aa-4aef-9e4e-8e2a362855b1","name":"3db612ae-e3aa-4aef-9e4e-8e2a362855b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0abe3892-4dff-4baa-b14c-eb85368af891","name":"0abe3892-4dff-4baa-b14c-eb85368af891","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b193357-84c6-4399-a900-b24b88446930","name":"7b193357-84c6-4399-a900-b24b88446930","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae2db314-7ff4-460f-b597-1f330bfee00a","name":"ae2db314-7ff4-460f-b597-1f330bfee00a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fdebd2ad-cdc0-4305-8152-dd34dd2638f2","name":"fdebd2ad-cdc0-4305-8152-dd34dd2638f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"380032a1-f564-49dd-bbf9-04391109226e","name":"380032a1-f564-49dd-bbf9-04391109226e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af9f51dd-77c9-4714-9cc9-f69c4b41221a","name":"af9f51dd-77c9-4714-9cc9-f69c4b41221a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0d869733-1346-401e-90c3-26ce45631ab2","name":"0d869733-1346-401e-90c3-26ce45631ab2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3bed14ed-d8ef-4e2f-9d71-6eb1ce5ddb34","name":"3bed14ed-d8ef-4e2f-9d71-6eb1ce5ddb34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"54ed6dd8-3b46-458d-9ef9-ddb84f9b5a53","name":"54ed6dd8-3b46-458d-9ef9-ddb84f9b5a53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f6b57a76-8e15-4e08-95a1-00acfc2ed262","name":"f6b57a76-8e15-4e08-95a1-00acfc2ed262","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7897ba67-28c3-4c9c-bd97-6211f4a079d0","name":"7897ba67-28c3-4c9c-bd97-6211f4a079d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"43ab2ecd-3983-4f57-9fc8-1ccaea47fc2c","name":"43ab2ecd-3983-4f57-9fc8-1ccaea47fc2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"78291903-2783-4041-82d8-cc072217aca3","name":"78291903-2783-4041-82d8-cc072217aca3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eb46993b-2b1d-4fc6-8811-78656a1d129c","name":"eb46993b-2b1d-4fc6-8811-78656a1d129c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a8642eb0-3023-4113-b13b-ff8a8c11386f","name":"a8642eb0-3023-4113-b13b-ff8a8c11386f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"455ba3a1-1a6c-4908-866d-4dd8b3104bfb","name":"455ba3a1-1a6c-4908-866d-4dd8b3104bfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -95,90 +95,34 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3509c403-4a42-4dbf-92f7-560c8127d7a4","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0737c21-c8fc-4c51-babe-20c7f6301068","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40b6fe6f-15f9-432c-8c3f-ff992acc31d0","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"106eb3e4-1b1b-46ba-8ad5-7ffef628f808","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95bc9f54-030d-4fe5-b022-ed084c5bde29","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e4baa6bd-fad7-44c9-8f44-2f639e7672df","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1b868bf-e07e-4504-9be4-050c777e2959","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16345a42-4a6d-469c-bc2b-068c367f3e84","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"99d73fc9-3d98-4ff9-b8ac-c0c643b60fff","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b5d675a-5366-4c96-b59d-7bbd3e337f6e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cd2dcc8-c818-467b-8b55-a1aa784707fc","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bcdd4262-9976-40ae-b742-018b5456d2b2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f18ca31-d1b6-41b4-98c8-14e2ee900f8f","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f43d1ca9-dcd0-4f92-9164-3f83f26fceb1","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16841a42-f578-4d0f-bc53-345e26a4309d","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd73b924-43bf-41d9-8271-12542380d00d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfdf43a6-c842-49fb-b161-ba27246384f4","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea6a1361-f0b5-4c2a-b600-50b96b43d815","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d55e1739-d36d-4487-a702-b89fa087184e","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a1583cf2-655a-4eed-beda-a527948cbcf2","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"44b7382e-2196-405b-bee8-29c85e8f23ed","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d7f9166-2daf-46d0-8160-71fe9d34b349","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3db612ae-e3aa-4aef-9e4e-8e2a362855b1","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b73b1e4a-ddc4-43e6-8264-d7e596a94a2c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0abe3892-4dff-4baa-b14c-eb85368af891","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c69ae899-b335-453b-a60c-77619c337695","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b193357-84c6-4399-a900-b24b88446930","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed9f679c-0740-4403-8633-8d1e1b1b248a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae2db314-7ff4-460f-b597-1f330bfee00a","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0b7520c4-53d0-4480-b6bc-988a15adf5b2","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fdebd2ad-cdc0-4305-8152-dd34dd2638f2","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e713a8a3-fb54-46a7-9848-4acf88a1a942","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"380032a1-f564-49dd-bbf9-04391109226e","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"85b99d1f-cbb3-48ec-9bdb-1c0c8f2d161f","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af9f51dd-77c9-4714-9cc9-f69c4b41221a","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2a05aa8d-8b2b-453b-b618-b3751e52eae7","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d869733-1346-401e-90c3-26ce45631ab2","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"52e4c85c-97cb-4ab5-9dc2-1997aa6af9ae","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bed14ed-d8ef-4e2f-9d71-6eb1ce5ddb34","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cff2981f-56c2-4d04-b56d-e3be09a68c89","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"54ed6dd8-3b46-458d-9ef9-ddb84f9b5a53","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16ae9ca2-b3ac-4381-8412-f62fe7f210ed","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6b57a76-8e15-4e08-95a1-00acfc2ed262","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"164a8aed-d9a1-4517-973b-a5ef5c079aff","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7897ba67-28c3-4c9c-bd97-6211f4a079d0","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c25a0fdd-5401-4665-a190-406d7fc58efe","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"43ab2ecd-3983-4f57-9fc8-1ccaea47fc2c","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"990fb6a9-5f10-4b9e-915c-c8b6e0364438","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"78291903-2783-4041-82d8-cc072217aca3","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"038df30f-7867-44fb-b37a-036a567daf58","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb46993b-2b1d-4fc6-8811-78656a1d129c","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"180be3f9-5423-4b36-82a2-253919c7b724","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8642eb0-3023-4113-b13b-ff8a8c11386f","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e2b9f7b3-5c75-4e9c-90d7-c22ba4be3d6b","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"455ba3a1-1a6c-4908-866d-4dd8b3104bfb","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2f2d209b-fa65-4288-a103-8204e39673c2","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3509c403-4a42-4dbf-92f7-560c8127d7a4","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0737c21-c8fc-4c51-babe-20c7f6301068","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40b6fe6f-15f9-432c-8c3f-ff992acc31d0","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"106eb3e4-1b1b-46ba-8ad5-7ffef628f808","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95bc9f54-030d-4fe5-b022-ed084c5bde29","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e4baa6bd-fad7-44c9-8f44-2f639e7672df","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1b868bf-e07e-4504-9be4-050c777e2959","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16345a42-4a6d-469c-bc2b-068c367f3e84","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"99d73fc9-3d98-4ff9-b8ac-c0c643b60fff","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b5d675a-5366-4c96-b59d-7bbd3e337f6e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cd2dcc8-c818-467b-8b55-a1aa784707fc","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bcdd4262-9976-40ae-b742-018b5456d2b2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f18ca31-d1b6-41b4-98c8-14e2ee900f8f","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f43d1ca9-dcd0-4f92-9164-3f83f26fceb1","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"16841a42-f578-4d0f-bc53-345e26a4309d","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd73b924-43bf-41d9-8271-12542380d00d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfdf43a6-c842-49fb-b161-ba27246384f4","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea6a1361-f0b5-4c2a-b600-50b96b43d815","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d55e1739-d36d-4487-a702-b89fa087184e","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a1583cf2-655a-4eed-beda-a527948cbcf2","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"44b7382e-2196-405b-bee8-29c85e8f23ed","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d7f9166-2daf-46d0-8160-71fe9d34b349","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3db612ae-e3aa-4aef-9e4e-8e2a362855b1","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b73b1e4a-ddc4-43e6-8264-d7e596a94a2c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0abe3892-4dff-4baa-b14c-eb85368af891","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c69ae899-b335-453b-a60c-77619c337695","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b193357-84c6-4399-a900-b24b88446930","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed9f679c-0740-4403-8633-8d1e1b1b248a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae2db314-7ff4-460f-b597-1f330bfee00a","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b7520c4-53d0-4480-b6bc-988a15adf5b2","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fdebd2ad-cdc0-4305-8152-dd34dd2638f2","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e713a8a3-fb54-46a7-9848-4acf88a1a942","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"380032a1-f564-49dd-bbf9-04391109226e","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"85b99d1f-cbb3-48ec-9bdb-1c0c8f2d161f","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af9f51dd-77c9-4714-9cc9-f69c4b41221a","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2a05aa8d-8b2b-453b-b618-b3751e52eae7","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d869733-1346-401e-90c3-26ce45631ab2","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"52e4c85c-97cb-4ab5-9dc2-1997aa6af9ae","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bed14ed-d8ef-4e2f-9d71-6eb1ce5ddb34","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cff2981f-56c2-4d04-b56d-e3be09a68c89","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"54ed6dd8-3b46-458d-9ef9-ddb84f9b5a53","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16ae9ca2-b3ac-4381-8412-f62fe7f210ed","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6b57a76-8e15-4e08-95a1-00acfc2ed262","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"164a8aed-d9a1-4517-973b-a5ef5c079aff","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7897ba67-28c3-4c9c-bd97-6211f4a079d0","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c25a0fdd-5401-4665-a190-406d7fc58efe","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"43ab2ecd-3983-4f57-9fc8-1ccaea47fc2c","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"990fb6a9-5f10-4b9e-915c-c8b6e0364438","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"78291903-2783-4041-82d8-cc072217aca3","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"038df30f-7867-44fb-b37a-036a567daf58","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb46993b-2b1d-4fc6-8811-78656a1d129c","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"180be3f9-5423-4b36-82a2-253919c7b724","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8642eb0-3023-4113-b13b-ff8a8c11386f","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2b9f7b3-5c75-4e9c-90d7-c22ba4be3d6b","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"455ba3a1-1a6c-4908-866d-4dd8b3104bfb","path":"sprites/spr_fleet_alert/spr_fleet_alert.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2f2d209b-fa65-4288-a103-8204e39673c2","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_fleet_chaos/spr_fleet_chaos.yy b/sprites/spr_fleet_chaos/spr_fleet_chaos.yy index 16ce6be63c..730a9ecb79 100644 --- a/sprites/spr_fleet_chaos/spr_fleet_chaos.yy +++ b/sprites/spr_fleet_chaos/spr_fleet_chaos.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_chaos", "bboxMode":0, "bbox_bottom":20, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"987862b2-cdf5-4a57-9a06-c84b97e7ed9d","name":"987862b2-cdf5-4a57-9a06-c84b97e7ed9d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"61da2e01-6bda-4afb-b52b-6b1cd2d2980e","name":"61da2e01-6bda-4afb-b52b-6b1cd2d2980e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e266532a-e48d-4033-9198-983dc9aeaa12","name":"e266532a-e48d-4033-9198-983dc9aeaa12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3265f69d-3464-4951-996a-68f67b9c2d1b","name":"3265f69d-3464-4951-996a-68f67b9c2d1b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8892a8a6-b1db-4b3e-a469-4ff8f0833fa0","name":"8892a8a6-b1db-4b3e-a469-4ff8f0833fa0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"33ca7b9f-9c5f-42ae-b5c9-3b8487406633","name":"33ca7b9f-9c5f-42ae-b5c9-3b8487406633","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"80628aac-30ac-47a2-9a43-54358b1e409f","name":"80628aac-30ac-47a2-9a43-54358b1e409f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f5d632fe-d51e-4d4d-b8f7-eb2bdba1e6db","name":"f5d632fe-d51e-4d4d-b8f7-eb2bdba1e6db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c4d8fbbf-e0fd-41e2-834d-65d35bec13e8","name":"c4d8fbbf-e0fd-41e2-834d-65d35bec13e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2bf519a7-2b69-4937-a724-57ee1bee2b6e","name":"2bf519a7-2b69-4937-a724-57ee1bee2b6e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"987862b2-cdf5-4a57-9a06-c84b97e7ed9d","name":"987862b2-cdf5-4a57-9a06-c84b97e7ed9d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61da2e01-6bda-4afb-b52b-6b1cd2d2980e","name":"61da2e01-6bda-4afb-b52b-6b1cd2d2980e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e266532a-e48d-4033-9198-983dc9aeaa12","name":"e266532a-e48d-4033-9198-983dc9aeaa12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3265f69d-3464-4951-996a-68f67b9c2d1b","name":"3265f69d-3464-4951-996a-68f67b9c2d1b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8892a8a6-b1db-4b3e-a469-4ff8f0833fa0","name":"8892a8a6-b1db-4b3e-a469-4ff8f0833fa0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"33ca7b9f-9c5f-42ae-b5c9-3b8487406633","name":"33ca7b9f-9c5f-42ae-b5c9-3b8487406633","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"80628aac-30ac-47a2-9a43-54358b1e409f","name":"80628aac-30ac-47a2-9a43-54358b1e409f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f5d632fe-d51e-4d4d-b8f7-eb2bdba1e6db","name":"f5d632fe-d51e-4d4d-b8f7-eb2bdba1e6db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4d8fbbf-e0fd-41e2-834d-65d35bec13e8","name":"c4d8fbbf-e0fd-41e2-834d-65d35bec13e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2bf519a7-2b69-4937-a724-57ee1bee2b6e","name":"2bf519a7-2b69-4937-a724-57ee1bee2b6e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"987862b2-cdf5-4a57-9a06-c84b97e7ed9d","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46f28293-2d79-4fe6-b237-4ed40fde54c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61da2e01-6bda-4afb-b52b-6b1cd2d2980e","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"81d93c89-67ae-4cf0-9ad1-d86e5c05bcaf","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e266532a-e48d-4033-9198-983dc9aeaa12","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"373f910c-a495-411f-8ada-1eb09f64c89d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3265f69d-3464-4951-996a-68f67b9c2d1b","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e8d984fe-634e-4902-83bc-bd164b7f00fb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8892a8a6-b1db-4b3e-a469-4ff8f0833fa0","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"738f4e69-702b-48d6-8c35-14324d057bba","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"33ca7b9f-9c5f-42ae-b5c9-3b8487406633","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c47715b4-c38b-45f3-8145-9cc384fca54d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"80628aac-30ac-47a2-9a43-54358b1e409f","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0c8f245-188c-4a06-bb04-f588e568bfa0","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5d632fe-d51e-4d4d-b8f7-eb2bdba1e6db","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"856878f8-b182-4126-8ded-d2c9a415b2f3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4d8fbbf-e0fd-41e2-834d-65d35bec13e8","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e495674e-7f72-4e9e-9cd6-f2e58f050dd2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bf519a7-2b69-4937-a724-57ee1bee2b6e","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d334534b-9968-4419-b7c0-f093f5407545","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"987862b2-cdf5-4a57-9a06-c84b97e7ed9d","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46f28293-2d79-4fe6-b237-4ed40fde54c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61da2e01-6bda-4afb-b52b-6b1cd2d2980e","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"81d93c89-67ae-4cf0-9ad1-d86e5c05bcaf","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e266532a-e48d-4033-9198-983dc9aeaa12","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"373f910c-a495-411f-8ada-1eb09f64c89d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3265f69d-3464-4951-996a-68f67b9c2d1b","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e8d984fe-634e-4902-83bc-bd164b7f00fb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8892a8a6-b1db-4b3e-a469-4ff8f0833fa0","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"738f4e69-702b-48d6-8c35-14324d057bba","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"33ca7b9f-9c5f-42ae-b5c9-3b8487406633","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c47715b4-c38b-45f3-8145-9cc384fca54d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"80628aac-30ac-47a2-9a43-54358b1e409f","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0c8f245-188c-4a06-bb04-f588e568bfa0","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5d632fe-d51e-4d4d-b8f7-eb2bdba1e6db","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"856878f8-b182-4126-8ded-d2c9a415b2f3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4d8fbbf-e0fd-41e2-834d-65d35bec13e8","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e495674e-7f72-4e9e-9cd6-f2e58f050dd2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2bf519a7-2b69-4937-a724-57ee1bee2b6e","path":"sprites/spr_fleet_chaos/spr_fleet_chaos.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d334534b-9968-4419-b7c0-f093f5407545","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_fleet_civilian/spr_fleet_civilian.yy b/sprites/spr_fleet_civilian/spr_fleet_civilian.yy index b02151edd3..c7f8276266 100644 --- a/sprites/spr_fleet_civilian/spr_fleet_civilian.yy +++ b/sprites/spr_fleet_civilian/spr_fleet_civilian.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_civilian", "bboxMode":0, "bbox_bottom":20, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6cc7413b-e997-41a1-80ea-9bf1d94bc27a","name":"6cc7413b-e997-41a1-80ea-9bf1d94bc27a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b251f968-ec3e-41e2-a361-0447e500b762","name":"b251f968-ec3e-41e2-a361-0447e500b762","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d18d46d9-9bfe-473d-8774-cd2182e4c895","name":"d18d46d9-9bfe-473d-8774-cd2182e4c895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e9189a05-67fd-4840-8a70-f8b7c19748b0","name":"e9189a05-67fd-4840-8a70-f8b7c19748b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6cc7413b-e997-41a1-80ea-9bf1d94bc27a","name":"6cc7413b-e997-41a1-80ea-9bf1d94bc27a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b251f968-ec3e-41e2-a361-0447e500b762","name":"b251f968-ec3e-41e2-a361-0447e500b762","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d18d46d9-9bfe-473d-8774-cd2182e4c895","name":"d18d46d9-9bfe-473d-8774-cd2182e4c895","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9189a05-67fd-4840-8a70-f8b7c19748b0","name":"e9189a05-67fd-4840-8a70-f8b7c19748b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cc7413b-e997-41a1-80ea-9bf1d94bc27a","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8bc6e585-d6ed-418b-9fbb-6cc8e6d4132d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b251f968-ec3e-41e2-a361-0447e500b762","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16bf733e-060b-4c84-810f-43f99f54487d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d18d46d9-9bfe-473d-8774-cd2182e4c895","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9238b428-2d61-45a2-9fb1-5bbffbb1fec7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9189a05-67fd-4840-8a70-f8b7c19748b0","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9c62ff3a-b746-4928-ab52-9f9787ba8f77","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cc7413b-e997-41a1-80ea-9bf1d94bc27a","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8bc6e585-d6ed-418b-9fbb-6cc8e6d4132d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b251f968-ec3e-41e2-a361-0447e500b762","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16bf733e-060b-4c84-810f-43f99f54487d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d18d46d9-9bfe-473d-8774-cd2182e4c895","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9238b428-2d61-45a2-9fb1-5bbffbb1fec7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9189a05-67fd-4840-8a70-f8b7c19748b0","path":"sprites/spr_fleet_civilian/spr_fleet_civilian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9c62ff3a-b746-4928-ab52-9f9787ba8f77","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_fleet_eldar/spr_fleet_eldar.yy b/sprites/spr_fleet_eldar/spr_fleet_eldar.yy index d32aea41c8..433357957d 100644 --- a/sprites/spr_fleet_eldar/spr_fleet_eldar.yy +++ b/sprites/spr_fleet_eldar/spr_fleet_eldar.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_eldar", "bboxMode":0, "bbox_bottom":19, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"368992a1-ac68-4259-81ba-06e750f8b4db","name":"368992a1-ac68-4259-81ba-06e750f8b4db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5763d425-3fc4-42f6-a71e-92566cf717dc","name":"5763d425-3fc4-42f6-a71e-92566cf717dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"11bb694a-8030-4caf-9546-1b54d0afebde","name":"11bb694a-8030-4caf-9546-1b54d0afebde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a4f48654-f67c-47a8-a423-98d3df6ebc68","name":"a4f48654-f67c-47a8-a423-98d3df6ebc68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"19ab2b18-39f1-4b70-9c10-b72bd726ce5b","name":"19ab2b18-39f1-4b70-9c10-b72bd726ce5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"beacacea-0909-441b-ac0c-db594bb0be14","name":"beacacea-0909-441b-ac0c-db594bb0be14","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"368992a1-ac68-4259-81ba-06e750f8b4db","name":"368992a1-ac68-4259-81ba-06e750f8b4db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5763d425-3fc4-42f6-a71e-92566cf717dc","name":"5763d425-3fc4-42f6-a71e-92566cf717dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"11bb694a-8030-4caf-9546-1b54d0afebde","name":"11bb694a-8030-4caf-9546-1b54d0afebde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a4f48654-f67c-47a8-a423-98d3df6ebc68","name":"a4f48654-f67c-47a8-a423-98d3df6ebc68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"19ab2b18-39f1-4b70-9c10-b72bd726ce5b","name":"19ab2b18-39f1-4b70-9c10-b72bd726ce5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"beacacea-0909-441b-ac0c-db594bb0be14","name":"beacacea-0909-441b-ac0c-db594bb0be14","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"368992a1-ac68-4259-81ba-06e750f8b4db","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"10a985b8-002c-4bf6-b9b2-b0e898422970","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5763d425-3fc4-42f6-a71e-92566cf717dc","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21f1d001-d744-4a6b-95a7-2ded391437e0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"11bb694a-8030-4caf-9546-1b54d0afebde","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"759a4d6a-a3a6-46a8-b605-f17aec42061a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4f48654-f67c-47a8-a423-98d3df6ebc68","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fff703a1-f607-4b81-85f0-b21a6749daa0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"19ab2b18-39f1-4b70-9c10-b72bd726ce5b","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f072f03b-0c53-4533-81fe-c72602a84056","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"beacacea-0909-441b-ac0c-db594bb0be14","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a3e376f-c503-4786-b5ff-7e30e266fdef","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"368992a1-ac68-4259-81ba-06e750f8b4db","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"10a985b8-002c-4bf6-b9b2-b0e898422970","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5763d425-3fc4-42f6-a71e-92566cf717dc","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21f1d001-d744-4a6b-95a7-2ded391437e0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"11bb694a-8030-4caf-9546-1b54d0afebde","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"759a4d6a-a3a6-46a8-b605-f17aec42061a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4f48654-f67c-47a8-a423-98d3df6ebc68","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fff703a1-f607-4b81-85f0-b21a6749daa0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"19ab2b18-39f1-4b70-9c10-b72bd726ce5b","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f072f03b-0c53-4533-81fe-c72602a84056","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"beacacea-0909-441b-ac0c-db594bb0be14","path":"sprites/spr_fleet_eldar/spr_fleet_eldar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a3e376f-c503-4786-b5ff-7e30e266fdef","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_fleet_imperial/spr_fleet_imperial.yy b/sprites/spr_fleet_imperial/spr_fleet_imperial.yy index 4a0ff9c371..bd2735723c 100644 --- a/sprites/spr_fleet_imperial/spr_fleet_imperial.yy +++ b/sprites/spr_fleet_imperial/spr_fleet_imperial.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_imperial", "bboxMode":0, "bbox_bottom":20, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7c517f52-18b0-4ce3-907a-266b27998f5e","name":"7c517f52-18b0-4ce3-907a-266b27998f5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83e2105e-06f4-433a-b155-899860422247","name":"83e2105e-06f4-433a-b155-899860422247","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"948a2eb0-29bf-4b0d-8710-2641375e304c","name":"948a2eb0-29bf-4b0d-8710-2641375e304c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7c517f52-18b0-4ce3-907a-266b27998f5e","name":"7c517f52-18b0-4ce3-907a-266b27998f5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83e2105e-06f4-433a-b155-899860422247","name":"83e2105e-06f4-433a-b155-899860422247","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"948a2eb0-29bf-4b0d-8710-2641375e304c","name":"948a2eb0-29bf-4b0d-8710-2641375e304c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2227933-b8bc-4bf6-9d8e-524410250dc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1746812c-c63b-415d-b459-f12dc9208349","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"edc14729-eece-4ed2-8dfc-a5f8c7dfe38b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c517f52-18b0-4ce3-907a-266b27998f5e","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"da9e9585-4af5-4c8f-bf1e-b0865913f48c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e924ab6f-120a-498b-80ba-78f1ec0f34fe","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83e2105e-06f4-433a-b155-899860422247","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e7f9699-c511-43fb-b4aa-f01b6cb66560","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cfe88df-f523-462d-bcf6-20f2367cf625","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"948a2eb0-29bf-4b0d-8710-2641375e304c","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e41b6128-03e4-490c-be0e-4c177c1dcfaa","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38bd26a6-a925-4d86-8cc1-91d1fa137e25","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"212d7172-82b2-47e9-95c1-fb55d943413e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ed3ac9a-c1a3-4966-8c07-799101e9fca6","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2227933-b8bc-4bf6-9d8e-524410250dc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdb72c37-035a-45e6-9261-6bb7235b36d0","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1746812c-c63b-415d-b459-f12dc9208349","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70d4f7d-d6e5-4417-a451-df64b6cc0dfc","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"edc14729-eece-4ed2-8dfc-a5f8c7dfe38b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7c517f52-18b0-4ce3-907a-266b27998f5e","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"da9e9585-4af5-4c8f-bf1e-b0865913f48c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e369ca2-e39c-4f3a-95cf-1f7ece113915","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e924ab6f-120a-498b-80ba-78f1ec0f34fe","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83e2105e-06f4-433a-b155-899860422247","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e7f9699-c511-43fb-b4aa-f01b6cb66560","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b33f482-c952-4a96-ae8e-fc3c743bb25f","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cfe88df-f523-462d-bcf6-20f2367cf625","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"948a2eb0-29bf-4b0d-8710-2641375e304c","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e41b6128-03e4-490c-be0e-4c177c1dcfaa","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c527feba-1ebf-430b-bcce-57c3998dd2ba","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38bd26a6-a925-4d86-8cc1-91d1fa137e25","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a21b19b-398c-43ca-98e1-b7cbeafd021a","path":"sprites/spr_fleet_imperial/spr_fleet_imperial.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"212d7172-82b2-47e9-95c1-fb55d943413e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy b/sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy index f77c68a02d..1982cd9ff2 100644 --- a/sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy +++ b/sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_inquisition", "bboxMode":0, "bbox_bottom":14, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"92019af0-cd11-4fd1-a771-9349389afadf","name":"92019af0-cd11-4fd1-a771-9349389afadf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"49595a43-1634-487e-b0b0-fce6c652401d","name":"49595a43-1634-487e-b0b0-fce6c652401d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d7e6cf88-0f06-4f6f-a8b1-03d510627901","name":"d7e6cf88-0f06-4f6f-a8b1-03d510627901","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92019af0-cd11-4fd1-a771-9349389afadf","name":"92019af0-cd11-4fd1-a771-9349389afadf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"49595a43-1634-487e-b0b0-fce6c652401d","name":"49595a43-1634-487e-b0b0-fce6c652401d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d7e6cf88-0f06-4f6f-a8b1-03d510627901","name":"d7e6cf88-0f06-4f6f-a8b1-03d510627901","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92019af0-cd11-4fd1-a771-9349389afadf","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d1a6ee6e-e331-44c5-85e3-374e6df5a48f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"49595a43-1634-487e-b0b0-fce6c652401d","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1b8571ff-c45f-4144-95b8-bd2e724dcb52","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7e6cf88-0f06-4f6f-a8b1-03d510627901","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7dcabe8c-e56b-40a7-a72c-ed6b3c6099d2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92019af0-cd11-4fd1-a771-9349389afadf","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d1a6ee6e-e331-44c5-85e3-374e6df5a48f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"49595a43-1634-487e-b0b0-fce6c652401d","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1b8571ff-c45f-4144-95b8-bd2e724dcb52","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7e6cf88-0f06-4f6f-a8b1-03d510627901","path":"sprites/spr_fleet_inquisition/spr_fleet_inquisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7dcabe8c-e56b-40a7-a72c-ed6b3c6099d2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy b/sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy index ecd7b874c2..4d232c696e 100644 --- a/sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy +++ b/sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_mechanicus", "bboxMode":0, "bbox_bottom":15, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ec075b4d-97b8-47b8-8a7f-5b2ec142ac61","name":"ec075b4d-97b8-47b8-8a7f-5b2ec142ac61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec075b4d-97b8-47b8-8a7f-5b2ec142ac61","name":"ec075b4d-97b8-47b8-8a7f-5b2ec142ac61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec075b4d-97b8-47b8-8a7f-5b2ec142ac61","path":"sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"758c2ed2-dbe8-403f-85bc-60e54b5cd9dc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec075b4d-97b8-47b8-8a7f-5b2ec142ac61","path":"sprites/spr_fleet_mechanicus/spr_fleet_mechanicus.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"758c2ed2-dbe8-403f-85bc-60e54b5cd9dc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_fleet_necron/spr_fleet_necron.yy b/sprites/spr_fleet_necron/spr_fleet_necron.yy index e599309694..b6147162a9 100644 --- a/sprites/spr_fleet_necron/spr_fleet_necron.yy +++ b/sprites/spr_fleet_necron/spr_fleet_necron.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_necron", "bboxMode":0, "bbox_bottom":21, @@ -12,15 +12,15 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7bca54aa-9126-4cb1-bfaf-fb4dc27c20f7","name":"7bca54aa-9126-4cb1-bfaf-fb4dc27c20f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c1fefcfe-ffe3-4ab7-8983-726bcbfe49f8","name":"c1fefcfe-ffe3-4ab7-8983-726bcbfe49f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"55123e8c-8dc3-4e03-835c-cecdd19910a1","name":"55123e8c-8dc3-4e03-835c-cecdd19910a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"12d78257-948b-4e4e-a3c5-3274e1470a06","name":"12d78257-948b-4e4e-a3c5-3274e1470a06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e04f6290-1b5d-4e6b-bc7f-1df53e022f99","name":"e04f6290-1b5d-4e6b-bc7f-1df53e022f99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a3875805-121c-458b-8790-8b3798976a94","name":"a3875805-121c-458b-8790-8b3798976a94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"981f81fe-69dc-4d16-b298-7e604b67d975","name":"981f81fe-69dc-4d16-b298-7e604b67d975","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"27ab43a2-1742-40b7-85bb-00ea316f8853","name":"27ab43a2-1742-40b7-85bb-00ea316f8853","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fae4629c-6732-4029-8e33-8f8ade262473","name":"fae4629c-6732-4029-8e33-8f8ade262473","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7bca54aa-9126-4cb1-bfaf-fb4dc27c20f7","name":"7bca54aa-9126-4cb1-bfaf-fb4dc27c20f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c1fefcfe-ffe3-4ab7-8983-726bcbfe49f8","name":"c1fefcfe-ffe3-4ab7-8983-726bcbfe49f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"55123e8c-8dc3-4e03-835c-cecdd19910a1","name":"55123e8c-8dc3-4e03-835c-cecdd19910a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"12d78257-948b-4e4e-a3c5-3274e1470a06","name":"12d78257-948b-4e4e-a3c5-3274e1470a06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e04f6290-1b5d-4e6b-bc7f-1df53e022f99","name":"e04f6290-1b5d-4e6b-bc7f-1df53e022f99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a3875805-121c-458b-8790-8b3798976a94","name":"a3875805-121c-458b-8790-8b3798976a94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"981f81fe-69dc-4d16-b298-7e604b67d975","name":"981f81fe-69dc-4d16-b298-7e604b67d975","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"27ab43a2-1742-40b7-85bb-00ea316f8853","name":"27ab43a2-1742-40b7-85bb-00ea316f8853","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fae4629c-6732-4029-8e33-8f8ade262473","name":"fae4629c-6732-4029-8e33-8f8ade262473","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -76,33 +76,15 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7bca54aa-9126-4cb1-bfaf-fb4dc27c20f7","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c53a9c8b-e405-4375-a26d-333ff1ee9885","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1fefcfe-ffe3-4ab7-8983-726bcbfe49f8","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc446df6-18f0-4424-b0c4-bc121b3912d1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"55123e8c-8dc3-4e03-835c-cecdd19910a1","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1e41c2b1-3401-4355-899a-799f973fc94c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"12d78257-948b-4e4e-a3c5-3274e1470a06","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8738c31-dff4-479e-a621-cc9b6b92ab5f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e04f6290-1b5d-4e6b-bc7f-1df53e022f99","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"80bc09f8-1b80-4d45-80f1-d9c696519868","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3875805-121c-458b-8790-8b3798976a94","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc5705e1-b55f-4a26-b422-688b5da3abd2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"981f81fe-69dc-4d16-b298-7e604b67d975","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64e8bc4e-10cf-4213-838c-cec6dc7b981d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"27ab43a2-1742-40b7-85bb-00ea316f8853","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"29b29106-6a2b-4e17-84d7-0dc589e0dcc9","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fae4629c-6732-4029-8e33-8f8ade262473","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e57f3f58-288a-45e4-bc21-d612ca745ad2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7bca54aa-9126-4cb1-bfaf-fb4dc27c20f7","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c53a9c8b-e405-4375-a26d-333ff1ee9885","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1fefcfe-ffe3-4ab7-8983-726bcbfe49f8","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc446df6-18f0-4424-b0c4-bc121b3912d1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"55123e8c-8dc3-4e03-835c-cecdd19910a1","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1e41c2b1-3401-4355-899a-799f973fc94c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"12d78257-948b-4e4e-a3c5-3274e1470a06","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8738c31-dff4-479e-a621-cc9b6b92ab5f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e04f6290-1b5d-4e6b-bc7f-1df53e022f99","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"80bc09f8-1b80-4d45-80f1-d9c696519868","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3875805-121c-458b-8790-8b3798976a94","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc5705e1-b55f-4a26-b422-688b5da3abd2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"981f81fe-69dc-4d16-b298-7e604b67d975","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64e8bc4e-10cf-4213-838c-cec6dc7b981d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"27ab43a2-1742-40b7-85bb-00ea316f8853","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"29b29106-6a2b-4e17-84d7-0dc589e0dcc9","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fae4629c-6732-4029-8e33-8f8ade262473","path":"sprites/spr_fleet_necron/spr_fleet_necron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e57f3f58-288a-45e4-bc21-d612ca745ad2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_fleet_ork/spr_fleet_ork.yy b/sprites/spr_fleet_ork/spr_fleet_ork.yy index 05a0b7f2a7..5468bdfa52 100644 --- a/sprites/spr_fleet_ork/spr_fleet_ork.yy +++ b/sprites/spr_fleet_ork/spr_fleet_ork.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_ork", "bboxMode":0, "bbox_bottom":20, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"af934098-f3c2-43d2-b187-dcee782ee97b","name":"af934098-f3c2-43d2-b187-dcee782ee97b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"112f84af-ae95-42da-8d8d-18dd3cbc4bdf","name":"112f84af-ae95-42da-8d8d-18dd3cbc4bdf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"97738318-6ef9-490c-a02b-9f3e648a040b","name":"97738318-6ef9-490c-a02b-9f3e648a040b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9f26a607-2436-4e52-8936-c3ce08fc99fe","name":"9f26a607-2436-4e52-8936-c3ce08fc99fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4da142fb-6fb9-4f50-af1c-587e29d4c36e","name":"4da142fb-6fb9-4f50-af1c-587e29d4c36e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"71d171c6-0460-4116-aba3-ad3b6f5f0a59","name":"71d171c6-0460-4116-aba3-ad3b6f5f0a59","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4051f9b1-936d-48f8-9d56-c671e4c0d580","name":"4051f9b1-936d-48f8-9d56-c671e4c0d580","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb64ba76-19d3-442b-9adc-d7f37139edb4","name":"fb64ba76-19d3-442b-9adc-d7f37139edb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ab9ddac-8e42-4f5c-b217-99251e829722","name":"6ab9ddac-8e42-4f5c-b217-99251e829722","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f0614b9b-e1eb-47c5-a481-31c2439271a6","name":"f0614b9b-e1eb-47c5-a481-31c2439271a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af934098-f3c2-43d2-b187-dcee782ee97b","name":"af934098-f3c2-43d2-b187-dcee782ee97b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"112f84af-ae95-42da-8d8d-18dd3cbc4bdf","name":"112f84af-ae95-42da-8d8d-18dd3cbc4bdf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"97738318-6ef9-490c-a02b-9f3e648a040b","name":"97738318-6ef9-490c-a02b-9f3e648a040b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f26a607-2436-4e52-8936-c3ce08fc99fe","name":"9f26a607-2436-4e52-8936-c3ce08fc99fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4da142fb-6fb9-4f50-af1c-587e29d4c36e","name":"4da142fb-6fb9-4f50-af1c-587e29d4c36e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"71d171c6-0460-4116-aba3-ad3b6f5f0a59","name":"71d171c6-0460-4116-aba3-ad3b6f5f0a59","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4051f9b1-936d-48f8-9d56-c671e4c0d580","name":"4051f9b1-936d-48f8-9d56-c671e4c0d580","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb64ba76-19d3-442b-9adc-d7f37139edb4","name":"fb64ba76-19d3-442b-9adc-d7f37139edb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ab9ddac-8e42-4f5c-b217-99251e829722","name":"6ab9ddac-8e42-4f5c-b217-99251e829722","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0614b9b-e1eb-47c5-a481-31c2439271a6","name":"f0614b9b-e1eb-47c5-a481-31c2439271a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,47 +72,26 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":22.0, + "seqWidth":22.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af934098-f3c2-43d2-b187-dcee782ee97b","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"67c20234-9707-42df-beac-ff0dda5b9c90","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"112f84af-ae95-42da-8d8d-18dd3cbc4bdf","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"859afc2d-3b8a-4c92-99b5-a9e260b4afa9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"97738318-6ef9-490c-a02b-9f3e648a040b","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7a9efd0-a71e-4a03-94a4-30b508ce83c3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f26a607-2436-4e52-8936-c3ce08fc99fe","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b16536ea-9fda-4393-adfa-41cf01e30dff","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4da142fb-6fb9-4f50-af1c-587e29d4c36e","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ecd3505-f84e-4413-848c-be7fe976be6b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"71d171c6-0460-4116-aba3-ad3b6f5f0a59","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed56594a-e030-488f-bec5-a202dae99407","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4051f9b1-936d-48f8-9d56-c671e4c0d580","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f69f7e34-5ec6-42bb-a21a-64a5f37514e8","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb64ba76-19d3-442b-9adc-d7f37139edb4","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d361abfb-cafd-405c-9b79-c66655dbe7ed","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ab9ddac-8e42-4f5c-b217-99251e829722","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ec537ed-9141-47b4-bd1c-8c11bafadcac","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0614b9b-e1eb-47c5-a481-31c2439271a6","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90531e4a-e9cc-4501-9a48-f0b3a50ad878","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af934098-f3c2-43d2-b187-dcee782ee97b","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67c20234-9707-42df-beac-ff0dda5b9c90","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"112f84af-ae95-42da-8d8d-18dd3cbc4bdf","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"859afc2d-3b8a-4c92-99b5-a9e260b4afa9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"97738318-6ef9-490c-a02b-9f3e648a040b","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7a9efd0-a71e-4a03-94a4-30b508ce83c3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f26a607-2436-4e52-8936-c3ce08fc99fe","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b16536ea-9fda-4393-adfa-41cf01e30dff","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4da142fb-6fb9-4f50-af1c-587e29d4c36e","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ecd3505-f84e-4413-848c-be7fe976be6b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"71d171c6-0460-4116-aba3-ad3b6f5f0a59","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed56594a-e030-488f-bec5-a202dae99407","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4051f9b1-936d-48f8-9d56-c671e4c0d580","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f69f7e34-5ec6-42bb-a21a-64a5f37514e8","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb64ba76-19d3-442b-9adc-d7f37139edb4","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d361abfb-cafd-405c-9b79-c66655dbe7ed","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ab9ddac-8e42-4f5c-b217-99251e829722","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ec537ed-9141-47b4-bd1c-8c11bafadcac","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0614b9b-e1eb-47c5-a481-31c2439271a6","path":"sprites/spr_fleet_ork/spr_fleet_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90531e4a-e9cc-4501-9a48-f0b3a50ad878","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":11, "yorigin":11, diff --git a/sprites/spr_fleet_tau/spr_fleet_tau.yy b/sprites/spr_fleet_tau/spr_fleet_tau.yy index a8c2d1d4f7..3e3b10899a 100644 --- a/sprites/spr_fleet_tau/spr_fleet_tau.yy +++ b/sprites/spr_fleet_tau/spr_fleet_tau.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_tau", "bboxMode":0, "bbox_bottom":20, @@ -12,17 +12,17 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"95d93dc5-c7db-4369-b68a-31026d5959fc","name":"95d93dc5-c7db-4369-b68a-31026d5959fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"617ee12d-133c-4e96-ba8d-93535804252d","name":"617ee12d-133c-4e96-ba8d-93535804252d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"06e6544f-caed-4f40-8705-c7108e508215","name":"06e6544f-caed-4f40-8705-c7108e508215","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a28eb7be-b330-4c6f-a971-0412e89f9546","name":"a28eb7be-b330-4c6f-a971-0412e89f9546","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95d93dc5-c7db-4369-b68a-31026d5959fc","name":"95d93dc5-c7db-4369-b68a-31026d5959fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"617ee12d-133c-4e96-ba8d-93535804252d","name":"617ee12d-133c-4e96-ba8d-93535804252d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"06e6544f-caed-4f40-8705-c7108e508215","name":"06e6544f-caed-4f40-8705-c7108e508215","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a28eb7be-b330-4c6f-a971-0412e89f9546","name":"a28eb7be-b330-4c6f-a971-0412e89f9546","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -78,39 +78,17 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1641c7b0-ba32-46a1-bdef-7751da95e1c5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95d93dc5-c7db-4369-b68a-31026d5959fc","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b1f176e9-a3cc-4a3b-94bf-ade7ddc106a3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"617ee12d-133c-4e96-ba8d-93535804252d","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1051b8c3-13b3-4b12-909d-886c3a09de27","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"06e6544f-caed-4f40-8705-c7108e508215","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"195aff74-b345-485c-8c41-640d808b3d87","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a06bc4eb-65c2-4824-b12e-4b2594e8cdc6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a5c0c0a4-63b3-43bc-8743-90cbd113bcb7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c0c4440-a668-4464-9e1c-647382b2af86","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a28eb7be-b330-4c6f-a971-0412e89f9546","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21ad7732-67d7-4445-a580-dc99939fd767","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c836550-2c0b-4ff6-bdf5-db3f343e1f8c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"621a69a7-bcaa-4299-821f-7014d3b98d91","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed6f8cbd-bba9-4119-b444-6aa8e37e6443","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdd4c365-a564-4c95-85ab-bda104c5d5e1","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1641c7b0-ba32-46a1-bdef-7751da95e1c5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95d93dc5-c7db-4369-b68a-31026d5959fc","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b1f176e9-a3cc-4a3b-94bf-ade7ddc106a3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"617ee12d-133c-4e96-ba8d-93535804252d","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1051b8c3-13b3-4b12-909d-886c3a09de27","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"06e6544f-caed-4f40-8705-c7108e508215","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"195aff74-b345-485c-8c41-640d808b3d87","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e69a52d-25e9-4c9b-89b5-80990b84fd94","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a06bc4eb-65c2-4824-b12e-4b2594e8cdc6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a9a662c-67fe-4cdf-bdbf-c87e0070a330","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a5c0c0a4-63b3-43bc-8743-90cbd113bcb7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb9a18cc-c332-4f49-86d2-1dd6b6a501ca","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c0c4440-a668-4464-9e1c-647382b2af86","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a28eb7be-b330-4c6f-a971-0412e89f9546","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21ad7732-67d7-4445-a580-dc99939fd767","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6faa2ba4-5a83-4f02-8506-0aed83da2623","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c836550-2c0b-4ff6-bdf5-db3f343e1f8c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93464d16-aa98-4c7b-83a4-f5f56f3bf632","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"621a69a7-bcaa-4299-821f-7014d3b98d91","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f6782bd-e559-446b-9cfb-76c842cac2e6","path":"sprites/spr_fleet_tau/spr_fleet_tau.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed6f8cbd-bba9-4119-b444-6aa8e37e6443","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_fleet_tiny/spr_fleet_tiny.yy b/sprites/spr_fleet_tiny/spr_fleet_tiny.yy index 0b8da40d4a..c7bcd1901c 100644 --- a/sprites/spr_fleet_tiny/spr_fleet_tiny.yy +++ b/sprites/spr_fleet_tiny/spr_fleet_tiny.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_tiny", "bboxMode":0, "bbox_bottom":20, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ca47a226-eb26-4a65-9e02-ec2499acf0a4","name":"ca47a226-eb26-4a65-9e02-ec2499acf0a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1533e9b-e4ff-4fa1-877a-9aa8b3a604e7","name":"d1533e9b-e4ff-4fa1-877a-9aa8b3a604e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"67399250-1d29-4aa9-8a9d-8a9d3d5793bf","name":"67399250-1d29-4aa9-8a9d-8a9d3d5793bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f2e5df5-4dc8-4b5b-86fc-3ef6cb6dea9b","name":"1f2e5df5-4dc8-4b5b-86fc-3ef6cb6dea9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c12986ff-6b4c-4ae7-be4b-89c627ff6fb7","name":"c12986ff-6b4c-4ae7-be4b-89c627ff6fb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8599d8c9-369b-4fe8-82e6-de49d01b80ab","name":"8599d8c9-369b-4fe8-82e6-de49d01b80ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fd1bfde9-fe9a-44a8-a2fd-1451e2d8f0da","name":"fd1bfde9-fe9a-44a8-a2fd-1451e2d8f0da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5c8cebb-5835-41d9-b6f2-16acde9af4a2","name":"d5c8cebb-5835-41d9-b6f2-16acde9af4a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4b7d3f6d-4d9b-474b-9257-9f43b214f43c","name":"4b7d3f6d-4d9b-474b-9257-9f43b214f43c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4ae26632-9db0-4a9b-9a2c-aeae2b38e12d","name":"4ae26632-9db0-4a9b-9a2c-aeae2b38e12d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca47a226-eb26-4a65-9e02-ec2499acf0a4","name":"ca47a226-eb26-4a65-9e02-ec2499acf0a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1533e9b-e4ff-4fa1-877a-9aa8b3a604e7","name":"d1533e9b-e4ff-4fa1-877a-9aa8b3a604e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67399250-1d29-4aa9-8a9d-8a9d3d5793bf","name":"67399250-1d29-4aa9-8a9d-8a9d3d5793bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f2e5df5-4dc8-4b5b-86fc-3ef6cb6dea9b","name":"1f2e5df5-4dc8-4b5b-86fc-3ef6cb6dea9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c12986ff-6b4c-4ae7-be4b-89c627ff6fb7","name":"c12986ff-6b4c-4ae7-be4b-89c627ff6fb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8599d8c9-369b-4fe8-82e6-de49d01b80ab","name":"8599d8c9-369b-4fe8-82e6-de49d01b80ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd1bfde9-fe9a-44a8-a2fd-1451e2d8f0da","name":"fd1bfde9-fe9a-44a8-a2fd-1451e2d8f0da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5c8cebb-5835-41d9-b6f2-16acde9af4a2","name":"d5c8cebb-5835-41d9-b6f2-16acde9af4a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b7d3f6d-4d9b-474b-9257-9f43b214f43c","name":"4b7d3f6d-4d9b-474b-9257-9f43b214f43c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4ae26632-9db0-4a9b-9a2c-aeae2b38e12d","name":"4ae26632-9db0-4a9b-9a2c-aeae2b38e12d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca47a226-eb26-4a65-9e02-ec2499acf0a4","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93ba9a2b-7ce0-4dae-9969-8dd31f9d5e05","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1533e9b-e4ff-4fa1-877a-9aa8b3a604e7","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6614b32-3ca4-4ad2-b473-59949e9d523e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67399250-1d29-4aa9-8a9d-8a9d3d5793bf","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce8b2924-62d4-49f3-8e69-ce8cd6aa06f9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f2e5df5-4dc8-4b5b-86fc-3ef6cb6dea9b","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c02526b5-5955-44af-a6f6-2c8e50041795","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c12986ff-6b4c-4ae7-be4b-89c627ff6fb7","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bed764f6-9eb2-4f9c-af36-1106addfda28","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8599d8c9-369b-4fe8-82e6-de49d01b80ab","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dfd5197f-4613-4ede-abe2-2402da165f6c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd1bfde9-fe9a-44a8-a2fd-1451e2d8f0da","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f83fdcd3-b144-4bd7-9bbd-cdb4b4dbe7f7","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5c8cebb-5835-41d9-b6f2-16acde9af4a2","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9cc2ee1b-d945-4a46-9985-e3051251ee4a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b7d3f6d-4d9b-474b-9257-9f43b214f43c","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"daded6b1-47b8-4749-854d-58c7121cabd4","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ae26632-9db0-4a9b-9a2c-aeae2b38e12d","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19b18c63-60ec-46ff-8577-f2d094f1bad5","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca47a226-eb26-4a65-9e02-ec2499acf0a4","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93ba9a2b-7ce0-4dae-9969-8dd31f9d5e05","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1533e9b-e4ff-4fa1-877a-9aa8b3a604e7","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6614b32-3ca4-4ad2-b473-59949e9d523e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67399250-1d29-4aa9-8a9d-8a9d3d5793bf","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce8b2924-62d4-49f3-8e69-ce8cd6aa06f9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f2e5df5-4dc8-4b5b-86fc-3ef6cb6dea9b","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c02526b5-5955-44af-a6f6-2c8e50041795","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c12986ff-6b4c-4ae7-be4b-89c627ff6fb7","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bed764f6-9eb2-4f9c-af36-1106addfda28","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8599d8c9-369b-4fe8-82e6-de49d01b80ab","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dfd5197f-4613-4ede-abe2-2402da165f6c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd1bfde9-fe9a-44a8-a2fd-1451e2d8f0da","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f83fdcd3-b144-4bd7-9bbd-cdb4b4dbe7f7","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5c8cebb-5835-41d9-b6f2-16acde9af4a2","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9cc2ee1b-d945-4a46-9985-e3051251ee4a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b7d3f6d-4d9b-474b-9257-9f43b214f43c","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"daded6b1-47b8-4749-854d-58c7121cabd4","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ae26632-9db0-4a9b-9a2c-aeae2b38e12d","path":"sprites/spr_fleet_tiny/spr_fleet_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"19b18c63-60ec-46ff-8577-f2d094f1bad5","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy b/sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy index bfec48951e..f62368c872 100644 --- a/sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy +++ b/sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fleet_tyranid", "bboxMode":0, "bbox_bottom":27, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"31d6f8b8-04c6-4717-bf25-4d12c7fb5f58","name":"31d6f8b8-04c6-4717-bf25-4d12c7fb5f58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d23b4c1b-7753-4847-8b6b-16f9db71838f","name":"d23b4c1b-7753-4847-8b6b-16f9db71838f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"916d18ce-ca97-471d-84d1-2af450e12185","name":"916d18ce-ca97-471d-84d1-2af450e12185","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c64c8440-3c79-42b3-8e16-6c29e783c55b","name":"c64c8440-3c79-42b3-8e16-6c29e783c55b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4dd63d4c-7628-49a7-b6e4-2f2fb22df3f2","name":"4dd63d4c-7628-49a7-b6e4-2f2fb22df3f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0874c050-be5e-4a23-ba02-bb54f0d816b8","name":"0874c050-be5e-4a23-ba02-bb54f0d816b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d674843-0690-4734-ae8e-d4c2a5f511fe","name":"1d674843-0690-4734-ae8e-d4c2a5f511fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"19de30ad-6b92-473a-9659-253e0181372b","name":"19de30ad-6b92-473a-9659-253e0181372b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87695c92-60dc-46b1-a7f1-d9a00dff5615","name":"87695c92-60dc-46b1-a7f1-d9a00dff5615","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fd6648f1-6f79-4074-acdc-013d536fde6b","name":"fd6648f1-6f79-4074-acdc-013d536fde6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"129a0a8c-c896-455c-8808-ddc6a9f011e9","name":"129a0a8c-c896-455c-8808-ddc6a9f011e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26cce3c8-bd6b-4863-84da-05b93a669ad7","name":"26cce3c8-bd6b-4863-84da-05b93a669ad7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31d6f8b8-04c6-4717-bf25-4d12c7fb5f58","name":"31d6f8b8-04c6-4717-bf25-4d12c7fb5f58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d23b4c1b-7753-4847-8b6b-16f9db71838f","name":"d23b4c1b-7753-4847-8b6b-16f9db71838f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"916d18ce-ca97-471d-84d1-2af450e12185","name":"916d18ce-ca97-471d-84d1-2af450e12185","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c64c8440-3c79-42b3-8e16-6c29e783c55b","name":"c64c8440-3c79-42b3-8e16-6c29e783c55b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4dd63d4c-7628-49a7-b6e4-2f2fb22df3f2","name":"4dd63d4c-7628-49a7-b6e4-2f2fb22df3f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0874c050-be5e-4a23-ba02-bb54f0d816b8","name":"0874c050-be5e-4a23-ba02-bb54f0d816b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d674843-0690-4734-ae8e-d4c2a5f511fe","name":"1d674843-0690-4734-ae8e-d4c2a5f511fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"19de30ad-6b92-473a-9659-253e0181372b","name":"19de30ad-6b92-473a-9659-253e0181372b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87695c92-60dc-46b1-a7f1-d9a00dff5615","name":"87695c92-60dc-46b1-a7f1-d9a00dff5615","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd6648f1-6f79-4074-acdc-013d536fde6b","name":"fd6648f1-6f79-4074-acdc-013d536fde6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"129a0a8c-c896-455c-8808-ddc6a9f011e9","name":"129a0a8c-c896-455c-8808-ddc6a9f011e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26cce3c8-bd6b-4863-84da-05b93a669ad7","name":"26cce3c8-bd6b-4863-84da-05b93a669ad7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,42 +79,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31d6f8b8-04c6-4717-bf25-4d12c7fb5f58","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7cd6d2f-e931-473e-9738-5e4c11076117","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d23b4c1b-7753-4847-8b6b-16f9db71838f","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4384c81-b200-4292-9216-b89244245ec6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"916d18ce-ca97-471d-84d1-2af450e12185","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"55965e6f-4c55-4ed7-8de5-988f48ca077c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c64c8440-3c79-42b3-8e16-6c29e783c55b","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16226b11-0e2a-45e1-b4b2-cf28f3ae789e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dd63d4c-7628-49a7-b6e4-2f2fb22df3f2","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb705fa2-b739-499c-a2dc-6923ab82ba3d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0874c050-be5e-4a23-ba02-bb54f0d816b8","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"401e7c8a-01b5-4698-b591-1de4591b2086","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d674843-0690-4734-ae8e-d4c2a5f511fe","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"299de8b7-0481-4a93-8893-c4364d2f6d90","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"19de30ad-6b92-473a-9659-253e0181372b","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"938fa86e-7dac-42c6-8e61-ceb64ab8de3f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87695c92-60dc-46b1-a7f1-d9a00dff5615","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8a6db97-f5a2-4626-82cd-a82f38c1fed4","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd6648f1-6f79-4074-acdc-013d536fde6b","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f91a41f7-d96c-4db3-99ca-d18b241dbb81","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"129a0a8c-c896-455c-8808-ddc6a9f011e9","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b698cfa6-6825-4815-aa71-09ae4d6ca041","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26cce3c8-bd6b-4863-84da-05b93a669ad7","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba17c42b-edf8-4b31-b958-ac28bf2f31e8","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31d6f8b8-04c6-4717-bf25-4d12c7fb5f58","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7cd6d2f-e931-473e-9738-5e4c11076117","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d23b4c1b-7753-4847-8b6b-16f9db71838f","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4384c81-b200-4292-9216-b89244245ec6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"916d18ce-ca97-471d-84d1-2af450e12185","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"55965e6f-4c55-4ed7-8de5-988f48ca077c","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c64c8440-3c79-42b3-8e16-6c29e783c55b","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16226b11-0e2a-45e1-b4b2-cf28f3ae789e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dd63d4c-7628-49a7-b6e4-2f2fb22df3f2","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb705fa2-b739-499c-a2dc-6923ab82ba3d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0874c050-be5e-4a23-ba02-bb54f0d816b8","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"401e7c8a-01b5-4698-b591-1de4591b2086","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d674843-0690-4734-ae8e-d4c2a5f511fe","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"299de8b7-0481-4a93-8893-c4364d2f6d90","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"19de30ad-6b92-473a-9659-253e0181372b","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"938fa86e-7dac-42c6-8e61-ceb64ab8de3f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87695c92-60dc-46b1-a7f1-d9a00dff5615","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8a6db97-f5a2-4626-82cd-a82f38c1fed4","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd6648f1-6f79-4074-acdc-013d536fde6b","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f91a41f7-d96c-4db3-99ca-d18b241dbb81","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"129a0a8c-c896-455c-8808-ddc6a9f011e9","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b698cfa6-6825-4815-aa71-09ae4d6ca041","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26cce3c8-bd6b-4863-84da-05b93a669ad7","path":"sprites/spr_fleet_tyranid/spr_fleet_tyranid.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba17c42b-edf8-4b31-b958-ac28bf2f31e8","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_flora_camo_texture/spr_flora_camo_texture.yy b/sprites/spr_flora_camo_texture/spr_flora_camo_texture.yy index c5085c1515..71e1d0c786 100644 --- a/sprites/spr_flora_camo_texture/spr_flora_camo_texture.yy +++ b/sprites/spr_flora_camo_texture/spr_flora_camo_texture.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_flora_camo_texture", "bboxMode":0, "bbox_bottom":72, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":true, "frames":[ - {"$GMSpriteFrame":"","%Name":"9fbe55de-2658-4efe-a910-fa61f675f9e0","name":"9fbe55de-2658-4efe-a910-fa61f675f9e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9fbe55de-2658-4efe-a910-fa61f675f9e0","name":"9fbe55de-2658-4efe-a910-fa61f675f9e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fbe55de-2658-4efe-a910-fa61f675f9e0","path":"sprites/spr_flora_camo_texture/spr_flora_camo_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09362bea-4c68-4013-b477-2be6d3bb1fa9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fbe55de-2658-4efe-a910-fa61f675f9e0","path":"sprites/spr_flora_camo_texture/spr_flora_camo_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09362bea-4c68-4013-b477-2be6d3bb1fa9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_force_icon/spr_force_icon.yy b/sprites/spr_force_icon/spr_force_icon.yy index 93ac804119..84d75bc02d 100644 --- a/sprites/spr_force_icon/spr_force_icon.yy +++ b/sprites/spr_force_icon/spr_force_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_force_icon", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"04d91957-6099-4cfb-8bba-07dd8b7ff130","name":"04d91957-6099-4cfb-8bba-07dd8b7ff130","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"04d91957-6099-4cfb-8bba-07dd8b7ff130","name":"04d91957-6099-4cfb-8bba-07dd8b7ff130","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"04d91957-6099-4cfb-8bba-07dd8b7ff130","path":"sprites/spr_force_icon/spr_force_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0cec9664-dc38-4564-ac6c-edd412b644c8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"04d91957-6099-4cfb-8bba-07dd8b7ff130","path":"sprites/spr_force_icon/spr_force_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0cec9664-dc38-4564-ac6c-edd412b644c8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_forge_holo/spr_forge_holo.yy b/sprites/spr_forge_holo/spr_forge_holo.yy index a1c5bc96a7..628c9b7fc7 100644 --- a/sprites/spr_forge_holo/spr_forge_holo.yy +++ b/sprites/spr_forge_holo/spr_forge_holo.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_forge_holo", "bboxMode":0, "bbox_bottom":138, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f41be05e-734f-47ef-9186-d8292a3f7b91","name":"f41be05e-734f-47ef-9186-d8292a3f7b91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f41be05e-734f-47ef-9186-d8292a3f7b91","name":"f41be05e-734f-47ef-9186-d8292a3f7b91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":500.0, + "seqWidth":600.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_forge_points_icon/spr_forge_points_icon.yy b/sprites/spr_forge_points_icon/spr_forge_points_icon.yy index 15c79b7e0a..2d20357965 100644 --- a/sprites/spr_forge_points_icon/spr_forge_points_icon.yy +++ b/sprites/spr_forge_points_icon/spr_forge_points_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_forge_points_icon", "bboxMode":0, "bbox_bottom":59, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"648354ec-7fc8-45f4-b6d3-bbaae98f0fa5","name":"648354ec-7fc8-45f4-b6d3-bbaae98f0fa5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"980f6eb9-4992-4562-bbae-c140a4104ce9","name":"980f6eb9-4992-4562-bbae-c140a4104ce9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"648354ec-7fc8-45f4-b6d3-bbaae98f0fa5","name":"648354ec-7fc8-45f4-b6d3-bbaae98f0fa5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"980f6eb9-4992-4562-bbae-c140a4104ce9","name":"980f6eb9-4992-4562-bbae-c140a4104ce9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"648354ec-7fc8-45f4-b6d3-bbaae98f0fa5","path":"sprites/spr_forge_points_icon/spr_forge_points_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fb46afc0-357e-44b3-8759-e74618551361","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"980f6eb9-4992-4562-bbae-c140a4104ce9","path":"sprites/spr_forge_points_icon/spr_forge_points_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f1e5cc4-df0f-4733-928b-ae386f337e97","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"648354ec-7fc8-45f4-b6d3-bbaae98f0fa5","path":"sprites/spr_forge_points_icon/spr_forge_points_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fb46afc0-357e-44b3-8759-e74618551361","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"980f6eb9-4992-4562-bbae-c140a4104ce9","path":"sprites/spr_forge_points_icon/spr_forge_points_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f1e5cc4-df0f-4733-928b-ae386f337e97","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_formation_arrow/spr_formation_arrow.yy b/sprites/spr_formation_arrow/spr_formation_arrow.yy index a11b0d0d6a..35eb75796e 100644 --- a/sprites/spr_formation_arrow/spr_formation_arrow.yy +++ b/sprites/spr_formation_arrow/spr_formation_arrow.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_formation_arrow", "bboxMode":0, "bbox_bottom":119, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d35c0b9f-0bb3-4062-bde0-3c1b51d6879f","name":"d35c0b9f-0bb3-4062-bde0-3c1b51d6879f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d35c0b9f-0bb3-4062-bde0-3c1b51d6879f","name":"d35c0b9f-0bb3-4062-bde0-3c1b51d6879f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d35c0b9f-0bb3-4062-bde0-3c1b51d6879f","path":"sprites/spr_formation_arrow/spr_formation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e6532af6-8c0d-47b6-bf0d-1d66a37d4715","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d35c0b9f-0bb3-4062-bde0-3c1b51d6879f","path":"sprites/spr_formation_arrow/spr_formation_arrow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e6532af6-8c0d-47b6-bf0d-1d66a37d4715","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_formation_bars/spr_formation_bars.yy b/sprites/spr_formation_bars/spr_formation_bars.yy index d8708e56dc..10ac1700fe 100644 --- a/sprites/spr_formation_bars/spr_formation_bars.yy +++ b/sprites/spr_formation_bars/spr_formation_bars.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_formation_bars", "bboxMode":0, "bbox_bottom":281, @@ -12,21 +12,21 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9b56c9a5-91a7-49b2-b255-baa5a867c8db","name":"9b56c9a5-91a7-49b2-b255-baa5a867c8db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9227f803-4d80-4548-9ac7-e132ba5cebdd","name":"9227f803-4d80-4548-9ac7-e132ba5cebdd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d5d96f2-551a-4624-a0b3-497691a89cb8","name":"7d5d96f2-551a-4624-a0b3-497691a89cb8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7cc61e40-6ba8-4ff6-87bf-d6ce7bf97c11","name":"7cc61e40-6ba8-4ff6-87bf-d6ce7bf97c11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c0ae5e15-f9ad-4697-b76e-f01675de6102","name":"c0ae5e15-f9ad-4697-b76e-f01675de6102","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b0ac10b9-1415-4150-bf81-f0978bef4874","name":"b0ac10b9-1415-4150-bf81-f0978bef4874","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"00aae7a4-5f57-4320-9a94-cfcd6d216924","name":"00aae7a4-5f57-4320-9a94-cfcd6d216924","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"309ea92c-752f-4ff3-a70d-b2d96a061998","name":"309ea92c-752f-4ff3-a70d-b2d96a061998","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1c971b3-a48d-42f9-9f5a-134c5d47bc7a","name":"e1c971b3-a48d-42f9-9f5a-134c5d47bc7a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f98b9d36-a40b-43c3-9ef3-7a48cbf46b57","name":"f98b9d36-a40b-43c3-9ef3-7a48cbf46b57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1e38e08-9068-4e0b-9707-6ad15b033f59","name":"b1e38e08-9068-4e0b-9707-6ad15b033f59","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"17888442-c2b9-48de-bd24-a2be76f28fbc","name":"17888442-c2b9-48de-bd24-a2be76f28fbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"46692e1c-c2a7-4828-ae89-a6af9d8bbf0f","name":"46692e1c-c2a7-4828-ae89-a6af9d8bbf0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"41192582-b37e-4da7-b4a2-1f46c1d159fc","name":"41192582-b37e-4da7-b4a2-1f46c1d159fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c6ae1886-a082-4bd0-9ff5-a4d4c496e479","name":"c6ae1886-a082-4bd0-9ff5-a4d4c496e479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b56c9a5-91a7-49b2-b255-baa5a867c8db","name":"9b56c9a5-91a7-49b2-b255-baa5a867c8db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9227f803-4d80-4548-9ac7-e132ba5cebdd","name":"9227f803-4d80-4548-9ac7-e132ba5cebdd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d5d96f2-551a-4624-a0b3-497691a89cb8","name":"7d5d96f2-551a-4624-a0b3-497691a89cb8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7cc61e40-6ba8-4ff6-87bf-d6ce7bf97c11","name":"7cc61e40-6ba8-4ff6-87bf-d6ce7bf97c11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0ae5e15-f9ad-4697-b76e-f01675de6102","name":"c0ae5e15-f9ad-4697-b76e-f01675de6102","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b0ac10b9-1415-4150-bf81-f0978bef4874","name":"b0ac10b9-1415-4150-bf81-f0978bef4874","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00aae7a4-5f57-4320-9a94-cfcd6d216924","name":"00aae7a4-5f57-4320-9a94-cfcd6d216924","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"309ea92c-752f-4ff3-a70d-b2d96a061998","name":"309ea92c-752f-4ff3-a70d-b2d96a061998","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1c971b3-a48d-42f9-9f5a-134c5d47bc7a","name":"e1c971b3-a48d-42f9-9f5a-134c5d47bc7a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f98b9d36-a40b-43c3-9ef3-7a48cbf46b57","name":"f98b9d36-a40b-43c3-9ef3-7a48cbf46b57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1e38e08-9068-4e0b-9707-6ad15b033f59","name":"b1e38e08-9068-4e0b-9707-6ad15b033f59","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"17888442-c2b9-48de-bd24-a2be76f28fbc","name":"17888442-c2b9-48de-bd24-a2be76f28fbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"46692e1c-c2a7-4828-ae89-a6af9d8bbf0f","name":"46692e1c-c2a7-4828-ae89-a6af9d8bbf0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41192582-b37e-4da7-b4a2-1f46c1d159fc","name":"41192582-b37e-4da7-b4a2-1f46c1d159fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c6ae1886-a082-4bd0-9ff5-a4d4c496e479","name":"c6ae1886-a082-4bd0-9ff5-a4d4c496e479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,51 +82,21 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b56c9a5-91a7-49b2-b255-baa5a867c8db","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46e13a28-e112-4933-8add-8b73f7768419","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9227f803-4d80-4548-9ac7-e132ba5cebdd","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9970ea10-0897-4059-a7b2-3d8e0103fa9a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5d96f2-551a-4624-a0b3-497691a89cb8","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"23c79e86-bdb6-4ce2-b417-396aeab1ca29","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cc61e40-6ba8-4ff6-87bf-d6ce7bf97c11","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"548deb30-5b96-45c3-b1c4-6c498fc763f7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0ae5e15-f9ad-4697-b76e-f01675de6102","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e4db157e-0e70-4fa4-ba33-d83926ebd4dc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0ac10b9-1415-4150-bf81-f0978bef4874","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9857969a-65b3-4d67-a576-ff2f0b569960","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00aae7a4-5f57-4320-9a94-cfcd6d216924","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"57a402b1-da6a-4bc9-b7af-293979d8f87f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"309ea92c-752f-4ff3-a70d-b2d96a061998","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e637be31-c60e-4d2c-b0f0-a3e597f1ca93","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1c971b3-a48d-42f9-9f5a-134c5d47bc7a","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aa4230a7-4ca4-4805-aeda-4b4f30031465","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f98b9d36-a40b-43c3-9ef3-7a48cbf46b57","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba040332-864d-43ee-a260-80f1b59bfe4d","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e38e08-9068-4e0b-9707-6ad15b033f59","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a94d6dae-c243-498f-829a-58d8668118e5","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"17888442-c2b9-48de-bd24-a2be76f28fbc","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4025e7ee-dccf-4f10-9f84-610d5b1de2cd","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46692e1c-c2a7-4828-ae89-a6af9d8bbf0f","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5c1b9ce4-040d-491a-93de-e00a1eca65e1","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41192582-b37e-4da7-b4a2-1f46c1d159fc","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"492d1a9e-d4b6-4971-9559-a3b1c17313fa","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c6ae1886-a082-4bd0-9ff5-a4d4c496e479","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c710c3c4-0e5d-4e70-b1f6-77b78619af6a","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b56c9a5-91a7-49b2-b255-baa5a867c8db","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46e13a28-e112-4933-8add-8b73f7768419","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9227f803-4d80-4548-9ac7-e132ba5cebdd","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9970ea10-0897-4059-a7b2-3d8e0103fa9a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5d96f2-551a-4624-a0b3-497691a89cb8","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"23c79e86-bdb6-4ce2-b417-396aeab1ca29","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cc61e40-6ba8-4ff6-87bf-d6ce7bf97c11","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"548deb30-5b96-45c3-b1c4-6c498fc763f7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0ae5e15-f9ad-4697-b76e-f01675de6102","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e4db157e-0e70-4fa4-ba33-d83926ebd4dc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0ac10b9-1415-4150-bf81-f0978bef4874","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9857969a-65b3-4d67-a576-ff2f0b569960","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00aae7a4-5f57-4320-9a94-cfcd6d216924","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"57a402b1-da6a-4bc9-b7af-293979d8f87f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"309ea92c-752f-4ff3-a70d-b2d96a061998","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e637be31-c60e-4d2c-b0f0-a3e597f1ca93","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1c971b3-a48d-42f9-9f5a-134c5d47bc7a","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aa4230a7-4ca4-4805-aeda-4b4f30031465","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f98b9d36-a40b-43c3-9ef3-7a48cbf46b57","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba040332-864d-43ee-a260-80f1b59bfe4d","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e38e08-9068-4e0b-9707-6ad15b033f59","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a94d6dae-c243-498f-829a-58d8668118e5","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"17888442-c2b9-48de-bd24-a2be76f28fbc","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4025e7ee-dccf-4f10-9f84-610d5b1de2cd","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"46692e1c-c2a7-4828-ae89-a6af9d8bbf0f","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c1b9ce4-040d-491a-93de-e00a1eca65e1","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41192582-b37e-4da7-b4a2-1f46c1d159fc","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"492d1a9e-d4b6-4971-9559-a3b1c17313fa","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c6ae1886-a082-4bd0-9ff5-a4d4c496e479","path":"sprites/spr_formation_bars/spr_formation_bars.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c710c3c4-0e5d-4e70-b1f6-77b78619af6a","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_formation_splash/spr_formation_splash.yy b/sprites/spr_formation_splash/spr_formation_splash.yy index 7240461f95..1671d331bb 100644 --- a/sprites/spr_formation_splash/spr_formation_splash.yy +++ b/sprites/spr_formation_splash/spr_formation_splash.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_formation_splash", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dfe1df56-5cb7-4f21-8b3c-5f2546c5bd79","name":"dfe1df56-5cb7-4f21-8b3c-5f2546c5bd79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfe1df56-5cb7-4f21-8b3c-5f2546c5bd79","name":"dfe1df56-5cb7-4f21-8b3c-5f2546c5bd79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfe1df56-5cb7-4f21-8b3c-5f2546c5bd79","path":"sprites/spr_formation_splash/spr_formation_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe3908e1-758d-486a-9f5d-307c11617dd5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfe1df56-5cb7-4f21-8b3c-5f2546c5bd79","path":"sprites/spr_formation_splash/spr_formation_splash.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe3908e1-758d-486a-9f5d-307c11617dd5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_fur_tabbard/spr_fur_tabbard.yy b/sprites/spr_fur_tabbard/spr_fur_tabbard.yy index 15c2fe08fd..2421a63efe 100644 --- a/sprites/spr_fur_tabbard/spr_fur_tabbard.yy +++ b/sprites/spr_fur_tabbard/spr_fur_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fur_tabbard", "bboxMode":0, "bbox_bottom":198, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b16cbfdf-6975-4b61-a593-9fd9b73e8a9a","name":"b16cbfdf-6975-4b61-a593-9fd9b73e8a9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b16cbfdf-6975-4b61-a593-9fd9b73e8a9a","name":"b16cbfdf-6975-4b61-a593-9fd9b73e8a9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b16cbfdf-6975-4b61-a593-9fd9b73e8a9a","path":"sprites/spr_fur_tabbard/spr_fur_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90a6bf62-015f-4b4a-b64b-dc368cae7708","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b16cbfdf-6975-4b61-a593-9fd9b73e8a9a","path":"sprites/spr_fur_tabbard/spr_fur_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90a6bf62-015f-4b4a-b64b-dc368cae7708","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_fur_tail_topknot/778eed9c-61df-4cb3-b13d-b1945275af2a.png b/sprites/spr_fur_tail_topknot/778eed9c-61df-4cb3-b13d-b1945275af2a.png index f88531158e..c08285b0ce 100644 Binary files a/sprites/spr_fur_tail_topknot/778eed9c-61df-4cb3-b13d-b1945275af2a.png and b/sprites/spr_fur_tail_topknot/778eed9c-61df-4cb3-b13d-b1945275af2a.png differ diff --git a/sprites/spr_fur_tail_topknot/layers/778eed9c-61df-4cb3-b13d-b1945275af2a/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png b/sprites/spr_fur_tail_topknot/layers/778eed9c-61df-4cb3-b13d-b1945275af2a/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png index f88531158e..ce74a3d422 100644 Binary files a/sprites/spr_fur_tail_topknot/layers/778eed9c-61df-4cb3-b13d-b1945275af2a/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png and b/sprites/spr_fur_tail_topknot/layers/778eed9c-61df-4cb3-b13d-b1945275af2a/bec54e42-2d69-41b0-a1d3-e3624a334ed8.png differ diff --git a/sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy b/sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy index 0ea79e04d8..758ea015b3 100644 --- a/sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy +++ b/sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_fur_tail_topknot", "bboxMode":0, "bbox_bottom":64, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"778eed9c-61df-4cb3-b13d-b1945275af2a","name":"778eed9c-61df-4cb3-b13d-b1945275af2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"778eed9c-61df-4cb3-b13d-b1945275af2a","name":"778eed9c-61df-4cb3-b13d-b1945275af2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_gear_apoth/spr_gear_apoth.yy b/sprites/spr_gear_apoth/spr_gear_apoth.yy index 21d8214252..707bf0d30c 100644 --- a/sprites/spr_gear_apoth/spr_gear_apoth.yy +++ b/sprites/spr_gear_apoth/spr_gear_apoth.yy @@ -1,8 +1,8 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_apoth", "bboxMode":0, - "bbox_bottom":44, + "bbox_bottom":41, "bbox_left":33, "bbox_right":129, "bbox_top":5, @@ -12,8 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -50,7 +49,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":2.0, + "length":1.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -64,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -72,9 +73,6 @@ {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbe2c10c-ddf0-458e-99ee-c3b5fba778d6","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"e2ad6063-a438-4759-a551-f4aee6d0c709","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c69fd9c-422a-4d42-863d-68657eb7a00a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_gear_apoth/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png b/sprites/spr_gear_apoth_eye/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png similarity index 73% rename from sprites/spr_gear_apoth/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png rename to sprites/spr_gear_apoth_eye/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png index 5d49b59102..5edd5e96aa 100644 Binary files a/sprites/spr_gear_apoth/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png and b/sprites/spr_gear_apoth_eye/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe.png differ diff --git a/sprites/spr_gear_apoth/layers/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe/db192a8c-3604-4553-bea9-59dc5e18b44c.png b/sprites/spr_gear_apoth_eye/layers/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe/db192a8c-3604-4553-bea9-59dc5e18b44c.png similarity index 100% rename from sprites/spr_gear_apoth/layers/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe/db192a8c-3604-4553-bea9-59dc5e18b44c.png rename to sprites/spr_gear_apoth_eye/layers/3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe/db192a8c-3604-4553-bea9-59dc5e18b44c.png diff --git a/sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy b/sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy new file mode 100644 index 0000000000..87391fe031 --- /dev/null +++ b/sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_gear_apoth_eye", + "bboxMode":0, + "bbox_bottom":44, + "bbox_left":85, + "bbox_right":97, + "bbox_top":32, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"db192a8c-3604-4553-bea9-59dc5e18b44c","blendMode":0,"displayName":"default","isLocked":false,"name":"db192a8c-3604-4553-bea9-59dc5e18b44c","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_gear_apoth_eye", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"decorations", + "path":"folders/Sprites/Marine Viewer/decorations.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_gear_apoth_eye", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_gear_apoth_eye", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ef63e36-9f97-4c93-a6b9-d09b80fd1fbe","path":"sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0c69fd9c-422a-4d42-863d-68657eb7a00a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":11, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_gear_chap/spr_gear_chap.yy b/sprites/spr_gear_chap/spr_gear_chap.yy index d6e2b900ff..3d25dbfc95 100644 --- a/sprites/spr_gear_chap/spr_gear_chap.yy +++ b/sprites/spr_gear_chap/spr_gear_chap.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_chap", "bboxMode":0, "bbox_bottom":52, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3ba98c10-77a8-4509-9736-86dc8724af44","name":"3ba98c10-77a8-4509-9736-86dc8724af44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7df15531-3e45-4a1a-b9c6-7c22dd26e063","name":"7df15531-3e45-4a1a-b9c6-7c22dd26e063","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f2cca646-5608-4f41-b755-792cce5db843","name":"f2cca646-5608-4f41-b755-792cce5db843","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0f550793-95a9-4d27-912e-f2f416090144","name":"0f550793-95a9-4d27-912e-f2f416090144","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ba98c10-77a8-4509-9736-86dc8724af44","name":"3ba98c10-77a8-4509-9736-86dc8724af44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7df15531-3e45-4a1a-b9c6-7c22dd26e063","name":"7df15531-3e45-4a1a-b9c6-7c22dd26e063","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2cca646-5608-4f41-b755-792cce5db843","name":"f2cca646-5608-4f41-b755-792cce5db843","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0f550793-95a9-4d27-912e-f2f416090144","name":"0f550793-95a9-4d27-912e-f2f416090144","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ba98c10-77a8-4509-9736-86dc8724af44","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"55ab5775-15c5-4857-82b8-ce4eb3b56137","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7df15531-3e45-4a1a-b9c6-7c22dd26e063","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c04ded57-a614-480d-b6fe-cb01f7cbc567","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2cca646-5608-4f41-b755-792cce5db843","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"71bed354-bfe8-499f-b239-0d52d9fcc7b9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f550793-95a9-4d27-912e-f2f416090144","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05190b39-b803-4f5b-9dda-2cfe5d75069d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ba98c10-77a8-4509-9736-86dc8724af44","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"55ab5775-15c5-4857-82b8-ce4eb3b56137","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7df15531-3e45-4a1a-b9c6-7c22dd26e063","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c04ded57-a614-480d-b6fe-cb01f7cbc567","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2cca646-5608-4f41-b755-792cce5db843","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"71bed354-bfe8-499f-b239-0d52d9fcc7b9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f550793-95a9-4d27-912e-f2f416090144","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05190b39-b803-4f5b-9dda-2cfe5d75069d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_gear_combat_shield/350bde68-1664-48e8-97c4-7cff3c59b4ae.png b/sprites/spr_gear_combat_shield/350bde68-1664-48e8-97c4-7cff3c59b4ae.png index cfd6c0fa37..5573062f6e 100644 Binary files a/sprites/spr_gear_combat_shield/350bde68-1664-48e8-97c4-7cff3c59b4ae.png and b/sprites/spr_gear_combat_shield/350bde68-1664-48e8-97c4-7cff3c59b4ae.png differ diff --git a/sprites/spr_gear_combat_shield/587d63a4-32c8-4617-9c28-59a8a099c2c1.png b/sprites/spr_gear_combat_shield/587d63a4-32c8-4617-9c28-59a8a099c2c1.png index c38d46e2bc..a28266c3d8 100644 Binary files a/sprites/spr_gear_combat_shield/587d63a4-32c8-4617-9c28-59a8a099c2c1.png and b/sprites/spr_gear_combat_shield/587d63a4-32c8-4617-9c28-59a8a099c2c1.png differ diff --git a/sprites/spr_gear_combat_shield/layers/350bde68-1664-48e8-97c4-7cff3c59b4ae/5cc2322f-a426-43f4-bc78-5cc25edf9210.png b/sprites/spr_gear_combat_shield/layers/350bde68-1664-48e8-97c4-7cff3c59b4ae/5cc2322f-a426-43f4-bc78-5cc25edf9210.png index cfd6c0fa37..5573062f6e 100644 Binary files a/sprites/spr_gear_combat_shield/layers/350bde68-1664-48e8-97c4-7cff3c59b4ae/5cc2322f-a426-43f4-bc78-5cc25edf9210.png and b/sprites/spr_gear_combat_shield/layers/350bde68-1664-48e8-97c4-7cff3c59b4ae/5cc2322f-a426-43f4-bc78-5cc25edf9210.png differ diff --git a/sprites/spr_gear_combat_shield/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png b/sprites/spr_gear_combat_shield/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png index ddbb04419c..a28266c3d8 100644 Binary files a/sprites/spr_gear_combat_shield/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png and b/sprites/spr_gear_combat_shield/layers/587d63a4-32c8-4617-9c28-59a8a099c2c1/5cc2322f-a426-43f4-bc78-5cc25edf9210.png differ diff --git a/sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy b/sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy index 9dd88bb4ea..c6dbba13d5 100644 --- a/sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy +++ b/sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_combat_shield", "bboxMode":0, "bbox_bottom":231, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","name":"587d63a4-32c8-4617-9c28-59a8a099c2c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_gear_halo/spr_gear_halo.yy b/sprites/spr_gear_halo/spr_gear_halo.yy index 1bece29be7..cba13d749c 100644 --- a/sprites/spr_gear_halo/spr_gear_halo.yy +++ b/sprites/spr_gear_halo/spr_gear_halo.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_halo", "bboxMode":0, "bbox_bottom":79, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ec7f27b6-14d0-4152-8f63-a4b2a02f46e3","name":"ec7f27b6-14d0-4152-8f63-a4b2a02f46e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6f8705cc-25c0-45f8-b522-813a85727411","name":"6f8705cc-25c0-45f8-b522-813a85727411","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72cb9da8-1d01-444f-8f96-d79921e95bb7","name":"72cb9da8-1d01-444f-8f96-d79921e95bb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"33022205-50ff-4396-96a1-1f77edceb66f","name":"33022205-50ff-4396-96a1-1f77edceb66f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec7f27b6-14d0-4152-8f63-a4b2a02f46e3","name":"ec7f27b6-14d0-4152-8f63-a4b2a02f46e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f8705cc-25c0-45f8-b522-813a85727411","name":"6f8705cc-25c0-45f8-b522-813a85727411","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72cb9da8-1d01-444f-8f96-d79921e95bb7","name":"72cb9da8-1d01-444f-8f96-d79921e95bb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"33022205-50ff-4396-96a1-1f77edceb66f","name":"33022205-50ff-4396-96a1-1f77edceb66f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -66,6 +66,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_gear_hood1/spr_gear_hood1.yy b/sprites/spr_gear_hood1/spr_gear_hood1.yy index 2da3fe6c6e..c2a3541062 100644 --- a/sprites/spr_gear_hood1/spr_gear_hood1.yy +++ b/sprites/spr_gear_hood1/spr_gear_hood1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_hood1", "bboxMode":0, "bbox_bottom":205, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2ea12e25-957f-42bb-9ee5-db2b5154edfe","name":"2ea12e25-957f-42bb-9ee5-db2b5154edfe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f15a50a7-d3f9-4703-abd1-943834a03ee6","name":"f15a50a7-d3f9-4703-abd1-943834a03ee6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3685e3ab-54b0-4cd2-b7d5-5782dbc4e702","name":"3685e3ab-54b0-4cd2-b7d5-5782dbc4e702","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d075042d-241e-45ec-b149-27f1e9c791f1","name":"d075042d-241e-45ec-b149-27f1e9c791f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0dd99c6e-f383-4ae0-9e7e-f86f0f730aea","name":"0dd99c6e-f383-4ae0-9e7e-f86f0f730aea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ec10ad9e-31db-4707-888c-2b59e46d7ce4","name":"ec10ad9e-31db-4707-888c-2b59e46d7ce4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"614e4978-3c1a-4a2b-8754-be5fcd28166c","name":"614e4978-3c1a-4a2b-8754-be5fcd28166c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d8e03add-e965-4a6e-a6db-0ef5cd9a0b49","name":"d8e03add-e965-4a6e-a6db-0ef5cd9a0b49","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ac2fe32-40b4-49ec-bda4-35080c01f8f7","name":"3ac2fe32-40b4-49ec-bda4-35080c01f8f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd270acb-7372-43f8-b94a-0e463be5c2a0","name":"cd270acb-7372-43f8-b94a-0e463be5c2a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"82a51724-0c4e-4d0e-b911-2748b2195c11","name":"82a51724-0c4e-4d0e-b911-2748b2195c11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a8051d6-87a9-4dd0-8c6c-8ef0697b0083","name":"3a8051d6-87a9-4dd0-8c6c-8ef0697b0083","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2ea12e25-957f-42bb-9ee5-db2b5154edfe","name":"2ea12e25-957f-42bb-9ee5-db2b5154edfe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f15a50a7-d3f9-4703-abd1-943834a03ee6","name":"f15a50a7-d3f9-4703-abd1-943834a03ee6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3685e3ab-54b0-4cd2-b7d5-5782dbc4e702","name":"3685e3ab-54b0-4cd2-b7d5-5782dbc4e702","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d075042d-241e-45ec-b149-27f1e9c791f1","name":"d075042d-241e-45ec-b149-27f1e9c791f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0dd99c6e-f383-4ae0-9e7e-f86f0f730aea","name":"0dd99c6e-f383-4ae0-9e7e-f86f0f730aea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec10ad9e-31db-4707-888c-2b59e46d7ce4","name":"ec10ad9e-31db-4707-888c-2b59e46d7ce4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"614e4978-3c1a-4a2b-8754-be5fcd28166c","name":"614e4978-3c1a-4a2b-8754-be5fcd28166c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d8e03add-e965-4a6e-a6db-0ef5cd9a0b49","name":"d8e03add-e965-4a6e-a6db-0ef5cd9a0b49","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ac2fe32-40b4-49ec-bda4-35080c01f8f7","name":"3ac2fe32-40b4-49ec-bda4-35080c01f8f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd270acb-7372-43f8-b94a-0e463be5c2a0","name":"cd270acb-7372-43f8-b94a-0e463be5c2a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82a51724-0c4e-4d0e-b911-2748b2195c11","name":"82a51724-0c4e-4d0e-b911-2748b2195c11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a8051d6-87a9-4dd0-8c6c-8ef0697b0083","name":"3a8051d6-87a9-4dd0-8c6c-8ef0697b0083","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,42 +81,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ea12e25-957f-42bb-9ee5-db2b5154edfe","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7e638c1-3263-4848-a7d4-38720fec02fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f15a50a7-d3f9-4703-abd1-943834a03ee6","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8239526-bc0c-4d66-a314-912e4cecdc5c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3685e3ab-54b0-4cd2-b7d5-5782dbc4e702","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0af985c0-34a6-41d1-afc5-ed65eb09cab3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d075042d-241e-45ec-b149-27f1e9c791f1","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d59c58f0-01a2-47d6-b2f6-ba6603028e41","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0dd99c6e-f383-4ae0-9e7e-f86f0f730aea","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8ce178ea-6dca-4a19-86f7-16e8c1a5a0fa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec10ad9e-31db-4707-888c-2b59e46d7ce4","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"63dde102-1279-4c04-a829-c8dd453d3e92","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"614e4978-3c1a-4a2b-8754-be5fcd28166c","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9dc83925-f071-463c-841a-5829c30e3d68","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8e03add-e965-4a6e-a6db-0ef5cd9a0b49","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05075f29-cf4e-4f43-9a83-f2af6be00517","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ac2fe32-40b4-49ec-bda4-35080c01f8f7","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"57a7a392-e649-4414-9c21-2af904a4673b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd270acb-7372-43f8-b94a-0e463be5c2a0","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c47dc30-17eb-48c0-ba8f-26390675c8b1","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82a51724-0c4e-4d0e-b911-2748b2195c11","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8aae6c0-9584-4fb4-af75-82fbee8bf42c","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a8051d6-87a9-4dd0-8c6c-8ef0697b0083","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c6b6a99-647e-4bd1-96ab-f313a64b8e19","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ea12e25-957f-42bb-9ee5-db2b5154edfe","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7e638c1-3263-4848-a7d4-38720fec02fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f15a50a7-d3f9-4703-abd1-943834a03ee6","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8239526-bc0c-4d66-a314-912e4cecdc5c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3685e3ab-54b0-4cd2-b7d5-5782dbc4e702","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0af985c0-34a6-41d1-afc5-ed65eb09cab3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d075042d-241e-45ec-b149-27f1e9c791f1","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d59c58f0-01a2-47d6-b2f6-ba6603028e41","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0dd99c6e-f383-4ae0-9e7e-f86f0f730aea","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8ce178ea-6dca-4a19-86f7-16e8c1a5a0fa","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec10ad9e-31db-4707-888c-2b59e46d7ce4","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"63dde102-1279-4c04-a829-c8dd453d3e92","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"614e4978-3c1a-4a2b-8754-be5fcd28166c","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9dc83925-f071-463c-841a-5829c30e3d68","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8e03add-e965-4a6e-a6db-0ef5cd9a0b49","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05075f29-cf4e-4f43-9a83-f2af6be00517","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ac2fe32-40b4-49ec-bda4-35080c01f8f7","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"57a7a392-e649-4414-9c21-2af904a4673b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd270acb-7372-43f8-b94a-0e463be5c2a0","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c47dc30-17eb-48c0-ba8f-26390675c8b1","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82a51724-0c4e-4d0e-b911-2748b2195c11","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8aae6c0-9584-4fb4-af75-82fbee8bf42c","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a8051d6-87a9-4dd0-8c6c-8ef0697b0083","path":"sprites/spr_gear_hood1/spr_gear_hood1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c6b6a99-647e-4bd1-96ab-f313a64b8e19","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_gear_hood2/spr_gear_hood2.yy b/sprites/spr_gear_hood2/spr_gear_hood2.yy index 0b05d5be79..87c73ba533 100644 --- a/sprites/spr_gear_hood2/spr_gear_hood2.yy +++ b/sprites/spr_gear_hood2/spr_gear_hood2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_hood2", "bboxMode":0, "bbox_bottom":49, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"98625b1b-c315-421f-942a-61723f81b005","name":"98625b1b-c315-421f-942a-61723f81b005","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"98625b1b-c315-421f-942a-61723f81b005","name":"98625b1b-c315-421f-942a-61723f81b005","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"98625b1b-c315-421f-942a-61723f81b005","path":"sprites/spr_gear_hood2/spr_gear_hood2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"50ebdc76-7691-4e67-ab14-f9533598ea2f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"98625b1b-c315-421f-942a-61723f81b005","path":"sprites/spr_gear_hood2/spr_gear_hood2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"50ebdc76-7691-4e67-ab14-f9533598ea2f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_gear_hood3/spr_gear_hood3.yy b/sprites/spr_gear_hood3/spr_gear_hood3.yy index af04159b73..97aab2603b 100644 --- a/sprites/spr_gear_hood3/spr_gear_hood3.yy +++ b/sprites/spr_gear_hood3/spr_gear_hood3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_hood3", "bboxMode":0, "bbox_bottom":204, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e91b6dc2-e1cb-421d-8924-bd78a1d566e0","name":"e91b6dc2-e1cb-421d-8924-bd78a1d566e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ba011eb4-2602-4258-922e-22163b5795a3","name":"ba011eb4-2602-4258-922e-22163b5795a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0528e4b3-353d-478c-a12c-f800434d667a","name":"0528e4b3-353d-478c-a12c-f800434d667a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c26273f9-5689-449b-9f3f-31af9c1d16be","name":"c26273f9-5689-449b-9f3f-31af9c1d16be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a2e8a472-302d-42a0-a191-6e8189f9d053","name":"a2e8a472-302d-42a0-a191-6e8189f9d053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1489bf2a-920f-4be2-a5c2-dfe4932e7e9a","name":"1489bf2a-920f-4be2-a5c2-dfe4932e7e9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d904ff69-d790-42e1-968d-d98335c4ba1e","name":"d904ff69-d790-42e1-968d-d98335c4ba1e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8d0a0885-0e0c-4ce3-856a-d77b59bf5693","name":"8d0a0885-0e0c-4ce3-856a-d77b59bf5693","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c94c5444-9b90-42ce-b3d1-0b7ae8fff856","name":"c94c5444-9b90-42ce-b3d1-0b7ae8fff856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"afd814e6-1e6e-432e-b3e1-b890ed2fbebd","name":"afd814e6-1e6e-432e-b3e1-b890ed2fbebd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e91b6dc2-e1cb-421d-8924-bd78a1d566e0","name":"e91b6dc2-e1cb-421d-8924-bd78a1d566e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba011eb4-2602-4258-922e-22163b5795a3","name":"ba011eb4-2602-4258-922e-22163b5795a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0528e4b3-353d-478c-a12c-f800434d667a","name":"0528e4b3-353d-478c-a12c-f800434d667a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c26273f9-5689-449b-9f3f-31af9c1d16be","name":"c26273f9-5689-449b-9f3f-31af9c1d16be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a2e8a472-302d-42a0-a191-6e8189f9d053","name":"a2e8a472-302d-42a0-a191-6e8189f9d053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1489bf2a-920f-4be2-a5c2-dfe4932e7e9a","name":"1489bf2a-920f-4be2-a5c2-dfe4932e7e9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d904ff69-d790-42e1-968d-d98335c4ba1e","name":"d904ff69-d790-42e1-968d-d98335c4ba1e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d0a0885-0e0c-4ce3-856a-d77b59bf5693","name":"8d0a0885-0e0c-4ce3-856a-d77b59bf5693","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c94c5444-9b90-42ce-b3d1-0b7ae8fff856","name":"c94c5444-9b90-42ce-b3d1-0b7ae8fff856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"afd814e6-1e6e-432e-b3e1-b890ed2fbebd","name":"afd814e6-1e6e-432e-b3e1-b890ed2fbebd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,36 +79,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e91b6dc2-e1cb-421d-8924-bd78a1d566e0","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f654497a-61ba-4e49-a98d-cb9a20cd50d8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba011eb4-2602-4258-922e-22163b5795a3","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f9849ba-5797-4abd-98e0-345ac5e46957","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0528e4b3-353d-478c-a12c-f800434d667a","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"87edcd92-5d55-4c60-aa8b-b0c674592211","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c26273f9-5689-449b-9f3f-31af9c1d16be","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"946368d6-ba73-4b0c-8325-2cd22cf1f5a2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2e8a472-302d-42a0-a191-6e8189f9d053","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"120c2802-b902-4f6f-9fc6-e9dc234c36e7","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1489bf2a-920f-4be2-a5c2-dfe4932e7e9a","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d1d2263-a1ca-4228-81dc-d3cad2cb4103","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d904ff69-d790-42e1-968d-d98335c4ba1e","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6175a05c-8d48-4db1-97a3-f66939c811e6","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d0a0885-0e0c-4ce3-856a-d77b59bf5693","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"27a5cb26-478e-4331-85a9-a2c45373712a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c94c5444-9b90-42ce-b3d1-0b7ae8fff856","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a045cd17-94fb-4bb7-84a6-93ce47448460","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"afd814e6-1e6e-432e-b3e1-b890ed2fbebd","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5dfaef21-c07e-4e46-8877-113627f722ef","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e91b6dc2-e1cb-421d-8924-bd78a1d566e0","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f654497a-61ba-4e49-a98d-cb9a20cd50d8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba011eb4-2602-4258-922e-22163b5795a3","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f9849ba-5797-4abd-98e0-345ac5e46957","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0528e4b3-353d-478c-a12c-f800434d667a","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87edcd92-5d55-4c60-aa8b-b0c674592211","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c26273f9-5689-449b-9f3f-31af9c1d16be","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"946368d6-ba73-4b0c-8325-2cd22cf1f5a2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2e8a472-302d-42a0-a191-6e8189f9d053","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"120c2802-b902-4f6f-9fc6-e9dc234c36e7","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1489bf2a-920f-4be2-a5c2-dfe4932e7e9a","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d1d2263-a1ca-4228-81dc-d3cad2cb4103","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d904ff69-d790-42e1-968d-d98335c4ba1e","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6175a05c-8d48-4db1-97a3-f66939c811e6","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d0a0885-0e0c-4ce3-856a-d77b59bf5693","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"27a5cb26-478e-4331-85a9-a2c45373712a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c94c5444-9b90-42ce-b3d1-0b7ae8fff856","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a045cd17-94fb-4bb7-84a6-93ce47448460","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"afd814e6-1e6e-432e-b3e1-b890ed2fbebd","path":"sprites/spr_gear_hood3/spr_gear_hood3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5dfaef21-c07e-4e46-8877-113627f722ef","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_gear_librarian/spr_gear_librarian.yy b/sprites/spr_gear_librarian/spr_gear_librarian.yy index 56227bed6f..4fcb1d980d 100644 --- a/sprites/spr_gear_librarian/spr_gear_librarian.yy +++ b/sprites/spr_gear_librarian/spr_gear_librarian.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_librarian", "bboxMode":0, "bbox_bottom":67, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy b/sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy index e232d04be8..cf11ee9c38 100644 --- a/sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy +++ b/sprites/spr_gear_librarian_term/spr_gear_librarian_term.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_librarian_term", "bboxMode":0, "bbox_bottom":68, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_gear_techa/spr_gear_techa.yy b/sprites/spr_gear_techa/spr_gear_techa.yy index a17db13c56..61ab2c9089 100644 --- a/sprites/spr_gear_techa/spr_gear_techa.yy +++ b/sprites/spr_gear_techa/spr_gear_techa.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gear_techa", "bboxMode":0, "bbox_bottom":45, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy b/sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy index 08745c2691..1f626dccde 100644 --- a/sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy +++ b/sprites/spr_generic_honor_guard/spr_generic_honor_guard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_honor_guard", "bboxMode":0, "bbox_bottom":220, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","name":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"36357777-96a0-45ba-9211-32f9f0c807f9","name":"36357777-96a0-45ba-9211-32f9f0c807f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"32642e56-6593-4c11-b48b-a780b48d9332","name":"32642e56-6593-4c11-b48b-a780b48d9332","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","name":"d1ffcc4e-d302-4897-b7f2-6f29a2cd019c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"36357777-96a0-45ba-9211-32f9f0c807f9","name":"36357777-96a0-45ba-9211-32f9f0c807f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","name":"66b749b5-748d-4f6b-b3ee-de1acf85499c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","name":"c43cfd5a-416a-4ba7-be6d-94492a1488a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","name":"47cc3181-8c92-4cdd-bc8d-add01497c0ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"32642e56-6593-4c11-b48b-a780b48d9332","name":"32642e56-6593-4c11-b48b-a780b48d9332","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,6 +68,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy b/sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy index c39da9ff02..6bab660fe1 100644 --- a/sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy +++ b/sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_sgt_mk3", "bboxMode":0, "bbox_bottom":52, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"453548fa-1925-4ac4-90d9-0c74608db18c","name":"453548fa-1925-4ac4-90d9-0c74608db18c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f9679102-ac16-49be-81c7-a76859c91828","name":"f9679102-ac16-49be-81c7-a76859c91828","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f7944d23-8f13-4749-a313-106c17d901c2","name":"f7944d23-8f13-4749-a313-106c17d901c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f16d60e8-3436-42e4-8ada-e41323378a0d","name":"f16d60e8-3436-42e4-8ada-e41323378a0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"453548fa-1925-4ac4-90d9-0c74608db18c","name":"453548fa-1925-4ac4-90d9-0c74608db18c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9679102-ac16-49be-81c7-a76859c91828","name":"f9679102-ac16-49be-81c7-a76859c91828","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7944d23-8f13-4749-a313-106c17d901c2","name":"f7944d23-8f13-4749-a313-106c17d901c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f16d60e8-3436-42e4-8ada-e41323378a0d","name":"f16d60e8-3436-42e4-8ada-e41323378a0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,18 +72,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"453548fa-1925-4ac4-90d9-0c74608db18c","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f18dc78f-1df7-4a87-9c60-07a21e6cd3ff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9679102-ac16-49be-81c7-a76859c91828","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ea9148c-d1c5-485c-a7df-c8cc7b6a94cd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7944d23-8f13-4749-a313-106c17d901c2","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f6a04fe9-de4e-4858-a54d-192e9865f75b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f16d60e8-3436-42e4-8ada-e41323378a0d","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f21a607d-23de-4ee9-a963-1d5670934960","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"453548fa-1925-4ac4-90d9-0c74608db18c","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f18dc78f-1df7-4a87-9c60-07a21e6cd3ff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9679102-ac16-49be-81c7-a76859c91828","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ea9148c-d1c5-485c-a7df-c8cc7b6a94cd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7944d23-8f13-4749-a313-106c17d901c2","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6a04fe9-de4e-4858-a54d-192e9865f75b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f16d60e8-3436-42e4-8ada-e41323378a0d","path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f21a607d-23de-4ee9-a963-1d5670934960","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy b/sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy index d4908f2dde..154b1c56e0 100644 --- a/sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy +++ b/sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_sgt_mk4", "bboxMode":0, "bbox_bottom":45, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6c40433-b796-4087-8033-516468284ec7","name":"b6c40433-b796-4087-8033-516468284ec7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc2837e3-fa50-4484-8af1-55fc959611a1","name":"bc2837e3-fa50-4484-8af1-55fc959611a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9444dcec-d8e1-4a40-b6bc-0055bf6708f9","name":"9444dcec-d8e1-4a40-b6bc-0055bf6708f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"900ad528-7741-42ae-9cf8-d3e761688379","name":"900ad528-7741-42ae-9cf8-d3e761688379","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"35f65277-0206-4cb4-b73b-a3f9a2db5145","name":"35f65277-0206-4cb4-b73b-a3f9a2db5145","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6c40433-b796-4087-8033-516468284ec7","name":"b6c40433-b796-4087-8033-516468284ec7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc2837e3-fa50-4484-8af1-55fc959611a1","name":"bc2837e3-fa50-4484-8af1-55fc959611a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9444dcec-d8e1-4a40-b6bc-0055bf6708f9","name":"9444dcec-d8e1-4a40-b6bc-0055bf6708f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"900ad528-7741-42ae-9cf8-d3e761688379","name":"900ad528-7741-42ae-9cf8-d3e761688379","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"35f65277-0206-4cb4-b73b-a3f9a2db5145","name":"35f65277-0206-4cb4-b73b-a3f9a2db5145","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6c40433-b796-4087-8033-516468284ec7","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02c37a45-2f0e-437d-b364-6d736cc0a01f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc2837e3-fa50-4484-8af1-55fc959611a1","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"492dbd86-e50a-454b-a40f-73a2da04c7a8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9444dcec-d8e1-4a40-b6bc-0055bf6708f9","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37048c1b-0257-4c88-b79e-5a6c77932e58","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"900ad528-7741-42ae-9cf8-d3e761688379","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"caf6c31f-886a-4064-9066-8b4ff4595fbb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"35f65277-0206-4cb4-b73b-a3f9a2db5145","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e4cbb5f2-c487-41f6-b212-5c0cb15007d8","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6c40433-b796-4087-8033-516468284ec7","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02c37a45-2f0e-437d-b364-6d736cc0a01f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc2837e3-fa50-4484-8af1-55fc959611a1","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"492dbd86-e50a-454b-a40f-73a2da04c7a8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9444dcec-d8e1-4a40-b6bc-0055bf6708f9","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37048c1b-0257-4c88-b79e-5a6c77932e58","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"900ad528-7741-42ae-9cf8-d3e761688379","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"caf6c31f-886a-4064-9066-8b4ff4595fbb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"35f65277-0206-4cb4-b73b-a3f9a2db5145","path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e4cbb5f2-c487-41f6-b212-5c0cb15007d8","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy b/sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy index fb2c47b161..b93562cccf 100644 --- a/sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy +++ b/sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_sgt_mk5", "bboxMode":0, "bbox_bottom":43, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5ef518ec-b0b8-48cb-982b-127b74bf1a93","name":"5ef518ec-b0b8-48cb-982b-127b74bf1a93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"151d8a45-d25d-4d91-96e9-95d98fc851ef","name":"151d8a45-d25d-4d91-96e9-95d98fc851ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b55fc1d3-fc95-4f04-8546-bd65825c4c79","name":"b55fc1d3-fc95-4f04-8546-bd65825c4c79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b192b936-3c58-43e2-b011-0f34b8e33c5b","name":"b192b936-3c58-43e2-b011-0f34b8e33c5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5ef518ec-b0b8-48cb-982b-127b74bf1a93","name":"5ef518ec-b0b8-48cb-982b-127b74bf1a93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"151d8a45-d25d-4d91-96e9-95d98fc851ef","name":"151d8a45-d25d-4d91-96e9-95d98fc851ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b55fc1d3-fc95-4f04-8546-bd65825c4c79","name":"b55fc1d3-fc95-4f04-8546-bd65825c4c79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b192b936-3c58-43e2-b011-0f34b8e33c5b","name":"b192b936-3c58-43e2-b011-0f34b8e33c5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5ef518ec-b0b8-48cb-982b-127b74bf1a93","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e1a21855-a9d4-4358-8ebd-1048afb81d7d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"151d8a45-d25d-4d91-96e9-95d98fc851ef","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"381c6466-48f6-4b57-be56-0cdd64b73a3b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b55fc1d3-fc95-4f04-8546-bd65825c4c79","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1251b2d8-d6bc-4335-98dd-69d1d7cf2190","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b192b936-3c58-43e2-b011-0f34b8e33c5b","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"35bb15b6-d4bd-4c6b-899e-6f3123a0af00","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5ef518ec-b0b8-48cb-982b-127b74bf1a93","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e1a21855-a9d4-4358-8ebd-1048afb81d7d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"151d8a45-d25d-4d91-96e9-95d98fc851ef","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"381c6466-48f6-4b57-be56-0cdd64b73a3b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b55fc1d3-fc95-4f04-8546-bd65825c4c79","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1251b2d8-d6bc-4335-98dd-69d1d7cf2190","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b192b936-3c58-43e2-b011-0f34b8e33c5b","path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"35bb15b6-d4bd-4c6b-899e-6f3123a0af00","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy b/sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy index 41766d177b..5efaa2287e 100644 --- a/sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy +++ b/sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_sgt_mk6", "bboxMode":0, "bbox_bottom":47, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d31acec8-4976-4be8-9b8b-dd77c486f2b5","name":"d31acec8-4976-4be8-9b8b-dd77c486f2b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b049956f-a206-4f0e-89b0-a8989e560f2c","name":"b049956f-a206-4f0e-89b0-a8989e560f2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"719f6e69-22d8-4a3a-ab4f-cdd616174b3d","name":"719f6e69-22d8-4a3a-ab4f-cdd616174b3d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb3b2bd0-2811-49bd-9c2d-124ff68c3635","name":"fb3b2bd0-2811-49bd-9c2d-124ff68c3635","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d31acec8-4976-4be8-9b8b-dd77c486f2b5","name":"d31acec8-4976-4be8-9b8b-dd77c486f2b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b049956f-a206-4f0e-89b0-a8989e560f2c","name":"b049956f-a206-4f0e-89b0-a8989e560f2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"719f6e69-22d8-4a3a-ab4f-cdd616174b3d","name":"719f6e69-22d8-4a3a-ab4f-cdd616174b3d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb3b2bd0-2811-49bd-9c2d-124ff68c3635","name":"fb3b2bd0-2811-49bd-9c2d-124ff68c3635","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d31acec8-4976-4be8-9b8b-dd77c486f2b5","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"282fff07-a56c-4045-8ba9-50ba49007c35","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b049956f-a206-4f0e-89b0-a8989e560f2c","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4a5c4b8f-5f6a-4840-82fe-ae6c470cbe6e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"719f6e69-22d8-4a3a-ab4f-cdd616174b3d","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e83fe56-93a9-472c-a9e1-1535a32175bf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb3b2bd0-2811-49bd-9c2d-124ff68c3635","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d0dfab9-7210-42a2-9f17-299cfd354675","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d31acec8-4976-4be8-9b8b-dd77c486f2b5","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"282fff07-a56c-4045-8ba9-50ba49007c35","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b049956f-a206-4f0e-89b0-a8989e560f2c","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4a5c4b8f-5f6a-4840-82fe-ae6c470cbe6e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"719f6e69-22d8-4a3a-ab4f-cdd616174b3d","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e83fe56-93a9-472c-a9e1-1535a32175bf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb3b2bd0-2811-49bd-9c2d-124ff68c3635","path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d0dfab9-7210-42a2-9f17-299cfd354675","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy b/sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy index a6375c6522..849bc33ab3 100644 --- a/sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy +++ b/sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_sgt_mk7", "bboxMode":0, "bbox_bottom":44, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"338f26c9-72be-4747-9d28-04bd5aa14d34","name":"338f26c9-72be-4747-9d28-04bd5aa14d34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"338f26c9-72be-4747-9d28-04bd5aa14d34","name":"338f26c9-72be-4747-9d28-04bd5aa14d34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c3b67ba-1b77-4057-8c08-116efd008557","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"10a73f48-bf94-4d68-a6ba-796328bc9468","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"338f26c9-72be-4747-9d28-04bd5aa14d34","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15f3b232-4e61-44bd-81bc-8db8deeaf9c7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"95fce0de-01d0-427d-b459-9896ef7ca6a8","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c3b67ba-1b77-4057-8c08-116efd008557","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"10a73f48-bf94-4d68-a6ba-796328bc9468","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"338f26c9-72be-4747-9d28-04bd5aa14d34","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15f3b232-4e61-44bd-81bc-8db8deeaf9c7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"95fce0de-01d0-427d-b459-9896ef7ca6a8","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy b/sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy index fe93a50a38..5f0fb069ac 100644 --- a/sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy +++ b/sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_sgt_mk8", "bboxMode":0, "bbox_bottom":38, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"338f26c9-72be-4747-9d28-04bd5aa14d34","name":"338f26c9-72be-4747-9d28-04bd5aa14d34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"338f26c9-72be-4747-9d28-04bd5aa14d34","name":"338f26c9-72be-4747-9d28-04bd5aa14d34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"afed0983-ac24-4636-8ae7-bd6b7a5dd3eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b1bcb94b-074f-4058-b0a0-8a9821d76426","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"338f26c9-72be-4747-9d28-04bd5aa14d34","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9d9b87b-7b58-4264-bede-ec8af0948dcb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9a1f0377-1634-4668-8cbf-80e38851a8c1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0587aa8-6da1-4dec-bfc5-f60450d6f8b3","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"afed0983-ac24-4636-8ae7-bd6b7a5dd3eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"253a151e-70ab-45ce-ad6f-6b7dbd4afea8","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b1bcb94b-074f-4058-b0a0-8a9821d76426","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"338f26c9-72be-4747-9d28-04bd5aa14d34","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9d9b87b-7b58-4264-bede-ec8af0948dcb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ee8ae6f-96a8-4fda-ab6a-51e2591df77a","path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9a1f0377-1634-4668-8cbf-80e38851a8c1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy b/sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy index 26a1d7935e..720feb2b4c 100644 --- a/sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy +++ b/sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_generic_terminator_sgt", "bboxMode":0, "bbox_bottom":88, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f0b4faaf-5213-4148-9d9c-f6da2bed200e","name":"f0b4faaf-5213-4148-9d9c-f6da2bed200e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9f2c3af3-6b8d-444a-8c69-497f48dcfe83","name":"9f2c3af3-6b8d-444a-8c69-497f48dcfe83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3617c3e-e674-42da-8f90-9aec47330e26","name":"e3617c3e-e674-42da-8f90-9aec47330e26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5cba2713-473a-411e-a40b-a7df58ed2a51","name":"5cba2713-473a-411e-a40b-a7df58ed2a51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0b4faaf-5213-4148-9d9c-f6da2bed200e","name":"f0b4faaf-5213-4148-9d9c-f6da2bed200e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f2c3af3-6b8d-444a-8c69-497f48dcfe83","name":"9f2c3af3-6b8d-444a-8c69-497f48dcfe83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3617c3e-e674-42da-8f90-9aec47330e26","name":"e3617c3e-e674-42da-8f90-9aec47330e26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5cba2713-473a-411e-a40b-a7df58ed2a51","name":"5cba2713-473a-411e-a40b-a7df58ed2a51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0b4faaf-5213-4148-9d9c-f6da2bed200e","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"205ae050-2827-43b3-83f8-260a37cf51ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f2c3af3-6b8d-444a-8c69-497f48dcfe83","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a03d1e4-27c9-4ac7-a6c8-c9c473a7909f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3617c3e-e674-42da-8f90-9aec47330e26","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1bccdd95-8e5b-4499-ab2d-6e379b86f0a4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5cba2713-473a-411e-a40b-a7df58ed2a51","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5c7eb130-195d-4ae5-815d-826040a80aa9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0b4faaf-5213-4148-9d9c-f6da2bed200e","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"205ae050-2827-43b3-83f8-260a37cf51ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f2c3af3-6b8d-444a-8c69-497f48dcfe83","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a03d1e4-27c9-4ac7-a6c8-c9c473a7909f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3617c3e-e674-42da-8f90-9aec47330e26","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1bccdd95-8e5b-4499-ab2d-6e379b86f0a4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5cba2713-473a-411e-a40b-a7df58ed2a51","path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c7eb130-195d-4ae5-815d-826040a80aa9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_gladiator_crest/ff8c3aa8-dc36-45e8-b043-45038d329396.png b/sprites/spr_gladiator_crest/ff8c3aa8-dc36-45e8-b043-45038d329396.png index 04b591eb74..c5d8ac6e4e 100644 Binary files a/sprites/spr_gladiator_crest/ff8c3aa8-dc36-45e8-b043-45038d329396.png and b/sprites/spr_gladiator_crest/ff8c3aa8-dc36-45e8-b043-45038d329396.png differ diff --git a/sprites/spr_gladiator_crest/layers/ff8c3aa8-dc36-45e8-b043-45038d329396/020e45fd-27e1-48c7-801f-deacfe57d9c1.png b/sprites/spr_gladiator_crest/layers/ff8c3aa8-dc36-45e8-b043-45038d329396/020e45fd-27e1-48c7-801f-deacfe57d9c1.png index 04b591eb74..355d83c379 100644 Binary files a/sprites/spr_gladiator_crest/layers/ff8c3aa8-dc36-45e8-b043-45038d329396/020e45fd-27e1-48c7-801f-deacfe57d9c1.png and b/sprites/spr_gladiator_crest/layers/ff8c3aa8-dc36-45e8-b043-45038d329396/020e45fd-27e1-48c7-801f-deacfe57d9c1.png differ diff --git a/sprites/spr_gladiator_crest/spr_gladiator_crest.yy b/sprites/spr_gladiator_crest/spr_gladiator_crest.yy index 3e16f75b9e..b85d4c285c 100644 --- a/sprites/spr_gladiator_crest/spr_gladiator_crest.yy +++ b/sprites/spr_gladiator_crest/spr_gladiator_crest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gladiator_crest", "bboxMode":0, "bbox_bottom":70, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ff8c3aa8-dc36-45e8-b043-45038d329396","name":"ff8c3aa8-dc36-45e8-b043-45038d329396","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ff8c3aa8-dc36-45e8-b043-45038d329396","name":"ff8c3aa8-dc36-45e8-b043-45038d329396","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_glob/spr_glob.yy b/sprites/spr_glob/spr_glob.yy index dd2b112d92..30b8a12225 100644 --- a/sprites/spr_glob/spr_glob.yy +++ b/sprites/spr_glob/spr_glob.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_glob", "bboxMode":0, "bbox_bottom":6, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"94125f36-c928-402d-a8e7-3cbca709e174","name":"94125f36-c928-402d-a8e7-3cbca709e174","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"94125f36-c928-402d-a8e7-3cbca709e174","name":"94125f36-c928-402d-a8e7-3cbca709e174","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"94125f36-c928-402d-a8e7-3cbca709e174","path":"sprites/spr_glob/spr_glob.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"80196786-2c38-4868-9fe7-eb855f01c0f8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"94125f36-c928-402d-a8e7-3cbca709e174","path":"sprites/spr_glob/spr_glob.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"80196786-2c38-4868-9fe7-eb855f01c0f8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy b/sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy index 69a0e0924a..afacf47b11 100644 --- a/sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy +++ b/sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_gothic_numbers_right_pauldron", "bboxMode":0, "bbox_bottom":65, @@ -12,17 +12,17 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87e5fd39-f168-48c2-a276-31cf1b797199","name":"87e5fd39-f168-48c2-a276-31cf1b797199","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5033b836-0568-4d4c-b81a-99fe09e568a2","name":"5033b836-0568-4d4c-b81a-99fe09e568a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da9a8b66-05d9-4947-9787-cae8b9015321","name":"da9a8b66-05d9-4947-9787-cae8b9015321","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87e5fd39-f168-48c2-a276-31cf1b797199","name":"87e5fd39-f168-48c2-a276-31cf1b797199","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5033b836-0568-4d4c-b81a-99fe09e568a2","name":"5033b836-0568-4d4c-b81a-99fe09e568a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da9a8b66-05d9-4947-9787-cae8b9015321","name":"da9a8b66-05d9-4947-9787-cae8b9015321","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -78,39 +78,17 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e8f2da6-4c4a-4e13-821d-699b0e5f5e6d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87e5fd39-f168-48c2-a276-31cf1b797199","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6aac9d83-a704-44dd-acc9-c66ceb93e2c2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d41ebca2-1e7a-4bfb-9ce1-0b68abced744","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b14dbd68-c1b6-4987-8559-ea45895073a6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5033b836-0568-4d4c-b81a-99fe09e568a2","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d75f6766-3b0f-4a70-a35a-c9a7c72e1896","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eec4d90e-c9c8-4bca-97ae-b61579e5d9ed","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc1805dc-a620-4133-b267-e9fb9480a8d7","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"86664de9-14af-4223-aa04-76d40612f5fb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de02452f-ee8f-49c4-8a45-db6793a11b9a","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da9a8b66-05d9-4947-9787-cae8b9015321","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94b419a4-05ae-413a-a175-9a6cdd69232b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97cf6ab4-2cb9-4a8e-9831-3ad6b5e8dfa8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d7d679d-aab5-41ff-8fe1-9e09cc803a4b","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e8f2da6-4c4a-4e13-821d-699b0e5f5e6d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87e5fd39-f168-48c2-a276-31cf1b797199","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6aac9d83-a704-44dd-acc9-c66ceb93e2c2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"154a4f6a-289b-47cb-8019-3f84d8764a8a","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d41ebca2-1e7a-4bfb-9ce1-0b68abced744","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f791d4dd-cc2d-41b7-affd-23a72b4771f0","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b14dbd68-c1b6-4987-8559-ea45895073a6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5033b836-0568-4d4c-b81a-99fe09e568a2","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d75f6766-3b0f-4a70-a35a-c9a7c72e1896","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"21bf7334-e7e2-4144-a2a6-612ffdd217c0","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eec4d90e-c9c8-4bca-97ae-b61579e5d9ed","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ad45a4b8-613b-40d8-bae5-3f5ab7644996","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc1805dc-a620-4133-b267-e9fb9480a8d7","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"70c94ec1-c0c7-4165-a387-8bce0f626fd9","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"86664de9-14af-4223-aa04-76d40612f5fb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cab768a9-5d1c-4f18-8f20-53214419c9f8","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de02452f-ee8f-49c4-8a45-db6793a11b9a","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da9a8b66-05d9-4947-9787-cae8b9015321","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94b419a4-05ae-413a-a175-9a6cdd69232b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"666fe5ca-6935-4698-a369-b7b96ff5e47d","path":"sprites/spr_gothic_numbers_right_pauldron/spr_gothic_numbers_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97cf6ab4-2cb9-4a8e-9831-3ad6b5e8dfa8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_green_las/spr_green_las.yy b/sprites/spr_green_las/spr_green_las.yy index 0f813ace20..7c98e3a1ed 100644 --- a/sprites/spr_green_las/spr_green_las.yy +++ b/sprites/spr_green_las/spr_green_las.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_green_las", "bboxMode":0, "bbox_bottom":1, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"229a045c-fa9a-4530-ba19-5266f3d1ebac","name":"229a045c-fa9a-4530-ba19-5266f3d1ebac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"229a045c-fa9a-4530-ba19-5266f3d1ebac","name":"229a045c-fa9a-4530-ba19-5266f3d1ebac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"229a045c-fa9a-4530-ba19-5266f3d1ebac","path":"sprites/spr_green_las/spr_green_las.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b611c7a-0b17-4060-94b2-33aaf44deca6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"229a045c-fa9a-4530-ba19-5266f3d1ebac","path":"sprites/spr_green_las/spr_green_las.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b611c7a-0b17-4060-94b2-33aaf44deca6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ground_conv/spr_ground_conv.yy b/sprites/spr_ground_conv/spr_ground_conv.yy index b72e0d7601..a83983405c 100644 --- a/sprites/spr_ground_conv/spr_ground_conv.yy +++ b/sprites/spr_ground_conv/spr_ground_conv.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ground_conv", "bboxMode":0, "bbox_bottom":2, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8bfd4089-9d50-4d68-9407-3a9333e6a77c","name":"8bfd4089-9d50-4d68-9407-3a9333e6a77c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8bfd4089-9d50-4d68-9407-3a9333e6a77c","name":"8bfd4089-9d50-4d68-9407-3a9333e6a77c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8bfd4089-9d50-4d68-9407-3a9333e6a77c","path":"sprites/spr_ground_conv/spr_ground_conv.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea315c54-c59c-4101-82ca-8cc522b67181","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8bfd4089-9d50-4d68-9407-3a9333e6a77c","path":"sprites/spr_ground_conv/spr_ground_conv.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea315c54-c59c-4101-82ca-8cc522b67181","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ground_las/spr_ground_las.yy b/sprites/spr_ground_las/spr_ground_las.yy index 33bded8a6f..7533cf3ba3 100644 --- a/sprites/spr_ground_las/spr_ground_las.yy +++ b/sprites/spr_ground_las/spr_ground_las.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ground_las", "bboxMode":0, "bbox_bottom":1, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"00caeb86-8fdb-40c5-913b-2403cc17e78e","name":"00caeb86-8fdb-40c5-913b-2403cc17e78e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00caeb86-8fdb-40c5-913b-2403cc17e78e","name":"00caeb86-8fdb-40c5-913b-2403cc17e78e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00caeb86-8fdb-40c5-913b-2403cc17e78e","path":"sprites/spr_ground_las/spr_ground_las.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"63b90f58-443f-48cf-a161-19699769319a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00caeb86-8fdb-40c5-913b-2403cc17e78e","path":"sprites/spr_ground_las/spr_ground_las.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"63b90f58-443f-48cf-a161-19699769319a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ground_plasma/spr_ground_plasma.yy b/sprites/spr_ground_plasma/spr_ground_plasma.yy index f314a224e8..05126e1263 100644 --- a/sprites/spr_ground_plasma/spr_ground_plasma.yy +++ b/sprites/spr_ground_plasma/spr_ground_plasma.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ground_plasma", "bboxMode":0, "bbox_bottom":4, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f2e82585-0d36-4633-a1eb-8f7346d137fb","name":"f2e82585-0d36-4633-a1eb-8f7346d137fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2e82585-0d36-4633-a1eb-8f7346d137fb","name":"f2e82585-0d36-4633-a1eb-8f7346d137fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2e82585-0d36-4633-a1eb-8f7346d137fb","path":"sprites/spr_ground_plasma/spr_ground_plasma.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09513bc0-464f-4962-83e5-0b1bcca916ef","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2e82585-0d36-4633-a1eb-8f7346d137fb","path":"sprites/spr_ground_plasma/spr_ground_plasma.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09513bc0-464f-4962-83e5-0b1bcca916ef","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_happenings_blue/spr_happenings_blue.yy b/sprites/spr_happenings_blue/spr_happenings_blue.yy index cd2130b81c..fb0cdf17bc 100644 --- a/sprites/spr_happenings_blue/spr_happenings_blue.yy +++ b/sprites/spr_happenings_blue/spr_happenings_blue.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_happenings_blue", "bboxMode":0, "bbox_bottom":26, @@ -12,32 +12,32 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"11016106-3e26-4d00-8fbe-bc2dc3c9ac6b","name":"11016106-3e26-4d00-8fbe-bc2dc3c9ac6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6df35a32-cf5a-4810-89ae-6ef93614d26b","name":"6df35a32-cf5a-4810-89ae-6ef93614d26b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e4334ed3-47d0-444b-887e-5cd19ab651c6","name":"e4334ed3-47d0-444b-887e-5cd19ab651c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"398323a5-85ff-465f-8aeb-f070a17fcf79","name":"398323a5-85ff-465f-8aeb-f070a17fcf79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"12c01e65-b298-4648-a16f-47fb4e9072e9","name":"12c01e65-b298-4648-a16f-47fb4e9072e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"873b5ead-4f37-40c8-b996-1ffa989d9193","name":"873b5ead-4f37-40c8-b996-1ffa989d9193","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d285d9fc-0157-4ebe-ad26-c057de3b0a5f","name":"d285d9fc-0157-4ebe-ad26-c057de3b0a5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be15ad6b-c337-4cb2-88e3-8dfb5183b43b","name":"be15ad6b-c337-4cb2-88e3-8dfb5183b43b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e7d6b571-b227-4ee2-9b4d-d766264df92f","name":"e7d6b571-b227-4ee2-9b4d-d766264df92f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c5e02804-71c1-4bae-a691-298c956dce73","name":"c5e02804-71c1-4bae-a691-298c956dce73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f2c7a8f-f1b1-46ac-8192-695dbc176ca7","name":"7f2c7a8f-f1b1-46ac-8192-695dbc176ca7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4b3af7e1-e51e-4287-a286-27e2b4d143ac","name":"4b3af7e1-e51e-4287-a286-27e2b4d143ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"337ce7db-005f-4394-bd10-38ae46363ea5","name":"337ce7db-005f-4394-bd10-38ae46363ea5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3940c17-adb9-42c5-84c9-24de4c8b3248","name":"e3940c17-adb9-42c5-84c9-24de4c8b3248","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"425b0eea-3478-4049-8d47-836d531fa61e","name":"425b0eea-3478-4049-8d47-836d531fa61e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a6992be-ba21-4b46-a8cb-a3624afa6c15","name":"2a6992be-ba21-4b46-a8cb-a3624afa6c15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b742df01-f74f-47fd-adee-ca128d96d708","name":"b742df01-f74f-47fd-adee-ca128d96d708","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd7b33c0-cca2-41e6-9b57-4f44e210e3c3","name":"cd7b33c0-cca2-41e6-9b57-4f44e210e3c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"143a040c-c4ff-4bf9-9fd8-b84ae31d7e60","name":"143a040c-c4ff-4bf9-9fd8-b84ae31d7e60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"06ce9b5b-bae9-45d5-a804-922b0946ef99","name":"06ce9b5b-bae9-45d5-a804-922b0946ef99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f03de3cc-bbba-4621-9b1b-f317c7c3b7f6","name":"f03de3cc-bbba-4621-9b1b-f317c7c3b7f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"79399347-d2ec-4a18-b332-b3f521b3e350","name":"79399347-d2ec-4a18-b332-b3f521b3e350","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"67fa920f-1a24-4316-80ad-e80e670533e6","name":"67fa920f-1a24-4316-80ad-e80e670533e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f2b7eb36-0918-4bdb-acae-31ffcdf54301","name":"f2b7eb36-0918-4bdb-acae-31ffcdf54301","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5bb5e8c1-0b8a-4946-a411-0dd47f27b265","name":"5bb5e8c1-0b8a-4946-a411-0dd47f27b265","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"156546e5-1266-4235-97b9-320f5e6c04f7","name":"156546e5-1266-4235-97b9-320f5e6c04f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"11016106-3e26-4d00-8fbe-bc2dc3c9ac6b","name":"11016106-3e26-4d00-8fbe-bc2dc3c9ac6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6df35a32-cf5a-4810-89ae-6ef93614d26b","name":"6df35a32-cf5a-4810-89ae-6ef93614d26b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4334ed3-47d0-444b-887e-5cd19ab651c6","name":"e4334ed3-47d0-444b-887e-5cd19ab651c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"398323a5-85ff-465f-8aeb-f070a17fcf79","name":"398323a5-85ff-465f-8aeb-f070a17fcf79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"12c01e65-b298-4648-a16f-47fb4e9072e9","name":"12c01e65-b298-4648-a16f-47fb4e9072e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"873b5ead-4f37-40c8-b996-1ffa989d9193","name":"873b5ead-4f37-40c8-b996-1ffa989d9193","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d285d9fc-0157-4ebe-ad26-c057de3b0a5f","name":"d285d9fc-0157-4ebe-ad26-c057de3b0a5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be15ad6b-c337-4cb2-88e3-8dfb5183b43b","name":"be15ad6b-c337-4cb2-88e3-8dfb5183b43b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7d6b571-b227-4ee2-9b4d-d766264df92f","name":"e7d6b571-b227-4ee2-9b4d-d766264df92f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5e02804-71c1-4bae-a691-298c956dce73","name":"c5e02804-71c1-4bae-a691-298c956dce73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f2c7a8f-f1b1-46ac-8192-695dbc176ca7","name":"7f2c7a8f-f1b1-46ac-8192-695dbc176ca7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b3af7e1-e51e-4287-a286-27e2b4d143ac","name":"4b3af7e1-e51e-4287-a286-27e2b4d143ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"337ce7db-005f-4394-bd10-38ae46363ea5","name":"337ce7db-005f-4394-bd10-38ae46363ea5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3940c17-adb9-42c5-84c9-24de4c8b3248","name":"e3940c17-adb9-42c5-84c9-24de4c8b3248","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"425b0eea-3478-4049-8d47-836d531fa61e","name":"425b0eea-3478-4049-8d47-836d531fa61e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a6992be-ba21-4b46-a8cb-a3624afa6c15","name":"2a6992be-ba21-4b46-a8cb-a3624afa6c15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b742df01-f74f-47fd-adee-ca128d96d708","name":"b742df01-f74f-47fd-adee-ca128d96d708","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd7b33c0-cca2-41e6-9b57-4f44e210e3c3","name":"cd7b33c0-cca2-41e6-9b57-4f44e210e3c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"143a040c-c4ff-4bf9-9fd8-b84ae31d7e60","name":"143a040c-c4ff-4bf9-9fd8-b84ae31d7e60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"06ce9b5b-bae9-45d5-a804-922b0946ef99","name":"06ce9b5b-bae9-45d5-a804-922b0946ef99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f03de3cc-bbba-4621-9b1b-f317c7c3b7f6","name":"f03de3cc-bbba-4621-9b1b-f317c7c3b7f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79399347-d2ec-4a18-b332-b3f521b3e350","name":"79399347-d2ec-4a18-b332-b3f521b3e350","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67fa920f-1a24-4316-80ad-e80e670533e6","name":"67fa920f-1a24-4316-80ad-e80e670533e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2b7eb36-0918-4bdb-acae-31ffcdf54301","name":"f2b7eb36-0918-4bdb-acae-31ffcdf54301","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5bb5e8c1-0b8a-4946-a411-0dd47f27b265","name":"5bb5e8c1-0b8a-4946-a411-0dd47f27b265","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"156546e5-1266-4235-97b9-320f5e6c04f7","name":"156546e5-1266-4235-97b9-320f5e6c04f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,84 +93,32 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"11016106-3e26-4d00-8fbe-bc2dc3c9ac6b","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8630044a-2c21-4a9e-a95f-1613546d93cc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6df35a32-cf5a-4810-89ae-6ef93614d26b","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ecc01ce-e9dc-430c-8376-3735a9d69ff3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4334ed3-47d0-444b-887e-5cd19ab651c6","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b3680579-0a21-439f-b143-13defbc8b5a5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"398323a5-85ff-465f-8aeb-f070a17fcf79","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54d24c23-94d9-4b6e-a0f8-9258e797b2bc","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"12c01e65-b298-4648-a16f-47fb4e9072e9","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"786fb1c2-ee0d-4b9f-810e-ccd2154aa8ea","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"873b5ead-4f37-40c8-b996-1ffa989d9193","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"51d3ef1a-4578-4542-8abb-758d1eceac9b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d285d9fc-0157-4ebe-ad26-c057de3b0a5f","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"db1f4c2a-b2bf-4cbc-a59a-689167d7cad9","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be15ad6b-c337-4cb2-88e3-8dfb5183b43b","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c91c1690-a0c8-4fa6-a36c-e6ea3fccae2d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7d6b571-b227-4ee2-9b4d-d766264df92f","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bcbd78fa-2746-4204-ac4a-4e607838beff","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5e02804-71c1-4bae-a691-298c956dce73","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d24ec6f-1fa8-4ee3-96e8-d7586529bfa0","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f2c7a8f-f1b1-46ac-8192-695dbc176ca7","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5effc3bf-d1bc-4ba0-9c17-b30c871b8119","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b3af7e1-e51e-4287-a286-27e2b4d143ac","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ccfb57a-950d-4e38-96ed-5a25116a2836","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"337ce7db-005f-4394-bd10-38ae46363ea5","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf3031aa-f6ca-4d6b-b74a-229a5dbde8e8","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3940c17-adb9-42c5-84c9-24de4c8b3248","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34f983fd-1955-4b75-bbbd-f8216219604c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"425b0eea-3478-4049-8d47-836d531fa61e","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bbd7dbf-40af-4314-b773-32fe095410d1","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a6992be-ba21-4b46-a8cb-a3624afa6c15","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ce0072a-f108-4df4-8ef8-a7bd4d103d69","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b742df01-f74f-47fd-adee-ca128d96d708","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a275856-0da3-4069-8446-b50868f374dd","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd7b33c0-cca2-41e6-9b57-4f44e210e3c3","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"74b4c830-cc03-4088-8136-b698c868304c","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"143a040c-c4ff-4bf9-9fd8-b84ae31d7e60","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04d4884f-23e6-4034-a002-66c2c1e13b25","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"06ce9b5b-bae9-45d5-a804-922b0946ef99","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24c45266-51df-4a6e-8394-77882acc7542","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f03de3cc-bbba-4621-9b1b-f317c7c3b7f6","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c9e32754-8d11-438e-a48e-f6fc4dc94818","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79399347-d2ec-4a18-b332-b3f521b3e350","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf8d3d45-e7b0-41ff-bdf5-bc3d6c82c834","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67fa920f-1a24-4316-80ad-e80e670533e6","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5876f540-45f1-4f85-a52b-d022b55d42db","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2b7eb36-0918-4bdb-acae-31ffcdf54301","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1125a58a-0ab6-484c-b8c7-75a1044fdd9d","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5bb5e8c1-0b8a-4946-a411-0dd47f27b265","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b03965fd-f705-4b11-ac8d-05787e0e8454","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"156546e5-1266-4235-97b9-320f5e6c04f7","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"585d085b-6a95-4d15-88a6-4dda3d20cbf2","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"11016106-3e26-4d00-8fbe-bc2dc3c9ac6b","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8630044a-2c21-4a9e-a95f-1613546d93cc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6df35a32-cf5a-4810-89ae-6ef93614d26b","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ecc01ce-e9dc-430c-8376-3735a9d69ff3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4334ed3-47d0-444b-887e-5cd19ab651c6","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b3680579-0a21-439f-b143-13defbc8b5a5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"398323a5-85ff-465f-8aeb-f070a17fcf79","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54d24c23-94d9-4b6e-a0f8-9258e797b2bc","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"12c01e65-b298-4648-a16f-47fb4e9072e9","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"786fb1c2-ee0d-4b9f-810e-ccd2154aa8ea","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"873b5ead-4f37-40c8-b996-1ffa989d9193","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"51d3ef1a-4578-4542-8abb-758d1eceac9b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d285d9fc-0157-4ebe-ad26-c057de3b0a5f","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"db1f4c2a-b2bf-4cbc-a59a-689167d7cad9","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be15ad6b-c337-4cb2-88e3-8dfb5183b43b","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c91c1690-a0c8-4fa6-a36c-e6ea3fccae2d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7d6b571-b227-4ee2-9b4d-d766264df92f","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bcbd78fa-2746-4204-ac4a-4e607838beff","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5e02804-71c1-4bae-a691-298c956dce73","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d24ec6f-1fa8-4ee3-96e8-d7586529bfa0","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f2c7a8f-f1b1-46ac-8192-695dbc176ca7","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5effc3bf-d1bc-4ba0-9c17-b30c871b8119","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b3af7e1-e51e-4287-a286-27e2b4d143ac","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ccfb57a-950d-4e38-96ed-5a25116a2836","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"337ce7db-005f-4394-bd10-38ae46363ea5","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf3031aa-f6ca-4d6b-b74a-229a5dbde8e8","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3940c17-adb9-42c5-84c9-24de4c8b3248","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34f983fd-1955-4b75-bbbd-f8216219604c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"425b0eea-3478-4049-8d47-836d531fa61e","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bbd7dbf-40af-4314-b773-32fe095410d1","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a6992be-ba21-4b46-a8cb-a3624afa6c15","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ce0072a-f108-4df4-8ef8-a7bd4d103d69","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b742df01-f74f-47fd-adee-ca128d96d708","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a275856-0da3-4069-8446-b50868f374dd","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd7b33c0-cca2-41e6-9b57-4f44e210e3c3","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"74b4c830-cc03-4088-8136-b698c868304c","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"143a040c-c4ff-4bf9-9fd8-b84ae31d7e60","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04d4884f-23e6-4034-a002-66c2c1e13b25","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"06ce9b5b-bae9-45d5-a804-922b0946ef99","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24c45266-51df-4a6e-8394-77882acc7542","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f03de3cc-bbba-4621-9b1b-f317c7c3b7f6","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c9e32754-8d11-438e-a48e-f6fc4dc94818","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79399347-d2ec-4a18-b332-b3f521b3e350","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf8d3d45-e7b0-41ff-bdf5-bc3d6c82c834","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67fa920f-1a24-4316-80ad-e80e670533e6","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5876f540-45f1-4f85-a52b-d022b55d42db","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2b7eb36-0918-4bdb-acae-31ffcdf54301","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1125a58a-0ab6-484c-b8c7-75a1044fdd9d","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5bb5e8c1-0b8a-4946-a411-0dd47f27b265","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b03965fd-f705-4b11-ac8d-05787e0e8454","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"156546e5-1266-4235-97b9-320f5e6c04f7","path":"sprites/spr_happenings_blue/spr_happenings_blue.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"585d085b-6a95-4d15-88a6-4dda3d20cbf2","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_happenings_green/spr_happenings_green.yy b/sprites/spr_happenings_green/spr_happenings_green.yy index 0f839e7fcb..0068510186 100644 --- a/sprites/spr_happenings_green/spr_happenings_green.yy +++ b/sprites/spr_happenings_green/spr_happenings_green.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_happenings_green", "bboxMode":0, "bbox_bottom":26, @@ -12,32 +12,32 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f7eee6f9-a600-4fe7-8ea2-42705c1addc1","name":"f7eee6f9-a600-4fe7-8ea2-42705c1addc1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e838345a-58e0-4c27-8ac5-e0293dc62516","name":"e838345a-58e0-4c27-8ac5-e0293dc62516","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"31948616-30f8-49af-aac8-36578e149f6d","name":"31948616-30f8-49af-aac8-36578e149f6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"93a8b121-857c-436d-80f4-190f9e822d48","name":"93a8b121-857c-436d-80f4-190f9e822d48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b18b7461-af7c-46f9-bb4b-908dbf23ee4b","name":"b18b7461-af7c-46f9-bb4b-908dbf23ee4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4eb7e8d-2608-4b34-ab31-05efaf6636fe","name":"f4eb7e8d-2608-4b34-ab31-05efaf6636fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b34a906-9e51-4d50-890e-c0464cf186c1","name":"3b34a906-9e51-4d50-890e-c0464cf186c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be48cb9e-c609-45fd-84ff-262941825380","name":"be48cb9e-c609-45fd-84ff-262941825380","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f0523cc9-8bde-42af-ae6d-dfb0486170b1","name":"f0523cc9-8bde-42af-ae6d-dfb0486170b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8df70f45-6df1-4469-8cac-6c18c853c909","name":"8df70f45-6df1-4469-8cac-6c18c853c909","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b2de682d-52d8-44fa-a041-5b24e23b00c6","name":"b2de682d-52d8-44fa-a041-5b24e23b00c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"56e9abd5-a55b-4417-98e1-8ddb4e497854","name":"56e9abd5-a55b-4417-98e1-8ddb4e497854","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a483d3b7-7327-43ce-bbc0-5782b9e1fc32","name":"a483d3b7-7327-43ce-bbc0-5782b9e1fc32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b4d9e078-40b2-468a-8d88-2e7fecf08af4","name":"b4d9e078-40b2-468a-8d88-2e7fecf08af4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e48b811b-5351-4a05-9ff3-e22a8a1bf68a","name":"e48b811b-5351-4a05-9ff3-e22a8a1bf68a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b0d4742-fe04-4728-a0e6-c25b3972b9de","name":"3b0d4742-fe04-4728-a0e6-c25b3972b9de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9d66e71a-806a-4c69-8f85-c61673e764ec","name":"9d66e71a-806a-4c69-8f85-c61673e764ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"36f3175c-b588-4d53-9be9-777ea6b2af5f","name":"36f3175c-b588-4d53-9be9-777ea6b2af5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1e4cd4e-c2af-49fe-95a3-0ecdc1958337","name":"d1e4cd4e-c2af-49fe-95a3-0ecdc1958337","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d2ada39-7bde-45e5-9bf4-2049b332fbcf","name":"7d2ada39-7bde-45e5-9bf4-2049b332fbcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"80e007d2-f590-4e0d-a322-e3a724ad18c3","name":"80e007d2-f590-4e0d-a322-e3a724ad18c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6759d1a5-9c36-4fa0-b87f-0bcba8445559","name":"6759d1a5-9c36-4fa0-b87f-0bcba8445559","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"951b1418-c23f-4741-8e06-4e4fc942ac4b","name":"951b1418-c23f-4741-8e06-4e4fc942ac4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"93799c01-29ea-4d9e-8f9b-a5a828787de9","name":"93799c01-29ea-4d9e-8f9b-a5a828787de9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9faabb4d-ab74-4e3b-ae9a-98c0658601ed","name":"9faabb4d-ab74-4e3b-ae9a-98c0658601ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8062dd9f-e092-4cb0-89d2-01d6c20dff51","name":"8062dd9f-e092-4cb0-89d2-01d6c20dff51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7eee6f9-a600-4fe7-8ea2-42705c1addc1","name":"f7eee6f9-a600-4fe7-8ea2-42705c1addc1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e838345a-58e0-4c27-8ac5-e0293dc62516","name":"e838345a-58e0-4c27-8ac5-e0293dc62516","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31948616-30f8-49af-aac8-36578e149f6d","name":"31948616-30f8-49af-aac8-36578e149f6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93a8b121-857c-436d-80f4-190f9e822d48","name":"93a8b121-857c-436d-80f4-190f9e822d48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b18b7461-af7c-46f9-bb4b-908dbf23ee4b","name":"b18b7461-af7c-46f9-bb4b-908dbf23ee4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4eb7e8d-2608-4b34-ab31-05efaf6636fe","name":"f4eb7e8d-2608-4b34-ab31-05efaf6636fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b34a906-9e51-4d50-890e-c0464cf186c1","name":"3b34a906-9e51-4d50-890e-c0464cf186c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be48cb9e-c609-45fd-84ff-262941825380","name":"be48cb9e-c609-45fd-84ff-262941825380","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0523cc9-8bde-42af-ae6d-dfb0486170b1","name":"f0523cc9-8bde-42af-ae6d-dfb0486170b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8df70f45-6df1-4469-8cac-6c18c853c909","name":"8df70f45-6df1-4469-8cac-6c18c853c909","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b2de682d-52d8-44fa-a041-5b24e23b00c6","name":"b2de682d-52d8-44fa-a041-5b24e23b00c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"56e9abd5-a55b-4417-98e1-8ddb4e497854","name":"56e9abd5-a55b-4417-98e1-8ddb4e497854","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a483d3b7-7327-43ce-bbc0-5782b9e1fc32","name":"a483d3b7-7327-43ce-bbc0-5782b9e1fc32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b4d9e078-40b2-468a-8d88-2e7fecf08af4","name":"b4d9e078-40b2-468a-8d88-2e7fecf08af4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e48b811b-5351-4a05-9ff3-e22a8a1bf68a","name":"e48b811b-5351-4a05-9ff3-e22a8a1bf68a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b0d4742-fe04-4728-a0e6-c25b3972b9de","name":"3b0d4742-fe04-4728-a0e6-c25b3972b9de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9d66e71a-806a-4c69-8f85-c61673e764ec","name":"9d66e71a-806a-4c69-8f85-c61673e764ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"36f3175c-b588-4d53-9be9-777ea6b2af5f","name":"36f3175c-b588-4d53-9be9-777ea6b2af5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1e4cd4e-c2af-49fe-95a3-0ecdc1958337","name":"d1e4cd4e-c2af-49fe-95a3-0ecdc1958337","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d2ada39-7bde-45e5-9bf4-2049b332fbcf","name":"7d2ada39-7bde-45e5-9bf4-2049b332fbcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"80e007d2-f590-4e0d-a322-e3a724ad18c3","name":"80e007d2-f590-4e0d-a322-e3a724ad18c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6759d1a5-9c36-4fa0-b87f-0bcba8445559","name":"6759d1a5-9c36-4fa0-b87f-0bcba8445559","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"951b1418-c23f-4741-8e06-4e4fc942ac4b","name":"951b1418-c23f-4741-8e06-4e4fc942ac4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93799c01-29ea-4d9e-8f9b-a5a828787de9","name":"93799c01-29ea-4d9e-8f9b-a5a828787de9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9faabb4d-ab74-4e3b-ae9a-98c0658601ed","name":"9faabb4d-ab74-4e3b-ae9a-98c0658601ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8062dd9f-e092-4cb0-89d2-01d6c20dff51","name":"8062dd9f-e092-4cb0-89d2-01d6c20dff51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,84 +93,32 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7eee6f9-a600-4fe7-8ea2-42705c1addc1","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"745c819e-96d8-4c95-8b47-89ff41c247c4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e838345a-58e0-4c27-8ac5-e0293dc62516","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ce1a5f9-812b-441a-a891-60860d9cf989","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31948616-30f8-49af-aac8-36578e149f6d","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"950fa642-1358-4e91-9b3a-13ecf677c112","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93a8b121-857c-436d-80f4-190f9e822d48","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"55800409-f864-4c40-8ece-15d95fe2b7f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b18b7461-af7c-46f9-bb4b-908dbf23ee4b","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"35b2b72f-a58f-46ae-8e6a-197c5a52dd2e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4eb7e8d-2608-4b34-ab31-05efaf6636fe","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"638848fb-2f6c-4926-b759-4c43d0107f62","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b34a906-9e51-4d50-890e-c0464cf186c1","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"728bd650-abfe-415c-aa44-542f4871435c","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be48cb9e-c609-45fd-84ff-262941825380","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b084b89f-9863-4b53-836d-541d30ebdc52","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0523cc9-8bde-42af-ae6d-dfb0486170b1","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a90b8bb-d548-4a36-bb7c-22b8c72f389d","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8df70f45-6df1-4469-8cac-6c18c853c909","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"964f61ad-8913-4277-beaa-b1fb46e30794","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2de682d-52d8-44fa-a041-5b24e23b00c6","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5b5ae6b0-ecbd-464b-9098-6cba869713cc","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"56e9abd5-a55b-4417-98e1-8ddb4e497854","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be0cbcbd-3f06-4fbb-9186-97abc63b9765","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a483d3b7-7327-43ce-bbc0-5782b9e1fc32","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a39bba5-201e-4fa1-903e-c7e99bf6009a","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4d9e078-40b2-468a-8d88-2e7fecf08af4","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"76ddaa53-58cd-49a0-9fa4-6f61ae15d272","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e48b811b-5351-4a05-9ff3-e22a8a1bf68a","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a467f7e2-ccae-4747-90fc-73374b7159bf","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b0d4742-fe04-4728-a0e6-c25b3972b9de","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"427351d0-5d22-40b7-ba8b-f59e9f53a436","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d66e71a-806a-4c69-8f85-c61673e764ec","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d054efea-45a0-4dc8-8f13-a322cf8f72b8","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"36f3175c-b588-4d53-9be9-777ea6b2af5f","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a811970b-129e-4008-92dd-6302786efe29","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1e4cd4e-c2af-49fe-95a3-0ecdc1958337","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0fb84d53-7b08-48b9-a504-7065fc374de4","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d2ada39-7bde-45e5-9bf4-2049b332fbcf","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ee9e33d-a006-4891-9cf5-a55783e3d01b","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"80e007d2-f590-4e0d-a322-e3a724ad18c3","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19ce3321-9253-46f0-b4c0-d25848d837d9","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6759d1a5-9c36-4fa0-b87f-0bcba8445559","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d757e25b-b666-41be-854c-f7ba9dad9992","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"951b1418-c23f-4741-8e06-4e4fc942ac4b","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15f3cb7e-0910-4c68-b1b7-cfe0b05b485b","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93799c01-29ea-4d9e-8f9b-a5a828787de9","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7af914d7-8869-4b94-9f92-0352412527d3","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9faabb4d-ab74-4e3b-ae9a-98c0658601ed","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1c949337-3477-45c9-9edb-ce35f327e368","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8062dd9f-e092-4cb0-89d2-01d6c20dff51","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15d6f074-c5d6-4261-b0b8-947b5447cce0","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7eee6f9-a600-4fe7-8ea2-42705c1addc1","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"745c819e-96d8-4c95-8b47-89ff41c247c4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e838345a-58e0-4c27-8ac5-e0293dc62516","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ce1a5f9-812b-441a-a891-60860d9cf989","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31948616-30f8-49af-aac8-36578e149f6d","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"950fa642-1358-4e91-9b3a-13ecf677c112","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93a8b121-857c-436d-80f4-190f9e822d48","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"55800409-f864-4c40-8ece-15d95fe2b7f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b18b7461-af7c-46f9-bb4b-908dbf23ee4b","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"35b2b72f-a58f-46ae-8e6a-197c5a52dd2e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4eb7e8d-2608-4b34-ab31-05efaf6636fe","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"638848fb-2f6c-4926-b759-4c43d0107f62","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b34a906-9e51-4d50-890e-c0464cf186c1","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"728bd650-abfe-415c-aa44-542f4871435c","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be48cb9e-c609-45fd-84ff-262941825380","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b084b89f-9863-4b53-836d-541d30ebdc52","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0523cc9-8bde-42af-ae6d-dfb0486170b1","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a90b8bb-d548-4a36-bb7c-22b8c72f389d","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8df70f45-6df1-4469-8cac-6c18c853c909","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"964f61ad-8913-4277-beaa-b1fb46e30794","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2de682d-52d8-44fa-a041-5b24e23b00c6","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5b5ae6b0-ecbd-464b-9098-6cba869713cc","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"56e9abd5-a55b-4417-98e1-8ddb4e497854","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be0cbcbd-3f06-4fbb-9186-97abc63b9765","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a483d3b7-7327-43ce-bbc0-5782b9e1fc32","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a39bba5-201e-4fa1-903e-c7e99bf6009a","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4d9e078-40b2-468a-8d88-2e7fecf08af4","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76ddaa53-58cd-49a0-9fa4-6f61ae15d272","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e48b811b-5351-4a05-9ff3-e22a8a1bf68a","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a467f7e2-ccae-4747-90fc-73374b7159bf","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b0d4742-fe04-4728-a0e6-c25b3972b9de","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"427351d0-5d22-40b7-ba8b-f59e9f53a436","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d66e71a-806a-4c69-8f85-c61673e764ec","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d054efea-45a0-4dc8-8f13-a322cf8f72b8","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"36f3175c-b588-4d53-9be9-777ea6b2af5f","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a811970b-129e-4008-92dd-6302786efe29","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1e4cd4e-c2af-49fe-95a3-0ecdc1958337","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0fb84d53-7b08-48b9-a504-7065fc374de4","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d2ada39-7bde-45e5-9bf4-2049b332fbcf","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ee9e33d-a006-4891-9cf5-a55783e3d01b","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"80e007d2-f590-4e0d-a322-e3a724ad18c3","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"19ce3321-9253-46f0-b4c0-d25848d837d9","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6759d1a5-9c36-4fa0-b87f-0bcba8445559","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d757e25b-b666-41be-854c-f7ba9dad9992","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"951b1418-c23f-4741-8e06-4e4fc942ac4b","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15f3cb7e-0910-4c68-b1b7-cfe0b05b485b","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93799c01-29ea-4d9e-8f9b-a5a828787de9","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7af914d7-8869-4b94-9f92-0352412527d3","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9faabb4d-ab74-4e3b-ae9a-98c0658601ed","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1c949337-3477-45c9-9edb-ce35f327e368","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8062dd9f-e092-4cb0-89d2-01d6c20dff51","path":"sprites/spr_happenings_green/spr_happenings_green.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15d6f074-c5d6-4261-b0b8-947b5447cce0","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_happenings_purple/spr_happenings_purple.yy b/sprites/spr_happenings_purple/spr_happenings_purple.yy index dbf4174427..4aa0565da9 100644 --- a/sprites/spr_happenings_purple/spr_happenings_purple.yy +++ b/sprites/spr_happenings_purple/spr_happenings_purple.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_happenings_purple", "bboxMode":0, "bbox_bottom":26, @@ -12,32 +12,32 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0e251917-274a-4022-aebe-7f1ef84f4d18","name":"0e251917-274a-4022-aebe-7f1ef84f4d18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8b1eadc-36d8-4f8d-8347-009726750698","name":"e8b1eadc-36d8-4f8d-8347-009726750698","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3118c3b6-10ff-49be-8a49-b3e61cd2b9e7","name":"3118c3b6-10ff-49be-8a49-b3e61cd2b9e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee9c762e-6200-48cb-a9df-a8e01d7bc6c6","name":"ee9c762e-6200-48cb-a9df-a8e01d7bc6c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"07c922be-6bc2-4f94-9727-696e167415e9","name":"07c922be-6bc2-4f94-9727-696e167415e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"025eea85-f9d3-4fc2-a87f-a2b3581a4486","name":"025eea85-f9d3-4fc2-a87f-a2b3581a4486","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5b2c54e4-3a1a-43e1-a5ea-0daf6ef79771","name":"5b2c54e4-3a1a-43e1-a5ea-0daf6ef79771","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c03f8ef8-9491-4560-86ed-3c0453a648b4","name":"c03f8ef8-9491-4560-86ed-3c0453a648b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"787b9142-d318-460e-962e-ee9cd7be3812","name":"787b9142-d318-460e-962e-ee9cd7be3812","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1a8ad05-e868-4d21-93b5-8c06ba2d886c","name":"b1a8ad05-e868-4d21-93b5-8c06ba2d886c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b7e13b91-fb39-4d22-b608-1034b2f8c0b6","name":"b7e13b91-fb39-4d22-b608-1034b2f8c0b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"007fc063-17cd-4e57-b579-c55acada2c3a","name":"007fc063-17cd-4e57-b579-c55acada2c3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ab63f795-03df-4b56-9112-2edb1303ade0","name":"ab63f795-03df-4b56-9112-2edb1303ade0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"35d92330-0437-48a3-afbd-6bd0df1dd08c","name":"35d92330-0437-48a3-afbd-6bd0df1dd08c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0bf10494-4d52-4155-a810-c7beeaad6556","name":"0bf10494-4d52-4155-a810-c7beeaad6556","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dcd74bf5-5b29-4430-abac-0dc4532ee836","name":"dcd74bf5-5b29-4430-abac-0dc4532ee836","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7a2765e3-69c4-462c-bb1b-ae8bf52c58ea","name":"7a2765e3-69c4-462c-bb1b-ae8bf52c58ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b07c48e3-7247-4d41-917e-25b96960603f","name":"b07c48e3-7247-4d41-917e-25b96960603f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14b440f8-abee-438e-b5b0-d7740be4d023","name":"14b440f8-abee-438e-b5b0-d7740be4d023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1be2ebf-14c2-44c3-8198-02012b07b454","name":"d1be2ebf-14c2-44c3-8198-02012b07b454","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e36f654d-3a6d-4620-9eb5-2c3cdbfdcf7f","name":"e36f654d-3a6d-4620-9eb5-2c3cdbfdcf7f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3183bac8-7d63-4455-92df-f84c41a528e4","name":"3183bac8-7d63-4455-92df-f84c41a528e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4a996b1d-29d6-4539-b44e-dc8596e6e3a7","name":"4a996b1d-29d6-4539-b44e-dc8596e6e3a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4895ac9f-18ba-4938-b37f-334b6e1f666b","name":"4895ac9f-18ba-4938-b37f-334b6e1f666b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c480d20-19d5-447d-8450-cdc6374c3ed1","name":"2c480d20-19d5-447d-8450-cdc6374c3ed1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74c20a03-082a-44b1-a7c0-a90ec20df6a4","name":"74c20a03-082a-44b1-a7c0-a90ec20df6a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0e251917-274a-4022-aebe-7f1ef84f4d18","name":"0e251917-274a-4022-aebe-7f1ef84f4d18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8b1eadc-36d8-4f8d-8347-009726750698","name":"e8b1eadc-36d8-4f8d-8347-009726750698","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3118c3b6-10ff-49be-8a49-b3e61cd2b9e7","name":"3118c3b6-10ff-49be-8a49-b3e61cd2b9e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee9c762e-6200-48cb-a9df-a8e01d7bc6c6","name":"ee9c762e-6200-48cb-a9df-a8e01d7bc6c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07c922be-6bc2-4f94-9727-696e167415e9","name":"07c922be-6bc2-4f94-9727-696e167415e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"025eea85-f9d3-4fc2-a87f-a2b3581a4486","name":"025eea85-f9d3-4fc2-a87f-a2b3581a4486","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5b2c54e4-3a1a-43e1-a5ea-0daf6ef79771","name":"5b2c54e4-3a1a-43e1-a5ea-0daf6ef79771","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c03f8ef8-9491-4560-86ed-3c0453a648b4","name":"c03f8ef8-9491-4560-86ed-3c0453a648b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"787b9142-d318-460e-962e-ee9cd7be3812","name":"787b9142-d318-460e-962e-ee9cd7be3812","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1a8ad05-e868-4d21-93b5-8c06ba2d886c","name":"b1a8ad05-e868-4d21-93b5-8c06ba2d886c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b7e13b91-fb39-4d22-b608-1034b2f8c0b6","name":"b7e13b91-fb39-4d22-b608-1034b2f8c0b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"007fc063-17cd-4e57-b579-c55acada2c3a","name":"007fc063-17cd-4e57-b579-c55acada2c3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ab63f795-03df-4b56-9112-2edb1303ade0","name":"ab63f795-03df-4b56-9112-2edb1303ade0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"35d92330-0437-48a3-afbd-6bd0df1dd08c","name":"35d92330-0437-48a3-afbd-6bd0df1dd08c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0bf10494-4d52-4155-a810-c7beeaad6556","name":"0bf10494-4d52-4155-a810-c7beeaad6556","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dcd74bf5-5b29-4430-abac-0dc4532ee836","name":"dcd74bf5-5b29-4430-abac-0dc4532ee836","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a2765e3-69c4-462c-bb1b-ae8bf52c58ea","name":"7a2765e3-69c4-462c-bb1b-ae8bf52c58ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b07c48e3-7247-4d41-917e-25b96960603f","name":"b07c48e3-7247-4d41-917e-25b96960603f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14b440f8-abee-438e-b5b0-d7740be4d023","name":"14b440f8-abee-438e-b5b0-d7740be4d023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1be2ebf-14c2-44c3-8198-02012b07b454","name":"d1be2ebf-14c2-44c3-8198-02012b07b454","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e36f654d-3a6d-4620-9eb5-2c3cdbfdcf7f","name":"e36f654d-3a6d-4620-9eb5-2c3cdbfdcf7f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3183bac8-7d63-4455-92df-f84c41a528e4","name":"3183bac8-7d63-4455-92df-f84c41a528e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a996b1d-29d6-4539-b44e-dc8596e6e3a7","name":"4a996b1d-29d6-4539-b44e-dc8596e6e3a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4895ac9f-18ba-4938-b37f-334b6e1f666b","name":"4895ac9f-18ba-4938-b37f-334b6e1f666b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c480d20-19d5-447d-8450-cdc6374c3ed1","name":"2c480d20-19d5-447d-8450-cdc6374c3ed1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74c20a03-082a-44b1-a7c0-a90ec20df6a4","name":"74c20a03-082a-44b1-a7c0-a90ec20df6a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,84 +93,32 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e251917-274a-4022-aebe-7f1ef84f4d18","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"99e28c59-beaf-400b-8431-9914197ed53f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8b1eadc-36d8-4f8d-8347-009726750698","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"49a48d30-cfc2-4b5b-9d89-a7a7bd3192a4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3118c3b6-10ff-49be-8a49-b3e61cd2b9e7","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"803e093b-ea1e-44cf-ab17-556e227c97e7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee9c762e-6200-48cb-a9df-a8e01d7bc6c6","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2f1ebd62-e696-4644-b6e4-0677a7062937","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07c922be-6bc2-4f94-9727-696e167415e9","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"216fa637-5887-438e-bc8d-7d8365ccc14c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"025eea85-f9d3-4fc2-a87f-a2b3581a4486","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8fb83f23-e74d-4fe0-adf1-6d3e5f61da5d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b2c54e4-3a1a-43e1-a5ea-0daf6ef79771","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2041d30a-4bac-42f2-88d8-a4ee5ba766f5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c03f8ef8-9491-4560-86ed-3c0453a648b4","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"222a9927-7e69-4a21-b86f-79dedd00b175","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"787b9142-d318-460e-962e-ee9cd7be3812","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e650480b-fc10-418b-94eb-555e2d95c1d6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1a8ad05-e868-4d21-93b5-8c06ba2d886c","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f049630-1fbe-4931-a67e-2790e6ca19bb","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7e13b91-fb39-4d22-b608-1034b2f8c0b6","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3928b504-cf3f-4d64-8abb-d52cfa9ad8ac","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"007fc063-17cd-4e57-b579-c55acada2c3a","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8257ae86-ed7d-4c6c-b42b-623fd22d6cb3","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab63f795-03df-4b56-9112-2edb1303ade0","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a853e2bd-258c-4792-81f0-0c2dd1fec278","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"35d92330-0437-48a3-afbd-6bd0df1dd08c","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"adac555f-9e31-45dc-b15e-d17f482548d2","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0bf10494-4d52-4155-a810-c7beeaad6556","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0385d9ab-58d6-4617-9b29-dc1ccc2e6d4c","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dcd74bf5-5b29-4430-abac-0dc4532ee836","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c89f3524-bf42-4eb9-809a-50843abe2909","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a2765e3-69c4-462c-bb1b-ae8bf52c58ea","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9623fc7a-9d63-4fd2-825d-11fe1b9abba5","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b07c48e3-7247-4d41-917e-25b96960603f","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2b7a1dc-63d3-429b-92df-7668d84472b3","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14b440f8-abee-438e-b5b0-d7740be4d023","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f5726aa-d67c-4b40-ba42-c252d41af20a","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1be2ebf-14c2-44c3-8198-02012b07b454","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e6be25f-0897-420e-9f3e-b2c8fd213e00","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e36f654d-3a6d-4620-9eb5-2c3cdbfdcf7f","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f1f49eaf-e95b-43ce-9729-dfc34380fed9","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3183bac8-7d63-4455-92df-f84c41a528e4","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"692aecbc-cacc-48fc-a477-be9a83c215c2","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a996b1d-29d6-4539-b44e-dc8596e6e3a7","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cea7b002-c69b-4de4-995e-ff8f43fb02d5","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4895ac9f-18ba-4938-b37f-334b6e1f666b","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5e5169dd-744c-4965-bbfd-0b681a9cee55","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c480d20-19d5-447d-8450-cdc6374c3ed1","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"953c6f1d-faca-4f58-a533-a79734d78256","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74c20a03-082a-44b1-a7c0-a90ec20df6a4","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"43a591f8-5ad0-4222-bf9a-f71878d35e58","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e251917-274a-4022-aebe-7f1ef84f4d18","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"99e28c59-beaf-400b-8431-9914197ed53f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8b1eadc-36d8-4f8d-8347-009726750698","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"49a48d30-cfc2-4b5b-9d89-a7a7bd3192a4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3118c3b6-10ff-49be-8a49-b3e61cd2b9e7","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"803e093b-ea1e-44cf-ab17-556e227c97e7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee9c762e-6200-48cb-a9df-a8e01d7bc6c6","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2f1ebd62-e696-4644-b6e4-0677a7062937","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07c922be-6bc2-4f94-9727-696e167415e9","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"216fa637-5887-438e-bc8d-7d8365ccc14c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"025eea85-f9d3-4fc2-a87f-a2b3581a4486","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8fb83f23-e74d-4fe0-adf1-6d3e5f61da5d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b2c54e4-3a1a-43e1-a5ea-0daf6ef79771","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2041d30a-4bac-42f2-88d8-a4ee5ba766f5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c03f8ef8-9491-4560-86ed-3c0453a648b4","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"222a9927-7e69-4a21-b86f-79dedd00b175","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"787b9142-d318-460e-962e-ee9cd7be3812","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e650480b-fc10-418b-94eb-555e2d95c1d6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1a8ad05-e868-4d21-93b5-8c06ba2d886c","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f049630-1fbe-4931-a67e-2790e6ca19bb","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7e13b91-fb39-4d22-b608-1034b2f8c0b6","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3928b504-cf3f-4d64-8abb-d52cfa9ad8ac","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"007fc063-17cd-4e57-b579-c55acada2c3a","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8257ae86-ed7d-4c6c-b42b-623fd22d6cb3","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab63f795-03df-4b56-9112-2edb1303ade0","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a853e2bd-258c-4792-81f0-0c2dd1fec278","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"35d92330-0437-48a3-afbd-6bd0df1dd08c","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"adac555f-9e31-45dc-b15e-d17f482548d2","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0bf10494-4d52-4155-a810-c7beeaad6556","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0385d9ab-58d6-4617-9b29-dc1ccc2e6d4c","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dcd74bf5-5b29-4430-abac-0dc4532ee836","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c89f3524-bf42-4eb9-809a-50843abe2909","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a2765e3-69c4-462c-bb1b-ae8bf52c58ea","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9623fc7a-9d63-4fd2-825d-11fe1b9abba5","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b07c48e3-7247-4d41-917e-25b96960603f","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2b7a1dc-63d3-429b-92df-7668d84472b3","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14b440f8-abee-438e-b5b0-d7740be4d023","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f5726aa-d67c-4b40-ba42-c252d41af20a","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d1be2ebf-14c2-44c3-8198-02012b07b454","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e6be25f-0897-420e-9f3e-b2c8fd213e00","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e36f654d-3a6d-4620-9eb5-2c3cdbfdcf7f","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f1f49eaf-e95b-43ce-9729-dfc34380fed9","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3183bac8-7d63-4455-92df-f84c41a528e4","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"692aecbc-cacc-48fc-a477-be9a83c215c2","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a996b1d-29d6-4539-b44e-dc8596e6e3a7","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cea7b002-c69b-4de4-995e-ff8f43fb02d5","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4895ac9f-18ba-4938-b37f-334b6e1f666b","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5e5169dd-744c-4965-bbfd-0b681a9cee55","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c480d20-19d5-447d-8450-cdc6374c3ed1","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"953c6f1d-faca-4f58-a533-a79734d78256","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74c20a03-082a-44b1-a7c0-a90ec20df6a4","path":"sprites/spr_happenings_purple/spr_happenings_purple.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"43a591f8-5ad0-4222-bf9a-f71878d35e58","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_happenings_red/spr_happenings_red.yy b/sprites/spr_happenings_red/spr_happenings_red.yy index 55e4506ab4..a4ef72e0df 100644 --- a/sprites/spr_happenings_red/spr_happenings_red.yy +++ b/sprites/spr_happenings_red/spr_happenings_red.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_happenings_red", "bboxMode":0, "bbox_bottom":26, @@ -12,32 +12,32 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"875e4422-5ff1-429f-b010-07dcd9a0e0dd","name":"875e4422-5ff1-429f-b010-07dcd9a0e0dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0776aab0-4b83-421d-b34e-a0a8e547af6f","name":"0776aab0-4b83-421d-b34e-a0a8e547af6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"104f8e4e-ab5e-4090-a0b0-09c49401079c","name":"104f8e4e-ab5e-4090-a0b0-09c49401079c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f4ebf29-9c43-427c-b41a-4febf1346d2e","name":"1f4ebf29-9c43-427c-b41a-4febf1346d2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed375340-eb85-4e35-8853-8e2aee6158f7","name":"ed375340-eb85-4e35-8853-8e2aee6158f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7467dd9b-dc2f-4ba2-a8f3-866de70789c0","name":"7467dd9b-dc2f-4ba2-a8f3-866de70789c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8ca89c50-74ea-439e-8523-e29bbee491be","name":"8ca89c50-74ea-439e-8523-e29bbee491be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6599305c-49fe-4081-9df0-062c0bbc4ab3","name":"6599305c-49fe-4081-9df0-062c0bbc4ab3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ce7c933c-d33d-4731-812f-ba20aa79c455","name":"ce7c933c-d33d-4731-812f-ba20aa79c455","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"759e6bd7-3124-4ecd-80b2-24c5f141deac","name":"759e6bd7-3124-4ecd-80b2-24c5f141deac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a1520983-f5b1-48fc-9005-eb156b6d23f2","name":"a1520983-f5b1-48fc-9005-eb156b6d23f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"986fe1b6-a5f3-4f25-b2f3-e22d72d878fe","name":"986fe1b6-a5f3-4f25-b2f3-e22d72d878fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fc58c4d0-0336-4946-9c6a-37233859677e","name":"fc58c4d0-0336-4946-9c6a-37233859677e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"57293e1e-1ebe-465a-86e2-f399d62ec36a","name":"57293e1e-1ebe-465a-86e2-f399d62ec36a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f30fa43-f771-4473-ae7f-8842fd842305","name":"7f30fa43-f771-4473-ae7f-8842fd842305","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0a0c875f-5446-4d13-b3dd-c95e9faa65db","name":"0a0c875f-5446-4d13-b3dd-c95e9faa65db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"52f1e27b-7cb6-4fbf-adcf-8e41ff82389b","name":"52f1e27b-7cb6-4fbf-adcf-8e41ff82389b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b956abf4-e68c-4dd8-b5a6-23e43628b07d","name":"b956abf4-e68c-4dd8-b5a6-23e43628b07d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ebb6819b-602f-4389-8bb5-4fd04def2f6d","name":"ebb6819b-602f-4389-8bb5-4fd04def2f6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9f1692f1-087f-4c1f-947b-4f20e9b18ee1","name":"9f1692f1-087f-4c1f-947b-4f20e9b18ee1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"75defacc-6f38-4352-aef7-fc555ee4287b","name":"75defacc-6f38-4352-aef7-fc555ee4287b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"591c2f2a-35a8-47ee-a88d-2b2c05c9689e","name":"591c2f2a-35a8-47ee-a88d-2b2c05c9689e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c684fa07-3dac-4eba-bfef-0fe387085f3c","name":"c684fa07-3dac-4eba-bfef-0fe387085f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2d9bc79a-9105-4a68-9ab8-0dbb18f54bc5","name":"2d9bc79a-9105-4a68-9ab8-0dbb18f54bc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d38e55da-771c-4f5d-9066-e2e293ca559f","name":"d38e55da-771c-4f5d-9066-e2e293ca559f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87a8e843-7d8f-40ed-91ca-bf83a5b9fe8f","name":"87a8e843-7d8f-40ed-91ca-bf83a5b9fe8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"875e4422-5ff1-429f-b010-07dcd9a0e0dd","name":"875e4422-5ff1-429f-b010-07dcd9a0e0dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0776aab0-4b83-421d-b34e-a0a8e547af6f","name":"0776aab0-4b83-421d-b34e-a0a8e547af6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"104f8e4e-ab5e-4090-a0b0-09c49401079c","name":"104f8e4e-ab5e-4090-a0b0-09c49401079c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f4ebf29-9c43-427c-b41a-4febf1346d2e","name":"1f4ebf29-9c43-427c-b41a-4febf1346d2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed375340-eb85-4e35-8853-8e2aee6158f7","name":"ed375340-eb85-4e35-8853-8e2aee6158f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7467dd9b-dc2f-4ba2-a8f3-866de70789c0","name":"7467dd9b-dc2f-4ba2-a8f3-866de70789c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8ca89c50-74ea-439e-8523-e29bbee491be","name":"8ca89c50-74ea-439e-8523-e29bbee491be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6599305c-49fe-4081-9df0-062c0bbc4ab3","name":"6599305c-49fe-4081-9df0-062c0bbc4ab3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce7c933c-d33d-4731-812f-ba20aa79c455","name":"ce7c933c-d33d-4731-812f-ba20aa79c455","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"759e6bd7-3124-4ecd-80b2-24c5f141deac","name":"759e6bd7-3124-4ecd-80b2-24c5f141deac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a1520983-f5b1-48fc-9005-eb156b6d23f2","name":"a1520983-f5b1-48fc-9005-eb156b6d23f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"986fe1b6-a5f3-4f25-b2f3-e22d72d878fe","name":"986fe1b6-a5f3-4f25-b2f3-e22d72d878fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fc58c4d0-0336-4946-9c6a-37233859677e","name":"fc58c4d0-0336-4946-9c6a-37233859677e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"57293e1e-1ebe-465a-86e2-f399d62ec36a","name":"57293e1e-1ebe-465a-86e2-f399d62ec36a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f30fa43-f771-4473-ae7f-8842fd842305","name":"7f30fa43-f771-4473-ae7f-8842fd842305","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a0c875f-5446-4d13-b3dd-c95e9faa65db","name":"0a0c875f-5446-4d13-b3dd-c95e9faa65db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52f1e27b-7cb6-4fbf-adcf-8e41ff82389b","name":"52f1e27b-7cb6-4fbf-adcf-8e41ff82389b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b956abf4-e68c-4dd8-b5a6-23e43628b07d","name":"b956abf4-e68c-4dd8-b5a6-23e43628b07d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ebb6819b-602f-4389-8bb5-4fd04def2f6d","name":"ebb6819b-602f-4389-8bb5-4fd04def2f6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f1692f1-087f-4c1f-947b-4f20e9b18ee1","name":"9f1692f1-087f-4c1f-947b-4f20e9b18ee1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"75defacc-6f38-4352-aef7-fc555ee4287b","name":"75defacc-6f38-4352-aef7-fc555ee4287b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"591c2f2a-35a8-47ee-a88d-2b2c05c9689e","name":"591c2f2a-35a8-47ee-a88d-2b2c05c9689e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c684fa07-3dac-4eba-bfef-0fe387085f3c","name":"c684fa07-3dac-4eba-bfef-0fe387085f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2d9bc79a-9105-4a68-9ab8-0dbb18f54bc5","name":"2d9bc79a-9105-4a68-9ab8-0dbb18f54bc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d38e55da-771c-4f5d-9066-e2e293ca559f","name":"d38e55da-771c-4f5d-9066-e2e293ca559f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87a8e843-7d8f-40ed-91ca-bf83a5b9fe8f","name":"87a8e843-7d8f-40ed-91ca-bf83a5b9fe8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,84 +93,32 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"875e4422-5ff1-429f-b010-07dcd9a0e0dd","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a609cf76-7e31-401e-9f69-864eeed79125","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0776aab0-4b83-421d-b34e-a0a8e547af6f","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f94f71d-4218-4c65-8562-932bc9aab55e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"104f8e4e-ab5e-4090-a0b0-09c49401079c","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"336b123b-c603-4911-a5ac-a943e4ab1cde","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f4ebf29-9c43-427c-b41a-4febf1346d2e","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad31793a-0d2b-45df-8b1a-8111fa131e4a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed375340-eb85-4e35-8853-8e2aee6158f7","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f299a66-ecd2-437c-8a59-b6f1723872c9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7467dd9b-dc2f-4ba2-a8f3-866de70789c0","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"48fa8cfc-885a-4522-bc2e-d06185e88936","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ca89c50-74ea-439e-8523-e29bbee491be","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"342fcc76-339b-4687-a07d-c180450f3c16","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6599305c-49fe-4081-9df0-062c0bbc4ab3","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b94f4dd1-b70c-4c68-b654-f81d679070ea","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce7c933c-d33d-4731-812f-ba20aa79c455","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e7ed7e3-9268-4b60-a425-08216d48ab45","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"759e6bd7-3124-4ecd-80b2-24c5f141deac","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b4401e08-0451-4eb1-82a2-49f251e73782","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a1520983-f5b1-48fc-9005-eb156b6d23f2","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"28edf77c-81e6-41dc-aea5-ddbd45eedb24","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"986fe1b6-a5f3-4f25-b2f3-e22d72d878fe","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7afe7900-0c18-412f-a0b9-99b09b4fc907","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc58c4d0-0336-4946-9c6a-37233859677e","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b0559484-0dcc-4929-be8b-030fda2cd9f4","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57293e1e-1ebe-465a-86e2-f399d62ec36a","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f08c81b4-d642-465a-9bcc-ff978084d5e6","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f30fa43-f771-4473-ae7f-8842fd842305","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b576b8c2-7730-49ba-b3af-8f041e6a7004","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a0c875f-5446-4d13-b3dd-c95e9faa65db","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44a1cae7-a20d-4769-b9d1-ff846d701be0","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52f1e27b-7cb6-4fbf-adcf-8e41ff82389b","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c9977911-186b-4bb2-b96d-1335acd7ca1a","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b956abf4-e68c-4dd8-b5a6-23e43628b07d","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6334c8b2-d4ee-4d7e-9f68-b05ffa179c00","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebb6819b-602f-4389-8bb5-4fd04def2f6d","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"da60249f-07d2-49f5-a278-a58f76072e9e","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f1692f1-087f-4c1f-947b-4f20e9b18ee1","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c2245027-c0c6-462a-999c-70f5cd819845","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"75defacc-6f38-4352-aef7-fc555ee4287b","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94169a22-41e2-4c11-84d6-e84a40d73fa1","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"591c2f2a-35a8-47ee-a88d-2b2c05c9689e","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69343e54-7967-430b-ac91-3f2947665045","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c684fa07-3dac-4eba-bfef-0fe387085f3c","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c32821f-2eb0-47bd-b28c-ec5ef91289af","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d9bc79a-9105-4a68-9ab8-0dbb18f54bc5","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8def33c1-48c4-49ce-87b9-9b48767a4629","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d38e55da-771c-4f5d-9066-e2e293ca559f","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"30aeda48-f1b7-45e2-96ac-07343b38b05e","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a8e843-7d8f-40ed-91ca-bf83a5b9fe8f","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2a970055-ff2f-4335-a20b-baa03e7a902e","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"875e4422-5ff1-429f-b010-07dcd9a0e0dd","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a609cf76-7e31-401e-9f69-864eeed79125","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0776aab0-4b83-421d-b34e-a0a8e547af6f","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f94f71d-4218-4c65-8562-932bc9aab55e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"104f8e4e-ab5e-4090-a0b0-09c49401079c","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"336b123b-c603-4911-a5ac-a943e4ab1cde","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f4ebf29-9c43-427c-b41a-4febf1346d2e","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad31793a-0d2b-45df-8b1a-8111fa131e4a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed375340-eb85-4e35-8853-8e2aee6158f7","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f299a66-ecd2-437c-8a59-b6f1723872c9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7467dd9b-dc2f-4ba2-a8f3-866de70789c0","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"48fa8cfc-885a-4522-bc2e-d06185e88936","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ca89c50-74ea-439e-8523-e29bbee491be","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"342fcc76-339b-4687-a07d-c180450f3c16","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6599305c-49fe-4081-9df0-062c0bbc4ab3","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b94f4dd1-b70c-4c68-b654-f81d679070ea","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce7c933c-d33d-4731-812f-ba20aa79c455","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e7ed7e3-9268-4b60-a425-08216d48ab45","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"759e6bd7-3124-4ecd-80b2-24c5f141deac","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b4401e08-0451-4eb1-82a2-49f251e73782","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a1520983-f5b1-48fc-9005-eb156b6d23f2","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"28edf77c-81e6-41dc-aea5-ddbd45eedb24","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"986fe1b6-a5f3-4f25-b2f3-e22d72d878fe","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7afe7900-0c18-412f-a0b9-99b09b4fc907","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc58c4d0-0336-4946-9c6a-37233859677e","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b0559484-0dcc-4929-be8b-030fda2cd9f4","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"57293e1e-1ebe-465a-86e2-f399d62ec36a","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f08c81b4-d642-465a-9bcc-ff978084d5e6","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f30fa43-f771-4473-ae7f-8842fd842305","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b576b8c2-7730-49ba-b3af-8f041e6a7004","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a0c875f-5446-4d13-b3dd-c95e9faa65db","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44a1cae7-a20d-4769-b9d1-ff846d701be0","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52f1e27b-7cb6-4fbf-adcf-8e41ff82389b","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c9977911-186b-4bb2-b96d-1335acd7ca1a","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b956abf4-e68c-4dd8-b5a6-23e43628b07d","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6334c8b2-d4ee-4d7e-9f68-b05ffa179c00","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebb6819b-602f-4389-8bb5-4fd04def2f6d","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"da60249f-07d2-49f5-a278-a58f76072e9e","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f1692f1-087f-4c1f-947b-4f20e9b18ee1","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c2245027-c0c6-462a-999c-70f5cd819845","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"75defacc-6f38-4352-aef7-fc555ee4287b","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94169a22-41e2-4c11-84d6-e84a40d73fa1","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"591c2f2a-35a8-47ee-a88d-2b2c05c9689e","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69343e54-7967-430b-ac91-3f2947665045","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c684fa07-3dac-4eba-bfef-0fe387085f3c","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c32821f-2eb0-47bd-b28c-ec5ef91289af","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d9bc79a-9105-4a68-9ab8-0dbb18f54bc5","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8def33c1-48c4-49ce-87b9-9b48767a4629","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d38e55da-771c-4f5d-9066-e2e293ca559f","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"30aeda48-f1b7-45e2-96ac-07343b38b05e","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a8e843-7d8f-40ed-91ca-bf83a5b9fe8f","path":"sprites/spr_happenings_red/spr_happenings_red.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2a970055-ff2f-4335-a20b-baa03e7a902e","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_happenings_white/spr_happenings_white.yy b/sprites/spr_happenings_white/spr_happenings_white.yy index 6eef554e3b..036e52f07e 100644 --- a/sprites/spr_happenings_white/spr_happenings_white.yy +++ b/sprites/spr_happenings_white/spr_happenings_white.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_happenings_white", "bboxMode":0, "bbox_bottom":26, @@ -12,32 +12,32 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"db366810-b7ef-4b06-a650-0ad031ea4030","name":"db366810-b7ef-4b06-a650-0ad031ea4030","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bec5a8da-29d8-44ff-ab66-9a732260e0b7","name":"bec5a8da-29d8-44ff-ab66-9a732260e0b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b147563a-a642-4b95-88ec-8b5c5fcd8c2a","name":"b147563a-a642-4b95-88ec-8b5c5fcd8c2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8771864d-ef78-4813-a122-52bdb867d7ac","name":"8771864d-ef78-4813-a122-52bdb867d7ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"25f82305-5ae9-4cf2-a0f7-83004a916244","name":"25f82305-5ae9-4cf2-a0f7-83004a916244","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d34cfff3-6ff3-4190-b558-f948b52f7b9b","name":"d34cfff3-6ff3-4190-b558-f948b52f7b9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84bfc8ab-1d3e-4ef4-9feb-21f68e48657d","name":"84bfc8ab-1d3e-4ef4-9feb-21f68e48657d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"789318a1-bc9d-4d8d-9a61-9be44c0a316f","name":"789318a1-bc9d-4d8d-9a61-9be44c0a316f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"21f7e28a-eed5-4140-aecf-f05c28299a69","name":"21f7e28a-eed5-4140-aecf-f05c28299a69","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9f6abc50-4135-4fe4-a51b-ca18c1f83cf6","name":"9f6abc50-4135-4fe4-a51b-ca18c1f83cf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"272cff7c-eb42-43a2-96f9-b4fc9dfb9cb3","name":"272cff7c-eb42-43a2-96f9-b4fc9dfb9cb3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df268304-3c52-4b1b-90b2-ada0aa9cb36c","name":"df268304-3c52-4b1b-90b2-ada0aa9cb36c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74930daf-c3d9-40f6-a282-3f1d4eb13255","name":"74930daf-c3d9-40f6-a282-3f1d4eb13255","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"acc01f13-b505-469e-aade-3c7f016f5de6","name":"acc01f13-b505-469e-aade-3c7f016f5de6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df172a79-3eb7-4e71-abf0-298ac745e4c8","name":"df172a79-3eb7-4e71-abf0-298ac745e4c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3479f38-6d78-42c6-9775-655d05bbf083","name":"f3479f38-6d78-42c6-9775-655d05bbf083","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3303b30-741b-4fa7-952e-523e5e783594","name":"f3303b30-741b-4fa7-952e-523e5e783594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"331973c7-e242-4724-bb8e-496be15657a5","name":"331973c7-e242-4724-bb8e-496be15657a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"28c90c11-c3c8-48d0-b230-c527837c2ed9","name":"28c90c11-c3c8-48d0-b230-c527837c2ed9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"91e65543-2959-472c-b83a-1a4fd488da97","name":"91e65543-2959-472c-b83a-1a4fd488da97","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d8be2f75-eb75-411c-a410-b1198688b5ed","name":"d8be2f75-eb75-411c-a410-b1198688b5ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a3cda4e-3a07-4424-993c-184058b527f4","name":"3a3cda4e-3a07-4424-993c-184058b527f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b42945c-b1d7-45fc-a1f7-6194f24b9bca","name":"3b42945c-b1d7-45fc-a1f7-6194f24b9bca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0ffa34ec-3ef0-4e8a-8ffb-e0b1fa45c1e9","name":"0ffa34ec-3ef0-4e8a-8ffb-e0b1fa45c1e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7cd8bd1d-4d4b-4072-b23b-cd5d0203448a","name":"7cd8bd1d-4d4b-4072-b23b-cd5d0203448a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f01dbe5-fdd5-4643-8206-e365ccb951ae","name":"4f01dbe5-fdd5-4643-8206-e365ccb951ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db366810-b7ef-4b06-a650-0ad031ea4030","name":"db366810-b7ef-4b06-a650-0ad031ea4030","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bec5a8da-29d8-44ff-ab66-9a732260e0b7","name":"bec5a8da-29d8-44ff-ab66-9a732260e0b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b147563a-a642-4b95-88ec-8b5c5fcd8c2a","name":"b147563a-a642-4b95-88ec-8b5c5fcd8c2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8771864d-ef78-4813-a122-52bdb867d7ac","name":"8771864d-ef78-4813-a122-52bdb867d7ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25f82305-5ae9-4cf2-a0f7-83004a916244","name":"25f82305-5ae9-4cf2-a0f7-83004a916244","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d34cfff3-6ff3-4190-b558-f948b52f7b9b","name":"d34cfff3-6ff3-4190-b558-f948b52f7b9b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84bfc8ab-1d3e-4ef4-9feb-21f68e48657d","name":"84bfc8ab-1d3e-4ef4-9feb-21f68e48657d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"789318a1-bc9d-4d8d-9a61-9be44c0a316f","name":"789318a1-bc9d-4d8d-9a61-9be44c0a316f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"21f7e28a-eed5-4140-aecf-f05c28299a69","name":"21f7e28a-eed5-4140-aecf-f05c28299a69","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f6abc50-4135-4fe4-a51b-ca18c1f83cf6","name":"9f6abc50-4135-4fe4-a51b-ca18c1f83cf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"272cff7c-eb42-43a2-96f9-b4fc9dfb9cb3","name":"272cff7c-eb42-43a2-96f9-b4fc9dfb9cb3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df268304-3c52-4b1b-90b2-ada0aa9cb36c","name":"df268304-3c52-4b1b-90b2-ada0aa9cb36c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74930daf-c3d9-40f6-a282-3f1d4eb13255","name":"74930daf-c3d9-40f6-a282-3f1d4eb13255","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"acc01f13-b505-469e-aade-3c7f016f5de6","name":"acc01f13-b505-469e-aade-3c7f016f5de6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df172a79-3eb7-4e71-abf0-298ac745e4c8","name":"df172a79-3eb7-4e71-abf0-298ac745e4c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3479f38-6d78-42c6-9775-655d05bbf083","name":"f3479f38-6d78-42c6-9775-655d05bbf083","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3303b30-741b-4fa7-952e-523e5e783594","name":"f3303b30-741b-4fa7-952e-523e5e783594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"331973c7-e242-4724-bb8e-496be15657a5","name":"331973c7-e242-4724-bb8e-496be15657a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"28c90c11-c3c8-48d0-b230-c527837c2ed9","name":"28c90c11-c3c8-48d0-b230-c527837c2ed9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"91e65543-2959-472c-b83a-1a4fd488da97","name":"91e65543-2959-472c-b83a-1a4fd488da97","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d8be2f75-eb75-411c-a410-b1198688b5ed","name":"d8be2f75-eb75-411c-a410-b1198688b5ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a3cda4e-3a07-4424-993c-184058b527f4","name":"3a3cda4e-3a07-4424-993c-184058b527f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b42945c-b1d7-45fc-a1f7-6194f24b9bca","name":"3b42945c-b1d7-45fc-a1f7-6194f24b9bca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0ffa34ec-3ef0-4e8a-8ffb-e0b1fa45c1e9","name":"0ffa34ec-3ef0-4e8a-8ffb-e0b1fa45c1e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7cd8bd1d-4d4b-4072-b23b-cd5d0203448a","name":"7cd8bd1d-4d4b-4072-b23b-cd5d0203448a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f01dbe5-fdd5-4643-8206-e365ccb951ae","name":"4f01dbe5-fdd5-4643-8206-e365ccb951ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -93,84 +93,32 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db366810-b7ef-4b06-a650-0ad031ea4030","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9cbeabb6-aaed-49a4-b008-a6ba9d93b0fc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bec5a8da-29d8-44ff-ab66-9a732260e0b7","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ca8f550-2f9c-4ffe-a890-cff8f343a6ff","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b147563a-a642-4b95-88ec-8b5c5fcd8c2a","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ca19cbb-adb7-416c-921e-de5fcf67e097","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8771864d-ef78-4813-a122-52bdb867d7ac","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4b1d1f6a-2654-4d3d-9cb4-2175b67be6cb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25f82305-5ae9-4cf2-a0f7-83004a916244","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24513b92-e2f4-406c-92a3-52623989e130","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d34cfff3-6ff3-4190-b558-f948b52f7b9b","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"91eab546-b11c-4839-a684-cfb240728268","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84bfc8ab-1d3e-4ef4-9feb-21f68e48657d","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"da8c2012-fa1a-47e0-98e8-39fbbcc4666b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"789318a1-bc9d-4d8d-9a61-9be44c0a316f","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"294b2f0b-cc43-48da-94b1-95dabb64ec4b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"21f7e28a-eed5-4140-aecf-f05c28299a69","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5e053276-a55a-4ec7-84ab-3f03c59eb876","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f6abc50-4135-4fe4-a51b-ca18c1f83cf6","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ac04e0b-0322-4ce5-8479-aa2b9f2298c1","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"272cff7c-eb42-43a2-96f9-b4fc9dfb9cb3","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7dc53e61-8cd1-42f9-bcd7-d8ff4a4b2664","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df268304-3c52-4b1b-90b2-ada0aa9cb36c","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04ba7220-c090-48f1-b218-bc570efd422f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74930daf-c3d9-40f6-a282-3f1d4eb13255","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02350b0d-6f36-426e-a0b7-227bc38ed5f7","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"acc01f13-b505-469e-aade-3c7f016f5de6","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6450e76b-1b9d-42ca-b486-fb40dbe96b6e","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df172a79-3eb7-4e71-abf0-298ac745e4c8","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c5eb6695-00a5-41f8-99b0-09e4e6691c36","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3479f38-6d78-42c6-9775-655d05bbf083","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6ecc1b0-f532-4c2e-9686-348aee0c3eab","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3303b30-741b-4fa7-952e-523e5e783594","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a986ca6c-7ef4-4a1a-af74-c690f91294eb","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"331973c7-e242-4724-bb8e-496be15657a5","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5780f91e-608a-418f-951c-9b15d119cf10","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28c90c11-c3c8-48d0-b230-c527837c2ed9","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af3fcc7e-3102-4cdb-92a6-111103806493","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"91e65543-2959-472c-b83a-1a4fd488da97","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f2cba20-6809-4814-a71a-863fc204969e","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8be2f75-eb75-411c-a410-b1198688b5ed","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"08a26015-f688-4ef0-ae06-d5ecf8f7229d","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a3cda4e-3a07-4424-993c-184058b527f4","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a5a0bad-2ac5-42f2-8a58-b3b3e1198fda","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b42945c-b1d7-45fc-a1f7-6194f24b9bca","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a4cae83-48f2-4369-84bb-86f419daed59","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ffa34ec-3ef0-4e8a-8ffb-e0b1fa45c1e9","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf2fdd01-afe2-42fb-91cb-106d177a3348","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cd8bd1d-4d4b-4072-b23b-cd5d0203448a","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"59fc8afd-1c93-4a1f-b5cf-77fa8a5cb735","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f01dbe5-fdd5-4643-8206-e365ccb951ae","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e71a3f77-80c6-46fa-947b-e77c44d1942f","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db366810-b7ef-4b06-a650-0ad031ea4030","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9cbeabb6-aaed-49a4-b008-a6ba9d93b0fc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bec5a8da-29d8-44ff-ab66-9a732260e0b7","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ca8f550-2f9c-4ffe-a890-cff8f343a6ff","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b147563a-a642-4b95-88ec-8b5c5fcd8c2a","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ca19cbb-adb7-416c-921e-de5fcf67e097","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8771864d-ef78-4813-a122-52bdb867d7ac","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4b1d1f6a-2654-4d3d-9cb4-2175b67be6cb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25f82305-5ae9-4cf2-a0f7-83004a916244","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24513b92-e2f4-406c-92a3-52623989e130","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d34cfff3-6ff3-4190-b558-f948b52f7b9b","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"91eab546-b11c-4839-a684-cfb240728268","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84bfc8ab-1d3e-4ef4-9feb-21f68e48657d","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"da8c2012-fa1a-47e0-98e8-39fbbcc4666b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"789318a1-bc9d-4d8d-9a61-9be44c0a316f","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"294b2f0b-cc43-48da-94b1-95dabb64ec4b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"21f7e28a-eed5-4140-aecf-f05c28299a69","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5e053276-a55a-4ec7-84ab-3f03c59eb876","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f6abc50-4135-4fe4-a51b-ca18c1f83cf6","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ac04e0b-0322-4ce5-8479-aa2b9f2298c1","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"272cff7c-eb42-43a2-96f9-b4fc9dfb9cb3","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7dc53e61-8cd1-42f9-bcd7-d8ff4a4b2664","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df268304-3c52-4b1b-90b2-ada0aa9cb36c","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04ba7220-c090-48f1-b218-bc570efd422f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74930daf-c3d9-40f6-a282-3f1d4eb13255","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02350b0d-6f36-426e-a0b7-227bc38ed5f7","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"acc01f13-b505-469e-aade-3c7f016f5de6","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6450e76b-1b9d-42ca-b486-fb40dbe96b6e","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df172a79-3eb7-4e71-abf0-298ac745e4c8","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c5eb6695-00a5-41f8-99b0-09e4e6691c36","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3479f38-6d78-42c6-9775-655d05bbf083","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6ecc1b0-f532-4c2e-9686-348aee0c3eab","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3303b30-741b-4fa7-952e-523e5e783594","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a986ca6c-7ef4-4a1a-af74-c690f91294eb","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"331973c7-e242-4724-bb8e-496be15657a5","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5780f91e-608a-418f-951c-9b15d119cf10","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"28c90c11-c3c8-48d0-b230-c527837c2ed9","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af3fcc7e-3102-4cdb-92a6-111103806493","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"91e65543-2959-472c-b83a-1a4fd488da97","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f2cba20-6809-4814-a71a-863fc204969e","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8be2f75-eb75-411c-a410-b1198688b5ed","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08a26015-f688-4ef0-ae06-d5ecf8f7229d","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a3cda4e-3a07-4424-993c-184058b527f4","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a5a0bad-2ac5-42f2-8a58-b3b3e1198fda","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b42945c-b1d7-45fc-a1f7-6194f24b9bca","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a4cae83-48f2-4369-84bb-86f419daed59","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ffa34ec-3ef0-4e8a-8ffb-e0b1fa45c1e9","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf2fdd01-afe2-42fb-91cb-106d177a3348","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cd8bd1d-4d4b-4072-b23b-cd5d0203448a","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"59fc8afd-1c93-4a1f-b5cf-77fa8a5cb735","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f01dbe5-fdd5-4643-8206-e365ccb951ae","path":"sprites/spr_happenings_white/spr_happenings_white.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e71a3f77-80c6-46fa-947b-e77c44d1942f","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_hazzard_texture/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png b/sprites/spr_hazzard_texture/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png deleted file mode 100644 index ac7309e1d2..0000000000 Binary files a/sprites/spr_hazzard_texture/58ee1e71-509f-4b0e-ab39-17c8da2a0687.png and /dev/null differ diff --git a/sprites/spr_hazzard_texture/ae06e8a7-34d7-4e6f-87e7-adef654eb7c4.png b/sprites/spr_hazzard_texture/ae06e8a7-34d7-4e6f-87e7-adef654eb7c4.png new file mode 100644 index 0000000000..4e48cc78f7 Binary files /dev/null and b/sprites/spr_hazzard_texture/ae06e8a7-34d7-4e6f-87e7-adef654eb7c4.png differ diff --git a/sprites/spr_hazzard_texture/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png b/sprites/spr_hazzard_texture/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png deleted file mode 100644 index ac7309e1d2..0000000000 Binary files a/sprites/spr_hazzard_texture/layers/58ee1e71-509f-4b0e-ab39-17c8da2a0687/ef1f92c3-6086-487a-a4a8-c38f6098016b.png and /dev/null differ diff --git a/sprites/spr_hazzard_texture/layers/ae06e8a7-34d7-4e6f-87e7-adef654eb7c4/3baf4d60-c33b-4a8a-a630-7c0ae7fed205.png b/sprites/spr_hazzard_texture/layers/ae06e8a7-34d7-4e6f-87e7-adef654eb7c4/3baf4d60-c33b-4a8a-a630-7c0ae7fed205.png new file mode 100644 index 0000000000..4e48cc78f7 Binary files /dev/null and b/sprites/spr_hazzard_texture/layers/ae06e8a7-34d7-4e6f-87e7-adef654eb7c4/3baf4d60-c33b-4a8a-a630-7c0ae7fed205.png differ diff --git a/sprites/spr_hazzard_texture/spr_hazzard_texture.yy b/sprites/spr_hazzard_texture/spr_hazzard_texture.yy index 30d3a06da5..4118bdce36 100644 --- a/sprites/spr_hazzard_texture/spr_hazzard_texture.yy +++ b/sprites/spr_hazzard_texture/spr_hazzard_texture.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_hazzard_texture", "bboxMode":0, "bbox_bottom":179, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":true, "frames":[ - {"$GMSpriteFrame":"","%Name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae06e8a7-34d7-4e6f-87e7-adef654eb7c4","name":"ae06e8a7-34d7-4e6f-87e7-adef654eb7c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":180, "HTile":true, "layers":[ - {"$GMImageLayer":"","%Name":"ef1f92c3-6086-487a-a4a8-c38f6098016b","blendMode":0,"displayName":"default","isLocked":false,"name":"ef1f92c3-6086-487a-a4a8-c38f6098016b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"3baf4d60-c33b-4a8a-a630-7c0ae7fed205","blendMode":0,"displayName":"default","isLocked":false,"name":"3baf4d60-c33b-4a8a-a630-7c0ae7fed205","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"spr_hazzard_texture", "nineSlice":{ @@ -82,14 +82,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":180.0, + "seqWidth":180.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_hazzard_texture/spr_hazzard_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0091329d-a69b-44eb-84c6-f0a31350ebd2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae06e8a7-34d7-4e6f-87e7-adef654eb7c4","path":"sprites/spr_hazzard_texture/spr_hazzard_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a1a3706c-b282-4c02-b619-9782da359759","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_helm_decorations/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png b/sprites/spr_helm_decorations/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png index 58dc547f3d..f7cec5be14 100644 Binary files a/sprites/spr_helm_decorations/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png and b/sprites/spr_helm_decorations/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png differ diff --git a/sprites/spr_helm_decorations/61531cde-cd44-4806-ae39-3c63f51d65de.png b/sprites/spr_helm_decorations/61531cde-cd44-4806-ae39-3c63f51d65de.png index 0cdf0b209a..9dd5ced6b7 100644 Binary files a/sprites/spr_helm_decorations/61531cde-cd44-4806-ae39-3c63f51d65de.png and b/sprites/spr_helm_decorations/61531cde-cd44-4806-ae39-3c63f51d65de.png differ diff --git a/sprites/spr_helm_decorations/layers/3dbaa400-5fe2-498d-abd8-9cc4b2bda693/4ff43f57-b34a-4219-8298-0399265c623b.png b/sprites/spr_helm_decorations/layers/3dbaa400-5fe2-498d-abd8-9cc4b2bda693/4ff43f57-b34a-4219-8298-0399265c623b.png index 58dc547f3d..f7cec5be14 100644 Binary files a/sprites/spr_helm_decorations/layers/3dbaa400-5fe2-498d-abd8-9cc4b2bda693/4ff43f57-b34a-4219-8298-0399265c623b.png and b/sprites/spr_helm_decorations/layers/3dbaa400-5fe2-498d-abd8-9cc4b2bda693/4ff43f57-b34a-4219-8298-0399265c623b.png differ diff --git a/sprites/spr_helm_decorations/layers/61531cde-cd44-4806-ae39-3c63f51d65de/4ff43f57-b34a-4219-8298-0399265c623b.png b/sprites/spr_helm_decorations/layers/61531cde-cd44-4806-ae39-3c63f51d65de/4ff43f57-b34a-4219-8298-0399265c623b.png index 0cdf0b209a..9dd5ced6b7 100644 Binary files a/sprites/spr_helm_decorations/layers/61531cde-cd44-4806-ae39-3c63f51d65de/4ff43f57-b34a-4219-8298-0399265c623b.png and b/sprites/spr_helm_decorations/layers/61531cde-cd44-4806-ae39-3c63f51d65de/4ff43f57-b34a-4219-8298-0399265c623b.png differ diff --git a/sprites/spr_helm_decorations/spr_helm_decorations.yy b/sprites/spr_helm_decorations/spr_helm_decorations.yy index 3000e7f7ba..b0907d4a89 100644 --- a/sprites/spr_helm_decorations/spr_helm_decorations.yy +++ b/sprites/spr_helm_decorations/spr_helm_decorations.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_helm_decorations", "bboxMode":0, "bbox_bottom":78, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_helm_stripe/spr_helm_stripe.yy b/sprites/spr_helm_stripe/spr_helm_stripe.yy index 7ad442efe7..7bfd4f2a8d 100644 --- a/sprites/spr_helm_stripe/spr_helm_stripe.yy +++ b/sprites/spr_helm_stripe/spr_helm_stripe.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_helm_stripe", "bboxMode":0, "bbox_bottom":231, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f4fe527e-74d7-4032-a5e4-f08cd296d221","name":"f4fe527e-74d7-4032-a5e4-f08cd296d221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f9679102-ac16-49be-81c7-a76859c91828","name":"f9679102-ac16-49be-81c7-a76859c91828","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f16d60e8-3436-42e4-8ada-e41323378a0d","name":"f16d60e8-3436-42e4-8ada-e41323378a0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4fe527e-74d7-4032-a5e4-f08cd296d221","name":"f4fe527e-74d7-4032-a5e4-f08cd296d221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9679102-ac16-49be-81c7-a76859c91828","name":"f9679102-ac16-49be-81c7-a76859c91828","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f16d60e8-3436-42e4-8ada-e41323378a0d","name":"f16d60e8-3436-42e4-8ada-e41323378a0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,15 +71,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4fe527e-74d7-4032-a5e4-f08cd296d221","path":"sprites/spr_helm_stripe/spr_helm_stripe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26f4dee6-051e-44b1-8d1e-45ba7e50c7a4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9679102-ac16-49be-81c7-a76859c91828","path":"sprites/spr_helm_stripe/spr_helm_stripe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4df215c-c404-4a0e-8307-02db1fc14b69","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f16d60e8-3436-42e4-8ada-e41323378a0d","path":"sprites/spr_helm_stripe/spr_helm_stripe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"43761bf0-cda0-4e6b-b420-5e4d14aa3afc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4fe527e-74d7-4032-a5e4-f08cd296d221","path":"sprites/spr_helm_stripe/spr_helm_stripe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26f4dee6-051e-44b1-8d1e-45ba7e50c7a4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9679102-ac16-49be-81c7-a76859c91828","path":"sprites/spr_helm_stripe/spr_helm_stripe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4df215c-c404-4a0e-8307-02db1fc14b69","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f16d60e8-3436-42e4-8ada-e41323378a0d","path":"sprites/spr_helm_stripe/spr_helm_stripe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"43761bf0-cda0-4e6b-b420-5e4d14aa3afc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy b/sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy index ceb7790f38..ae1af94e1a 100644 --- a/sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy +++ b/sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_helm_stripe_term", "bboxMode":0, "bbox_bottom":63, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f9679102-ac16-49be-81c7-a76859c91828","name":"f9679102-ac16-49be-81c7-a76859c91828","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f16d60e8-3436-42e4-8ada-e41323378a0d","name":"f16d60e8-3436-42e4-8ada-e41323378a0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9679102-ac16-49be-81c7-a76859c91828","name":"f9679102-ac16-49be-81c7-a76859c91828","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f16d60e8-3436-42e4-8ada-e41323378a0d","name":"f16d60e8-3436-42e4-8ada-e41323378a0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9679102-ac16-49be-81c7-a76859c91828","path":"sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d62a43af-319b-4d46-8e60-6ad0bc3bb267","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f16d60e8-3436-42e4-8ada-e41323378a0d","path":"sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7c65181-363a-4a1c-9a7e-30f58343e90f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9679102-ac16-49be-81c7-a76859c91828","path":"sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d62a43af-319b-4d46-8e60-6ad0bc3bb267","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f16d60e8-3436-42e4-8ada-e41323378a0d","path":"sprites/spr_helm_stripe_term/spr_helm_stripe_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7c65181-363a-4a1c-9a7e-30f58343e90f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_help_exit/spr_help_exit.yy b/sprites/spr_help_exit/spr_help_exit.yy index ac6e2c280b..28fc9cf024 100644 --- a/sprites/spr_help_exit/spr_help_exit.yy +++ b/sprites/spr_help_exit/spr_help_exit.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_help_exit", "bboxMode":0, "bbox_bottom":32, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"de989a75-8166-4e04-9fc0-52e6a861158c","name":"de989a75-8166-4e04-9fc0-52e6a861158c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"80ce6140-4a2b-4591-9ad1-818bd4ca40cb","name":"80ce6140-4a2b-4591-9ad1-818bd4ca40cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de989a75-8166-4e04-9fc0-52e6a861158c","name":"de989a75-8166-4e04-9fc0-52e6a861158c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"80ce6140-4a2b-4591-9ad1-818bd4ca40cb","name":"80ce6140-4a2b-4591-9ad1-818bd4ca40cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de989a75-8166-4e04-9fc0-52e6a861158c","path":"sprites/spr_help_exit/spr_help_exit.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc4106cf-31bb-4712-b9dc-24942e618f2f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"80ce6140-4a2b-4591-9ad1-818bd4ca40cb","path":"sprites/spr_help_exit/spr_help_exit.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2fc7b99b-32a5-4343-8381-8fd66d7eb02e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de989a75-8166-4e04-9fc0-52e6a861158c","path":"sprites/spr_help_exit/spr_help_exit.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc4106cf-31bb-4712-b9dc-24942e618f2f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"80ce6140-4a2b-4591-9ad1-818bd4ca40cb","path":"sprites/spr_help_exit/spr_help_exit.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2fc7b99b-32a5-4343-8381-8fd66d7eb02e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_help_panel/spr_help_panel.yy b/sprites/spr_help_panel/spr_help_panel.yy index 6990e48d70..2d870889f9 100644 --- a/sprites/spr_help_panel/spr_help_panel.yy +++ b/sprites/spr_help_panel/spr_help_panel.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_help_panel", "bboxMode":0, "bbox_bottom":833, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e1055a25-a03c-463a-884a-257874dac353","name":"e1055a25-a03c-463a-884a-257874dac353","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1055a25-a03c-463a-884a-257874dac353","name":"e1055a25-a03c-463a-884a-257874dac353","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1055a25-a03c-463a-884a-257874dac353","path":"sprites/spr_help_panel/spr_help_panel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"49bddd04-a0a1-47fa-b516-17ec9434cf54","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1055a25-a03c-463a-884a-257874dac353","path":"sprites/spr_help_panel/spr_help_panel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"49bddd04-a0a1-47fa-b516-17ec9434cf54","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_heresy_colors/spr_heresy_colors.yy b/sprites/spr_heresy_colors/spr_heresy_colors.yy index c83332bdf0..bf84655cd5 100644 --- a/sprites/spr_heresy_colors/spr_heresy_colors.yy +++ b/sprites/spr_heresy_colors/spr_heresy_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_heresy_colors", "bboxMode":0, "bbox_bottom":221, @@ -12,19 +12,19 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d51f983a-1596-4dfa-a471-604575f8d758","name":"d51f983a-1596-4dfa-a471-604575f8d758","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"493e74a6-0b54-43ee-bba5-a53005b9f601","name":"493e74a6-0b54-43ee-bba5-a53005b9f601","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d81d991c-217b-466a-817a-a195815277d7","name":"d81d991c-217b-466a-817a-a195815277d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5fca723-ed0a-493b-abfd-dd39d423f991","name":"d5fca723-ed0a-493b-abfd-dd39d423f991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"961521f2-a3f0-462d-9c13-369f928b5594","name":"961521f2-a3f0-462d-9c13-369f928b5594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d51f983a-1596-4dfa-a471-604575f8d758","name":"d51f983a-1596-4dfa-a471-604575f8d758","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"493e74a6-0b54-43ee-bba5-a53005b9f601","name":"493e74a6-0b54-43ee-bba5-a53005b9f601","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d81d991c-217b-466a-817a-a195815277d7","name":"d81d991c-217b-466a-817a-a195815277d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5fca723-ed0a-493b-abfd-dd39d423f991","name":"d5fca723-ed0a-493b-abfd-dd39d423f991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"961521f2-a3f0-462d-9c13-369f928b5594","name":"961521f2-a3f0-462d-9c13-369f928b5594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -80,45 +80,19 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8298aad2-b42d-4fac-be2a-e0225796cc6a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51f983a-1596-4dfa-a471-604575f8d758","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"92f17322-5cee-446a-9f52-d795abd1269b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24ee9754-534c-4a1b-a134-0f261e8671e1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f5633d0-4c0d-4b89-8384-14ae90b765de","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cad6a3e4-90b4-4185-be91-04e126c0bc69","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"493e74a6-0b54-43ee-bba5-a53005b9f601","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"442bb12f-fd34-4feb-a3de-72114e1520dd","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e2969f2-69e9-4b4f-a20c-a6dca07aba49","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9542367-f514-4fef-a384-d649a4b8b12c","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5f42b48a-0df1-4671-8ee0-b2d1b3b33f85","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d81d991c-217b-466a-817a-a195815277d7","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"948fb262-714f-4969-9b99-c288abed38cc","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5fca723-ed0a-493b-abfd-dd39d423f991","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"86a1471b-a052-465b-817d-27abe3c5e2f4","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ae72bc80-d47c-4ae1-adcd-318f9598633c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"961521f2-a3f0-462d-9c13-369f928b5594","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9df8149-3c9e-4887-b45a-8fb96a47f66d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8298aad2-b42d-4fac-be2a-e0225796cc6a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51f983a-1596-4dfa-a471-604575f8d758","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"92f17322-5cee-446a-9f52-d795abd1269b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24ee9754-534c-4a1b-a134-0f261e8671e1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f5633d0-4c0d-4b89-8384-14ae90b765de","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cad6a3e4-90b4-4185-be91-04e126c0bc69","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"493e74a6-0b54-43ee-bba5-a53005b9f601","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"442bb12f-fd34-4feb-a3de-72114e1520dd","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e2969f2-69e9-4b4f-a20c-a6dca07aba49","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9542367-f514-4fef-a384-d649a4b8b12c","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5f42b48a-0df1-4671-8ee0-b2d1b3b33f85","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d81d991c-217b-466a-817a-a195815277d7","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"948fb262-714f-4969-9b99-c288abed38cc","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5fca723-ed0a-493b-abfd-dd39d423f991","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"86a1471b-a052-465b-817d-27abe3c5e2f4","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ae72bc80-d47c-4ae1-adcd-318f9598633c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"961521f2-a3f0-462d-9c13-369f928b5594","path":"sprites/spr_heresy_colors/spr_heresy_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9df8149-3c9e-4887-b45a-8fb96a47f66d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_hero/spr_hero.yy b/sprites/spr_hero/spr_hero.yy index af7f3fdbcb..171adee5cc 100644 --- a/sprites/spr_hero/spr_hero.yy +++ b/sprites/spr_hero/spr_hero.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_hero", "bboxMode":0, "bbox_bottom":49, @@ -12,22 +12,22 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9b5e1d94-bfaa-4717-b12c-7706b8d42a5e","name":"9b5e1d94-bfaa-4717-b12c-7706b8d42a5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f86f349e-9753-4ec9-b3a7-51f38648f98c","name":"f86f349e-9753-4ec9-b3a7-51f38648f98c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"233a96d2-66b0-4ee9-9f35-4c818ad485a7","name":"233a96d2-66b0-4ee9-9f35-4c818ad485a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8b1c231-1ad6-4e0d-8ceb-adf2302e8bb4","name":"e8b1c231-1ad6-4e0d-8ceb-adf2302e8bb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e9fc3491-c582-4071-b70b-5e4839b09dc4","name":"e9fc3491-c582-4071-b70b-5e4839b09dc4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bfb8fda0-a02a-4869-8600-efb3715721cd","name":"bfb8fda0-a02a-4869-8600-efb3715721cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5d7195bf-80e2-4ec2-ac95-a4557f5cff54","name":"5d7195bf-80e2-4ec2-ac95-a4557f5cff54","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6039e82-d38e-4232-9f84-e648009998f7","name":"a6039e82-d38e-4232-9f84-e648009998f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"66704094-4abc-4a6e-b4fc-acf5cafc75f0","name":"66704094-4abc-4a6e-b4fc-acf5cafc75f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ef84ad8d-e32a-4e39-acdb-782789771b91","name":"ef84ad8d-e32a-4e39-acdb-782789771b91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c7cc2d6d-a356-4678-b8ae-5c8972d464ca","name":"c7cc2d6d-a356-4678-b8ae-5c8972d464ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3153288-2f26-4f17-89b7-3f0dc6382715","name":"f3153288-2f26-4f17-89b7-3f0dc6382715","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bcbcfd3b-cbb0-429c-8647-6b25749ed195","name":"bcbcfd3b-cbb0-429c-8647-6b25749ed195","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84b07b6d-f135-4ac9-9c55-bef3de1c21f1","name":"84b07b6d-f135-4ac9-9c55-bef3de1c21f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"de75ca2e-0981-4cc7-8b7a-d3c3d0e806d0","name":"de75ca2e-0981-4cc7-8b7a-d3c3d0e806d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"33e39f67-56a2-4e87-8cce-8521f581cef8","name":"33e39f67-56a2-4e87-8cce-8521f581cef8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b5e1d94-bfaa-4717-b12c-7706b8d42a5e","name":"9b5e1d94-bfaa-4717-b12c-7706b8d42a5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f86f349e-9753-4ec9-b3a7-51f38648f98c","name":"f86f349e-9753-4ec9-b3a7-51f38648f98c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"233a96d2-66b0-4ee9-9f35-4c818ad485a7","name":"233a96d2-66b0-4ee9-9f35-4c818ad485a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8b1c231-1ad6-4e0d-8ceb-adf2302e8bb4","name":"e8b1c231-1ad6-4e0d-8ceb-adf2302e8bb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9fc3491-c582-4071-b70b-5e4839b09dc4","name":"e9fc3491-c582-4071-b70b-5e4839b09dc4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bfb8fda0-a02a-4869-8600-efb3715721cd","name":"bfb8fda0-a02a-4869-8600-efb3715721cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5d7195bf-80e2-4ec2-ac95-a4557f5cff54","name":"5d7195bf-80e2-4ec2-ac95-a4557f5cff54","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6039e82-d38e-4232-9f84-e648009998f7","name":"a6039e82-d38e-4232-9f84-e648009998f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"66704094-4abc-4a6e-b4fc-acf5cafc75f0","name":"66704094-4abc-4a6e-b4fc-acf5cafc75f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ef84ad8d-e32a-4e39-acdb-782789771b91","name":"ef84ad8d-e32a-4e39-acdb-782789771b91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c7cc2d6d-a356-4678-b8ae-5c8972d464ca","name":"c7cc2d6d-a356-4678-b8ae-5c8972d464ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3153288-2f26-4f17-89b7-3f0dc6382715","name":"f3153288-2f26-4f17-89b7-3f0dc6382715","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bcbcfd3b-cbb0-429c-8647-6b25749ed195","name":"bcbcfd3b-cbb0-429c-8647-6b25749ed195","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84b07b6d-f135-4ac9-9c55-bef3de1c21f1","name":"84b07b6d-f135-4ac9-9c55-bef3de1c21f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de75ca2e-0981-4cc7-8b7a-d3c3d0e806d0","name":"de75ca2e-0981-4cc7-8b7a-d3c3d0e806d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"33e39f67-56a2-4e87-8cce-8521f581cef8","name":"33e39f67-56a2-4e87-8cce-8521f581cef8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -83,54 +83,22 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b5e1d94-bfaa-4717-b12c-7706b8d42a5e","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3523907d-d28e-4283-a733-03b5c9194a77","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f86f349e-9753-4ec9-b3a7-51f38648f98c","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c47069de-4072-4c93-9d57-473ef2d6cf59","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"233a96d2-66b0-4ee9-9f35-4c818ad485a7","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88cc7d5b-bc75-4d9e-95b8-989f6ebdcc4d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8b1c231-1ad6-4e0d-8ceb-adf2302e8bb4","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"58d58d17-ae35-490d-9140-c0d2adc14e98","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9fc3491-c582-4071-b70b-5e4839b09dc4","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9a796042-5827-4be3-be91-1c8e3fb48730","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfb8fda0-a02a-4869-8600-efb3715721cd","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e0d735f8-345f-4dda-911f-8d9341527762","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d7195bf-80e2-4ec2-ac95-a4557f5cff54","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"76e56d45-5bfa-4650-b87e-71b24d2f68fa","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6039e82-d38e-4232-9f84-e648009998f7","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"173fdc0e-83df-438b-8697-5564514cb110","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66704094-4abc-4a6e-b4fc-acf5cafc75f0","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d94a64b0-0a02-4d17-b422-9d502a2d8789","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef84ad8d-e32a-4e39-acdb-782789771b91","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"28b0e95b-3c24-4731-ad5c-b7fb8b8187ab","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7cc2d6d-a356-4678-b8ae-5c8972d464ca","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6a5440d-5323-432f-8f63-3b8b1ec024fb","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3153288-2f26-4f17-89b7-3f0dc6382715","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9af01d7b-f7d9-4b10-8b7f-d6aab6fb6973","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bcbcfd3b-cbb0-429c-8647-6b25749ed195","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"68f73d20-60ec-4343-bff2-73f167268cf8","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84b07b6d-f135-4ac9-9c55-bef3de1c21f1","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"daf5720d-40c0-463a-8abb-33c3cd2aa169","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de75ca2e-0981-4cc7-8b7a-d3c3d0e806d0","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"920d1701-2603-47fe-82cc-dee84904a3a9","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"33e39f67-56a2-4e87-8cce-8521f581cef8","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45be5739-0ee5-467b-8704-9dadb4aaf2ec","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b5e1d94-bfaa-4717-b12c-7706b8d42a5e","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3523907d-d28e-4283-a733-03b5c9194a77","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f86f349e-9753-4ec9-b3a7-51f38648f98c","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c47069de-4072-4c93-9d57-473ef2d6cf59","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"233a96d2-66b0-4ee9-9f35-4c818ad485a7","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88cc7d5b-bc75-4d9e-95b8-989f6ebdcc4d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8b1c231-1ad6-4e0d-8ceb-adf2302e8bb4","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"58d58d17-ae35-490d-9140-c0d2adc14e98","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e9fc3491-c582-4071-b70b-5e4839b09dc4","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9a796042-5827-4be3-be91-1c8e3fb48730","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfb8fda0-a02a-4869-8600-efb3715721cd","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e0d735f8-345f-4dda-911f-8d9341527762","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d7195bf-80e2-4ec2-ac95-a4557f5cff54","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76e56d45-5bfa-4650-b87e-71b24d2f68fa","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6039e82-d38e-4232-9f84-e648009998f7","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"173fdc0e-83df-438b-8697-5564514cb110","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66704094-4abc-4a6e-b4fc-acf5cafc75f0","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d94a64b0-0a02-4d17-b422-9d502a2d8789","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef84ad8d-e32a-4e39-acdb-782789771b91","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"28b0e95b-3c24-4731-ad5c-b7fb8b8187ab","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7cc2d6d-a356-4678-b8ae-5c8972d464ca","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6a5440d-5323-432f-8f63-3b8b1ec024fb","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3153288-2f26-4f17-89b7-3f0dc6382715","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9af01d7b-f7d9-4b10-8b7f-d6aab6fb6973","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bcbcfd3b-cbb0-429c-8647-6b25749ed195","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"68f73d20-60ec-4343-bff2-73f167268cf8","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84b07b6d-f135-4ac9-9c55-bef3de1c21f1","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"daf5720d-40c0-463a-8abb-33c3cd2aa169","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de75ca2e-0981-4cc7-8b7a-d3c3d0e806d0","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"920d1701-2603-47fe-82cc-dee84904a3a9","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"33e39f67-56a2-4e87-8cce-8521f581cef8","path":"sprites/spr_hero/spr_hero.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45be5739-0ee5-467b-8704-9dadb4aaf2ec","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_hero_skull/spr_hero_skull.yy b/sprites/spr_hero_skull/spr_hero_skull.yy index 171a256c54..53d2aa1eaa 100644 --- a/sprites/spr_hero_skull/spr_hero_skull.yy +++ b/sprites/spr_hero_skull/spr_hero_skull.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_hero_skull", "bboxMode":0, "bbox_bottom":30, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4028fec9-b72f-46fc-bb33-779f5cc99798","name":"4028fec9-b72f-46fc-bb33-779f5cc99798","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4028fec9-b72f-46fc-bb33-779f5cc99798","name":"4028fec9-b72f-46fc-bb33-779f5cc99798","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4028fec9-b72f-46fc-bb33-779f5cc99798","path":"sprites/spr_hero_skull/spr_hero_skull.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45265b93-e31f-4a46-834d-75c6b65d1994","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4028fec9-b72f-46fc-bb33-779f5cc99798","path":"sprites/spr_hero_skull/spr_hero_skull.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45265b93-e31f-4a46-834d-75c6b65d1994","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_holo_pad/89bfcfeb-e00c-4896-854a-bb20c2000103.png b/sprites/spr_holo_pad/89bfcfeb-e00c-4896-854a-bb20c2000103.png new file mode 100644 index 0000000000..4b42c368df Binary files /dev/null and b/sprites/spr_holo_pad/89bfcfeb-e00c-4896-854a-bb20c2000103.png differ diff --git a/sprites/spr_holo_pad/layers/89bfcfeb-e00c-4896-854a-bb20c2000103/2be4912c-981a-4c4c-a48e-98881663e423.png b/sprites/spr_holo_pad/layers/89bfcfeb-e00c-4896-854a-bb20c2000103/2be4912c-981a-4c4c-a48e-98881663e423.png new file mode 100644 index 0000000000..4b42c368df Binary files /dev/null and b/sprites/spr_holo_pad/layers/89bfcfeb-e00c-4896-854a-bb20c2000103/2be4912c-981a-4c4c-a48e-98881663e423.png differ diff --git a/sprites/spr_holo_pad/spr_holo_pad.yy b/sprites/spr_holo_pad/spr_holo_pad.yy new file mode 100644 index 0000000000..f1d68dcba5 --- /dev/null +++ b/sprites/spr_holo_pad/spr_holo_pad.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_holo_pad", + "bboxMode":0, + "bbox_bottom":81, + "bbox_left":0, + "bbox_right":166, + "bbox_top":22, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"89bfcfeb-e00c-4896-854a-bb20c2000103","name":"89bfcfeb-e00c-4896-854a-bb20c2000103","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":82, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"2be4912c-981a-4c4c-a48e-98881663e423","blendMode":0,"displayName":"default","isLocked":false,"name":"2be4912c-981a-4c4c-a48e-98881663e423","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_holo_pad", + "nineSlice":null, + "origin":6, + "parent":{ + "name":"UI", + "path":"folders/Sprites/UI.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_holo_pad", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_holo_pad", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":82.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89bfcfeb-e00c-4896-854a-bb20c2000103","path":"sprites/spr_holo_pad/spr_holo_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"67fe5d47-b758-48da-bda3-2a6368086433","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":82, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_honor_helm/spr_honor_helm.yy b/sprites/spr_honor_helm/spr_honor_helm.yy index fb22b5e7d1..f104bf4424 100644 --- a/sprites/spr_honor_helm/spr_honor_helm.yy +++ b/sprites/spr_honor_helm/spr_honor_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_honor_helm", "bboxMode":0, "bbox_bottom":57, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2faa2af3-c655-4c48-98c0-b35ce45ac30d","name":"2faa2af3-c655-4c48-98c0-b35ce45ac30d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7fda6c5c-99be-453f-9f3c-e2b3f414e643","name":"7fda6c5c-99be-453f-9f3c-e2b3f414e643","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8362ac13-7231-4584-a993-c6d4f51343b0","name":"8362ac13-7231-4584-a993-c6d4f51343b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6d89f537-514e-4956-bd62-3d0e38852475","name":"6d89f537-514e-4956-bd62-3d0e38852475","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3bb7c5a4-77cb-4634-a0c7-0715b3f5ff2a","name":"3bb7c5a4-77cb-4634-a0c7-0715b3f5ff2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2faa2af3-c655-4c48-98c0-b35ce45ac30d","name":"2faa2af3-c655-4c48-98c0-b35ce45ac30d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7fda6c5c-99be-453f-9f3c-e2b3f414e643","name":"7fda6c5c-99be-453f-9f3c-e2b3f414e643","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8362ac13-7231-4584-a993-c6d4f51343b0","name":"8362ac13-7231-4584-a993-c6d4f51343b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6d89f537-514e-4956-bd62-3d0e38852475","name":"6d89f537-514e-4956-bd62-3d0e38852475","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3bb7c5a4-77cb-4634-a0c7-0715b3f5ff2a","name":"3bb7c5a4-77cb-4634-a0c7-0715b3f5ff2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -67,6 +67,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":80.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy b/sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy index dfaba6b634..5be1606b51 100644 --- a/sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy +++ b/sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_apothecarion", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8c420298-afa1-4414-ae6e-dcdf955885f3","name":"8c420298-afa1-4414-ae6e-dcdf955885f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c420298-afa1-4414-ae6e-dcdf955885f3","name":"8c420298-afa1-4414-ae6e-dcdf955885f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c420298-afa1-4414-ae6e-dcdf955885f3","path":"sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2232c4f0-83bb-414e-b240-877fb4da7576","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c420298-afa1-4414-ae6e-dcdf955885f3","path":"sprites/spr_icon_apothecarion/spr_icon_apothecarion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2232c4f0-83bb-414e-b240-877fb4da7576","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy b/sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy index 1b56469a46..221a32e636 100644 --- a/sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy +++ b/sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_ballistic_skill", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"175bd7b9-849b-46ce-8efe-940114991cfe","name":"175bd7b9-849b-46ce-8efe-940114991cfe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"175bd7b9-849b-46ce-8efe-940114991cfe","name":"175bd7b9-849b-46ce-8efe-940114991cfe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"175bd7b9-849b-46ce-8efe-940114991cfe","path":"sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"79b5a674-3dee-46f0-9590-19df26ad27c5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"175bd7b9-849b-46ce-8efe-940114991cfe","path":"sprites/spr_icon_ballistic_skill/spr_icon_ballistic_skill.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"79b5a674-3dee-46f0-9590-19df26ad27c5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_bionics/4847858a-0725-4a81-831e-e621066a51a0.png b/sprites/spr_icon_bionics/4847858a-0725-4a81-831e-e621066a51a0.png index bddd20e88e..62f45ef2dc 100644 Binary files a/sprites/spr_icon_bionics/4847858a-0725-4a81-831e-e621066a51a0.png and b/sprites/spr_icon_bionics/4847858a-0725-4a81-831e-e621066a51a0.png differ diff --git a/sprites/spr_icon_bionics/layers/4847858a-0725-4a81-831e-e621066a51a0/b54f1199-11ed-42e0-a11d-e3324888d46f.png b/sprites/spr_icon_bionics/layers/4847858a-0725-4a81-831e-e621066a51a0/b54f1199-11ed-42e0-a11d-e3324888d46f.png index bddd20e88e..62f45ef2dc 100644 Binary files a/sprites/spr_icon_bionics/layers/4847858a-0725-4a81-831e-e621066a51a0/b54f1199-11ed-42e0-a11d-e3324888d46f.png and b/sprites/spr_icon_bionics/layers/4847858a-0725-4a81-831e-e621066a51a0/b54f1199-11ed-42e0-a11d-e3324888d46f.png differ diff --git a/sprites/spr_icon_bionics/spr_icon_bionics.yy b/sprites/spr_icon_bionics/spr_icon_bionics.yy index 312fd8c018..9e2865cdd2 100644 --- a/sprites/spr_icon_bionics/spr_icon_bionics.yy +++ b/sprites/spr_icon_bionics/spr_icon_bionics.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_bionics", "bboxMode":0, "bbox_bottom":123, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4847858a-0725-4a81-831e-e621066a51a0","name":"4847858a-0725-4a81-831e-e621066a51a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4847858a-0725-4a81-831e-e621066a51a0","name":"4847858a-0725-4a81-831e-e621066a51a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":128.0, + "seqWidth":128.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_icon_change/spr_icon_change.yy b/sprites/spr_icon_change/spr_icon_change.yy index 4455982768..8eafa3e05b 100644 --- a/sprites/spr_icon_change/spr_icon_change.yy +++ b/sprites/spr_icon_change/spr_icon_change.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_change", "bboxMode":0, "bbox_bottom":77, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7f321054-1d52-47c4-a451-9447c52b8931","name":"7f321054-1d52-47c4-a451-9447c52b8931","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f321054-1d52-47c4-a451-9447c52b8931","name":"7f321054-1d52-47c4-a451-9447c52b8931","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":80.0, + "seqWidth":80.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"c6ec8eee-1414-4a10-82fc-83027463d27d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, diff --git a/sprites/spr_icon_health/spr_icon_health.yy b/sprites/spr_icon_health/spr_icon_health.yy index 0b5a7232d6..2129706acd 100644 --- a/sprites/spr_icon_health/spr_icon_health.yy +++ b/sprites/spr_icon_health/spr_icon_health.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_health", "bboxMode":0, "bbox_bottom":121, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bc87ff96-289a-4158-8d2e-07149fb4a405","name":"bc87ff96-289a-4158-8d2e-07149fb4a405","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc87ff96-289a-4158-8d2e-07149fb4a405","name":"bc87ff96-289a-4158-8d2e-07149fb4a405","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc87ff96-289a-4158-8d2e-07149fb4a405","path":"sprites/spr_icon_health/spr_icon_health.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2bd0248-1537-4bfe-8c66-33384bd00df6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc87ff96-289a-4158-8d2e-07149fb4a405","path":"sprites/spr_icon_health/spr_icon_health.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2bd0248-1537-4bfe-8c66-33384bd00df6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy b/sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy index a9a7151dd3..89a2f008cf 100644 --- a/sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy +++ b/sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_iron_halo", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"45765e6b-00d8-4316-988d-daca2372308f","name":"45765e6b-00d8-4316-988d-daca2372308f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"45765e6b-00d8-4316-988d-daca2372308f","name":"45765e6b-00d8-4316-988d-daca2372308f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"45765e6b-00d8-4316-988d-daca2372308f","path":"sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9993fbbb-7bcd-43e9-b367-1c5b57522dab","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"45765e6b-00d8-4316-988d-daca2372308f","path":"sprites/spr_icon_iron_halo/spr_icon_iron_halo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9993fbbb-7bcd-43e9-b367-1c5b57522dab","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy b/sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy index 5f27faa814..8c87163c27 100644 --- a/sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy +++ b/sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_iron_hands", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"87ee8039-2984-40e8-bacb-57ff8740fd19","name":"87ee8039-2984-40e8-bacb-57ff8740fd19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87ee8039-2984-40e8-bacb-57ff8740fd19","name":"87ee8039-2984-40e8-bacb-57ff8740fd19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87ee8039-2984-40e8-bacb-57ff8740fd19","path":"sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c18301a-894e-4feb-942f-4e8cdbc700f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87ee8039-2984-40e8-bacb-57ff8740fd19","path":"sprites/spr_icon_iron_hands/spr_icon_iron_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c18301a-894e-4feb-942f-4e8cdbc700f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy b/sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy index 363fa8d2b4..c58ae5bf2a 100644 --- a/sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy +++ b/sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_iron_hands2", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3c24869b-4466-4bfe-9253-6ac5b898f203","name":"3c24869b-4466-4bfe-9253-6ac5b898f203","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c24869b-4466-4bfe-9253-6ac5b898f203","name":"3c24869b-4466-4bfe-9253-6ac5b898f203","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c24869b-4466-4bfe-9253-6ac5b898f203","path":"sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f40cabf-70e1-4e42-8746-6d9dd7255888","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c24869b-4466-4bfe-9253-6ac5b898f203","path":"sprites/spr_icon_iron_hands2/spr_icon_iron_hands2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f40cabf-70e1-4e42-8746-6d9dd7255888","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy b/sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy index 1b04e2bc8f..b118f25ac2 100644 --- a/sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy +++ b/sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_iron_hands3", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"372c9370-897b-4991-9628-fd531cc75d05","name":"372c9370-897b-4991-9628-fd531cc75d05","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"372c9370-897b-4991-9628-fd531cc75d05","name":"372c9370-897b-4991-9628-fd531cc75d05","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"372c9370-897b-4991-9628-fd531cc75d05","path":"sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"39bf6dba-f4a6-490b-ba05-cf47f615a5f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"372c9370-897b-4991-9628-fd531cc75d05","path":"sprites/spr_icon_iron_hands3/spr_icon_iron_hands3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"39bf6dba-f4a6-490b-ba05-cf47f615a5f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_librarius/spr_icon_librarius.yy b/sprites/spr_icon_librarius/spr_icon_librarius.yy index 5c1d838731..10e3b0c011 100644 --- a/sprites/spr_icon_librarius/spr_icon_librarius.yy +++ b/sprites/spr_icon_librarius/spr_icon_librarius.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_librarius", "bboxMode":0, "bbox_bottom":110, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","path":"sprites/spr_icon_librarius/spr_icon_librarius.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b274634c-f2d4-4dfc-9370-f0b342c2cd10","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec084bd7-b124-4b5f-b9e2-ba4a50309829","path":"sprites/spr_icon_librarius/spr_icon_librarius.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b274634c-f2d4-4dfc-9370-f0b342c2cd10","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_psyker/spr_icon_psyker.yy b/sprites/spr_icon_psyker/spr_icon_psyker.yy index c8a6b45ede..7bc9cfe4ce 100644 --- a/sprites/spr_icon_psyker/spr_icon_psyker.yy +++ b/sprites/spr_icon_psyker/spr_icon_psyker.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_psyker", "bboxMode":0, "bbox_bottom":124, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"100d817f-b993-4588-bcf6-a6db6c63e96d","name":"100d817f-b993-4588-bcf6-a6db6c63e96d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"100d817f-b993-4588-bcf6-a6db6c63e96d","name":"100d817f-b993-4588-bcf6-a6db6c63e96d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"100d817f-b993-4588-bcf6-a6db6c63e96d","path":"sprites/spr_icon_psyker/spr_icon_psyker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8fb3e588-63d7-49a0-ab99-4bd52fdbb678","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"100d817f-b993-4588-bcf6-a6db6c63e96d","path":"sprites/spr_icon_psyker/spr_icon_psyker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8fb3e588-63d7-49a0-ab99-4bd52fdbb678","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_shield/spr_icon_shield.yy b/sprites/spr_icon_shield/spr_icon_shield.yy index 3755ee5a2b..ed65d1a1d6 100644 --- a/sprites/spr_icon_shield/spr_icon_shield.yy +++ b/sprites/spr_icon_shield/spr_icon_shield.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_shield", "bboxMode":0, "bbox_bottom":119, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"52d29a79-1164-4e74-a115-73a3753c0552","name":"52d29a79-1164-4e74-a115-73a3753c0552","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52d29a79-1164-4e74-a115-73a3753c0552","name":"52d29a79-1164-4e74-a115-73a3753c0552","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d29a79-1164-4e74-a115-73a3753c0552","path":"sprites/spr_icon_shield/spr_icon_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e5f8e2e-b061-4eca-86ba-6f413b5c413d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d29a79-1164-4e74-a115-73a3753c0552","path":"sprites/spr_icon_shield/spr_icon_shield.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e5f8e2e-b061-4eca-86ba-6f413b5c413d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_shield2/spr_icon_shield2.yy b/sprites/spr_icon_shield2/spr_icon_shield2.yy index e493764145..af97d05f44 100644 --- a/sprites/spr_icon_shield2/spr_icon_shield2.yy +++ b/sprites/spr_icon_shield2/spr_icon_shield2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_shield2", "bboxMode":0, "bbox_bottom":124, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","path":"sprites/spr_icon_shield2/spr_icon_shield2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"07012a80-3fb0-404b-8bad-c1b776cac4ce","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8369f543-dbf8-4595-af8c-2ed911ca4cc4","path":"sprites/spr_icon_shield2/spr_icon_shield2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"07012a80-3fb0-404b-8bad-c1b776cac4ce","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_telepatica/spr_icon_telepatica.yy b/sprites/spr_icon_telepatica/spr_icon_telepatica.yy index 05025bba3d..2f2ee4a519 100644 --- a/sprites/spr_icon_telepatica/spr_icon_telepatica.yy +++ b/sprites/spr_icon_telepatica/spr_icon_telepatica.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_telepatica", "bboxMode":0, "bbox_bottom":122, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","path":"sprites/spr_icon_telepatica/spr_icon_telepatica.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19274f90-7f8d-4764-9066-671a72532c31","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b216b4d3-4604-4d5e-9507-2a70874b7ffa","path":"sprites/spr_icon_telepatica/spr_icon_telepatica.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"19274f90-7f8d-4764-9066-671a72532c31","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy b/sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy index e87ab0cf53..ae79d2aae5 100644 --- a/sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy +++ b/sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_telepatica2", "bboxMode":0, "bbox_bottom":126, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"38c9167a-ee5a-4729-8a71-6963ab98a018","name":"38c9167a-ee5a-4729-8a71-6963ab98a018","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38c9167a-ee5a-4729-8a71-6963ab98a018","name":"38c9167a-ee5a-4729-8a71-6963ab98a018","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38c9167a-ee5a-4729-8a71-6963ab98a018","path":"sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fdc039bc-8374-4edc-83dd-446e17ebb408","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38c9167a-ee5a-4729-8a71-6963ab98a018","path":"sprites/spr_icon_telepatica2/spr_icon_telepatica2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fdc039bc-8374-4edc-83dd-446e17ebb408","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_veteran/spr_icon_veteran.yy b/sprites/spr_icon_veteran/spr_icon_veteran.yy index eec01d2532..c2c4008ad6 100644 --- a/sprites/spr_icon_veteran/spr_icon_veteran.yy +++ b/sprites/spr_icon_veteran/spr_icon_veteran.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_veteran", "bboxMode":0, "bbox_bottom":113, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6d818433-1ab6-4818-aee1-badbac0b7712","name":"6d818433-1ab6-4818-aee1-badbac0b7712","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6d818433-1ab6-4818-aee1-badbac0b7712","name":"6d818433-1ab6-4818-aee1-badbac0b7712","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d818433-1ab6-4818-aee1-badbac0b7712","path":"sprites/spr_icon_veteran/spr_icon_veteran.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"879e18a1-ac47-4a1f-9231-529f71b21cb0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d818433-1ab6-4818-aee1-badbac0b7712","path":"sprites/spr_icon_veteran/spr_icon_veteran.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"879e18a1-ac47-4a1f-9231-529f71b21cb0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy b/sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy index 2bee3f4586..61091942e9 100644 --- a/sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy +++ b/sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_weapon_skill", "bboxMode":0, "bbox_bottom":127, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","path":"sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fa7e868a-9b98-4831-94a0-d4135318d307","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5507e490-eb5e-4f75-8ab8-b839bdc67871","path":"sprites/spr_icon_weapon_skill/spr_icon_weapon_skill.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fa7e868a-9b98-4831-94a0-d4135318d307","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_weight/spr_icon_weight.yy b/sprites/spr_icon_weight/spr_icon_weight.yy index 7aff6fb136..0be996df06 100644 --- a/sprites/spr_icon_weight/spr_icon_weight.yy +++ b/sprites/spr_icon_weight/spr_icon_weight.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_weight", "bboxMode":0, "bbox_bottom":112, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9221b377-916e-498d-bc28-a2e999f17843","name":"9221b377-916e-498d-bc28-a2e999f17843","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9221b377-916e-498d-bc28-a2e999f17843","name":"9221b377-916e-498d-bc28-a2e999f17843","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9221b377-916e-498d-bc28-a2e999f17843","path":"sprites/spr_icon_weight/spr_icon_weight.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2a57d19e-374a-48c1-8955-53e45e4020ba","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9221b377-916e-498d-bc28-a2e999f17843","path":"sprites/spr_icon_weight/spr_icon_weight.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2a57d19e-374a-48c1-8955-53e45e4020ba","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_icon_wounds/spr_icon_wounds.yy b/sprites/spr_icon_wounds/spr_icon_wounds.yy index 96e42abea0..54e1bcb00d 100644 --- a/sprites/spr_icon_wounds/spr_icon_wounds.yy +++ b/sprites/spr_icon_wounds/spr_icon_wounds.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_icon_wounds", "bboxMode":0, "bbox_bottom":112, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"07486fe4-76e6-481f-9ca9-94952463ecb4","name":"07486fe4-76e6-481f-9ca9-94952463ecb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07486fe4-76e6-481f-9ca9-94952463ecb4","name":"07486fe4-76e6-481f-9ca9-94952463ecb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07486fe4-76e6-481f-9ca9-94952463ecb4","path":"sprites/spr_icon_wounds/spr_icon_wounds.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7833cd98-7681-4fe5-b5bb-8aeab0dba461","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07486fe4-76e6-481f-9ca9-94952463ecb4","path":"sprites/spr_icon_wounds/spr_icon_wounds.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7833cd98-7681-4fe5-b5bb-8aeab0dba461","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy b/sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy index 879abb2185..72232aea25 100644 --- a/sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy +++ b/sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_if_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dec421f3-8236-4461-8ef3-e2b2b0993a2d","name":"dec421f3-8236-4461-8ef3-e2b2b0993a2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"41b00509-3aa8-491f-ac2e-fd29be3ca4bb","name":"41b00509-3aa8-491f-ac2e-fd29be3ca4bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d46e43b-37cf-48df-964c-e00c02be3fd5","name":"1d46e43b-37cf-48df-964c-e00c02be3fd5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dec421f3-8236-4461-8ef3-e2b2b0993a2d","name":"dec421f3-8236-4461-8ef3-e2b2b0993a2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41b00509-3aa8-491f-ac2e-fd29be3ca4bb","name":"41b00509-3aa8-491f-ac2e-fd29be3ca4bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d46e43b-37cf-48df-964c-e00c02be3fd5","name":"1d46e43b-37cf-48df-964c-e00c02be3fd5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dec421f3-8236-4461-8ef3-e2b2b0993a2d","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"96d6ba50-844d-4b20-8660-44109a52e875","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41b00509-3aa8-491f-ac2e-fd29be3ca4bb","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"826222be-8f31-4261-bbc0-e1c6c119be12","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d46e43b-37cf-48df-964c-e00c02be3fd5","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"959e4469-ff4a-434e-adcc-44625ee7e511","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dec421f3-8236-4461-8ef3-e2b2b0993a2d","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"96d6ba50-844d-4b20-8660-44109a52e875","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41b00509-3aa8-491f-ac2e-fd29be3ca4bb","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"826222be-8f31-4261-bbc0-e1c6c119be12","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d46e43b-37cf-48df-964c-e00c02be3fd5","path":"sprites/spr_if_mk5_helm/spr_if_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"959e4469-ff4a-434e-adcc-44625ee7e511","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy b/sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy index 4442de907a..06bb2f4d82 100644 --- a/sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy +++ b/sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_if_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"de518e95-b95f-4cfa-8f9f-ceeec6f87da2","name":"de518e95-b95f-4cfa-8f9f-ceeec6f87da2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6691f594-8d96-4874-8c5e-9270b2729038","name":"6691f594-8d96-4874-8c5e-9270b2729038","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8654944b-42fa-4a32-9a49-f85da15cb64e","name":"8654944b-42fa-4a32-9a49-f85da15cb64e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"006476c9-63e2-4612-a92c-d99440071596","name":"006476c9-63e2-4612-a92c-d99440071596","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ce48e770-7a4c-4382-a312-495dea5bb37d","name":"ce48e770-7a4c-4382-a312-495dea5bb37d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de518e95-b95f-4cfa-8f9f-ceeec6f87da2","name":"de518e95-b95f-4cfa-8f9f-ceeec6f87da2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6691f594-8d96-4874-8c5e-9270b2729038","name":"6691f594-8d96-4874-8c5e-9270b2729038","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8654944b-42fa-4a32-9a49-f85da15cb64e","name":"8654944b-42fa-4a32-9a49-f85da15cb64e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"006476c9-63e2-4612-a92c-d99440071596","name":"006476c9-63e2-4612-a92c-d99440071596","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce48e770-7a4c-4382-a312-495dea5bb37d","name":"ce48e770-7a4c-4382-a312-495dea5bb37d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de518e95-b95f-4cfa-8f9f-ceeec6f87da2","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ef3ccc4-520e-468a-bcaa-7428d87c6681","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6691f594-8d96-4874-8c5e-9270b2729038","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de5fdfc9-9f64-4c20-9c32-6d5e9f4f9fce","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8654944b-42fa-4a32-9a49-f85da15cb64e","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7897dfb-d9da-4108-ac0c-040c497b3433","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"006476c9-63e2-4612-a92c-d99440071596","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f03a9ffe-40ca-4513-8eff-af5d7acf2a4f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce48e770-7a4c-4382-a312-495dea5bb37d","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c2331b9-bec3-406a-92f2-206bec4c524f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de518e95-b95f-4cfa-8f9f-ceeec6f87da2","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ef3ccc4-520e-468a-bcaa-7428d87c6681","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6691f594-8d96-4874-8c5e-9270b2729038","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de5fdfc9-9f64-4c20-9c32-6d5e9f4f9fce","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8654944b-42fa-4a32-9a49-f85da15cb64e","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7897dfb-d9da-4108-ac0c-040c497b3433","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"006476c9-63e2-4612-a92c-d99440071596","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f03a9ffe-40ca-4513-8eff-af5d7acf2a4f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce48e770-7a4c-4382-a312-495dea5bb37d","path":"sprites/spr_if_mk6_helm/spr_if_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c2331b9-bec3-406a-92f2-206bec4c524f","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy b/sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy index eb81941e30..2699c9d6c3 100644 --- a/sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy +++ b/sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_if_mk7_helm", "bboxMode":0, "bbox_bottom":56, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bfb83da2-d3a8-4217-a285-208996d2c8e0","name":"bfb83da2-d3a8-4217-a285-208996d2c8e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aa8e54a0-af39-41d2-8aa5-fdc66fa3fda0","name":"aa8e54a0-af39-41d2-8aa5-fdc66fa3fda0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bfb83da2-d3a8-4217-a285-208996d2c8e0","name":"bfb83da2-d3a8-4217-a285-208996d2c8e0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aa8e54a0-af39-41d2-8aa5-fdc66fa3fda0","name":"aa8e54a0-af39-41d2-8aa5-fdc66fa3fda0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfb83da2-d3a8-4217-a285-208996d2c8e0","path":"sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e63e934-7709-480e-82cf-c16124eab733","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa8e54a0-af39-41d2-8aa5-fdc66fa3fda0","path":"sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ad0d33af-11ca-4a82-b468-8073458f806b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bfb83da2-d3a8-4217-a285-208996d2c8e0","path":"sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e63e934-7709-480e-82cf-c16124eab733","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa8e54a0-af39-41d2-8aa5-fdc66fa3fda0","path":"sprites/spr_if_mk7_helm/spr_if_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ad0d33af-11ca-4a82-b468-8073458f806b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy b/sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy index 53946f9d81..8b87a16d91 100644 --- a/sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy +++ b/sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ih_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b642399d-d97e-40d8-adaf-2809088e730f","name":"b642399d-d97e-40d8-adaf-2809088e730f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f7e174c-865e-46f8-be78-69317b96de10","name":"1f7e174c-865e-46f8-be78-69317b96de10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b642399d-d97e-40d8-adaf-2809088e730f","name":"b642399d-d97e-40d8-adaf-2809088e730f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f7e174c-865e-46f8-be78-69317b96de10","name":"1f7e174c-865e-46f8-be78-69317b96de10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b642399d-d97e-40d8-adaf-2809088e730f","path":"sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d78dbd31-89bd-4267-a7f6-77dd4d6454d2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f7e174c-865e-46f8-be78-69317b96de10","path":"sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cbabb173-cfe5-490a-bbe2-901751188108","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b642399d-d97e-40d8-adaf-2809088e730f","path":"sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d78dbd31-89bd-4267-a7f6-77dd4d6454d2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f7e174c-865e-46f8-be78-69317b96de10","path":"sprites/spr_ih_mk5_helm/spr_ih_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cbabb173-cfe5-490a-bbe2-901751188108","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy b/sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy index 4176c0b2bf..1e18b0b424 100644 --- a/sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy +++ b/sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ih_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"db85fc39-20f1-4c33-9214-04c64fea3140","name":"db85fc39-20f1-4c33-9214-04c64fea3140","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a3c64ba6-26bb-45d4-a9ce-ba5560c69555","name":"a3c64ba6-26bb-45d4-a9ce-ba5560c69555","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db85fc39-20f1-4c33-9214-04c64fea3140","name":"db85fc39-20f1-4c33-9214-04c64fea3140","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a3c64ba6-26bb-45d4-a9ce-ba5560c69555","name":"a3c64ba6-26bb-45d4-a9ce-ba5560c69555","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db85fc39-20f1-4c33-9214-04c64fea3140","path":"sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bb79bfe-987b-416b-a03f-4abdb1d8d14e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3c64ba6-26bb-45d4-a9ce-ba5560c69555","path":"sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4b71391-715d-453c-aad9-a6af40cb2390","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db85fc39-20f1-4c33-9214-04c64fea3140","path":"sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bb79bfe-987b-416b-a03f-4abdb1d8d14e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3c64ba6-26bb-45d4-a9ce-ba5560c69555","path":"sprites/spr_ih_mk6_helm/spr_ih_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4b71391-715d-453c-aad9-a6af40cb2390","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy b/sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy index 6aaa16557d..c4297aac28 100644 --- a/sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy +++ b/sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ih_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d61530e1-48e9-4f47-9420-ce41def4cf25","name":"d61530e1-48e9-4f47-9420-ce41def4cf25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"56d174a7-0545-41ad-a95a-a85cce3a9cf4","name":"56d174a7-0545-41ad-a95a-a85cce3a9cf4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d61530e1-48e9-4f47-9420-ce41def4cf25","name":"d61530e1-48e9-4f47-9420-ce41def4cf25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"56d174a7-0545-41ad-a95a-a85cce3a9cf4","name":"56d174a7-0545-41ad-a95a-a85cce3a9cf4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d61530e1-48e9-4f47-9420-ce41def4cf25","path":"sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2a7da707-d0b3-4baa-9e51-0798160ef9d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"56d174a7-0545-41ad-a95a-a85cce3a9cf4","path":"sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ac8930c-7088-4d26-9666-4add4d91d775","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d61530e1-48e9-4f47-9420-ce41def4cf25","path":"sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2a7da707-d0b3-4baa-9e51-0798160ef9d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"56d174a7-0545-41ad-a95a-a85cce3a9cf4","path":"sprites/spr_ih_mk7_helm/spr_ih_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ac8930c-7088-4d26-9666-4add4d91d775","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_indomitus_backpack_variants/26a48129-bbce-4502-98fa-bb1536100ae8.png b/sprites/spr_indomitus_backpack_variants/26a48129-bbce-4502-98fa-bb1536100ae8.png index 6ad75c3f81..a825f405fc 100644 Binary files a/sprites/spr_indomitus_backpack_variants/26a48129-bbce-4502-98fa-bb1536100ae8.png and b/sprites/spr_indomitus_backpack_variants/26a48129-bbce-4502-98fa-bb1536100ae8.png differ diff --git a/sprites/spr_indomitus_backpack_variants/3c4a6865-1bd0-4736-afba-d1184eb7c9c2.png b/sprites/spr_indomitus_backpack_variants/3c4a6865-1bd0-4736-afba-d1184eb7c9c2.png index d3498057e8..e45a60f1dc 100644 Binary files a/sprites/spr_indomitus_backpack_variants/3c4a6865-1bd0-4736-afba-d1184eb7c9c2.png and b/sprites/spr_indomitus_backpack_variants/3c4a6865-1bd0-4736-afba-d1184eb7c9c2.png differ diff --git a/sprites/spr_indomitus_backpack_variants/f263cbc2-c596-4d91-bf6e-98df697e82d6.png b/sprites/spr_indomitus_backpack_variants/f263cbc2-c596-4d91-bf6e-98df697e82d6.png index 2066073dcd..c7a53a5565 100644 Binary files a/sprites/spr_indomitus_backpack_variants/f263cbc2-c596-4d91-bf6e-98df697e82d6.png and b/sprites/spr_indomitus_backpack_variants/f263cbc2-c596-4d91-bf6e-98df697e82d6.png differ diff --git a/sprites/spr_indomitus_backpack_variants/layers/26a48129-bbce-4502-98fa-bb1536100ae8/62b09ae3-d70e-4c96-a796-f9dc9b29190d.png b/sprites/spr_indomitus_backpack_variants/layers/26a48129-bbce-4502-98fa-bb1536100ae8/62b09ae3-d70e-4c96-a796-f9dc9b29190d.png index 5cb06a2525..a825f405fc 100644 Binary files a/sprites/spr_indomitus_backpack_variants/layers/26a48129-bbce-4502-98fa-bb1536100ae8/62b09ae3-d70e-4c96-a796-f9dc9b29190d.png and b/sprites/spr_indomitus_backpack_variants/layers/26a48129-bbce-4502-98fa-bb1536100ae8/62b09ae3-d70e-4c96-a796-f9dc9b29190d.png differ diff --git a/sprites/spr_indomitus_backpack_variants/layers/3c4a6865-1bd0-4736-afba-d1184eb7c9c2/62b09ae3-d70e-4c96-a796-f9dc9b29190d.png b/sprites/spr_indomitus_backpack_variants/layers/3c4a6865-1bd0-4736-afba-d1184eb7c9c2/62b09ae3-d70e-4c96-a796-f9dc9b29190d.png index d3498057e8..e45a60f1dc 100644 Binary files a/sprites/spr_indomitus_backpack_variants/layers/3c4a6865-1bd0-4736-afba-d1184eb7c9c2/62b09ae3-d70e-4c96-a796-f9dc9b29190d.png and b/sprites/spr_indomitus_backpack_variants/layers/3c4a6865-1bd0-4736-afba-d1184eb7c9c2/62b09ae3-d70e-4c96-a796-f9dc9b29190d.png differ diff --git a/sprites/spr_indomitus_backpack_variants/layers/f263cbc2-c596-4d91-bf6e-98df697e82d6/62b09ae3-d70e-4c96-a796-f9dc9b29190d.png b/sprites/spr_indomitus_backpack_variants/layers/f263cbc2-c596-4d91-bf6e-98df697e82d6/62b09ae3-d70e-4c96-a796-f9dc9b29190d.png index 2066073dcd..c7a53a5565 100644 Binary files a/sprites/spr_indomitus_backpack_variants/layers/f263cbc2-c596-4d91-bf6e-98df697e82d6/62b09ae3-d70e-4c96-a796-f9dc9b29190d.png and b/sprites/spr_indomitus_backpack_variants/layers/f263cbc2-c596-4d91-bf6e-98df697e82d6/62b09ae3-d70e-4c96-a796-f9dc9b29190d.png differ diff --git a/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy b/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy index e61e22cd6b..2b66c36298 100644 --- a/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy +++ b/sprites/spr_indomitus_backpack_variants/spr_indomitus_backpack_variants.yy @@ -1,24 +1,24 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_backpack_variants", "bboxMode":0, - "bbox_bottom":47, - "bbox_left":0, + "bbox_bottom":72, + "bbox_left":57, "bbox_right":123, - "bbox_top":0, + "bbox_top":57, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26a48129-bbce-4502-98fa-bb1536100ae8","name":"26a48129-bbce-4502-98fa-bb1536100ae8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","name":"f263cbc2-c596-4d91-bf6e-98df697e82d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26a48129-bbce-4502-98fa-bb1536100ae8","name":"26a48129-bbce-4502-98fa-bb1536100ae8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","name":"3c4a6865-1bd0-4736-afba-d1184eb7c9c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, - "height":271, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"62b09ae3-d70e-4c96-a796-f9dc9b29190d","blendMode":0,"displayName":"default","isLocked":false,"name":"62b09ae3-d70e-4c96-a796-f9dc9b29190d","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, @@ -65,6 +65,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -83,8 +85,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, - "yorigin":38, + "xorigin":0, + "yorigin":63, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_indomitus_belt/379a95d4-e686-4cd0-bae4-d6538fe00566.png b/sprites/spr_indomitus_belt/379a95d4-e686-4cd0-bae4-d6538fe00566.png index f5a857eaf4..9e494c1ad2 100644 Binary files a/sprites/spr_indomitus_belt/379a95d4-e686-4cd0-bae4-d6538fe00566.png and b/sprites/spr_indomitus_belt/379a95d4-e686-4cd0-bae4-d6538fe00566.png differ diff --git a/sprites/spr_indomitus_belt/7173924c-400c-4ee3-8b3d-0123aa659415.png b/sprites/spr_indomitus_belt/7173924c-400c-4ee3-8b3d-0123aa659415.png index 65c0b2578c..6a920a2bf0 100644 Binary files a/sprites/spr_indomitus_belt/7173924c-400c-4ee3-8b3d-0123aa659415.png and b/sprites/spr_indomitus_belt/7173924c-400c-4ee3-8b3d-0123aa659415.png differ diff --git a/sprites/spr_indomitus_belt/layers/379a95d4-e686-4cd0-bae4-d6538fe00566/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_belt/layers/379a95d4-e686-4cd0-bae4-d6538fe00566/03d917a8-bff1-45d7-818b-f057c5540e44.png index f5a857eaf4..9e494c1ad2 100644 Binary files a/sprites/spr_indomitus_belt/layers/379a95d4-e686-4cd0-bae4-d6538fe00566/03d917a8-bff1-45d7-818b-f057c5540e44.png and b/sprites/spr_indomitus_belt/layers/379a95d4-e686-4cd0-bae4-d6538fe00566/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_belt/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_belt/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png index 65c0b2578c..6a920a2bf0 100644 Binary files a/sprites/spr_indomitus_belt/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png and b/sprites/spr_indomitus_belt/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_belt/spr_indomitus_belt.yy b/sprites/spr_indomitus_belt/spr_indomitus_belt.yy index d117101fc6..9ddf24f160 100644 --- a/sprites/spr_indomitus_belt/spr_indomitus_belt.yy +++ b/sprites/spr_indomitus_belt/spr_indomitus_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_belt", "bboxMode":0, "bbox_bottom":136, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"379a95d4-e686-4cd0-bae4-d6538fe00566","name":"379a95d4-e686-4cd0-bae4-d6538fe00566","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3974ad3d-d41e-4056-8cc6-6e5d870fd56e","name":"3974ad3d-d41e-4056-8cc6-6e5d870fd56e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"379a95d4-e686-4cd0-bae4-d6538fe00566","name":"379a95d4-e686-4cd0-bae4-d6538fe00566","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3974ad3d-d41e-4056-8cc6-6e5d870fd56e","name":"3974ad3d-d41e-4056-8cc6-6e5d870fd56e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -65,6 +65,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -83,7 +85,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy b/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy index 30a3c35872..4f882d5afc 100644 --- a/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy +++ b/sprites/spr_indomitus_chest_variants/spr_indomitus_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_chest_variants", "bboxMode":0, "bbox_bottom":111, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","name":"f0e60637-c555-4a00-8c01-76f1d0b98b07","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","name":"8df37974-a38e-49cb-a1ac-77820eeb1e35","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","name":"1903824a-daf5-4c6b-b252-ca5eb43f6ccc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -65,6 +65,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -83,7 +85,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_complex/7173924c-400c-4ee3-8b3d-0123aa659415.png b/sprites/spr_indomitus_complex/7173924c-400c-4ee3-8b3d-0123aa659415.png index 5eddacd831..a8f0cb6576 100644 Binary files a/sprites/spr_indomitus_complex/7173924c-400c-4ee3-8b3d-0123aa659415.png and b/sprites/spr_indomitus_complex/7173924c-400c-4ee3-8b3d-0123aa659415.png differ diff --git a/sprites/spr_indomitus_complex/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_complex/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png index 5eddacd831..a8f0cb6576 100644 Binary files a/sprites/spr_indomitus_complex/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png and b/sprites/spr_indomitus_complex/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_complex/spr_indomitus_complex.yy b/sprites/spr_indomitus_complex/spr_indomitus_complex.yy index a9040d31e2..149d517bed 100644 --- a/sprites/spr_indomitus_complex/spr_indomitus_complex.yy +++ b/sprites/spr_indomitus_complex/spr_indomitus_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_complex", "bboxMode":0, "bbox_bottom":185, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_complex_psy_hood/308aed46-7906-480b-a2b9-07b771c978e3.png b/sprites/spr_indomitus_complex_psy_hood/308aed46-7906-480b-a2b9-07b771c978e3.png new file mode 100644 index 0000000000..3c4b039cb1 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood/308aed46-7906-480b-a2b9-07b771c978e3.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood/baed253b-ca79-4975-a382-c6f3bb1e3750.png b/sprites/spr_indomitus_complex_psy_hood/baed253b-ca79-4975-a382-c6f3bb1e3750.png new file mode 100644 index 0000000000..651457e5fc Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood/baed253b-ca79-4975-a382-c6f3bb1e3750.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood/cc48e121-d030-4365-98d4-c96cae616cf6.png b/sprites/spr_indomitus_complex_psy_hood/cc48e121-d030-4365-98d4-c96cae616cf6.png new file mode 100644 index 0000000000..1db8513110 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood/cc48e121-d030-4365-98d4-c96cae616cf6.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood/layers/308aed46-7906-480b-a2b9-07b771c978e3/025efc18-cda5-4ad2-aa08-89bf4392026e.png b/sprites/spr_indomitus_complex_psy_hood/layers/308aed46-7906-480b-a2b9-07b771c978e3/025efc18-cda5-4ad2-aa08-89bf4392026e.png new file mode 100644 index 0000000000..3c4b039cb1 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood/layers/308aed46-7906-480b-a2b9-07b771c978e3/025efc18-cda5-4ad2-aa08-89bf4392026e.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood/layers/308aed46-7906-480b-a2b9-07b771c978e3/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_complex_psy_hood/layers/308aed46-7906-480b-a2b9-07b771c978e3/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..4406613077 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood/layers/308aed46-7906-480b-a2b9-07b771c978e3/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood/layers/baed253b-ca79-4975-a382-c6f3bb1e3750/025efc18-cda5-4ad2-aa08-89bf4392026e.png b/sprites/spr_indomitus_complex_psy_hood/layers/baed253b-ca79-4975-a382-c6f3bb1e3750/025efc18-cda5-4ad2-aa08-89bf4392026e.png new file mode 100644 index 0000000000..651457e5fc Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood/layers/baed253b-ca79-4975-a382-c6f3bb1e3750/025efc18-cda5-4ad2-aa08-89bf4392026e.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood/layers/baed253b-ca79-4975-a382-c6f3bb1e3750/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_complex_psy_hood/layers/baed253b-ca79-4975-a382-c6f3bb1e3750/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..4406613077 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood/layers/baed253b-ca79-4975-a382-c6f3bb1e3750/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood/layers/cc48e121-d030-4365-98d4-c96cae616cf6/025efc18-cda5-4ad2-aa08-89bf4392026e.png b/sprites/spr_indomitus_complex_psy_hood/layers/cc48e121-d030-4365-98d4-c96cae616cf6/025efc18-cda5-4ad2-aa08-89bf4392026e.png new file mode 100644 index 0000000000..6818e66932 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood/layers/cc48e121-d030-4365-98d4-c96cae616cf6/025efc18-cda5-4ad2-aa08-89bf4392026e.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood/layers/cc48e121-d030-4365-98d4-c96cae616cf6/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_complex_psy_hood/layers/cc48e121-d030-4365-98d4-c96cae616cf6/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..4406613077 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood/layers/cc48e121-d030-4365-98d4-c96cae616cf6/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood/spr_indomitus_complex_psy_hood.yy b/sprites/spr_indomitus_complex_psy_hood/spr_indomitus_complex_psy_hood.yy new file mode 100644 index 0000000000..818d157d41 --- /dev/null +++ b/sprites/spr_indomitus_complex_psy_hood/spr_indomitus_complex_psy_hood.yy @@ -0,0 +1,101 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_indomitus_complex_psy_hood", + "bboxMode":0, + "bbox_bottom":75, + "bbox_left":59, + "bbox_right":121, + "bbox_top":38, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"cc48e121-d030-4365-98d4-c96cae616cf6","name":"cc48e121-d030-4365-98d4-c96cae616cf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"308aed46-7906-480b-a2b9-07b771c978e3","name":"308aed46-7906-480b-a2b9-07b771c978e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"baed253b-ca79-4975-a382-c6f3bb1e3750","name":"baed253b-ca79-4975-a382-c6f3bb1e3750","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"025efc18-cda5-4ad2-aa08-89bf4392026e","blendMode":0,"displayName":"Layer 1","isLocked":false,"name":"025efc18-cda5-4ad2-aa08-89bf4392026e","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"03d917a8-bff1-45d7-818b-f057c5540e44","blendMode":0,"displayName":"default","isLocked":false,"name":"03d917a8-bff1-45d7-818b-f057c5540e44","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_indomitus_complex_psy_hood", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"indomitus_complex", + "path":"folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_indomitus_complex_psy_hood", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":3.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_indomitus_complex_psy_hood", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cc48e121-d030-4365-98d4-c96cae616cf6","path":"sprites/spr_indomitus_complex_psy_hood/spr_indomitus_complex_psy_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b8c3e689-7b18-420a-8e2a-0d7a6e41ecfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"308aed46-7906-480b-a2b9-07b771c978e3","path":"sprites/spr_indomitus_complex_psy_hood/spr_indomitus_complex_psy_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a85f4d2c-c662-4347-bba8-ef6723dadcd4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"baed253b-ca79-4975-a382-c6f3bb1e3750","path":"sprites/spr_indomitus_complex_psy_hood/spr_indomitus_complex_psy_hood.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"13d2fc00-8364-4495-a4ab-d50aae3bf1bb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_indomitus_complex_psy_hood_cables/0a003967-014c-4789-8e8b-22966f90f92b.png b/sprites/spr_indomitus_complex_psy_hood_cables/0a003967-014c-4789-8e8b-22966f90f92b.png new file mode 100644 index 0000000000..fec603074c Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_cables/0a003967-014c-4789-8e8b-22966f90f92b.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_cables/12292fae-7c51-4ce0-a73a-640e9340ff09.png b/sprites/spr_indomitus_complex_psy_hood_cables/12292fae-7c51-4ce0-a73a-640e9340ff09.png new file mode 100644 index 0000000000..eaa94f9e21 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_cables/12292fae-7c51-4ce0-a73a-640e9340ff09.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_cables/677ccaa0-47e6-481a-9397-b045df6425bf.png b/sprites/spr_indomitus_complex_psy_hood_cables/677ccaa0-47e6-481a-9397-b045df6425bf.png new file mode 100644 index 0000000000..f0fc17a5ee Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_cables/677ccaa0-47e6-481a-9397-b045df6425bf.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_cables/f7b471f2-993d-4ab5-a31e-e7494c3a2e7d.png b/sprites/spr_indomitus_complex_psy_hood_cables/f7b471f2-993d-4ab5-a31e-e7494c3a2e7d.png new file mode 100644 index 0000000000..8864e9d699 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_cables/f7b471f2-993d-4ab5-a31e-e7494c3a2e7d.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_cables/layers/0a003967-014c-4789-8e8b-22966f90f92b/025efc18-cda5-4ad2-aa08-89bf4392026e.png b/sprites/spr_indomitus_complex_psy_hood_cables/layers/0a003967-014c-4789-8e8b-22966f90f92b/025efc18-cda5-4ad2-aa08-89bf4392026e.png new file mode 100644 index 0000000000..fec603074c Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_cables/layers/0a003967-014c-4789-8e8b-22966f90f92b/025efc18-cda5-4ad2-aa08-89bf4392026e.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_cables/layers/0a003967-014c-4789-8e8b-22966f90f92b/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_complex_psy_hood_cables/layers/0a003967-014c-4789-8e8b-22966f90f92b/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..db00bd12f4 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_cables/layers/0a003967-014c-4789-8e8b-22966f90f92b/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_cables/layers/12292fae-7c51-4ce0-a73a-640e9340ff09/025efc18-cda5-4ad2-aa08-89bf4392026e.png b/sprites/spr_indomitus_complex_psy_hood_cables/layers/12292fae-7c51-4ce0-a73a-640e9340ff09/025efc18-cda5-4ad2-aa08-89bf4392026e.png new file mode 100644 index 0000000000..eaa94f9e21 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_cables/layers/12292fae-7c51-4ce0-a73a-640e9340ff09/025efc18-cda5-4ad2-aa08-89bf4392026e.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_cables/layers/12292fae-7c51-4ce0-a73a-640e9340ff09/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_complex_psy_hood_cables/layers/12292fae-7c51-4ce0-a73a-640e9340ff09/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..db00bd12f4 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_cables/layers/12292fae-7c51-4ce0-a73a-640e9340ff09/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_cables/layers/677ccaa0-47e6-481a-9397-b045df6425bf/025efc18-cda5-4ad2-aa08-89bf4392026e.png b/sprites/spr_indomitus_complex_psy_hood_cables/layers/677ccaa0-47e6-481a-9397-b045df6425bf/025efc18-cda5-4ad2-aa08-89bf4392026e.png new file mode 100644 index 0000000000..f0fc17a5ee Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_cables/layers/677ccaa0-47e6-481a-9397-b045df6425bf/025efc18-cda5-4ad2-aa08-89bf4392026e.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_cables/layers/677ccaa0-47e6-481a-9397-b045df6425bf/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_complex_psy_hood_cables/layers/677ccaa0-47e6-481a-9397-b045df6425bf/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..4406613077 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_cables/layers/677ccaa0-47e6-481a-9397-b045df6425bf/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_cables/layers/f7b471f2-993d-4ab5-a31e-e7494c3a2e7d/025efc18-cda5-4ad2-aa08-89bf4392026e.png b/sprites/spr_indomitus_complex_psy_hood_cables/layers/f7b471f2-993d-4ab5-a31e-e7494c3a2e7d/025efc18-cda5-4ad2-aa08-89bf4392026e.png new file mode 100644 index 0000000000..8864e9d699 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_cables/layers/f7b471f2-993d-4ab5-a31e-e7494c3a2e7d/025efc18-cda5-4ad2-aa08-89bf4392026e.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_cables/layers/f7b471f2-993d-4ab5-a31e-e7494c3a2e7d/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_complex_psy_hood_cables/layers/f7b471f2-993d-4ab5-a31e-e7494c3a2e7d/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..db00bd12f4 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_cables/layers/f7b471f2-993d-4ab5-a31e-e7494c3a2e7d/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_cables/spr_indomitus_complex_psy_hood_cables.yy b/sprites/spr_indomitus_complex_psy_hood_cables/spr_indomitus_complex_psy_hood_cables.yy new file mode 100644 index 0000000000..8a38d2c391 --- /dev/null +++ b/sprites/spr_indomitus_complex_psy_hood_cables/spr_indomitus_complex_psy_hood_cables.yy @@ -0,0 +1,105 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_indomitus_complex_psy_hood_cables", + "bboxMode":0, + "bbox_bottom":74, + "bbox_left":64, + "bbox_right":117, + "bbox_top":44, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"677ccaa0-47e6-481a-9397-b045df6425bf","name":"677ccaa0-47e6-481a-9397-b045df6425bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a003967-014c-4789-8e8b-22966f90f92b","name":"0a003967-014c-4789-8e8b-22966f90f92b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7b471f2-993d-4ab5-a31e-e7494c3a2e7d","name":"f7b471f2-993d-4ab5-a31e-e7494c3a2e7d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"12292fae-7c51-4ce0-a73a-640e9340ff09","name":"12292fae-7c51-4ce0-a73a-640e9340ff09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"025efc18-cda5-4ad2-aa08-89bf4392026e","blendMode":0,"displayName":"Layer 1","isLocked":false,"name":"025efc18-cda5-4ad2-aa08-89bf4392026e","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"03d917a8-bff1-45d7-818b-f057c5540e44","blendMode":0,"displayName":"default","isLocked":false,"name":"03d917a8-bff1-45d7-818b-f057c5540e44","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_indomitus_complex_psy_hood_cables", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"indomitus_complex", + "path":"folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_indomitus_complex_psy_hood_cables", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":4.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_indomitus_complex_psy_hood_cables", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"677ccaa0-47e6-481a-9397-b045df6425bf","path":"sprites/spr_indomitus_complex_psy_hood_cables/spr_indomitus_complex_psy_hood_cables.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"09617dd9-c90b-49db-97eb-3fd9d73f654e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a003967-014c-4789-8e8b-22966f90f92b","path":"sprites/spr_indomitus_complex_psy_hood_cables/spr_indomitus_complex_psy_hood_cables.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"39db3a91-142a-4591-94d1-9d2f6c1d599d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7b471f2-993d-4ab5-a31e-e7494c3a2e7d","path":"sprites/spr_indomitus_complex_psy_hood_cables/spr_indomitus_complex_psy_hood_cables.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6bb7ae80-6e16-495b-b037-7264f7282a3e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"12292fae-7c51-4ce0-a73a-640e9340ff09","path":"sprites/spr_indomitus_complex_psy_hood_cables/spr_indomitus_complex_psy_hood_cables.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"573fb1ea-45be-41a3-a85b-48ed5b4a455d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_indomitus_complex_psy_hood_crown/0cc6a913-f7cf-4a42-b55d-4c2e35912f8d.png b/sprites/spr_indomitus_complex_psy_hood_crown/0cc6a913-f7cf-4a42-b55d-4c2e35912f8d.png new file mode 100644 index 0000000000..67a2e51d88 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_crown/0cc6a913-f7cf-4a42-b55d-4c2e35912f8d.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_crown/d5b54b53-180c-46be-9598-14d688af60f6.png b/sprites/spr_indomitus_complex_psy_hood_crown/d5b54b53-180c-46be-9598-14d688af60f6.png new file mode 100644 index 0000000000..97b3d87fad Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_crown/d5b54b53-180c-46be-9598-14d688af60f6.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_crown/eeeb9f09-92af-47b6-926b-9af54f8b3dd0.png b/sprites/spr_indomitus_complex_psy_hood_crown/eeeb9f09-92af-47b6-926b-9af54f8b3dd0.png new file mode 100644 index 0000000000..2e2bcd7472 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_crown/eeeb9f09-92af-47b6-926b-9af54f8b3dd0.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_crown/layers/0cc6a913-f7cf-4a42-b55d-4c2e35912f8d/025efc18-cda5-4ad2-aa08-89bf4392026e.png b/sprites/spr_indomitus_complex_psy_hood_crown/layers/0cc6a913-f7cf-4a42-b55d-4c2e35912f8d/025efc18-cda5-4ad2-aa08-89bf4392026e.png new file mode 100644 index 0000000000..67a2e51d88 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_crown/layers/0cc6a913-f7cf-4a42-b55d-4c2e35912f8d/025efc18-cda5-4ad2-aa08-89bf4392026e.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_crown/layers/0cc6a913-f7cf-4a42-b55d-4c2e35912f8d/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_complex_psy_hood_crown/layers/0cc6a913-f7cf-4a42-b55d-4c2e35912f8d/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..6405808d0a Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_crown/layers/0cc6a913-f7cf-4a42-b55d-4c2e35912f8d/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_crown/layers/d5b54b53-180c-46be-9598-14d688af60f6/025efc18-cda5-4ad2-aa08-89bf4392026e.png b/sprites/spr_indomitus_complex_psy_hood_crown/layers/d5b54b53-180c-46be-9598-14d688af60f6/025efc18-cda5-4ad2-aa08-89bf4392026e.png new file mode 100644 index 0000000000..97b3d87fad Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_crown/layers/d5b54b53-180c-46be-9598-14d688af60f6/025efc18-cda5-4ad2-aa08-89bf4392026e.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_crown/layers/d5b54b53-180c-46be-9598-14d688af60f6/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_complex_psy_hood_crown/layers/d5b54b53-180c-46be-9598-14d688af60f6/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..6405808d0a Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_crown/layers/d5b54b53-180c-46be-9598-14d688af60f6/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_crown/layers/eeeb9f09-92af-47b6-926b-9af54f8b3dd0/025efc18-cda5-4ad2-aa08-89bf4392026e.png b/sprites/spr_indomitus_complex_psy_hood_crown/layers/eeeb9f09-92af-47b6-926b-9af54f8b3dd0/025efc18-cda5-4ad2-aa08-89bf4392026e.png new file mode 100644 index 0000000000..2e2bcd7472 Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_crown/layers/eeeb9f09-92af-47b6-926b-9af54f8b3dd0/025efc18-cda5-4ad2-aa08-89bf4392026e.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_crown/layers/eeeb9f09-92af-47b6-926b-9af54f8b3dd0/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_complex_psy_hood_crown/layers/eeeb9f09-92af-47b6-926b-9af54f8b3dd0/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..6405808d0a Binary files /dev/null and b/sprites/spr_indomitus_complex_psy_hood_crown/layers/eeeb9f09-92af-47b6-926b-9af54f8b3dd0/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_complex_psy_hood_crown/spr_indomitus_complex_psy_hood_crown.yy b/sprites/spr_indomitus_complex_psy_hood_crown/spr_indomitus_complex_psy_hood_crown.yy new file mode 100644 index 0000000000..5354b0d398 --- /dev/null +++ b/sprites/spr_indomitus_complex_psy_hood_crown/spr_indomitus_complex_psy_hood_crown.yy @@ -0,0 +1,101 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_indomitus_complex_psy_hood_crown", + "bboxMode":0, + "bbox_bottom":60, + "bbox_left":75, + "bbox_right":105, + "bbox_top":43, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"eeeb9f09-92af-47b6-926b-9af54f8b3dd0","name":"eeeb9f09-92af-47b6-926b-9af54f8b3dd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5b54b53-180c-46be-9598-14d688af60f6","name":"d5b54b53-180c-46be-9598-14d688af60f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0cc6a913-f7cf-4a42-b55d-4c2e35912f8d","name":"0cc6a913-f7cf-4a42-b55d-4c2e35912f8d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"025efc18-cda5-4ad2-aa08-89bf4392026e","blendMode":0,"displayName":"Layer 1","isLocked":false,"name":"025efc18-cda5-4ad2-aa08-89bf4392026e","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"03d917a8-bff1-45d7-818b-f057c5540e44","blendMode":0,"displayName":"default","isLocked":false,"name":"03d917a8-bff1-45d7-818b-f057c5540e44","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_indomitus_complex_psy_hood_crown", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"indomitus_complex", + "path":"folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_indomitus_complex_psy_hood_crown", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":3.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_indomitus_complex_psy_hood_crown", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeeb9f09-92af-47b6-926b-9af54f8b3dd0","path":"sprites/spr_indomitus_complex_psy_hood_crown/spr_indomitus_complex_psy_hood_crown.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4e40d96b-066b-41e9-9987-a5edcabe46d1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5b54b53-180c-46be-9598-14d688af60f6","path":"sprites/spr_indomitus_complex_psy_hood_crown/spr_indomitus_complex_psy_hood_crown.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ad5cfb53-b8db-4d4b-8c9d-d2dedc4743bb","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0cc6a913-f7cf-4a42-b55d-4c2e35912f8d","path":"sprites/spr_indomitus_complex_psy_hood_crown/spr_indomitus_complex_psy_hood_crown.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5bdd2add-00a6-4b23-93ec-cb53e9b0cb96","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_indomitus_complex_shadows/7173924c-400c-4ee3-8b3d-0123aa659415.png b/sprites/spr_indomitus_complex_shadows/7173924c-400c-4ee3-8b3d-0123aa659415.png new file mode 100644 index 0000000000..59c4435f56 Binary files /dev/null and b/sprites/spr_indomitus_complex_shadows/7173924c-400c-4ee3-8b3d-0123aa659415.png differ diff --git a/sprites/spr_indomitus_complex_shadows/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_complex_shadows/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..59c4435f56 Binary files /dev/null and b/sprites/spr_indomitus_complex_shadows/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_complex_shadows/spr_indomitus_complex_shadows.yy b/sprites/spr_indomitus_complex_shadows/spr_indomitus_complex_shadows.yy new file mode 100644 index 0000000000..ffb388424a --- /dev/null +++ b/sprites/spr_indomitus_complex_shadows/spr_indomitus_complex_shadows.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_indomitus_complex_shadows", + "bboxMode":0, + "bbox_bottom":185, + "bbox_left":10, + "bbox_right":172, + "bbox_top":32, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"03d917a8-bff1-45d7-818b-f057c5540e44","blendMode":0,"displayName":"default","isLocked":false,"name":"03d917a8-bff1-45d7-818b-f057c5540e44","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_indomitus_complex_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"indomitus_complex", + "path":"folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_indomitus_complex_shadows", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_indomitus_complex_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_complex_shadows/spr_indomitus_complex_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6e1fa933-e2c0-4763-b072-75adc49be13b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_indomitus_head_variants/7173924c-400c-4ee3-8b3d-0123aa659415.png b/sprites/spr_indomitus_head_variants/7173924c-400c-4ee3-8b3d-0123aa659415.png index 810f193847..0b2690cea2 100644 Binary files a/sprites/spr_indomitus_head_variants/7173924c-400c-4ee3-8b3d-0123aa659415.png and b/sprites/spr_indomitus_head_variants/7173924c-400c-4ee3-8b3d-0123aa659415.png differ diff --git a/sprites/spr_indomitus_head_variants/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_head_variants/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png index 810f193847..0b2690cea2 100644 Binary files a/sprites/spr_indomitus_head_variants/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png and b/sprites/spr_indomitus_head_variants/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy b/sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy index 42acc9e30a..3d04b98586 100644 --- a/sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy +++ b/sprites/spr_indomitus_head_variants/spr_indomitus_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_head_variants", "bboxMode":0, "bbox_bottom":88, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_head_variants_shadows/7173924c-400c-4ee3-8b3d-0123aa659415.png b/sprites/spr_indomitus_head_variants_shadows/7173924c-400c-4ee3-8b3d-0123aa659415.png new file mode 100644 index 0000000000..3cd87fcc04 Binary files /dev/null and b/sprites/spr_indomitus_head_variants_shadows/7173924c-400c-4ee3-8b3d-0123aa659415.png differ diff --git a/sprites/spr_indomitus_head_variants_shadows/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png b/sprites/spr_indomitus_head_variants_shadows/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png new file mode 100644 index 0000000000..3cd87fcc04 Binary files /dev/null and b/sprites/spr_indomitus_head_variants_shadows/layers/7173924c-400c-4ee3-8b3d-0123aa659415/03d917a8-bff1-45d7-818b-f057c5540e44.png differ diff --git a/sprites/spr_indomitus_head_variants_shadows/spr_indomitus_head_variants_shadows.yy b/sprites/spr_indomitus_head_variants_shadows/spr_indomitus_head_variants_shadows.yy new file mode 100644 index 0000000000..89e163671f --- /dev/null +++ b/sprites/spr_indomitus_head_variants_shadows/spr_indomitus_head_variants_shadows.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_indomitus_head_variants_shadows", + "bboxMode":0, + "bbox_bottom":88, + "bbox_left":65, + "bbox_right":115, + "bbox_top":43, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"7173924c-400c-4ee3-8b3d-0123aa659415","name":"7173924c-400c-4ee3-8b3d-0123aa659415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"03d917a8-bff1-45d7-818b-f057c5540e44","blendMode":0,"displayName":"default","isLocked":false,"name":"03d917a8-bff1-45d7-818b-f057c5540e44","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_indomitus_head_variants_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"indomitus_complex", + "path":"folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_indomitus_head_variants_shadows", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_indomitus_head_variants_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7173924c-400c-4ee3-8b3d-0123aa659415","path":"sprites/spr_indomitus_head_variants_shadows/spr_indomitus_head_variants_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c4562bd4-7167-4589-a834-2a10a6e5f760","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy b/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy index 5e2dfe806d..da72db7173 100644 --- a/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy +++ b/sprites/spr_indomitus_knightly_robe/spr_indomitus_knightly_robe.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_knightly_robe", "bboxMode":0, "bbox_bottom":238, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"05afe988-9760-4afd-a9a3-082287887f4a","name":"05afe988-9760-4afd-a9a3-082287887f4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05afe988-9760-4afd-a9a3-082287887f4a","name":"05afe988-9760-4afd-a9a3-082287887f4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy b/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy index 1020555be3..2b15f6aef1 100644 --- a/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy +++ b/sprites/spr_indomitus_left_arm/spr_indomitus_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_left_arm", "bboxMode":0, "bbox_bottom":170, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","name":"8165f8b1-f548-43db-a12f-9fb5d46a8ce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy b/sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy index d187e1b196..4a3a8b37d8 100644 --- a/sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy +++ b/sprites/spr_indomitus_left_arm_bionic/spr_indomitus_left_arm_bionic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_left_arm_bionic", "bboxMode":0, "bbox_bottom":183, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a3ac1d6f-e781-440e-a110-6fad27f8a376","name":"a3ac1d6f-e781-440e-a110-6fad27f8a376","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a3ac1d6f-e781-440e-a110-6fad27f8a376","name":"a3ac1d6f-e781-440e-a110-6fad27f8a376","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":39, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy b/sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy index 773e40350c..51e229b368 100644 --- a/sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy +++ b/sprites/spr_indomitus_left_eye_bionic/spr_indomitus_left_eye_bionic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_left_eye_bionic", "bboxMode":0, "bbox_bottom":75, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -66,6 +66,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -87,7 +89,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy b/sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy index 9b26a50863..fd22de1c0c 100644 --- a/sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy +++ b/sprites/spr_indomitus_left_knee_crux/spr_indomitus_left_knee_crux.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_left_knee_crux", "bboxMode":0, "bbox_bottom":206, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d086015e-a6f4-4603-8d87-f9dc34671215","name":"d086015e-a6f4-4603-8d87-f9dc34671215","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d086015e-a6f4-4603-8d87-f9dc34671215","name":"d086015e-a6f4-4603-8d87-f9dc34671215","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy b/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy index bc377646d6..df34234b5a 100644 --- a/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy +++ b/sprites/spr_indomitus_left_leg_bionic/spr_indomitus_left_leg_bionic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_left_leg_bionic", "bboxMode":0, "bbox_bottom":260, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","name":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","name":"9050d74b-ae5d-43ad-9ef5-42a5ae426e64","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":39, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy b/sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy index add50a6d22..fd7491bed1 100644 --- a/sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy +++ b/sprites/spr_indomitus_left_shin/spr_indomitus_left_shin.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_left_shin", "bboxMode":0, "bbox_bottom":248, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e60513c5-fcc3-459c-916e-8b19128ed541","name":"e60513c5-fcc3-459c-916e-8b19128ed541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb2de076-5af9-459a-b130-624bab24de74","name":"bb2de076-5af9-459a-b130-624bab24de74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e60513c5-fcc3-459c-916e-8b19128ed541","name":"e60513c5-fcc3-459c-916e-8b19128ed541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb2de076-5af9-459a-b130-624bab24de74","name":"bb2de076-5af9-459a-b130-624bab24de74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -85,7 +85,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_left_shin_shadow/bb2de076-5af9-459a-b130-624bab24de74.png b/sprites/spr_indomitus_left_shin_shadow/bb2de076-5af9-459a-b130-624bab24de74.png new file mode 100644 index 0000000000..2d1db69e88 Binary files /dev/null and b/sprites/spr_indomitus_left_shin_shadow/bb2de076-5af9-459a-b130-624bab24de74.png differ diff --git a/sprites/spr_indomitus_left_shin_shadow/c23a99ed-6ea4-4ba2-8272-35125ec5c9db.png b/sprites/spr_indomitus_left_shin_shadow/c23a99ed-6ea4-4ba2-8272-35125ec5c9db.png new file mode 100644 index 0000000000..2d1db69e88 Binary files /dev/null and b/sprites/spr_indomitus_left_shin_shadow/c23a99ed-6ea4-4ba2-8272-35125ec5c9db.png differ diff --git a/sprites/spr_indomitus_left_shin_shadow/e60513c5-fcc3-459c-916e-8b19128ed541.png b/sprites/spr_indomitus_left_shin_shadow/e60513c5-fcc3-459c-916e-8b19128ed541.png new file mode 100644 index 0000000000..19e55dc772 Binary files /dev/null and b/sprites/spr_indomitus_left_shin_shadow/e60513c5-fcc3-459c-916e-8b19128ed541.png differ diff --git a/sprites/spr_indomitus_left_shin_shadow/layers/bb2de076-5af9-459a-b130-624bab24de74/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_left_shin_shadow/layers/bb2de076-5af9-459a-b130-624bab24de74/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png new file mode 100644 index 0000000000..2d1db69e88 Binary files /dev/null and b/sprites/spr_indomitus_left_shin_shadow/layers/bb2de076-5af9-459a-b130-624bab24de74/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_left_shin_shadow/layers/c23a99ed-6ea4-4ba2-8272-35125ec5c9db/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_left_shin_shadow/layers/c23a99ed-6ea4-4ba2-8272-35125ec5c9db/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png new file mode 100644 index 0000000000..2d1db69e88 Binary files /dev/null and b/sprites/spr_indomitus_left_shin_shadow/layers/c23a99ed-6ea4-4ba2-8272-35125ec5c9db/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_left_shin_shadow/layers/e60513c5-fcc3-459c-916e-8b19128ed541/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_left_shin_shadow/layers/e60513c5-fcc3-459c-916e-8b19128ed541/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png new file mode 100644 index 0000000000..bf9f4a8f16 Binary files /dev/null and b/sprites/spr_indomitus_left_shin_shadow/layers/e60513c5-fcc3-459c-916e-8b19128ed541/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_left_shin_shadow/spr_indomitus_left_shin_shadow.yy b/sprites/spr_indomitus_left_shin_shadow/spr_indomitus_left_shin_shadow.yy new file mode 100644 index 0000000000..13769f3b0d --- /dev/null +++ b/sprites/spr_indomitus_left_shin_shadow/spr_indomitus_left_shin_shadow.yy @@ -0,0 +1,100 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_indomitus_left_shin_shadow", + "bboxMode":0, + "bbox_bottom":0, + "bbox_left":0, + "bbox_right":0, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"e60513c5-fcc3-459c-916e-8b19128ed541","name":"e60513c5-fcc3-459c-916e-8b19128ed541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb2de076-5af9-459a-b130-624bab24de74","name":"bb2de076-5af9-459a-b130-624bab24de74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"5ed376c2-9d33-44c5-9f13-c15f43e640b4","blendMode":0,"displayName":"default","isLocked":false,"name":"5ed376c2-9d33-44c5-9f13-c15f43e640b4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_indomitus_left_shin_shadow", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"indomitus_complex", + "path":"folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_indomitus_left_shin_shadow", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":3.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_indomitus_left_shin_shadow", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e60513c5-fcc3-459c-916e-8b19128ed541","path":"sprites/spr_indomitus_left_shin_shadow/spr_indomitus_left_shin_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8c9fab82-bd4c-4aaa-8995-50ee32141c65","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb2de076-5af9-459a-b130-624bab24de74","path":"sprites/spr_indomitus_left_shin_shadow/spr_indomitus_left_shin_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"67c33f4c-ee5a-4a87-99df-324d5f6e3d29","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c23a99ed-6ea4-4ba2-8272-35125ec5c9db","path":"sprites/spr_indomitus_left_shin_shadow/spr_indomitus_left_shin_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3cfeac81-ef68-4b7a-9463-ea132dcc12df","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":7, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_indomitus_leg_variants/1717fb82-7e0f-4cdd-b0f7-e881ec8ad680.png b/sprites/spr_indomitus_leg_variants/1717fb82-7e0f-4cdd-b0f7-e881ec8ad680.png new file mode 100644 index 0000000000..c0ab9506e4 Binary files /dev/null and b/sprites/spr_indomitus_leg_variants/1717fb82-7e0f-4cdd-b0f7-e881ec8ad680.png differ diff --git a/sprites/spr_indomitus_leg_variants/220fdf6f-48b5-4de0-9576-27b046131605.png b/sprites/spr_indomitus_leg_variants/220fdf6f-48b5-4de0-9576-27b046131605.png index cc96d92c64..0816eb3c46 100644 Binary files a/sprites/spr_indomitus_leg_variants/220fdf6f-48b5-4de0-9576-27b046131605.png and b/sprites/spr_indomitus_leg_variants/220fdf6f-48b5-4de0-9576-27b046131605.png differ diff --git a/sprites/spr_indomitus_leg_variants/b1984530-db57-4951-bec4-a09cab003f1a.png b/sprites/spr_indomitus_leg_variants/b1984530-db57-4951-bec4-a09cab003f1a.png index 1262d6ae4b..646a3c52e2 100644 Binary files a/sprites/spr_indomitus_leg_variants/b1984530-db57-4951-bec4-a09cab003f1a.png and b/sprites/spr_indomitus_leg_variants/b1984530-db57-4951-bec4-a09cab003f1a.png differ diff --git a/sprites/spr_indomitus_leg_variants/layers/1717fb82-7e0f-4cdd-b0f7-e881ec8ad680/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_leg_variants/layers/1717fb82-7e0f-4cdd-b0f7-e881ec8ad680/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png new file mode 100644 index 0000000000..c0ab9506e4 Binary files /dev/null and b/sprites/spr_indomitus_leg_variants/layers/1717fb82-7e0f-4cdd-b0f7-e881ec8ad680/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_leg_variants/layers/220fdf6f-48b5-4de0-9576-27b046131605/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_leg_variants/layers/220fdf6f-48b5-4de0-9576-27b046131605/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png index cc96d92c64..0816eb3c46 100644 Binary files a/sprites/spr_indomitus_leg_variants/layers/220fdf6f-48b5-4de0-9576-27b046131605/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png and b/sprites/spr_indomitus_leg_variants/layers/220fdf6f-48b5-4de0-9576-27b046131605/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_leg_variants/layers/b1984530-db57-4951-bec4-a09cab003f1a/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_leg_variants/layers/b1984530-db57-4951-bec4-a09cab003f1a/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png index 1262d6ae4b..646a3c52e2 100644 Binary files a/sprites/spr_indomitus_leg_variants/layers/b1984530-db57-4951-bec4-a09cab003f1a/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png and b/sprites/spr_indomitus_leg_variants/layers/b1984530-db57-4951-bec4-a09cab003f1a/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy b/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy index c555c85b89..ce65313ac0 100644 --- a/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy +++ b/sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy @@ -1,19 +1,20 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_leg_variants", "bboxMode":0, "bbox_bottom":259, "bbox_left":11, "bbox_right":169, - "bbox_top":165, + "bbox_top":166, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b1984530-db57-4951-bec4-a09cab003f1a","name":"b1984530-db57-4951-bec4-a09cab003f1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"220fdf6f-48b5-4de0-9576-27b046131605","name":"220fdf6f-48b5-4de0-9576-27b046131605","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1984530-db57-4951-bec4-a09cab003f1a","name":"b1984530-db57-4951-bec4-a09cab003f1a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1717fb82-7e0f-4cdd-b0f7-e881ec8ad680","name":"1717fb82-7e0f-4cdd-b0f7-e881ec8ad680","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"220fdf6f-48b5-4de0-9576-27b046131605","name":"220fdf6f-48b5-4de0-9576-27b046131605","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -50,7 +51,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":2.0, + "length":3.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -74,14 +75,17 @@ {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1984530-db57-4951-bec4-a09cab003f1a","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"764ed5f4-cd44-421c-9173-78dc4b5c4698","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1717fb82-7e0f-4cdd-b0f7-e881ec8ad680","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d38863ce-3890-4bb1-8284-7718da807cd8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"220fdf6f-48b5-4de0-9576-27b046131605","path":"sprites/spr_indomitus_leg_variants/spr_indomitus_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d185e240-e0cf-4973-93cf-cd6660ec621e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"d185e240-e0cf-4973-93cf-cd6660ec621e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_leg_variants_shadows/1401c2ba-1a86-4c4d-b731-8f28f0ae33d8.png b/sprites/spr_indomitus_leg_variants_shadows/1401c2ba-1a86-4c4d-b731-8f28f0ae33d8.png new file mode 100644 index 0000000000..b4c8a956f4 Binary files /dev/null and b/sprites/spr_indomitus_leg_variants_shadows/1401c2ba-1a86-4c4d-b731-8f28f0ae33d8.png differ diff --git a/sprites/spr_indomitus_leg_variants_shadows/220fdf6f-48b5-4de0-9576-27b046131605.png b/sprites/spr_indomitus_leg_variants_shadows/220fdf6f-48b5-4de0-9576-27b046131605.png new file mode 100644 index 0000000000..a253bf7a6c Binary files /dev/null and b/sprites/spr_indomitus_leg_variants_shadows/220fdf6f-48b5-4de0-9576-27b046131605.png differ diff --git a/sprites/spr_indomitus_leg_variants_shadows/f11ec996-00a0-4383-95d7-687ed1f9f302.png b/sprites/spr_indomitus_leg_variants_shadows/f11ec996-00a0-4383-95d7-687ed1f9f302.png new file mode 100644 index 0000000000..52f4bc099d Binary files /dev/null and b/sprites/spr_indomitus_leg_variants_shadows/f11ec996-00a0-4383-95d7-687ed1f9f302.png differ diff --git a/sprites/spr_indomitus_leg_variants_shadows/layers/1401c2ba-1a86-4c4d-b731-8f28f0ae33d8/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_leg_variants_shadows/layers/1401c2ba-1a86-4c4d-b731-8f28f0ae33d8/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png new file mode 100644 index 0000000000..b4c8a956f4 Binary files /dev/null and b/sprites/spr_indomitus_leg_variants_shadows/layers/1401c2ba-1a86-4c4d-b731-8f28f0ae33d8/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_leg_variants_shadows/layers/220fdf6f-48b5-4de0-9576-27b046131605/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_leg_variants_shadows/layers/220fdf6f-48b5-4de0-9576-27b046131605/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png new file mode 100644 index 0000000000..a253bf7a6c Binary files /dev/null and b/sprites/spr_indomitus_leg_variants_shadows/layers/220fdf6f-48b5-4de0-9576-27b046131605/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_leg_variants_shadows/layers/f11ec996-00a0-4383-95d7-687ed1f9f302/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_leg_variants_shadows/layers/f11ec996-00a0-4383-95d7-687ed1f9f302/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png new file mode 100644 index 0000000000..52f4bc099d Binary files /dev/null and b/sprites/spr_indomitus_leg_variants_shadows/layers/f11ec996-00a0-4383-95d7-687ed1f9f302/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_leg_variants_shadows/spr_indomitus_leg_variants_shadows.yy b/sprites/spr_indomitus_leg_variants_shadows/spr_indomitus_leg_variants_shadows.yy new file mode 100644 index 0000000000..73518609d5 --- /dev/null +++ b/sprites/spr_indomitus_leg_variants_shadows/spr_indomitus_leg_variants_shadows.yy @@ -0,0 +1,100 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_indomitus_leg_variants_shadows", + "bboxMode":0, + "bbox_bottom":259, + "bbox_left":11, + "bbox_right":169, + "bbox_top":166, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"f11ec996-00a0-4383-95d7-687ed1f9f302","name":"f11ec996-00a0-4383-95d7-687ed1f9f302","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1401c2ba-1a86-4c4d-b731-8f28f0ae33d8","name":"1401c2ba-1a86-4c4d-b731-8f28f0ae33d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"220fdf6f-48b5-4de0-9576-27b046131605","name":"220fdf6f-48b5-4de0-9576-27b046131605","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"5ed376c2-9d33-44c5-9f13-c15f43e640b4","blendMode":0,"displayName":"default","isLocked":false,"name":"5ed376c2-9d33-44c5-9f13-c15f43e640b4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_indomitus_leg_variants_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"indomitus_complex", + "path":"folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_indomitus_leg_variants_shadows", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":3.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_indomitus_leg_variants_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f11ec996-00a0-4383-95d7-687ed1f9f302","path":"sprites/spr_indomitus_leg_variants_shadows/spr_indomitus_leg_variants_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"72be29e1-0c21-472d-922f-72b530477e36","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1401c2ba-1a86-4c4d-b731-8f28f0ae33d8","path":"sprites/spr_indomitus_leg_variants_shadows/spr_indomitus_leg_variants_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c3473bf9-c426-4a16-9150-c0f4322bded3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"220fdf6f-48b5-4de0-9576-27b046131605","path":"sprites/spr_indomitus_leg_variants_shadows/spr_indomitus_leg_variants_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d185e240-e0cf-4973-93cf-cd6660ec621e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy b/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy index 3a45cbdf10..9f6c05ca67 100644 --- a/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy +++ b/sprites/spr_indomitus_right_arm/spr_indomitus_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_right_arm", "bboxMode":0, "bbox_bottom":170, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy b/sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy index 19da8fb24e..b0e05edacb 100644 --- a/sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy +++ b/sprites/spr_indomitus_right_arm_bionic/spr_indomitus_right_arm_bionic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_right_arm_bionic", "bboxMode":0, "bbox_bottom":183, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":39, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_right_arm_shadows/d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc.png b/sprites/spr_indomitus_right_arm_shadows/d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc.png new file mode 100644 index 0000000000..c59f7e5918 Binary files /dev/null and b/sprites/spr_indomitus_right_arm_shadows/d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc.png differ diff --git a/sprites/spr_indomitus_right_arm_shadows/layers/d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc/55de725b-7bbe-44d0-9ec6-a9c031920d39.png b/sprites/spr_indomitus_right_arm_shadows/layers/d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc/55de725b-7bbe-44d0-9ec6-a9c031920d39.png new file mode 100644 index 0000000000..c59f7e5918 Binary files /dev/null and b/sprites/spr_indomitus_right_arm_shadows/layers/d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc/55de725b-7bbe-44d0-9ec6-a9c031920d39.png differ diff --git a/sprites/spr_indomitus_right_arm_shadows/spr_indomitus_right_arm_shadows.yy b/sprites/spr_indomitus_right_arm_shadows/spr_indomitus_right_arm_shadows.yy new file mode 100644 index 0000000000..cfda05770c --- /dev/null +++ b/sprites/spr_indomitus_right_arm_shadows/spr_indomitus_right_arm_shadows.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_indomitus_right_arm_shadows", + "bboxMode":0, + "bbox_bottom":170, + "bbox_left":5, + "bbox_right":48, + "bbox_top":89, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"55de725b-7bbe-44d0-9ec6-a9c031920d39","blendMode":0,"displayName":"default","isLocked":false,"name":"55de725b-7bbe-44d0-9ec6-a9c031920d39","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_indomitus_right_arm_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"indomitus_complex", + "path":"folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_indomitus_right_arm_shadows", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_indomitus_right_arm_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d026e4c1-b8b3-449b-8c2e-5e0ccf1277cc","path":"sprites/spr_indomitus_right_arm_shadows/spr_indomitus_right_arm_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2172cfc5-5476-46d2-ba16-c7a79aada399","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy b/sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy index da659677d3..1704652603 100644 --- a/sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy +++ b/sprites/spr_indomitus_right_eye_bionic/spr_indomitus_right_eye_bionic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_right_eye_bionic", "bboxMode":0, "bbox_bottom":75, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","name":"31989d85-49ac-4983-b8fb-45efa3e06aa7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","name":"a8ea05d9-93c5-4939-ab47-bac06fd85282","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","name":"7c88e163-9b76-4a91-a58a-ffd8f4e1066f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","name":"b1333d46-5d71-48c7-b81d-909c1f8a2b39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -66,6 +66,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -87,7 +89,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy b/sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy index 52d75c9847..37389f88b1 100644 --- a/sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy +++ b/sprites/spr_indomitus_right_knee_crux/spr_indomitus_right_knee_crux.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_right_knee_crux", "bboxMode":0, "bbox_bottom":206, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"597aa984-87e8-4425-8954-56127319e962","name":"597aa984-87e8-4425-8954-56127319e962","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"597aa984-87e8-4425-8954-56127319e962","name":"597aa984-87e8-4425-8954-56127319e962","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy b/sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy index 700ab2c6a6..e098829635 100644 --- a/sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy +++ b/sprites/spr_indomitus_right_leg_bionic/spr_indomitus_right_leg_bionic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_right_leg_bionic", "bboxMode":0, "bbox_bottom":260, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","name":"4bc0c5a9-ad91-4ba4-bcc8-3c39fcaa1d70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":39, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_right_shin/aa2b5092-d69b-4dac-8052-e89d83b7a246.png b/sprites/spr_indomitus_right_shin/aa2b5092-d69b-4dac-8052-e89d83b7a246.png index 54c8dedc09..41963ca75e 100644 Binary files a/sprites/spr_indomitus_right_shin/aa2b5092-d69b-4dac-8052-e89d83b7a246.png and b/sprites/spr_indomitus_right_shin/aa2b5092-d69b-4dac-8052-e89d83b7a246.png differ diff --git a/sprites/spr_indomitus_right_shin/b1bed381-dffb-49f9-b787-37a97bc22f95.png b/sprites/spr_indomitus_right_shin/b1bed381-dffb-49f9-b787-37a97bc22f95.png index de05508025..92f7551507 100644 Binary files a/sprites/spr_indomitus_right_shin/b1bed381-dffb-49f9-b787-37a97bc22f95.png and b/sprites/spr_indomitus_right_shin/b1bed381-dffb-49f9-b787-37a97bc22f95.png differ diff --git a/sprites/spr_indomitus_right_shin/layers/aa2b5092-d69b-4dac-8052-e89d83b7a246/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_right_shin/layers/aa2b5092-d69b-4dac-8052-e89d83b7a246/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png index d6fbbc0359..41963ca75e 100644 Binary files a/sprites/spr_indomitus_right_shin/layers/aa2b5092-d69b-4dac-8052-e89d83b7a246/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png and b/sprites/spr_indomitus_right_shin/layers/aa2b5092-d69b-4dac-8052-e89d83b7a246/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_right_shin/layers/b1bed381-dffb-49f9-b787-37a97bc22f95/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_right_shin/layers/b1bed381-dffb-49f9-b787-37a97bc22f95/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png index de05508025..92f7551507 100644 Binary files a/sprites/spr_indomitus_right_shin/layers/b1bed381-dffb-49f9-b787-37a97bc22f95/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png and b/sprites/spr_indomitus_right_shin/layers/b1bed381-dffb-49f9-b787-37a97bc22f95/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy b/sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy index 04d57b9504..c6264934e7 100644 --- a/sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy +++ b/sprites/spr_indomitus_right_shin/spr_indomitus_right_shin.yy @@ -1,20 +1,20 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_indomitus_right_shin", "bboxMode":0, "bbox_bottom":248, - "bbox_left":0, + "bbox_left":16, "bbox_right":68, - "bbox_top":0, + "bbox_top":194, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b1bed381-dffb-49f9-b787-37a97bc22f95","name":"b1bed381-dffb-49f9-b787-37a97bc22f95","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c47c8ef5-80d7-495f-aed4-2018547c6479","name":"c47c8ef5-80d7-495f-aed4-2018547c6479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1bed381-dffb-49f9-b787-37a97bc22f95","name":"b1bed381-dffb-49f9-b787-37a97bc22f95","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c47c8ef5-80d7-495f-aed4-2018547c6479","name":"c47c8ef5-80d7-495f-aed4-2018547c6479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -85,7 +85,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_indomitus_right_shin_shadows/aa2b5092-d69b-4dac-8052-e89d83b7a246.png b/sprites/spr_indomitus_right_shin_shadows/aa2b5092-d69b-4dac-8052-e89d83b7a246.png new file mode 100644 index 0000000000..0700940889 Binary files /dev/null and b/sprites/spr_indomitus_right_shin_shadows/aa2b5092-d69b-4dac-8052-e89d83b7a246.png differ diff --git a/sprites/spr_indomitus_right_shin_shadows/b1bed381-dffb-49f9-b787-37a97bc22f95.png b/sprites/spr_indomitus_right_shin_shadows/b1bed381-dffb-49f9-b787-37a97bc22f95.png new file mode 100644 index 0000000000..3caf437896 Binary files /dev/null and b/sprites/spr_indomitus_right_shin_shadows/b1bed381-dffb-49f9-b787-37a97bc22f95.png differ diff --git a/sprites/spr_indomitus_right_shin_shadows/c47c8ef5-80d7-495f-aed4-2018547c6479.png b/sprites/spr_indomitus_right_shin_shadows/c47c8ef5-80d7-495f-aed4-2018547c6479.png new file mode 100644 index 0000000000..f919dcaff3 Binary files /dev/null and b/sprites/spr_indomitus_right_shin_shadows/c47c8ef5-80d7-495f-aed4-2018547c6479.png differ diff --git a/sprites/spr_indomitus_right_shin_shadows/layers/aa2b5092-d69b-4dac-8052-e89d83b7a246/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_right_shin_shadows/layers/aa2b5092-d69b-4dac-8052-e89d83b7a246/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png new file mode 100644 index 0000000000..0700940889 Binary files /dev/null and b/sprites/spr_indomitus_right_shin_shadows/layers/aa2b5092-d69b-4dac-8052-e89d83b7a246/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_right_shin_shadows/layers/b1bed381-dffb-49f9-b787-37a97bc22f95/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_right_shin_shadows/layers/b1bed381-dffb-49f9-b787-37a97bc22f95/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png new file mode 100644 index 0000000000..3caf437896 Binary files /dev/null and b/sprites/spr_indomitus_right_shin_shadows/layers/b1bed381-dffb-49f9-b787-37a97bc22f95/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_right_shin_shadows/layers/c47c8ef5-80d7-495f-aed4-2018547c6479/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png b/sprites/spr_indomitus_right_shin_shadows/layers/c47c8ef5-80d7-495f-aed4-2018547c6479/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png new file mode 100644 index 0000000000..b47925a530 Binary files /dev/null and b/sprites/spr_indomitus_right_shin_shadows/layers/c47c8ef5-80d7-495f-aed4-2018547c6479/5ed376c2-9d33-44c5-9f13-c15f43e640b4.png differ diff --git a/sprites/spr_indomitus_right_shin_shadows/spr_indomitus_right_shin_shadows.yy b/sprites/spr_indomitus_right_shin_shadows/spr_indomitus_right_shin_shadows.yy new file mode 100644 index 0000000000..40b7f8605f --- /dev/null +++ b/sprites/spr_indomitus_right_shin_shadows/spr_indomitus_right_shin_shadows.yy @@ -0,0 +1,100 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_indomitus_right_shin_shadows", + "bboxMode":0, + "bbox_bottom":248, + "bbox_left":16, + "bbox_right":68, + "bbox_top":194, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b1bed381-dffb-49f9-b787-37a97bc22f95","name":"b1bed381-dffb-49f9-b787-37a97bc22f95","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c47c8ef5-80d7-495f-aed4-2018547c6479","name":"c47c8ef5-80d7-495f-aed4-2018547c6479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"5ed376c2-9d33-44c5-9f13-c15f43e640b4","blendMode":0,"displayName":"default","isLocked":false,"name":"5ed376c2-9d33-44c5-9f13-c15f43e640b4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_indomitus_right_shin_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"indomitus_complex", + "path":"folders/Sprites/Marine Viewer/body_types/indomitus_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_indomitus_right_shin_shadows", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":3.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_indomitus_right_shin_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1bed381-dffb-49f9-b787-37a97bc22f95","path":"sprites/spr_indomitus_right_shin_shadows/spr_indomitus_right_shin_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"48a05983-ea7b-44c3-a992-de9cc1664717","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c47c8ef5-80d7-495f-aed4-2018547c6479","path":"sprites/spr_indomitus_right_shin_shadows/spr_indomitus_right_shin_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"21dded79-bee1-4a00-b8ed-516dcd97f1e7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa2b5092-d69b-4dac-8052-e89d83b7a246","path":"sprites/spr_indomitus_right_shin_shadows/spr_indomitus_right_shin_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1961e603-5686-438f-aff5-54e527aeb5a6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_ingame_menu/spr_ingame_menu.yy b/sprites/spr_ingame_menu/spr_ingame_menu.yy index dc8c531f01..dbd9b1eae5 100644 --- a/sprites/spr_ingame_menu/spr_ingame_menu.yy +++ b/sprites/spr_ingame_menu/spr_ingame_menu.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ingame_menu", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b65f6694-b366-414f-9654-e26918f980bb","name":"b65f6694-b366-414f-9654-e26918f980bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b65f6694-b366-414f-9654-e26918f980bb","name":"b65f6694-b366-414f-9654-e26918f980bb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_inspect_small/spr_inspect_small.yy b/sprites/spr_inspect_small/spr_inspect_small.yy index 6933cb4f4a..383fc5964c 100644 --- a/sprites/spr_inspect_small/spr_inspect_small.yy +++ b/sprites/spr_inspect_small/spr_inspect_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_inspect_small", "bboxMode":0, "bbox_bottom":13, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0090d381-ea2b-4d42-9d2d-e45e1b50b1f9","name":"0090d381-ea2b-4d42-9d2d-e45e1b50b1f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0090d381-ea2b-4d42-9d2d-e45e1b50b1f9","name":"0090d381-ea2b-4d42-9d2d-e45e1b50b1f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":14.0, + "seqWidth":14.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"25439a65-c8e8-427a-99ad-76bb9aa6510a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, diff --git a/sprites/spr_intelligence_icon/spr_intelligence_icon.yy b/sprites/spr_intelligence_icon/spr_intelligence_icon.yy index 71abe2441b..b679c1b635 100644 --- a/sprites/spr_intelligence_icon/spr_intelligence_icon.yy +++ b/sprites/spr_intelligence_icon/spr_intelligence_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_intelligence_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"85cf4316-e81b-4313-bd8a-5fb90ac87e4a","name":"85cf4316-e81b-4313-bd8a-5fb90ac87e4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"85cf4316-e81b-4313-bd8a-5fb90ac87e4a","name":"85cf4316-e81b-4313-bd8a-5fb90ac87e4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"85cf4316-e81b-4313-bd8a-5fb90ac87e4a","path":"sprites/spr_intelligence_icon/spr_intelligence_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee3d470c-76e2-4c4c-9673-2dfeb506bd71","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"85cf4316-e81b-4313-bd8a-5fb90ac87e4a","path":"sprites/spr_intelligence_icon/spr_intelligence_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee3d470c-76e2-4c4c-9673-2dfeb506bd71","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_iron2_colors/spr_iron2_colors.yy b/sprites/spr_iron2_colors/spr_iron2_colors.yy index 6c0a193c4b..4d734fb12b 100644 --- a/sprites/spr_iron2_colors/spr_iron2_colors.yy +++ b/sprites/spr_iron2_colors/spr_iron2_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_iron2_colors", "bboxMode":0, "bbox_bottom":226, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"68983a54-f464-439d-b9c3-e617744dbd38","name":"68983a54-f464-439d-b9c3-e617744dbd38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"de91054b-d131-4595-ae7a-cd693f216b00","name":"de91054b-d131-4595-ae7a-cd693f216b00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"670d234d-0594-4987-944b-f6f6a18e90ce","name":"670d234d-0594-4987-944b-f6f6a18e90ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"81f4b5d2-f789-47bf-9bb4-07ea5a378987","name":"81f4b5d2-f789-47bf-9bb4-07ea5a378987","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"46188561-ca08-4852-a95c-89306ae2bc12","name":"46188561-ca08-4852-a95c-89306ae2bc12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73fa6e7a-cfa8-49c1-a1ed-6084beb9c039","name":"73fa6e7a-cfa8-49c1-a1ed-6084beb9c039","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9edd79c3-06b0-426d-aebd-e35e0658f7fa","name":"9edd79c3-06b0-426d-aebd-e35e0658f7fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2458e4aa-898d-47f4-814f-bb35887f2116","name":"2458e4aa-898d-47f4-814f-bb35887f2116","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ba9d4d31-71c1-4b14-8e82-5284f2c801d3","name":"ba9d4d31-71c1-4b14-8e82-5284f2c801d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76f25edc-9000-449f-a06f-4223015d179e","name":"76f25edc-9000-449f-a06f-4223015d179e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"354c4384-43a6-4072-ba17-6b481bdb5f9c","name":"354c4384-43a6-4072-ba17-6b481bdb5f9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7e40c88-2114-4621-b155-7159c72b39be","name":"a7e40c88-2114-4621-b155-7159c72b39be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc5ec13c-417b-43c4-a70d-2bb79f4ffd11","name":"bc5ec13c-417b-43c4-a70d-2bb79f4ffd11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"70304c3b-0d04-4885-833a-b51390439de9","name":"70304c3b-0d04-4885-833a-b51390439de9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"68983a54-f464-439d-b9c3-e617744dbd38","name":"68983a54-f464-439d-b9c3-e617744dbd38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de91054b-d131-4595-ae7a-cd693f216b00","name":"de91054b-d131-4595-ae7a-cd693f216b00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"670d234d-0594-4987-944b-f6f6a18e90ce","name":"670d234d-0594-4987-944b-f6f6a18e90ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"81f4b5d2-f789-47bf-9bb4-07ea5a378987","name":"81f4b5d2-f789-47bf-9bb4-07ea5a378987","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"46188561-ca08-4852-a95c-89306ae2bc12","name":"46188561-ca08-4852-a95c-89306ae2bc12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73fa6e7a-cfa8-49c1-a1ed-6084beb9c039","name":"73fa6e7a-cfa8-49c1-a1ed-6084beb9c039","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9edd79c3-06b0-426d-aebd-e35e0658f7fa","name":"9edd79c3-06b0-426d-aebd-e35e0658f7fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2458e4aa-898d-47f4-814f-bb35887f2116","name":"2458e4aa-898d-47f4-814f-bb35887f2116","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba9d4d31-71c1-4b14-8e82-5284f2c801d3","name":"ba9d4d31-71c1-4b14-8e82-5284f2c801d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76f25edc-9000-449f-a06f-4223015d179e","name":"76f25edc-9000-449f-a06f-4223015d179e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"354c4384-43a6-4072-ba17-6b481bdb5f9c","name":"354c4384-43a6-4072-ba17-6b481bdb5f9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7e40c88-2114-4621-b155-7159c72b39be","name":"a7e40c88-2114-4621-b155-7159c72b39be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc5ec13c-417b-43c4-a70d-2bb79f4ffd11","name":"bc5ec13c-417b-43c4-a70d-2bb79f4ffd11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"70304c3b-0d04-4885-833a-b51390439de9","name":"70304c3b-0d04-4885-833a-b51390439de9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"68983a54-f464-439d-b9c3-e617744dbd38","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"103bbe7c-1edf-49cf-8311-e341df44c2e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de91054b-d131-4595-ae7a-cd693f216b00","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"28c5461c-ff00-4e26-8433-1b02eef09c7f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"670d234d-0594-4987-944b-f6f6a18e90ce","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea1daba6-87de-458b-8cb9-b74ab92aad25","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"81f4b5d2-f789-47bf-9bb4-07ea5a378987","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6b4c153-dc7b-4187-a900-676798338321","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46188561-ca08-4852-a95c-89306ae2bc12","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"87f26c9f-2bbb-4db8-a6fe-6ad91660582d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73fa6e7a-cfa8-49c1-a1ed-6084beb9c039","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed57d5ed-21a4-4d56-928c-dbdf31e584b3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9edd79c3-06b0-426d-aebd-e35e0658f7fa","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"50993775-fb34-4a82-b68a-40598688813d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2458e4aa-898d-47f4-814f-bb35887f2116","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f0181e7-c0bf-44ec-949e-c32900e99071","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba9d4d31-71c1-4b14-8e82-5284f2c801d3","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a220a7b1-219c-475e-ad5f-bc22aceb9088","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76f25edc-9000-449f-a06f-4223015d179e","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef512294-e3dc-43c8-8ff7-316d2bd69f17","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"354c4384-43a6-4072-ba17-6b481bdb5f9c","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7885f74f-4aa2-4a29-8b7d-2be898185fb2","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7e40c88-2114-4621-b155-7159c72b39be","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33d38726-0482-44de-b32f-e9c07b50f278","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5ec13c-417b-43c4-a70d-2bb79f4ffd11","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c4ee1628-f122-48f7-aabd-d275c0365f97","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"70304c3b-0d04-4885-833a-b51390439de9","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64c9c53c-fddc-454c-ad27-08d260147a3e","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"68983a54-f464-439d-b9c3-e617744dbd38","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"103bbe7c-1edf-49cf-8311-e341df44c2e1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de91054b-d131-4595-ae7a-cd693f216b00","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"28c5461c-ff00-4e26-8433-1b02eef09c7f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"670d234d-0594-4987-944b-f6f6a18e90ce","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea1daba6-87de-458b-8cb9-b74ab92aad25","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"81f4b5d2-f789-47bf-9bb4-07ea5a378987","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6b4c153-dc7b-4187-a900-676798338321","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"46188561-ca08-4852-a95c-89306ae2bc12","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87f26c9f-2bbb-4db8-a6fe-6ad91660582d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73fa6e7a-cfa8-49c1-a1ed-6084beb9c039","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed57d5ed-21a4-4d56-928c-dbdf31e584b3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9edd79c3-06b0-426d-aebd-e35e0658f7fa","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"50993775-fb34-4a82-b68a-40598688813d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2458e4aa-898d-47f4-814f-bb35887f2116","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f0181e7-c0bf-44ec-949e-c32900e99071","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba9d4d31-71c1-4b14-8e82-5284f2c801d3","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a220a7b1-219c-475e-ad5f-bc22aceb9088","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76f25edc-9000-449f-a06f-4223015d179e","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef512294-e3dc-43c8-8ff7-316d2bd69f17","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"354c4384-43a6-4072-ba17-6b481bdb5f9c","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7885f74f-4aa2-4a29-8b7d-2be898185fb2","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7e40c88-2114-4621-b155-7159c72b39be","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33d38726-0482-44de-b32f-e9c07b50f278","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5ec13c-417b-43c4-a70d-2bb79f4ffd11","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c4ee1628-f122-48f7-aabd-d275c0365f97","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"70304c3b-0d04-4885-833a-b51390439de9","path":"sprites/spr_iron2_colors/spr_iron2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64c9c53c-fddc-454c-ad27-08d260147a3e","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_iron_colors/spr_iron_colors.yy b/sprites/spr_iron_colors/spr_iron_colors.yy index 1af0c53a46..e488e59424 100644 --- a/sprites/spr_iron_colors/spr_iron_colors.yy +++ b/sprites/spr_iron_colors/spr_iron_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_iron_colors", "bboxMode":0, "bbox_bottom":226, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8954f497-78cf-4943-a5b8-1ad0d56338ba","name":"8954f497-78cf-4943-a5b8-1ad0d56338ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"07ac734c-d38b-4e57-ba7a-0430e3e04fd4","name":"07ac734c-d38b-4e57-ba7a-0430e3e04fd4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b65fe40-4fee-4efb-b9af-518409dbe823","name":"9b65fe40-4fee-4efb-b9af-518409dbe823","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4066d94a-d66f-4e8f-972b-83ecea6d4cdc","name":"4066d94a-d66f-4e8f-972b-83ecea6d4cdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b5111476-ed12-41e7-9771-0363cd974204","name":"b5111476-ed12-41e7-9771-0363cd974204","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1fbe4fe0-b7b9-4993-8f67-e08fd83191c2","name":"1fbe4fe0-b7b9-4993-8f67-e08fd83191c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d395d946-9677-487c-9595-19b8c3e6c0a9","name":"d395d946-9677-487c-9595-19b8c3e6c0a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"abc7ad93-6a10-4b6f-8586-8f7df3b676dd","name":"abc7ad93-6a10-4b6f-8586-8f7df3b676dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"00b5a3ca-7bb3-4150-b449-deff37ed2a99","name":"00b5a3ca-7bb3-4150-b449-deff37ed2a99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d3c248e7-3151-4651-89e9-f5ff8942f4dc","name":"d3c248e7-3151-4651-89e9-f5ff8942f4dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f08d183c-3981-4178-8bac-83424529f1fb","name":"f08d183c-3981-4178-8bac-83424529f1fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03ce65a0-467b-4267-a4ce-f89e37b34863","name":"03ce65a0-467b-4267-a4ce-f89e37b34863","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4a08c6ea-8aa6-4fdf-a111-e3b2a603df17","name":"4a08c6ea-8aa6-4fdf-a111-e3b2a603df17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ccd0c0f6-ec74-40c4-9f5a-0b138fd94a5c","name":"ccd0c0f6-ec74-40c4-9f5a-0b138fd94a5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8954f497-78cf-4943-a5b8-1ad0d56338ba","name":"8954f497-78cf-4943-a5b8-1ad0d56338ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07ac734c-d38b-4e57-ba7a-0430e3e04fd4","name":"07ac734c-d38b-4e57-ba7a-0430e3e04fd4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b65fe40-4fee-4efb-b9af-518409dbe823","name":"9b65fe40-4fee-4efb-b9af-518409dbe823","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4066d94a-d66f-4e8f-972b-83ecea6d4cdc","name":"4066d94a-d66f-4e8f-972b-83ecea6d4cdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b5111476-ed12-41e7-9771-0363cd974204","name":"b5111476-ed12-41e7-9771-0363cd974204","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1fbe4fe0-b7b9-4993-8f67-e08fd83191c2","name":"1fbe4fe0-b7b9-4993-8f67-e08fd83191c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d395d946-9677-487c-9595-19b8c3e6c0a9","name":"d395d946-9677-487c-9595-19b8c3e6c0a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"abc7ad93-6a10-4b6f-8586-8f7df3b676dd","name":"abc7ad93-6a10-4b6f-8586-8f7df3b676dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00b5a3ca-7bb3-4150-b449-deff37ed2a99","name":"00b5a3ca-7bb3-4150-b449-deff37ed2a99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d3c248e7-3151-4651-89e9-f5ff8942f4dc","name":"d3c248e7-3151-4651-89e9-f5ff8942f4dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f08d183c-3981-4178-8bac-83424529f1fb","name":"f08d183c-3981-4178-8bac-83424529f1fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03ce65a0-467b-4267-a4ce-f89e37b34863","name":"03ce65a0-467b-4267-a4ce-f89e37b34863","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a08c6ea-8aa6-4fdf-a111-e3b2a603df17","name":"4a08c6ea-8aa6-4fdf-a111-e3b2a603df17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ccd0c0f6-ec74-40c4-9f5a-0b138fd94a5c","name":"ccd0c0f6-ec74-40c4-9f5a-0b138fd94a5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8954f497-78cf-4943-a5b8-1ad0d56338ba","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8dd35abf-58b8-4bee-a73e-b68108f3975a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07ac734c-d38b-4e57-ba7a-0430e3e04fd4","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9b27058b-7088-4e05-927d-59513c2528c7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b65fe40-4fee-4efb-b9af-518409dbe823","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"715c9c4d-e729-44c6-bc57-259d7aef64ae","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4066d94a-d66f-4e8f-972b-83ecea6d4cdc","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78d3327a-d1ab-4790-9cb1-c3e61a3625c5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5111476-ed12-41e7-9771-0363cd974204","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1c25ac4b-3a8e-4a16-b7ab-77738e68309d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1fbe4fe0-b7b9-4993-8f67-e08fd83191c2","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e5be4cf-f072-4bc7-9d27-27c97a7826de","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d395d946-9677-487c-9595-19b8c3e6c0a9","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"027b7011-7248-4b34-bf70-55e0061e160d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"abc7ad93-6a10-4b6f-8586-8f7df3b676dd","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"252fbac2-7be8-4ab0-ad94-fc757078ca75","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"00b5a3ca-7bb3-4150-b449-deff37ed2a99","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b7c46ff5-11b8-4bf2-aa16-50840e7fba23","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3c248e7-3151-4651-89e9-f5ff8942f4dc","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d5a480e-758f-4382-9d7c-b61b9bc36666","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f08d183c-3981-4178-8bac-83424529f1fb","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1036be0f-f3ba-422a-b7ff-f5b9e307e0a5","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03ce65a0-467b-4267-a4ce-f89e37b34863","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"776c41b8-f672-4a6d-8fa7-d5af0f3c0b7a","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a08c6ea-8aa6-4fdf-a111-e3b2a603df17","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"645928a9-b88f-4cc4-acb3-3368a2ce1466","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccd0c0f6-ec74-40c4-9f5a-0b138fd94a5c","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c5ec09e-d333-4c77-a557-d55af9fe73d0","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8954f497-78cf-4943-a5b8-1ad0d56338ba","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8dd35abf-58b8-4bee-a73e-b68108f3975a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07ac734c-d38b-4e57-ba7a-0430e3e04fd4","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9b27058b-7088-4e05-927d-59513c2528c7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b65fe40-4fee-4efb-b9af-518409dbe823","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"715c9c4d-e729-44c6-bc57-259d7aef64ae","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4066d94a-d66f-4e8f-972b-83ecea6d4cdc","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78d3327a-d1ab-4790-9cb1-c3e61a3625c5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5111476-ed12-41e7-9771-0363cd974204","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1c25ac4b-3a8e-4a16-b7ab-77738e68309d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1fbe4fe0-b7b9-4993-8f67-e08fd83191c2","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e5be4cf-f072-4bc7-9d27-27c97a7826de","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d395d946-9677-487c-9595-19b8c3e6c0a9","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"027b7011-7248-4b34-bf70-55e0061e160d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"abc7ad93-6a10-4b6f-8586-8f7df3b676dd","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"252fbac2-7be8-4ab0-ad94-fc757078ca75","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"00b5a3ca-7bb3-4150-b449-deff37ed2a99","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b7c46ff5-11b8-4bf2-aa16-50840e7fba23","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3c248e7-3151-4651-89e9-f5ff8942f4dc","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d5a480e-758f-4382-9d7c-b61b9bc36666","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f08d183c-3981-4178-8bac-83424529f1fb","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1036be0f-f3ba-422a-b7ff-f5b9e307e0a5","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03ce65a0-467b-4267-a4ce-f89e37b34863","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"776c41b8-f672-4a6d-8fa7-d5af0f3c0b7a","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a08c6ea-8aa6-4fdf-a111-e3b2a603df17","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"645928a9-b88f-4cc4-acb3-3368a2ce1466","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccd0c0f6-ec74-40c4-9f5a-0b138fd94a5c","path":"sprites/spr_iron_colors/spr_iron_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c5ec09e-d333-4c77-a557-d55af9fe73d0","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_jump_pack_complex/c5bc43cd-b567-4673-92b9-efede7a0b44f.png b/sprites/spr_jump_pack_complex/c5bc43cd-b567-4673-92b9-efede7a0b44f.png index 0eb23c1554..7d71dd4efe 100644 Binary files a/sprites/spr_jump_pack_complex/c5bc43cd-b567-4673-92b9-efede7a0b44f.png and b/sprites/spr_jump_pack_complex/c5bc43cd-b567-4673-92b9-efede7a0b44f.png differ diff --git a/sprites/spr_jump_pack_complex/layers/c5bc43cd-b567-4673-92b9-efede7a0b44f/0e8b239a-6017-4ba5-8cbe-9353a86768ec.png b/sprites/spr_jump_pack_complex/layers/c5bc43cd-b567-4673-92b9-efede7a0b44f/0e8b239a-6017-4ba5-8cbe-9353a86768ec.png index 0eb23c1554..7d71dd4efe 100644 Binary files a/sprites/spr_jump_pack_complex/layers/c5bc43cd-b567-4673-92b9-efede7a0b44f/0e8b239a-6017-4ba5-8cbe-9353a86768ec.png and b/sprites/spr_jump_pack_complex/layers/c5bc43cd-b567-4673-92b9-efede7a0b44f/0e8b239a-6017-4ba5-8cbe-9353a86768ec.png differ diff --git a/sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy b/sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy index fb9279641b..0ca44b59a7 100644 --- a/sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy +++ b/sprites/spr_jump_pack_complex/spr_jump_pack_complex.yy @@ -1,29 +1,29 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_jump_pack_complex", "bboxMode":0, - "bbox_bottom":77, + "bbox_bottom":122, "bbox_left":10, "bbox_right":157, - "bbox_top":2, + "bbox_top":47, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, - "height":232, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"0e8b239a-6017-4ba5-8cbe-9353a86768ec","blendMode":0,"displayName":"default","isLocked":false,"name":"0e8b239a-6017-4ba5-8cbe-9353a86768ec","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"spr_jump_pack_complex", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"packs", "path":"folders/Sprites/Marine Viewer/packs.yy", @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -76,7 +78,7 @@ "visibleRange":null, "volume":1.0, "xorigin":0, - "yorigin":0, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_jump_pack_serpha_complex/bf0c5f8b-3023-4fe2-8b02-193bc2c05b25.png b/sprites/spr_jump_pack_serpha_complex/bf0c5f8b-3023-4fe2-8b02-193bc2c05b25.png new file mode 100644 index 0000000000..6c9a645dbd Binary files /dev/null and b/sprites/spr_jump_pack_serpha_complex/bf0c5f8b-3023-4fe2-8b02-193bc2c05b25.png differ diff --git a/sprites/spr_jump_pack_serpha_complex/layers/bf0c5f8b-3023-4fe2-8b02-193bc2c05b25/44bab4d0-aab6-43b3-8549-2f4f4dc0ef03.png b/sprites/spr_jump_pack_serpha_complex/layers/bf0c5f8b-3023-4fe2-8b02-193bc2c05b25/44bab4d0-aab6-43b3-8549-2f4f4dc0ef03.png new file mode 100644 index 0000000000..6c9a645dbd Binary files /dev/null and b/sprites/spr_jump_pack_serpha_complex/layers/bf0c5f8b-3023-4fe2-8b02-193bc2c05b25/44bab4d0-aab6-43b3-8549-2f4f4dc0ef03.png differ diff --git a/sprites/spr_jump_pack_serpha_complex/spr_jump_pack_serpha_complex.yy b/sprites/spr_jump_pack_serpha_complex/spr_jump_pack_serpha_complex.yy new file mode 100644 index 0000000000..29e6e377e0 --- /dev/null +++ b/sprites/spr_jump_pack_serpha_complex/spr_jump_pack_serpha_complex.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_jump_pack_serpha_complex", + "bboxMode":0, + "bbox_bottom":106, + "bbox_left":6, + "bbox_right":160, + "bbox_top":36, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"bf0c5f8b-3023-4fe2-8b02-193bc2c05b25","name":"bf0c5f8b-3023-4fe2-8b02-193bc2c05b25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":322, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"44bab4d0-aab6-43b3-8549-2f4f4dc0ef03","blendMode":0,"displayName":"default","isLocked":false,"name":"44bab4d0-aab6-43b3-8549-2f4f4dc0ef03","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_jump_pack_serpha_complex", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"packs", + "path":"folders/Sprites/Marine Viewer/packs.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_jump_pack_serpha_complex", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_jump_pack_serpha_complex", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf0c5f8b-3023-4fe2-8b02-193bc2c05b25","path":"sprites/spr_jump_pack_serpha_complex/spr_jump_pack_serpha_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"81954740-eb52-4281-a7c1-da1ca938492a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":45, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_knightly_belt/spr_knightly_belt.yy b/sprites/spr_knightly_belt/spr_knightly_belt.yy index 5d1add7640..c0e74a352c 100644 --- a/sprites/spr_knightly_belt/spr_knightly_belt.yy +++ b/sprites/spr_knightly_belt/spr_knightly_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_knightly_belt", "bboxMode":0, "bbox_bottom":114, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_knightly_belt/spr_knightly_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"68badb9c-da79-4a80-b8c4-f9962a02da21","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_knightly_belt/spr_knightly_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"68badb9c-da79-4a80-b8c4-f9962a02da21","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy b/sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy index 62900585e0..f8d6074a50 100644 --- a/sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy +++ b/sprites/spr_knightly_personal_livery/spr_knightly_personal_livery.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_knightly_personal_livery", "bboxMode":0, "bbox_bottom":147, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"024f569c-a0dc-465d-a295-994d80ecdc72","name":"024f569c-a0dc-465d-a295-994d80ecdc72","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2f1a13d5-6930-4af9-8bec-8646b5b779d4","name":"2f1a13d5-6930-4af9-8bec-8646b5b779d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c","name":"214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e61c9db0-a400-41d3-8c2d-e44ec1ac97dc","name":"e61c9db0-a400-41d3-8c2d-e44ec1ac97dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","name":"aaf65e00-98e5-4655-b105-2c4a6c74b695","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"024f569c-a0dc-465d-a295-994d80ecdc72","name":"024f569c-a0dc-465d-a295-994d80ecdc72","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2f1a13d5-6930-4af9-8bec-8646b5b779d4","name":"2f1a13d5-6930-4af9-8bec-8646b5b779d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c","name":"214ebeed-1ce9-49c7-b4b9-0e827b8f1e3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e61c9db0-a400-41d3-8c2d-e44ec1ac97dc","name":"e61c9db0-a400-41d3-8c2d-e44ec1ac97dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -67,6 +67,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_knightly_robes/spr_knightly_robes.yy b/sprites/spr_knightly_robes/spr_knightly_robes.yy index 0bf232cc4f..67eccfe928 100644 --- a/sprites/spr_knightly_robes/spr_knightly_robes.yy +++ b/sprites/spr_knightly_robes/spr_knightly_robes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_knightly_robes", "bboxMode":0, "bbox_bottom":200, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9a188b5e-581b-4e24-a278-56e5c336a324","name":"9a188b5e-581b-4e24-a278-56e5c336a324","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2","name":"a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","name":"d50f61ee-1ed4-4329-a0d3-20176ffc6a71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9a188b5e-581b-4e24-a278-56e5c336a324","name":"9a188b5e-581b-4e24-a278-56e5c336a324","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2","name":"a9f2fe5e-d679-49a6-bfda-f4cc90a1e3a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -65,6 +65,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_laurel/spr_laurel.yy b/sprites/spr_laurel/spr_laurel.yy index c313ad5e54..679ad729f4 100644 --- a/sprites/spr_laurel/spr_laurel.yy +++ b/sprites/spr_laurel/spr_laurel.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_laurel", "bboxMode":0, "bbox_bottom":64, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_laurel/spr_laurel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ff43a50-5175-4249-ac1a-a39557b93c1c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_laurel/spr_laurel.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ff43a50-5175-4249-ac1a-a39557b93c1c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy b/sprites/spr_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy index a94626035c..10f9459f15 100644 --- a/sprites/spr_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy +++ b/sprites/spr_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_left_pauldron_chainmail", "bboxMode":0, "bbox_bottom":96, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -34,13 +34,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -90,9 +84,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ffd25d2-f283-4823-9926-1576535448ca","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_left_pauldron_chainmail/spr_left_pauldron_chainmail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ffd25d2-f283-4823-9926-1576535448ca","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy b/sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy index a3d9c504bc..6dd02992f7 100644 --- a/sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy +++ b/sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_left_pauldron_fur_hanging", "bboxMode":0, "bbox_bottom":117, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"52d5981c-c162-45da-84db-60501fe9d9f1","name":"52d5981c-c162-45da-84db-60501fe9d9f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"460206a5-318f-4048-bdf9-249e96846430","name":"460206a5-318f-4048-bdf9-249e96846430","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52d5981c-c162-45da-84db-60501fe9d9f1","name":"52d5981c-c162-45da-84db-60501fe9d9f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"460206a5-318f-4048-bdf9-249e96846430","name":"460206a5-318f-4048-bdf9-249e96846430","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -38,13 +38,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -94,18 +88,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fac0f522-8b4a-4288-ad9c-70f373393e94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1bd0f84a-fd4a-496b-9fd1-369d25bd45ec","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d5981c-c162-45da-84db-60501fe9d9f1","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"168346db-67b1-47ac-b145-52da0b158996","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"460206a5-318f-4048-bdf9-249e96846430","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aba64abc-cd2b-43a1-8891-da658e78d283","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fac0f522-8b4a-4288-ad9c-70f373393e94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1bd0f84a-fd4a-496b-9fd1-369d25bd45ec","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d5981c-c162-45da-84db-60501fe9d9f1","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"168346db-67b1-47ac-b145-52da0b158996","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"460206a5-318f-4048-bdf9-249e96846430","path":"sprites/spr_left_pauldron_fur_hanging/spr_left_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aba64abc-cd2b-43a1-8891-da658e78d283","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_left_shin_spikes/spr_left_shin_spikes.yy b/sprites/spr_left_shin_spikes/spr_left_shin_spikes.yy index 53694dcafc..da9d4b35ee 100644 --- a/sprites/spr_left_shin_spikes/spr_left_shin_spikes.yy +++ b/sprites/spr_left_shin_spikes/spr_left_shin_spikes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_left_shin_spikes", "bboxMode":0, "bbox_bottom":199, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_left_shin_spikes/spr_left_shin_spikes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_left_shin_spikes/spr_left_shin_spikes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_leopard_sprite/spr_leopard_sprite.yy b/sprites/spr_leopard_sprite/spr_leopard_sprite.yy index 611ba4f450..2e86214a95 100644 --- a/sprites/spr_leopard_sprite/spr_leopard_sprite.yy +++ b/sprites/spr_leopard_sprite/spr_leopard_sprite.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_leopard_sprite", "bboxMode":0, "bbox_bottom":1045, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":true, "frames":[ - {"$GMSpriteFrame":"","%Name":"65e7e956-93b9-47bc-8d8d-2515bf68797e","name":"65e7e956-93b9-47bc-8d8d-2515bf68797e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"65e7e956-93b9-47bc-8d8d-2515bf68797e","name":"65e7e956-93b9-47bc-8d8d-2515bf68797e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,6 +82,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":1046.0, + "seqWidth":1454.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_lib_area_pad/spr_lib_area_pad.yy b/sprites/spr_lib_area_pad/spr_lib_area_pad.yy index 56a13254bb..caa64fa184 100644 --- a/sprites/spr_lib_area_pad/spr_lib_area_pad.yy +++ b/sprites/spr_lib_area_pad/spr_lib_area_pad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_lib_area_pad", "bboxMode":0, "bbox_bottom":156, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"79a89cdc-8304-4ba7-85bc-216c6b783541","name":"79a89cdc-8304-4ba7-85bc-216c6b783541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79a89cdc-8304-4ba7-85bc-216c6b783541","name":"79a89cdc-8304-4ba7-85bc-216c6b783541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79a89cdc-8304-4ba7-85bc-216c6b783541","path":"sprites/spr_lib_area_pad/spr_lib_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"18b5f818-4948-4206-9e3b-991e27ceb176","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79a89cdc-8304-4ba7-85bc-216c6b783541","path":"sprites/spr_lib_area_pad/spr_lib_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"18b5f818-4948-4206-9e3b-991e27ceb176","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_lion_belt/spr_lion_belt.yy b/sprites/spr_lion_belt/spr_lion_belt.yy index 4ef9561af1..b8c83e5610 100644 --- a/sprites/spr_lion_belt/spr_lion_belt.yy +++ b/sprites/spr_lion_belt/spr_lion_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_lion_belt", "bboxMode":0, "bbox_bottom":106, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_load_splash/spr_load_splash.yy b/sprites/spr_load_splash/spr_load_splash.yy index 4bb6e38af9..981a0cc925 100644 --- a/sprites/spr_load_splash/spr_load_splash.yy +++ b/sprites/spr_load_splash/spr_load_splash.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_load_splash", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9f37f9ad-5acf-4749-b330-653b00bf1685","name":"9f37f9ad-5acf-4749-b330-653b00bf1685","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f37f9ad-5acf-4749-b330-653b00bf1685","name":"9f37f9ad-5acf-4749-b330-653b00bf1685","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_load_text/spr_load_text.yy b/sprites/spr_load_text/spr_load_text.yy index 1d2b8442d2..1630400e62 100644 --- a/sprites/spr_load_text/spr_load_text.yy +++ b/sprites/spr_load_text/spr_load_text.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_load_text", "bboxMode":0, "bbox_bottom":52, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"babe11d3-8f2c-4fc0-8eb3-ffc125e6fb5c","name":"babe11d3-8f2c-4fc0-8eb3-ffc125e6fb5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b065e4b2-6233-4f3b-8c82-cf5a9264d1e8","name":"b065e4b2-6233-4f3b-8c82-cf5a9264d1e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a4b62e7-6e59-4e4e-b377-fc2bda6b5e79","name":"5a4b62e7-6e59-4e4e-b377-fc2bda6b5e79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"babe11d3-8f2c-4fc0-8eb3-ffc125e6fb5c","name":"babe11d3-8f2c-4fc0-8eb3-ffc125e6fb5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b065e4b2-6233-4f3b-8c82-cf5a9264d1e8","name":"b065e4b2-6233-4f3b-8c82-cf5a9264d1e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a4b62e7-6e59-4e4e-b377-fc2bda6b5e79","name":"5a4b62e7-6e59-4e4e-b377-fc2bda6b5e79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -65,6 +65,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":53.0, + "seqWidth":187.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_loadbar/spr_loadbar.yy b/sprites/spr_loadbar/spr_loadbar.yy index f0e35ac0c6..2d45f1de76 100644 --- a/sprites/spr_loadbar/spr_loadbar.yy +++ b/sprites/spr_loadbar/spr_loadbar.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_loadbar", "bboxMode":0, "bbox_bottom":10, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"90751334-decf-4a0b-8001-6657b1ffacce","name":"90751334-decf-4a0b-8001-6657b1ffacce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90751334-decf-4a0b-8001-6657b1ffacce","name":"90751334-decf-4a0b-8001-6657b1ffacce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90751334-decf-4a0b-8001-6657b1ffacce","path":"sprites/spr_loadbar/spr_loadbar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69fbbe7f-fe79-4fac-888c-f3b6a0794f2d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90751334-decf-4a0b-8001-6657b1ffacce","path":"sprites/spr_loadbar/spr_loadbar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69fbbe7f-fe79-4fac-888c-f3b6a0794f2d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_loadbar_cover/spr_loadbar_cover.yy b/sprites/spr_loadbar_cover/spr_loadbar_cover.yy index 850818832f..d73eda019f 100644 --- a/sprites/spr_loadbar_cover/spr_loadbar_cover.yy +++ b/sprites/spr_loadbar_cover/spr_loadbar_cover.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_loadbar_cover", "bboxMode":0, "bbox_bottom":12, @@ -12,107 +12,107 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ee0d14e4-33e3-41e9-b76d-dca309d76ad9","name":"ee0d14e4-33e3-41e9-b76d-dca309d76ad9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f270f2a7-106e-4206-b281-695e204d1fb5","name":"f270f2a7-106e-4206-b281-695e204d1fb5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"522fa573-e304-4534-9cd1-3a7eb9d1fa85","name":"522fa573-e304-4534-9cd1-3a7eb9d1fa85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"936fdbeb-4b78-4752-a6f2-e034907abe7b","name":"936fdbeb-4b78-4752-a6f2-e034907abe7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2f30c4f3-a697-4fd9-9169-f435b4405a16","name":"2f30c4f3-a697-4fd9-9169-f435b4405a16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4d46705d-b833-4d6e-8abd-6033c5cd5ce5","name":"4d46705d-b833-4d6e-8abd-6033c5cd5ce5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d5b3d2c-0241-4728-995f-e7677c1e7e2e","name":"7d5b3d2c-0241-4728-995f-e7677c1e7e2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"16d84a8d-7b48-4f33-83f4-26d64fcb25c2","name":"16d84a8d-7b48-4f33-83f4-26d64fcb25c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"96733f64-cd1f-4cec-8e30-dc22a2e69a46","name":"96733f64-cd1f-4cec-8e30-dc22a2e69a46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"39e4d2ef-0a45-4891-aba7-fe8fee30953e","name":"39e4d2ef-0a45-4891-aba7-fe8fee30953e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd69f163-4f5d-498f-9626-78607c751537","name":"cd69f163-4f5d-498f-9626-78607c751537","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5b8470f0-1f27-4104-b687-cb965c775614","name":"5b8470f0-1f27-4104-b687-cb965c775614","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b4d0f773-f488-4932-9aa3-265920a8f897","name":"b4d0f773-f488-4932-9aa3-265920a8f897","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"996a27ed-d5bc-4d10-bc45-024bb9576ff8","name":"996a27ed-d5bc-4d10-bc45-024bb9576ff8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"112e4e63-bd13-4011-8039-f279dadb602e","name":"112e4e63-bd13-4011-8039-f279dadb602e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aa241cbb-d783-4a57-b89f-a3d03e66f21d","name":"aa241cbb-d783-4a57-b89f-a3d03e66f21d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dd62d727-be6c-415a-99cd-f5de4fdb103a","name":"dd62d727-be6c-415a-99cd-f5de4fdb103a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4ff012a-ee06-4fe8-84b7-82842d5fb3e9","name":"f4ff012a-ee06-4fe8-84b7-82842d5fb3e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b1b8ba1-1c08-4982-aa07-e7b934a90a91","name":"2b1b8ba1-1c08-4982-aa07-e7b934a90a91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"16883075-4215-499b-8420-ae62da7885b3","name":"16883075-4215-499b-8420-ae62da7885b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"67ca0cc1-b3e6-4030-a21b-3fbccb49e569","name":"67ca0cc1-b3e6-4030-a21b-3fbccb49e569","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"073c6354-9f1a-403c-af4c-9f7e11558113","name":"073c6354-9f1a-403c-af4c-9f7e11558113","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c50586b8-1616-46a7-ab52-621258e72d24","name":"c50586b8-1616-46a7-ab52-621258e72d24","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7dea7750-7395-4a7e-bc4c-1622df7a2cbf","name":"7dea7750-7395-4a7e-bc4c-1622df7a2cbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"92b7ffac-f927-44fe-95f2-bd4341b5f27a","name":"92b7ffac-f927-44fe-95f2-bd4341b5f27a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc92382f-39f4-4234-a7ec-9adff3753797","name":"bc92382f-39f4-4234-a7ec-9adff3753797","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e61b5912-0ae5-4c54-bde5-a78fc0369549","name":"e61b5912-0ae5-4c54-bde5-a78fc0369549","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"086ee7b7-2a83-46bd-801c-034bd3897145","name":"086ee7b7-2a83-46bd-801c-034bd3897145","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"17186ae0-6f03-47a5-b79b-a745ced48618","name":"17186ae0-6f03-47a5-b79b-a745ced48618","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f0011933-8620-4fe5-90bc-2fe2b3df5bef","name":"f0011933-8620-4fe5-90bc-2fe2b3df5bef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b330b6b2-192a-4de0-adfd-cba28cdd83d2","name":"b330b6b2-192a-4de0-adfd-cba28cdd83d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"88dff011-f0d7-43fc-94a8-32f332baf6c1","name":"88dff011-f0d7-43fc-94a8-32f332baf6c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2eb5da78-7aaf-42fe-b31a-9e8bcb4a721c","name":"2eb5da78-7aaf-42fe-b31a-9e8bcb4a721c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59b94851-05b4-424c-a678-d9df694da13f","name":"59b94851-05b4-424c-a678-d9df694da13f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"48e6e0df-250c-4313-9521-88fc5cee2be2","name":"48e6e0df-250c-4313-9521-88fc5cee2be2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6706cebb-96d9-4335-8dec-4fc2285a98e1","name":"6706cebb-96d9-4335-8dec-4fc2285a98e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ab4ed675-82c1-4f80-abd4-ddbcadbf7114","name":"ab4ed675-82c1-4f80-abd4-ddbcadbf7114","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b54bf828-8d29-4e6b-9e09-5863969f44b4","name":"b54bf828-8d29-4e6b-9e09-5863969f44b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"82780114-bc2c-4080-95ea-0b3908914da6","name":"82780114-bc2c-4080-95ea-0b3908914da6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df11f0c7-ba0c-4c65-b86e-a368c90d8094","name":"df11f0c7-ba0c-4c65-b86e-a368c90d8094","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"425a2b21-1b7c-4060-9429-39cc3011d999","name":"425a2b21-1b7c-4060-9429-39cc3011d999","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"913e2d4b-0ca1-4bbd-bc01-4fd5e599053a","name":"913e2d4b-0ca1-4bbd-bc01-4fd5e599053a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7a265b9c-cde0-4ff5-bf6e-364d90bcdb5e","name":"7a265b9c-cde0-4ff5-bf6e-364d90bcdb5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee4e0a74-c9e9-4bab-b85c-183df0b5070b","name":"ee4e0a74-c9e9-4bab-b85c-183df0b5070b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5439c2d6-ee02-4bc7-ab82-4a5854ee1d2c","name":"5439c2d6-ee02-4bc7-ab82-4a5854ee1d2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aed5da4d-ea30-4654-a61f-16967414002e","name":"aed5da4d-ea30-4654-a61f-16967414002e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c5bba97a-d671-49c8-84d2-f995712fc403","name":"c5bba97a-d671-49c8-84d2-f995712fc403","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"daa9667b-a496-4f30-b167-6af80c119e30","name":"daa9667b-a496-4f30-b167-6af80c119e30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f22c2d34-46b9-4440-a86f-37fd859f7cda","name":"f22c2d34-46b9-4440-a86f-37fd859f7cda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a9cd073b-de37-49db-9f59-f6cd38490c52","name":"a9cd073b-de37-49db-9f59-f6cd38490c52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"24bea0d7-bb4e-469d-a9c0-97635743d8ed","name":"24bea0d7-bb4e-469d-a9c0-97635743d8ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f82e291-5fc6-45bc-a208-3647e5830f17","name":"4f82e291-5fc6-45bc-a208-3647e5830f17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c113a74f-504d-475b-8115-f90294743c81","name":"c113a74f-504d-475b-8115-f90294743c81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be762ab0-d12d-48d2-bb53-d4730721531b","name":"be762ab0-d12d-48d2-bb53-d4730721531b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0e1e619-158f-4bba-b8b5-94dcc1953491","name":"e0e1e619-158f-4bba-b8b5-94dcc1953491","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"71bd4d2e-1907-49d9-b5b0-6ee0d6aabb00","name":"71bd4d2e-1907-49d9-b5b0-6ee0d6aabb00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af6c6100-804f-4c05-8d22-71e0211d277a","name":"af6c6100-804f-4c05-8d22-71e0211d277a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"44daeebc-81f7-4a3e-9566-e297f548509d","name":"44daeebc-81f7-4a3e-9566-e297f548509d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76358f9c-44de-4773-bf94-08cfd0b706b7","name":"76358f9c-44de-4773-bf94-08cfd0b706b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3a1b3c0-9b73-40e4-bbcf-e3c2b025a98b","name":"f3a1b3c0-9b73-40e4-bbcf-e3c2b025a98b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5324fcf9-6bd3-4064-9ebf-0af8b4c636d7","name":"5324fcf9-6bd3-4064-9ebf-0af8b4c636d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"428c192f-e278-49f5-8d3b-74b07cd088b1","name":"428c192f-e278-49f5-8d3b-74b07cd088b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a53ac2d7-2889-41a4-8d1b-6a0bf2f7bac9","name":"a53ac2d7-2889-41a4-8d1b-6a0bf2f7bac9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"51927562-4d2a-436b-adbb-62a690d6c661","name":"51927562-4d2a-436b-adbb-62a690d6c661","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59b0bcf3-19ed-4f4c-b0e5-2c349fc1a26b","name":"59b0bcf3-19ed-4f4c-b0e5-2c349fc1a26b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f45bfd5f-8167-4b03-a26c-6468a48db3f1","name":"f45bfd5f-8167-4b03-a26c-6468a48db3f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8af43abe-2954-4429-a96e-5553ad6375c9","name":"8af43abe-2954-4429-a96e-5553ad6375c9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"578f1ad8-ccce-405b-af49-70f5b5ec6bc5","name":"578f1ad8-ccce-405b-af49-70f5b5ec6bc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"16dfc277-8209-4c38-a4fa-acff85d6b150","name":"16dfc277-8209-4c38-a4fa-acff85d6b150","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f068b9df-7ba7-4686-85c5-88a2ec6ce6a9","name":"f068b9df-7ba7-4686-85c5-88a2ec6ce6a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"43771aa1-f221-4485-9c32-0ca06344e04c","name":"43771aa1-f221-4485-9c32-0ca06344e04c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6d9c5187-edc7-4f27-a6b0-7c3fb4a355d7","name":"6d9c5187-edc7-4f27-a6b0-7c3fb4a355d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6f3452a1-a45b-4c09-a126-a8f0afafd909","name":"6f3452a1-a45b-4c09-a126-a8f0afafd909","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e522eb85-b82f-4feb-b671-5108350cfb16","name":"e522eb85-b82f-4feb-b671-5108350cfb16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b398bcd4-2967-43bd-aceb-351f1a577bd9","name":"b398bcd4-2967-43bd-aceb-351f1a577bd9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"71ff8ca0-3f42-4dda-9730-4a2ac4530c17","name":"71ff8ca0-3f42-4dda-9730-4a2ac4530c17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"db054ef7-2537-41d7-bcaf-34b5f9073296","name":"db054ef7-2537-41d7-bcaf-34b5f9073296","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7e595fd1-f058-4eb0-92b2-7112b02693f0","name":"7e595fd1-f058-4eb0-92b2-7112b02693f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73be05d6-bdbf-488d-824a-4fe1cb89e070","name":"73be05d6-bdbf-488d-824a-4fe1cb89e070","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76cd8d8c-db17-401c-a660-84e8565440be","name":"76cd8d8c-db17-401c-a660-84e8565440be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fa9a6a5f-d27f-4915-bd3c-654e9b88bad4","name":"fa9a6a5f-d27f-4915-bd3c-654e9b88bad4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59a7ad1b-f30b-468a-b661-11fa1a07fcff","name":"59a7ad1b-f30b-468a-b661-11fa1a07fcff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"beea7bcb-bb67-48bd-abce-529db7dbe41c","name":"beea7bcb-bb67-48bd-abce-529db7dbe41c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8698f1a0-7ff8-4a84-8bd2-e389ec25a420","name":"8698f1a0-7ff8-4a84-8bd2-e389ec25a420","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"932663f3-9530-4c49-8d84-8c20a41549ef","name":"932663f3-9530-4c49-8d84-8c20a41549ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"13c95d20-70e5-4988-b859-c15ab08abd85","name":"13c95d20-70e5-4988-b859-c15ab08abd85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b709ce77-9b28-4388-bd75-f096350846ff","name":"b709ce77-9b28-4388-bd75-f096350846ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f8fe5a01-de13-4476-9af8-bcc7f187bba4","name":"f8fe5a01-de13-4476-9af8-bcc7f187bba4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"164fb034-c917-4aeb-8e30-0c4c989a3560","name":"164fb034-c917-4aeb-8e30-0c4c989a3560","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bbe1b91b-58af-460f-abd5-80225a8dde77","name":"bbe1b91b-58af-460f-abd5-80225a8dde77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d1aff5b9-0c78-4ddc-8cf9-1e2daf3607b0","name":"d1aff5b9-0c78-4ddc-8cf9-1e2daf3607b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3adda1a-086e-4eab-92b9-84b6bbaa6b58","name":"e3adda1a-086e-4eab-92b9-84b6bbaa6b58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df79b26f-f1ee-45c0-a52a-17bd22edf09b","name":"df79b26f-f1ee-45c0-a52a-17bd22edf09b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1769e8b5-3c03-48a9-90a2-0502b8dd5d79","name":"1769e8b5-3c03-48a9-90a2-0502b8dd5d79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83b76c05-deaf-4543-862f-8e5bc4f242d4","name":"83b76c05-deaf-4543-862f-8e5bc4f242d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2dddb531-3570-44ff-bfb0-d647ac3c37ed","name":"2dddb531-3570-44ff-bfb0-d647ac3c37ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7df26bce-c930-4969-ab20-6aaa30f85c2e","name":"7df26bce-c930-4969-ab20-6aaa30f85c2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1ef6c7d-b668-4ece-9607-822177143185","name":"b1ef6c7d-b668-4ece-9607-822177143185","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a261ce25-dc09-4e9c-b2ab-ca494eb7f6af","name":"a261ce25-dc09-4e9c-b2ab-ca494eb7f6af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c32a1e3-ebc0-4ac5-bad5-8a1aca452527","name":"3c32a1e3-ebc0-4ac5-bad5-8a1aca452527","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"92f5ddbd-2444-4532-808e-3b2e26795ba7","name":"92f5ddbd-2444-4532-808e-3b2e26795ba7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee0d14e4-33e3-41e9-b76d-dca309d76ad9","name":"ee0d14e4-33e3-41e9-b76d-dca309d76ad9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f270f2a7-106e-4206-b281-695e204d1fb5","name":"f270f2a7-106e-4206-b281-695e204d1fb5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"522fa573-e304-4534-9cd1-3a7eb9d1fa85","name":"522fa573-e304-4534-9cd1-3a7eb9d1fa85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"936fdbeb-4b78-4752-a6f2-e034907abe7b","name":"936fdbeb-4b78-4752-a6f2-e034907abe7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2f30c4f3-a697-4fd9-9169-f435b4405a16","name":"2f30c4f3-a697-4fd9-9169-f435b4405a16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d46705d-b833-4d6e-8abd-6033c5cd5ce5","name":"4d46705d-b833-4d6e-8abd-6033c5cd5ce5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d5b3d2c-0241-4728-995f-e7677c1e7e2e","name":"7d5b3d2c-0241-4728-995f-e7677c1e7e2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"16d84a8d-7b48-4f33-83f4-26d64fcb25c2","name":"16d84a8d-7b48-4f33-83f4-26d64fcb25c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96733f64-cd1f-4cec-8e30-dc22a2e69a46","name":"96733f64-cd1f-4cec-8e30-dc22a2e69a46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39e4d2ef-0a45-4891-aba7-fe8fee30953e","name":"39e4d2ef-0a45-4891-aba7-fe8fee30953e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd69f163-4f5d-498f-9626-78607c751537","name":"cd69f163-4f5d-498f-9626-78607c751537","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5b8470f0-1f27-4104-b687-cb965c775614","name":"5b8470f0-1f27-4104-b687-cb965c775614","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b4d0f773-f488-4932-9aa3-265920a8f897","name":"b4d0f773-f488-4932-9aa3-265920a8f897","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"996a27ed-d5bc-4d10-bc45-024bb9576ff8","name":"996a27ed-d5bc-4d10-bc45-024bb9576ff8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"112e4e63-bd13-4011-8039-f279dadb602e","name":"112e4e63-bd13-4011-8039-f279dadb602e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aa241cbb-d783-4a57-b89f-a3d03e66f21d","name":"aa241cbb-d783-4a57-b89f-a3d03e66f21d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd62d727-be6c-415a-99cd-f5de4fdb103a","name":"dd62d727-be6c-415a-99cd-f5de4fdb103a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4ff012a-ee06-4fe8-84b7-82842d5fb3e9","name":"f4ff012a-ee06-4fe8-84b7-82842d5fb3e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b1b8ba1-1c08-4982-aa07-e7b934a90a91","name":"2b1b8ba1-1c08-4982-aa07-e7b934a90a91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"16883075-4215-499b-8420-ae62da7885b3","name":"16883075-4215-499b-8420-ae62da7885b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67ca0cc1-b3e6-4030-a21b-3fbccb49e569","name":"67ca0cc1-b3e6-4030-a21b-3fbccb49e569","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"073c6354-9f1a-403c-af4c-9f7e11558113","name":"073c6354-9f1a-403c-af4c-9f7e11558113","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c50586b8-1616-46a7-ab52-621258e72d24","name":"c50586b8-1616-46a7-ab52-621258e72d24","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7dea7750-7395-4a7e-bc4c-1622df7a2cbf","name":"7dea7750-7395-4a7e-bc4c-1622df7a2cbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92b7ffac-f927-44fe-95f2-bd4341b5f27a","name":"92b7ffac-f927-44fe-95f2-bd4341b5f27a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc92382f-39f4-4234-a7ec-9adff3753797","name":"bc92382f-39f4-4234-a7ec-9adff3753797","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e61b5912-0ae5-4c54-bde5-a78fc0369549","name":"e61b5912-0ae5-4c54-bde5-a78fc0369549","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"086ee7b7-2a83-46bd-801c-034bd3897145","name":"086ee7b7-2a83-46bd-801c-034bd3897145","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"17186ae0-6f03-47a5-b79b-a745ced48618","name":"17186ae0-6f03-47a5-b79b-a745ced48618","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0011933-8620-4fe5-90bc-2fe2b3df5bef","name":"f0011933-8620-4fe5-90bc-2fe2b3df5bef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b330b6b2-192a-4de0-adfd-cba28cdd83d2","name":"b330b6b2-192a-4de0-adfd-cba28cdd83d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"88dff011-f0d7-43fc-94a8-32f332baf6c1","name":"88dff011-f0d7-43fc-94a8-32f332baf6c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2eb5da78-7aaf-42fe-b31a-9e8bcb4a721c","name":"2eb5da78-7aaf-42fe-b31a-9e8bcb4a721c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59b94851-05b4-424c-a678-d9df694da13f","name":"59b94851-05b4-424c-a678-d9df694da13f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48e6e0df-250c-4313-9521-88fc5cee2be2","name":"48e6e0df-250c-4313-9521-88fc5cee2be2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6706cebb-96d9-4335-8dec-4fc2285a98e1","name":"6706cebb-96d9-4335-8dec-4fc2285a98e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ab4ed675-82c1-4f80-abd4-ddbcadbf7114","name":"ab4ed675-82c1-4f80-abd4-ddbcadbf7114","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b54bf828-8d29-4e6b-9e09-5863969f44b4","name":"b54bf828-8d29-4e6b-9e09-5863969f44b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82780114-bc2c-4080-95ea-0b3908914da6","name":"82780114-bc2c-4080-95ea-0b3908914da6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df11f0c7-ba0c-4c65-b86e-a368c90d8094","name":"df11f0c7-ba0c-4c65-b86e-a368c90d8094","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"425a2b21-1b7c-4060-9429-39cc3011d999","name":"425a2b21-1b7c-4060-9429-39cc3011d999","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"913e2d4b-0ca1-4bbd-bc01-4fd5e599053a","name":"913e2d4b-0ca1-4bbd-bc01-4fd5e599053a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a265b9c-cde0-4ff5-bf6e-364d90bcdb5e","name":"7a265b9c-cde0-4ff5-bf6e-364d90bcdb5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee4e0a74-c9e9-4bab-b85c-183df0b5070b","name":"ee4e0a74-c9e9-4bab-b85c-183df0b5070b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5439c2d6-ee02-4bc7-ab82-4a5854ee1d2c","name":"5439c2d6-ee02-4bc7-ab82-4a5854ee1d2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aed5da4d-ea30-4654-a61f-16967414002e","name":"aed5da4d-ea30-4654-a61f-16967414002e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5bba97a-d671-49c8-84d2-f995712fc403","name":"c5bba97a-d671-49c8-84d2-f995712fc403","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"daa9667b-a496-4f30-b167-6af80c119e30","name":"daa9667b-a496-4f30-b167-6af80c119e30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f22c2d34-46b9-4440-a86f-37fd859f7cda","name":"f22c2d34-46b9-4440-a86f-37fd859f7cda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9cd073b-de37-49db-9f59-f6cd38490c52","name":"a9cd073b-de37-49db-9f59-f6cd38490c52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"24bea0d7-bb4e-469d-a9c0-97635743d8ed","name":"24bea0d7-bb4e-469d-a9c0-97635743d8ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f82e291-5fc6-45bc-a208-3647e5830f17","name":"4f82e291-5fc6-45bc-a208-3647e5830f17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c113a74f-504d-475b-8115-f90294743c81","name":"c113a74f-504d-475b-8115-f90294743c81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be762ab0-d12d-48d2-bb53-d4730721531b","name":"be762ab0-d12d-48d2-bb53-d4730721531b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0e1e619-158f-4bba-b8b5-94dcc1953491","name":"e0e1e619-158f-4bba-b8b5-94dcc1953491","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"71bd4d2e-1907-49d9-b5b0-6ee0d6aabb00","name":"71bd4d2e-1907-49d9-b5b0-6ee0d6aabb00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af6c6100-804f-4c05-8d22-71e0211d277a","name":"af6c6100-804f-4c05-8d22-71e0211d277a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"44daeebc-81f7-4a3e-9566-e297f548509d","name":"44daeebc-81f7-4a3e-9566-e297f548509d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76358f9c-44de-4773-bf94-08cfd0b706b7","name":"76358f9c-44de-4773-bf94-08cfd0b706b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3a1b3c0-9b73-40e4-bbcf-e3c2b025a98b","name":"f3a1b3c0-9b73-40e4-bbcf-e3c2b025a98b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5324fcf9-6bd3-4064-9ebf-0af8b4c636d7","name":"5324fcf9-6bd3-4064-9ebf-0af8b4c636d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"428c192f-e278-49f5-8d3b-74b07cd088b1","name":"428c192f-e278-49f5-8d3b-74b07cd088b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a53ac2d7-2889-41a4-8d1b-6a0bf2f7bac9","name":"a53ac2d7-2889-41a4-8d1b-6a0bf2f7bac9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"51927562-4d2a-436b-adbb-62a690d6c661","name":"51927562-4d2a-436b-adbb-62a690d6c661","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59b0bcf3-19ed-4f4c-b0e5-2c349fc1a26b","name":"59b0bcf3-19ed-4f4c-b0e5-2c349fc1a26b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f45bfd5f-8167-4b03-a26c-6468a48db3f1","name":"f45bfd5f-8167-4b03-a26c-6468a48db3f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8af43abe-2954-4429-a96e-5553ad6375c9","name":"8af43abe-2954-4429-a96e-5553ad6375c9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"578f1ad8-ccce-405b-af49-70f5b5ec6bc5","name":"578f1ad8-ccce-405b-af49-70f5b5ec6bc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"16dfc277-8209-4c38-a4fa-acff85d6b150","name":"16dfc277-8209-4c38-a4fa-acff85d6b150","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f068b9df-7ba7-4686-85c5-88a2ec6ce6a9","name":"f068b9df-7ba7-4686-85c5-88a2ec6ce6a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"43771aa1-f221-4485-9c32-0ca06344e04c","name":"43771aa1-f221-4485-9c32-0ca06344e04c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6d9c5187-edc7-4f27-a6b0-7c3fb4a355d7","name":"6d9c5187-edc7-4f27-a6b0-7c3fb4a355d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f3452a1-a45b-4c09-a126-a8f0afafd909","name":"6f3452a1-a45b-4c09-a126-a8f0afafd909","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e522eb85-b82f-4feb-b671-5108350cfb16","name":"e522eb85-b82f-4feb-b671-5108350cfb16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b398bcd4-2967-43bd-aceb-351f1a577bd9","name":"b398bcd4-2967-43bd-aceb-351f1a577bd9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"71ff8ca0-3f42-4dda-9730-4a2ac4530c17","name":"71ff8ca0-3f42-4dda-9730-4a2ac4530c17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db054ef7-2537-41d7-bcaf-34b5f9073296","name":"db054ef7-2537-41d7-bcaf-34b5f9073296","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7e595fd1-f058-4eb0-92b2-7112b02693f0","name":"7e595fd1-f058-4eb0-92b2-7112b02693f0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73be05d6-bdbf-488d-824a-4fe1cb89e070","name":"73be05d6-bdbf-488d-824a-4fe1cb89e070","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76cd8d8c-db17-401c-a660-84e8565440be","name":"76cd8d8c-db17-401c-a660-84e8565440be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fa9a6a5f-d27f-4915-bd3c-654e9b88bad4","name":"fa9a6a5f-d27f-4915-bd3c-654e9b88bad4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59a7ad1b-f30b-468a-b661-11fa1a07fcff","name":"59a7ad1b-f30b-468a-b661-11fa1a07fcff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"beea7bcb-bb67-48bd-abce-529db7dbe41c","name":"beea7bcb-bb67-48bd-abce-529db7dbe41c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8698f1a0-7ff8-4a84-8bd2-e389ec25a420","name":"8698f1a0-7ff8-4a84-8bd2-e389ec25a420","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"932663f3-9530-4c49-8d84-8c20a41549ef","name":"932663f3-9530-4c49-8d84-8c20a41549ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"13c95d20-70e5-4988-b859-c15ab08abd85","name":"13c95d20-70e5-4988-b859-c15ab08abd85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b709ce77-9b28-4388-bd75-f096350846ff","name":"b709ce77-9b28-4388-bd75-f096350846ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f8fe5a01-de13-4476-9af8-bcc7f187bba4","name":"f8fe5a01-de13-4476-9af8-bcc7f187bba4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"164fb034-c917-4aeb-8e30-0c4c989a3560","name":"164fb034-c917-4aeb-8e30-0c4c989a3560","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bbe1b91b-58af-460f-abd5-80225a8dde77","name":"bbe1b91b-58af-460f-abd5-80225a8dde77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d1aff5b9-0c78-4ddc-8cf9-1e2daf3607b0","name":"d1aff5b9-0c78-4ddc-8cf9-1e2daf3607b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3adda1a-086e-4eab-92b9-84b6bbaa6b58","name":"e3adda1a-086e-4eab-92b9-84b6bbaa6b58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df79b26f-f1ee-45c0-a52a-17bd22edf09b","name":"df79b26f-f1ee-45c0-a52a-17bd22edf09b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1769e8b5-3c03-48a9-90a2-0502b8dd5d79","name":"1769e8b5-3c03-48a9-90a2-0502b8dd5d79","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83b76c05-deaf-4543-862f-8e5bc4f242d4","name":"83b76c05-deaf-4543-862f-8e5bc4f242d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2dddb531-3570-44ff-bfb0-d647ac3c37ed","name":"2dddb531-3570-44ff-bfb0-d647ac3c37ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7df26bce-c930-4969-ab20-6aaa30f85c2e","name":"7df26bce-c930-4969-ab20-6aaa30f85c2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1ef6c7d-b668-4ece-9607-822177143185","name":"b1ef6c7d-b668-4ece-9607-822177143185","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a261ce25-dc09-4e9c-b2ab-ca494eb7f6af","name":"a261ce25-dc09-4e9c-b2ab-ca494eb7f6af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c32a1e3-ebc0-4ac5-bad5-8a1aca452527","name":"3c32a1e3-ebc0-4ac5-bad5-8a1aca452527","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92f5ddbd-2444-4532-808e-3b2e26795ba7","name":"92f5ddbd-2444-4532-808e-3b2e26795ba7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -163,6 +163,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":13.0, + "seqWidth":443.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_loadbar_empty/spr_loadbar_empty.yy b/sprites/spr_loadbar_empty/spr_loadbar_empty.yy index 37389b4e54..f62d4bfdf5 100644 --- a/sprites/spr_loadbar_empty/spr_loadbar_empty.yy +++ b/sprites/spr_loadbar_empty/spr_loadbar_empty.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_loadbar_empty", "bboxMode":0, "bbox_bottom":12, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c2994374-2a5e-4831-bc9e-33b033839c5c","name":"c2994374-2a5e-4831-bc9e-33b033839c5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c2994374-2a5e-4831-bc9e-33b033839c5c","name":"c2994374-2a5e-4831-bc9e-33b033839c5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":13.0, + "seqWidth":443.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_loading/spr_loading.yy b/sprites/spr_loading/spr_loading.yy index 81fee7819a..7d0b2341ec 100644 --- a/sprites/spr_loading/spr_loading.yy +++ b/sprites/spr_loading/spr_loading.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_loading", "bboxMode":0, "bbox_bottom":27, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9b9dca6d-d089-4673-81d4-02a8b047a84a","name":"9b9dca6d-d089-4673-81d4-02a8b047a84a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"181b8dfe-0174-4adf-bf1f-7dabe62cbab1","name":"181b8dfe-0174-4adf-bf1f-7dabe62cbab1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b43abf4-eaa0-4558-a721-1a690a34c000","name":"3b43abf4-eaa0-4558-a721-1a690a34c000","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"31b73db6-9d1e-46e6-90bd-782fc318bba0","name":"31b73db6-9d1e-46e6-90bd-782fc318bba0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"58a4c9c7-9418-4292-86fd-6f85f0e091df","name":"58a4c9c7-9418-4292-86fd-6f85f0e091df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"30976229-98b3-46f2-a241-48171df83ad2","name":"30976229-98b3-46f2-a241-48171df83ad2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cfba1c13-c0e8-4899-849a-892b6eef93fe","name":"cfba1c13-c0e8-4899-849a-892b6eef93fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9bfa8ee6-df56-467c-b545-4d443c335479","name":"9bfa8ee6-df56-467c-b545-4d443c335479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc9b1cca-ca4c-40d5-8b3a-d825a2be1e90","name":"dc9b1cca-ca4c-40d5-8b3a-d825a2be1e90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1271b1cf-ff42-4fbe-b17d-d8a074adad17","name":"1271b1cf-ff42-4fbe-b17d-d8a074adad17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d93fd483-f225-4990-bf6f-df877d244664","name":"d93fd483-f225-4990-bf6f-df877d244664","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"38fdffdf-322e-409a-88d8-ae352474fde6","name":"38fdffdf-322e-409a-88d8-ae352474fde6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b9dca6d-d089-4673-81d4-02a8b047a84a","name":"9b9dca6d-d089-4673-81d4-02a8b047a84a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"181b8dfe-0174-4adf-bf1f-7dabe62cbab1","name":"181b8dfe-0174-4adf-bf1f-7dabe62cbab1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b43abf4-eaa0-4558-a721-1a690a34c000","name":"3b43abf4-eaa0-4558-a721-1a690a34c000","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31b73db6-9d1e-46e6-90bd-782fc318bba0","name":"31b73db6-9d1e-46e6-90bd-782fc318bba0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"58a4c9c7-9418-4292-86fd-6f85f0e091df","name":"58a4c9c7-9418-4292-86fd-6f85f0e091df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"30976229-98b3-46f2-a241-48171df83ad2","name":"30976229-98b3-46f2-a241-48171df83ad2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfba1c13-c0e8-4899-849a-892b6eef93fe","name":"cfba1c13-c0e8-4899-849a-892b6eef93fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9bfa8ee6-df56-467c-b545-4d443c335479","name":"9bfa8ee6-df56-467c-b545-4d443c335479","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc9b1cca-ca4c-40d5-8b3a-d825a2be1e90","name":"dc9b1cca-ca4c-40d5-8b3a-d825a2be1e90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1271b1cf-ff42-4fbe-b17d-d8a074adad17","name":"1271b1cf-ff42-4fbe-b17d-d8a074adad17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d93fd483-f225-4990-bf6f-df877d244664","name":"d93fd483-f225-4990-bf6f-df877d244664","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38fdffdf-322e-409a-88d8-ae352474fde6","name":"38fdffdf-322e-409a-88d8-ae352474fde6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,42 +79,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b9dca6d-d089-4673-81d4-02a8b047a84a","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f5c82248-146e-4c1f-bb5a-5e0eb42dd21e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"181b8dfe-0174-4adf-bf1f-7dabe62cbab1","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11e76469-4652-456e-b4ea-e8d3396bce4e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b43abf4-eaa0-4558-a721-1a690a34c000","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d8d8818-5383-49e9-8f18-f15e75ec6d3f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31b73db6-9d1e-46e6-90bd-782fc318bba0","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e20eaf16-b6f3-432f-8560-2875bdaaaffe","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58a4c9c7-9418-4292-86fd-6f85f0e091df","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0d8728df-953a-4970-84d2-c0fad08b5f27","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"30976229-98b3-46f2-a241-48171df83ad2","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2c52796a-9504-42a5-b6de-e10fd3719d7f","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfba1c13-c0e8-4899-849a-892b6eef93fe","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"210aa3d9-0330-4726-954b-bdadbb88c61e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9bfa8ee6-df56-467c-b545-4d443c335479","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"68b1ed21-fda6-49ff-b716-78e6b898a509","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc9b1cca-ca4c-40d5-8b3a-d825a2be1e90","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d8f99ee7-5163-4470-aad9-fac87b12da19","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1271b1cf-ff42-4fbe-b17d-d8a074adad17","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"00c9cad2-ecc5-438d-83a4-e38fa9441462","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d93fd483-f225-4990-bf6f-df877d244664","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"087a699e-17e0-4f78-b453-c65d84bc01f0","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38fdffdf-322e-409a-88d8-ae352474fde6","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6ae7486-b8a8-4184-af83-46889b187aa0","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b9dca6d-d089-4673-81d4-02a8b047a84a","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f5c82248-146e-4c1f-bb5a-5e0eb42dd21e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"181b8dfe-0174-4adf-bf1f-7dabe62cbab1","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11e76469-4652-456e-b4ea-e8d3396bce4e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b43abf4-eaa0-4558-a721-1a690a34c000","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d8d8818-5383-49e9-8f18-f15e75ec6d3f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31b73db6-9d1e-46e6-90bd-782fc318bba0","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e20eaf16-b6f3-432f-8560-2875bdaaaffe","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"58a4c9c7-9418-4292-86fd-6f85f0e091df","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0d8728df-953a-4970-84d2-c0fad08b5f27","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"30976229-98b3-46f2-a241-48171df83ad2","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2c52796a-9504-42a5-b6de-e10fd3719d7f","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfba1c13-c0e8-4899-849a-892b6eef93fe","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"210aa3d9-0330-4726-954b-bdadbb88c61e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9bfa8ee6-df56-467c-b545-4d443c335479","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"68b1ed21-fda6-49ff-b716-78e6b898a509","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc9b1cca-ca4c-40d5-8b3a-d825a2be1e90","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d8f99ee7-5163-4470-aad9-fac87b12da19","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1271b1cf-ff42-4fbe-b17d-d8a074adad17","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"00c9cad2-ecc5-438d-83a4-e38fa9441462","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d93fd483-f225-4990-bf6f-df877d244664","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"087a699e-17e0-4f78-b453-c65d84bc01f0","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38fdffdf-322e-409a-88d8-ae352474fde6","path":"sprites/spr_loading/spr_loading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6ae7486-b8a8-4184-af83-46889b187aa0","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_loading2/spr_loading2.yy b/sprites/spr_loading2/spr_loading2.yy index a8e2449c66..226b3c9480 100644 --- a/sprites/spr_loading2/spr_loading2.yy +++ b/sprites/spr_loading2/spr_loading2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_loading2", "bboxMode":0, "bbox_bottom":30, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8b470910-b621-490a-a783-411ee078b812","name":"8b470910-b621-490a-a783-411ee078b812","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"91f77803-fdbf-45b9-ba2a-d6a00911d13f","name":"91f77803-fdbf-45b9-ba2a-d6a00911d13f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"41726c78-4d1d-46a5-9941-be0886823037","name":"41726c78-4d1d-46a5-9941-be0886823037","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"039f8acb-ac48-46ba-beb3-62711c4d69f8","name":"039f8acb-ac48-46ba-beb3-62711c4d69f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8b470910-b621-490a-a783-411ee078b812","name":"8b470910-b621-490a-a783-411ee078b812","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","name":"cf510d03-7a34-4777-a6e6-009ebcd6fccc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","name":"37a52a8f-f010-4987-8d6a-4b83e1ff1186","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"91f77803-fdbf-45b9-ba2a-d6a00911d13f","name":"91f77803-fdbf-45b9-ba2a-d6a00911d13f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41726c78-4d1d-46a5-9941-be0886823037","name":"41726c78-4d1d-46a5-9941-be0886823037","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"039f8acb-ac48-46ba-beb3-62711c4d69f8","name":"039f8acb-ac48-46ba-beb3-62711c4d69f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,17 +70,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":31.0, + "seqWidth":31.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"975627ff-8df0-4e31-9c0d-3a165e9ffa3e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b470910-b621-490a-a783-411ee078b812","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dff72920-d2c1-4bcb-84ea-e539caa245f8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"dff72920-d2c1-4bcb-84ea-e539caa245f8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfe64c72-788d-4d52-bbd4-58b53f3c2e49","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"975627ff-8df0-4e31-9c0d-3a165e9ffa3e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05f5f018-2f5d-40a3-a69e-4ef342b4279a","path":"sprites/spr_loading2/spr_loading2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"ec783239-b271-4744-bb34-213183fb1a9d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, diff --git a/sprites/spr_loc_icon/spr_loc_icon.yy b/sprites/spr_loc_icon/spr_loc_icon.yy index de2ed727ea..b31b1b50ae 100644 --- a/sprites/spr_loc_icon/spr_loc_icon.yy +++ b/sprites/spr_loc_icon/spr_loc_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_loc_icon", "bboxMode":0, "bbox_bottom":17, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"416b110b-43f5-4021-ac05-3f87227dc544","name":"416b110b-43f5-4021-ac05-3f87227dc544","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd18c971-69e9-4263-a0e6-d2df33ee95d6","name":"cd18c971-69e9-4263-a0e6-d2df33ee95d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d3d07a76-1f81-4273-866b-71e2736d7b6f","name":"d3d07a76-1f81-4273-866b-71e2736d7b6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c3673468-8b19-4bac-9539-3ff7228b6921","name":"c3673468-8b19-4bac-9539-3ff7228b6921","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e7c2d2df-3cab-474a-8058-96fa1b687654","name":"e7c2d2df-3cab-474a-8058-96fa1b687654","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"416b110b-43f5-4021-ac05-3f87227dc544","name":"416b110b-43f5-4021-ac05-3f87227dc544","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd18c971-69e9-4263-a0e6-d2df33ee95d6","name":"cd18c971-69e9-4263-a0e6-d2df33ee95d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d3d07a76-1f81-4273-866b-71e2736d7b6f","name":"d3d07a76-1f81-4273-866b-71e2736d7b6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c3673468-8b19-4bac-9539-3ff7228b6921","name":"c3673468-8b19-4bac-9539-3ff7228b6921","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7c2d2df-3cab-474a-8058-96fa1b687654","name":"e7c2d2df-3cab-474a-8058-96fa1b687654","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"416b110b-43f5-4021-ac05-3f87227dc544","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cbfc9e28-0682-4eeb-92dc-2455cf8e6fa8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd18c971-69e9-4263-a0e6-d2df33ee95d6","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ab72642d-2755-4891-b086-f3538e23f1af","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3d07a76-1f81-4273-866b-71e2736d7b6f","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0011c1c-e1e5-4c3c-b96e-605c82ac9fe9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3673468-8b19-4bac-9539-3ff7228b6921","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ee84902-0ebb-4605-a786-50c295102bdb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7c2d2df-3cab-474a-8058-96fa1b687654","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7280c334-9fc8-44b0-ae02-aeeac20c963a","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"416b110b-43f5-4021-ac05-3f87227dc544","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cbfc9e28-0682-4eeb-92dc-2455cf8e6fa8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd18c971-69e9-4263-a0e6-d2df33ee95d6","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ab72642d-2755-4891-b086-f3538e23f1af","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3d07a76-1f81-4273-866b-71e2736d7b6f","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0011c1c-e1e5-4c3c-b96e-605c82ac9fe9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3673468-8b19-4bac-9539-3ff7228b6921","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ee84902-0ebb-4605-a786-50c295102bdb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7c2d2df-3cab-474a-8058-96fa1b687654","path":"sprites/spr_loc_icon/spr_loc_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7280c334-9fc8-44b0-ae02-aeeac20c963a","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_luck_icon/spr_luck_icon.yy b/sprites/spr_luck_icon/spr_luck_icon.yy index 307a98485f..86481556bf 100644 --- a/sprites/spr_luck_icon/spr_luck_icon.yy +++ b/sprites/spr_luck_icon/spr_luck_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_luck_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"30b283ed-a5bc-430c-92bc-94c1dc9dc0b8","name":"30b283ed-a5bc-430c-92bc-94c1dc9dc0b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"30b283ed-a5bc-430c-92bc-94c1dc9dc0b8","name":"30b283ed-a5bc-430c-92bc-94c1dc9dc0b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"30b283ed-a5bc-430c-92bc-94c1dc9dc0b8","path":"sprites/spr_luck_icon/spr_luck_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d0e216b8-a255-4367-8128-437a22f3baa4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"30b283ed-a5bc-430c-92bc-94c1dc9dc0b8","path":"sprites/spr_luck_icon/spr_luck_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d0e216b8-a255-4367-8128-437a22f3baa4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mahreen/spr_mahreen.yy b/sprites/spr_mahreen/spr_mahreen.yy index 180007fdf6..6ef3101495 100644 --- a/sprites/spr_mahreen/spr_mahreen.yy +++ b/sprites/spr_mahreen/spr_mahreen.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mahreen", "bboxMode":0, "bbox_bottom":52, @@ -12,21 +12,21 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"14de9ffa-b488-44f9-afd3-fb4030398a09","name":"14de9ffa-b488-44f9-afd3-fb4030398a09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ba4be018-3c02-477d-bb65-62fa67dc3b67","name":"ba4be018-3c02-477d-bb65-62fa67dc3b67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3f565aef-eb59-4b1d-876e-f7b88d0f7129","name":"3f565aef-eb59-4b1d-876e-f7b88d0f7129","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d875b6df-8ffd-4a18-b575-19f871ab433e","name":"d875b6df-8ffd-4a18-b575-19f871ab433e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4b9d55d7-a4d2-44dc-985e-50763bb1810d","name":"4b9d55d7-a4d2-44dc-985e-50763bb1810d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"90f3dd18-f272-42c4-8509-dc1667fd2c7a","name":"90f3dd18-f272-42c4-8509-dc1667fd2c7a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15368c39-27df-4dcb-b87b-94593dd25c57","name":"15368c39-27df-4dcb-b87b-94593dd25c57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"315144e4-36e5-4485-83ba-b61ec26febf9","name":"315144e4-36e5-4485-83ba-b61ec26febf9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b29d1b35-9e76-41f9-9970-17c607f6793f","name":"b29d1b35-9e76-41f9-9970-17c607f6793f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f4e0662-c792-4b27-825d-9cb06fe183ff","name":"4f4e0662-c792-4b27-825d-9cb06fe183ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cb04c4cd-f562-4c14-ac9a-e437ce7f46ed","name":"cb04c4cd-f562-4c14-ac9a-e437ce7f46ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e081e164-ccf6-449f-9060-35f957ad22e5","name":"e081e164-ccf6-449f-9060-35f957ad22e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aae59b9b-c126-4b33-bb10-f7a40cad275f","name":"aae59b9b-c126-4b33-bb10-f7a40cad275f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e5eae182-4aa0-4282-bfe8-fa1c1e89083c","name":"e5eae182-4aa0-4282-bfe8-fa1c1e89083c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"063437d3-cd92-4e25-96f1-97ef985aa6db","name":"063437d3-cd92-4e25-96f1-97ef985aa6db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14de9ffa-b488-44f9-afd3-fb4030398a09","name":"14de9ffa-b488-44f9-afd3-fb4030398a09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba4be018-3c02-477d-bb65-62fa67dc3b67","name":"ba4be018-3c02-477d-bb65-62fa67dc3b67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f565aef-eb59-4b1d-876e-f7b88d0f7129","name":"3f565aef-eb59-4b1d-876e-f7b88d0f7129","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d875b6df-8ffd-4a18-b575-19f871ab433e","name":"d875b6df-8ffd-4a18-b575-19f871ab433e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b9d55d7-a4d2-44dc-985e-50763bb1810d","name":"4b9d55d7-a4d2-44dc-985e-50763bb1810d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90f3dd18-f272-42c4-8509-dc1667fd2c7a","name":"90f3dd18-f272-42c4-8509-dc1667fd2c7a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15368c39-27df-4dcb-b87b-94593dd25c57","name":"15368c39-27df-4dcb-b87b-94593dd25c57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"315144e4-36e5-4485-83ba-b61ec26febf9","name":"315144e4-36e5-4485-83ba-b61ec26febf9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b29d1b35-9e76-41f9-9970-17c607f6793f","name":"b29d1b35-9e76-41f9-9970-17c607f6793f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f4e0662-c792-4b27-825d-9cb06fe183ff","name":"4f4e0662-c792-4b27-825d-9cb06fe183ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cb04c4cd-f562-4c14-ac9a-e437ce7f46ed","name":"cb04c4cd-f562-4c14-ac9a-e437ce7f46ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e081e164-ccf6-449f-9060-35f957ad22e5","name":"e081e164-ccf6-449f-9060-35f957ad22e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aae59b9b-c126-4b33-bb10-f7a40cad275f","name":"aae59b9b-c126-4b33-bb10-f7a40cad275f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e5eae182-4aa0-4282-bfe8-fa1c1e89083c","name":"e5eae182-4aa0-4282-bfe8-fa1c1e89083c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"063437d3-cd92-4e25-96f1-97ef985aa6db","name":"063437d3-cd92-4e25-96f1-97ef985aa6db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,51 +82,21 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14de9ffa-b488-44f9-afd3-fb4030398a09","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c32fc363-3fc0-4f92-a088-d7a8feb6c58b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba4be018-3c02-477d-bb65-62fa67dc3b67","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19d2f518-dd6c-4879-a04e-2c7116330dff","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f565aef-eb59-4b1d-876e-f7b88d0f7129","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44db714c-bea2-479b-a486-f98f439e81e4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d875b6df-8ffd-4a18-b575-19f871ab433e","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"73fcc85b-1be6-4763-ae2c-b7e76f75c5a0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b9d55d7-a4d2-44dc-985e-50763bb1810d","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4940806-389e-4a3b-a400-6c4c24e42fc2","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90f3dd18-f272-42c4-8509-dc1667fd2c7a","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97da6424-ca4f-452a-9e65-de6d331da653","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15368c39-27df-4dcb-b87b-94593dd25c57","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1594b838-67b0-41f4-b1f5-15815e7ad64f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"315144e4-36e5-4485-83ba-b61ec26febf9","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"66c0d605-f696-47ff-8228-2ad92d4fe67b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b29d1b35-9e76-41f9-9970-17c607f6793f","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9c0339df-59a2-4224-b4ea-a5d6b57ea56c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f4e0662-c792-4b27-825d-9cb06fe183ff","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"465d239f-2864-49ca-9501-11df5da0dd3b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cb04c4cd-f562-4c14-ac9a-e437ce7f46ed","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e7a641f1-ab25-4635-a1e8-09f5cb4869a6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e081e164-ccf6-449f-9060-35f957ad22e5","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b7220668-2d49-4c83-b07d-8f55c99872df","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aae59b9b-c126-4b33-bb10-f7a40cad275f","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2f81c49b-475d-4053-9122-2bc970556538","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5eae182-4aa0-4282-bfe8-fa1c1e89083c","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1df1f1e3-1879-4906-af31-7645d8144a4a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"063437d3-cd92-4e25-96f1-97ef985aa6db","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be276b34-4e94-4a14-8bdf-af36af0f5c5a","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14de9ffa-b488-44f9-afd3-fb4030398a09","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c32fc363-3fc0-4f92-a088-d7a8feb6c58b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba4be018-3c02-477d-bb65-62fa67dc3b67","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"19d2f518-dd6c-4879-a04e-2c7116330dff","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f565aef-eb59-4b1d-876e-f7b88d0f7129","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44db714c-bea2-479b-a486-f98f439e81e4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d875b6df-8ffd-4a18-b575-19f871ab433e","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"73fcc85b-1be6-4763-ae2c-b7e76f75c5a0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b9d55d7-a4d2-44dc-985e-50763bb1810d","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4940806-389e-4a3b-a400-6c4c24e42fc2","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90f3dd18-f272-42c4-8509-dc1667fd2c7a","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97da6424-ca4f-452a-9e65-de6d331da653","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15368c39-27df-4dcb-b87b-94593dd25c57","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1594b838-67b0-41f4-b1f5-15815e7ad64f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"315144e4-36e5-4485-83ba-b61ec26febf9","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"66c0d605-f696-47ff-8228-2ad92d4fe67b","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b29d1b35-9e76-41f9-9970-17c607f6793f","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9c0339df-59a2-4224-b4ea-a5d6b57ea56c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f4e0662-c792-4b27-825d-9cb06fe183ff","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"465d239f-2864-49ca-9501-11df5da0dd3b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cb04c4cd-f562-4c14-ac9a-e437ce7f46ed","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e7a641f1-ab25-4635-a1e8-09f5cb4869a6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e081e164-ccf6-449f-9060-35f957ad22e5","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b7220668-2d49-4c83-b07d-8f55c99872df","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aae59b9b-c126-4b33-bb10-f7a40cad275f","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2f81c49b-475d-4053-9122-2bc970556538","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e5eae182-4aa0-4282-bfe8-fa1c1e89083c","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1df1f1e3-1879-4906-af31-7645d8144a4a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"063437d3-cd92-4e25-96f1-97ef985aa6db","path":"sprites/spr_mahreen/spr_mahreen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be276b34-4e94-4a14-8bdf-af36af0f5c5a","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mahreen_gun/spr_mahreen_gun.yy b/sprites/spr_mahreen_gun/spr_mahreen_gun.yy index 3f7ff0a1be..cb09c8dfe4 100644 --- a/sprites/spr_mahreen_gun/spr_mahreen_gun.yy +++ b/sprites/spr_mahreen_gun/spr_mahreen_gun.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mahreen_gun", "bboxMode":0, "bbox_bottom":51, @@ -12,21 +12,21 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"26b32576-846a-4d2c-957b-8d8ea19e7d97","name":"26b32576-846a-4d2c-957b-8d8ea19e7d97","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1c4c8e8d-1419-4455-a133-2fdbbdd0845e","name":"1c4c8e8d-1419-4455-a133-2fdbbdd0845e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ef768e33-ee33-41e5-9a93-9aca665e8d0f","name":"ef768e33-ee33-41e5-9a93-9aca665e8d0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"834da95f-937d-4755-ba47-5cc13d8b4d5d","name":"834da95f-937d-4755-ba47-5cc13d8b4d5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4bd5971-3e67-4ca4-8989-8fbadbd28769","name":"f4bd5971-3e67-4ca4-8989-8fbadbd28769","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1503ec11-e9c9-4d29-8297-78bd0515a012","name":"1503ec11-e9c9-4d29-8297-78bd0515a012","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b5dad1e7-3a8d-484c-a6ad-d460d98d657d","name":"b5dad1e7-3a8d-484c-a6ad-d460d98d657d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9ce214a4-56de-421a-aa04-e6cfe7d0a13b","name":"9ce214a4-56de-421a-aa04-e6cfe7d0a13b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0b7e43c3-f13b-40f4-9eca-167ff22e296b","name":"0b7e43c3-f13b-40f4-9eca-167ff22e296b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3eabc99b-f00d-4acf-893d-69b898ffdfe7","name":"3eabc99b-f00d-4acf-893d-69b898ffdfe7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f1f90d51-a0ec-47f9-b0e3-19af05cdf3a3","name":"f1f90d51-a0ec-47f9-b0e3-19af05cdf3a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8455f93d-b9c8-4156-8956-56244747b171","name":"8455f93d-b9c8-4156-8956-56244747b171","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"742e6880-3cda-4cde-982f-60b8dafa6112","name":"742e6880-3cda-4cde-982f-60b8dafa6112","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ff28df7-7cf4-4dc7-bf60-21e32687a7c1","name":"6ff28df7-7cf4-4dc7-bf60-21e32687a7c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74ac2f73-28fb-479b-911c-7ca0384f9738","name":"74ac2f73-28fb-479b-911c-7ca0384f9738","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26b32576-846a-4d2c-957b-8d8ea19e7d97","name":"26b32576-846a-4d2c-957b-8d8ea19e7d97","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1c4c8e8d-1419-4455-a133-2fdbbdd0845e","name":"1c4c8e8d-1419-4455-a133-2fdbbdd0845e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ef768e33-ee33-41e5-9a93-9aca665e8d0f","name":"ef768e33-ee33-41e5-9a93-9aca665e8d0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"834da95f-937d-4755-ba47-5cc13d8b4d5d","name":"834da95f-937d-4755-ba47-5cc13d8b4d5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4bd5971-3e67-4ca4-8989-8fbadbd28769","name":"f4bd5971-3e67-4ca4-8989-8fbadbd28769","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1503ec11-e9c9-4d29-8297-78bd0515a012","name":"1503ec11-e9c9-4d29-8297-78bd0515a012","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b5dad1e7-3a8d-484c-a6ad-d460d98d657d","name":"b5dad1e7-3a8d-484c-a6ad-d460d98d657d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9ce214a4-56de-421a-aa04-e6cfe7d0a13b","name":"9ce214a4-56de-421a-aa04-e6cfe7d0a13b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0b7e43c3-f13b-40f4-9eca-167ff22e296b","name":"0b7e43c3-f13b-40f4-9eca-167ff22e296b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3eabc99b-f00d-4acf-893d-69b898ffdfe7","name":"3eabc99b-f00d-4acf-893d-69b898ffdfe7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f1f90d51-a0ec-47f9-b0e3-19af05cdf3a3","name":"f1f90d51-a0ec-47f9-b0e3-19af05cdf3a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8455f93d-b9c8-4156-8956-56244747b171","name":"8455f93d-b9c8-4156-8956-56244747b171","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"742e6880-3cda-4cde-982f-60b8dafa6112","name":"742e6880-3cda-4cde-982f-60b8dafa6112","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ff28df7-7cf4-4dc7-bf60-21e32687a7c1","name":"6ff28df7-7cf4-4dc7-bf60-21e32687a7c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74ac2f73-28fb-479b-911c-7ca0384f9738","name":"74ac2f73-28fb-479b-911c-7ca0384f9738","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,51 +82,21 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26b32576-846a-4d2c-957b-8d8ea19e7d97","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d080e80e-2e64-416c-ab86-a82df3a1d9fd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1c4c8e8d-1419-4455-a133-2fdbbdd0845e","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4551645-6945-49a3-a74b-be127b7b90b6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef768e33-ee33-41e5-9a93-9aca665e8d0f","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c8a89b8-59a6-41fc-abcc-a25a329477c5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"834da95f-937d-4755-ba47-5cc13d8b4d5d","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e2b8c888-4a78-4dd1-a5b9-3a51745509ef","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4bd5971-3e67-4ca4-8989-8fbadbd28769","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0fcd727c-0b77-460c-9833-588b29c77fe3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1503ec11-e9c9-4d29-8297-78bd0515a012","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"13eb5f60-95ed-497e-8fd6-d60bbed2b6f3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5dad1e7-3a8d-484c-a6ad-d460d98d657d","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8fbffe1c-a902-49ad-a926-3d610aa4e63f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ce214a4-56de-421a-aa04-e6cfe7d0a13b","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6065c582-12c0-41b6-8c28-3e6c752390ba","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b7e43c3-f13b-40f4-9eca-167ff22e296b","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"39c463f5-38ac-4cfa-9357-ced874d14c67","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3eabc99b-f00d-4acf-893d-69b898ffdfe7","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1670f0bc-0eaa-42b5-9e68-577b74371851","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1f90d51-a0ec-47f9-b0e3-19af05cdf3a3","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0adb3fae-5b8e-4e06-ba18-f126862b1cf9","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8455f93d-b9c8-4156-8956-56244747b171","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7cf4139-37f4-4875-b097-7aab1d8b2f41","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"742e6880-3cda-4cde-982f-60b8dafa6112","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"23526fe7-d62c-4258-9aa9-ef5e9d498646","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ff28df7-7cf4-4dc7-bf60-21e32687a7c1","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d45104df-28dc-4ad9-8c58-2a723b8e0c09","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74ac2f73-28fb-479b-911c-7ca0384f9738","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46fa195a-7db8-47e8-890c-3aa7c0fb18fd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26b32576-846a-4d2c-957b-8d8ea19e7d97","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d080e80e-2e64-416c-ab86-a82df3a1d9fd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1c4c8e8d-1419-4455-a133-2fdbbdd0845e","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4551645-6945-49a3-a74b-be127b7b90b6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef768e33-ee33-41e5-9a93-9aca665e8d0f","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c8a89b8-59a6-41fc-abcc-a25a329477c5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"834da95f-937d-4755-ba47-5cc13d8b4d5d","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2b8c888-4a78-4dd1-a5b9-3a51745509ef","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4bd5971-3e67-4ca4-8989-8fbadbd28769","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0fcd727c-0b77-460c-9833-588b29c77fe3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1503ec11-e9c9-4d29-8297-78bd0515a012","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"13eb5f60-95ed-497e-8fd6-d60bbed2b6f3","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b5dad1e7-3a8d-484c-a6ad-d460d98d657d","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8fbffe1c-a902-49ad-a926-3d610aa4e63f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ce214a4-56de-421a-aa04-e6cfe7d0a13b","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6065c582-12c0-41b6-8c28-3e6c752390ba","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b7e43c3-f13b-40f4-9eca-167ff22e296b","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"39c463f5-38ac-4cfa-9357-ced874d14c67","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3eabc99b-f00d-4acf-893d-69b898ffdfe7","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1670f0bc-0eaa-42b5-9e68-577b74371851","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1f90d51-a0ec-47f9-b0e3-19af05cdf3a3","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0adb3fae-5b8e-4e06-ba18-f126862b1cf9","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8455f93d-b9c8-4156-8956-56244747b171","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7cf4139-37f4-4875-b097-7aab1d8b2f41","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"742e6880-3cda-4cde-982f-60b8dafa6112","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"23526fe7-d62c-4258-9aa9-ef5e9d498646","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ff28df7-7cf4-4dc7-bf60-21e32687a7c1","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d45104df-28dc-4ad9-8c58-2a723b8e0c09","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74ac2f73-28fb-479b-911c-7ca0384f9738","path":"sprites/spr_mahreen_gun/spr_mahreen_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46fa195a-7db8-47e8-890c-3aa7c0fb18fd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy b/sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy index 384c8a3d5c..084b9920ba 100644 --- a/sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy +++ b/sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mahreen_secondary", "bboxMode":0, "bbox_bottom":34, @@ -12,21 +12,21 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"39fa9316-112e-4905-81ed-5d32ece608d0","name":"39fa9316-112e-4905-81ed-5d32ece608d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c0cd8bb6-1285-4414-a383-6cfa0e8a5b73","name":"c0cd8bb6-1285-4414-a383-6cfa0e8a5b73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2682bc13-59ea-489d-8a57-a5bfcd569f04","name":"2682bc13-59ea-489d-8a57-a5bfcd569f04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"693e6ced-dbdf-4425-8848-f4ac590b520c","name":"693e6ced-dbdf-4425-8848-f4ac590b520c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c4599e38-a482-46a2-a468-ddb4e7214e34","name":"c4599e38-a482-46a2-a468-ddb4e7214e34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"13074c90-cc1a-433a-b435-cfdee44786bd","name":"13074c90-cc1a-433a-b435-cfdee44786bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eeb0644b-18bf-447c-bbf3-534a72f57e0d","name":"eeb0644b-18bf-447c-bbf3-534a72f57e0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"db4a9a8c-e96a-4f9d-a7d5-d69f401c4f6f","name":"db4a9a8c-e96a-4f9d-a7d5-d69f401c4f6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c1593c4-869f-4aca-a1b3-33b3e9ab15c9","name":"2c1593c4-869f-4aca-a1b3-33b3e9ab15c9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"079cf1c0-5db0-4fb6-8d0a-13fcd36a6afb","name":"079cf1c0-5db0-4fb6-8d0a-13fcd36a6afb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7fa2715f-5a22-4174-9809-708623e4c6c1","name":"7fa2715f-5a22-4174-9809-708623e4c6c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b1b06dd-2ef1-47ee-b7b4-e16fc2189627","name":"3b1b06dd-2ef1-47ee-b7b4-e16fc2189627","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3d516822-d888-40f2-bae9-7a98c273c307","name":"3d516822-d888-40f2-bae9-7a98c273c307","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"153ad7f3-c616-4efb-bc80-4beb31a2b363","name":"153ad7f3-c616-4efb-bc80-4beb31a2b363","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc106fdf-8dc9-465f-86cf-ce5a888edae7","name":"bc106fdf-8dc9-465f-86cf-ce5a888edae7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39fa9316-112e-4905-81ed-5d32ece608d0","name":"39fa9316-112e-4905-81ed-5d32ece608d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0cd8bb6-1285-4414-a383-6cfa0e8a5b73","name":"c0cd8bb6-1285-4414-a383-6cfa0e8a5b73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2682bc13-59ea-489d-8a57-a5bfcd569f04","name":"2682bc13-59ea-489d-8a57-a5bfcd569f04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"693e6ced-dbdf-4425-8848-f4ac590b520c","name":"693e6ced-dbdf-4425-8848-f4ac590b520c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4599e38-a482-46a2-a468-ddb4e7214e34","name":"c4599e38-a482-46a2-a468-ddb4e7214e34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"13074c90-cc1a-433a-b435-cfdee44786bd","name":"13074c90-cc1a-433a-b435-cfdee44786bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eeb0644b-18bf-447c-bbf3-534a72f57e0d","name":"eeb0644b-18bf-447c-bbf3-534a72f57e0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db4a9a8c-e96a-4f9d-a7d5-d69f401c4f6f","name":"db4a9a8c-e96a-4f9d-a7d5-d69f401c4f6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c1593c4-869f-4aca-a1b3-33b3e9ab15c9","name":"2c1593c4-869f-4aca-a1b3-33b3e9ab15c9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"079cf1c0-5db0-4fb6-8d0a-13fcd36a6afb","name":"079cf1c0-5db0-4fb6-8d0a-13fcd36a6afb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7fa2715f-5a22-4174-9809-708623e4c6c1","name":"7fa2715f-5a22-4174-9809-708623e4c6c1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b1b06dd-2ef1-47ee-b7b4-e16fc2189627","name":"3b1b06dd-2ef1-47ee-b7b4-e16fc2189627","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3d516822-d888-40f2-bae9-7a98c273c307","name":"3d516822-d888-40f2-bae9-7a98c273c307","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"153ad7f3-c616-4efb-bc80-4beb31a2b363","name":"153ad7f3-c616-4efb-bc80-4beb31a2b363","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc106fdf-8dc9-465f-86cf-ce5a888edae7","name":"bc106fdf-8dc9-465f-86cf-ce5a888edae7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,51 +82,21 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39fa9316-112e-4905-81ed-5d32ece608d0","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7c264cd4-4730-4a9b-bf9e-d764125b9bae","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0cd8bb6-1285-4414-a383-6cfa0e8a5b73","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"99691236-7ce3-4580-8c6e-2b186e45f54d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2682bc13-59ea-489d-8a57-a5bfcd569f04","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d8fc769d-8830-4603-b31e-185623028d9f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"693e6ced-dbdf-4425-8848-f4ac590b520c","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9a635ea-5d94-47ed-a5b3-e765b78aa4c2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4599e38-a482-46a2-a468-ddb4e7214e34","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6a52467-3838-49f8-81b7-0f5272fccef4","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"13074c90-cc1a-433a-b435-cfdee44786bd","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"32713d25-ecff-47b4-9da5-4e49e3f34ce2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeb0644b-18bf-447c-bbf3-534a72f57e0d","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d68ba8d1-3df2-4bdf-991b-c051db694ac8","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db4a9a8c-e96a-4f9d-a7d5-d69f401c4f6f","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"31607eb0-41e8-406b-ae45-deb3bcc4c18d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c1593c4-869f-4aca-a1b3-33b3e9ab15c9","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9027993f-4420-4b89-8fb0-a138124e5528","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"079cf1c0-5db0-4fb6-8d0a-13fcd36a6afb","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c8bc27d5-b80d-4b9b-a0f4-8ec7c0df980e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fa2715f-5a22-4174-9809-708623e4c6c1","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af7ff51f-f2fb-46a7-bf03-db0e458197d8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b1b06dd-2ef1-47ee-b7b4-e16fc2189627","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c2ba782-39ea-4de9-9300-da1fc687eb5b","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d516822-d888-40f2-bae9-7a98c273c307","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2fcb8330-b75e-4c95-aa3c-9af440f6516d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"153ad7f3-c616-4efb-bc80-4beb31a2b363","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"06ff3a4a-9032-4c22-8fd7-6b3a169899ef","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc106fdf-8dc9-465f-86cf-ce5a888edae7","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"acec81cf-187f-4f3d-861e-f0c706ff2750","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39fa9316-112e-4905-81ed-5d32ece608d0","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7c264cd4-4730-4a9b-bf9e-d764125b9bae","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0cd8bb6-1285-4414-a383-6cfa0e8a5b73","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"99691236-7ce3-4580-8c6e-2b186e45f54d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2682bc13-59ea-489d-8a57-a5bfcd569f04","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d8fc769d-8830-4603-b31e-185623028d9f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"693e6ced-dbdf-4425-8848-f4ac590b520c","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9a635ea-5d94-47ed-a5b3-e765b78aa4c2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4599e38-a482-46a2-a468-ddb4e7214e34","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6a52467-3838-49f8-81b7-0f5272fccef4","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"13074c90-cc1a-433a-b435-cfdee44786bd","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"32713d25-ecff-47b4-9da5-4e49e3f34ce2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeb0644b-18bf-447c-bbf3-534a72f57e0d","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d68ba8d1-3df2-4bdf-991b-c051db694ac8","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db4a9a8c-e96a-4f9d-a7d5-d69f401c4f6f","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"31607eb0-41e8-406b-ae45-deb3bcc4c18d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c1593c4-869f-4aca-a1b3-33b3e9ab15c9","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9027993f-4420-4b89-8fb0-a138124e5528","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"079cf1c0-5db0-4fb6-8d0a-13fcd36a6afb","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c8bc27d5-b80d-4b9b-a0f4-8ec7c0df980e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fa2715f-5a22-4174-9809-708623e4c6c1","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af7ff51f-f2fb-46a7-bf03-db0e458197d8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b1b06dd-2ef1-47ee-b7b4-e16fc2189627","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c2ba782-39ea-4de9-9300-da1fc687eb5b","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d516822-d888-40f2-bae9-7a98c273c307","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2fcb8330-b75e-4c95-aa3c-9af440f6516d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"153ad7f3-c616-4efb-bc80-4beb31a2b363","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"06ff3a4a-9032-4c22-8fd7-6b3a169899ef","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc106fdf-8dc9-465f-86cf-ce5a888edae7","path":"sprites/spr_mahreen_secondary/spr_mahreen_secondary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"acec81cf-187f-4f3d-861e-f0c706ff2750","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_mahreen_visor/spr_mahreen_visor.yy b/sprites/spr_mahreen_visor/spr_mahreen_visor.yy index 73a64b6503..216322791c 100644 --- a/sprites/spr_mahreen_visor/spr_mahreen_visor.yy +++ b/sprites/spr_mahreen_visor/spr_mahreen_visor.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mahreen_visor", "bboxMode":0, "bbox_bottom":12, @@ -12,21 +12,21 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7af506e9-e6fb-4104-9837-15d29df97d09","name":"7af506e9-e6fb-4104-9837-15d29df97d09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b90c868-5420-425d-840d-218478167973","name":"3b90c868-5420-425d-840d-218478167973","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6e1823b8-a7fa-42f9-b1c9-9d861c06ea26","name":"6e1823b8-a7fa-42f9-b1c9-9d861c06ea26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"07bbef0d-d9c8-4b16-8de1-560f31f9114f","name":"07bbef0d-d9c8-4b16-8de1-560f31f9114f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0c9f03b4-63af-4763-a7a8-bcdf89a8627f","name":"0c9f03b4-63af-4763-a7a8-bcdf89a8627f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af80be5a-c8a3-4e11-b275-992a36db6482","name":"af80be5a-c8a3-4e11-b275-992a36db6482","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"789a0f32-fb81-43ee-8538-9edf934797a9","name":"789a0f32-fb81-43ee-8538-9edf934797a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d5ecfb8-f210-42ce-bbe2-bf8a917b4e85","name":"7d5ecfb8-f210-42ce-bbe2-bf8a917b4e85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9e806d42-0922-476d-8d9c-e37aaf9aa07d","name":"9e806d42-0922-476d-8d9c-e37aaf9aa07d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d156d998-2521-4b7d-980a-5271ec8b3897","name":"d156d998-2521-4b7d-980a-5271ec8b3897","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5e7fa1cb-9835-4af2-af83-d0519e041c02","name":"5e7fa1cb-9835-4af2-af83-d0519e041c02","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"804ae55c-6893-462b-a31b-d176381419fc","name":"804ae55c-6893-462b-a31b-d176381419fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af3416e4-f87d-4aed-90e1-9aa672dbe43d","name":"af3416e4-f87d-4aed-90e1-9aa672dbe43d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5168cffa-a26b-444c-bc2a-61bf8674a560","name":"5168cffa-a26b-444c-bc2a-61bf8674a560","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"71a92573-c199-49aa-92f4-ef2bfa4b245b","name":"71a92573-c199-49aa-92f4-ef2bfa4b245b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7af506e9-e6fb-4104-9837-15d29df97d09","name":"7af506e9-e6fb-4104-9837-15d29df97d09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b90c868-5420-425d-840d-218478167973","name":"3b90c868-5420-425d-840d-218478167973","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6e1823b8-a7fa-42f9-b1c9-9d861c06ea26","name":"6e1823b8-a7fa-42f9-b1c9-9d861c06ea26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07bbef0d-d9c8-4b16-8de1-560f31f9114f","name":"07bbef0d-d9c8-4b16-8de1-560f31f9114f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0c9f03b4-63af-4763-a7a8-bcdf89a8627f","name":"0c9f03b4-63af-4763-a7a8-bcdf89a8627f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af80be5a-c8a3-4e11-b275-992a36db6482","name":"af80be5a-c8a3-4e11-b275-992a36db6482","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"789a0f32-fb81-43ee-8538-9edf934797a9","name":"789a0f32-fb81-43ee-8538-9edf934797a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d5ecfb8-f210-42ce-bbe2-bf8a917b4e85","name":"7d5ecfb8-f210-42ce-bbe2-bf8a917b4e85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e806d42-0922-476d-8d9c-e37aaf9aa07d","name":"9e806d42-0922-476d-8d9c-e37aaf9aa07d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d156d998-2521-4b7d-980a-5271ec8b3897","name":"d156d998-2521-4b7d-980a-5271ec8b3897","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5e7fa1cb-9835-4af2-af83-d0519e041c02","name":"5e7fa1cb-9835-4af2-af83-d0519e041c02","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"804ae55c-6893-462b-a31b-d176381419fc","name":"804ae55c-6893-462b-a31b-d176381419fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af3416e4-f87d-4aed-90e1-9aa672dbe43d","name":"af3416e4-f87d-4aed-90e1-9aa672dbe43d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5168cffa-a26b-444c-bc2a-61bf8674a560","name":"5168cffa-a26b-444c-bc2a-61bf8674a560","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"71a92573-c199-49aa-92f4-ef2bfa4b245b","name":"71a92573-c199-49aa-92f4-ef2bfa4b245b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,51 +82,21 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7af506e9-e6fb-4104-9837-15d29df97d09","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf6543f1-58b9-4b31-a36a-717dea5e6a7c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b90c868-5420-425d-840d-218478167973","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5cc113f7-867f-470e-b882-87e8d20b31bc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e1823b8-a7fa-42f9-b1c9-9d861c06ea26","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f2f1a8e-2da3-4a2e-9bdb-129d86c1241f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07bbef0d-d9c8-4b16-8de1-560f31f9114f","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e25a334-4340-4c46-b0a8-5da549f782b8","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0c9f03b4-63af-4763-a7a8-bcdf89a8627f","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"691134e1-5fec-424c-a344-c6c8bf05aa21","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af80be5a-c8a3-4e11-b275-992a36db6482","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4bfe5bf8-b809-4cfb-84c6-995c59bb311c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"789a0f32-fb81-43ee-8538-9edf934797a9","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e3b95f8-639f-476f-ba9d-20860f96f499","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5ecfb8-f210-42ce-bbe2-bf8a917b4e85","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d8f565e5-70d2-491a-83d3-e1c579cee9a6","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e806d42-0922-476d-8d9c-e37aaf9aa07d","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"412eac1e-7d00-4ef9-acbe-61b7c1dedd1b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d156d998-2521-4b7d-980a-5271ec8b3897","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a9ebc85-4f8e-425b-94dc-7c8a4d09bbc3","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e7fa1cb-9835-4af2-af83-d0519e041c02","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"120a012d-0b78-490f-8e9b-0553b9d43f4b","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"804ae55c-6893-462b-a31b-d176381419fc","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e7be5e7-79ac-4f35-a84c-2689e54b87a7","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af3416e4-f87d-4aed-90e1-9aa672dbe43d","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"923e7314-a879-42b5-bdd5-2b8e791ca784","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5168cffa-a26b-444c-bc2a-61bf8674a560","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c992c954-80e2-4c90-a649-238d976cff90","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"71a92573-c199-49aa-92f4-ef2bfa4b245b","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9c63d7c0-4a78-4d1c-a4d3-87781aae3f63","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7af506e9-e6fb-4104-9837-15d29df97d09","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf6543f1-58b9-4b31-a36a-717dea5e6a7c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b90c868-5420-425d-840d-218478167973","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5cc113f7-867f-470e-b882-87e8d20b31bc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e1823b8-a7fa-42f9-b1c9-9d861c06ea26","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f2f1a8e-2da3-4a2e-9bdb-129d86c1241f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07bbef0d-d9c8-4b16-8de1-560f31f9114f","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e25a334-4340-4c46-b0a8-5da549f782b8","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0c9f03b4-63af-4763-a7a8-bcdf89a8627f","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"691134e1-5fec-424c-a344-c6c8bf05aa21","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af80be5a-c8a3-4e11-b275-992a36db6482","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4bfe5bf8-b809-4cfb-84c6-995c59bb311c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"789a0f32-fb81-43ee-8538-9edf934797a9","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e3b95f8-639f-476f-ba9d-20860f96f499","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d5ecfb8-f210-42ce-bbe2-bf8a917b4e85","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d8f565e5-70d2-491a-83d3-e1c579cee9a6","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e806d42-0922-476d-8d9c-e37aaf9aa07d","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"412eac1e-7d00-4ef9-acbe-61b7c1dedd1b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d156d998-2521-4b7d-980a-5271ec8b3897","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a9ebc85-4f8e-425b-94dc-7c8a4d09bbc3","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e7fa1cb-9835-4af2-af83-d0519e041c02","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"120a012d-0b78-490f-8e9b-0553b9d43f4b","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"804ae55c-6893-462b-a31b-d176381419fc","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e7be5e7-79ac-4f35-a84c-2689e54b87a7","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af3416e4-f87d-4aed-90e1-9aa672dbe43d","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"923e7314-a879-42b5-bdd5-2b8e791ca784","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5168cffa-a26b-444c-bc2a-61bf8674a560","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c992c954-80e2-4c90-a649-238d976cff90","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"71a92573-c199-49aa-92f4-ef2bfa4b245b","path":"sprites/spr_mahreen_visor/spr_mahreen_visor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9c63d7c0-4a78-4d1c-a4d3-87781aae3f63","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_manta/spr_manta.yy b/sprites/spr_manta/spr_manta.yy index 0c9fa27cf2..2851379efb 100644 --- a/sprites/spr_manta/spr_manta.yy +++ b/sprites/spr_manta/spr_manta.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_manta", "bboxMode":0, "bbox_bottom":47, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5f787cb0-7e13-451c-890c-3ef5add27e66","name":"5f787cb0-7e13-451c-890c-3ef5add27e66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5f787cb0-7e13-451c-890c-3ef5add27e66","name":"5f787cb0-7e13-451c-890c-3ef5add27e66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f787cb0-7e13-451c-890c-3ef5add27e66","path":"sprites/spr_manta/spr_manta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9ba13ab-74a9-4415-b636-70b079792bc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f787cb0-7e13-451c-890c-3ef5add27e66","path":"sprites/spr_manta/spr_manta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9ba13ab-74a9-4415-b636-70b079792bc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy b/sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy index 89d4807e14..da4f406aa3 100644 --- a/sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy +++ b/sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mantis_warriors_icon", "bboxMode":0, "bbox_bottom":72, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a47d6a18-1de6-44c5-b1b5-899bf4162402","name":"a47d6a18-1de6-44c5-b1b5-899bf4162402","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8f304484-8756-4ea1-800a-b54b710b175d","name":"8f304484-8756-4ea1-800a-b54b710b175d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a47d6a18-1de6-44c5-b1b5-899bf4162402","name":"a47d6a18-1de6-44c5-b1b5-899bf4162402","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8f304484-8756-4ea1-800a-b54b710b175d","name":"8f304484-8756-4ea1-800a-b54b710b175d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a47d6a18-1de6-44c5-b1b5-899bf4162402","path":"sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a5d5c4a-4588-4129-9abb-f210090c169c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f304484-8756-4ea1-800a-b54b710b175d","path":"sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"62e74cff-5357-4b1a-9049-84c4e78299a4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a47d6a18-1de6-44c5-b1b5-899bf4162402","path":"sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a5d5c4a-4588-4129-9abb-f210090c169c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f304484-8756-4ea1-800a-b54b710b175d","path":"sprites/spr_mantis_warriors_icon/spr_mantis_warriors_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"62e74cff-5357-4b1a-9049-84c4e78299a4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mar_collision/spr_mar_collision.yy b/sprites/spr_mar_collision/spr_mar_collision.yy index 81e7818bb0..d4e9fccf8f 100644 --- a/sprites/spr_mar_collision/spr_mar_collision.yy +++ b/sprites/spr_mar_collision/spr_mar_collision.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_collision", "bboxMode":2, "bbox_bottom":38, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"98e46c57-e2c4-40cc-be18-0d9c957f9ddc","name":"98e46c57-e2c4-40cc-be18-0d9c957f9ddc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1674be3c-5769-44c3-81e8-c574d1aada7e","name":"1674be3c-5769-44c3-81e8-c574d1aada7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc91e6af-a580-481b-86d8-2218efdf1bd4","name":"dc91e6af-a580-481b-86d8-2218efdf1bd4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c6619ce-8999-4deb-8866-715dbad4ebfb","name":"2c6619ce-8999-4deb-8866-715dbad4ebfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73dfb102-c129-4c22-94b5-873f24246195","name":"73dfb102-c129-4c22-94b5-873f24246195","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e7d2a384-1c48-41be-9909-2cc16a84f88f","name":"e7d2a384-1c48-41be-9909-2cc16a84f88f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f154861b-1ec2-4b0d-b3db-606ee8c7378b","name":"f154861b-1ec2-4b0d-b3db-606ee8c7378b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a106682-8b51-41e2-b785-e56933172957","name":"2a106682-8b51-41e2-b785-e56933172957","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f7466f3-22ea-434b-b759-14d8cf633d6b","name":"4f7466f3-22ea-434b-b759-14d8cf633d6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59c3df88-024a-4d43-9eb6-479b616a5a8f","name":"59c3df88-024a-4d43-9eb6-479b616a5a8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f798c093-387b-4249-9e78-21c3cf42ab6a","name":"f798c093-387b-4249-9e78-21c3cf42ab6a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6334a270-feae-41eb-bfcb-27bddb85fc08","name":"6334a270-feae-41eb-bfcb-27bddb85fc08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"789c3d1b-bf8d-4a82-bb84-791e93be0e66","name":"789c3d1b-bf8d-4a82-bb84-791e93be0e66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f2512b2a-a43d-4c58-b0c6-11431094a257","name":"f2512b2a-a43d-4c58-b0c6-11431094a257","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d14d60dc-3cad-4f33-ab49-c6c5aa26343d","name":"d14d60dc-3cad-4f33-ab49-c6c5aa26343d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c50735d8-7c0e-4d82-bbf2-f1695a62e5fb","name":"c50735d8-7c0e-4d82-bbf2-f1695a62e5fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8045ea39-103b-4f28-ac8f-8c4e6826fbb7","name":"8045ea39-103b-4f28-ac8f-8c4e6826fbb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"98e46c57-e2c4-40cc-be18-0d9c957f9ddc","name":"98e46c57-e2c4-40cc-be18-0d9c957f9ddc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1674be3c-5769-44c3-81e8-c574d1aada7e","name":"1674be3c-5769-44c3-81e8-c574d1aada7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc91e6af-a580-481b-86d8-2218efdf1bd4","name":"dc91e6af-a580-481b-86d8-2218efdf1bd4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c6619ce-8999-4deb-8866-715dbad4ebfb","name":"2c6619ce-8999-4deb-8866-715dbad4ebfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73dfb102-c129-4c22-94b5-873f24246195","name":"73dfb102-c129-4c22-94b5-873f24246195","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7d2a384-1c48-41be-9909-2cc16a84f88f","name":"e7d2a384-1c48-41be-9909-2cc16a84f88f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f154861b-1ec2-4b0d-b3db-606ee8c7378b","name":"f154861b-1ec2-4b0d-b3db-606ee8c7378b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a106682-8b51-41e2-b785-e56933172957","name":"2a106682-8b51-41e2-b785-e56933172957","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f7466f3-22ea-434b-b759-14d8cf633d6b","name":"4f7466f3-22ea-434b-b759-14d8cf633d6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59c3df88-024a-4d43-9eb6-479b616a5a8f","name":"59c3df88-024a-4d43-9eb6-479b616a5a8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f798c093-387b-4249-9e78-21c3cf42ab6a","name":"f798c093-387b-4249-9e78-21c3cf42ab6a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6334a270-feae-41eb-bfcb-27bddb85fc08","name":"6334a270-feae-41eb-bfcb-27bddb85fc08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"789c3d1b-bf8d-4a82-bb84-791e93be0e66","name":"789c3d1b-bf8d-4a82-bb84-791e93be0e66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2512b2a-a43d-4c58-b0c6-11431094a257","name":"f2512b2a-a43d-4c58-b0c6-11431094a257","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d14d60dc-3cad-4f33-ab49-c6c5aa26343d","name":"d14d60dc-3cad-4f33-ab49-c6c5aa26343d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c50735d8-7c0e-4d82-bbf2-f1695a62e5fb","name":"c50735d8-7c0e-4d82-bbf2-f1695a62e5fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8045ea39-103b-4f28-ac8f-8c4e6826fbb7","name":"8045ea39-103b-4f28-ac8f-8c4e6826fbb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -86,57 +86,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"98e46c57-e2c4-40cc-be18-0d9c957f9ddc","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef388b7f-ba09-4d17-a004-a92fcdb86fbf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1674be3c-5769-44c3-81e8-c574d1aada7e","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"344d8112-ce2c-434d-8738-3f0b8c8b01fd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc91e6af-a580-481b-86d8-2218efdf1bd4","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"91d37893-4565-49d2-a9a7-3db7befd7eda","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c6619ce-8999-4deb-8866-715dbad4ebfb","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5047741-bf2a-419e-a4f4-56ab24e09b01","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73dfb102-c129-4c22-94b5-873f24246195","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53f64345-c8a5-445e-830a-b9e5bdd8cfac","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7d2a384-1c48-41be-9909-2cc16a84f88f","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"303eef0a-81fd-4e4f-981b-e1e710e6f662","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f154861b-1ec2-4b0d-b3db-606ee8c7378b","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7985c880-8351-4466-b139-e36ebf2d647d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a106682-8b51-41e2-b785-e56933172957","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d2ca48f5-06fa-4dea-9913-90f27af95398","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f7466f3-22ea-434b-b759-14d8cf633d6b","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c433fd3-2fd0-4d7a-acf7-0e422f71be5c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59c3df88-024a-4d43-9eb6-479b616a5a8f","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f604799-de6e-4458-8af2-294213d98556","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f798c093-387b-4249-9e78-21c3cf42ab6a","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"96b94c6e-13fe-4a6e-86ba-9f2cbad8ab00","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6334a270-feae-41eb-bfcb-27bddb85fc08","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e0142ec8-d841-48cb-936e-82a13956511f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"789c3d1b-bf8d-4a82-bb84-791e93be0e66","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ebeff04f-5606-4d71-993e-558cbedac30b","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2512b2a-a43d-4c58-b0c6-11431094a257","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9505c8f1-0494-4159-ac5d-da5869ecc711","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d14d60dc-3cad-4f33-ab49-c6c5aa26343d","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"71124f4a-45df-4a75-b534-7cbedb524849","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c50735d8-7c0e-4d82-bbf2-f1695a62e5fb","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dfa989b8-a09a-4f2a-8a74-d5dcbdb904a5","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8045ea39-103b-4f28-ac8f-8c4e6826fbb7","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"00599ad0-601a-4cb3-9583-e321154407ec","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"98e46c57-e2c4-40cc-be18-0d9c957f9ddc","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef388b7f-ba09-4d17-a004-a92fcdb86fbf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1674be3c-5769-44c3-81e8-c574d1aada7e","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"344d8112-ce2c-434d-8738-3f0b8c8b01fd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc91e6af-a580-481b-86d8-2218efdf1bd4","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"91d37893-4565-49d2-a9a7-3db7befd7eda","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c6619ce-8999-4deb-8866-715dbad4ebfb","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5047741-bf2a-419e-a4f4-56ab24e09b01","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73dfb102-c129-4c22-94b5-873f24246195","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53f64345-c8a5-445e-830a-b9e5bdd8cfac","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7d2a384-1c48-41be-9909-2cc16a84f88f","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"303eef0a-81fd-4e4f-981b-e1e710e6f662","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f154861b-1ec2-4b0d-b3db-606ee8c7378b","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7985c880-8351-4466-b139-e36ebf2d647d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a106682-8b51-41e2-b785-e56933172957","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d2ca48f5-06fa-4dea-9913-90f27af95398","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f7466f3-22ea-434b-b759-14d8cf633d6b","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c433fd3-2fd0-4d7a-acf7-0e422f71be5c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59c3df88-024a-4d43-9eb6-479b616a5a8f","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f604799-de6e-4458-8af2-294213d98556","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f798c093-387b-4249-9e78-21c3cf42ab6a","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"96b94c6e-13fe-4a6e-86ba-9f2cbad8ab00","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6334a270-feae-41eb-bfcb-27bddb85fc08","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e0142ec8-d841-48cb-936e-82a13956511f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"789c3d1b-bf8d-4a82-bb84-791e93be0e66","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ebeff04f-5606-4d71-993e-558cbedac30b","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f2512b2a-a43d-4c58-b0c6-11431094a257","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9505c8f1-0494-4159-ac5d-da5869ecc711","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d14d60dc-3cad-4f33-ab49-c6c5aa26343d","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"71124f4a-45df-4a75-b534-7cbedb524849","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c50735d8-7c0e-4d82-bbf2-f1695a62e5fb","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dfa989b8-a09a-4f2a-8a74-d5dcbdb904a5","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8045ea39-103b-4f28-ac8f-8c4e6826fbb7","path":"sprites/spr_mar_collision/spr_mar_collision.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"00599ad0-601a-4cb3-9583-e321154407ec","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy b/sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy index a5d2f2defb..e4bd9e51aa 100644 --- a/sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy +++ b/sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_fire_body1", "bboxMode":0, "bbox_bottom":21, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"01affcad-7536-4bf5-b69f-c617ef77ee73","name":"01affcad-7536-4bf5-b69f-c617ef77ee73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df131e14-4494-465a-8c50-27ba2e8f8e85","name":"df131e14-4494-465a-8c50-27ba2e8f8e85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"86691a2b-a73b-4513-9f17-c8bcadf34ff7","name":"86691a2b-a73b-4513-9f17-c8bcadf34ff7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"28560d18-6336-4c17-b74a-90012673caf8","name":"28560d18-6336-4c17-b74a-90012673caf8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01affcad-7536-4bf5-b69f-c617ef77ee73","name":"01affcad-7536-4bf5-b69f-c617ef77ee73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df131e14-4494-465a-8c50-27ba2e8f8e85","name":"df131e14-4494-465a-8c50-27ba2e8f8e85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"86691a2b-a73b-4513-9f17-c8bcadf34ff7","name":"86691a2b-a73b-4513-9f17-c8bcadf34ff7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"28560d18-6336-4c17-b74a-90012673caf8","name":"28560d18-6336-4c17-b74a-90012673caf8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01affcad-7536-4bf5-b69f-c617ef77ee73","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea94f0b1-bd27-4e6e-8da4-b55352effd08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df131e14-4494-465a-8c50-27ba2e8f8e85","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2cbd5256-4d85-4a0c-9612-a24c946faa34","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"86691a2b-a73b-4513-9f17-c8bcadf34ff7","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd3eda7e-1232-4176-b9b0-ba25bcbb3c68","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28560d18-6336-4c17-b74a-90012673caf8","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"150b7f86-89d2-44f7-b072-e0a61d54d8d4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01affcad-7536-4bf5-b69f-c617ef77ee73","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea94f0b1-bd27-4e6e-8da4-b55352effd08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df131e14-4494-465a-8c50-27ba2e8f8e85","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2cbd5256-4d85-4a0c-9612-a24c946faa34","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"86691a2b-a73b-4513-9f17-c8bcadf34ff7","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd3eda7e-1232-4176-b9b0-ba25bcbb3c68","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"28560d18-6336-4c17-b74a-90012673caf8","path":"sprites/spr_mar_fire_body1/spr_mar_fire_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"150b7f86-89d2-44f7-b072-e0a61d54d8d4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy b/sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy index 863019f48d..1db99b3123 100644 --- a/sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy +++ b/sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_fire_body2", "bboxMode":0, "bbox_bottom":21, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"38210a5c-143d-47db-89c1-09ba5ae9e1c3","name":"38210a5c-143d-47db-89c1-09ba5ae9e1c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fc78904a-61cb-4bbe-9320-d5b4d0939fbe","name":"fc78904a-61cb-4bbe-9320-d5b4d0939fbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8c4d598b-ad21-4c5c-b58d-98a36755c3da","name":"8c4d598b-ad21-4c5c-b58d-98a36755c3da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"43151143-33ae-4b30-b675-230f6d4b65c3","name":"43151143-33ae-4b30-b675-230f6d4b65c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38210a5c-143d-47db-89c1-09ba5ae9e1c3","name":"38210a5c-143d-47db-89c1-09ba5ae9e1c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fc78904a-61cb-4bbe-9320-d5b4d0939fbe","name":"fc78904a-61cb-4bbe-9320-d5b4d0939fbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c4d598b-ad21-4c5c-b58d-98a36755c3da","name":"8c4d598b-ad21-4c5c-b58d-98a36755c3da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"43151143-33ae-4b30-b675-230f6d4b65c3","name":"43151143-33ae-4b30-b675-230f6d4b65c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38210a5c-143d-47db-89c1-09ba5ae9e1c3","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"07897a39-2fbd-409b-87f4-1cd3904179c1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc78904a-61cb-4bbe-9320-d5b4d0939fbe","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"224c5f12-1b61-43fa-bef0-898d61d48471","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c4d598b-ad21-4c5c-b58d-98a36755c3da","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f3637fc5-96d0-40da-974a-6a478148f4bd","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"43151143-33ae-4b30-b675-230f6d4b65c3","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c415e46f-1c71-4842-9cf3-0191411cba7a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38210a5c-143d-47db-89c1-09ba5ae9e1c3","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"07897a39-2fbd-409b-87f4-1cd3904179c1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc78904a-61cb-4bbe-9320-d5b4d0939fbe","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"224c5f12-1b61-43fa-bef0-898d61d48471","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c4d598b-ad21-4c5c-b58d-98a36755c3da","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f3637fc5-96d0-40da-974a-6a478148f4bd","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"43151143-33ae-4b30-b675-230f6d4b65c3","path":"sprites/spr_mar_fire_body2/spr_mar_fire_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c415e46f-1c71-4842-9cf3-0191411cba7a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy b/sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy index 304c0067d2..00e5ad146e 100644 --- a/sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy +++ b/sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_fire_body3", "bboxMode":0, "bbox_bottom":21, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"72fa21ad-3151-4426-8d7a-193683cf4ffb","name":"72fa21ad-3151-4426-8d7a-193683cf4ffb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"047ad514-4829-45b0-b1e3-4df5ec519c30","name":"047ad514-4829-45b0-b1e3-4df5ec519c30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8a15141a-5786-4c79-9fde-b10c457a32e8","name":"8a15141a-5786-4c79-9fde-b10c457a32e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cfb8c2c7-f509-4ab5-9f9d-7d8eeab20312","name":"cfb8c2c7-f509-4ab5-9f9d-7d8eeab20312","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72fa21ad-3151-4426-8d7a-193683cf4ffb","name":"72fa21ad-3151-4426-8d7a-193683cf4ffb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"047ad514-4829-45b0-b1e3-4df5ec519c30","name":"047ad514-4829-45b0-b1e3-4df5ec519c30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a15141a-5786-4c79-9fde-b10c457a32e8","name":"8a15141a-5786-4c79-9fde-b10c457a32e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cfb8c2c7-f509-4ab5-9f9d-7d8eeab20312","name":"cfb8c2c7-f509-4ab5-9f9d-7d8eeab20312","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72fa21ad-3151-4426-8d7a-193683cf4ffb","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1ba287f0-053e-46d5-a151-03d599b06430","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"047ad514-4829-45b0-b1e3-4df5ec519c30","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b35e38a-df41-43e4-8738-49c0596d86a8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a15141a-5786-4c79-9fde-b10c457a32e8","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26713e1c-51b7-458c-aa43-e7621843eb88","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfb8c2c7-f509-4ab5-9f9d-7d8eeab20312","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b3f3c26e-0b7a-4e8a-8f75-067fb1384a68","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72fa21ad-3151-4426-8d7a-193683cf4ffb","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1ba287f0-053e-46d5-a151-03d599b06430","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"047ad514-4829-45b0-b1e3-4df5ec519c30","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b35e38a-df41-43e4-8738-49c0596d86a8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a15141a-5786-4c79-9fde-b10c457a32e8","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26713e1c-51b7-458c-aa43-e7621843eb88","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfb8c2c7-f509-4ab5-9f9d-7d8eeab20312","path":"sprites/spr_mar_fire_body3/spr_mar_fire_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b3f3c26e-0b7a-4e8a-8f75-067fb1384a68","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy b/sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy index 3ccc4d77a4..af173ce4a3 100644 --- a/sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy +++ b/sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_fire_pauldron1", "bboxMode":0, "bbox_bottom":12, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"44561e3e-695b-42b6-a9cb-05df7b491263","name":"44561e3e-695b-42b6-a9cb-05df7b491263","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0fb87477-e686-4d73-9109-792d5902591b","name":"0fb87477-e686-4d73-9109-792d5902591b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f1d4ecd-4b1c-45ba-8259-8a7bad6ceebf","name":"4f1d4ecd-4b1c-45ba-8259-8a7bad6ceebf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15ca85c2-a667-484b-ad43-0519cbbe3ad6","name":"15ca85c2-a667-484b-ad43-0519cbbe3ad6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"44561e3e-695b-42b6-a9cb-05df7b491263","name":"44561e3e-695b-42b6-a9cb-05df7b491263","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0fb87477-e686-4d73-9109-792d5902591b","name":"0fb87477-e686-4d73-9109-792d5902591b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f1d4ecd-4b1c-45ba-8259-8a7bad6ceebf","name":"4f1d4ecd-4b1c-45ba-8259-8a7bad6ceebf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15ca85c2-a667-484b-ad43-0519cbbe3ad6","name":"15ca85c2-a667-484b-ad43-0519cbbe3ad6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"44561e3e-695b-42b6-a9cb-05df7b491263","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9837af83-5d30-4704-83f5-4237d2aa22f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0fb87477-e686-4d73-9109-792d5902591b","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1fa1abe3-4d15-47ab-bf7b-87858dcd3a03","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f1d4ecd-4b1c-45ba-8259-8a7bad6ceebf","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d998a60-9a9c-4668-acdf-6a912756b3d5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15ca85c2-a667-484b-ad43-0519cbbe3ad6","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8188cdf-b45d-4742-8d5b-2d124a5dc1ce","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"44561e3e-695b-42b6-a9cb-05df7b491263","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9837af83-5d30-4704-83f5-4237d2aa22f5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0fb87477-e686-4d73-9109-792d5902591b","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1fa1abe3-4d15-47ab-bf7b-87858dcd3a03","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f1d4ecd-4b1c-45ba-8259-8a7bad6ceebf","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d998a60-9a9c-4668-acdf-6a912756b3d5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15ca85c2-a667-484b-ad43-0519cbbe3ad6","path":"sprites/spr_mar_fire_pauldron1/spr_mar_fire_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8188cdf-b45d-4742-8d5b-2d124a5dc1ce","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy b/sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy index b5e2481570..0ef765296c 100644 --- a/sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy +++ b/sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_fire_pauldron2", "bboxMode":0, "bbox_bottom":12, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"15b8fe75-8faf-415b-97e1-fd9046dd1092","name":"15b8fe75-8faf-415b-97e1-fd9046dd1092","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ffac56e-c40f-4bc1-baf7-88dea80e1614","name":"3ffac56e-c40f-4bc1-baf7-88dea80e1614","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"38bc760b-cb19-45ae-b9db-808873773b0d","name":"38bc760b-cb19-45ae-b9db-808873773b0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ccd8433e-0945-4f53-abd2-ccc162d812f8","name":"ccd8433e-0945-4f53-abd2-ccc162d812f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15b8fe75-8faf-415b-97e1-fd9046dd1092","name":"15b8fe75-8faf-415b-97e1-fd9046dd1092","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ffac56e-c40f-4bc1-baf7-88dea80e1614","name":"3ffac56e-c40f-4bc1-baf7-88dea80e1614","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38bc760b-cb19-45ae-b9db-808873773b0d","name":"38bc760b-cb19-45ae-b9db-808873773b0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ccd8433e-0945-4f53-abd2-ccc162d812f8","name":"ccd8433e-0945-4f53-abd2-ccc162d812f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15b8fe75-8faf-415b-97e1-fd9046dd1092","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a47727c0-b49a-4dce-bcd4-8d0a92a7b96e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ffac56e-c40f-4bc1-baf7-88dea80e1614","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"130b5dd0-bbb1-4dab-9cf6-0dd46d30e73e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38bc760b-cb19-45ae-b9db-808873773b0d","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46768cec-37de-4e55-9143-ceb57239d74a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccd8433e-0945-4f53-abd2-ccc162d812f8","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9a12232-13cf-430e-8a54-4e19517033eb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15b8fe75-8faf-415b-97e1-fd9046dd1092","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a47727c0-b49a-4dce-bcd4-8d0a92a7b96e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ffac56e-c40f-4bc1-baf7-88dea80e1614","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"130b5dd0-bbb1-4dab-9cf6-0dd46d30e73e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38bc760b-cb19-45ae-b9db-808873773b0d","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46768cec-37de-4e55-9143-ceb57239d74a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccd8433e-0945-4f53-abd2-ccc162d812f8","path":"sprites/spr_mar_fire_pauldron2/spr_mar_fire_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9a12232-13cf-430e-8a54-4e19517033eb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy b/sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy index 6af9cb58e3..cf71eeaece 100644 --- a/sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy +++ b/sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_body1", "bboxMode":0, "bbox_bottom":23, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"90e1e875-f064-4f29-ab11-2d784ff7b6a5","name":"90e1e875-f064-4f29-ab11-2d784ff7b6a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3bfb1a68-d8d5-4eb4-818b-67979dcc8f38","name":"3bfb1a68-d8d5-4eb4-818b-67979dcc8f38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cc7f4a26-46c8-4137-90ff-52f0a474323b","name":"cc7f4a26-46c8-4137-90ff-52f0a474323b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c3b365d2-f0c9-4b82-8668-a1a14f3a9ff8","name":"c3b365d2-f0c9-4b82-8668-a1a14f3a9ff8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2654f12c-02e1-44c3-9902-4fea338cc91d","name":"2654f12c-02e1-44c3-9902-4fea338cc91d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74ba2eae-27b1-4937-af8b-a963929d1dc7","name":"74ba2eae-27b1-4937-af8b-a963929d1dc7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8887d72-3dff-4109-9420-cbb8d7e93dc3","name":"e8887d72-3dff-4109-9420-cbb8d7e93dc3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"68deea30-4635-4fca-bfcb-c630cdf2ee48","name":"68deea30-4635-4fca-bfcb-c630cdf2ee48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"941bdb8d-1fd3-47c3-80fd-e60cadd36344","name":"941bdb8d-1fd3-47c3-80fd-e60cadd36344","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f952ea3-eaaa-4446-935d-8de3733d898f","name":"1f952ea3-eaaa-4446-935d-8de3733d898f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4e33722-8245-4eb1-a2dc-8c71c2dde44b","name":"f4e33722-8245-4eb1-a2dc-8c71c2dde44b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"045820a2-27c8-4a17-9860-ed379673f5f8","name":"045820a2-27c8-4a17-9860-ed379673f5f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e2b012c-2123-414b-b3f2-3b91c062e3d8","name":"8e2b012c-2123-414b-b3f2-3b91c062e3d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d2bb8428-0e2e-40c3-97d5-36f938701f6e","name":"d2bb8428-0e2e-40c3-97d5-36f938701f6e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c227c5fc-e20f-4a40-a4df-15d58e99e0b6","name":"c227c5fc-e20f-4a40-a4df-15d58e99e0b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"972c5fb8-c64d-4f45-ab78-e01aa6f532e2","name":"972c5fb8-c64d-4f45-ab78-e01aa6f532e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b9fc0b41-f1ab-489a-88ea-11a8bf17698a","name":"b9fc0b41-f1ab-489a-88ea-11a8bf17698a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90e1e875-f064-4f29-ab11-2d784ff7b6a5","name":"90e1e875-f064-4f29-ab11-2d784ff7b6a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3bfb1a68-d8d5-4eb4-818b-67979dcc8f38","name":"3bfb1a68-d8d5-4eb4-818b-67979dcc8f38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cc7f4a26-46c8-4137-90ff-52f0a474323b","name":"cc7f4a26-46c8-4137-90ff-52f0a474323b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c3b365d2-f0c9-4b82-8668-a1a14f3a9ff8","name":"c3b365d2-f0c9-4b82-8668-a1a14f3a9ff8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2654f12c-02e1-44c3-9902-4fea338cc91d","name":"2654f12c-02e1-44c3-9902-4fea338cc91d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74ba2eae-27b1-4937-af8b-a963929d1dc7","name":"74ba2eae-27b1-4937-af8b-a963929d1dc7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8887d72-3dff-4109-9420-cbb8d7e93dc3","name":"e8887d72-3dff-4109-9420-cbb8d7e93dc3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"68deea30-4635-4fca-bfcb-c630cdf2ee48","name":"68deea30-4635-4fca-bfcb-c630cdf2ee48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"941bdb8d-1fd3-47c3-80fd-e60cadd36344","name":"941bdb8d-1fd3-47c3-80fd-e60cadd36344","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f952ea3-eaaa-4446-935d-8de3733d898f","name":"1f952ea3-eaaa-4446-935d-8de3733d898f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4e33722-8245-4eb1-a2dc-8c71c2dde44b","name":"f4e33722-8245-4eb1-a2dc-8c71c2dde44b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"045820a2-27c8-4a17-9860-ed379673f5f8","name":"045820a2-27c8-4a17-9860-ed379673f5f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e2b012c-2123-414b-b3f2-3b91c062e3d8","name":"8e2b012c-2123-414b-b3f2-3b91c062e3d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d2bb8428-0e2e-40c3-97d5-36f938701f6e","name":"d2bb8428-0e2e-40c3-97d5-36f938701f6e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c227c5fc-e20f-4a40-a4df-15d58e99e0b6","name":"c227c5fc-e20f-4a40-a4df-15d58e99e0b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"972c5fb8-c64d-4f45-ab78-e01aa6f532e2","name":"972c5fb8-c64d-4f45-ab78-e01aa6f532e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b9fc0b41-f1ab-489a-88ea-11a8bf17698a","name":"b9fc0b41-f1ab-489a-88ea-11a8bf17698a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90e1e875-f064-4f29-ab11-2d784ff7b6a5","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"791b0399-0529-41db-837e-2956828ca90b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bfb1a68-d8d5-4eb4-818b-67979dcc8f38","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c0b9fa42-7067-4a16-81cc-3f210c3c2676","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cc7f4a26-46c8-4137-90ff-52f0a474323b","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd5ff78c-1e07-4b5a-8732-b18dffba7d50","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3b365d2-f0c9-4b82-8668-a1a14f3a9ff8","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f39d291-581a-4340-9f54-230ecdf3c0bd","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2654f12c-02e1-44c3-9902-4fea338cc91d","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"255720a5-147d-4039-b072-2c4e4b4d0b32","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74ba2eae-27b1-4937-af8b-a963929d1dc7","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d771123e-76c3-4acf-aac8-cc7b6409a83d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8887d72-3dff-4109-9420-cbb8d7e93dc3","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"59118366-e90b-41ca-91af-b8618a336f0b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"68deea30-4635-4fca-bfcb-c630cdf2ee48","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41220da6-5d68-484c-8b2a-a0388b76c77f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"941bdb8d-1fd3-47c3-80fd-e60cadd36344","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0abe53ee-c1c9-4253-8978-f1d051c031b6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f952ea3-eaaa-4446-935d-8de3733d898f","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bcf64e1d-590e-41bb-87b2-4c79d4a9f895","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4e33722-8245-4eb1-a2dc-8c71c2dde44b","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1841081d-3a92-4307-9db8-fb088ed65cc0","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"045820a2-27c8-4a17-9860-ed379673f5f8","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1bf2917b-f8eb-4fd8-934b-9f8a1abc5f7b","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e2b012c-2123-414b-b3f2-3b91c062e3d8","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"becb79e7-b8c1-4d16-94a5-89ac8fe8979c","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2bb8428-0e2e-40c3-97d5-36f938701f6e","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cfdabb68-ba40-430e-8592-c01b9cad91aa","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c227c5fc-e20f-4a40-a4df-15d58e99e0b6","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ab92e60-55c3-4950-b118-8083482f48c9","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"972c5fb8-c64d-4f45-ab78-e01aa6f532e2","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"873c8618-4057-4d64-bbee-574285f38f6a","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9fc0b41-f1ab-489a-88ea-11a8bf17698a","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a302f0b2-b45a-46cc-93ed-04b24e2a1c90","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90e1e875-f064-4f29-ab11-2d784ff7b6a5","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"791b0399-0529-41db-837e-2956828ca90b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bfb1a68-d8d5-4eb4-818b-67979dcc8f38","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c0b9fa42-7067-4a16-81cc-3f210c3c2676","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cc7f4a26-46c8-4137-90ff-52f0a474323b","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd5ff78c-1e07-4b5a-8732-b18dffba7d50","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3b365d2-f0c9-4b82-8668-a1a14f3a9ff8","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f39d291-581a-4340-9f54-230ecdf3c0bd","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2654f12c-02e1-44c3-9902-4fea338cc91d","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"255720a5-147d-4039-b072-2c4e4b4d0b32","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74ba2eae-27b1-4937-af8b-a963929d1dc7","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d771123e-76c3-4acf-aac8-cc7b6409a83d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8887d72-3dff-4109-9420-cbb8d7e93dc3","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"59118366-e90b-41ca-91af-b8618a336f0b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"68deea30-4635-4fca-bfcb-c630cdf2ee48","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41220da6-5d68-484c-8b2a-a0388b76c77f","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"941bdb8d-1fd3-47c3-80fd-e60cadd36344","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0abe53ee-c1c9-4253-8978-f1d051c031b6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f952ea3-eaaa-4446-935d-8de3733d898f","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bcf64e1d-590e-41bb-87b2-4c79d4a9f895","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4e33722-8245-4eb1-a2dc-8c71c2dde44b","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1841081d-3a92-4307-9db8-fb088ed65cc0","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"045820a2-27c8-4a17-9860-ed379673f5f8","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1bf2917b-f8eb-4fd8-934b-9f8a1abc5f7b","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e2b012c-2123-414b-b3f2-3b91c062e3d8","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"becb79e7-b8c1-4d16-94a5-89ac8fe8979c","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2bb8428-0e2e-40c3-97d5-36f938701f6e","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cfdabb68-ba40-430e-8592-c01b9cad91aa","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c227c5fc-e20f-4a40-a4df-15d58e99e0b6","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ab92e60-55c3-4950-b118-8083482f48c9","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"972c5fb8-c64d-4f45-ab78-e01aa6f532e2","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"873c8618-4057-4d64-bbee-574285f38f6a","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9fc0b41-f1ab-489a-88ea-11a8bf17698a","path":"sprites/spr_mar_walk_body1/spr_mar_walk_body1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a302f0b2-b45a-46cc-93ed-04b24e2a1c90","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy b/sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy index 3effa2e49f..5fd0bf7a17 100644 --- a/sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy +++ b/sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_body2", "bboxMode":0, "bbox_bottom":23, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"467523c5-1041-45cb-8d64-8e6050ce3f09","name":"467523c5-1041-45cb-8d64-8e6050ce3f09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"066b0a13-b2c6-4823-bfa8-30d2732a2fc8","name":"066b0a13-b2c6-4823-bfa8-30d2732a2fc8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b12ffb2d-a3d9-4847-9ead-c0e7bf24a7a5","name":"b12ffb2d-a3d9-4847-9ead-c0e7bf24a7a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"27894834-ac2a-4345-b497-a51d1bf8ccf2","name":"27894834-ac2a-4345-b497-a51d1bf8ccf2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c00bec42-7e5f-4a1c-b625-a0a53066e6e2","name":"c00bec42-7e5f-4a1c-b625-a0a53066e6e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b4c963d0-b475-4267-a887-fc3e016a2222","name":"b4c963d0-b475-4267-a887-fc3e016a2222","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"25a47dbf-754a-4a39-a8b9-f8913277ec00","name":"25a47dbf-754a-4a39-a8b9-f8913277ec00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"50e9196c-59b5-4c30-aa86-fd9f37ccd7a3","name":"50e9196c-59b5-4c30-aa86-fd9f37ccd7a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ad6b9726-05d8-443a-a232-84859891d411","name":"ad6b9726-05d8-443a-a232-84859891d411","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1e481ea8-380e-441c-a6fa-d59987014d25","name":"1e481ea8-380e-441c-a6fa-d59987014d25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4387a9e7-f250-4afe-9e45-d3ad3d4f86d7","name":"4387a9e7-f250-4afe-9e45-d3ad3d4f86d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b60ae3f9-a3b1-4e65-b222-ec853bc9fa0d","name":"b60ae3f9-a3b1-4e65-b222-ec853bc9fa0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7150c51c-937d-47d1-b5d2-7f3a3b82f5c5","name":"7150c51c-937d-47d1-b5d2-7f3a3b82f5c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"180a201d-8a4c-4ddc-b137-2fe7ff8a3f5c","name":"180a201d-8a4c-4ddc-b137-2fe7ff8a3f5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7e65cb8f-d2c1-40f8-87a0-880d3fb252ba","name":"7e65cb8f-d2c1-40f8-87a0-880d3fb252ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"07e2c5b6-a398-42be-8d89-87492926392c","name":"07e2c5b6-a398-42be-8d89-87492926392c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03f517fd-fe76-4a54-9034-88e734e84398","name":"03f517fd-fe76-4a54-9034-88e734e84398","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"467523c5-1041-45cb-8d64-8e6050ce3f09","name":"467523c5-1041-45cb-8d64-8e6050ce3f09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"066b0a13-b2c6-4823-bfa8-30d2732a2fc8","name":"066b0a13-b2c6-4823-bfa8-30d2732a2fc8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b12ffb2d-a3d9-4847-9ead-c0e7bf24a7a5","name":"b12ffb2d-a3d9-4847-9ead-c0e7bf24a7a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"27894834-ac2a-4345-b497-a51d1bf8ccf2","name":"27894834-ac2a-4345-b497-a51d1bf8ccf2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c00bec42-7e5f-4a1c-b625-a0a53066e6e2","name":"c00bec42-7e5f-4a1c-b625-a0a53066e6e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b4c963d0-b475-4267-a887-fc3e016a2222","name":"b4c963d0-b475-4267-a887-fc3e016a2222","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25a47dbf-754a-4a39-a8b9-f8913277ec00","name":"25a47dbf-754a-4a39-a8b9-f8913277ec00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"50e9196c-59b5-4c30-aa86-fd9f37ccd7a3","name":"50e9196c-59b5-4c30-aa86-fd9f37ccd7a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ad6b9726-05d8-443a-a232-84859891d411","name":"ad6b9726-05d8-443a-a232-84859891d411","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1e481ea8-380e-441c-a6fa-d59987014d25","name":"1e481ea8-380e-441c-a6fa-d59987014d25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4387a9e7-f250-4afe-9e45-d3ad3d4f86d7","name":"4387a9e7-f250-4afe-9e45-d3ad3d4f86d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b60ae3f9-a3b1-4e65-b222-ec853bc9fa0d","name":"b60ae3f9-a3b1-4e65-b222-ec853bc9fa0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7150c51c-937d-47d1-b5d2-7f3a3b82f5c5","name":"7150c51c-937d-47d1-b5d2-7f3a3b82f5c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"180a201d-8a4c-4ddc-b137-2fe7ff8a3f5c","name":"180a201d-8a4c-4ddc-b137-2fe7ff8a3f5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7e65cb8f-d2c1-40f8-87a0-880d3fb252ba","name":"7e65cb8f-d2c1-40f8-87a0-880d3fb252ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07e2c5b6-a398-42be-8d89-87492926392c","name":"07e2c5b6-a398-42be-8d89-87492926392c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03f517fd-fe76-4a54-9034-88e734e84398","name":"03f517fd-fe76-4a54-9034-88e734e84398","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"467523c5-1041-45cb-8d64-8e6050ce3f09","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b0262acb-01f2-4d60-8e20-519e5aa4ce08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"066b0a13-b2c6-4823-bfa8-30d2732a2fc8","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b1ae5075-5aa6-4bb0-bbde-3ce85ea507b0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b12ffb2d-a3d9-4847-9ead-c0e7bf24a7a5","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"afbce28b-935f-4730-bbaf-f35fb81bb939","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"27894834-ac2a-4345-b497-a51d1bf8ccf2","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e825447b-2c95-4607-961b-fdbd4a7ae13a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c00bec42-7e5f-4a1c-b625-a0a53066e6e2","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fba64b1a-a025-46ec-b972-94378c3f43e7","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4c963d0-b475-4267-a887-fc3e016a2222","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8911da3b-6ace-4ff9-989d-29ea04ef059b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25a47dbf-754a-4a39-a8b9-f8913277ec00","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69b19c6c-3dd2-4e84-ad02-d854a1f0e1fa","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"50e9196c-59b5-4c30-aa86-fd9f37ccd7a3","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f440ed57-94c4-434c-9d3a-6b0dadef08c1","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ad6b9726-05d8-443a-a232-84859891d411","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"456edfe0-ed8d-478f-bb52-350f549f5092","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1e481ea8-380e-441c-a6fa-d59987014d25","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38444669-8149-410f-a484-ee6ad3f63841","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4387a9e7-f250-4afe-9e45-d3ad3d4f86d7","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d666dea7-f511-4d8f-bb0f-2db6629ea19d","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b60ae3f9-a3b1-4e65-b222-ec853bc9fa0d","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8b0c450-d879-435f-a9c5-f36600252da2","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7150c51c-937d-47d1-b5d2-7f3a3b82f5c5","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2577d053-353b-45c4-970a-4b9598c0e571","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"180a201d-8a4c-4ddc-b137-2fe7ff8a3f5c","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9f90e72f-15e1-441b-a3f4-ec59294cf95c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e65cb8f-d2c1-40f8-87a0-880d3fb252ba","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"274498ff-9483-4279-a711-6486069cabf3","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07e2c5b6-a398-42be-8d89-87492926392c","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90e0ce56-5b21-478f-810a-e1dc998b0a80","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03f517fd-fe76-4a54-9034-88e734e84398","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"098a5439-72b0-4a86-a7e2-83a6aa6b7031","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"467523c5-1041-45cb-8d64-8e6050ce3f09","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b0262acb-01f2-4d60-8e20-519e5aa4ce08","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"066b0a13-b2c6-4823-bfa8-30d2732a2fc8","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b1ae5075-5aa6-4bb0-bbde-3ce85ea507b0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b12ffb2d-a3d9-4847-9ead-c0e7bf24a7a5","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"afbce28b-935f-4730-bbaf-f35fb81bb939","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"27894834-ac2a-4345-b497-a51d1bf8ccf2","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e825447b-2c95-4607-961b-fdbd4a7ae13a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c00bec42-7e5f-4a1c-b625-a0a53066e6e2","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fba64b1a-a025-46ec-b972-94378c3f43e7","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b4c963d0-b475-4267-a887-fc3e016a2222","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8911da3b-6ace-4ff9-989d-29ea04ef059b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25a47dbf-754a-4a39-a8b9-f8913277ec00","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69b19c6c-3dd2-4e84-ad02-d854a1f0e1fa","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"50e9196c-59b5-4c30-aa86-fd9f37ccd7a3","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f440ed57-94c4-434c-9d3a-6b0dadef08c1","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ad6b9726-05d8-443a-a232-84859891d411","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"456edfe0-ed8d-478f-bb52-350f549f5092","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1e481ea8-380e-441c-a6fa-d59987014d25","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38444669-8149-410f-a484-ee6ad3f63841","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4387a9e7-f250-4afe-9e45-d3ad3d4f86d7","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d666dea7-f511-4d8f-bb0f-2db6629ea19d","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b60ae3f9-a3b1-4e65-b222-ec853bc9fa0d","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8b0c450-d879-435f-a9c5-f36600252da2","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7150c51c-937d-47d1-b5d2-7f3a3b82f5c5","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2577d053-353b-45c4-970a-4b9598c0e571","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"180a201d-8a4c-4ddc-b137-2fe7ff8a3f5c","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f90e72f-15e1-441b-a3f4-ec59294cf95c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e65cb8f-d2c1-40f8-87a0-880d3fb252ba","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"274498ff-9483-4279-a711-6486069cabf3","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07e2c5b6-a398-42be-8d89-87492926392c","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90e0ce56-5b21-478f-810a-e1dc998b0a80","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03f517fd-fe76-4a54-9034-88e734e84398","path":"sprites/spr_mar_walk_body2/spr_mar_walk_body2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"098a5439-72b0-4a86-a7e2-83a6aa6b7031","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy b/sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy index c3ddbf4c5e..14260bc3b3 100644 --- a/sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy +++ b/sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_body3", "bboxMode":0, "bbox_bottom":23, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"52144d87-ab6a-4acd-aa23-3251a5059ea8","name":"52144d87-ab6a-4acd-aa23-3251a5059ea8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b7d8cbac-4aa1-462a-b0c6-e7959c4a341d","name":"b7d8cbac-4aa1-462a-b0c6-e7959c4a341d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"236377e1-ced1-4636-91b5-c4af681da3ea","name":"236377e1-ced1-4636-91b5-c4af681da3ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"89d88cfe-6a4c-4f9b-941b-36e2f6852712","name":"89d88cfe-6a4c-4f9b-941b-36e2f6852712","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"154a1029-63af-4304-a7b4-37deec6d4299","name":"154a1029-63af-4304-a7b4-37deec6d4299","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ce0b271d-a10b-48f0-8dcb-1840947bd9a0","name":"ce0b271d-a10b-48f0-8dcb-1840947bd9a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72ec45fe-9568-407e-a51b-0b33ebd671fd","name":"72ec45fe-9568-407e-a51b-0b33ebd671fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e819277b-fad6-4235-8163-e3845f10510b","name":"e819277b-fad6-4235-8163-e3845f10510b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1096a6c5-b038-4de2-89c2-433a93cc549c","name":"1096a6c5-b038-4de2-89c2-433a93cc549c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dd421efe-30e3-483c-b66e-3c3a77ed7651","name":"dd421efe-30e3-483c-b66e-3c3a77ed7651","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fc9837a8-68a4-4105-a0cf-1d51c03d9303","name":"fc9837a8-68a4-4105-a0cf-1d51c03d9303","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2d5e6037-56eb-4229-be25-821d2746541b","name":"2d5e6037-56eb-4229-be25-821d2746541b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc4f5f09-2786-4121-9883-f0a81ff1c633","name":"bc4f5f09-2786-4121-9883-f0a81ff1c633","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ab22c645-65eb-4850-92bb-4dc1efd37598","name":"ab22c645-65eb-4850-92bb-4dc1efd37598","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fa7d2cc9-0fb3-4def-a4d9-b9890e0320ad","name":"fa7d2cc9-0fb3-4def-a4d9-b9890e0320ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"acf9bd95-2d1e-44b7-943e-acd686b267d6","name":"acf9bd95-2d1e-44b7-943e-acd686b267d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ef994322-3af5-469a-a31a-e766754c6852","name":"ef994322-3af5-469a-a31a-e766754c6852","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52144d87-ab6a-4acd-aa23-3251a5059ea8","name":"52144d87-ab6a-4acd-aa23-3251a5059ea8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b7d8cbac-4aa1-462a-b0c6-e7959c4a341d","name":"b7d8cbac-4aa1-462a-b0c6-e7959c4a341d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"236377e1-ced1-4636-91b5-c4af681da3ea","name":"236377e1-ced1-4636-91b5-c4af681da3ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89d88cfe-6a4c-4f9b-941b-36e2f6852712","name":"89d88cfe-6a4c-4f9b-941b-36e2f6852712","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"154a1029-63af-4304-a7b4-37deec6d4299","name":"154a1029-63af-4304-a7b4-37deec6d4299","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce0b271d-a10b-48f0-8dcb-1840947bd9a0","name":"ce0b271d-a10b-48f0-8dcb-1840947bd9a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72ec45fe-9568-407e-a51b-0b33ebd671fd","name":"72ec45fe-9568-407e-a51b-0b33ebd671fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e819277b-fad6-4235-8163-e3845f10510b","name":"e819277b-fad6-4235-8163-e3845f10510b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1096a6c5-b038-4de2-89c2-433a93cc549c","name":"1096a6c5-b038-4de2-89c2-433a93cc549c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd421efe-30e3-483c-b66e-3c3a77ed7651","name":"dd421efe-30e3-483c-b66e-3c3a77ed7651","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fc9837a8-68a4-4105-a0cf-1d51c03d9303","name":"fc9837a8-68a4-4105-a0cf-1d51c03d9303","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2d5e6037-56eb-4229-be25-821d2746541b","name":"2d5e6037-56eb-4229-be25-821d2746541b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc4f5f09-2786-4121-9883-f0a81ff1c633","name":"bc4f5f09-2786-4121-9883-f0a81ff1c633","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ab22c645-65eb-4850-92bb-4dc1efd37598","name":"ab22c645-65eb-4850-92bb-4dc1efd37598","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fa7d2cc9-0fb3-4def-a4d9-b9890e0320ad","name":"fa7d2cc9-0fb3-4def-a4d9-b9890e0320ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"acf9bd95-2d1e-44b7-943e-acd686b267d6","name":"acf9bd95-2d1e-44b7-943e-acd686b267d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ef994322-3af5-469a-a31a-e766754c6852","name":"ef994322-3af5-469a-a31a-e766754c6852","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52144d87-ab6a-4acd-aa23-3251a5059ea8","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e91e7fb6-71d4-42ae-b53d-a55af28ded7a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7d8cbac-4aa1-462a-b0c6-e7959c4a341d","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1cb9cdb0-422f-4a9f-a3d1-77ec0ed9ca5c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"236377e1-ced1-4636-91b5-c4af681da3ea","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ffcc3b7f-e557-43b8-9e97-6b72dae68ce9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89d88cfe-6a4c-4f9b-941b-36e2f6852712","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2274549d-7845-451b-b683-65c8ef433e34","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"154a1029-63af-4304-a7b4-37deec6d4299","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9b9b332c-bb9d-401e-a3d5-57368a0eeadc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce0b271d-a10b-48f0-8dcb-1840947bd9a0","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7705b38b-35a6-4a6a-834b-074c782ee423","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72ec45fe-9568-407e-a51b-0b33ebd671fd","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"99448237-30a9-4675-85b1-ce634aac94b3","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e819277b-fad6-4235-8163-e3845f10510b","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0d2f2819-906e-4896-9c2c-e74970a820fb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1096a6c5-b038-4de2-89c2-433a93cc549c","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf60c901-315c-4470-acb5-022272e954b2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd421efe-30e3-483c-b66e-3c3a77ed7651","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7586d567-a3e5-40f3-9306-8ae1475893c4","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc9837a8-68a4-4105-a0cf-1d51c03d9303","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec7fa86f-5973-4c36-a6cc-3e59b4319c59","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d5e6037-56eb-4229-be25-821d2746541b","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d45813a0-3a85-4499-9846-85b5bf859820","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc4f5f09-2786-4121-9883-f0a81ff1c633","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7cfab11f-c45c-4333-b5f0-24e3ecd0b7ee","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab22c645-65eb-4850-92bb-4dc1efd37598","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9243bd4-5d21-4b7c-b38e-eb6c1dce5a9b","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa7d2cc9-0fb3-4def-a4d9-b9890e0320ad","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0335e729-472f-4df9-9359-371794cf03cd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"acf9bd95-2d1e-44b7-943e-acd686b267d6","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1379ab9e-d061-40dc-8ad0-8e6b21df5fa5","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef994322-3af5-469a-a31a-e766754c6852","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"83adbcc0-9d56-40f3-8993-2f72d1940009","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52144d87-ab6a-4acd-aa23-3251a5059ea8","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e91e7fb6-71d4-42ae-b53d-a55af28ded7a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7d8cbac-4aa1-462a-b0c6-e7959c4a341d","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1cb9cdb0-422f-4a9f-a3d1-77ec0ed9ca5c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"236377e1-ced1-4636-91b5-c4af681da3ea","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ffcc3b7f-e557-43b8-9e97-6b72dae68ce9","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89d88cfe-6a4c-4f9b-941b-36e2f6852712","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2274549d-7845-451b-b683-65c8ef433e34","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"154a1029-63af-4304-a7b4-37deec6d4299","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9b9b332c-bb9d-401e-a3d5-57368a0eeadc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce0b271d-a10b-48f0-8dcb-1840947bd9a0","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7705b38b-35a6-4a6a-834b-074c782ee423","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72ec45fe-9568-407e-a51b-0b33ebd671fd","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"99448237-30a9-4675-85b1-ce634aac94b3","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e819277b-fad6-4235-8163-e3845f10510b","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0d2f2819-906e-4896-9c2c-e74970a820fb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1096a6c5-b038-4de2-89c2-433a93cc549c","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf60c901-315c-4470-acb5-022272e954b2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd421efe-30e3-483c-b66e-3c3a77ed7651","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7586d567-a3e5-40f3-9306-8ae1475893c4","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc9837a8-68a4-4105-a0cf-1d51c03d9303","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec7fa86f-5973-4c36-a6cc-3e59b4319c59","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d5e6037-56eb-4229-be25-821d2746541b","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d45813a0-3a85-4499-9846-85b5bf859820","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc4f5f09-2786-4121-9883-f0a81ff1c633","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7cfab11f-c45c-4333-b5f0-24e3ecd0b7ee","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab22c645-65eb-4850-92bb-4dc1efd37598","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9243bd4-5d21-4b7c-b38e-eb6c1dce5a9b","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa7d2cc9-0fb3-4def-a4d9-b9890e0320ad","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0335e729-472f-4df9-9359-371794cf03cd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"acf9bd95-2d1e-44b7-943e-acd686b267d6","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1379ab9e-d061-40dc-8ad0-8e6b21df5fa5","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef994322-3af5-469a-a31a-e766754c6852","path":"sprites/spr_mar_walk_body3/spr_mar_walk_body3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"83adbcc0-9d56-40f3-8993-2f72d1940009","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy b/sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy index bd0e0ccad0..12e353fd7a 100644 --- a/sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy +++ b/sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_legs1", "bboxMode":0, "bbox_bottom":37, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c2f036ba-6dfb-46d7-a569-361317d930eb","name":"c2f036ba-6dfb-46d7-a569-361317d930eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f6dd5d91-65e5-40a4-b1aa-9c7cdb777295","name":"f6dd5d91-65e5-40a4-b1aa-9c7cdb777295","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eb2af642-9022-4f21-9660-2703755609ea","name":"eb2af642-9022-4f21-9660-2703755609ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"965fff3f-1783-457c-9393-a03c1931ae10","name":"965fff3f-1783-457c-9393-a03c1931ae10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8a371f7-4ee6-4a35-b2f2-727706fe163f","name":"e8a371f7-4ee6-4a35-b2f2-727706fe163f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dbee7f5e-5160-403d-8567-5df73e765eeb","name":"dbee7f5e-5160-403d-8567-5df73e765eeb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"22a707ef-ff83-495a-abec-8ad9dd05f3fb","name":"22a707ef-ff83-495a-abec-8ad9dd05f3fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8744b640-716d-4d4e-9513-00e317357df6","name":"8744b640-716d-4d4e-9513-00e317357df6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"645ae09e-fcf3-446f-b807-fb00205d8f87","name":"645ae09e-fcf3-446f-b807-fb00205d8f87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"997f6c7b-e898-4e66-b59b-772d60f0c829","name":"997f6c7b-e898-4e66-b59b-772d60f0c829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca07ac06-7e66-46ab-b936-a7e43bbdfeaa","name":"ca07ac06-7e66-46ab-b936-a7e43bbdfeaa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"638ce1cd-1072-4d30-aaea-22b9b132a7c0","name":"638ce1cd-1072-4d30-aaea-22b9b132a7c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ce1449fa-495c-4d39-8e55-6cacd176f505","name":"ce1449fa-495c-4d39-8e55-6cacd176f505","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5490e1ed-6181-4153-b10e-fdec7a84b36e","name":"5490e1ed-6181-4153-b10e-fdec7a84b36e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f8b3a70-e22f-43f6-9c7d-f556befc9055","name":"4f8b3a70-e22f-43f6-9c7d-f556befc9055","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c060e23e-b430-4136-a4c6-0e97db7a4a3e","name":"c060e23e-b430-4136-a4c6-0e97db7a4a3e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"944eafd1-f8f9-43e7-9123-47a3efe9740b","name":"944eafd1-f8f9-43e7-9123-47a3efe9740b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c2f036ba-6dfb-46d7-a569-361317d930eb","name":"c2f036ba-6dfb-46d7-a569-361317d930eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f6dd5d91-65e5-40a4-b1aa-9c7cdb777295","name":"f6dd5d91-65e5-40a4-b1aa-9c7cdb777295","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eb2af642-9022-4f21-9660-2703755609ea","name":"eb2af642-9022-4f21-9660-2703755609ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"965fff3f-1783-457c-9393-a03c1931ae10","name":"965fff3f-1783-457c-9393-a03c1931ae10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8a371f7-4ee6-4a35-b2f2-727706fe163f","name":"e8a371f7-4ee6-4a35-b2f2-727706fe163f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbee7f5e-5160-403d-8567-5df73e765eeb","name":"dbee7f5e-5160-403d-8567-5df73e765eeb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"22a707ef-ff83-495a-abec-8ad9dd05f3fb","name":"22a707ef-ff83-495a-abec-8ad9dd05f3fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8744b640-716d-4d4e-9513-00e317357df6","name":"8744b640-716d-4d4e-9513-00e317357df6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"645ae09e-fcf3-446f-b807-fb00205d8f87","name":"645ae09e-fcf3-446f-b807-fb00205d8f87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"997f6c7b-e898-4e66-b59b-772d60f0c829","name":"997f6c7b-e898-4e66-b59b-772d60f0c829","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca07ac06-7e66-46ab-b936-a7e43bbdfeaa","name":"ca07ac06-7e66-46ab-b936-a7e43bbdfeaa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"638ce1cd-1072-4d30-aaea-22b9b132a7c0","name":"638ce1cd-1072-4d30-aaea-22b9b132a7c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce1449fa-495c-4d39-8e55-6cacd176f505","name":"ce1449fa-495c-4d39-8e55-6cacd176f505","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5490e1ed-6181-4153-b10e-fdec7a84b36e","name":"5490e1ed-6181-4153-b10e-fdec7a84b36e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f8b3a70-e22f-43f6-9c7d-f556befc9055","name":"4f8b3a70-e22f-43f6-9c7d-f556befc9055","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c060e23e-b430-4136-a4c6-0e97db7a4a3e","name":"c060e23e-b430-4136-a4c6-0e97db7a4a3e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"944eafd1-f8f9-43e7-9123-47a3efe9740b","name":"944eafd1-f8f9-43e7-9123-47a3efe9740b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2f036ba-6dfb-46d7-a569-361317d930eb","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d86851b-e1a3-4ea1-bfe8-0919044ab423","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6dd5d91-65e5-40a4-b1aa-9c7cdb777295","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"48ae85a6-c68a-48bb-9db1-c096d55ba89c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb2af642-9022-4f21-9660-2703755609ea","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2d2c23a-91ed-42db-a4bb-f16713dbfa78","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"965fff3f-1783-457c-9393-a03c1931ae10","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a474b0a-54b5-45c3-a003-d6f081a47d7b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8a371f7-4ee6-4a35-b2f2-727706fe163f","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5db78d0d-8574-4432-832c-6955a66a38ee","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbee7f5e-5160-403d-8567-5df73e765eeb","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4659ea85-ef68-4926-9b35-467ce96ac92a","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22a707ef-ff83-495a-abec-8ad9dd05f3fb","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6127d529-6bda-4910-b02e-f81da044e691","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8744b640-716d-4d4e-9513-00e317357df6","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8a31b1a1-1c0d-45f8-aee5-0dcb5e172678","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"645ae09e-fcf3-446f-b807-fb00205d8f87","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3de86e30-d61f-4d67-a64f-eb2735ecd72b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"997f6c7b-e898-4e66-b59b-772d60f0c829","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f3b7675-e2b5-4c75-b351-755181189d6d","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca07ac06-7e66-46ab-b936-a7e43bbdfeaa","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f70e9054-b6a8-4239-be1e-6f151eb25910","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"638ce1cd-1072-4d30-aaea-22b9b132a7c0","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"72666edf-3d1a-4a45-be71-ab09a846bc90","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce1449fa-495c-4d39-8e55-6cacd176f505","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5876e088-9df4-4a21-a80b-5d3ddf9f62d2","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5490e1ed-6181-4153-b10e-fdec7a84b36e","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21965edc-adc9-4724-9bf6-af11c62d9522","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f8b3a70-e22f-43f6-9c7d-f556befc9055","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75f5f4a1-d044-4b4b-889f-0d3c3d031d51","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c060e23e-b430-4136-a4c6-0e97db7a4a3e","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"73127f5d-2f5d-498b-a7d0-e8c19a17c2ed","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"944eafd1-f8f9-43e7-9123-47a3efe9740b","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54d73ba7-6b05-4f08-9a32-204eb788ec2c","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2f036ba-6dfb-46d7-a569-361317d930eb","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d86851b-e1a3-4ea1-bfe8-0919044ab423","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6dd5d91-65e5-40a4-b1aa-9c7cdb777295","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"48ae85a6-c68a-48bb-9db1-c096d55ba89c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb2af642-9022-4f21-9660-2703755609ea","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2d2c23a-91ed-42db-a4bb-f16713dbfa78","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"965fff3f-1783-457c-9393-a03c1931ae10","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a474b0a-54b5-45c3-a003-d6f081a47d7b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8a371f7-4ee6-4a35-b2f2-727706fe163f","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5db78d0d-8574-4432-832c-6955a66a38ee","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbee7f5e-5160-403d-8567-5df73e765eeb","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4659ea85-ef68-4926-9b35-467ce96ac92a","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"22a707ef-ff83-495a-abec-8ad9dd05f3fb","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6127d529-6bda-4910-b02e-f81da044e691","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8744b640-716d-4d4e-9513-00e317357df6","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8a31b1a1-1c0d-45f8-aee5-0dcb5e172678","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"645ae09e-fcf3-446f-b807-fb00205d8f87","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3de86e30-d61f-4d67-a64f-eb2735ecd72b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"997f6c7b-e898-4e66-b59b-772d60f0c829","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f3b7675-e2b5-4c75-b351-755181189d6d","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca07ac06-7e66-46ab-b936-a7e43bbdfeaa","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f70e9054-b6a8-4239-be1e-6f151eb25910","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"638ce1cd-1072-4d30-aaea-22b9b132a7c0","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"72666edf-3d1a-4a45-be71-ab09a846bc90","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce1449fa-495c-4d39-8e55-6cacd176f505","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5876e088-9df4-4a21-a80b-5d3ddf9f62d2","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5490e1ed-6181-4153-b10e-fdec7a84b36e","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21965edc-adc9-4724-9bf6-af11c62d9522","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f8b3a70-e22f-43f6-9c7d-f556befc9055","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75f5f4a1-d044-4b4b-889f-0d3c3d031d51","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c060e23e-b430-4136-a4c6-0e97db7a4a3e","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"73127f5d-2f5d-498b-a7d0-e8c19a17c2ed","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"944eafd1-f8f9-43e7-9123-47a3efe9740b","path":"sprites/spr_mar_walk_legs1/spr_mar_walk_legs1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54d73ba7-6b05-4f08-9a32-204eb788ec2c","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy b/sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy index 5d4aa560fa..45a6cf6a08 100644 --- a/sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy +++ b/sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_legs3", "bboxMode":0, "bbox_bottom":37, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1ce337ce-7d1c-4b5b-bf79-024ef178d7d9","name":"1ce337ce-7d1c-4b5b-bf79-024ef178d7d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c72cd2b-fccb-4c59-9d75-42a3c1a4e4e6","name":"2c72cd2b-fccb-4c59-9d75-42a3c1a4e4e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5b0a7bd9-06d5-402f-9246-50e2baf0b92c","name":"5b0a7bd9-06d5-402f-9246-50e2baf0b92c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5fa70dc1-d979-417b-8ef4-7aa9c0f0f58a","name":"5fa70dc1-d979-417b-8ef4-7aa9c0f0f58a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd70c167-7cc7-41ed-ae05-6bd2bf3b2d19","name":"cd70c167-7cc7-41ed-ae05-6bd2bf3b2d19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"77638842-d819-4373-8f3b-3d002b35dc20","name":"77638842-d819-4373-8f3b-3d002b35dc20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76f9eb70-2f86-41c2-ac22-a392c5f45b00","name":"76f9eb70-2f86-41c2-ac22-a392c5f45b00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b58c877-3ee4-4b95-b654-75568d548ab6","name":"3b58c877-3ee4-4b95-b654-75568d548ab6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dfaa01bc-0674-449b-9218-7f7b08913781","name":"dfaa01bc-0674-449b-9218-7f7b08913781","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3ae80d3d-77f3-47d8-927e-faf5be09b47f","name":"3ae80d3d-77f3-47d8-927e-faf5be09b47f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6f7cd542-f922-43ab-b933-251126717e95","name":"6f7cd542-f922-43ab-b933-251126717e95","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f9e90dda-a498-4844-bcb5-64cdd6d5ae5f","name":"f9e90dda-a498-4844-bcb5-64cdd6d5ae5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0b1bd3b4-9357-4aaa-b4ee-f86618c3d5ca","name":"0b1bd3b4-9357-4aaa-b4ee-f86618c3d5ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"57c33534-9b8a-4e50-9c46-cc1bf20d7abf","name":"57c33534-9b8a-4e50-9c46-cc1bf20d7abf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84e60c23-9d89-4831-b241-c08e4a5e6526","name":"84e60c23-9d89-4831-b241-c08e4a5e6526","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1305ebd8-1ec7-4311-aa0d-b4b80c847f55","name":"1305ebd8-1ec7-4311-aa0d-b4b80c847f55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b0dae561-f13a-4ead-8783-f71e946a49cc","name":"b0dae561-f13a-4ead-8783-f71e946a49cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ce337ce-7d1c-4b5b-bf79-024ef178d7d9","name":"1ce337ce-7d1c-4b5b-bf79-024ef178d7d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c72cd2b-fccb-4c59-9d75-42a3c1a4e4e6","name":"2c72cd2b-fccb-4c59-9d75-42a3c1a4e4e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5b0a7bd9-06d5-402f-9246-50e2baf0b92c","name":"5b0a7bd9-06d5-402f-9246-50e2baf0b92c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fa70dc1-d979-417b-8ef4-7aa9c0f0f58a","name":"5fa70dc1-d979-417b-8ef4-7aa9c0f0f58a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd70c167-7cc7-41ed-ae05-6bd2bf3b2d19","name":"cd70c167-7cc7-41ed-ae05-6bd2bf3b2d19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"77638842-d819-4373-8f3b-3d002b35dc20","name":"77638842-d819-4373-8f3b-3d002b35dc20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76f9eb70-2f86-41c2-ac22-a392c5f45b00","name":"76f9eb70-2f86-41c2-ac22-a392c5f45b00","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b58c877-3ee4-4b95-b654-75568d548ab6","name":"3b58c877-3ee4-4b95-b654-75568d548ab6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfaa01bc-0674-449b-9218-7f7b08913781","name":"dfaa01bc-0674-449b-9218-7f7b08913781","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3ae80d3d-77f3-47d8-927e-faf5be09b47f","name":"3ae80d3d-77f3-47d8-927e-faf5be09b47f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f7cd542-f922-43ab-b933-251126717e95","name":"6f7cd542-f922-43ab-b933-251126717e95","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9e90dda-a498-4844-bcb5-64cdd6d5ae5f","name":"f9e90dda-a498-4844-bcb5-64cdd6d5ae5f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0b1bd3b4-9357-4aaa-b4ee-f86618c3d5ca","name":"0b1bd3b4-9357-4aaa-b4ee-f86618c3d5ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"57c33534-9b8a-4e50-9c46-cc1bf20d7abf","name":"57c33534-9b8a-4e50-9c46-cc1bf20d7abf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84e60c23-9d89-4831-b241-c08e4a5e6526","name":"84e60c23-9d89-4831-b241-c08e4a5e6526","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1305ebd8-1ec7-4311-aa0d-b4b80c847f55","name":"1305ebd8-1ec7-4311-aa0d-b4b80c847f55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b0dae561-f13a-4ead-8783-f71e946a49cc","name":"b0dae561-f13a-4ead-8783-f71e946a49cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ce337ce-7d1c-4b5b-bf79-024ef178d7d9","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b1a483ed-5e77-43a9-96ce-4b62b867f7f1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c72cd2b-fccb-4c59-9d75-42a3c1a4e4e6","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9d70c72-6e46-4b96-af44-be960316171f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b0a7bd9-06d5-402f-9246-50e2baf0b92c","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2413b45c-cde3-45de-8133-b20d1f554433","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fa70dc1-d979-417b-8ef4-7aa9c0f0f58a","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d84cb2c-0ef8-4dc3-9125-45b73b65ee86","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd70c167-7cc7-41ed-ae05-6bd2bf3b2d19","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2ee9969-cd0d-45e5-a275-763e221414bd","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"77638842-d819-4373-8f3b-3d002b35dc20","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c795c091-a988-4ee9-a846-6caf8690562b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76f9eb70-2f86-41c2-ac22-a392c5f45b00","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24f9becf-c663-4005-a926-e0012f014c7e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b58c877-3ee4-4b95-b654-75568d548ab6","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3fbe6f0d-3484-4c62-92f7-d83878f4c6e5","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfaa01bc-0674-449b-9218-7f7b08913781","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d940cea-52b4-44e4-bd3d-884bd56cef01","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ae80d3d-77f3-47d8-927e-faf5be09b47f","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"42a0ac23-afdf-4805-93b2-51e900bb2b8a","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f7cd542-f922-43ab-b933-251126717e95","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e146ecd-2e8e-48de-b68c-0111dd0f1eab","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9e90dda-a498-4844-bcb5-64cdd6d5ae5f","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef155006-a64a-478f-a369-5a54bfaac69f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b1bd3b4-9357-4aaa-b4ee-f86618c3d5ca","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7894ac22-7768-481b-a050-2080121b1dc4","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57c33534-9b8a-4e50-9c46-cc1bf20d7abf","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d8b147c8-8847-4a5d-838a-7c1135823e8b","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84e60c23-9d89-4831-b241-c08e4a5e6526","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b0983887-af1d-4bc2-b1f4-cefc411c69c0","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1305ebd8-1ec7-4311-aa0d-b4b80c847f55","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5925805b-4db1-4b6e-a59a-6a21bfbaf0b1","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0dae561-f13a-4ead-8783-f71e946a49cc","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be39ee89-f754-490c-b725-3b6a703116e4","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ce337ce-7d1c-4b5b-bf79-024ef178d7d9","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b1a483ed-5e77-43a9-96ce-4b62b867f7f1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c72cd2b-fccb-4c59-9d75-42a3c1a4e4e6","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9d70c72-6e46-4b96-af44-be960316171f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b0a7bd9-06d5-402f-9246-50e2baf0b92c","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2413b45c-cde3-45de-8133-b20d1f554433","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fa70dc1-d979-417b-8ef4-7aa9c0f0f58a","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d84cb2c-0ef8-4dc3-9125-45b73b65ee86","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd70c167-7cc7-41ed-ae05-6bd2bf3b2d19","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2ee9969-cd0d-45e5-a275-763e221414bd","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"77638842-d819-4373-8f3b-3d002b35dc20","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c795c091-a988-4ee9-a846-6caf8690562b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76f9eb70-2f86-41c2-ac22-a392c5f45b00","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24f9becf-c663-4005-a926-e0012f014c7e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b58c877-3ee4-4b95-b654-75568d548ab6","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3fbe6f0d-3484-4c62-92f7-d83878f4c6e5","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfaa01bc-0674-449b-9218-7f7b08913781","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d940cea-52b4-44e4-bd3d-884bd56cef01","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3ae80d3d-77f3-47d8-927e-faf5be09b47f","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"42a0ac23-afdf-4805-93b2-51e900bb2b8a","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f7cd542-f922-43ab-b933-251126717e95","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e146ecd-2e8e-48de-b68c-0111dd0f1eab","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f9e90dda-a498-4844-bcb5-64cdd6d5ae5f","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef155006-a64a-478f-a369-5a54bfaac69f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b1bd3b4-9357-4aaa-b4ee-f86618c3d5ca","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7894ac22-7768-481b-a050-2080121b1dc4","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"57c33534-9b8a-4e50-9c46-cc1bf20d7abf","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d8b147c8-8847-4a5d-838a-7c1135823e8b","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84e60c23-9d89-4831-b241-c08e4a5e6526","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b0983887-af1d-4bc2-b1f4-cefc411c69c0","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1305ebd8-1ec7-4311-aa0d-b4b80c847f55","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5925805b-4db1-4b6e-a59a-6a21bfbaf0b1","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0dae561-f13a-4ead-8783-f71e946a49cc","path":"sprites/spr_mar_walk_legs3/spr_mar_walk_legs3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be39ee89-f754-490c-b725-3b6a703116e4","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy b/sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy index ceb25b5514..c3c0f105f7 100644 --- a/sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy +++ b/sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_legs4", "bboxMode":0, "bbox_bottom":37, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"caa00d1c-443e-49d6-941c-29529df71739","name":"caa00d1c-443e-49d6-941c-29529df71739","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"55e96122-72ec-459e-aca9-db53e3c08f8d","name":"55e96122-72ec-459e-aca9-db53e3c08f8d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5737f0b0-c620-45a9-9c93-b7fbcef6c4c8","name":"5737f0b0-c620-45a9-9c93-b7fbcef6c4c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"906b5068-61b4-4fe0-acbf-bc0d774aab2b","name":"906b5068-61b4-4fe0-acbf-bc0d774aab2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c04df1e1-5044-4f44-8b87-54c625d3f7c0","name":"c04df1e1-5044-4f44-8b87-54c625d3f7c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6607f421-d530-4ab4-b20d-ef4240becd9c","name":"6607f421-d530-4ab4-b20d-ef4240becd9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5d150cdd-95c4-45ea-80a7-0b34f49510b5","name":"5d150cdd-95c4-45ea-80a7-0b34f49510b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"17a776e8-c3ab-4411-ac50-0f2033957381","name":"17a776e8-c3ab-4411-ac50-0f2033957381","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5cf5656b-80b4-4aa6-b9c4-b38322a57112","name":"5cf5656b-80b4-4aa6-b9c4-b38322a57112","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9df407ba-5bda-401c-b27c-53eb9c7c2e16","name":"9df407ba-5bda-401c-b27c-53eb9c7c2e16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bbf95248-3480-4c61-8898-4ddc75a49628","name":"bbf95248-3480-4c61-8898-4ddc75a49628","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"877c1656-505c-4ca1-9c43-057e4cd76346","name":"877c1656-505c-4ca1-9c43-057e4cd76346","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8ab57e3-e2c2-401f-a63c-736b5fa231fd","name":"e8ab57e3-e2c2-401f-a63c-736b5fa231fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"09745b8e-9657-451a-8ce4-456d2eef61ac","name":"09745b8e-9657-451a-8ce4-456d2eef61ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"19d5a9c1-4f24-4826-8ffe-6b9f7e73cfaf","name":"19d5a9c1-4f24-4826-8ffe-6b9f7e73cfaf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"36361e69-53b7-40cf-905d-95b15eaf953b","name":"36361e69-53b7-40cf-905d-95b15eaf953b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b567b3e-977a-4dfa-a2af-e616f95663e6","name":"1b567b3e-977a-4dfa-a2af-e616f95663e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"caa00d1c-443e-49d6-941c-29529df71739","name":"caa00d1c-443e-49d6-941c-29529df71739","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"55e96122-72ec-459e-aca9-db53e3c08f8d","name":"55e96122-72ec-459e-aca9-db53e3c08f8d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5737f0b0-c620-45a9-9c93-b7fbcef6c4c8","name":"5737f0b0-c620-45a9-9c93-b7fbcef6c4c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"906b5068-61b4-4fe0-acbf-bc0d774aab2b","name":"906b5068-61b4-4fe0-acbf-bc0d774aab2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c04df1e1-5044-4f44-8b87-54c625d3f7c0","name":"c04df1e1-5044-4f44-8b87-54c625d3f7c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6607f421-d530-4ab4-b20d-ef4240becd9c","name":"6607f421-d530-4ab4-b20d-ef4240becd9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5d150cdd-95c4-45ea-80a7-0b34f49510b5","name":"5d150cdd-95c4-45ea-80a7-0b34f49510b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"17a776e8-c3ab-4411-ac50-0f2033957381","name":"17a776e8-c3ab-4411-ac50-0f2033957381","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5cf5656b-80b4-4aa6-b9c4-b38322a57112","name":"5cf5656b-80b4-4aa6-b9c4-b38322a57112","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9df407ba-5bda-401c-b27c-53eb9c7c2e16","name":"9df407ba-5bda-401c-b27c-53eb9c7c2e16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bbf95248-3480-4c61-8898-4ddc75a49628","name":"bbf95248-3480-4c61-8898-4ddc75a49628","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"877c1656-505c-4ca1-9c43-057e4cd76346","name":"877c1656-505c-4ca1-9c43-057e4cd76346","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8ab57e3-e2c2-401f-a63c-736b5fa231fd","name":"e8ab57e3-e2c2-401f-a63c-736b5fa231fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"09745b8e-9657-451a-8ce4-456d2eef61ac","name":"09745b8e-9657-451a-8ce4-456d2eef61ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"19d5a9c1-4f24-4826-8ffe-6b9f7e73cfaf","name":"19d5a9c1-4f24-4826-8ffe-6b9f7e73cfaf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"36361e69-53b7-40cf-905d-95b15eaf953b","name":"36361e69-53b7-40cf-905d-95b15eaf953b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b567b3e-977a-4dfa-a2af-e616f95663e6","name":"1b567b3e-977a-4dfa-a2af-e616f95663e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"caa00d1c-443e-49d6-941c-29529df71739","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4432def1-2c16-4762-a486-98859e253902","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e96122-72ec-459e-aca9-db53e3c08f8d","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc6fb347-fee6-4420-88cf-4473e511fd32","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5737f0b0-c620-45a9-9c93-b7fbcef6c4c8","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d2ef441-b40a-4681-bcc1-62ce6ec9f565","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"906b5068-61b4-4fe0-acbf-bc0d774aab2b","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a0335310-0f37-4143-8405-75861681e88a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c04df1e1-5044-4f44-8b87-54c625d3f7c0","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40357d02-75cc-4ae8-a8ba-c4bdf0227a04","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6607f421-d530-4ab4-b20d-ef4240becd9c","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7a7bafff-bcf9-44d7-96b6-844c22fab10d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d150cdd-95c4-45ea-80a7-0b34f49510b5","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5219354d-bb8f-4a30-b2dd-9af0362869eb","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"17a776e8-c3ab-4411-ac50-0f2033957381","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7608aa62-d2f6-40c0-90c5-f65811df1022","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5cf5656b-80b4-4aa6-b9c4-b38322a57112","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69ec8aab-f5b0-42eb-8952-8443d056ce26","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9df407ba-5bda-401c-b27c-53eb9c7c2e16","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54bc4f58-03ef-4a00-8048-f979196e28db","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbf95248-3480-4c61-8898-4ddc75a49628","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"127dc9bf-f4d6-42a2-bbaf-a6f8f010deba","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"877c1656-505c-4ca1-9c43-057e4cd76346","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc060b96-fe48-4cc0-aeb0-e87e725ece2e","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8ab57e3-e2c2-401f-a63c-736b5fa231fd","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"50f8a3f1-435b-4339-ac14-d99f7dea4cef","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"09745b8e-9657-451a-8ce4-456d2eef61ac","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"334edbbe-8c21-467c-a914-e51e3e06b91a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"19d5a9c1-4f24-4826-8ffe-6b9f7e73cfaf","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"131de9ef-1e27-4f50-bbee-22319b25d980","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"36361e69-53b7-40cf-905d-95b15eaf953b","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"27b33854-917d-421d-bd55-81f716db4900","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b567b3e-977a-4dfa-a2af-e616f95663e6","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e323067-52fa-45a5-9a9f-cf5c93962d78","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"caa00d1c-443e-49d6-941c-29529df71739","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4432def1-2c16-4762-a486-98859e253902","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e96122-72ec-459e-aca9-db53e3c08f8d","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc6fb347-fee6-4420-88cf-4473e511fd32","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5737f0b0-c620-45a9-9c93-b7fbcef6c4c8","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d2ef441-b40a-4681-bcc1-62ce6ec9f565","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"906b5068-61b4-4fe0-acbf-bc0d774aab2b","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a0335310-0f37-4143-8405-75861681e88a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c04df1e1-5044-4f44-8b87-54c625d3f7c0","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40357d02-75cc-4ae8-a8ba-c4bdf0227a04","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6607f421-d530-4ab4-b20d-ef4240becd9c","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7a7bafff-bcf9-44d7-96b6-844c22fab10d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d150cdd-95c4-45ea-80a7-0b34f49510b5","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5219354d-bb8f-4a30-b2dd-9af0362869eb","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"17a776e8-c3ab-4411-ac50-0f2033957381","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7608aa62-d2f6-40c0-90c5-f65811df1022","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5cf5656b-80b4-4aa6-b9c4-b38322a57112","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69ec8aab-f5b0-42eb-8952-8443d056ce26","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9df407ba-5bda-401c-b27c-53eb9c7c2e16","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54bc4f58-03ef-4a00-8048-f979196e28db","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbf95248-3480-4c61-8898-4ddc75a49628","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"127dc9bf-f4d6-42a2-bbaf-a6f8f010deba","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"877c1656-505c-4ca1-9c43-057e4cd76346","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc060b96-fe48-4cc0-aeb0-e87e725ece2e","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8ab57e3-e2c2-401f-a63c-736b5fa231fd","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"50f8a3f1-435b-4339-ac14-d99f7dea4cef","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"09745b8e-9657-451a-8ce4-456d2eef61ac","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"334edbbe-8c21-467c-a914-e51e3e06b91a","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"19d5a9c1-4f24-4826-8ffe-6b9f7e73cfaf","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"131de9ef-1e27-4f50-bbee-22319b25d980","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"36361e69-53b7-40cf-905d-95b15eaf953b","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"27b33854-917d-421d-bd55-81f716db4900","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b567b3e-977a-4dfa-a2af-e616f95663e6","path":"sprites/spr_mar_walk_legs4/spr_mar_walk_legs4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e323067-52fa-45a5-9a9f-cf5c93962d78","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy b/sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy index 5d8c897a75..6c8463d5d3 100644 --- a/sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy +++ b/sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_pauldron1", "bboxMode":0, "bbox_bottom":14, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"af2cb782-beb6-49fd-b8b1-ec37aaba3a60","name":"af2cb782-beb6-49fd-b8b1-ec37aaba3a60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f991fe3b-a1b2-4faa-92a5-d3be126df12a","name":"f991fe3b-a1b2-4faa-92a5-d3be126df12a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"661b3802-8624-40e2-930f-6474feb5b781","name":"661b3802-8624-40e2-930f-6474feb5b781","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7d88cc6-5638-4273-8d59-cd784cd11f69","name":"a7d88cc6-5638-4273-8d59-cd784cd11f69","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6cecddef-acd7-4a72-bf73-ea2c6e4d9502","name":"6cecddef-acd7-4a72-bf73-ea2c6e4d9502","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc56116f-9cdf-4989-bc05-5791009049da","name":"dc56116f-9cdf-4989-bc05-5791009049da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1b4bc06-317a-441b-a7d1-17bd27f70682","name":"e1b4bc06-317a-441b-a7d1-17bd27f70682","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bd66c7ad-b9cb-49d5-af4b-a31c412d973c","name":"bd66c7ad-b9cb-49d5-af4b-a31c412d973c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b35eb062-430f-4247-8a95-80ade92fd13d","name":"b35eb062-430f-4247-8a95-80ade92fd13d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73bff7a1-50c9-48dc-afa8-93a5127fc152","name":"73bff7a1-50c9-48dc-afa8-93a5127fc152","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c62e46c-d633-472c-aeac-28c65405201d","name":"3c62e46c-d633-472c-aeac-28c65405201d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b270eba5-87f5-4299-b055-42d8650a1049","name":"b270eba5-87f5-4299-b055-42d8650a1049","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"70433f03-e533-40ef-ac04-b6699f39f2db","name":"70433f03-e533-40ef-ac04-b6699f39f2db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"051bcf5e-2c35-43ff-8882-3a43fe168a58","name":"051bcf5e-2c35-43ff-8882-3a43fe168a58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ec7a710a-9cdc-4ffc-9fbb-cde0806ef68b","name":"ec7a710a-9cdc-4ffc-9fbb-cde0806ef68b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4dca56da-691f-43b2-ae74-94e7269fad99","name":"4dca56da-691f-43b2-ae74-94e7269fad99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1949a57d-1c65-4841-aee8-4993f8e2d0ec","name":"1949a57d-1c65-4841-aee8-4993f8e2d0ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af2cb782-beb6-49fd-b8b1-ec37aaba3a60","name":"af2cb782-beb6-49fd-b8b1-ec37aaba3a60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f991fe3b-a1b2-4faa-92a5-d3be126df12a","name":"f991fe3b-a1b2-4faa-92a5-d3be126df12a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"661b3802-8624-40e2-930f-6474feb5b781","name":"661b3802-8624-40e2-930f-6474feb5b781","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7d88cc6-5638-4273-8d59-cd784cd11f69","name":"a7d88cc6-5638-4273-8d59-cd784cd11f69","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6cecddef-acd7-4a72-bf73-ea2c6e4d9502","name":"6cecddef-acd7-4a72-bf73-ea2c6e4d9502","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc56116f-9cdf-4989-bc05-5791009049da","name":"dc56116f-9cdf-4989-bc05-5791009049da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1b4bc06-317a-441b-a7d1-17bd27f70682","name":"e1b4bc06-317a-441b-a7d1-17bd27f70682","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd66c7ad-b9cb-49d5-af4b-a31c412d973c","name":"bd66c7ad-b9cb-49d5-af4b-a31c412d973c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b35eb062-430f-4247-8a95-80ade92fd13d","name":"b35eb062-430f-4247-8a95-80ade92fd13d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73bff7a1-50c9-48dc-afa8-93a5127fc152","name":"73bff7a1-50c9-48dc-afa8-93a5127fc152","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c62e46c-d633-472c-aeac-28c65405201d","name":"3c62e46c-d633-472c-aeac-28c65405201d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b270eba5-87f5-4299-b055-42d8650a1049","name":"b270eba5-87f5-4299-b055-42d8650a1049","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"70433f03-e533-40ef-ac04-b6699f39f2db","name":"70433f03-e533-40ef-ac04-b6699f39f2db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"051bcf5e-2c35-43ff-8882-3a43fe168a58","name":"051bcf5e-2c35-43ff-8882-3a43fe168a58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec7a710a-9cdc-4ffc-9fbb-cde0806ef68b","name":"ec7a710a-9cdc-4ffc-9fbb-cde0806ef68b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4dca56da-691f-43b2-ae74-94e7269fad99","name":"4dca56da-691f-43b2-ae74-94e7269fad99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1949a57d-1c65-4841-aee8-4993f8e2d0ec","name":"1949a57d-1c65-4841-aee8-4993f8e2d0ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af2cb782-beb6-49fd-b8b1-ec37aaba3a60","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44b617f3-0fae-4f1e-9d44-4bd1a2a38ede","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f991fe3b-a1b2-4faa-92a5-d3be126df12a","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ba20f51-d770-4609-bffa-c007416ec912","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"661b3802-8624-40e2-930f-6474feb5b781","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b1a8513-11a8-4cd8-b846-abdab255f0d8","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7d88cc6-5638-4273-8d59-cd784cd11f69","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4efd5d7-a6f0-4326-bf31-46c5860043e4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cecddef-acd7-4a72-bf73-ea2c6e4d9502","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b60564e1-8ac0-4bcc-b78a-ac25a2d6b7d6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc56116f-9cdf-4989-bc05-5791009049da","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1ff97f3-c2cc-406a-8ec9-2a9273cd41c1","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1b4bc06-317a-441b-a7d1-17bd27f70682","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46417154-91f6-4286-b4de-a96a1af577de","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd66c7ad-b9cb-49d5-af4b-a31c412d973c","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e93be9a4-d28e-468a-ada5-220892e8cf69","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b35eb062-430f-4247-8a95-80ade92fd13d","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"81f2b4a3-305a-43b6-812b-16eb48e67471","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73bff7a1-50c9-48dc-afa8-93a5127fc152","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9c00d12-87e7-42c5-bfbe-dd82b99de1fd","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c62e46c-d633-472c-aeac-28c65405201d","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0103e129-31f7-45f2-bccc-d00ff0397e54","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b270eba5-87f5-4299-b055-42d8650a1049","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1ee15558-9b1d-4350-b6fb-3467f6b5abc4","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"70433f03-e533-40ef-ac04-b6699f39f2db","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1ea104f0-10b6-4952-8432-593d54520fa0","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"051bcf5e-2c35-43ff-8882-3a43fe168a58","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cc15da12-5abf-49a1-ad9f-e38dc97899b6","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec7a710a-9cdc-4ffc-9fbb-cde0806ef68b","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b2a15112-e84b-4528-9935-6df7471bdf81","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dca56da-691f-43b2-ae74-94e7269fad99","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b1997871-4810-42a7-8396-cb9bbe0f4966","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1949a57d-1c65-4841-aee8-4993f8e2d0ec","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"16ff5483-4c3a-47f5-9b5a-d64b19bc16fa","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af2cb782-beb6-49fd-b8b1-ec37aaba3a60","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44b617f3-0fae-4f1e-9d44-4bd1a2a38ede","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f991fe3b-a1b2-4faa-92a5-d3be126df12a","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ba20f51-d770-4609-bffa-c007416ec912","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"661b3802-8624-40e2-930f-6474feb5b781","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b1a8513-11a8-4cd8-b846-abdab255f0d8","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7d88cc6-5638-4273-8d59-cd784cd11f69","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4efd5d7-a6f0-4326-bf31-46c5860043e4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cecddef-acd7-4a72-bf73-ea2c6e4d9502","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b60564e1-8ac0-4bcc-b78a-ac25a2d6b7d6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc56116f-9cdf-4989-bc05-5791009049da","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1ff97f3-c2cc-406a-8ec9-2a9273cd41c1","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1b4bc06-317a-441b-a7d1-17bd27f70682","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46417154-91f6-4286-b4de-a96a1af577de","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd66c7ad-b9cb-49d5-af4b-a31c412d973c","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e93be9a4-d28e-468a-ada5-220892e8cf69","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b35eb062-430f-4247-8a95-80ade92fd13d","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"81f2b4a3-305a-43b6-812b-16eb48e67471","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73bff7a1-50c9-48dc-afa8-93a5127fc152","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9c00d12-87e7-42c5-bfbe-dd82b99de1fd","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3c62e46c-d633-472c-aeac-28c65405201d","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0103e129-31f7-45f2-bccc-d00ff0397e54","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b270eba5-87f5-4299-b055-42d8650a1049","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1ee15558-9b1d-4350-b6fb-3467f6b5abc4","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"70433f03-e533-40ef-ac04-b6699f39f2db","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1ea104f0-10b6-4952-8432-593d54520fa0","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"051bcf5e-2c35-43ff-8882-3a43fe168a58","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cc15da12-5abf-49a1-ad9f-e38dc97899b6","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ec7a710a-9cdc-4ffc-9fbb-cde0806ef68b","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b2a15112-e84b-4528-9935-6df7471bdf81","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4dca56da-691f-43b2-ae74-94e7269fad99","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b1997871-4810-42a7-8396-cb9bbe0f4966","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1949a57d-1c65-4841-aee8-4993f8e2d0ec","path":"sprites/spr_mar_walk_pauldron1/spr_mar_walk_pauldron1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"16ff5483-4c3a-47f5-9b5a-d64b19bc16fa","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy b/sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy index 438dc91fb0..e1ccb6ea51 100644 --- a/sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy +++ b/sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mar_walk_pauldron2", "bboxMode":0, "bbox_bottom":14, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"81f9cae2-a751-4e4d-af10-3a57fec0bd40","name":"81f9cae2-a751-4e4d-af10-3a57fec0bd40","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"db63b0ea-9074-42a0-bdb0-2e1923ce2b0c","name":"db63b0ea-9074-42a0-bdb0-2e1923ce2b0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8df28315-269d-432b-a708-23820aeaab77","name":"8df28315-269d-432b-a708-23820aeaab77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dcf887bb-9920-47f6-b3e8-740fa4b83b0b","name":"dcf887bb-9920-47f6-b3e8-740fa4b83b0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c776f495-65b2-40a3-90c3-63df559ac482","name":"c776f495-65b2-40a3-90c3-63df559ac482","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2047e9d2-d217-4970-a624-317dd6ce677b","name":"2047e9d2-d217-4970-a624-317dd6ce677b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3e7264f-0632-49ab-a30f-9be1f0a171b6","name":"f3e7264f-0632-49ab-a30f-9be1f0a171b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d951311e-912b-4651-8a9c-bbbf6dbc025c","name":"d951311e-912b-4651-8a9c-bbbf6dbc025c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5339ce2b-6d13-475f-adab-993098883b65","name":"5339ce2b-6d13-475f-adab-993098883b65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"602b1368-8b88-4729-8a53-ba3b9d33e69e","name":"602b1368-8b88-4729-8a53-ba3b9d33e69e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2eb2b517-510c-475d-bc56-17f25895492c","name":"2eb2b517-510c-475d-bc56-17f25895492c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e78ca533-bd75-4242-a4fc-fea3f894a8b0","name":"e78ca533-bd75-4242-a4fc-fea3f894a8b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dac8105e-f730-4b45-ab32-3878728c1cde","name":"dac8105e-f730-4b45-ab32-3878728c1cde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a2b6bdf4-e4f0-4fdb-92f8-f1c81d893a83","name":"a2b6bdf4-e4f0-4fdb-92f8-f1c81d893a83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"75d57217-083f-495c-993f-4ab3e009a5a6","name":"75d57217-083f-495c-993f-4ab3e009a5a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5db184dc-06b8-4417-93fd-897d7f84c2aa","name":"5db184dc-06b8-4417-93fd-897d7f84c2aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9a4e1e3b-208f-4295-ad99-32db9717fd08","name":"9a4e1e3b-208f-4295-ad99-32db9717fd08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"81f9cae2-a751-4e4d-af10-3a57fec0bd40","name":"81f9cae2-a751-4e4d-af10-3a57fec0bd40","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db63b0ea-9074-42a0-bdb0-2e1923ce2b0c","name":"db63b0ea-9074-42a0-bdb0-2e1923ce2b0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8df28315-269d-432b-a708-23820aeaab77","name":"8df28315-269d-432b-a708-23820aeaab77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dcf887bb-9920-47f6-b3e8-740fa4b83b0b","name":"dcf887bb-9920-47f6-b3e8-740fa4b83b0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c776f495-65b2-40a3-90c3-63df559ac482","name":"c776f495-65b2-40a3-90c3-63df559ac482","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2047e9d2-d217-4970-a624-317dd6ce677b","name":"2047e9d2-d217-4970-a624-317dd6ce677b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3e7264f-0632-49ab-a30f-9be1f0a171b6","name":"f3e7264f-0632-49ab-a30f-9be1f0a171b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d951311e-912b-4651-8a9c-bbbf6dbc025c","name":"d951311e-912b-4651-8a9c-bbbf6dbc025c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5339ce2b-6d13-475f-adab-993098883b65","name":"5339ce2b-6d13-475f-adab-993098883b65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"602b1368-8b88-4729-8a53-ba3b9d33e69e","name":"602b1368-8b88-4729-8a53-ba3b9d33e69e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2eb2b517-510c-475d-bc56-17f25895492c","name":"2eb2b517-510c-475d-bc56-17f25895492c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e78ca533-bd75-4242-a4fc-fea3f894a8b0","name":"e78ca533-bd75-4242-a4fc-fea3f894a8b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dac8105e-f730-4b45-ab32-3878728c1cde","name":"dac8105e-f730-4b45-ab32-3878728c1cde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a2b6bdf4-e4f0-4fdb-92f8-f1c81d893a83","name":"a2b6bdf4-e4f0-4fdb-92f8-f1c81d893a83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"75d57217-083f-495c-993f-4ab3e009a5a6","name":"75d57217-083f-495c-993f-4ab3e009a5a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5db184dc-06b8-4417-93fd-897d7f84c2aa","name":"5db184dc-06b8-4417-93fd-897d7f84c2aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9a4e1e3b-208f-4295-ad99-32db9717fd08","name":"9a4e1e3b-208f-4295-ad99-32db9717fd08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"81f9cae2-a751-4e4d-af10-3a57fec0bd40","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0bd342cc-a552-4293-a730-5614fdb518f3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db63b0ea-9074-42a0-bdb0-2e1923ce2b0c","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37de31b9-d304-47e6-9ea5-d44e3feb0e05","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8df28315-269d-432b-a708-23820aeaab77","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"62a71675-6595-465d-8862-b2d823563ea4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dcf887bb-9920-47f6-b3e8-740fa4b83b0b","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fec6f7d8-56ca-443c-b686-3031f116090c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c776f495-65b2-40a3-90c3-63df559ac482","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"073660be-f7d1-4170-a21e-a2915b533139","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2047e9d2-d217-4970-a624-317dd6ce677b","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"65e2d395-3aa7-4301-abb3-cf59ee4e21ae","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3e7264f-0632-49ab-a30f-9be1f0a171b6","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc68a23c-7e6c-4f74-8469-b5c198d165d5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d951311e-912b-4651-8a9c-bbbf6dbc025c","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7551fa3-53f0-4852-89b6-9e1fcf36997a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5339ce2b-6d13-475f-adab-993098883b65","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15845535-7a76-468f-9060-74c53736dd99","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"602b1368-8b88-4729-8a53-ba3b9d33e69e","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8ef8f55e-93f7-487a-b48d-1e942f3493b7","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2eb2b517-510c-475d-bc56-17f25895492c","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"06b2d985-f6df-4005-81cc-18bc9aeeb94e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e78ca533-bd75-4242-a4fc-fea3f894a8b0","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f040df1-e58d-4b78-8dbd-1fa774633ec4","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dac8105e-f730-4b45-ab32-3878728c1cde","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e2618a44-f935-4039-9723-38995ec0f345","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2b6bdf4-e4f0-4fdb-92f8-f1c81d893a83","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef3169c9-2bde-4dc5-8bc0-b593d55b0f76","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"75d57217-083f-495c-993f-4ab3e009a5a6","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"614bc5ed-c6b8-46e6-ae81-4dd34ebfef6d","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5db184dc-06b8-4417-93fd-897d7f84c2aa","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b554dfe4-317b-489f-b422-929b11e52eb2","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a4e1e3b-208f-4295-ad99-32db9717fd08","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec1f66aa-c7e9-47b4-a662-669c521aa7a8","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"81f9cae2-a751-4e4d-af10-3a57fec0bd40","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bd342cc-a552-4293-a730-5614fdb518f3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db63b0ea-9074-42a0-bdb0-2e1923ce2b0c","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37de31b9-d304-47e6-9ea5-d44e3feb0e05","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8df28315-269d-432b-a708-23820aeaab77","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"62a71675-6595-465d-8862-b2d823563ea4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dcf887bb-9920-47f6-b3e8-740fa4b83b0b","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fec6f7d8-56ca-443c-b686-3031f116090c","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c776f495-65b2-40a3-90c3-63df559ac482","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"073660be-f7d1-4170-a21e-a2915b533139","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2047e9d2-d217-4970-a624-317dd6ce677b","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"65e2d395-3aa7-4301-abb3-cf59ee4e21ae","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3e7264f-0632-49ab-a30f-9be1f0a171b6","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc68a23c-7e6c-4f74-8469-b5c198d165d5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d951311e-912b-4651-8a9c-bbbf6dbc025c","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7551fa3-53f0-4852-89b6-9e1fcf36997a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5339ce2b-6d13-475f-adab-993098883b65","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15845535-7a76-468f-9060-74c53736dd99","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"602b1368-8b88-4729-8a53-ba3b9d33e69e","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8ef8f55e-93f7-487a-b48d-1e942f3493b7","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2eb2b517-510c-475d-bc56-17f25895492c","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"06b2d985-f6df-4005-81cc-18bc9aeeb94e","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e78ca533-bd75-4242-a4fc-fea3f894a8b0","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f040df1-e58d-4b78-8dbd-1fa774633ec4","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dac8105e-f730-4b45-ab32-3878728c1cde","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2618a44-f935-4039-9723-38995ec0f345","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2b6bdf4-e4f0-4fdb-92f8-f1c81d893a83","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef3169c9-2bde-4dc5-8bc0-b593d55b0f76","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"75d57217-083f-495c-993f-4ab3e009a5a6","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"614bc5ed-c6b8-46e6-ae81-4dd34ebfef6d","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5db184dc-06b8-4417-93fd-897d7f84c2aa","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b554dfe4-317b-489f-b422-929b11e52eb2","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a4e1e3b-208f-4295-ad99-32db9717fd08","path":"sprites/spr_mar_walk_pauldron2/spr_mar_walk_pauldron2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec1f66aa-c7e9-47b4-a662-669c521aa7a8","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_marine_base/spr_marine_base.yy b/sprites/spr_marine_base/spr_marine_base.yy index 89b62c4e77..db920b7221 100644 --- a/sprites/spr_marine_base/spr_marine_base.yy +++ b/sprites/spr_marine_base/spr_marine_base.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_marine_base", "bboxMode":0, "bbox_bottom":223, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a05aea4-57b6-4ab4-803b-a93394062444","name":"5a05aea4-57b6-4ab4-803b-a93394062444","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fd950c16-6d9d-4e20-a10d-276227a20344","name":"fd950c16-6d9d-4e20-a10d-276227a20344","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fba90e85-801a-4835-aed5-4bb97356cb61","name":"fba90e85-801a-4835-aed5-4bb97356cb61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f0de4c5d-f50a-473f-9115-15ff989e446c","name":"f0de4c5d-f50a-473f-9115-15ff989e446c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"112d615d-f6ee-4aef-b624-bf4d20ae8400","name":"112d615d-f6ee-4aef-b624-bf4d20ae8400","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a05aea4-57b6-4ab4-803b-a93394062444","name":"5a05aea4-57b6-4ab4-803b-a93394062444","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd950c16-6d9d-4e20-a10d-276227a20344","name":"fd950c16-6d9d-4e20-a10d-276227a20344","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fba90e85-801a-4835-aed5-4bb97356cb61","name":"fba90e85-801a-4835-aed5-4bb97356cb61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0de4c5d-f50a-473f-9115-15ff989e446c","name":"f0de4c5d-f50a-473f-9115-15ff989e446c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"112d615d-f6ee-4aef-b624-bf4d20ae8400","name":"112d615d-f6ee-4aef-b624-bf4d20ae8400","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,6 +69,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_marine_cloth_hood/spr_marine_cloth_hood.yy b/sprites/spr_marine_cloth_hood/spr_marine_cloth_hood.yy index 6b1393e071..49771bdcb5 100644 --- a/sprites/spr_marine_cloth_hood/spr_marine_cloth_hood.yy +++ b/sprites/spr_marine_cloth_hood/spr_marine_cloth_hood.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_marine_cloth_hood", "bboxMode":0, "bbox_bottom":46, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ec5d3ec6-f2b2-4d55-b5bd-e2ffa20891ec","name":"ec5d3ec6-f2b2-4d55-b5bd-e2ffa20891ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec5d3ec6-f2b2-4d55-b5bd-e2ffa20891ec","name":"ec5d3ec6-f2b2-4d55-b5bd-e2ffa20891ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_marine_head/spr_marine_head.yy b/sprites/spr_marine_head/spr_marine_head.yy index e7b599ad17..834ce41403 100644 --- a/sprites/spr_marine_head/spr_marine_head.yy +++ b/sprites/spr_marine_head/spr_marine_head.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_marine_head", "bboxMode":0, "bbox_bottom":61, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a05aea4-57b6-4ab4-803b-a93394062444","name":"5a05aea4-57b6-4ab4-803b-a93394062444","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fd950c16-6d9d-4e20-a10d-276227a20344","name":"fd950c16-6d9d-4e20-a10d-276227a20344","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fba90e85-801a-4835-aed5-4bb97356cb61","name":"fba90e85-801a-4835-aed5-4bb97356cb61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f0de4c5d-f50a-473f-9115-15ff989e446c","name":"f0de4c5d-f50a-473f-9115-15ff989e446c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","name":"9f83f9cb-6eaa-4dca-80fc-48c124c81686","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a05aea4-57b6-4ab4-803b-a93394062444","name":"5a05aea4-57b6-4ab4-803b-a93394062444","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","name":"2c6a533b-dd56-42e8-8cb2-12e93668ef65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd950c16-6d9d-4e20-a10d-276227a20344","name":"fd950c16-6d9d-4e20-a10d-276227a20344","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fba90e85-801a-4835-aed5-4bb97356cb61","name":"fba90e85-801a-4835-aed5-4bb97356cb61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0de4c5d-f50a-473f-9115-15ff989e446c","name":"f0de4c5d-f50a-473f-9115-15ff989e446c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,6 +68,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_marine_robes/spr_marine_robes.yy b/sprites/spr_marine_robes/spr_marine_robes.yy index bd26238f1d..32083affb9 100644 --- a/sprites/spr_marine_robes/spr_marine_robes.yy +++ b/sprites/spr_marine_robes/spr_marine_robes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_marine_robes", "bboxMode":0, "bbox_bottom":198, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c69262d4-e553-4269-a37b-ce6d95d4fbe9","name":"c69262d4-e553-4269-a37b-ce6d95d4fbe9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2517a4fc-f093-4d83-8a38-f4f33e3f9ed3","name":"2517a4fc-f093-4d83-8a38-f4f33e3f9ed3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c69262d4-e553-4269-a37b-ce6d95d4fbe9","name":"c69262d4-e553-4269-a37b-ce6d95d4fbe9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2517a4fc-f093-4d83-8a38-f4f33e3f9ed3","name":"2517a4fc-f093-4d83-8a38-f4f33e3f9ed3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_marksmans_honor/spr_marksmans_honor.yy b/sprites/spr_marksmans_honor/spr_marksmans_honor.yy index 4302733979..fb9c7c8138 100644 --- a/sprites/spr_marksmans_honor/spr_marksmans_honor.yy +++ b/sprites/spr_marksmans_honor/spr_marksmans_honor.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_marksmans_honor", "bboxMode":0, "bbox_bottom":26, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","path":"sprites/spr_marksmans_honor/spr_marksmans_honor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ccb9b2a6-2d8d-4fe5-8d85-f4cf871046a5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","path":"sprites/spr_marksmans_honor/spr_marksmans_honor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"399cb25a-d0c4-4928-b1ba-0f988b480254","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ebea8d5-984d-4402-9aaf-ec60793fd75d","path":"sprites/spr_marksmans_honor/spr_marksmans_honor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ccb9b2a6-2d8d-4fe5-8d85-f4cf871046a5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03289b4f-ccaf-48a8-b0b7-c2a4141465d1","path":"sprites/spr_marksmans_honor/spr_marksmans_honor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"399cb25a-d0c4-4928-b1ba-0f988b480254","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_master_splash/spr_master_splash.yy b/sprites/spr_master_splash/spr_master_splash.yy index 896c339055..069460fbbd 100644 --- a/sprites/spr_master_splash/spr_master_splash.yy +++ b/sprites/spr_master_splash/spr_master_splash.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_master_splash", "bboxMode":0, "bbox_bottom":479, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"139198e3-1db0-4dfc-8fd5-2b19c54b05ba","name":"139198e3-1db0-4dfc-8fd5-2b19c54b05ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"139198e3-1db0-4dfc-8fd5-2b19c54b05ba","name":"139198e3-1db0-4dfc-8fd5-2b19c54b05ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":480.0, + "seqWidth":214.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"6ff8d8db-ce0f-44a4-b676-62c6aa9da21d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, diff --git a/sprites/spr_master_title/spr_master_title.yy b/sprites/spr_master_title/spr_master_title.yy index d0dc2036ca..a3ab58e622 100644 --- a/sprites/spr_master_title/spr_master_title.yy +++ b/sprites/spr_master_title/spr_master_title.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_master_title", "bboxMode":0, "bbox_bottom":2, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"79c91420-f39c-4f56-9743-270274c42515","name":"79c91420-f39c-4f56-9743-270274c42515","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79c91420-f39c-4f56-9743-270274c42515","name":"79c91420-f39c-4f56-9743-270274c42515","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":3.0, + "seqWidth":151.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_maximus_colors/spr_maximus_colors.yy b/sprites/spr_maximus_colors/spr_maximus_colors.yy index 0054d33192..95f95f1541 100644 --- a/sprites/spr_maximus_colors/spr_maximus_colors.yy +++ b/sprites/spr_maximus_colors/spr_maximus_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_maximus_colors", "bboxMode":0, "bbox_bottom":220, @@ -12,19 +12,19 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d51f983a-1596-4dfa-a471-604575f8d758","name":"d51f983a-1596-4dfa-a471-604575f8d758","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"493e74a6-0b54-43ee-bba5-a53005b9f601","name":"493e74a6-0b54-43ee-bba5-a53005b9f601","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d81d991c-217b-466a-817a-a195815277d7","name":"d81d991c-217b-466a-817a-a195815277d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5fca723-ed0a-493b-abfd-dd39d423f991","name":"d5fca723-ed0a-493b-abfd-dd39d423f991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"961521f2-a3f0-462d-9c13-369f928b5594","name":"961521f2-a3f0-462d-9c13-369f928b5594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d51f983a-1596-4dfa-a471-604575f8d758","name":"d51f983a-1596-4dfa-a471-604575f8d758","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"493e74a6-0b54-43ee-bba5-a53005b9f601","name":"493e74a6-0b54-43ee-bba5-a53005b9f601","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d81d991c-217b-466a-817a-a195815277d7","name":"d81d991c-217b-466a-817a-a195815277d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5fca723-ed0a-493b-abfd-dd39d423f991","name":"d5fca723-ed0a-493b-abfd-dd39d423f991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"961521f2-a3f0-462d-9c13-369f928b5594","name":"961521f2-a3f0-462d-9c13-369f928b5594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -80,45 +80,19 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8a0f4334-9529-4cd6-ac67-1a3eab5a387a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51f983a-1596-4dfa-a471-604575f8d758","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eeb4850a-8933-4f8f-a87f-20c23dc42ec6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"722ee4dd-b531-47a5-b37d-272d3b2d7ad8","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3242b5b3-24bd-4175-9af2-5f379b44305a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5777af28-cf29-43d2-8092-8738a2c12b5d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"493e74a6-0b54-43ee-bba5-a53005b9f601","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c79176e4-18d4-4833-8f13-1b06c19e9150","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09b73112-ad1d-4019-a20b-07a5b569d4d8","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02aa1cdf-ecda-4511-94a3-57c8940e29ee","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ddcb749d-0a9a-4f7d-a298-147aa3d94b71","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d81d991c-217b-466a-817a-a195815277d7","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b55c5033-5687-4c72-ad54-a614a228de1a","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5fca723-ed0a-493b-abfd-dd39d423f991","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"136412ca-466d-4197-b145-ac8f364356e8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f7bf925-c4c9-4a97-be0b-4d59812b39ff","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"961521f2-a3f0-462d-9c13-369f928b5594","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"839d2136-94be-4b64-b5bc-2340a2227577","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"efad9889-e5a3-4dff-b1b5-a71f3d1efe66","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8a0f4334-9529-4cd6-ac67-1a3eab5a387a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d51f983a-1596-4dfa-a471-604575f8d758","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eeb4850a-8933-4f8f-a87f-20c23dc42ec6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"78d16c23-bebd-4773-9ae6-0e3b87a4fa74","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"722ee4dd-b531-47a5-b37d-272d3b2d7ad8","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2911ab4b-5f10-490e-8d4a-b378f70d4776","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3242b5b3-24bd-4175-9af2-5f379b44305a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca1dc041-04c2-42de-ba8f-367d17ebbaef","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5777af28-cf29-43d2-8092-8738a2c12b5d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"493e74a6-0b54-43ee-bba5-a53005b9f601","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c79176e4-18d4-4833-8f13-1b06c19e9150","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1e887a9-9646-488d-91fa-7f71cbc257d4","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09b73112-ad1d-4019-a20b-07a5b569d4d8","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"63ab01ac-d593-43fe-b2f8-3fae21ad8a70","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02aa1cdf-ecda-4511-94a3-57c8940e29ee","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1947bde9-4bac-457b-b372-06b6b6c3a8b2","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ddcb749d-0a9a-4f7d-a298-147aa3d94b71","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d81d991c-217b-466a-817a-a195815277d7","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b55c5033-5687-4c72-ad54-a614a228de1a","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5fca723-ed0a-493b-abfd-dd39d423f991","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"136412ca-466d-4197-b145-ac8f364356e8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b0f363d-67cc-474a-83f2-88f783b12bd3","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f7bf925-c4c9-4a97-be0b-4d59812b39ff","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"961521f2-a3f0-462d-9c13-369f928b5594","path":"sprites/spr_maximus_colors/spr_maximus_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"839d2136-94be-4b64-b5bc-2340a2227577","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_maximus_colors2/spr_maximus_colors2.yy b/sprites/spr_maximus_colors2/spr_maximus_colors2.yy index e8c18a718c..93539fb16f 100644 --- a/sprites/spr_maximus_colors2/spr_maximus_colors2.yy +++ b/sprites/spr_maximus_colors2/spr_maximus_colors2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_maximus_colors2", "bboxMode":0, "bbox_bottom":227, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c8cb17b6-c6be-417a-89ef-bf9a93bd560f","name":"c8cb17b6-c6be-417a-89ef-bf9a93bd560f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4d7d4b8a-b7d6-40ad-9da5-97b67d5ab9a2","name":"4d7d4b8a-b7d6-40ad-9da5-97b67d5ab9a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b4bae8a-552a-4ddf-91de-7f246ad7923b","name":"2b4bae8a-552a-4ddf-91de-7f246ad7923b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"24ba43be-2ed3-4a99-82ac-a2ffb43c6e16","name":"24ba43be-2ed3-4a99-82ac-a2ffb43c6e16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8fecf39d-c055-449d-bec6-eba091676059","name":"8fecf39d-c055-449d-bec6-eba091676059","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a35b52da-bf3f-483d-98ef-7a6309f140a8","name":"a35b52da-bf3f-483d-98ef-7a6309f140a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03cc23b6-cf2e-405d-910c-27af987d7e4c","name":"03cc23b6-cf2e-405d-910c-27af987d7e4c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2912ac20-8fa5-4837-aad0-eaa2ccc2a21a","name":"2912ac20-8fa5-4837-aad0-eaa2ccc2a21a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed42e076-eb1a-4eca-88bc-b198d12d8291","name":"ed42e076-eb1a-4eca-88bc-b198d12d8291","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"318341de-fa3b-4c86-a354-c490f5ac3a28","name":"318341de-fa3b-4c86-a354-c490f5ac3a28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d0a0c1c-38a8-4327-bc89-78b0a370739a","name":"1d0a0c1c-38a8-4327-bc89-78b0a370739a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"684d2ac2-b224-45e1-bc09-69a37a9dae37","name":"684d2ac2-b224-45e1-bc09-69a37a9dae37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c50ba520-6850-41ff-98b0-def6581631a5","name":"c50ba520-6850-41ff-98b0-def6581631a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"476657fe-2ada-41a7-8162-775ffa4b1576","name":"476657fe-2ada-41a7-8162-775ffa4b1576","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c8cb17b6-c6be-417a-89ef-bf9a93bd560f","name":"c8cb17b6-c6be-417a-89ef-bf9a93bd560f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d7d4b8a-b7d6-40ad-9da5-97b67d5ab9a2","name":"4d7d4b8a-b7d6-40ad-9da5-97b67d5ab9a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b4bae8a-552a-4ddf-91de-7f246ad7923b","name":"2b4bae8a-552a-4ddf-91de-7f246ad7923b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"24ba43be-2ed3-4a99-82ac-a2ffb43c6e16","name":"24ba43be-2ed3-4a99-82ac-a2ffb43c6e16","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8fecf39d-c055-449d-bec6-eba091676059","name":"8fecf39d-c055-449d-bec6-eba091676059","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a35b52da-bf3f-483d-98ef-7a6309f140a8","name":"a35b52da-bf3f-483d-98ef-7a6309f140a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03cc23b6-cf2e-405d-910c-27af987d7e4c","name":"03cc23b6-cf2e-405d-910c-27af987d7e4c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2912ac20-8fa5-4837-aad0-eaa2ccc2a21a","name":"2912ac20-8fa5-4837-aad0-eaa2ccc2a21a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed42e076-eb1a-4eca-88bc-b198d12d8291","name":"ed42e076-eb1a-4eca-88bc-b198d12d8291","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"318341de-fa3b-4c86-a354-c490f5ac3a28","name":"318341de-fa3b-4c86-a354-c490f5ac3a28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d0a0c1c-38a8-4327-bc89-78b0a370739a","name":"1d0a0c1c-38a8-4327-bc89-78b0a370739a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"684d2ac2-b224-45e1-bc09-69a37a9dae37","name":"684d2ac2-b224-45e1-bc09-69a37a9dae37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c50ba520-6850-41ff-98b0-def6581631a5","name":"c50ba520-6850-41ff-98b0-def6581631a5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"476657fe-2ada-41a7-8162-775ffa4b1576","name":"476657fe-2ada-41a7-8162-775ffa4b1576","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8cb17b6-c6be-417a-89ef-bf9a93bd560f","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"275f7692-e3c9-4c5a-862c-cfcda559f1d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d7d4b8a-b7d6-40ad-9da5-97b67d5ab9a2","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c01ace79-390d-4c4b-b80a-c17d379254b7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b4bae8a-552a-4ddf-91de-7f246ad7923b","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e1b8ef5-df11-4a9b-a79d-e986f294c399","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"24ba43be-2ed3-4a99-82ac-a2ffb43c6e16","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ef6c561-6e91-43ab-871d-3b8bfbb90bce","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fecf39d-c055-449d-bec6-eba091676059","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89f7e359-08d5-46aa-9b97-a9c0fff83b08","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a35b52da-bf3f-483d-98ef-7a6309f140a8","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f3c7ea15-503e-4e33-8e26-5dc230326770","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03cc23b6-cf2e-405d-910c-27af987d7e4c","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ae99b10-6856-47e2-bc24-32f924978e77","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2912ac20-8fa5-4837-aad0-eaa2ccc2a21a","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a21311c7-e30f-4457-afe2-4eba5441d834","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed42e076-eb1a-4eca-88bc-b198d12d8291","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c403f8cf-a7cb-4253-946d-b3e7cf5f9be7","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"318341de-fa3b-4c86-a354-c490f5ac3a28","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90342c3a-c5e7-4c30-b02e-055b74b415ac","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d0a0c1c-38a8-4327-bc89-78b0a370739a","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7fd98488-1dcd-42c5-874d-748e424b7bcc","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"684d2ac2-b224-45e1-bc09-69a37a9dae37","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8298b0ca-d94a-4e7d-93b5-843f9e8c70ae","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c50ba520-6850-41ff-98b0-def6581631a5","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25845d32-a357-44c9-9fb4-5ee87128531e","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"476657fe-2ada-41a7-8162-775ffa4b1576","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"71e2989a-48fc-49e1-b7ca-5dcc46f18d6b","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8cb17b6-c6be-417a-89ef-bf9a93bd560f","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"275f7692-e3c9-4c5a-862c-cfcda559f1d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d7d4b8a-b7d6-40ad-9da5-97b67d5ab9a2","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c01ace79-390d-4c4b-b80a-c17d379254b7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b4bae8a-552a-4ddf-91de-7f246ad7923b","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e1b8ef5-df11-4a9b-a79d-e986f294c399","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"24ba43be-2ed3-4a99-82ac-a2ffb43c6e16","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ef6c561-6e91-43ab-871d-3b8bfbb90bce","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fecf39d-c055-449d-bec6-eba091676059","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89f7e359-08d5-46aa-9b97-a9c0fff83b08","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a35b52da-bf3f-483d-98ef-7a6309f140a8","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f3c7ea15-503e-4e33-8e26-5dc230326770","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03cc23b6-cf2e-405d-910c-27af987d7e4c","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ae99b10-6856-47e2-bc24-32f924978e77","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2912ac20-8fa5-4837-aad0-eaa2ccc2a21a","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a21311c7-e30f-4457-afe2-4eba5441d834","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed42e076-eb1a-4eca-88bc-b198d12d8291","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c403f8cf-a7cb-4253-946d-b3e7cf5f9be7","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"318341de-fa3b-4c86-a354-c490f5ac3a28","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90342c3a-c5e7-4c30-b02e-055b74b415ac","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d0a0c1c-38a8-4327-bc89-78b0a370739a","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7fd98488-1dcd-42c5-874d-748e424b7bcc","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"684d2ac2-b224-45e1-bc09-69a37a9dae37","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8298b0ca-d94a-4e7d-93b5-843f9e8c70ae","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c50ba520-6850-41ff-98b0-def6581631a5","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25845d32-a357-44c9-9fb4-5ee87128531e","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"476657fe-2ada-41a7-8162-775ffa4b1576","path":"sprites/spr_maximus_colors2/spr_maximus_colors2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"71e2989a-48fc-49e1-b7ca-5dcc46f18d6b","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_medicine_icon/spr_medicine_icon.yy b/sprites/spr_medicine_icon/spr_medicine_icon.yy index 1facd441ce..08ffa42b61 100644 --- a/sprites/spr_medicine_icon/spr_medicine_icon.yy +++ b/sprites/spr_medicine_icon/spr_medicine_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_medicine_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0fbf6532-6be4-43b1-9c15-8bf354357241","name":"0fbf6532-6be4-43b1-9c15-8bf354357241","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0fbf6532-6be4-43b1-9c15-8bf354357241","name":"0fbf6532-6be4-43b1-9c15-8bf354357241","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0fbf6532-6be4-43b1-9c15-8bf354357241","path":"sprites/spr_medicine_icon/spr_medicine_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78528be8-8310-462c-a5df-9390de9368f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0fbf6532-6be4-43b1-9c15-8bf354357241","path":"sprites/spr_medicine_icon/spr_medicine_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78528be8-8310-462c-a5df-9390de9368f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_melta/spr_melta.yy b/sprites/spr_melta/spr_melta.yy index d83529a0c5..3eb43b6ae8 100644 --- a/sprites/spr_melta/spr_melta.yy +++ b/sprites/spr_melta/spr_melta.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_melta", "bboxMode":2, "bbox_bottom":29, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9b57cafa-76c3-40cc-90ee-d3356794051b","name":"9b57cafa-76c3-40cc-90ee-d3356794051b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3095ccce-dd3f-446b-97f7-95dd4c2c8a06","name":"3095ccce-dd3f-446b-97f7-95dd4c2c8a06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"75264f28-3821-4997-930c-60e09ac121bd","name":"75264f28-3821-4997-930c-60e09ac121bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"efed80f4-9f46-4b37-ac81-066e0bb00fda","name":"efed80f4-9f46-4b37-ac81-066e0bb00fda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"549538a6-1b70-4144-88ce-8ae66206eed9","name":"549538a6-1b70-4144-88ce-8ae66206eed9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0e78fbd4-5407-4d29-97ed-f7cb92f66a2d","name":"0e78fbd4-5407-4d29-97ed-f7cb92f66a2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6dad0bf6-dc80-40b6-8f15-c64e5792a9ce","name":"6dad0bf6-dc80-40b6-8f15-c64e5792a9ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ba709feb-d1d2-432a-b1ba-72bccf507015","name":"ba709feb-d1d2-432a-b1ba-72bccf507015","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b57cafa-76c3-40cc-90ee-d3356794051b","name":"9b57cafa-76c3-40cc-90ee-d3356794051b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3095ccce-dd3f-446b-97f7-95dd4c2c8a06","name":"3095ccce-dd3f-446b-97f7-95dd4c2c8a06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"75264f28-3821-4997-930c-60e09ac121bd","name":"75264f28-3821-4997-930c-60e09ac121bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"efed80f4-9f46-4b37-ac81-066e0bb00fda","name":"efed80f4-9f46-4b37-ac81-066e0bb00fda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"549538a6-1b70-4144-88ce-8ae66206eed9","name":"549538a6-1b70-4144-88ce-8ae66206eed9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0e78fbd4-5407-4d29-97ed-f7cb92f66a2d","name":"0e78fbd4-5407-4d29-97ed-f7cb92f66a2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6dad0bf6-dc80-40b6-8f15-c64e5792a9ce","name":"6dad0bf6-dc80-40b6-8f15-c64e5792a9ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba709feb-d1d2-432a-b1ba-72bccf507015","name":"ba709feb-d1d2-432a-b1ba-72bccf507015","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,30 +75,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b57cafa-76c3-40cc-90ee-d3356794051b","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01320803-609a-4af2-bea2-6042e6d1c093","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3095ccce-dd3f-446b-97f7-95dd4c2c8a06","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6dad15c-c679-46f9-af64-f168b51b1029","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"75264f28-3821-4997-930c-60e09ac121bd","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9aecd644-8450-4c87-a6e6-2f3e8310a5fe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"efed80f4-9f46-4b37-ac81-066e0bb00fda","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"587bd5b6-a72a-48e5-a2e3-a4042e58c53d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"549538a6-1b70-4144-88ce-8ae66206eed9","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d65d15c8-88d7-493a-9ad0-d187c873732e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e78fbd4-5407-4d29-97ed-f7cb92f66a2d","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8b205325-4ab1-4ecc-8807-a86c94717e8d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6dad0bf6-dc80-40b6-8f15-c64e5792a9ce","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6eb84ca-ea7c-4bf8-8635-219af404dd5f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba709feb-d1d2-432a-b1ba-72bccf507015","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"525c863e-ef29-4744-bf9f-0f69d713c150","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b57cafa-76c3-40cc-90ee-d3356794051b","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01320803-609a-4af2-bea2-6042e6d1c093","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3095ccce-dd3f-446b-97f7-95dd4c2c8a06","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6dad15c-c679-46f9-af64-f168b51b1029","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"75264f28-3821-4997-930c-60e09ac121bd","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9aecd644-8450-4c87-a6e6-2f3e8310a5fe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"efed80f4-9f46-4b37-ac81-066e0bb00fda","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"587bd5b6-a72a-48e5-a2e3-a4042e58c53d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"549538a6-1b70-4144-88ce-8ae66206eed9","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d65d15c8-88d7-493a-9ad0-d187c873732e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e78fbd4-5407-4d29-97ed-f7cb92f66a2d","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8b205325-4ab1-4ecc-8807-a86c94717e8d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6dad0bf6-dc80-40b6-8f15-c64e5792a9ce","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6eb84ca-ea7c-4bf8-8635-219af404dd5f","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba709feb-d1d2-432a-b1ba-72bccf507015","path":"sprites/spr_melta/spr_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"525c863e-ef29-4744-bf9f-0f69d713c150","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_metal_tabbard/spr_metal_tabbard.yy b/sprites/spr_metal_tabbard/spr_metal_tabbard.yy index 5f3f896479..c1021f605c 100644 --- a/sprites/spr_metal_tabbard/spr_metal_tabbard.yy +++ b/sprites/spr_metal_tabbard/spr_metal_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_metal_tabbard", "bboxMode":0, "bbox_bottom":226, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_metal_tabbard_shadow/c686bbde-e480-472c-bb08-d523ecc16fd7.png b/sprites/spr_metal_tabbard_shadow/c686bbde-e480-472c-bb08-d523ecc16fd7.png new file mode 100644 index 0000000000..babf245ca8 Binary files /dev/null and b/sprites/spr_metal_tabbard_shadow/c686bbde-e480-472c-bb08-d523ecc16fd7.png differ diff --git a/sprites/spr_metal_tabbard_shadow/layers/c686bbde-e480-472c-bb08-d523ecc16fd7/5f3e59f5-7bfc-4c98-bc85-b5046258cb74.png b/sprites/spr_metal_tabbard_shadow/layers/c686bbde-e480-472c-bb08-d523ecc16fd7/5f3e59f5-7bfc-4c98-bc85-b5046258cb74.png new file mode 100644 index 0000000000..babf245ca8 Binary files /dev/null and b/sprites/spr_metal_tabbard_shadow/layers/c686bbde-e480-472c-bb08-d523ecc16fd7/5f3e59f5-7bfc-4c98-bc85-b5046258cb74.png differ diff --git a/sprites/spr_metal_tabbard_shadow/spr_metal_tabbard_shadow.yy b/sprites/spr_metal_tabbard_shadow/spr_metal_tabbard_shadow.yy new file mode 100644 index 0000000000..74de19fd3c --- /dev/null +++ b/sprites/spr_metal_tabbard_shadow/spr_metal_tabbard_shadow.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_metal_tabbard_shadow", + "bboxMode":0, + "bbox_bottom":226, + "bbox_left":65, + "bbox_right":103, + "bbox_top":102, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"c686bbde-e480-472c-bb08-d523ecc16fd7","name":"c686bbde-e480-472c-bb08-d523ecc16fd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"5f3e59f5-7bfc-4c98-bc85-b5046258cb74","blendMode":0,"displayName":"default","isLocked":false,"name":"5f3e59f5-7bfc-4c98-bc85-b5046258cb74","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_metal_tabbard_shadow", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"decorations", + "path":"folders/Sprites/Marine Viewer/decorations.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_metal_tabbard_shadow", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_metal_tabbard_shadow", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c686bbde-e480-472c-bb08-d523ecc16fd7","path":"sprites/spr_metal_tabbard_shadow/spr_metal_tabbard_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"181eb698-17b4-48e0-bf60-e786cc8baaa7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":11, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_mk3_belt/spr_mk3_belt.yy b/sprites/spr_mk3_belt/spr_mk3_belt.yy index 1d0a44bd03..b9140cf5a4 100644 --- a/sprites/spr_mk3_belt/spr_mk3_belt.yy +++ b/sprites/spr_mk3_belt/spr_mk3_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_belt", "bboxMode":0, "bbox_bottom":133, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"358913f3-25cd-4411-aa3a-01c656c1166c","name":"358913f3-25cd-4411-aa3a-01c656c1166c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"358913f3-25cd-4411-aa3a-01c656c1166c","name":"358913f3-25cd-4411-aa3a-01c656c1166c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"358913f3-25cd-4411-aa3a-01c656c1166c","path":"sprites/spr_mk3_belt/spr_mk3_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"47d7ef7d-b3f5-48e5-9ee6-d99a5f3de6a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"358913f3-25cd-4411-aa3a-01c656c1166c","path":"sprites/spr_mk3_belt/spr_mk3_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"47d7ef7d-b3f5-48e5-9ee6-d99a5f3de6a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_chest/spr_mk3_chest.yy b/sprites/spr_mk3_chest/spr_mk3_chest.yy index df685b8560..243a5f82e1 100644 --- a/sprites/spr_mk3_chest/spr_mk3_chest.yy +++ b/sprites/spr_mk3_chest/spr_mk3_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_chest", "bboxMode":0, "bbox_bottom":96, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"653c0ec0-9752-43fa-836d-887cd38798e4","name":"653c0ec0-9752-43fa-836d-887cd38798e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"653c0ec0-9752-43fa-836d-887cd38798e4","name":"653c0ec0-9752-43fa-836d-887cd38798e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"653c0ec0-9752-43fa-836d-887cd38798e4","path":"sprites/spr_mk3_chest/spr_mk3_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25a5823d-7e46-458c-b93f-082194e2e4a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"653c0ec0-9752-43fa-836d-887cd38798e4","path":"sprites/spr_mk3_chest/spr_mk3_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25a5823d-7e46-458c-b93f-082194e2e4a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_colors/spr_mk3_colors.yy b/sprites/spr_mk3_colors/spr_mk3_colors.yy index 430e2f0321..838df707c8 100644 --- a/sprites/spr_mk3_colors/spr_mk3_colors.yy +++ b/sprites/spr_mk3_colors/spr_mk3_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_colors", "bboxMode":0, "bbox_bottom":220, @@ -12,22 +12,22 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"62c3577f-e597-4cd1-9a9e-f559e6eb42f3","name":"62c3577f-e597-4cd1-9a9e-f559e6eb42f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f629c04e-891c-45a9-875c-fc3c820221d8","name":"f629c04e-891c-45a9-875c-fc3c820221d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b36a256-1a8f-46fe-927a-b454edbe5676","name":"1b36a256-1a8f-46fe-927a-b454edbe5676","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a982464b-f06f-4e0c-8953-6e17e06f0e55","name":"a982464b-f06f-4e0c-8953-6e17e06f0e55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5c2e039f-fdb7-4c67-bbfb-f92673d2a953","name":"5c2e039f-fdb7-4c67-bbfb-f92673d2a953","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4d0acb32-f02a-4e15-ae52-cef6b2c01084","name":"4d0acb32-f02a-4e15-ae52-cef6b2c01084","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2632e926-dd48-4080-9cd6-453d5b7cf0b3","name":"2632e926-dd48-4080-9cd6-453d5b7cf0b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9c2f6f26-d7bb-484b-bd34-fa9ae2fadd50","name":"9c2f6f26-d7bb-484b-bd34-fa9ae2fadd50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d9942e3b-b3c5-4acf-ab8a-138cdb5c9454","name":"d9942e3b-b3c5-4acf-ab8a-138cdb5c9454","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"27c3551e-1bf8-42f7-ae9b-3f5df09e2413","name":"27c3551e-1bf8-42f7-ae9b-3f5df09e2413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a23d5f06-e2b2-4fe9-96ba-2f0fd14f2315","name":"a23d5f06-e2b2-4fe9-96ba-2f0fd14f2315","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fa21a8ce-25e3-4660-882c-23194594a657","name":"fa21a8ce-25e3-4660-882c-23194594a657","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"64ee1a9b-96dd-4cd2-aa93-7c7599d8b350","name":"64ee1a9b-96dd-4cd2-aa93-7c7599d8b350","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f61ff89f-9503-40ee-913a-097280eb3137","name":"f61ff89f-9503-40ee-913a-097280eb3137","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6f24d0a-2c09-42f0-9ad7-0319550b7e22","name":"a6f24d0a-2c09-42f0-9ad7-0319550b7e22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3ff3afd-66af-4f5b-a60d-3fe256d91dd3","name":"f3ff3afd-66af-4f5b-a60d-3fe256d91dd3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"62c3577f-e597-4cd1-9a9e-f559e6eb42f3","name":"62c3577f-e597-4cd1-9a9e-f559e6eb42f3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f629c04e-891c-45a9-875c-fc3c820221d8","name":"f629c04e-891c-45a9-875c-fc3c820221d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b36a256-1a8f-46fe-927a-b454edbe5676","name":"1b36a256-1a8f-46fe-927a-b454edbe5676","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a982464b-f06f-4e0c-8953-6e17e06f0e55","name":"a982464b-f06f-4e0c-8953-6e17e06f0e55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c2e039f-fdb7-4c67-bbfb-f92673d2a953","name":"5c2e039f-fdb7-4c67-bbfb-f92673d2a953","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d0acb32-f02a-4e15-ae52-cef6b2c01084","name":"4d0acb32-f02a-4e15-ae52-cef6b2c01084","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2632e926-dd48-4080-9cd6-453d5b7cf0b3","name":"2632e926-dd48-4080-9cd6-453d5b7cf0b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9c2f6f26-d7bb-484b-bd34-fa9ae2fadd50","name":"9c2f6f26-d7bb-484b-bd34-fa9ae2fadd50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9942e3b-b3c5-4acf-ab8a-138cdb5c9454","name":"d9942e3b-b3c5-4acf-ab8a-138cdb5c9454","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"27c3551e-1bf8-42f7-ae9b-3f5df09e2413","name":"27c3551e-1bf8-42f7-ae9b-3f5df09e2413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a23d5f06-e2b2-4fe9-96ba-2f0fd14f2315","name":"a23d5f06-e2b2-4fe9-96ba-2f0fd14f2315","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fa21a8ce-25e3-4660-882c-23194594a657","name":"fa21a8ce-25e3-4660-882c-23194594a657","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64ee1a9b-96dd-4cd2-aa93-7c7599d8b350","name":"64ee1a9b-96dd-4cd2-aa93-7c7599d8b350","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f61ff89f-9503-40ee-913a-097280eb3137","name":"f61ff89f-9503-40ee-913a-097280eb3137","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6f24d0a-2c09-42f0-9ad7-0319550b7e22","name":"a6f24d0a-2c09-42f0-9ad7-0319550b7e22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3ff3afd-66af-4f5b-a60d-3fe256d91dd3","name":"f3ff3afd-66af-4f5b-a60d-3fe256d91dd3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -48,13 +48,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -102,54 +96,22 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"62c3577f-e597-4cd1-9a9e-f559e6eb42f3","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f7003538-a699-4f02-b362-f91da46eb0a4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f629c04e-891c-45a9-875c-fc3c820221d8","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ab6dc1f-9ab3-4a92-8089-400b97c96e5d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b36a256-1a8f-46fe-927a-b454edbe5676","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8bc7f1ed-5f9f-4390-9845-56c133191e3b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a982464b-f06f-4e0c-8953-6e17e06f0e55","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"baac790b-075b-4417-8789-39fdacd38ffe","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c2e039f-fdb7-4c67-bbfb-f92673d2a953","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e8402d7f-6718-45fb-b930-773c521d0362","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d0acb32-f02a-4e15-ae52-cef6b2c01084","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ab6712b-9dbd-4c52-88fd-33f36c07dc71","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2632e926-dd48-4080-9cd6-453d5b7cf0b3","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a828e63-dae2-4ebe-ab0f-991630962412","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c2f6f26-d7bb-484b-bd34-fa9ae2fadd50","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1641eaf-a69a-4419-a527-7b74994854a6","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9942e3b-b3c5-4acf-ab8a-138cdb5c9454","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a07c98c1-b6f9-4df3-ab1e-6f92c81786b6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"27c3551e-1bf8-42f7-ae9b-3f5df09e2413","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"82a312a8-35ce-409f-b1b9-2fe0d02f973c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a23d5f06-e2b2-4fe9-96ba-2f0fd14f2315","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc422c9a-fe9b-4a49-a96b-4d773f2526e4","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa21a8ce-25e3-4660-882c-23194594a657","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4f6f6f8f-713c-4a7d-b44d-86ca9d3b1d45","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64ee1a9b-96dd-4cd2-aa93-7c7599d8b350","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a527c0b3-df5a-40a5-8c70-6ef4de2d6500","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f61ff89f-9503-40ee-913a-097280eb3137","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b29ea8f-8c30-484e-9eaa-186bbb796b0f","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6f24d0a-2c09-42f0-9ad7-0319550b7e22","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4b986f7b-7e21-48e5-9a1d-1bf9d81bf873","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3ff3afd-66af-4f5b-a60d-3fe256d91dd3","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"39956189-0400-4262-b523-9c96d90ba130","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"62c3577f-e597-4cd1-9a9e-f559e6eb42f3","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f7003538-a699-4f02-b362-f91da46eb0a4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f629c04e-891c-45a9-875c-fc3c820221d8","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ab6dc1f-9ab3-4a92-8089-400b97c96e5d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b36a256-1a8f-46fe-927a-b454edbe5676","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8bc7f1ed-5f9f-4390-9845-56c133191e3b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a982464b-f06f-4e0c-8953-6e17e06f0e55","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"baac790b-075b-4417-8789-39fdacd38ffe","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c2e039f-fdb7-4c67-bbfb-f92673d2a953","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e8402d7f-6718-45fb-b930-773c521d0362","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d0acb32-f02a-4e15-ae52-cef6b2c01084","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ab6712b-9dbd-4c52-88fd-33f36c07dc71","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2632e926-dd48-4080-9cd6-453d5b7cf0b3","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a828e63-dae2-4ebe-ab0f-991630962412","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c2f6f26-d7bb-484b-bd34-fa9ae2fadd50","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1641eaf-a69a-4419-a527-7b74994854a6","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9942e3b-b3c5-4acf-ab8a-138cdb5c9454","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a07c98c1-b6f9-4df3-ab1e-6f92c81786b6","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"27c3551e-1bf8-42f7-ae9b-3f5df09e2413","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82a312a8-35ce-409f-b1b9-2fe0d02f973c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a23d5f06-e2b2-4fe9-96ba-2f0fd14f2315","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc422c9a-fe9b-4a49-a96b-4d773f2526e4","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa21a8ce-25e3-4660-882c-23194594a657","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4f6f6f8f-713c-4a7d-b44d-86ca9d3b1d45","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64ee1a9b-96dd-4cd2-aa93-7c7599d8b350","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a527c0b3-df5a-40a5-8c70-6ef4de2d6500","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f61ff89f-9503-40ee-913a-097280eb3137","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b29ea8f-8c30-484e-9eaa-186bbb796b0f","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6f24d0a-2c09-42f0-9ad7-0319550b7e22","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4b986f7b-7e21-48e5-9a1d-1bf9d81bf873","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f3ff3afd-66af-4f5b-a60d-3fe256d91dd3","path":"sprites/spr_mk3_colors/spr_mk3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"39956189-0400-4262-b523-9c96d90ba130","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_complex/358913f3-25cd-4411-aa3a-01c656c1166c.png b/sprites/spr_mk3_complex/358913f3-25cd-4411-aa3a-01c656c1166c.png index b241890dee..d5831fd55f 100644 Binary files a/sprites/spr_mk3_complex/358913f3-25cd-4411-aa3a-01c656c1166c.png and b/sprites/spr_mk3_complex/358913f3-25cd-4411-aa3a-01c656c1166c.png differ diff --git a/sprites/spr_mk3_complex/layers/358913f3-25cd-4411-aa3a-01c656c1166c/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_complex/layers/358913f3-25cd-4411-aa3a-01c656c1166c/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png index b241890dee..4830c87d6b 100644 Binary files a/sprites/spr_mk3_complex/layers/358913f3-25cd-4411-aa3a-01c656c1166c/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png and b/sprites/spr_mk3_complex/layers/358913f3-25cd-4411-aa3a-01c656c1166c/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png differ diff --git a/sprites/spr_mk3_complex/layers/358913f3-25cd-4411-aa3a-01c656c1166c/d9e2c0be-152c-435b-b546-d987a36b384c.png b/sprites/spr_mk3_complex/layers/358913f3-25cd-4411-aa3a-01c656c1166c/d9e2c0be-152c-435b-b546-d987a36b384c.png index c10299292e..5502cf7fac 100644 Binary files a/sprites/spr_mk3_complex/layers/358913f3-25cd-4411-aa3a-01c656c1166c/d9e2c0be-152c-435b-b546-d987a36b384c.png and b/sprites/spr_mk3_complex/layers/358913f3-25cd-4411-aa3a-01c656c1166c/d9e2c0be-152c-435b-b546-d987a36b384c.png differ diff --git a/sprites/spr_mk3_complex/spr_mk3_complex.yy b/sprites/spr_mk3_complex/spr_mk3_complex.yy index 6ae83e4d0b..0ee71d3adb 100644 --- a/sprites/spr_mk3_complex/spr_mk3_complex.yy +++ b/sprites/spr_mk3_complex/spr_mk3_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_complex", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"358913f3-25cd-4411-aa3a-01c656c1166c","name":"358913f3-25cd-4411-aa3a-01c656c1166c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"358913f3-25cd-4411-aa3a-01c656c1166c","name":"358913f3-25cd-4411-aa3a-01c656c1166c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk3_complex_backpack/1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f.png b/sprites/spr_mk3_complex_backpack/1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f.png index eeffda3174..a69022b30b 100644 Binary files a/sprites/spr_mk3_complex_backpack/1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f.png and b/sprites/spr_mk3_complex_backpack/1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f.png differ diff --git a/sprites/spr_mk3_complex_backpack/layers/1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f/9bf31ffc-9a0a-492f-89fb-b703fed172b9.png b/sprites/spr_mk3_complex_backpack/layers/1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f/9bf31ffc-9a0a-492f-89fb-b703fed172b9.png index eeffda3174..a69022b30b 100644 Binary files a/sprites/spr_mk3_complex_backpack/layers/1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f/9bf31ffc-9a0a-492f-89fb-b703fed172b9.png and b/sprites/spr_mk3_complex_backpack/layers/1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f/9bf31ffc-9a0a-492f-89fb-b703fed172b9.png differ diff --git a/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy b/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy index ab43c9018e..7274a20a17 100644 --- a/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy +++ b/sprites/spr_mk3_complex_backpack/spr_mk3_complex_backpack.yy @@ -1,22 +1,22 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_complex_backpack", "bboxMode":0, - "bbox_bottom":36, + "bbox_bottom":81, "bbox_left":27, "bbox_right":136, - "bbox_top":9, + "bbox_top":54, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","name":"1b7c53e0-54ee-4ded-bfb1-a4a19c2f498f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, - "height":232, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"9bf31ffc-9a0a-492f-89fb-b703fed172b9","blendMode":0,"displayName":"default","isLocked":false,"name":"9bf31ffc-9a0a-492f-89fb-b703fed172b9","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":-2, - "yorigin":0, + "xorigin":0, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy b/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy index 8c7d687e9a..8fefbecf92 100644 --- a/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy +++ b/sprites/spr_mk3_forehead_variants/spr_mk3_forehead_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_forehead_variants", "bboxMode":0, "bbox_bottom":29, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"37c11dd3-1414-4c8d-8d71-e00098819009","name":"37c11dd3-1414-4c8d-8d71-e00098819009","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","name":"6b0a122b-cbde-43d7-86fa-09659011d3ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","name":"1b4c0911-af1a-4514-8459-35cf7d4f6aeb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","name":"ee9859ca-5867-4ea9-9c32-bce41c0bf04d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","name":"3f3d4f82-2879-4b96-9ec5-2fd9414ac048","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"37c11dd3-1414-4c8d-8d71-e00098819009","name":"37c11dd3-1414-4c8d-8d71-e00098819009","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,6 +69,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy b/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy index 891dd3a5b8..0d590db684 100644 --- a/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy +++ b/sprites/spr_mk3_head_variants/spr_mk3_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_head_variants", "bboxMode":0, "bbox_bottom":37, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ae95461-420f-49c2-b583-d6fc14c50cb2","name":"6ae95461-420f-49c2-b583-d6fc14c50cb2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ae95461-420f-49c2-b583-d6fc14c50cb2","name":"6ae95461-420f-49c2-b583-d6fc14c50cb2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy b/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy index 61bcc45399..f33cbde28f 100644 --- a/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy +++ b/sprites/spr_mk3_left_arm/spr_mk3_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_left_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","name":"0020b04c-892d-4cf2-9bf1-2240b0622ccd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk3_left_knee/31a02b91-20f6-4e25-8262-cdd09b5a5081.png b/sprites/spr_mk3_left_knee/31a02b91-20f6-4e25-8262-cdd09b5a5081.png new file mode 100644 index 0000000000..88cfef1a01 Binary files /dev/null and b/sprites/spr_mk3_left_knee/31a02b91-20f6-4e25-8262-cdd09b5a5081.png differ diff --git a/sprites/spr_mk3_left_knee/791128a9-6e7d-45a1-9768-df389631c490.png b/sprites/spr_mk3_left_knee/791128a9-6e7d-45a1-9768-df389631c490.png new file mode 100644 index 0000000000..9a4078e057 Binary files /dev/null and b/sprites/spr_mk3_left_knee/791128a9-6e7d-45a1-9768-df389631c490.png differ diff --git a/sprites/spr_mk3_left_knee/7945b113-31a9-4792-8b3d-f168bac8c94f.png b/sprites/spr_mk3_left_knee/7945b113-31a9-4792-8b3d-f168bac8c94f.png new file mode 100644 index 0000000000..94cc2c35d2 Binary files /dev/null and b/sprites/spr_mk3_left_knee/7945b113-31a9-4792-8b3d-f168bac8c94f.png differ diff --git a/sprites/spr_mk3_left_knee/layers/31a02b91-20f6-4e25-8262-cdd09b5a5081/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_left_knee/layers/31a02b91-20f6-4e25-8262-cdd09b5a5081/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png new file mode 100644 index 0000000000..88cfef1a01 Binary files /dev/null and b/sprites/spr_mk3_left_knee/layers/31a02b91-20f6-4e25-8262-cdd09b5a5081/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png differ diff --git a/sprites/spr_mk3_left_knee/layers/791128a9-6e7d-45a1-9768-df389631c490/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_left_knee/layers/791128a9-6e7d-45a1-9768-df389631c490/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png new file mode 100644 index 0000000000..9a4078e057 Binary files /dev/null and b/sprites/spr_mk3_left_knee/layers/791128a9-6e7d-45a1-9768-df389631c490/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png differ diff --git a/sprites/spr_mk3_left_knee/layers/7945b113-31a9-4792-8b3d-f168bac8c94f/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_left_knee/layers/7945b113-31a9-4792-8b3d-f168bac8c94f/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png new file mode 100644 index 0000000000..94cc2c35d2 Binary files /dev/null and b/sprites/spr_mk3_left_knee/layers/7945b113-31a9-4792-8b3d-f168bac8c94f/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png differ diff --git a/sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy b/sprites/spr_mk3_left_knee/spr_mk3_left_knee.yy similarity index 60% rename from sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy rename to sprites/spr_mk3_left_knee/spr_mk3_left_knee.yy index 1331889720..c55890c6f6 100644 --- a/sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy +++ b/sprites/spr_mk3_left_knee/spr_mk3_left_knee.yy @@ -1,10 +1,10 @@ { - "$GMSprite":"", - "%Name":"spr_mk3_left_leg_variants", + "$GMSprite":"v2", + "%Name":"spr_mk3_left_knee", "bboxMode":0, - "bbox_bottom":220, - "bbox_left":97, - "bbox_right":152, + "bbox_bottom":169, + "bbox_left":27, + "bbox_right":136, "bbox_top":133, "collisionKind":1, "collisionTolerance":0, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"04fc9961-d557-4205-a023-dd867df0fdfb","name":"04fc9961-d557-4205-a023-dd867df0fdfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7945b113-31a9-4792-8b3d-f168bac8c94f","name":"7945b113-31a9-4792-8b3d-f168bac8c94f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31a02b91-20f6-4e25-8262-cdd09b5a5081","name":"31a02b91-20f6-4e25-8262-cdd09b5a5081","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"791128a9-6e7d-45a1-9768-df389631c490","name":"791128a9-6e7d-45a1-9768-df389631c490","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -23,7 +23,7 @@ "layers":[ {"$GMImageLayer":"","%Name":"9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387","blendMode":0,"displayName":"default","isLocked":false,"name":"9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "name":"spr_mk3_left_leg_variants", + "name":"spr_mk3_left_knee", "nineSlice":null, "origin":9, "parent":{ @@ -35,7 +35,7 @@ "resourceVersion":"2.0", "sequence":{ "$GMSequence":"v1", - "%Name":"spr_mk3_left_leg_variants", + "%Name":"spr_mk3_left_knee", "autoRecord":true, "backdropHeight":768, "backdropImageOpacity":0.5, @@ -59,26 +59,28 @@ "resourceType":"KeyframeStore", "resourceVersion":"2.0", }, - "name":"spr_mk3_left_leg_variants", + "name":"spr_mk3_left_knee", "playback":1, "playbackSpeed":30.0, "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd674911-3574-4213-b332-57af50579a99","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7945b113-31a9-4792-8b3d-f168bac8c94f","path":"sprites/spr_mk3_left_knee/spr_mk3_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"29d4a1e1-f8cc-4762-8f95-b8409db320b9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1e0625e6-7cca-4fb6-9a2e-a33cabfbe0a2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31a02b91-20f6-4e25-8262-cdd09b5a5081","path":"sprites/spr_mk3_left_knee/spr_mk3_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"35d74b37-2ab9-442b-9444-49bdf176b9c0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"04fc9961-d557-4205-a023-dd867df0fdfb","path":"sprites/spr_mk3_left_leg_variants/spr_mk3_left_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9c70ed6c-7032-4848-8556-ff826065b08e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"791128a9-6e7d-45a1-9768-df389631c490","path":"sprites/spr_mk3_left_knee/spr_mk3_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6a284a54-5288-4198-9408-04ed16c817c1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_left_leg_variants/04fc9961-d557-4205-a023-dd867df0fdfb.png b/sprites/spr_mk3_left_leg_variants/04fc9961-d557-4205-a023-dd867df0fdfb.png deleted file mode 100644 index 0e9a8a0e2c..0000000000 Binary files a/sprites/spr_mk3_left_leg_variants/04fc9961-d557-4205-a023-dd867df0fdfb.png and /dev/null differ diff --git a/sprites/spr_mk3_left_leg_variants/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png b/sprites/spr_mk3_left_leg_variants/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png deleted file mode 100644 index 7bb2ce80b2..0000000000 Binary files a/sprites/spr_mk3_left_leg_variants/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png and /dev/null differ diff --git a/sprites/spr_mk3_left_leg_variants/9e7144c8-574e-488a-bdf9-38b61ac9a946.png b/sprites/spr_mk3_left_leg_variants/9e7144c8-574e-488a-bdf9-38b61ac9a946.png deleted file mode 100644 index 01f6fe79df..0000000000 Binary files a/sprites/spr_mk3_left_leg_variants/9e7144c8-574e-488a-bdf9-38b61ac9a946.png and /dev/null differ diff --git a/sprites/spr_mk3_left_leg_variants/layers/04fc9961-d557-4205-a023-dd867df0fdfb/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_left_leg_variants/layers/04fc9961-d557-4205-a023-dd867df0fdfb/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png deleted file mode 100644 index 0e9a8a0e2c..0000000000 Binary files a/sprites/spr_mk3_left_leg_variants/layers/04fc9961-d557-4205-a023-dd867df0fdfb/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png and /dev/null differ diff --git a/sprites/spr_mk3_left_leg_variants/layers/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_left_leg_variants/layers/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png deleted file mode 100644 index 7bb2ce80b2..0000000000 Binary files a/sprites/spr_mk3_left_leg_variants/layers/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png and /dev/null differ diff --git a/sprites/spr_mk3_left_leg_variants/layers/9e7144c8-574e-488a-bdf9-38b61ac9a946/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_left_leg_variants/layers/9e7144c8-574e-488a-bdf9-38b61ac9a946/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png deleted file mode 100644 index 01f6fe79df..0000000000 Binary files a/sprites/spr_mk3_left_leg_variants/layers/9e7144c8-574e-488a-bdf9-38b61ac9a946/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png and /dev/null differ diff --git a/sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy b/sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy index 66536409a8..0645edda45 100644 --- a/sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy +++ b/sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_left_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d01d6cf-461d-456e-9332-abf118aaaad7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"319c9c02-ebc4-458c-aa5f-b95f2e64fb44","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1ca8578-2345-4f88-9c55-fdf39bfa917a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"81050e27-d210-414e-a369-43b4bc7e99af","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ab63ae6-5124-4282-8187-d7e41deef9c6","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d01d6cf-461d-456e-9332-abf118aaaad7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a8af0d51-b28c-46a8-aac6-63d9368e47c6","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"319c9c02-ebc4-458c-aa5f-b95f2e64fb44","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f73e16a-8b30-45b1-be18-c7aea78c9da1","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1ca8578-2345-4f88-9c55-fdf39bfa917a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f23ada7-84e2-4746-8e5c-f69e283899ef","path":"sprites/spr_mk3_left_trim/spr_mk3_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"81050e27-d210-414e-a369-43b4bc7e99af","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_mouth/spr_mk3_mouth.yy b/sprites/spr_mk3_mouth/spr_mk3_mouth.yy index 9b93205259..c3e5880934 100644 --- a/sprites/spr_mk3_mouth/spr_mk3_mouth.yy +++ b/sprites/spr_mk3_mouth/spr_mk3_mouth.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_mouth", "bboxMode":0, "bbox_bottom":50, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e591e43e-d3da-42fb-bc8f-4cbae3aca323","name":"e591e43e-d3da-42fb-bc8f-4cbae3aca323","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e591e43e-d3da-42fb-bc8f-4cbae3aca323","name":"e591e43e-d3da-42fb-bc8f-4cbae3aca323","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -66,6 +66,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy b/sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy index 0415cde918..def5a6f178 100644 --- a/sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy +++ b/sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_mouth_flame_cult", "bboxMode":0, "bbox_bottom":50, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dafbefe7-5ef7-4c6e-bf41-74e0fc0edf26","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"006f1fc6-2a40-4299-aedd-c8ec3435711f","path":"sprites/spr_mk3_mouth_flame_cult/spr_mk3_mouth_flame_cult.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dafbefe7-5ef7-4c6e-bf41-74e0fc0edf26","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy b/sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy index 156afba267..9485c29772 100644 --- a/sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy +++ b/sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_mouth_prussian", "bboxMode":0, "bbox_bottom":50, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"254cb1c4-26aa-429c-8253-fafc878744e7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"120c0dc2-09ee-43e7-8b97-23af2bfa96b6","path":"sprites/spr_mk3_mouth_prussian/spr_mk3_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"254cb1c4-26aa-429c-8253-fafc878744e7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy b/sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy index a7c433a8a7..8ac587699c 100644 --- a/sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy +++ b/sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_right_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","path":"sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fb663579-f17d-4461-829e-36f5f9b87989","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"10d9b570-f20a-499d-a9c7-e96a1044b0f5","path":"sprites/spr_mk3_right_arm/spr_mk3_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fb663579-f17d-4461-829e-36f5f9b87989","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_right_arm_shadow/6a57f22a-0d22-44d9-9f77-fc818daa157a.png b/sprites/spr_mk3_right_arm_shadow/6a57f22a-0d22-44d9-9f77-fc818daa157a.png new file mode 100644 index 0000000000..0bcbdb1e72 Binary files /dev/null and b/sprites/spr_mk3_right_arm_shadow/6a57f22a-0d22-44d9-9f77-fc818daa157a.png differ diff --git a/sprites/spr_mk3_right_arm_shadow/layers/6a57f22a-0d22-44d9-9f77-fc818daa157a/a36cc102-af8d-4321-bd66-cbf3f0ad2435.png b/sprites/spr_mk3_right_arm_shadow/layers/6a57f22a-0d22-44d9-9f77-fc818daa157a/a36cc102-af8d-4321-bd66-cbf3f0ad2435.png new file mode 100644 index 0000000000..0bcbdb1e72 Binary files /dev/null and b/sprites/spr_mk3_right_arm_shadow/layers/6a57f22a-0d22-44d9-9f77-fc818daa157a/a36cc102-af8d-4321-bd66-cbf3f0ad2435.png differ diff --git a/sprites/spr_mk3_right_arm_shadow/spr_mk3_right_arm_shadow.yy b/sprites/spr_mk3_right_arm_shadow/spr_mk3_right_arm_shadow.yy new file mode 100644 index 0000000000..5a41e00977 --- /dev/null +++ b/sprites/spr_mk3_right_arm_shadow/spr_mk3_right_arm_shadow.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_mk3_right_arm_shadow", + "bboxMode":0, + "bbox_bottom":125, + "bbox_left":15, + "bbox_right":42, + "bbox_top":67, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"6a57f22a-0d22-44d9-9f77-fc818daa157a","name":"6a57f22a-0d22-44d9-9f77-fc818daa157a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"a36cc102-af8d-4321-bd66-cbf3f0ad2435","blendMode":0,"displayName":"default","isLocked":false,"name":"a36cc102-af8d-4321-bd66-cbf3f0ad2435","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_mk3_right_arm_shadow", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"mk_3_complex", + "path":"folders/Sprites/Marine Viewer/body_types/mk_3_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_mk3_right_arm_shadow", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_mk3_right_arm_shadow", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6a57f22a-0d22-44d9-9f77-fc818daa157a","path":"sprites/spr_mk3_right_arm_shadow/spr_mk3_right_arm_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b0fbc816-005b-44a1-932d-b3f4ae5b718c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":164, +} \ No newline at end of file diff --git a/sprites/spr_mk3_right_knee/04fc9961-d557-4205-a023-dd867df0fdfb.png b/sprites/spr_mk3_right_knee/04fc9961-d557-4205-a023-dd867df0fdfb.png new file mode 100644 index 0000000000..aa85d16b24 Binary files /dev/null and b/sprites/spr_mk3_right_knee/04fc9961-d557-4205-a023-dd867df0fdfb.png differ diff --git a/sprites/spr_mk3_right_knee/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png b/sprites/spr_mk3_right_knee/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png new file mode 100644 index 0000000000..04d85b35f5 Binary files /dev/null and b/sprites/spr_mk3_right_knee/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png differ diff --git a/sprites/spr_mk3_right_knee/9e7144c8-574e-488a-bdf9-38b61ac9a946.png b/sprites/spr_mk3_right_knee/9e7144c8-574e-488a-bdf9-38b61ac9a946.png new file mode 100644 index 0000000000..e0214477c1 Binary files /dev/null and b/sprites/spr_mk3_right_knee/9e7144c8-574e-488a-bdf9-38b61ac9a946.png differ diff --git a/sprites/spr_mk3_right_knee/layers/04fc9961-d557-4205-a023-dd867df0fdfb/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_right_knee/layers/04fc9961-d557-4205-a023-dd867df0fdfb/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png new file mode 100644 index 0000000000..aa85d16b24 Binary files /dev/null and b/sprites/spr_mk3_right_knee/layers/04fc9961-d557-4205-a023-dd867df0fdfb/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png differ diff --git a/sprites/spr_mk3_right_knee/layers/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_right_knee/layers/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png new file mode 100644 index 0000000000..04d85b35f5 Binary files /dev/null and b/sprites/spr_mk3_right_knee/layers/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png differ diff --git a/sprites/spr_mk3_right_knee/layers/9e7144c8-574e-488a-bdf9-38b61ac9a946/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_right_knee/layers/9e7144c8-574e-488a-bdf9-38b61ac9a946/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png new file mode 100644 index 0000000000..e0214477c1 Binary files /dev/null and b/sprites/spr_mk3_right_knee/layers/9e7144c8-574e-488a-bdf9-38b61ac9a946/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png differ diff --git a/sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy b/sprites/spr_mk3_right_knee/spr_mk3_right_knee.yy similarity index 76% rename from sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy rename to sprites/spr_mk3_right_knee/spr_mk3_right_knee.yy index 240933b5a8..eb55587df6 100644 --- a/sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy +++ b/sprites/spr_mk3_right_knee/spr_mk3_right_knee.yy @@ -1,9 +1,9 @@ { - "$GMSprite":"", - "%Name":"spr_mk3_right_leg_variants", + "$GMSprite":"v2", + "%Name":"spr_mk3_right_knee", "bboxMode":0, - "bbox_bottom":220, - "bbox_left":11, + "bbox_bottom":169, + "bbox_left":27, "bbox_right":66, "bbox_top":133, "collisionKind":1, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"04fc9961-d557-4205-a023-dd867df0fdfb","name":"04fc9961-d557-4205-a023-dd867df0fdfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"04fc9961-d557-4205-a023-dd867df0fdfb","name":"04fc9961-d557-4205-a023-dd867df0fdfb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -23,7 +23,7 @@ "layers":[ {"$GMImageLayer":"","%Name":"9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387","blendMode":0,"displayName":"default","isLocked":false,"name":"9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "name":"spr_mk3_right_leg_variants", + "name":"spr_mk3_right_knee", "nineSlice":null, "origin":9, "parent":{ @@ -35,7 +35,7 @@ "resourceVersion":"2.0", "sequence":{ "$GMSequence":"v1", - "%Name":"spr_mk3_right_leg_variants", + "%Name":"spr_mk3_right_knee", "autoRecord":true, "backdropHeight":768, "backdropImageOpacity":0.5, @@ -59,25 +59,27 @@ "resourceType":"KeyframeStore", "resourceVersion":"2.0", }, - "name":"spr_mk3_right_leg_variants", + "name":"spr_mk3_right_knee", "playback":1, "playbackSpeed":30.0, "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ac1a90e-a16e-421a-8a7c-2edb61a4b0df","path":"sprites/spr_mk3_right_knee/spr_mk3_right_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"fb1bc77b-386e-404a-84af-e5941220ad0c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e7144c8-574e-488a-bdf9-38b61ac9a946","path":"sprites/spr_mk3_right_knee/spr_mk3_right_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"3d485ac5-c0cd-4580-a56b-a873feaf2900","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"04fc9961-d557-4205-a023-dd867df0fdfb","path":"sprites/spr_mk3_right_leg_variants/spr_mk3_right_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"04fc9961-d557-4205-a023-dd867df0fdfb","path":"sprites/spr_mk3_right_knee/spr_mk3_right_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"7ee4fbca-f448-4cd3-b4a5-259657157ff5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], diff --git a/sprites/spr_mk3_right_leg_variants/04fc9961-d557-4205-a023-dd867df0fdfb.png b/sprites/spr_mk3_right_leg_variants/04fc9961-d557-4205-a023-dd867df0fdfb.png deleted file mode 100644 index a98e27c591..0000000000 Binary files a/sprites/spr_mk3_right_leg_variants/04fc9961-d557-4205-a023-dd867df0fdfb.png and /dev/null differ diff --git a/sprites/spr_mk3_right_leg_variants/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png b/sprites/spr_mk3_right_leg_variants/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png deleted file mode 100644 index 2e1bb6140d..0000000000 Binary files a/sprites/spr_mk3_right_leg_variants/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df.png and /dev/null differ diff --git a/sprites/spr_mk3_right_leg_variants/9e7144c8-574e-488a-bdf9-38b61ac9a946.png b/sprites/spr_mk3_right_leg_variants/9e7144c8-574e-488a-bdf9-38b61ac9a946.png deleted file mode 100644 index 948404f573..0000000000 Binary files a/sprites/spr_mk3_right_leg_variants/9e7144c8-574e-488a-bdf9-38b61ac9a946.png and /dev/null differ diff --git a/sprites/spr_mk3_right_leg_variants/layers/04fc9961-d557-4205-a023-dd867df0fdfb/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_right_leg_variants/layers/04fc9961-d557-4205-a023-dd867df0fdfb/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png deleted file mode 100644 index a98e27c591..0000000000 Binary files a/sprites/spr_mk3_right_leg_variants/layers/04fc9961-d557-4205-a023-dd867df0fdfb/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png and /dev/null differ diff --git a/sprites/spr_mk3_right_leg_variants/layers/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_right_leg_variants/layers/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png deleted file mode 100644 index 2e1bb6140d..0000000000 Binary files a/sprites/spr_mk3_right_leg_variants/layers/1ac1a90e-a16e-421a-8a7c-2edb61a4b0df/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png and /dev/null differ diff --git a/sprites/spr_mk3_right_leg_variants/layers/9e7144c8-574e-488a-bdf9-38b61ac9a946/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png b/sprites/spr_mk3_right_leg_variants/layers/9e7144c8-574e-488a-bdf9-38b61ac9a946/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png deleted file mode 100644 index 948404f573..0000000000 Binary files a/sprites/spr_mk3_right_leg_variants/layers/9e7144c8-574e-488a-bdf9-38b61ac9a946/9f0d4e11-dbb4-4a1d-a21b-c96ba3d82387.png and /dev/null differ diff --git a/sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy b/sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy index e82663c276..bd189343d2 100644 --- a/sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy +++ b/sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_right_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"42c93ebb-31a5-4529-add7-5c4ada48da57","name":"42c93ebb-31a5-4529-add7-5c4ada48da57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e8f2b623-db31-44d0-a510-ff212dd3f269","name":"e8f2b623-db31-44d0-a510-ff212dd3f269","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3046bd80-d3fb-4878-b070-c42a135928aa","name":"3046bd80-d3fb-4878-b070-c42a135928aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42c93ebb-31a5-4529-add7-5c4ada48da57","name":"42c93ebb-31a5-4529-add7-5c4ada48da57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8f2b623-db31-44d0-a510-ff212dd3f269","name":"e8f2b623-db31-44d0-a510-ff212dd3f269","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3046bd80-d3fb-4878-b070-c42a135928aa","name":"3046bd80-d3fb-4878-b070-c42a135928aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42c93ebb-31a5-4529-add7-5c4ada48da57","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a1a6de8-928a-4b5a-9b92-1eaa80fc4171","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8f2b623-db31-44d0-a510-ff212dd3f269","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c7301961-da67-453e-a396-070fac8dfbe4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3046bd80-d3fb-4878-b070-c42a135928aa","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f71392e9-e16c-4d5b-836f-daa455a41de5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4ab6e5b-4e60-4125-ad0e-f195ed660e71","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"42c93ebb-31a5-4529-add7-5c4ada48da57","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a1a6de8-928a-4b5a-9b92-1eaa80fc4171","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8f2b623-db31-44d0-a510-ff212dd3f269","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c7301961-da67-453e-a396-070fac8dfbe4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3046bd80-d3fb-4878-b070-c42a135928aa","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f71392e9-e16c-4d5b-836f-daa455a41de5","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6e5adf0-e385-406b-8e12-f57ab1666a3e","path":"sprites/spr_mk3_right_trim/spr_mk3_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4ab6e5b-4e60-4125-ad0e-f195ed660e71","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk3_runic_chest/spr_mk3_runic_chest.yy b/sprites/spr_mk3_runic_chest/spr_mk3_runic_chest.yy index 0c29273b65..7ada504a64 100644 --- a/sprites/spr_mk3_runic_chest/spr_mk3_runic_chest.yy +++ b/sprites/spr_mk3_runic_chest/spr_mk3_runic_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk3_runic_chest", "bboxMode":0, "bbox_bottom":96, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"653c0ec0-9752-43fa-836d-887cd38798e4","name":"653c0ec0-9752-43fa-836d-887cd38798e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"653c0ec0-9752-43fa-836d-887cd38798e4","name":"653c0ec0-9752-43fa-836d-887cd38798e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,9 +71,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"653c0ec0-9752-43fa-836d-887cd38798e4","path":"sprites/spr_mk3_runic_chest/spr_mk3_runic_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a61bcf7-973c-45fd-8623-cd2e2aa417c7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"653c0ec0-9752-43fa-836d-887cd38798e4","path":"sprites/spr_mk3_runic_chest/spr_mk3_runic_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a61bcf7-973c-45fd-8623-cd2e2aa417c7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy b/sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy index 49f2fb8653..e9ec6f688f 100644 --- a/sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy +++ b/sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_chest_fastenings", "bboxMode":0, "bbox_bottom":86, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"40c77a23-0d91-41c3-865e-885ca7f6df03","name":"40c77a23-0d91-41c3-865e-885ca7f6df03","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f99c987b-7a91-4dc7-b79f-d53299f70551","name":"f99c987b-7a91-4dc7-b79f-d53299f70551","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0de91ff0-be17-4fd1-9a82-01f42330261b","name":"0de91ff0-be17-4fd1-9a82-01f42330261b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40c77a23-0d91-41c3-865e-885ca7f6df03","name":"40c77a23-0d91-41c3-865e-885ca7f6df03","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f99c987b-7a91-4dc7-b79f-d53299f70551","name":"f99c987b-7a91-4dc7-b79f-d53299f70551","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0de91ff0-be17-4fd1-9a82-01f42330261b","name":"0de91ff0-be17-4fd1-9a82-01f42330261b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40c77a23-0d91-41c3-865e-885ca7f6df03","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a66f3f85-cd83-4651-aa90-f25bca60da0e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02831958-f299-4f70-8116-3a658fe588dc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f99c987b-7a91-4dc7-b79f-d53299f70551","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fecadf85-a338-45ac-b302-0176bfbe27c0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0de91ff0-be17-4fd1-9a82-01f42330261b","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c2871da1-9fb5-4779-b942-07e5460892a5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40c77a23-0d91-41c3-865e-885ca7f6df03","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a66f3f85-cd83-4651-aa90-f25bca60da0e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"390fa6ba-721f-4bdc-8b11-b7012f417f0e","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02831958-f299-4f70-8116-3a658fe588dc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f99c987b-7a91-4dc7-b79f-d53299f70551","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fecadf85-a338-45ac-b302-0176bfbe27c0","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0de91ff0-be17-4fd1-9a82-01f42330261b","path":"sprites/spr_mk4_chest_fastenings/spr_mk4_chest_fastenings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c2871da1-9fb5-4779-b942-07e5460892a5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy b/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy index 87cc444d39..21ec0fa38b 100644 --- a/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy +++ b/sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_chest_variants", "bboxMode":0, "bbox_bottom":209, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d25b0580-a514-4932-b9cf-76ae2aa29221","name":"d25b0580-a514-4932-b9cf-76ae2aa29221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d25b0580-a514-4932-b9cf-76ae2aa29221","name":"d25b0580-a514-4932-b9cf-76ae2aa29221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e2036e56-f8b6-467a-aef9-1d6ca203ba9e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d25b0580-a514-4932-b9cf-76ae2aa29221","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d411f29-8d00-43d6-8673-d7432df20309","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e2036e56-f8b6-467a-aef9-1d6ca203ba9e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d25b0580-a514-4932-b9cf-76ae2aa29221","path":"sprites/spr_mk4_chest_variants/spr_mk4_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d411f29-8d00-43d6-8673-d7432df20309","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_colors/spr_mk4_colors.yy b/sprites/spr_mk4_colors/spr_mk4_colors.yy index ceb0ce685c..345737a2a3 100644 --- a/sprites/spr_mk4_colors/spr_mk4_colors.yy +++ b/sprites/spr_mk4_colors/spr_mk4_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_colors", "bboxMode":0, "bbox_bottom":220, @@ -12,22 +12,22 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ebd378bb-3414-47cd-913e-98f9b2d84e58","name":"ebd378bb-3414-47cd-913e-98f9b2d84e58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1576158-84f7-41d2-a0d5-619c7102a3ed","name":"e1576158-84f7-41d2-a0d5-619c7102a3ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ef957394-0489-40b0-8de1-ccb1bf729ab2","name":"ef957394-0489-40b0-8de1-ccb1bf729ab2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a907589-e0bd-4850-8d4c-e62bde16e5d7","name":"3a907589-e0bd-4850-8d4c-e62bde16e5d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"287f6d48-afc4-4934-99e3-6a793feaea68","name":"287f6d48-afc4-4934-99e3-6a793feaea68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"217d09b5-981f-4d58-99c5-84e9d0ddb228","name":"217d09b5-981f-4d58-99c5-84e9d0ddb228","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3059d51d-11a6-4332-933f-f0d0fb58181e","name":"3059d51d-11a6-4332-933f-f0d0fb58181e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2e3dca8f-5e82-4e7a-ad81-ef7299a53953","name":"2e3dca8f-5e82-4e7a-ad81-ef7299a53953","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ba787f16-e814-44a6-a629-1f617ec2ff7b","name":"ba787f16-e814-44a6-a629-1f617ec2ff7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"56ffc0a1-d21a-45f0-8b3e-88025e688764","name":"56ffc0a1-d21a-45f0-8b3e-88025e688764","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1aa3f769-e8d1-4eef-95b8-dcce13298745","name":"1aa3f769-e8d1-4eef-95b8-dcce13298745","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eed7f8d5-4b8d-42a9-a6ed-1372de345d3d","name":"eed7f8d5-4b8d-42a9-a6ed-1372de345d3d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7308a14a-e119-45cb-a60b-73cd37a1cd6a","name":"7308a14a-e119-45cb-a60b-73cd37a1cd6a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0e01d65-f432-411b-b673-239c5bfaf45b","name":"e0e01d65-f432-411b-b673-239c5bfaf45b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4c8d673e-7d42-4987-b107-684a037cf5b6","name":"4c8d673e-7d42-4987-b107-684a037cf5b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3adeb78-1cf8-4a2a-a4d2-99183b2e36e5","name":"e3adeb78-1cf8-4a2a-a4d2-99183b2e36e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ebd378bb-3414-47cd-913e-98f9b2d84e58","name":"ebd378bb-3414-47cd-913e-98f9b2d84e58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1576158-84f7-41d2-a0d5-619c7102a3ed","name":"e1576158-84f7-41d2-a0d5-619c7102a3ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ef957394-0489-40b0-8de1-ccb1bf729ab2","name":"ef957394-0489-40b0-8de1-ccb1bf729ab2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a907589-e0bd-4850-8d4c-e62bde16e5d7","name":"3a907589-e0bd-4850-8d4c-e62bde16e5d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"287f6d48-afc4-4934-99e3-6a793feaea68","name":"287f6d48-afc4-4934-99e3-6a793feaea68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"217d09b5-981f-4d58-99c5-84e9d0ddb228","name":"217d09b5-981f-4d58-99c5-84e9d0ddb228","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3059d51d-11a6-4332-933f-f0d0fb58181e","name":"3059d51d-11a6-4332-933f-f0d0fb58181e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2e3dca8f-5e82-4e7a-ad81-ef7299a53953","name":"2e3dca8f-5e82-4e7a-ad81-ef7299a53953","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba787f16-e814-44a6-a629-1f617ec2ff7b","name":"ba787f16-e814-44a6-a629-1f617ec2ff7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"56ffc0a1-d21a-45f0-8b3e-88025e688764","name":"56ffc0a1-d21a-45f0-8b3e-88025e688764","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1aa3f769-e8d1-4eef-95b8-dcce13298745","name":"1aa3f769-e8d1-4eef-95b8-dcce13298745","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eed7f8d5-4b8d-42a9-a6ed-1372de345d3d","name":"eed7f8d5-4b8d-42a9-a6ed-1372de345d3d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7308a14a-e119-45cb-a60b-73cd37a1cd6a","name":"7308a14a-e119-45cb-a60b-73cd37a1cd6a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0e01d65-f432-411b-b673-239c5bfaf45b","name":"e0e01d65-f432-411b-b673-239c5bfaf45b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4c8d673e-7d42-4987-b107-684a037cf5b6","name":"4c8d673e-7d42-4987-b107-684a037cf5b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3adeb78-1cf8-4a2a-a4d2-99183b2e36e5","name":"e3adeb78-1cf8-4a2a-a4d2-99183b2e36e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -83,54 +83,22 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebd378bb-3414-47cd-913e-98f9b2d84e58","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7aa7ae2b-508c-4b78-8b26-237fb4b31279","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1576158-84f7-41d2-a0d5-619c7102a3ed","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf163fbb-78e4-4e41-b583-c67bc8097d1e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef957394-0489-40b0-8de1-ccb1bf729ab2","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"48f0d3d6-843e-48e9-b1d3-421527bee669","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a907589-e0bd-4850-8d4c-e62bde16e5d7","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd09e29d-514b-4234-8e70-7413f027cb01","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"287f6d48-afc4-4934-99e3-6a793feaea68","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4f613c2c-fd00-4733-a64b-d4ca2796b1b0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"217d09b5-981f-4d58-99c5-84e9d0ddb228","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9539d417-e1c9-4696-8cfe-4e498ec1ee40","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3059d51d-11a6-4332-933f-f0d0fb58181e","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fecb5fb1-8817-4d28-beb0-77282063505b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e3dca8f-5e82-4e7a-ad81-ef7299a53953","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f412f3c5-96fc-42e6-8f43-b2380baf6041","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba787f16-e814-44a6-a629-1f617ec2ff7b","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c16c7cb7-ce94-4501-8c83-cd879c4539f4","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"56ffc0a1-d21a-45f0-8b3e-88025e688764","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be6d5e73-096b-420a-a3d8-ce62602f57b3","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1aa3f769-e8d1-4eef-95b8-dcce13298745","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e3d0df4-9ad4-4629-9392-f873a64462a5","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eed7f8d5-4b8d-42a9-a6ed-1372de345d3d","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6d05ec9-749e-456c-84e7-a1ce56d2b2dd","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7308a14a-e119-45cb-a60b-73cd37a1cd6a","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"48ea3a9e-cee6-444d-b1da-6a83aab91101","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0e01d65-f432-411b-b673-239c5bfaf45b","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"626bd8a0-7388-4c79-9cfc-6815424a3f97","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c8d673e-7d42-4987-b107-684a037cf5b6","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"421b2d1c-319b-47d8-b080-e9e0b349b065","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3adeb78-1cf8-4a2a-a4d2-99183b2e36e5","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"936e4486-47a9-4643-b27b-70c3ab2f2e00","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebd378bb-3414-47cd-913e-98f9b2d84e58","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7aa7ae2b-508c-4b78-8b26-237fb4b31279","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1576158-84f7-41d2-a0d5-619c7102a3ed","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf163fbb-78e4-4e41-b583-c67bc8097d1e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef957394-0489-40b0-8de1-ccb1bf729ab2","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"48f0d3d6-843e-48e9-b1d3-421527bee669","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a907589-e0bd-4850-8d4c-e62bde16e5d7","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd09e29d-514b-4234-8e70-7413f027cb01","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"287f6d48-afc4-4934-99e3-6a793feaea68","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4f613c2c-fd00-4733-a64b-d4ca2796b1b0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"217d09b5-981f-4d58-99c5-84e9d0ddb228","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9539d417-e1c9-4696-8cfe-4e498ec1ee40","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3059d51d-11a6-4332-933f-f0d0fb58181e","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fecb5fb1-8817-4d28-beb0-77282063505b","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e3dca8f-5e82-4e7a-ad81-ef7299a53953","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f412f3c5-96fc-42e6-8f43-b2380baf6041","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba787f16-e814-44a6-a629-1f617ec2ff7b","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c16c7cb7-ce94-4501-8c83-cd879c4539f4","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"56ffc0a1-d21a-45f0-8b3e-88025e688764","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be6d5e73-096b-420a-a3d8-ce62602f57b3","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1aa3f769-e8d1-4eef-95b8-dcce13298745","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e3d0df4-9ad4-4629-9392-f873a64462a5","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eed7f8d5-4b8d-42a9-a6ed-1372de345d3d","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6d05ec9-749e-456c-84e7-a1ce56d2b2dd","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7308a14a-e119-45cb-a60b-73cd37a1cd6a","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"48ea3a9e-cee6-444d-b1da-6a83aab91101","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0e01d65-f432-411b-b673-239c5bfaf45b","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"626bd8a0-7388-4c79-9cfc-6815424a3f97","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c8d673e-7d42-4987-b107-684a037cf5b6","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"421b2d1c-319b-47d8-b080-e9e0b349b065","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3adeb78-1cf8-4a2a-a4d2-99183b2e36e5","path":"sprites/spr_mk4_colors/spr_mk4_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"936e4486-47a9-4643-b27b-70c3ab2f2e00","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_complex/40cfe8bd-f11d-4d74-a157-47d58c39d7e8.png b/sprites/spr_mk4_complex/40cfe8bd-f11d-4d74-a157-47d58c39d7e8.png index 9ef4c15cf3..e66fa68383 100644 Binary files a/sprites/spr_mk4_complex/40cfe8bd-f11d-4d74-a157-47d58c39d7e8.png and b/sprites/spr_mk4_complex/40cfe8bd-f11d-4d74-a157-47d58c39d7e8.png differ diff --git a/sprites/spr_mk4_complex/layers/40cfe8bd-f11d-4d74-a157-47d58c39d7e8/e7b69ad2-206a-4f32-ade6-1a7c0f38210f.png b/sprites/spr_mk4_complex/layers/40cfe8bd-f11d-4d74-a157-47d58c39d7e8/e7b69ad2-206a-4f32-ade6-1a7c0f38210f.png index c70aabb18d..11b9d64740 100644 Binary files a/sprites/spr_mk4_complex/layers/40cfe8bd-f11d-4d74-a157-47d58c39d7e8/e7b69ad2-206a-4f32-ade6-1a7c0f38210f.png and b/sprites/spr_mk4_complex/layers/40cfe8bd-f11d-4d74-a157-47d58c39d7e8/e7b69ad2-206a-4f32-ade6-1a7c0f38210f.png differ diff --git a/sprites/spr_mk4_complex/spr_mk4_complex.yy b/sprites/spr_mk4_complex/spr_mk4_complex.yy index 4d0c73e8db..0bd256c69c 100644 --- a/sprites/spr_mk4_complex/spr_mk4_complex.yy +++ b/sprites/spr_mk4_complex/spr_mk4_complex.yy @@ -1,18 +1,18 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_complex", "bboxMode":0, "bbox_bottom":220, - "bbox_left":11, - "bbox_right":152, - "bbox_top":28, + "bbox_left":12, + "bbox_right":151, + "bbox_top":31, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","name":"40cfe8bd-f11d-4d74-a157-47d58c39d7e8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk4_complex_backpack/a43406eb-6236-415d-9902-e818a2185ba9.png b/sprites/spr_mk4_complex_backpack/a43406eb-6236-415d-9902-e818a2185ba9.png index f5c405e1be..5a81f71033 100644 Binary files a/sprites/spr_mk4_complex_backpack/a43406eb-6236-415d-9902-e818a2185ba9.png and b/sprites/spr_mk4_complex_backpack/a43406eb-6236-415d-9902-e818a2185ba9.png differ diff --git a/sprites/spr_mk4_complex_backpack/layers/a43406eb-6236-415d-9902-e818a2185ba9/32295d2f-e43c-4d2b-a49d-2a445111c733.png b/sprites/spr_mk4_complex_backpack/layers/a43406eb-6236-415d-9902-e818a2185ba9/32295d2f-e43c-4d2b-a49d-2a445111c733.png index f5c405e1be..5a81f71033 100644 Binary files a/sprites/spr_mk4_complex_backpack/layers/a43406eb-6236-415d-9902-e818a2185ba9/32295d2f-e43c-4d2b-a49d-2a445111c733.png and b/sprites/spr_mk4_complex_backpack/layers/a43406eb-6236-415d-9902-e818a2185ba9/32295d2f-e43c-4d2b-a49d-2a445111c733.png differ diff --git a/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy b/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy index b1a2e5eee8..9535b4368b 100644 --- a/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy +++ b/sprites/spr_mk4_complex_backpack/spr_mk4_complex_backpack.yy @@ -1,22 +1,22 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_complex_backpack", "bboxMode":0, - "bbox_bottom":35, + "bbox_bottom":80, "bbox_left":34, "bbox_right":129, - "bbox_top":14, + "bbox_top":59, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a43406eb-6236-415d-9902-e818a2185ba9","name":"a43406eb-6236-415d-9902-e818a2185ba9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a43406eb-6236-415d-9902-e818a2185ba9","name":"a43406eb-6236-415d-9902-e818a2185ba9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, - "height":232, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"32295d2f-e43c-4d2b-a49d-2a445111c733","blendMode":0,"displayName":"default","isLocked":false,"name":"32295d2f-e43c-4d2b-a49d-2a445111c733","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":-2, - "yorigin":0, + "xorigin":0, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy b/sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy index 47b9a44e7d..00d995fe64 100644 --- a/sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy +++ b/sprites/spr_mk4_head_variants/spr_mk4_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_head_variants", "bboxMode":0, "bbox_bottom":45, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy b/sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy index edd67fd904..483b6c7c74 100644 --- a/sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy +++ b/sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_left_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d132fab6-39de-405e-b127-9f335cf85536","name":"d132fab6-39de-405e-b127-9f335cf85536","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d132fab6-39de-405e-b127-9f335cf85536","name":"d132fab6-39de-405e-b127-9f335cf85536","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d132fab6-39de-405e-b127-9f335cf85536","path":"sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0853379d-62d4-401d-bdeb-8b64cac8fbfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d132fab6-39de-405e-b127-9f335cf85536","path":"sprites/spr_mk4_left_arm/spr_mk4_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0853379d-62d4-401d-bdeb-8b64cac8fbfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy b/sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy index 6ea8cc3a67..8ef77826c5 100644 --- a/sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy +++ b/sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_left_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d128442-bf77-4769-8d75-a63dd3942ff8","name":"7d128442-bf77-4769-8d75-a63dd3942ff8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0f4435dc-8ba2-40a6-a643-d38318383c10","name":"0f4435dc-8ba2-40a6-a643-d38318383c10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d128442-bf77-4769-8d75-a63dd3942ff8","name":"7d128442-bf77-4769-8d75-a63dd3942ff8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0f4435dc-8ba2-40a6-a643-d38318383c10","name":"0f4435dc-8ba2-40a6-a643-d38318383c10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"baf60be2-46a1-4588-a03b-762baa867599","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d128442-bf77-4769-8d75-a63dd3942ff8","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e63d2dd-b459-434d-93fd-4607df6dd69a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f4435dc-8ba2-40a6-a643-d38318383c10","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8dcb92ec-fd8d-4cc6-9285-dbb186051c10","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b38845bb-5261-4b58-b135-a5718fb726f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8bd7e56-9dc2-4b90-a286-403f37e35f36","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9e92ecb-d3e8-4554-b608-47b47aa79876","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"baf60be2-46a1-4588-a03b-762baa867599","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d128442-bf77-4769-8d75-a63dd3942ff8","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e63d2dd-b459-434d-93fd-4607df6dd69a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f4435dc-8ba2-40a6-a643-d38318383c10","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8dcb92ec-fd8d-4cc6-9285-dbb186051c10","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ccdf7cd6-d258-4f76-9fd9-65b076861997","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b38845bb-5261-4b58-b135-a5718fb726f0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f5e0817a-c222-4bd1-b7af-957a96c6334d","path":"sprites/spr_mk4_left_trim/spr_mk4_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8bd7e56-9dc2-4b90-a286-403f37e35f36","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy b/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy index 17020ec82d..5767518ca5 100644 --- a/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy +++ b/sprites/spr_mk4_leg_variants/spr_mk4_leg_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_leg_variants", "bboxMode":0, "bbox_bottom":193, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f5551e24-09d8-40c0-888e-0e5818c0c403","name":"f5551e24-09d8-40c0-888e-0e5818c0c403","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"79b13155-0f85-4e11-9fef-324bf6e87d15","name":"79b13155-0f85-4e11-9fef-324bf6e87d15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f5551e24-09d8-40c0-888e-0e5818c0c403","name":"f5551e24-09d8-40c0-888e-0e5818c0c403","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","name":"7801e3ee-eaad-4b34-af43-c6c9080b2caf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79b13155-0f85-4e11-9fef-324bf6e87d15","name":"79b13155-0f85-4e11-9fef-324bf6e87d15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","name":"f43f9098-5ab6-4ea9-9d2c-9be14d2214b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -66,6 +66,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy b/sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy index 6c4ad5dd18..cd2bd79456 100644 --- a/sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy +++ b/sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_mongol_chest_variants", "bboxMode":0, "bbox_bottom":79, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2cfc06ab-7db9-40db-8c02-32b555a577e4","name":"2cfc06ab-7db9-40db-8c02-32b555a577e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2cfc06ab-7db9-40db-8c02-32b555a577e4","name":"2cfc06ab-7db9-40db-8c02-32b555a577e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cfc06ab-7db9-40db-8c02-32b555a577e4","path":"sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2132b90-0c80-46bb-88ef-de7faad10ae5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cfc06ab-7db9-40db-8c02-32b555a577e4","path":"sprites/spr_mk4_mongol_chest_variants/spr_mk4_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2132b90-0c80-46bb-88ef-de7faad10ae5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy b/sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy index 2d2b81f60d..a6fc9e6f7f 100644 --- a/sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy +++ b/sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_mongol_hat", "bboxMode":0, "bbox_bottom":29, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"776f298a-8428-4cd5-8716-592b704fce94","name":"776f298a-8428-4cd5-8716-592b704fce94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"776f298a-8428-4cd5-8716-592b704fce94","name":"776f298a-8428-4cd5-8716-592b704fce94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"776f298a-8428-4cd5-8716-592b704fce94","path":"sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"83c1deea-feff-46bd-b99b-36c3d05c4bbb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"776f298a-8428-4cd5-8716-592b704fce94","path":"sprites/spr_mk4_mongol_hat/spr_mk4_mongol_hat.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"83c1deea-feff-46bd-b99b-36c3d05c4bbb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy b/sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy index 5f36bc2308..8a776f1f85 100644 --- a/sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy +++ b/sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_mouth_variants", "bboxMode":0, "bbox_bottom":43, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7cb87107-55af-49a2-967f-fce654e6d0b2","name":"7cb87107-55af-49a2-967f-fce654e6d0b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f57e6879-ac68-40d0-900d-57fff9a35503","name":"f57e6879-ac68-40d0-900d-57fff9a35503","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7cb87107-55af-49a2-967f-fce654e6d0b2","name":"7cb87107-55af-49a2-967f-fce654e6d0b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f57e6879-ac68-40d0-900d-57fff9a35503","name":"f57e6879-ac68-40d0-900d-57fff9a35503","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fdd2c8c8-f92b-409f-b185-8b6f7db1b8aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cb87107-55af-49a2-967f-fce654e6d0b2","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc1900e1-e6ba-42d6-8d89-f59b501502a7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f57e6879-ac68-40d0-900d-57fff9a35503","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c312846-f775-44d4-9710-5e49bda55667","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b40c0e7a-d4dc-4bf6-91f0-72ce317e597d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8b4f09f8-23a8-455e-a154-20561e393423","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b8ef32c-78f9-46d9-8e67-7f619d1c5356","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fdd2c8c8-f92b-409f-b185-8b6f7db1b8aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7cb87107-55af-49a2-967f-fce654e6d0b2","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc1900e1-e6ba-42d6-8d89-f59b501502a7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f57e6879-ac68-40d0-900d-57fff9a35503","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c312846-f775-44d4-9710-5e49bda55667","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6d34f74-449c-4ef2-b6cf-700cbce5ac09","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b40c0e7a-d4dc-4bf6-91f0-72ce317e597d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"208e4971-e34d-4d7f-95dd-adc79dd8f0fd","path":"sprites/spr_mk4_mouth_variants/spr_mk4_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8b4f09f8-23a8-455e-a154-20561e393423","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy b/sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy index 08acf87610..d015ece017 100644 --- a/sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy +++ b/sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_right_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"691da313-acdf-4e3b-8a61-65b5199f6f21","name":"691da313-acdf-4e3b-8a61-65b5199f6f21","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"691da313-acdf-4e3b-8a61-65b5199f6f21","name":"691da313-acdf-4e3b-8a61-65b5199f6f21","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"691da313-acdf-4e3b-8a61-65b5199f6f21","path":"sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6246d1fe-0f1d-44a4-876f-79b2e85b226a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"691da313-acdf-4e3b-8a61-65b5199f6f21","path":"sprites/spr_mk4_right_arm/spr_mk4_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6246d1fe-0f1d-44a4-876f-79b2e85b226a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk4_right_arm_shadow/3d13dae2-7b70-44aa-8549-cbb2c2dbc424.png b/sprites/spr_mk4_right_arm_shadow/3d13dae2-7b70-44aa-8549-cbb2c2dbc424.png new file mode 100644 index 0000000000..a519247762 Binary files /dev/null and b/sprites/spr_mk4_right_arm_shadow/3d13dae2-7b70-44aa-8549-cbb2c2dbc424.png differ diff --git a/sprites/spr_mk4_right_arm_shadow/layers/3d13dae2-7b70-44aa-8549-cbb2c2dbc424/15ec2c68-c987-495a-ad96-2f90a4749ca3.png b/sprites/spr_mk4_right_arm_shadow/layers/3d13dae2-7b70-44aa-8549-cbb2c2dbc424/15ec2c68-c987-495a-ad96-2f90a4749ca3.png new file mode 100644 index 0000000000..a519247762 Binary files /dev/null and b/sprites/spr_mk4_right_arm_shadow/layers/3d13dae2-7b70-44aa-8549-cbb2c2dbc424/15ec2c68-c987-495a-ad96-2f90a4749ca3.png differ diff --git a/sprites/spr_mk4_right_arm_shadow/spr_mk4_right_arm_shadow.yy b/sprites/spr_mk4_right_arm_shadow/spr_mk4_right_arm_shadow.yy new file mode 100644 index 0000000000..2a9c3ae82a --- /dev/null +++ b/sprites/spr_mk4_right_arm_shadow/spr_mk4_right_arm_shadow.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_mk4_right_arm_shadow", + "bboxMode":0, + "bbox_bottom":125, + "bbox_left":13, + "bbox_right":45, + "bbox_top":66, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"3d13dae2-7b70-44aa-8549-cbb2c2dbc424","name":"3d13dae2-7b70-44aa-8549-cbb2c2dbc424","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"15ec2c68-c987-495a-ad96-2f90a4749ca3","blendMode":0,"displayName":"default","isLocked":false,"name":"15ec2c68-c987-495a-ad96-2f90a4749ca3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_mk4_right_arm_shadow", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"mk_4_complex", + "path":"folders/Sprites/Marine Viewer/body_types/mk_4_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_mk4_right_arm_shadow", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_mk4_right_arm_shadow", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d13dae2-7b70-44aa-8549-cbb2c2dbc424","path":"sprites/spr_mk4_right_arm_shadow/spr_mk4_right_arm_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f71a2b82-4ed7-4326-8120-bacd0e4bcda0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":-2, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":164, +} \ No newline at end of file diff --git a/sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy b/sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy index cea29f3409..09f51c6865 100644 --- a/sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy +++ b/sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk4_right_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9f939d89-30fc-4492-a4fe-b12fa412f437","name":"9f939d89-30fc-4492-a4fe-b12fa412f437","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f939d89-30fc-4492-a4fe-b12fa412f437","name":"9f939d89-30fc-4492-a4fe-b12fa412f437","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f939d89-30fc-4492-a4fe-b12fa412f437","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ad3f6b6-0d9e-474b-accc-e820942fdad5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d3ed260-00ee-4573-9de6-a47b932a55aa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce299549-2c09-47b2-b44d-2306b8c0c2b4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54242b24-25bc-4088-a2c4-fdf65553d805","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a90700c3-30df-47fe-adcd-a32ef97a91b0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f939d89-30fc-4492-a4fe-b12fa412f437","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ad3f6b6-0d9e-474b-accc-e820942fdad5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6047874-066e-4ed2-a09a-5f16b7bd84ab","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d3ed260-00ee-4573-9de6-a47b932a55aa","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fd016a6-7fcc-4d09-97f5-dea1a98b9905","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce299549-2c09-47b2-b44d-2306b8c0c2b4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b92f2fa-575c-4297-b3a2-ed23e70cd1d5","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54242b24-25bc-4088-a2c4-fdf65553d805","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb840ad0-a0d4-4c50-83c4-1dcf5f0dfc2c","path":"sprites/spr_mk4_right_trim/spr_mk4_right_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a90700c3-30df-47fe-adcd-a32ef97a91b0","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy b/sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy index d748da46c8..7065380fff 100644 --- a/sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy +++ b/sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_chest_variants", "bboxMode":0, "bbox_bottom":97, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bafabbd7-db90-49f5-9bc8-8b338ebf2ca3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_mk5_chest_variants/spr_mk5_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bafabbd7-db90-49f5-9bc8-8b338ebf2ca3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk5_colors/spr_mk5_colors.yy b/sprites/spr_mk5_colors/spr_mk5_colors.yy index 152cccd4cc..87ae564ee9 100644 --- a/sprites/spr_mk5_colors/spr_mk5_colors.yy +++ b/sprites/spr_mk5_colors/spr_mk5_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_colors", "bboxMode":0, "bbox_bottom":220, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e925f8dc-f68b-4b57-b349-aaf54f977dcf","name":"e925f8dc-f68b-4b57-b349-aaf54f977dcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2fbec92e-84b0-498f-9725-3e0eed5c65ff","name":"2fbec92e-84b0-498f-9725-3e0eed5c65ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f0165640-a879-40ab-8fc1-1109f6c8ad1d","name":"f0165640-a879-40ab-8fc1-1109f6c8ad1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03b9eef3-bac8-4c92-b391-60154466ea63","name":"03b9eef3-bac8-4c92-b391-60154466ea63","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f1a5d458-e6c0-4fda-a64c-d0a69dbccf3f","name":"f1a5d458-e6c0-4fda-a64c-d0a69dbccf3f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"525390cd-8f5d-4f17-b373-e7523c71e756","name":"525390cd-8f5d-4f17-b373-e7523c71e756","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"824057dd-57d8-4988-81ad-7843670e525f","name":"824057dd-57d8-4988-81ad-7843670e525f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a9dfd01-8e60-48cb-94b0-9e1d442bcacf","name":"3a9dfd01-8e60-48cb-94b0-9e1d442bcacf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"04056724-6e77-47f9-bc78-04245136983a","name":"04056724-6e77-47f9-bc78-04245136983a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a4739aff-a6c6-479d-8022-5da8edd7feac","name":"a4739aff-a6c6-479d-8022-5da8edd7feac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d1808ad-4b5b-4a6b-89f1-18aa5c5d51ab","name":"1d1808ad-4b5b-4a6b-89f1-18aa5c5d51ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f39e1f11-2234-4b91-b86d-2cf8ed4e612c","name":"f39e1f11-2234-4b91-b86d-2cf8ed4e612c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0f1ab696-8adc-425d-bf80-427a3e021fe1","name":"0f1ab696-8adc-425d-bf80-427a3e021fe1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0538d1c9-8b5c-467f-8881-3971b138dce1","name":"0538d1c9-8b5c-467f-8881-3971b138dce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e925f8dc-f68b-4b57-b349-aaf54f977dcf","name":"e925f8dc-f68b-4b57-b349-aaf54f977dcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2fbec92e-84b0-498f-9725-3e0eed5c65ff","name":"2fbec92e-84b0-498f-9725-3e0eed5c65ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0165640-a879-40ab-8fc1-1109f6c8ad1d","name":"f0165640-a879-40ab-8fc1-1109f6c8ad1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03b9eef3-bac8-4c92-b391-60154466ea63","name":"03b9eef3-bac8-4c92-b391-60154466ea63","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f1a5d458-e6c0-4fda-a64c-d0a69dbccf3f","name":"f1a5d458-e6c0-4fda-a64c-d0a69dbccf3f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"525390cd-8f5d-4f17-b373-e7523c71e756","name":"525390cd-8f5d-4f17-b373-e7523c71e756","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"824057dd-57d8-4988-81ad-7843670e525f","name":"824057dd-57d8-4988-81ad-7843670e525f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a9dfd01-8e60-48cb-94b0-9e1d442bcacf","name":"3a9dfd01-8e60-48cb-94b0-9e1d442bcacf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"04056724-6e77-47f9-bc78-04245136983a","name":"04056724-6e77-47f9-bc78-04245136983a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a4739aff-a6c6-479d-8022-5da8edd7feac","name":"a4739aff-a6c6-479d-8022-5da8edd7feac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d1808ad-4b5b-4a6b-89f1-18aa5c5d51ab","name":"1d1808ad-4b5b-4a6b-89f1-18aa5c5d51ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f39e1f11-2234-4b91-b86d-2cf8ed4e612c","name":"f39e1f11-2234-4b91-b86d-2cf8ed4e612c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0f1ab696-8adc-425d-bf80-427a3e021fe1","name":"0f1ab696-8adc-425d-bf80-427a3e021fe1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0538d1c9-8b5c-467f-8881-3971b138dce1","name":"0538d1c9-8b5c-467f-8881-3971b138dce1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,48 +81,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e925f8dc-f68b-4b57-b349-aaf54f977dcf","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34f79352-9e1d-41b5-971d-53bc7d180dcf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2fbec92e-84b0-498f-9725-3e0eed5c65ff","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41ebc135-a734-483b-9fdb-036963d1fd78","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0165640-a879-40ab-8fc1-1109f6c8ad1d","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"278ee5e0-fcf7-4231-a797-cc9f649c46fe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03b9eef3-bac8-4c92-b391-60154466ea63","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2698944f-a778-4862-af5e-d1e965a055e9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1a5d458-e6c0-4fda-a64c-d0a69dbccf3f","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b4ad9b4-ccbf-40cf-9814-6c5848584e0e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"525390cd-8f5d-4f17-b373-e7523c71e756","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4131ca8-4631-4aff-ba48-ffc95e14da43","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"824057dd-57d8-4988-81ad-7843670e525f","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e54b2e68-86b8-42df-83a2-5667027c2582","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a9dfd01-8e60-48cb-94b0-9e1d442bcacf","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e0bb39ab-c8b1-4931-b5b0-38d0c7e1ca9d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"04056724-6e77-47f9-bc78-04245136983a","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6d661e5-6c13-4083-b139-1984b5b15593","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4739aff-a6c6-479d-8022-5da8edd7feac","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2c0f3071-514e-4c64-a1a3-c1ff0538208c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d1808ad-4b5b-4a6b-89f1-18aa5c5d51ab","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f7c6f1c-cbc1-4d9d-ab0c-3265f63aeb87","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f39e1f11-2234-4b91-b86d-2cf8ed4e612c","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02611d68-04eb-426c-9235-2793882b1177","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f1ab696-8adc-425d-bf80-427a3e021fe1","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0340420d-ca3d-4e8f-a3d3-d39a86fc1cad","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0538d1c9-8b5c-467f-8881-3971b138dce1","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4ebf624a-29e0-43d1-957b-5ef6da0fd47e","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e925f8dc-f68b-4b57-b349-aaf54f977dcf","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34f79352-9e1d-41b5-971d-53bc7d180dcf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2fbec92e-84b0-498f-9725-3e0eed5c65ff","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41ebc135-a734-483b-9fdb-036963d1fd78","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0165640-a879-40ab-8fc1-1109f6c8ad1d","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"278ee5e0-fcf7-4231-a797-cc9f649c46fe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03b9eef3-bac8-4c92-b391-60154466ea63","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2698944f-a778-4862-af5e-d1e965a055e9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1a5d458-e6c0-4fda-a64c-d0a69dbccf3f","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b4ad9b4-ccbf-40cf-9814-6c5848584e0e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"525390cd-8f5d-4f17-b373-e7523c71e756","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4131ca8-4631-4aff-ba48-ffc95e14da43","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"824057dd-57d8-4988-81ad-7843670e525f","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e54b2e68-86b8-42df-83a2-5667027c2582","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a9dfd01-8e60-48cb-94b0-9e1d442bcacf","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e0bb39ab-c8b1-4931-b5b0-38d0c7e1ca9d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"04056724-6e77-47f9-bc78-04245136983a","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6d661e5-6c13-4083-b139-1984b5b15593","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4739aff-a6c6-479d-8022-5da8edd7feac","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2c0f3071-514e-4c64-a1a3-c1ff0538208c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d1808ad-4b5b-4a6b-89f1-18aa5c5d51ab","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f7c6f1c-cbc1-4d9d-ab0c-3265f63aeb87","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f39e1f11-2234-4b91-b86d-2cf8ed4e612c","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02611d68-04eb-426c-9235-2793882b1177","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f1ab696-8adc-425d-bf80-427a3e021fe1","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0340420d-ca3d-4e8f-a3d3-d39a86fc1cad","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0538d1c9-8b5c-467f-8881-3971b138dce1","path":"sprites/spr_mk5_colors/spr_mk5_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4ebf624a-29e0-43d1-957b-5ef6da0fd47e","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk5_complex/spr_mk5_complex.yy b/sprites/spr_mk5_complex/spr_mk5_complex.yy index 4b6e44d95c..44729e5ed3 100644 --- a/sprites/spr_mk5_complex/spr_mk5_complex.yy +++ b/sprites/spr_mk5_complex/spr_mk5_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_complex", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk5_complex_backpack/9aa55975-2b4b-4679-8fd7-f6141f200e93.png b/sprites/spr_mk5_complex_backpack/9aa55975-2b4b-4679-8fd7-f6141f200e93.png index 8d1fd51cf8..4d18aad727 100644 Binary files a/sprites/spr_mk5_complex_backpack/9aa55975-2b4b-4679-8fd7-f6141f200e93.png and b/sprites/spr_mk5_complex_backpack/9aa55975-2b4b-4679-8fd7-f6141f200e93.png differ diff --git a/sprites/spr_mk5_complex_backpack/layers/9aa55975-2b4b-4679-8fd7-f6141f200e93/013833bd-91ce-4c08-a77d-d15ce3981f2f.png b/sprites/spr_mk5_complex_backpack/layers/9aa55975-2b4b-4679-8fd7-f6141f200e93/013833bd-91ce-4c08-a77d-d15ce3981f2f.png index 8d1fd51cf8..4d18aad727 100644 Binary files a/sprites/spr_mk5_complex_backpack/layers/9aa55975-2b4b-4679-8fd7-f6141f200e93/013833bd-91ce-4c08-a77d-d15ce3981f2f.png and b/sprites/spr_mk5_complex_backpack/layers/9aa55975-2b4b-4679-8fd7-f6141f200e93/013833bd-91ce-4c08-a77d-d15ce3981f2f.png differ diff --git a/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy b/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy index 26b419ba0d..ab866fb5ca 100644 --- a/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy +++ b/sprites/spr_mk5_complex_backpack/spr_mk5_complex_backpack.yy @@ -1,22 +1,22 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_complex_backpack", "bboxMode":0, - "bbox_bottom":35, + "bbox_bottom":80, "bbox_left":37, "bbox_right":126, - "bbox_top":10, + "bbox_top":55, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","name":"9aa55975-2b4b-4679-8fd7-f6141f200e93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, - "height":232, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"013833bd-91ce-4c08-a77d-d15ce3981f2f","blendMode":0,"displayName":"default","isLocked":false,"name":"013833bd-91ce-4c08-a77d-d15ce3981f2f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":-2, - "yorigin":0, + "xorigin":0, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy b/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy index 62a3da6288..3624aadb5a 100644 --- a/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy +++ b/sprites/spr_mk5_head_variants/spr_mk5_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_head_variants", "bboxMode":0, "bbox_bottom":46, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6ae9cb2a-6253-4261-9f21-88688afd2163","name":"6ae9cb2a-6253-4261-9f21-88688afd2163","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ae9cb2a-6253-4261-9f21-88688afd2163","name":"6ae9cb2a-6253-4261-9f21-88688afd2163","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy b/sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy index 975616b124..3933b3de1d 100644 --- a/sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy +++ b/sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_left_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b03de0e7-42de-4112-9568-659441788221","name":"b03de0e7-42de-4112-9568-659441788221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b03de0e7-42de-4112-9568-659441788221","name":"b03de0e7-42de-4112-9568-659441788221","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b03de0e7-42de-4112-9568-659441788221","path":"sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cabe8ec7-e204-4d1a-a7bf-1450852659fe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b03de0e7-42de-4112-9568-659441788221","path":"sprites/spr_mk5_left_arm/spr_mk5_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cabe8ec7-e204-4d1a-a7bf-1450852659fe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy b/sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy index c236091b21..278a6af5a0 100644 --- a/sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy +++ b/sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_right_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"667e4008-fe43-4bbe-b40b-8411d9921596","name":"667e4008-fe43-4bbe-b40b-8411d9921596","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"667e4008-fe43-4bbe-b40b-8411d9921596","name":"667e4008-fe43-4bbe-b40b-8411d9921596","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"667e4008-fe43-4bbe-b40b-8411d9921596","path":"sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"993de37b-fcef-4d76-92c0-6e447ba018c7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"667e4008-fe43-4bbe-b40b-8411d9921596","path":"sprites/spr_mk5_right_arm/spr_mk5_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"993de37b-fcef-4d76-92c0-6e447ba018c7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk5_right_arm_shadow/4562abe0-e286-4146-bdf1-58e7d3303d26.png b/sprites/spr_mk5_right_arm_shadow/4562abe0-e286-4146-bdf1-58e7d3303d26.png new file mode 100644 index 0000000000..4e6f398155 Binary files /dev/null and b/sprites/spr_mk5_right_arm_shadow/4562abe0-e286-4146-bdf1-58e7d3303d26.png differ diff --git a/sprites/spr_mk5_right_arm_shadow/layers/4562abe0-e286-4146-bdf1-58e7d3303d26/bac5b4ca-abcb-41a0-9f00-48051b29b22b.png b/sprites/spr_mk5_right_arm_shadow/layers/4562abe0-e286-4146-bdf1-58e7d3303d26/bac5b4ca-abcb-41a0-9f00-48051b29b22b.png new file mode 100644 index 0000000000..4e6f398155 Binary files /dev/null and b/sprites/spr_mk5_right_arm_shadow/layers/4562abe0-e286-4146-bdf1-58e7d3303d26/bac5b4ca-abcb-41a0-9f00-48051b29b22b.png differ diff --git a/sprites/spr_mk5_right_arm_shadow/spr_mk5_right_arm_shadow.yy b/sprites/spr_mk5_right_arm_shadow/spr_mk5_right_arm_shadow.yy new file mode 100644 index 0000000000..f3fbaf2ff2 --- /dev/null +++ b/sprites/spr_mk5_right_arm_shadow/spr_mk5_right_arm_shadow.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_mk5_right_arm_shadow", + "bboxMode":0, + "bbox_bottom":125, + "bbox_left":13, + "bbox_right":45, + "bbox_top":66, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"4562abe0-e286-4146-bdf1-58e7d3303d26","name":"4562abe0-e286-4146-bdf1-58e7d3303d26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"bac5b4ca-abcb-41a0-9f00-48051b29b22b","blendMode":0,"displayName":"default","isLocked":false,"name":"bac5b4ca-abcb-41a0-9f00-48051b29b22b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_mk5_right_arm_shadow", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"mk_5_complex", + "path":"folders/Sprites/Marine Viewer/body_types/mk_5_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_mk5_right_arm_shadow", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_mk5_right_arm_shadow", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4562abe0-e286-4146-bdf1-58e7d3303d26","path":"sprites/spr_mk5_right_arm_shadow/spr_mk5_right_arm_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0eff2ca1-b5ad-4602-87a1-706f52833ec3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":164, +} \ No newline at end of file diff --git a/sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy b/sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy index 34fa4aafe5..cc2f42a13d 100644 --- a/sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy +++ b/sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk5_samuri_faceplate", "bboxMode":0, "bbox_bottom":47, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5333554c-9d16-493b-8907-d467605b3c7c","name":"5333554c-9d16-493b-8907-d467605b3c7c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5333554c-9d16-493b-8907-d467605b3c7c","name":"5333554c-9d16-493b-8907-d467605b3c7c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5333554c-9d16-493b-8907-d467605b3c7c","path":"sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6268e815-40ba-4a86-99ba-0009c1cbbc9f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5333554c-9d16-493b-8907-d467605b3c7c","path":"sprites/spr_mk5_samuri_faceplate/spr_mk5_samuri_faceplate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6268e815-40ba-4a86-99ba-0009c1cbbc9f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk6_complex/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png b/sprites/spr_mk6_complex/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png index 54409ebc51..b4bacfd0c5 100644 Binary files a/sprites/spr_mk6_complex/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png and b/sprites/spr_mk6_complex/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf.png differ diff --git a/sprites/spr_mk6_complex/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/78fed957-a769-4e64-9288-8be2bf39a5d4.png b/sprites/spr_mk6_complex/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/78fed957-a769-4e64-9288-8be2bf39a5d4.png index 54409ebc51..b4bacfd0c5 100644 Binary files a/sprites/spr_mk6_complex/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/78fed957-a769-4e64-9288-8be2bf39a5d4.png and b/sprites/spr_mk6_complex/layers/fad92a4f-b6de-4209-8eed-5a7b6bf3abcf/78fed957-a769-4e64-9288-8be2bf39a5d4.png differ diff --git a/sprites/spr_mk6_complex/spr_mk6_complex.yy b/sprites/spr_mk6_complex/spr_mk6_complex.yy index d637a5303e..002e3e15dd 100644 --- a/sprites/spr_mk6_complex/spr_mk6_complex.yy +++ b/sprites/spr_mk6_complex/spr_mk6_complex.yy @@ -1,18 +1,18 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_complex", "bboxMode":0, "bbox_bottom":220, - "bbox_left":11, - "bbox_right":152, - "bbox_top":26, + "bbox_left":12, + "bbox_right":151, + "bbox_top":30, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk6_complex_backpack/557d0497-d213-4f3c-9acb-a261ca311b93.png b/sprites/spr_mk6_complex_backpack/557d0497-d213-4f3c-9acb-a261ca311b93.png index 11ee799f19..01a505c4ea 100644 Binary files a/sprites/spr_mk6_complex_backpack/557d0497-d213-4f3c-9acb-a261ca311b93.png and b/sprites/spr_mk6_complex_backpack/557d0497-d213-4f3c-9acb-a261ca311b93.png differ diff --git a/sprites/spr_mk6_complex_backpack/layers/557d0497-d213-4f3c-9acb-a261ca311b93/7dd54480-bbb1-4af4-b670-96698734e764.png b/sprites/spr_mk6_complex_backpack/layers/557d0497-d213-4f3c-9acb-a261ca311b93/7dd54480-bbb1-4af4-b670-96698734e764.png index 11ee799f19..01a505c4ea 100644 Binary files a/sprites/spr_mk6_complex_backpack/layers/557d0497-d213-4f3c-9acb-a261ca311b93/7dd54480-bbb1-4af4-b670-96698734e764.png and b/sprites/spr_mk6_complex_backpack/layers/557d0497-d213-4f3c-9acb-a261ca311b93/7dd54480-bbb1-4af4-b670-96698734e764.png differ diff --git a/sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy b/sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy index b903b5661e..186bf98617 100644 --- a/sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy +++ b/sprites/spr_mk6_complex_backpack/spr_mk6_complex_backpack.yy @@ -1,22 +1,22 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_complex_backpack", "bboxMode":0, - "bbox_bottom":38, + "bbox_bottom":83, "bbox_left":35, "bbox_right":128, - "bbox_top":10, + "bbox_top":55, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"557d0497-d213-4f3c-9acb-a261ca311b93","name":"557d0497-d213-4f3c-9acb-a261ca311b93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"557d0497-d213-4f3c-9acb-a261ca311b93","name":"557d0497-d213-4f3c-9acb-a261ca311b93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, - "height":232, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"7dd54480-bbb1-4af4-b670-96698734e764","blendMode":0,"displayName":"default","isLocked":false,"name":"7dd54480-bbb1-4af4-b670-96698734e764","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, @@ -63,7 +63,7 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", - "seqHeight":232.0, + "seqHeight":322.0, "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, @@ -77,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":-2, - "yorigin":0, + "xorigin":0, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy b/sprites/spr_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy index fb93663d38..8ae305162e 100644 --- a/sprites/spr_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy +++ b/sprites/spr_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_cthonian_heads", "bboxMode":0, "bbox_bottom":46, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"83d5214e-7c9a-4b81-912a-89e8daedbab4","name":"83d5214e-7c9a-4b81-912a-89e8daedbab4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83d5214e-7c9a-4b81-912a-89e8daedbab4","name":"83d5214e-7c9a-4b81-912a-89e8daedbab4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83d5214e-7c9a-4b81-912a-89e8daedbab4","path":"sprites/spr_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d75e3f1-ccde-413d-ba85-55cf7f715d46","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83d5214e-7c9a-4b81-912a-89e8daedbab4","path":"sprites/spr_mk6_cthonian_heads/spr_mk6_cthonian_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d75e3f1-ccde-413d-ba85-55cf7f715d46","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy b/sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy index c4b6608c40..5600da5a74 100644 --- a/sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy +++ b/sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_forehead_knightly", "bboxMode":0, "bbox_bottom":29, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"990daad4-708f-4aff-be58-94b415e06c63","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70d60aec-8edb-4110-af4b-e8f926007ab2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"95e20c38-53de-470d-9550-f0e9435d416a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"990daad4-708f-4aff-be58-94b415e06c63","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"415fcd60-4ea4-4d41-8642-a475ac5f2696","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70d60aec-8edb-4110-af4b-e8f926007ab2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"184bb9a2-c0f5-488b-9e51-6819cfc3eabf","path":"sprites/spr_mk6_forehead_knightly/spr_mk6_forehead_knightly.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"95e20c38-53de-470d-9550-f0e9435d416a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy b/sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy index 74d45fa7aa..7f8fc9e724 100644 --- a/sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy +++ b/sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_head_variants", "bboxMode":0, "bbox_bottom":46, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83fc5467-64c1-49f9-8b39-0522440d9284","name":"83fc5467-64c1-49f9-8b39-0522440d9284","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b3f65aab-e87f-4f14-a67d-19dbeac26482","name":"b3f65aab-e87f-4f14-a67d-19dbeac26482","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83fc5467-64c1-49f9-8b39-0522440d9284","name":"83fc5467-64c1-49f9-8b39-0522440d9284","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b3f65aab-e87f-4f14-a67d-19dbeac26482","name":"b3f65aab-e87f-4f14-a67d-19dbeac26482","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,15 +72,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c6fa85d-e91b-4424-a5a9-457f82bdc5b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83fc5467-64c1-49f9-8b39-0522440d9284","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9fdbe958-7c98-4ca5-bc2d-75debc7c1e5b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3f65aab-e87f-4f14-a67d-19dbeac26482","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5fb38721-2924-47bc-a9c0-aa2137ffc2d1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c6fa85d-e91b-4424-a5a9-457f82bdc5b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83fc5467-64c1-49f9-8b39-0522440d9284","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9fdbe958-7c98-4ca5-bc2d-75debc7c1e5b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3f65aab-e87f-4f14-a67d-19dbeac26482","path":"sprites/spr_mk6_head_variants/spr_mk6_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5fb38721-2924-47bc-a9c0-aa2137ffc2d1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy b/sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy index 034eb566fd..9012ac6008 100644 --- a/sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy +++ b/sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_knightly_mouth_variants", "bboxMode":0, "bbox_bottom":46, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed8f7823-887b-4797-b2fc-2c5bebf5c720","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_knightly_mouth_variants/spr_mk6_knightly_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed8f7823-887b-4797-b2fc-2c5bebf5c720","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy b/sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy index 20d965e7e7..4215ef0194 100644 --- a/sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy +++ b/sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_left_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"22cfde6e-f8bd-4528-8635-78300f040903","name":"22cfde6e-f8bd-4528-8635-78300f040903","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"22cfde6e-f8bd-4528-8635-78300f040903","name":"22cfde6e-f8bd-4528-8635-78300f040903","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22cfde6e-f8bd-4528-8635-78300f040903","path":"sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a261d08-29c4-4b92-b017-d0cd9ed8f1ef","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"22cfde6e-f8bd-4528-8635-78300f040903","path":"sprites/spr_mk6_left_arm/spr_mk6_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a261d08-29c4-4b92-b017-d0cd9ed8f1ef","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy b/sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy index be40e0616d..eee19efc32 100644 --- a/sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy +++ b/sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_mongol_chest_variants", "bboxMode":0, "bbox_bottom":77, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"be51056f-3c34-44c2-865d-3cb121432582","name":"be51056f-3c34-44c2-865d-3cb121432582","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be51056f-3c34-44c2-865d-3cb121432582","name":"be51056f-3c34-44c2-865d-3cb121432582","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be51056f-3c34-44c2-865d-3cb121432582","path":"sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b8a0cec-2320-4e14-9783-f4e8bf0f87d3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be51056f-3c34-44c2-865d-3cb121432582","path":"sprites/spr_mk6_mongol_chest_variants/spr_mk6_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b8a0cec-2320-4e14-9783-f4e8bf0f87d3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy b/sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy index 26b2f4dae5..4472ecb273 100644 --- a/sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy +++ b/sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_mouth_prussian", "bboxMode":0, "bbox_bottom":45, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8571ae2-19d0-4093-ae0a-e5f864f1c8b4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d33d213-2125-4792-bea1-65c540c83851","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6423fa90-8cbf-47a6-ad5e-e020ea6ae916","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fad92a4f-b6de-4209-8eed-5a7b6bf3abcf","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8571ae2-19d0-4093-ae0a-e5f864f1c8b4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"413c9428-5da2-4ef2-a236-fbbd9ad3d6ab","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d33d213-2125-4792-bea1-65c540c83851","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef00b133-1edd-4ecd-a7c1-41f2f80c4d01","path":"sprites/spr_mk6_mouth_prussian/spr_mk6_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6423fa90-8cbf-47a6-ad5e-e020ea6ae916","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy b/sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy index 396e34cb92..ca8a7036fe 100644 --- a/sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy +++ b/sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_mouth_variants", "bboxMode":0, "bbox_bottom":41, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"79e7c2cf-678c-4a6a-863f-a7530e271840","name":"79e7c2cf-678c-4a6a-863f-a7530e271840","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15b22a94-9604-4054-869e-a78662b8ec58","name":"15b22a94-9604-4054-869e-a78662b8ec58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0baf035-398a-47b0-91c9-fd825a890c94","name":"e0baf035-398a-47b0-91c9-fd825a890c94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79e7c2cf-678c-4a6a-863f-a7530e271840","name":"79e7c2cf-678c-4a6a-863f-a7530e271840","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15b22a94-9604-4054-869e-a78662b8ec58","name":"15b22a94-9604-4054-869e-a78662b8ec58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0baf035-398a-47b0-91c9-fd825a890c94","name":"e0baf035-398a-47b0-91c9-fd825a890c94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79e7c2cf-678c-4a6a-863f-a7530e271840","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"87a6e7ac-eb2f-4c87-9af3-b2d14c030606","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15b22a94-9604-4054-869e-a78662b8ec58","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af62b5cb-8786-452d-b03b-ed40c3dc6b0b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0baf035-398a-47b0-91c9-fd825a890c94","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93544ea3-4ac1-4ea3-90a7-1c5f1f9626b4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79e7c2cf-678c-4a6a-863f-a7530e271840","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"87a6e7ac-eb2f-4c87-9af3-b2d14c030606","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15b22a94-9604-4054-869e-a78662b8ec58","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af62b5cb-8786-452d-b03b-ed40c3dc6b0b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0baf035-398a-47b0-91c9-fd825a890c94","path":"sprites/spr_mk6_mouth_variants/spr_mk6_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93544ea3-4ac1-4ea3-90a7-1c5f1f9626b4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy b/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy index b3a8788f58..d3afeb8d85 100644 --- a/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy +++ b/sprites/spr_mk6_right_arm/spr_mk6_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk6_right_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","name":"e575792d-42ea-419f-9fac-43c0dbc4a85c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy b/sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy index a8c9b88ae6..dbf734430f 100644 --- a/sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy +++ b/sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_chest_ultra", "bboxMode":0, "bbox_bottom":75, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a366fd3-4565-4f7a-9f00-8dccbe3b8a08","name":"2a366fd3-4565-4f7a-9f00-8dccbe3b8a08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a366fd3-4565-4f7a-9f00-8dccbe3b8a08","name":"2a366fd3-4565-4f7a-9f00-8dccbe3b8a08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41ee0869-22a0-48b8-a427-0b83c48f44e0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a366fd3-4565-4f7a-9f00-8dccbe3b8a08","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7fe645e7-d233-453e-94b8-ad1e403f67f3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e528881-8989-4611-9af3-d1fbfb6e801f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ac3b10a-c20f-4eae-a29d-0a446ea8e1e4","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41ee0869-22a0-48b8-a427-0b83c48f44e0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a366fd3-4565-4f7a-9f00-8dccbe3b8a08","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7fe645e7-d233-453e-94b8-ad1e403f67f3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4cf35299-781f-4c3c-94e2-4aa3eded03aa","path":"sprites/spr_mk7_chest_ultra/spr_mk7_chest_ultra.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e528881-8989-4611-9af3-d1fbfb6e801f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_chest_variants/5769f893-c909-4b88-9856-62d72a0b6130.png b/sprites/spr_mk7_chest_variants/5769f893-c909-4b88-9856-62d72a0b6130.png index ca85fd7dfe..54e539817b 100644 Binary files a/sprites/spr_mk7_chest_variants/5769f893-c909-4b88-9856-62d72a0b6130.png and b/sprites/spr_mk7_chest_variants/5769f893-c909-4b88-9856-62d72a0b6130.png differ diff --git a/sprites/spr_mk7_chest_variants/af74c721-e4c2-4842-b738-a2c688adc317.png b/sprites/spr_mk7_chest_variants/af74c721-e4c2-4842-b738-a2c688adc317.png index d95bc183c3..a877bfb01a 100644 Binary files a/sprites/spr_mk7_chest_variants/af74c721-e4c2-4842-b738-a2c688adc317.png and b/sprites/spr_mk7_chest_variants/af74c721-e4c2-4842-b738-a2c688adc317.png differ diff --git a/sprites/spr_mk7_chest_variants/bc5e2753-207d-403d-81c5-a4e7066de053.png b/sprites/spr_mk7_chest_variants/bc5e2753-207d-403d-81c5-a4e7066de053.png index 351ac62e3a..1c8a4027f6 100644 Binary files a/sprites/spr_mk7_chest_variants/bc5e2753-207d-403d-81c5-a4e7066de053.png and b/sprites/spr_mk7_chest_variants/bc5e2753-207d-403d-81c5-a4e7066de053.png differ diff --git a/sprites/spr_mk7_chest_variants/ca44f968-4109-4468-901b-d07add46e880.png b/sprites/spr_mk7_chest_variants/ca44f968-4109-4468-901b-d07add46e880.png index 7dc69125d1..f1fbe7aad1 100644 Binary files a/sprites/spr_mk7_chest_variants/ca44f968-4109-4468-901b-d07add46e880.png and b/sprites/spr_mk7_chest_variants/ca44f968-4109-4468-901b-d07add46e880.png differ diff --git a/sprites/spr_mk7_chest_variants/d359bd56-6962-4c59-a10d-f16ae433baa8.png b/sprites/spr_mk7_chest_variants/d359bd56-6962-4c59-a10d-f16ae433baa8.png index 5d958d996c..438a64040c 100644 Binary files a/sprites/spr_mk7_chest_variants/d359bd56-6962-4c59-a10d-f16ae433baa8.png and b/sprites/spr_mk7_chest_variants/d359bd56-6962-4c59-a10d-f16ae433baa8.png differ diff --git a/sprites/spr_mk7_chest_variants/layers/5769f893-c909-4b88-9856-62d72a0b6130/d0764e38-6f97-4f33-8770-83719dde468f.png b/sprites/spr_mk7_chest_variants/layers/5769f893-c909-4b88-9856-62d72a0b6130/d0764e38-6f97-4f33-8770-83719dde468f.png index ca85fd7dfe..54e539817b 100644 Binary files a/sprites/spr_mk7_chest_variants/layers/5769f893-c909-4b88-9856-62d72a0b6130/d0764e38-6f97-4f33-8770-83719dde468f.png and b/sprites/spr_mk7_chest_variants/layers/5769f893-c909-4b88-9856-62d72a0b6130/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_variants/layers/af74c721-e4c2-4842-b738-a2c688adc317/d0764e38-6f97-4f33-8770-83719dde468f.png b/sprites/spr_mk7_chest_variants/layers/af74c721-e4c2-4842-b738-a2c688adc317/d0764e38-6f97-4f33-8770-83719dde468f.png index d95bc183c3..a877bfb01a 100644 Binary files a/sprites/spr_mk7_chest_variants/layers/af74c721-e4c2-4842-b738-a2c688adc317/d0764e38-6f97-4f33-8770-83719dde468f.png and b/sprites/spr_mk7_chest_variants/layers/af74c721-e4c2-4842-b738-a2c688adc317/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_variants/layers/bc5e2753-207d-403d-81c5-a4e7066de053/d0764e38-6f97-4f33-8770-83719dde468f.png b/sprites/spr_mk7_chest_variants/layers/bc5e2753-207d-403d-81c5-a4e7066de053/d0764e38-6f97-4f33-8770-83719dde468f.png index 351ac62e3a..1c8a4027f6 100644 Binary files a/sprites/spr_mk7_chest_variants/layers/bc5e2753-207d-403d-81c5-a4e7066de053/d0764e38-6f97-4f33-8770-83719dde468f.png and b/sprites/spr_mk7_chest_variants/layers/bc5e2753-207d-403d-81c5-a4e7066de053/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_variants/layers/ca44f968-4109-4468-901b-d07add46e880/d0764e38-6f97-4f33-8770-83719dde468f.png b/sprites/spr_mk7_chest_variants/layers/ca44f968-4109-4468-901b-d07add46e880/d0764e38-6f97-4f33-8770-83719dde468f.png index 7dc69125d1..f1fbe7aad1 100644 Binary files a/sprites/spr_mk7_chest_variants/layers/ca44f968-4109-4468-901b-d07add46e880/d0764e38-6f97-4f33-8770-83719dde468f.png and b/sprites/spr_mk7_chest_variants/layers/ca44f968-4109-4468-901b-d07add46e880/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_variants/layers/d359bd56-6962-4c59-a10d-f16ae433baa8/d0764e38-6f97-4f33-8770-83719dde468f.png b/sprites/spr_mk7_chest_variants/layers/d359bd56-6962-4c59-a10d-f16ae433baa8/d0764e38-6f97-4f33-8770-83719dde468f.png index 5d958d996c..438a64040c 100644 Binary files a/sprites/spr_mk7_chest_variants/layers/d359bd56-6962-4c59-a10d-f16ae433baa8/d0764e38-6f97-4f33-8770-83719dde468f.png and b/sprites/spr_mk7_chest_variants/layers/d359bd56-6962-4c59-a10d-f16ae433baa8/d0764e38-6f97-4f33-8770-83719dde468f.png differ diff --git a/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy b/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy index 3894b2ac0e..8db1fd932e 100644 --- a/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy +++ b/sprites/spr_mk7_chest_variants/spr_mk7_chest_variants.yy @@ -1,22 +1,22 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_chest_variants", "bboxMode":0, "bbox_bottom":73, - "bbox_left":0, + "bbox_left":51, "bbox_right":112, - "bbox_top":0, + "bbox_top":40, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d359bd56-6962-4c59-a10d-f16ae433baa8","name":"d359bd56-6962-4c59-a10d-f16ae433baa8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc5e2753-207d-403d-81c5-a4e7066de053","name":"bc5e2753-207d-403d-81c5-a4e7066de053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca44f968-4109-4468-901b-d07add46e880","name":"ca44f968-4109-4468-901b-d07add46e880","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af74c721-e4c2-4842-b738-a2c688adc317","name":"af74c721-e4c2-4842-b738-a2c688adc317","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5769f893-c909-4b88-9856-62d72a0b6130","name":"5769f893-c909-4b88-9856-62d72a0b6130","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d359bd56-6962-4c59-a10d-f16ae433baa8","name":"d359bd56-6962-4c59-a10d-f16ae433baa8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc5e2753-207d-403d-81c5-a4e7066de053","name":"bc5e2753-207d-403d-81c5-a4e7066de053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca44f968-4109-4468-901b-d07add46e880","name":"ca44f968-4109-4468-901b-d07add46e880","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af74c721-e4c2-4842-b738-a2c688adc317","name":"af74c721-e4c2-4842-b738-a2c688adc317","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5769f893-c909-4b88-9856-62d72a0b6130","name":"5769f893-c909-4b88-9856-62d72a0b6130","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -67,6 +67,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk7_colors/spr_mk7_colors.yy b/sprites/spr_mk7_colors/spr_mk7_colors.yy index 4d85774d70..d1cfc8c5da 100644 --- a/sprites/spr_mk7_colors/spr_mk7_colors.yy +++ b/sprites/spr_mk7_colors/spr_mk7_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_colors", "bboxMode":0, "bbox_bottom":281, @@ -12,20 +12,20 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"193aff66-5833-47c7-9ed8-759d3357f47e","name":"193aff66-5833-47c7-9ed8-759d3357f47e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea8ace5c-65c3-4db2-bf11-a0e546441d29","name":"ea8ace5c-65c3-4db2-bf11-a0e546441d29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8f979f47-d969-40e4-b2c1-9c520c3d2ba6","name":"8f979f47-d969-40e4-b2c1-9c520c3d2ba6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"93ff5df5-2919-46d2-b6c6-7b48d36a04da","name":"93ff5df5-2919-46d2-b6c6-7b48d36a04da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"537f38be-267b-411a-b3f5-955b65e5b516","name":"537f38be-267b-411a-b3f5-955b65e5b516","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7770c842-4a7e-4b96-b19b-171c0fcfb3fb","name":"7770c842-4a7e-4b96-b19b-171c0fcfb3fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87a7c1a3-99aa-48d9-82ee-dcc6ed2c5dd0","name":"87a7c1a3-99aa-48d9-82ee-dcc6ed2c5dd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3f0324cb-c5d0-4df7-b607-449f0c42ea0f","name":"3f0324cb-c5d0-4df7-b607-449f0c42ea0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3519d9b7-e3c7-49ac-b339-0c76d75632e5","name":"3519d9b7-e3c7-49ac-b339-0c76d75632e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4e1caf7-804f-4a73-8115-ea6377691b4e","name":"d4e1caf7-804f-4a73-8115-ea6377691b4e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7965302a-4558-4997-bb0a-53070501b346","name":"7965302a-4558-4997-bb0a-53070501b346","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee53da7c-72ca-4782-bea9-d9be0c9ee441","name":"ee53da7c-72ca-4782-bea9-d9be0c9ee441","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d559b6fc-9f43-450c-b72d-178ab6f49a7c","name":"d559b6fc-9f43-450c-b72d-178ab6f49a7c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"193aff66-5833-47c7-9ed8-759d3357f47e","name":"193aff66-5833-47c7-9ed8-759d3357f47e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea8ace5c-65c3-4db2-bf11-a0e546441d29","name":"ea8ace5c-65c3-4db2-bf11-a0e546441d29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8f979f47-d969-40e4-b2c1-9c520c3d2ba6","name":"8f979f47-d969-40e4-b2c1-9c520c3d2ba6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93ff5df5-2919-46d2-b6c6-7b48d36a04da","name":"93ff5df5-2919-46d2-b6c6-7b48d36a04da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"537f38be-267b-411a-b3f5-955b65e5b516","name":"537f38be-267b-411a-b3f5-955b65e5b516","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7770c842-4a7e-4b96-b19b-171c0fcfb3fb","name":"7770c842-4a7e-4b96-b19b-171c0fcfb3fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87a7c1a3-99aa-48d9-82ee-dcc6ed2c5dd0","name":"87a7c1a3-99aa-48d9-82ee-dcc6ed2c5dd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f0324cb-c5d0-4df7-b607-449f0c42ea0f","name":"3f0324cb-c5d0-4df7-b607-449f0c42ea0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3519d9b7-e3c7-49ac-b339-0c76d75632e5","name":"3519d9b7-e3c7-49ac-b339-0c76d75632e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4e1caf7-804f-4a73-8115-ea6377691b4e","name":"d4e1caf7-804f-4a73-8115-ea6377691b4e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7965302a-4558-4997-bb0a-53070501b346","name":"7965302a-4558-4997-bb0a-53070501b346","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee53da7c-72ca-4782-bea9-d9be0c9ee441","name":"ee53da7c-72ca-4782-bea9-d9be0c9ee441","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d559b6fc-9f43-450c-b72d-178ab6f49a7c","name":"d559b6fc-9f43-450c-b72d-178ab6f49a7c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -83,48 +83,20 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2aa55f99-dcd4-44ed-8f22-89b7e6954826","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"193aff66-5833-47c7-9ed8-759d3357f47e","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"222812b7-2032-4667-9138-22e4e5ba61e6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea8ace5c-65c3-4db2-bf11-a0e546441d29","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09beb9c6-b978-4ca7-b22e-a4d4a871745b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f979f47-d969-40e4-b2c1-9c520c3d2ba6","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37f99b97-a065-4cdc-bd92-2831a8e44efd","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ff5df5-2919-46d2-b6c6-7b48d36a04da","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba68f83a-7007-4c08-a09e-685074b73eb9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"537f38be-267b-411a-b3f5-955b65e5b516","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd0c33be-fe95-4d4e-896b-f695b1cad650","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7770c842-4a7e-4b96-b19b-171c0fcfb3fb","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53e5f5b2-541f-4b32-bf2c-d77a0ed44abb","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a7c1a3-99aa-48d9-82ee-dcc6ed2c5dd0","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"efd1188b-0578-4324-9a32-b99c428534b7","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f0324cb-c5d0-4df7-b607-449f0c42ea0f","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c8c2d1a-62ed-4576-9385-317f739f82ab","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3519d9b7-e3c7-49ac-b339-0c76d75632e5","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c601ed8-4532-44a6-8fba-e1d41872c695","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4e1caf7-804f-4a73-8115-ea6377691b4e","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64231b23-101c-4d8d-8043-efa06138ea9f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7965302a-4558-4997-bb0a-53070501b346","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ae643bac-6a55-4baf-9b4f-430da92b70af","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee53da7c-72ca-4782-bea9-d9be0c9ee441","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"996fc6d5-2bd6-480b-b65c-77c4af03b378","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d559b6fc-9f43-450c-b72d-178ab6f49a7c","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f995272-2abe-4060-a7df-e5bc4924ca70","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2aa55f99-dcd4-44ed-8f22-89b7e6954826","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"193aff66-5833-47c7-9ed8-759d3357f47e","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"222812b7-2032-4667-9138-22e4e5ba61e6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea8ace5c-65c3-4db2-bf11-a0e546441d29","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09beb9c6-b978-4ca7-b22e-a4d4a871745b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f979f47-d969-40e4-b2c1-9c520c3d2ba6","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37f99b97-a065-4cdc-bd92-2831a8e44efd","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ff5df5-2919-46d2-b6c6-7b48d36a04da","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba68f83a-7007-4c08-a09e-685074b73eb9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"537f38be-267b-411a-b3f5-955b65e5b516","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd0c33be-fe95-4d4e-896b-f695b1cad650","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7770c842-4a7e-4b96-b19b-171c0fcfb3fb","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53e5f5b2-541f-4b32-bf2c-d77a0ed44abb","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a7c1a3-99aa-48d9-82ee-dcc6ed2c5dd0","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"efd1188b-0578-4324-9a32-b99c428534b7","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f0324cb-c5d0-4df7-b607-449f0c42ea0f","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c8c2d1a-62ed-4576-9385-317f739f82ab","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3519d9b7-e3c7-49ac-b339-0c76d75632e5","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8c601ed8-4532-44a6-8fba-e1d41872c695","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4e1caf7-804f-4a73-8115-ea6377691b4e","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64231b23-101c-4d8d-8043-efa06138ea9f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7965302a-4558-4997-bb0a-53070501b346","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ae643bac-6a55-4baf-9b4f-430da92b70af","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee53da7c-72ca-4782-bea9-d9be0c9ee441","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"996fc6d5-2bd6-480b-b65c-77c4af03b378","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d559b6fc-9f43-450c-b72d-178ab6f49a7c","path":"sprites/spr_mk7_colors/spr_mk7_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f995272-2abe-4060-a7df-e5bc4924ca70","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_complex/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png index 168fe2d122..4c2524c092 100644 Binary files a/sprites/spr_mk7_complex/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png and b/sprites/spr_mk7_complex/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png differ diff --git a/sprites/spr_mk7_complex/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png index 168fe2d122..4c2524c092 100644 Binary files a/sprites/spr_mk7_complex/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png and b/sprites/spr_mk7_complex/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_complex/spr_mk7_complex.yy b/sprites/spr_mk7_complex/spr_mk7_complex.yy index 246cccae3e..3a861d2f93 100644 --- a/sprites/spr_mk7_complex/spr_mk7_complex.yy +++ b/sprites/spr_mk7_complex/spr_mk7_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, diff --git a/sprites/spr_mk7_complex_backpack/d759779c-a75b-4d79-b22b-410d27d6c6de.png b/sprites/spr_mk7_complex_backpack/d759779c-a75b-4d79-b22b-410d27d6c6de.png index 91e1fdb2bf..8da5258765 100644 Binary files a/sprites/spr_mk7_complex_backpack/d759779c-a75b-4d79-b22b-410d27d6c6de.png and b/sprites/spr_mk7_complex_backpack/d759779c-a75b-4d79-b22b-410d27d6c6de.png differ diff --git a/sprites/spr_mk7_complex_backpack/layers/d759779c-a75b-4d79-b22b-410d27d6c6de/216ff805-fa19-4063-a04c-9a3542762bd3.png b/sprites/spr_mk7_complex_backpack/layers/d759779c-a75b-4d79-b22b-410d27d6c6de/216ff805-fa19-4063-a04c-9a3542762bd3.png index 91e1fdb2bf..8da5258765 100644 Binary files a/sprites/spr_mk7_complex_backpack/layers/d759779c-a75b-4d79-b22b-410d27d6c6de/216ff805-fa19-4063-a04c-9a3542762bd3.png and b/sprites/spr_mk7_complex_backpack/layers/d759779c-a75b-4d79-b22b-410d27d6c6de/216ff805-fa19-4063-a04c-9a3542762bd3.png differ diff --git a/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy b/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy index 30308453ad..8fddc2cf0e 100644 --- a/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy +++ b/sprites/spr_mk7_complex_backpack/spr_mk7_complex_backpack.yy @@ -1,22 +1,22 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex_backpack", "bboxMode":0, - "bbox_bottom":38, + "bbox_bottom":83, "bbox_left":33, "bbox_right":130, - "bbox_top":14, + "bbox_top":59, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d759779c-a75b-4d79-b22b-410d27d6c6de","name":"d759779c-a75b-4d79-b22b-410d27d6c6de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d759779c-a75b-4d79-b22b-410d27d6c6de","name":"d759779c-a75b-4d79-b22b-410d27d6c6de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, - "height":232, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"216ff805-fa19-4063-a04c-9a3542762bd3","blendMode":0,"displayName":"default","isLocked":false,"name":"216ff805-fa19-4063-a04c-9a3542762bd3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,8 +77,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":-2, - "yorigin":0, + "xorigin":0, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_mk7_complex_backpack_shadow/d759779c-a75b-4d79-b22b-410d27d6c6de.png b/sprites/spr_mk7_complex_backpack_shadow/d759779c-a75b-4d79-b22b-410d27d6c6de.png new file mode 100644 index 0000000000..798abff018 Binary files /dev/null and b/sprites/spr_mk7_complex_backpack_shadow/d759779c-a75b-4d79-b22b-410d27d6c6de.png differ diff --git a/sprites/spr_mk7_complex_backpack_shadow/layers/d759779c-a75b-4d79-b22b-410d27d6c6de/216ff805-fa19-4063-a04c-9a3542762bd3.png b/sprites/spr_mk7_complex_backpack_shadow/layers/d759779c-a75b-4d79-b22b-410d27d6c6de/216ff805-fa19-4063-a04c-9a3542762bd3.png new file mode 100644 index 0000000000..798abff018 Binary files /dev/null and b/sprites/spr_mk7_complex_backpack_shadow/layers/d759779c-a75b-4d79-b22b-410d27d6c6de/216ff805-fa19-4063-a04c-9a3542762bd3.png differ diff --git a/sprites/spr_mk7_complex_backpack_shadow/spr_mk7_complex_backpack_shadow.yy b/sprites/spr_mk7_complex_backpack_shadow/spr_mk7_complex_backpack_shadow.yy new file mode 100644 index 0000000000..6c13ee6d1a --- /dev/null +++ b/sprites/spr_mk7_complex_backpack_shadow/spr_mk7_complex_backpack_shadow.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_mk7_complex_backpack_shadow", + "bboxMode":0, + "bbox_bottom":83, + "bbox_left":33, + "bbox_right":130, + "bbox_top":59, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"d759779c-a75b-4d79-b22b-410d27d6c6de","name":"d759779c-a75b-4d79-b22b-410d27d6c6de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":322, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"216ff805-fa19-4063-a04c-9a3542762bd3","blendMode":0,"displayName":"default","isLocked":false,"name":"216ff805-fa19-4063-a04c-9a3542762bd3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_mk7_complex_backpack_shadow", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"mk_7_complex", + "path":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_mk7_complex_backpack_shadow", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_mk7_complex_backpack_shadow", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":164.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d759779c-a75b-4d79-b22b-410d27d6c6de","path":"sprites/spr_mk7_complex_backpack_shadow/spr_mk7_complex_backpack_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"dfcc2188-1c25-4b83-b365-64f54b46e5f6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":45, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":164, +} \ No newline at end of file diff --git a/sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy b/sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy index bfb4971270..fec5493330 100644 --- a/sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy +++ b/sprites/spr_mk7_complex_belt/spr_mk7_complex_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex_belt", "bboxMode":0, "bbox_bottom":104, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b","name":"c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"163be470-f687-42e2-b07c-ad2291c828fa","name":"163be470-f687-42e2-b07c-ad2291c828fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b","name":"c5eacaf3-6c5a-4af4-ac56-fd957c8f9f0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"163be470-f687-42e2-b07c-ad2291c828fa","name":"163be470-f687-42e2-b07c-ad2291c828fa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -65,6 +65,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk7_complex_crux_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex_crux_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png index 0cf1f92a29..1bfc1ddaa7 100644 Binary files a/sprites/spr_mk7_complex_crux_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png and b/sprites/spr_mk7_complex_crux_belt/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png differ diff --git a/sprites/spr_mk7_complex_crux_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex_crux_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png index 0cf1f92a29..1bfc1ddaa7 100644 Binary files a/sprites/spr_mk7_complex_crux_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png and b/sprites/spr_mk7_complex_crux_belt/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy b/sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy index 44a0e66bdd..b8d9373899 100644 --- a/sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy +++ b/sprites/spr_mk7_complex_crux_belt/spr_mk7_complex_crux_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex_crux_belt", "bboxMode":0, "bbox_bottom":107, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk7_complex_knees/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex_knees/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png index fd1454d6ee..4bd1d4dfdb 100644 Binary files a/sprites/spr_mk7_complex_knees/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png and b/sprites/spr_mk7_complex_knees/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png differ diff --git a/sprites/spr_mk7_complex_knees/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex_knees/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png index f3f81af34f..056cd47982 100644 Binary files a/sprites/spr_mk7_complex_knees/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png and b/sprites/spr_mk7_complex_knees/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_complex_knees/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png b/sprites/spr_mk7_complex_knees/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png index e904c4a166..5c22effc43 100644 Binary files a/sprites/spr_mk7_complex_knees/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png and b/sprites/spr_mk7_complex_knees/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png differ diff --git a/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy b/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy index a68028e381..7927be7296 100644 --- a/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy +++ b/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex_knees", "bboxMode":0, "bbox_bottom":164, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -83,6 +83,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk7_complex_left_knee_1/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex_left_knee_1/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png new file mode 100644 index 0000000000..c43cd0abc7 Binary files /dev/null and b/sprites/spr_mk7_complex_left_knee_1/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png differ diff --git a/sprites/spr_mk7_complex_left_knee_1/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex_left_knee_1/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png new file mode 100644 index 0000000000..f3f81af34f Binary files /dev/null and b/sprites/spr_mk7_complex_left_knee_1/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_leg_variants/89a6d4dd-18ab-43ec-ad94-6adb0940fd20.png b/sprites/spr_mk7_complex_left_knee_1/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png similarity index 60% rename from sprites/spr_mk7_leg_variants/89a6d4dd-18ab-43ec-ad94-6adb0940fd20.png rename to sprites/spr_mk7_complex_left_knee_1/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png index 3e1f7df0f0..8fd15c90ad 100644 Binary files a/sprites/spr_mk7_leg_variants/89a6d4dd-18ab-43ec-ad94-6adb0940fd20.png and b/sprites/spr_mk7_complex_left_knee_1/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png differ diff --git a/sprites/spr_mk7_complex_left_knee_1/spr_mk7_complex_left_knee_1.yy b/sprites/spr_mk7_complex_left_knee_1/spr_mk7_complex_left_knee_1.yy new file mode 100644 index 0000000000..e0f3656bc0 --- /dev/null +++ b/sprites/spr_mk7_complex_left_knee_1/spr_mk7_complex_left_knee_1.yy @@ -0,0 +1,112 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_mk7_complex_left_knee_1", + "bboxMode":0, + "bbox_bottom":164, + "bbox_left":104, + "bbox_right":129, + "bbox_top":134, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"88207c69-b4a6-4dcf-bff5-449f98b2cb6f","blendMode":0,"displayName":"Layer 1","isLocked":false,"name":"88207c69-b4a6-4dcf-bff5-449f98b2cb6f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"468e0a30-2dea-45bc-a7bd-4b115f803d2d","blendMode":0,"displayName":"default","isLocked":false,"name":"468e0a30-2dea-45bc-a7bd-4b115f803d2d","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_mk7_complex_left_knee_1", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":9, + "parent":{ + "name":"mk_7_complex", + "path":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_mk7_complex_left_knee_1", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_mk7_complex_left_knee_1", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_left_knee_1/spr_mk7_complex_left_knee_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7ea69ecd-f81f-42b8-ac71-b6987343efcb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":-2, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":164, +} \ No newline at end of file diff --git a/sprites/spr_mk7_complex_left_pauldron/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex_left_pauldron/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png deleted file mode 100644 index c73a52735a..0000000000 Binary files a/sprites/spr_mk7_complex_left_pauldron/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png and /dev/null differ diff --git a/sprites/spr_mk7_complex_right_knee/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex_right_knee/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png new file mode 100644 index 0000000000..a09b740835 Binary files /dev/null and b/sprites/spr_mk7_complex_right_knee/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png differ diff --git a/sprites/spr_mk7_leg_variants/layers/89a6d4dd-18ab-43ec-ad94-6adb0940fd20/10dc3cac-c9af-43fd-9995-5de673dd5408.png b/sprites/spr_mk7_complex_right_knee/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png similarity index 60% rename from sprites/spr_mk7_leg_variants/layers/89a6d4dd-18ab-43ec-ad94-6adb0940fd20/10dc3cac-c9af-43fd-9995-5de673dd5408.png rename to sprites/spr_mk7_complex_right_knee/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png index 3e1f7df0f0..b02e41acdc 100644 Binary files a/sprites/spr_mk7_leg_variants/layers/89a6d4dd-18ab-43ec-ad94-6adb0940fd20/10dc3cac-c9af-43fd-9995-5de673dd5408.png and b/sprites/spr_mk7_complex_right_knee/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_complex_right_knee/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png b/sprites/spr_mk7_complex_right_knee/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png new file mode 100644 index 0000000000..a09b740835 Binary files /dev/null and b/sprites/spr_mk7_complex_right_knee/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/88207c69-b4a6-4dcf-bff5-449f98b2cb6f.png differ diff --git a/sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy b/sprites/spr_mk7_complex_right_knee/spr_mk7_complex_right_knee.yy similarity index 75% rename from sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy rename to sprites/spr_mk7_complex_right_knee/spr_mk7_complex_right_knee.yy index 665accc9b4..0fead546d0 100644 --- a/sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy +++ b/sprites/spr_mk7_complex_right_knee/spr_mk7_complex_right_knee.yy @@ -1,27 +1,28 @@ { - "$GMSprite":"", - "%Name":"spr_mk7_complex_left_pauldron", + "$GMSprite":"v2", + "%Name":"spr_mk7_complex_right_knee", "bboxMode":0, - "bbox_bottom":81, - "bbox_left":105, - "bbox_right":152, - "bbox_top":28, + "bbox_bottom":163, + "bbox_left":34, + "bbox_right":59, + "bbox_top":134, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":232, "HTile":false, "layers":[ + {"$GMImageLayer":"","%Name":"88207c69-b4a6-4dcf-bff5-449f98b2cb6f","blendMode":0,"displayName":"Layer 1","isLocked":false,"name":"88207c69-b4a6-4dcf-bff5-449f98b2cb6f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, {"$GMImageLayer":"","%Name":"468e0a30-2dea-45bc-a7bd-4b115f803d2d","blendMode":0,"displayName":"default","isLocked":false,"name":"468e0a30-2dea-45bc-a7bd-4b115f803d2d","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "name":"spr_mk7_complex_left_pauldron", + "name":"spr_mk7_complex_right_knee", "nineSlice":{ "$GMNineSliceData":"", "bottom":0, @@ -52,7 +53,7 @@ "resourceVersion":"2.0", "sequence":{ "$GMSequence":"v1", - "%Name":"spr_mk7_complex_left_pauldron", + "%Name":"spr_mk7_complex_right_knee", "autoRecord":true, "backdropHeight":768, "backdropImageOpacity":0.5, @@ -76,20 +77,22 @@ "resourceType":"KeyframeStore", "resourceVersion":"2.0", }, - "name":"spr_mk7_complex_left_pauldron", + "name":"spr_mk7_complex_right_knee", "playback":1, "playbackSpeed":30.0, "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_left_pauldron/spr_mk7_complex_left_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ffd25d2-f283-4823-9926-1576535448ca","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_right_knee/spr_mk7_complex_right_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7ea69ecd-f81f-42b8-ac71-b6987343efcb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_complex_right_pauldron/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex_right_pauldron/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png index 59e4e43dad..d9799e5b8e 100644 Binary files a/sprites/spr_mk7_complex_right_pauldron/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png and b/sprites/spr_mk7_complex_right_pauldron/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png differ diff --git a/sprites/spr_mk7_complex_right_pauldron/fec73702-4742-44a4-a0aa-eb3645361703.png b/sprites/spr_mk7_complex_right_pauldron/fec73702-4742-44a4-a0aa-eb3645361703.png deleted file mode 100644 index da354e5ab4..0000000000 Binary files a/sprites/spr_mk7_complex_right_pauldron/fec73702-4742-44a4-a0aa-eb3645361703.png and /dev/null differ diff --git a/sprites/spr_mk7_complex_right_pauldron/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex_right_pauldron/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png index 59e4e43dad..d9799e5b8e 100644 Binary files a/sprites/spr_mk7_complex_right_pauldron/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png and b/sprites/spr_mk7_complex_right_pauldron/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png differ diff --git a/sprites/spr_mk7_complex_right_pauldron/layers/fec73702-4742-44a4-a0aa-eb3645361703/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex_right_pauldron/layers/fec73702-4742-44a4-a0aa-eb3645361703/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png deleted file mode 100644 index da354e5ab4..0000000000 Binary files a/sprites/spr_mk7_complex_right_pauldron/layers/fec73702-4742-44a4-a0aa-eb3645361703/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png and /dev/null differ diff --git a/sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy b/sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy index b98693c9db..f60e4a3bf7 100644 --- a/sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy +++ b/sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy @@ -1,19 +1,18 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_complex_right_pauldron", "bboxMode":0, "bbox_bottom":81, - "bbox_left":0, + "bbox_left":11, "bbox_right":58, - "bbox_top":0, + "bbox_top":28, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fec73702-4742-44a4-a0aa-eb3645361703","name":"fec73702-4742-44a4-a0aa-eb3645361703","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -43,7 +42,7 @@ ], "top":0, }, - "origin":9, + "origin":0, "parent":{ "name":"mk_7_complex", "path":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", @@ -69,7 +68,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":2.0, + "length":1.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -93,14 +92,11 @@ {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"476ba96b-7680-45aa-b001-fa8c00b30b9b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fec73702-4742-44a4-a0aa-eb3645361703","path":"sprites/spr_mk7_complex_right_pauldron/spr_mk7_complex_right_pauldron.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5741aa36-ecdb-43df-978f-2fd7d30dd093","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, "volume":1.0, - "xorigin":-2, + "xorigin":0, "yorigin":0, }, "swatchColours":null, diff --git a/sprites/spr_mk7_complex_right_pauldron_shadow/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png b/sprites/spr_mk7_complex_right_pauldron_shadow/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png new file mode 100644 index 0000000000..a18451ca5b Binary files /dev/null and b/sprites/spr_mk7_complex_right_pauldron_shadow/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e.png differ diff --git a/sprites/spr_mk7_complex_left_pauldron/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png b/sprites/spr_mk7_complex_right_pauldron_shadow/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png similarity index 100% rename from sprites/spr_mk7_complex_left_pauldron/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png rename to sprites/spr_mk7_complex_right_pauldron_shadow/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/468e0a30-2dea-45bc-a7bd-4b115f803d2d.png diff --git a/sprites/spr_mk7_complex_right_pauldron_shadow/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/60e7fd4f-7783-44f5-a681-eabe60cc1dc4.png b/sprites/spr_mk7_complex_right_pauldron_shadow/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/60e7fd4f-7783-44f5-a681-eabe60cc1dc4.png new file mode 100644 index 0000000000..a18451ca5b Binary files /dev/null and b/sprites/spr_mk7_complex_right_pauldron_shadow/layers/b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e/60e7fd4f-7783-44f5-a681-eabe60cc1dc4.png differ diff --git a/sprites/spr_mk7_complex_right_pauldron_shadow/spr_mk7_complex_right_pauldron_shadow.yy b/sprites/spr_mk7_complex_right_pauldron_shadow/spr_mk7_complex_right_pauldron_shadow.yy new file mode 100644 index 0000000000..1af11c5cc2 --- /dev/null +++ b/sprites/spr_mk7_complex_right_pauldron_shadow/spr_mk7_complex_right_pauldron_shadow.yy @@ -0,0 +1,112 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_mk7_complex_right_pauldron_shadow", + "bboxMode":0, + "bbox_bottom":80, + "bbox_left":11, + "bbox_right":58, + "bbox_top":27, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"60e7fd4f-7783-44f5-a681-eabe60cc1dc4","blendMode":0,"displayName":"default (2)","isLocked":false,"name":"60e7fd4f-7783-44f5-a681-eabe60cc1dc4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"468e0a30-2dea-45bc-a7bd-4b115f803d2d","blendMode":0,"displayName":"default","isLocked":false,"name":"468e0a30-2dea-45bc-a7bd-4b115f803d2d","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":false,}, + ], + "name":"spr_mk7_complex_right_pauldron_shadow", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":0, + "parent":{ + "name":"mk_7_complex", + "path":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_mk7_complex_right_pauldron_shadow", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_mk7_complex_right_pauldron_shadow", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_right_pauldron_shadow/spr_mk7_complex_right_pauldron_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7ffd25d2-f283-4823-9926-1576535448ca","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":164, +} \ No newline at end of file diff --git a/sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy b/sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy index 992b76a445..53eff73a9c 100644 --- a/sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy +++ b/sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_full_colour", "bboxMode":0, "bbox_bottom":220, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"274a8c7b-ca8c-4721-8340-7a38238347c7","name":"274a8c7b-ca8c-4721-8340-7a38238347c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"274a8c7b-ca8c-4721-8340-7a38238347c7","name":"274a8c7b-ca8c-4721-8340-7a38238347c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc1fc3c0-fa0f-45d3-8a1a-2ffa8d073dec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6e067f3-ad2b-4116-9e07-c3b86d62143c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"274a8c7b-ca8c-4721-8340-7a38238347c7","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1530679f-5fa0-4e40-a97f-16971a179bd4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8e2b4d81-03fe-4fb8-b4ec-dab2348651b5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"60c38400-c4aa-4c69-ba2a-e8945e9335cf","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc1fc3c0-fa0f-45d3-8a1a-2ffa8d073dec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1511823a-2bc1-4cd3-8b23-b93d0470c00d","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6e067f3-ad2b-4116-9e07-c3b86d62143c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"274a8c7b-ca8c-4721-8340-7a38238347c7","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1530679f-5fa0-4e40-a97f-16971a179bd4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26ca7d83-cd69-43c3-b87e-c17db7491c50","path":"sprites/spr_mk7_full_colour/spr_mk7_full_colour.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8e2b4d81-03fe-4fb8-b4ec-dab2348651b5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy b/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy index 6da82ea10c..77e7c3fad3 100644 --- a/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy +++ b/sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_gladiator_chest", "bboxMode":0, "bbox_bottom":88, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1cdabc8e-5838-4520-bb52-b164914135dd","name":"1cdabc8e-5838-4520-bb52-b164914135dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1cdabc8e-5838-4520-bb52-b164914135dd","name":"1cdabc8e-5838-4520-bb52-b164914135dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -65,20 +65,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7154fd28-b589-4124-982c-0c705bca0e90","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cdabc8e-5838-4520-bb52-b164914135dd","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b623e4d-4d87-4cc2-9ef5-9416c7741aea","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd2746b7-cdab-4df5-a8c4-ab06ddd6fbef","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7154fd28-b589-4124-982c-0c705bca0e90","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cdabc8e-5838-4520-bb52-b164914135dd","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b623e4d-4d87-4cc2-9ef5-9416c7741aea","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"058bac9e-56f9-4a9e-8b2e-4ae998099703","path":"sprites/spr_mk7_gladiator_chest/spr_mk7_gladiator_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd2746b7-cdab-4df5-a8c4-ab06ddd6fbef","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy b/sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy index 525fe935cf..4b392198ce 100644 --- a/sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy +++ b/sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_head_variants", "bboxMode":0, "bbox_bottom":44, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"baf9a104-7ab3-42e8-bc99-ab91707455a7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_head_variants/spr_mk7_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"baf9a104-7ab3-42e8-bc99-ab91707455a7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy b/sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy index bdaed8ab22..259c530676 100644 --- a/sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy +++ b/sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_knightly_chest", "bboxMode":0, "bbox_bottom":73, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","path":"sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01437ca1-e985-4229-a447-001c9264a235","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af4b0687-a18b-4d72-85f6-2dc19b2e74c3","path":"sprites/spr_mk7_knightly_chest/spr_mk7_knightly_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01437ca1-e985-4229-a447-001c9264a235","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy b/sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy index 1850d33f78..cbbdf3e612 100644 --- a/sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy +++ b/sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_left_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5d794479-23e8-47a4-925d-8b51fe539cad","name":"5d794479-23e8-47a4-925d-8b51fe539cad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5d794479-23e8-47a4-925d-8b51fe539cad","name":"5d794479-23e8-47a4-925d-8b51fe539cad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d794479-23e8-47a4-925d-8b51fe539cad","path":"sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0924d635-008c-493a-8c4b-3d347b7d6043","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d794479-23e8-47a4-925d-8b51fe539cad","path":"sprites/spr_mk7_left_arm/spr_mk7_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0924d635-008c-493a-8c4b-3d347b7d6043","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy b/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy index 38bc699b60..f063783b46 100644 --- a/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy +++ b/sprites/spr_mk7_left_trim/spr_mk7_left_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_left_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c59f380a-e222-4020-bf08-125985f587ac","name":"c59f380a-e222-4020-bf08-125985f587ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"09035cbe-5b3d-4474-a920-751ccede1b22","name":"09035cbe-5b3d-4474-a920-751ccede1b22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c59f380a-e222-4020-bf08-125985f587ac","name":"c59f380a-e222-4020-bf08-125985f587ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"09035cbe-5b3d-4474-a920-751ccede1b22","name":"09035cbe-5b3d-4474-a920-751ccede1b22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -26,7 +26,7 @@ ], "name":"spr_mk7_left_trim", "nineSlice":null, - "origin":9, + "origin":0, "parent":{ "name":"mk_7_complex", "path":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", @@ -66,6 +66,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -87,7 +89,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":-2, + "xorigin":0, "yorigin":0, }, "swatchColours":null, diff --git a/sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy b/sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy index b3c08ea75a..611d359b34 100644 --- a/sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy +++ b/sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy @@ -1,20 +1,19 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_leg_variants", "bboxMode":0, "bbox_bottom":220, - "bbox_left":0, + "bbox_left":12, "bbox_right":151, - "bbox_top":0, + "bbox_top":148, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6481474b-6526-4bec-86dd-ba8cc60fe287","name":"6481474b-6526-4bec-86dd-ba8cc60fe287","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9dfbc583-089d-4b8c-9012-405d17389b4b","name":"9dfbc583-089d-4b8c-9012-405d17389b4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6481474b-6526-4bec-86dd-ba8cc60fe287","name":"6481474b-6526-4bec-86dd-ba8cc60fe287","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9dfbc583-089d-4b8c-9012-405d17389b4b","name":"9dfbc583-089d-4b8c-9012-405d17389b4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -51,7 +50,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":3.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -65,20 +64,19 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6481474b-6526-4bec-86dd-ba8cc60fe287","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"989a10c5-a397-4446-9be1-267e74dc0585","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"989a10c5-a397-4446-9be1-267e74dc0585","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9dfbc583-089d-4b8c-9012-405d17389b4b","path":"sprites/spr_mk7_leg_variants/spr_mk7_leg_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8c9a2904-eb56-452e-8890-9a68ec5d0217","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"8c9a2904-eb56-452e-8890-9a68ec5d0217","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_leg_variants_shadows/6481474b-6526-4bec-86dd-ba8cc60fe287.png b/sprites/spr_mk7_leg_variants_shadows/6481474b-6526-4bec-86dd-ba8cc60fe287.png new file mode 100644 index 0000000000..0bd354b619 Binary files /dev/null and b/sprites/spr_mk7_leg_variants_shadows/6481474b-6526-4bec-86dd-ba8cc60fe287.png differ diff --git a/sprites/spr_mk7_leg_variants_shadows/bba12579-8210-4f16-96c0-e49c4d0765cc.png b/sprites/spr_mk7_leg_variants_shadows/bba12579-8210-4f16-96c0-e49c4d0765cc.png new file mode 100644 index 0000000000..d5ae23d2c3 Binary files /dev/null and b/sprites/spr_mk7_leg_variants_shadows/bba12579-8210-4f16-96c0-e49c4d0765cc.png differ diff --git a/sprites/spr_mk7_leg_variants_shadows/layers/6481474b-6526-4bec-86dd-ba8cc60fe287/650a5470-6d7f-40d4-a0d4-f8c00c43a5c1.png b/sprites/spr_mk7_leg_variants_shadows/layers/6481474b-6526-4bec-86dd-ba8cc60fe287/650a5470-6d7f-40d4-a0d4-f8c00c43a5c1.png new file mode 100644 index 0000000000..13d35c117c Binary files /dev/null and b/sprites/spr_mk7_leg_variants_shadows/layers/6481474b-6526-4bec-86dd-ba8cc60fe287/650a5470-6d7f-40d4-a0d4-f8c00c43a5c1.png differ diff --git a/sprites/spr_mk7_leg_variants_shadows/layers/bba12579-8210-4f16-96c0-e49c4d0765cc/650a5470-6d7f-40d4-a0d4-f8c00c43a5c1.png b/sprites/spr_mk7_leg_variants_shadows/layers/bba12579-8210-4f16-96c0-e49c4d0765cc/650a5470-6d7f-40d4-a0d4-f8c00c43a5c1.png new file mode 100644 index 0000000000..d5ae23d2c3 Binary files /dev/null and b/sprites/spr_mk7_leg_variants_shadows/layers/bba12579-8210-4f16-96c0-e49c4d0765cc/650a5470-6d7f-40d4-a0d4-f8c00c43a5c1.png differ diff --git a/sprites/spr_mk7_leg_variants_shadows/spr_mk7_leg_variants_shadows.yy b/sprites/spr_mk7_leg_variants_shadows/spr_mk7_leg_variants_shadows.yy new file mode 100644 index 0000000000..37b09ee300 --- /dev/null +++ b/sprites/spr_mk7_leg_variants_shadows/spr_mk7_leg_variants_shadows.yy @@ -0,0 +1,96 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_mk7_leg_variants_shadows", + "bboxMode":0, + "bbox_bottom":221, + "bbox_left":12, + "bbox_right":151, + "bbox_top":148, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"6481474b-6526-4bec-86dd-ba8cc60fe287","name":"6481474b-6526-4bec-86dd-ba8cc60fe287","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bba12579-8210-4f16-96c0-e49c4d0765cc","name":"bba12579-8210-4f16-96c0-e49c4d0765cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"650a5470-6d7f-40d4-a0d4-f8c00c43a5c1","blendMode":0,"displayName":"Layer 1","isLocked":false,"name":"650a5470-6d7f-40d4-a0d4-f8c00c43a5c1","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_mk7_leg_variants_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"mk_7_complex", + "path":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_mk7_leg_variants_shadows", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_mk7_leg_variants_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6481474b-6526-4bec-86dd-ba8cc60fe287","path":"sprites/spr_mk7_leg_variants_shadows/spr_mk7_leg_variants_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"989a10c5-a397-4446-9be1-267e74dc0585","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bba12579-8210-4f16-96c0-e49c4d0765cc","path":"sprites/spr_mk7_leg_variants_shadows/spr_mk7_leg_variants_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d4a11546-42cc-446d-96a1-b864ed733c16","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":-2, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":164, +} \ No newline at end of file diff --git a/sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy b/sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy index 49c7f81a23..5ea5bb551c 100644 --- a/sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy +++ b/sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_mongol_chest_variants", "bboxMode":0, "bbox_bottom":73, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"64394992-62c2-494d-9a48-1fdaec945713","name":"64394992-62c2-494d-9a48-1fdaec945713","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64394992-62c2-494d-9a48-1fdaec945713","name":"64394992-62c2-494d-9a48-1fdaec945713","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64394992-62c2-494d-9a48-1fdaec945713","path":"sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"687774f6-25e5-43b9-9644-afb140487387","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","path":"sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc0888e9-91c0-494a-b193-3ac7bb3db229","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64394992-62c2-494d-9a48-1fdaec945713","path":"sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"687774f6-25e5-43b9-9644-afb140487387","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0e3fc64-2159-4eb7-a154-6acda8ba5207","path":"sprites/spr_mk7_mongol_chest_variants/spr_mk7_mongol_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc0888e9-91c0-494a-b193-3ac7bb3db229","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy b/sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy index f559ed92cd..b747599ace 100644 --- a/sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy +++ b/sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_mouth_prussian", "bboxMode":0, "bbox_bottom":48, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"39559a84-9ef2-47ad-982c-840f197ffac7","name":"39559a84-9ef2-47ad-982c-840f197ffac7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39559a84-9ef2-47ad-982c-840f197ffac7","name":"39559a84-9ef2-47ad-982c-840f197ffac7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d2d40c6-5430-4d09-a305-853a603296d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3160ee19-f37b-4969-bc87-9c858e597b6b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39559a84-9ef2-47ad-982c-840f197ffac7","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"58009909-cf0f-4b81-96c4-5fa8378c9091","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ee8e999-4d5c-4751-a174-4d1d8fc5c3bc","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d2d40c6-5430-4d09-a305-853a603296d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67b73bd0-4dda-4f23-b077-dcc3f76cbc45","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3160ee19-f37b-4969-bc87-9c858e597b6b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39559a84-9ef2-47ad-982c-840f197ffac7","path":"sprites/spr_mk7_mouth_prussian/spr_mk7_mouth_prussian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"58009909-cf0f-4b81-96c4-5fa8378c9091","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy b/sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy index 4fcad814c3..50a02383ec 100644 --- a/sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy +++ b/sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_mouth_variants", "bboxMode":0, "bbox_bottom":44, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"805b74c1-f681-48e7-abfd-6f5b223474c6","name":"805b74c1-f681-48e7-abfd-6f5b223474c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"805b74c1-f681-48e7-abfd-6f5b223474c6","name":"805b74c1-f681-48e7-abfd-6f5b223474c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"805b74c1-f681-48e7-abfd-6f5b223474c6","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90424d54-c018-4c65-bf40-761e34299d1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94d1248d-c0c4-4e25-8dfc-560ddc824524","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e284f5f0-bfd1-44e1-83c7-c26b0384c4ca","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b5b860f-4677-4acd-80cd-7c6676d57d40","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"805b74c1-f681-48e7-abfd-6f5b223474c6","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90424d54-c018-4c65-bf40-761e34299d1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"68e458f5-8c1b-450b-be3f-67390cbf0b81","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94d1248d-c0c4-4e25-8dfc-560ddc824524","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f81f55ba-964f-4c22-bab2-2bea5d52d416","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e284f5f0-bfd1-44e1-83c7-c26b0384c4ca","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"59db1a95-f5a5-474c-b9a9-a6e2993cc98a","path":"sprites/spr_mk7_mouth_variants/spr_mk7_mouth_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b5b860f-4677-4acd-80cd-7c6676d57d40","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy b/sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy index 01cf9d494e..7ecca87e30 100644 --- a/sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy +++ b/sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_prussia_chest", "bboxMode":0, "bbox_bottom":82, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be47593c-61a3-4f18-94fb-d10377ee52c2","name":"be47593c-61a3-4f18-94fb-d10377ee52c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be47593c-61a3-4f18-94fb-d10377ee52c2","name":"be47593c-61a3-4f18-94fb-d10377ee52c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"325b6201-0d39-4816-ab63-ff3059baaa71","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8623654c-b493-4e7a-9016-c4cb86b3a5c7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be47593c-61a3-4f18-94fb-d10377ee52c2","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a3a1701a-91b0-42b3-821d-2ca5b311081a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e60dbbc5-c2af-4409-87fb-f63db8f14b63","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4db6343-e700-4a31-9305-2b0c40459865","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"325b6201-0d39-4816-ab63-ff3059baaa71","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f29ddf8f-9b5f-481e-84fc-70def0f52822","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8623654c-b493-4e7a-9016-c4cb86b3a5c7","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be47593c-61a3-4f18-94fb-d10377ee52c2","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a3a1701a-91b0-42b3-821d-2ca5b311081a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9cefe8d7-2292-4e91-9b7c-c798eda8297d","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e60dbbc5-c2af-4409-87fb-f63db8f14b63","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5e1a5df6-8fc9-48f2-8a7f-be5d7c9ab441","path":"sprites/spr_mk7_prussia_chest/spr_mk7_prussia_chest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4db6343-e700-4a31-9305-2b0c40459865","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy b/sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy index 749775f2b1..dad32314a0 100644 --- a/sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy +++ b/sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_right_arm", "bboxMode":0, "bbox_bottom":125, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","path":"sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b3d2383f-78e1-45a6-b6fb-577392a18352","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1894dc2e-dcc3-4d36-a463-17cc5c39a59d","path":"sprites/spr_mk7_right_arm/spr_mk7_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b3d2383f-78e1-45a6-b6fb-577392a18352","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_right_arm_shadow/cfe568ab-9ef3-408a-9d05-1decc5d59df3.png b/sprites/spr_mk7_right_arm_shadow/cfe568ab-9ef3-408a-9d05-1decc5d59df3.png new file mode 100644 index 0000000000..2da5e2c471 Binary files /dev/null and b/sprites/spr_mk7_right_arm_shadow/cfe568ab-9ef3-408a-9d05-1decc5d59df3.png differ diff --git a/sprites/spr_mk7_right_arm_shadow/layers/cfe568ab-9ef3-408a-9d05-1decc5d59df3/70be6473-60f8-463e-b96c-cabfe91ace59.png b/sprites/spr_mk7_right_arm_shadow/layers/cfe568ab-9ef3-408a-9d05-1decc5d59df3/70be6473-60f8-463e-b96c-cabfe91ace59.png new file mode 100644 index 0000000000..2da5e2c471 Binary files /dev/null and b/sprites/spr_mk7_right_arm_shadow/layers/cfe568ab-9ef3-408a-9d05-1decc5d59df3/70be6473-60f8-463e-b96c-cabfe91ace59.png differ diff --git a/sprites/spr_mk7_right_arm_shadow/spr_mk7_right_arm_shadow.yy b/sprites/spr_mk7_right_arm_shadow/spr_mk7_right_arm_shadow.yy new file mode 100644 index 0000000000..ecc5154a2f --- /dev/null +++ b/sprites/spr_mk7_right_arm_shadow/spr_mk7_right_arm_shadow.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_mk7_right_arm_shadow", + "bboxMode":0, + "bbox_bottom":125, + "bbox_left":13, + "bbox_right":45, + "bbox_top":66, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"cfe568ab-9ef3-408a-9d05-1decc5d59df3","name":"cfe568ab-9ef3-408a-9d05-1decc5d59df3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"70be6473-60f8-463e-b96c-cabfe91ace59","blendMode":0,"displayName":"default","isLocked":false,"name":"70be6473-60f8-463e-b96c-cabfe91ace59","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_mk7_right_arm_shadow", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"mk_7_complex", + "path":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_mk7_right_arm_shadow", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_mk7_right_arm_shadow", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cfe568ab-9ef3-408a-9d05-1decc5d59df3","path":"sprites/spr_mk7_right_arm_shadow/spr_mk7_right_arm_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c1fa9940-04b6-435f-b159-29ad2d8e834c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":-2, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":164, +} \ No newline at end of file diff --git a/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy b/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy index 65beda6db2..118e79ff83 100644 --- a/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy +++ b/sprites/spr_mk7_right_trim/spr_mk7_right_trim.yy @@ -1,21 +1,21 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_right_trim", "bboxMode":0, "bbox_bottom":81, - "bbox_left":0, + "bbox_left":10, "bbox_right":58, - "bbox_top":0, + "bbox_top":27, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c59f380a-e222-4020-bf08-125985f587ac","name":"c59f380a-e222-4020-bf08-125985f587ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"09035cbe-5b3d-4474-a920-751ccede1b22","name":"09035cbe-5b3d-4474-a920-751ccede1b22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","name":"a9ab7201-7070-45ca-8574-83152cfd6f3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c59f380a-e222-4020-bf08-125985f587ac","name":"c59f380a-e222-4020-bf08-125985f587ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","name":"dc4d4861-9b2d-464f-9682-578770b6ac9a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"09035cbe-5b3d-4474-a920-751ccede1b22","name":"09035cbe-5b3d-4474-a920-751ccede1b22","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -26,7 +26,7 @@ ], "name":"spr_mk7_right_trim", "nineSlice":null, - "origin":9, + "origin":0, "parent":{ "name":"mk_7_complex", "path":"folders/Sprites/Marine Viewer/body_types/mk_7_complex.yy", @@ -89,7 +89,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":-2, + "xorigin":0, "yorigin":0, }, "swatchColours":null, diff --git a/sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy b/sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy index 812efe5ed7..407591fb56 100644 --- a/sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy +++ b/sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_rope_belt", "bboxMode":0, "bbox_bottom":163, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","path":"sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7e921701-e99d-41a9-82a0-24a921a8ed56","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","path":"sprites/spr_mk7_rope_belt/spr_mk7_rope_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e921701-e99d-41a9-82a0-24a921a8ed56","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_runic_belt/spr_mk7_runic_belt.yy b/sprites/spr_mk7_runic_belt/spr_mk7_runic_belt.yy index 97c3245e32..c95522093e 100644 --- a/sprites/spr_mk7_runic_belt/spr_mk7_runic_belt.yy +++ b/sprites/spr_mk7_runic_belt/spr_mk7_runic_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_runic_belt", "bboxMode":0, "bbox_bottom":104, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_runic_belt/spr_mk7_runic_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"30003a9b-235a-4a43-8274-13d6bc52408e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_runic_belt/spr_mk7_runic_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"30003a9b-235a-4a43-8274-13d6bc52408e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy b/sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy index 86d18731af..7fedf5cac4 100644 --- a/sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy +++ b/sprites/spr_mk7_sculpted_chest/spr_mk7_sculpted_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_sculpted_chest", "bboxMode":0, "bbox_bottom":97, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d359bd56-6962-4c59-a10d-f16ae433baa8","name":"d359bd56-6962-4c59-a10d-f16ae433baa8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"092aa646-8af7-4ede-a104-ccb04fae0cbf","name":"092aa646-8af7-4ede-a104-ccb04fae0cbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc5e2753-207d-403d-81c5-a4e7066de053","name":"bc5e2753-207d-403d-81c5-a4e7066de053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca44f968-4109-4468-901b-d07add46e880","name":"ca44f968-4109-4468-901b-d07add46e880","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af74c721-e4c2-4842-b738-a2c688adc317","name":"af74c721-e4c2-4842-b738-a2c688adc317","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0d02faaf-2101-406d-a94f-527d1c7834db","name":"0d02faaf-2101-406d-a94f-527d1c7834db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5769f893-c909-4b88-9856-62d72a0b6130","name":"5769f893-c909-4b88-9856-62d72a0b6130","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d359bd56-6962-4c59-a10d-f16ae433baa8","name":"d359bd56-6962-4c59-a10d-f16ae433baa8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"092aa646-8af7-4ede-a104-ccb04fae0cbf","name":"092aa646-8af7-4ede-a104-ccb04fae0cbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc5e2753-207d-403d-81c5-a4e7066de053","name":"bc5e2753-207d-403d-81c5-a4e7066de053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca44f968-4109-4468-901b-d07add46e880","name":"ca44f968-4109-4468-901b-d07add46e880","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af74c721-e4c2-4842-b738-a2c688adc317","name":"af74c721-e4c2-4842-b738-a2c688adc317","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0d02faaf-2101-406d-a94f-527d1c7834db","name":"0d02faaf-2101-406d-a94f-527d1c7834db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5769f893-c909-4b88-9856-62d72a0b6130","name":"5769f893-c909-4b88-9856-62d72a0b6130","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,6 +69,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy b/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy index 21dba15817..f40beee983 100644 --- a/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy +++ b/sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_thorax_variants", "bboxMode":0, "bbox_bottom":94, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d0338708-7e62-4549-91ae-e73b183dd2ef","name":"d0338708-7e62-4549-91ae-e73b183dd2ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"44f5165b-6919-4a3a-9c58-452f3f588084","name":"44f5165b-6919-4a3a-9c58-452f3f588084","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d0338708-7e62-4549-91ae-e73b183dd2ef","name":"d0338708-7e62-4549-91ae-e73b183dd2ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"44f5165b-6919-4a3a-9c58-452f3f588084","name":"44f5165b-6919-4a3a-9c58-452f3f588084","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0338708-7e62-4549-91ae-e73b183dd2ef","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"df9c08ff-f06d-400b-80e7-bb59328f9199","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee5845f8-5f75-4dda-836e-fc135b26839e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"44f5165b-6919-4a3a-9c58-452f3f588084","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"db13cbd7-28ca-45ef-bbcc-e67390716428","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca73c5a3-17d3-45a9-b6c9-78cb538894d1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0fae1fd8-4aa0-442c-994c-edeef09a437b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec56882c-5f46-4d97-b25b-d17bbef25348","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0338708-7e62-4549-91ae-e73b183dd2ef","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df9c08ff-f06d-400b-80e7-bb59328f9199","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d082ec33-adf7-4978-a9fb-3fcf8cdcfbe6","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee5845f8-5f75-4dda-836e-fc135b26839e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"44f5165b-6919-4a3a-9c58-452f3f588084","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"db13cbd7-28ca-45ef-bbcc-e67390716428","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a8cd791-4f7b-4fe6-993f-255b1e395f90","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca73c5a3-17d3-45a9-b6c9-78cb538894d1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"979ec1c1-5d04-49f0-bb6c-2260773073c8","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0fae1fd8-4aa0-442c-994c-edeef09a437b","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"819e247d-9b1e-4fdc-a9d8-b719ed4cd316","path":"sprites/spr_mk7_thorax_variants/spr_mk7_thorax_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec56882c-5f46-4d97-b25b-d17bbef25348","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_wolf_cult_belt/spr_mk7_wolf_cult_belt.yy b/sprites/spr_mk7_wolf_cult_belt/spr_mk7_wolf_cult_belt.yy index fee5ab2bd8..4808408ebf 100644 --- a/sprites/spr_mk7_wolf_cult_belt/spr_mk7_wolf_cult_belt.yy +++ b/sprites/spr_mk7_wolf_cult_belt/spr_mk7_wolf_cult_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_wolf_cult_belt", "bboxMode":0, "bbox_bottom":105, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -65,6 +65,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy b/sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy index 79541a838e..9d2d53b28e 100644 --- a/sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy +++ b/sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk7_wolf_cult_chest_variants", "bboxMode":0, "bbox_bottom":70, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bc5e2753-207d-403d-81c5-a4e7066de053","name":"bc5e2753-207d-403d-81c5-a4e7066de053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc5e2753-207d-403d-81c5-a4e7066de053","name":"bc5e2753-207d-403d-81c5-a4e7066de053","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ad9cfc1-5d97-4389-99cb-ecafad8ac462","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc5e2753-207d-403d-81c5-a4e7066de053","path":"sprites/spr_mk7_wolf_cult_chest_variants/spr_mk7_wolf_cult_chest_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ad9cfc1-5d97-4389-99cb-ecafad8ac462","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk8_colors/spr_mk8_colors.yy b/sprites/spr_mk8_colors/spr_mk8_colors.yy index a800b21d31..0202853028 100644 --- a/sprites/spr_mk8_colors/spr_mk8_colors.yy +++ b/sprites/spr_mk8_colors/spr_mk8_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk8_colors", "bboxMode":0, "bbox_bottom":220, @@ -12,19 +12,19 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8be4a626-6064-4b08-a100-7509ef5b5e5e","name":"8be4a626-6064-4b08-a100-7509ef5b5e5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9e9a85f0-b4e6-4c9b-8233-0b5a268bf521","name":"9e9a85f0-b4e6-4c9b-8233-0b5a268bf521","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"981be636-52a5-4d29-96b0-5dee6151a13a","name":"981be636-52a5-4d29-96b0-5dee6151a13a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0f0c616c-4a13-4802-b8b3-2822cfe25787","name":"0f0c616c-4a13-4802-b8b3-2822cfe25787","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b557307-d3ab-44db-88bd-dd939efc6f44","name":"1b557307-d3ab-44db-88bd-dd939efc6f44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"95e99182-f9d7-45c6-aa75-55e9d68109af","name":"95e99182-f9d7-45c6-aa75-55e9d68109af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fbff63f1-b792-412e-9e65-2b9f52a1a2b7","name":"fbff63f1-b792-412e-9e65-2b9f52a1a2b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"349d1be4-0273-4d96-b600-2d943ad99dbe","name":"349d1be4-0273-4d96-b600-2d943ad99dbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c002c68f-30e5-4bbe-b121-e694c138b49d","name":"c002c68f-30e5-4bbe-b121-e694c138b49d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4d4ccd1e-f8af-41b7-9098-1af71496f28b","name":"4d4ccd1e-f8af-41b7-9098-1af71496f28b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"277f0aa2-b06c-4fa9-9656-a6bf6895da55","name":"277f0aa2-b06c-4fa9-9656-a6bf6895da55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01e36482-0b8b-41d7-8adc-d3c6b70c8575","name":"01e36482-0b8b-41d7-8adc-d3c6b70c8575","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"51421269-71df-4679-9664-340ff8792b13","name":"51421269-71df-4679-9664-340ff8792b13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8be4a626-6064-4b08-a100-7509ef5b5e5e","name":"8be4a626-6064-4b08-a100-7509ef5b5e5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e9a85f0-b4e6-4c9b-8233-0b5a268bf521","name":"9e9a85f0-b4e6-4c9b-8233-0b5a268bf521","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"981be636-52a5-4d29-96b0-5dee6151a13a","name":"981be636-52a5-4d29-96b0-5dee6151a13a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0f0c616c-4a13-4802-b8b3-2822cfe25787","name":"0f0c616c-4a13-4802-b8b3-2822cfe25787","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b557307-d3ab-44db-88bd-dd939efc6f44","name":"1b557307-d3ab-44db-88bd-dd939efc6f44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95e99182-f9d7-45c6-aa75-55e9d68109af","name":"95e99182-f9d7-45c6-aa75-55e9d68109af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fbff63f1-b792-412e-9e65-2b9f52a1a2b7","name":"fbff63f1-b792-412e-9e65-2b9f52a1a2b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"349d1be4-0273-4d96-b600-2d943ad99dbe","name":"349d1be4-0273-4d96-b600-2d943ad99dbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c002c68f-30e5-4bbe-b121-e694c138b49d","name":"c002c68f-30e5-4bbe-b121-e694c138b49d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d4ccd1e-f8af-41b7-9098-1af71496f28b","name":"4d4ccd1e-f8af-41b7-9098-1af71496f28b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"277f0aa2-b06c-4fa9-9656-a6bf6895da55","name":"277f0aa2-b06c-4fa9-9656-a6bf6895da55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01e36482-0b8b-41d7-8adc-d3c6b70c8575","name":"01e36482-0b8b-41d7-8adc-d3c6b70c8575","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"51421269-71df-4679-9664-340ff8792b13","name":"51421269-71df-4679-9664-340ff8792b13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -80,45 +80,19 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8be4a626-6064-4b08-a100-7509ef5b5e5e","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ebf9ae16-672c-441f-a17e-427926b6b7cf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e9a85f0-b4e6-4c9b-8233-0b5a268bf521","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cee4d72f-5a12-42ae-a9c9-3561d40b0ff2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"981be636-52a5-4d29-96b0-5dee6151a13a","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"76a9ca46-05c1-4bb5-acc8-2a902aafaa8f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f0c616c-4a13-4802-b8b3-2822cfe25787","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ddc8d6b7-8742-46d6-b53b-8e944fa4a624","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b557307-d3ab-44db-88bd-dd939efc6f44","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b2b0de0d-7520-4f67-b900-38544950c442","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95e99182-f9d7-45c6-aa75-55e9d68109af","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"696987ef-0b47-44bd-8b4f-dc0717b4ebb1","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbff63f1-b792-412e-9e65-2b9f52a1a2b7","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cad3b930-d7c0-42d9-b598-4fb681152d39","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"349d1be4-0273-4d96-b600-2d943ad99dbe","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"110ba57c-100a-4f0b-a35c-6dd3e30ad0fd","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c002c68f-30e5-4bbe-b121-e694c138b49d","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c77406f6-2f88-4c3c-890f-86bc5b562115","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d4ccd1e-f8af-41b7-9098-1af71496f28b","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d1a7567-af80-4b42-a3d4-f55d86e29ee0","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"277f0aa2-b06c-4fa9-9656-a6bf6895da55","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6213a87d-cde3-4aad-96a0-66fa3cccfd96","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01e36482-0b8b-41d7-8adc-d3c6b70c8575","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a539504c-1db9-4b3d-ae90-398cd9f79ff7","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"51421269-71df-4679-9664-340ff8792b13","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e08051c1-4b10-4607-aaef-e161d151137d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8be4a626-6064-4b08-a100-7509ef5b5e5e","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ebf9ae16-672c-441f-a17e-427926b6b7cf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e9a85f0-b4e6-4c9b-8233-0b5a268bf521","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cee4d72f-5a12-42ae-a9c9-3561d40b0ff2","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"981be636-52a5-4d29-96b0-5dee6151a13a","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"76a9ca46-05c1-4bb5-acc8-2a902aafaa8f","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f0c616c-4a13-4802-b8b3-2822cfe25787","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ddc8d6b7-8742-46d6-b53b-8e944fa4a624","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b557307-d3ab-44db-88bd-dd939efc6f44","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b2b0de0d-7520-4f67-b900-38544950c442","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95e99182-f9d7-45c6-aa75-55e9d68109af","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"696987ef-0b47-44bd-8b4f-dc0717b4ebb1","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbff63f1-b792-412e-9e65-2b9f52a1a2b7","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cad3b930-d7c0-42d9-b598-4fb681152d39","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"349d1be4-0273-4d96-b600-2d943ad99dbe","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"110ba57c-100a-4f0b-a35c-6dd3e30ad0fd","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c002c68f-30e5-4bbe-b121-e694c138b49d","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c77406f6-2f88-4c3c-890f-86bc5b562115","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d4ccd1e-f8af-41b7-9098-1af71496f28b","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d1a7567-af80-4b42-a3d4-f55d86e29ee0","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"277f0aa2-b06c-4fa9-9656-a6bf6895da55","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6213a87d-cde3-4aad-96a0-66fa3cccfd96","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01e36482-0b8b-41d7-8adc-d3c6b70c8575","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a539504c-1db9-4b3d-ae90-398cd9f79ff7","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"51421269-71df-4679-9664-340ff8792b13","path":"sprites/spr_mk8_colors/spr_mk8_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e08051c1-4b10-4607-aaef-e161d151137d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk8_gorget/spr_mk8_gorget.yy b/sprites/spr_mk8_gorget/spr_mk8_gorget.yy index 30e32980b3..cc4d7c7954 100644 --- a/sprites/spr_mk8_gorget/spr_mk8_gorget.yy +++ b/sprites/spr_mk8_gorget/spr_mk8_gorget.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mk8_gorget", "bboxMode":0, "bbox_bottom":53, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"851a2104-903f-436b-b68b-06b80d754bf4","name":"851a2104-903f-436b-b68b-06b80d754bf4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"603329e3-8632-4533-b8b4-82b83c307cac","name":"603329e3-8632-4533-b8b4-82b83c307cac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4999c3e-8f41-4b09-ac88-634015b49682","name":"d4999c3e-8f41-4b09-ac88-634015b49682","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"158ee31a-9f08-4c7d-9e87-fae8d166c376","name":"158ee31a-9f08-4c7d-9e87-fae8d166c376","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"851a2104-903f-436b-b68b-06b80d754bf4","name":"851a2104-903f-436b-b68b-06b80d754bf4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","name":"b18dfcbc-b847-441b-9b0c-618cd25c2349","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","name":"6988a4aa-1960-49dd-a4d3-166e6ff7c4df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"603329e3-8632-4533-b8b4-82b83c307cac","name":"603329e3-8632-4533-b8b4-82b83c307cac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","name":"4898c548-a0c7-4e41-a1b5-a09ace2df4a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4999c3e-8f41-4b09-ac88-634015b49682","name":"d4999c3e-8f41-4b09-ac88-634015b49682","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"158ee31a-9f08-4c7d-9e87-fae8d166c376","name":"158ee31a-9f08-4c7d-9e87-fae8d166c376","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,6 +69,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mk8_gorgot_shadows/851a2104-903f-436b-b68b-06b80d754bf4.png b/sprites/spr_mk8_gorgot_shadows/851a2104-903f-436b-b68b-06b80d754bf4.png new file mode 100644 index 0000000000..68ebed585c Binary files /dev/null and b/sprites/spr_mk8_gorgot_shadows/851a2104-903f-436b-b68b-06b80d754bf4.png differ diff --git a/sprites/spr_mk8_gorgot_shadows/layers/851a2104-903f-436b-b68b-06b80d754bf4/3994dc61-d579-4603-9654-c8424ce7bb41.png b/sprites/spr_mk8_gorgot_shadows/layers/851a2104-903f-436b-b68b-06b80d754bf4/3994dc61-d579-4603-9654-c8424ce7bb41.png new file mode 100644 index 0000000000..f4abe8038f Binary files /dev/null and b/sprites/spr_mk8_gorgot_shadows/layers/851a2104-903f-436b-b68b-06b80d754bf4/3994dc61-d579-4603-9654-c8424ce7bb41.png differ diff --git a/sprites/spr_mk8_gorgot_shadows/layers/851a2104-903f-436b-b68b-06b80d754bf4/69099ddf-381f-4a25-8b11-acd021520a66.png b/sprites/spr_mk8_gorgot_shadows/layers/851a2104-903f-436b-b68b-06b80d754bf4/69099ddf-381f-4a25-8b11-acd021520a66.png new file mode 100644 index 0000000000..68ebed585c Binary files /dev/null and b/sprites/spr_mk8_gorgot_shadows/layers/851a2104-903f-436b-b68b-06b80d754bf4/69099ddf-381f-4a25-8b11-acd021520a66.png differ diff --git a/sprites/spr_mk8_gorgot_shadows/layers/851a2104-903f-436b-b68b-06b80d754bf4/e79fd6c3-148d-41a0-b649-496590b98fdc.png b/sprites/spr_mk8_gorgot_shadows/layers/851a2104-903f-436b-b68b-06b80d754bf4/e79fd6c3-148d-41a0-b649-496590b98fdc.png new file mode 100644 index 0000000000..93bfbcaebe Binary files /dev/null and b/sprites/spr_mk8_gorgot_shadows/layers/851a2104-903f-436b-b68b-06b80d754bf4/e79fd6c3-148d-41a0-b649-496590b98fdc.png differ diff --git a/sprites/spr_mk8_gorgot_shadows/spr_mk8_gorgot_shadows.yy b/sprites/spr_mk8_gorgot_shadows/spr_mk8_gorgot_shadows.yy new file mode 100644 index 0000000000..d374fefc64 --- /dev/null +++ b/sprites/spr_mk8_gorgot_shadows/spr_mk8_gorgot_shadows.yy @@ -0,0 +1,94 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_mk8_gorgot_shadows", + "bboxMode":0, + "bbox_bottom":51, + "bbox_left":58, + "bbox_right":106, + "bbox_top":24, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"851a2104-903f-436b-b68b-06b80d754bf4","name":"851a2104-903f-436b-b68b-06b80d754bf4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"69099ddf-381f-4a25-8b11-acd021520a66","blendMode":0,"displayName":"Layer 1","isLocked":false,"name":"69099ddf-381f-4a25-8b11-acd021520a66","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"3994dc61-d579-4603-9654-c8424ce7bb41","blendMode":0,"displayName":"Layer 2","isLocked":false,"name":"3994dc61-d579-4603-9654-c8424ce7bb41","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":false,}, + {"$GMImageLayer":"","%Name":"e79fd6c3-148d-41a0-b649-496590b98fdc","blendMode":0,"displayName":"default","isLocked":false,"name":"e79fd6c3-148d-41a0-b649-496590b98fdc","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":false,}, + ], + "name":"spr_mk8_gorgot_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"mk_8_complex", + "path":"folders/Sprites/Marine Viewer/body_types/mk_8_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_mk8_gorgot_shadows", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_mk8_gorgot_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"851a2104-903f-436b-b68b-06b80d754bf4","path":"sprites/spr_mk8_gorgot_shadows/spr_mk8_gorgot_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"80b2289b-cc75-4ca5-96ca-3097105f3fd2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":-2, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":164, +} \ No newline at end of file diff --git a/sprites/spr_mm_butts/spr_mm_butts.yy b/sprites/spr_mm_butts/spr_mm_butts.yy index dab65c487f..1e54636e49 100644 --- a/sprites/spr_mm_butts/spr_mm_butts.yy +++ b/sprites/spr_mm_butts/spr_mm_butts.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mm_butts", "bboxMode":0, "bbox_bottom":19, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b2f3fc02-83c3-4384-8cf7-349730941d32","name":"b2f3fc02-83c3-4384-8cf7-349730941d32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8ada21ef-8373-4ce3-a587-650fb8da0541","name":"8ada21ef-8373-4ce3-a587-650fb8da0541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a490443b-3cdf-4753-9ffc-2896f0104827","name":"a490443b-3cdf-4753-9ffc-2896f0104827","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"07b73ac4-39da-4acb-9f11-a9ee3400a71f","name":"07b73ac4-39da-4acb-9f11-a9ee3400a71f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b2f3fc02-83c3-4384-8cf7-349730941d32","name":"b2f3fc02-83c3-4384-8cf7-349730941d32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8ada21ef-8373-4ce3-a587-650fb8da0541","name":"8ada21ef-8373-4ce3-a587-650fb8da0541","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a490443b-3cdf-4753-9ffc-2896f0104827","name":"a490443b-3cdf-4753-9ffc-2896f0104827","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"07b73ac4-39da-4acb-9f11-a9ee3400a71f","name":"07b73ac4-39da-4acb-9f11-a9ee3400a71f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2f3fc02-83c3-4384-8cf7-349730941d32","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a3a0d07f-06dc-4ca4-b90a-8a1d3ac5001c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ada21ef-8373-4ce3-a587-650fb8da0541","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"85c4ac87-7c94-4842-aed9-9ecf21a490bb","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a490443b-3cdf-4753-9ffc-2896f0104827","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89e01832-b757-43a7-97c2-1be750fd2a76","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"07b73ac4-39da-4acb-9f11-a9ee3400a71f","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca031830-21c6-4642-818b-5df96fb549d2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04528819-a220-4726-8700-303995f2fb3c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2f3fc02-83c3-4384-8cf7-349730941d32","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a3a0d07f-06dc-4ca4-b90a-8a1d3ac5001c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8ada21ef-8373-4ce3-a587-650fb8da0541","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"85c4ac87-7c94-4842-aed9-9ecf21a490bb","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a490443b-3cdf-4753-9ffc-2896f0104827","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89e01832-b757-43a7-97c2-1be750fd2a76","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"07b73ac4-39da-4acb-9f11-a9ee3400a71f","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca031830-21c6-4642-818b-5df96fb549d2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","path":"sprites/spr_mm_butts/spr_mm_butts.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04528819-a220-4726-8700-303995f2fb3c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mm_butts_small/spr_mm_butts_small.yy b/sprites/spr_mm_butts_small/spr_mm_butts_small.yy index 707db231a6..331e857a00 100644 --- a/sprites/spr_mm_butts_small/spr_mm_butts_small.yy +++ b/sprites/spr_mm_butts_small/spr_mm_butts_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mm_butts_small", "bboxMode":0, "bbox_bottom":19, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a490443b-3cdf-4753-9ffc-2896f0104827","name":"a490443b-3cdf-4753-9ffc-2896f0104827","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a490443b-3cdf-4753-9ffc-2896f0104827","name":"a490443b-3cdf-4753-9ffc-2896f0104827","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","name":"8122bd56-7d5c-49d3-a373-6548e3cf9b7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":20.0, + "seqWidth":144.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mm_glow/spr_mm_glow.yy b/sprites/spr_mm_glow/spr_mm_glow.yy index 20b8314a19..6992b7deae 100644 --- a/sprites/spr_mm_glow/spr_mm_glow.yy +++ b/sprites/spr_mm_glow/spr_mm_glow.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mm_glow", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4556acbf-7ef8-4c6f-9353-35cbb469a534","name":"4556acbf-7ef8-4c6f-9353-35cbb469a534","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4556acbf-7ef8-4c6f-9353-35cbb469a534","name":"4556acbf-7ef8-4c6f-9353-35cbb469a534","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4556acbf-7ef8-4c6f-9353-35cbb469a534","path":"sprites/spr_mm_glow/spr_mm_glow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d532e166-1426-4753-a82c-2239adaee1f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4556acbf-7ef8-4c6f-9353-35cbb469a534","path":"sprites/spr_mm_glow/spr_mm_glow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d532e166-1426-4753-a82c-2239adaee1f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mm_glowold/spr_mm_glowold.yy b/sprites/spr_mm_glowold/spr_mm_glowold.yy index 2f34d688c5..52be77ffd3 100644 --- a/sprites/spr_mm_glowold/spr_mm_glowold.yy +++ b/sprites/spr_mm_glowold/spr_mm_glowold.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mm_glowold", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a810a33a-a34b-49b8-a394-e5126d46c22f","name":"a810a33a-a34b-49b8-a394-e5126d46c22f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a810a33a-a34b-49b8-a394-e5126d46c22f","name":"a810a33a-a34b-49b8-a394-e5126d46c22f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a810a33a-a34b-49b8-a394-e5126d46c22f","path":"sprites/spr_mm_glowold/spr_mm_glowold.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3d2b87d-08e3-49ce-95d6-627e333eca68","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a810a33a-a34b-49b8-a394-e5126d46c22f","path":"sprites/spr_mm_glowold/spr_mm_glowold.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3d2b87d-08e3-49ce-95d6-627e333eca68","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mongol_hat/spr_mongol_hat.yy b/sprites/spr_mongol_hat/spr_mongol_hat.yy index a5cac3914a..6c28c71872 100644 --- a/sprites/spr_mongol_hat/spr_mongol_hat.yy +++ b/sprites/spr_mongol_hat/spr_mongol_hat.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mongol_hat", "bboxMode":0, "bbox_bottom":37, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f98623c4-a90f-4f13-a78b-50d7aae8aca6","name":"f98623c4-a90f-4f13-a78b-50d7aae8aca6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2f4626ef-3b9b-492c-9b46-13db7e74e087","name":"2f4626ef-3b9b-492c-9b46-13db7e74e087","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f98623c4-a90f-4f13-a78b-50d7aae8aca6","name":"f98623c4-a90f-4f13-a78b-50d7aae8aca6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2f4626ef-3b9b-492c-9b46-13db7e74e087","name":"2f4626ef-3b9b-492c-9b46-13db7e74e087","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_mongol_topknots/spr_mongol_topknots.yy b/sprites/spr_mongol_topknots/spr_mongol_topknots.yy index 3c32849d9f..d6abf58818 100644 --- a/sprites/spr_mongol_topknots/spr_mongol_topknots.yy +++ b/sprites/spr_mongol_topknots/spr_mongol_topknots.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_mongol_topknots", "bboxMode":0, "bbox_bottom":69, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4a660cc7-bffb-4e55-a447-3261a00bc7c8","name":"4a660cc7-bffb-4e55-a447-3261a00bc7c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8dfcac38-dfd1-4639-84d7-f101aec4c205","name":"8dfcac38-dfd1-4639-84d7-f101aec4c205","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a660cc7-bffb-4e55-a447-3261a00bc7c8","name":"4a660cc7-bffb-4e55-a447-3261a00bc7c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8dfcac38-dfd1-4639-84d7-f101aec4c205","name":"8dfcac38-dfd1-4639-84d7-f101aec4c205","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -65,6 +65,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_narthecium_2/spr_narthecium_2.yy b/sprites/spr_narthecium_2/spr_narthecium_2.yy index be1d7326dc..6cf1fbf539 100644 --- a/sprites/spr_narthecium_2/spr_narthecium_2.yy +++ b/sprites/spr_narthecium_2/spr_narthecium_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_narthecium_2", "bboxMode":0, "bbox_bottom":134, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","path":"sprites/spr_narthecium_2/spr_narthecium_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"25b210ef-73fb-4ec5-bcd7-b16bd2738aa9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"350bde68-1664-48e8-97c4-7cff3c59b4ae","path":"sprites/spr_narthecium_2/spr_narthecium_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"25b210ef-73fb-4ec5-bcd7-b16bd2738aa9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_new_banner/spr_new_banner.yy b/sprites/spr_new_banner/spr_new_banner.yy index c5332cb062..4042519b21 100644 --- a/sprites/spr_new_banner/spr_new_banner.yy +++ b/sprites/spr_new_banner/spr_new_banner.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_new_banner", "bboxMode":0, "bbox_bottom":197, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"affc02cd-401a-4d10-8d72-28cb9fc69444","name":"affc02cd-401a-4d10-8d72-28cb9fc69444","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"affc02cd-401a-4d10-8d72-28cb9fc69444","name":"affc02cd-401a-4d10-8d72-28cb9fc69444","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":198.0, + "seqWidth":161.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_new_mm/spr_new_mm.yy b/sprites/spr_new_mm/spr_new_mm.yy index f53214f6a2..d92d63b1f9 100644 --- a/sprites/spr_new_mm/spr_new_mm.yy +++ b/sprites/spr_new_mm/spr_new_mm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_new_mm", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"24507153-8c4a-4a69-b14f-9a079657f166","name":"24507153-8c4a-4a69-b14f-9a079657f166","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"24507153-8c4a-4a69-b14f-9a079657f166","name":"24507153-8c4a-4a69-b14f-9a079657f166","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":32.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_new_resource/spr_new_resource.yy b/sprites/spr_new_resource/spr_new_resource.yy index a7c43fcbb3..c507c235a1 100644 --- a/sprites/spr_new_resource/spr_new_resource.yy +++ b/sprites/spr_new_resource/spr_new_resource.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_new_resource", "bboxMode":0, "bbox_bottom":16, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"284792e4-d862-4f8a-a95c-5da79bfd3c5e","name":"284792e4-d862-4f8a-a95c-5da79bfd3c5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"99dadd8d-4acd-431a-b7f3-9b4cb6925ed9","name":"99dadd8d-4acd-431a-b7f3-9b4cb6925ed9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b715fa2-79cd-4464-9f8a-de6c2ef6b6bc","name":"3b715fa2-79cd-4464-9f8a-de6c2ef6b6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4978835-d9d6-4bd9-9090-17f08503e7f7","name":"f4978835-d9d6-4bd9-9090-17f08503e7f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"284792e4-d862-4f8a-a95c-5da79bfd3c5e","name":"284792e4-d862-4f8a-a95c-5da79bfd3c5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"99dadd8d-4acd-431a-b7f3-9b4cb6925ed9","name":"99dadd8d-4acd-431a-b7f3-9b4cb6925ed9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b715fa2-79cd-4464-9f8a-de6c2ef6b6bc","name":"3b715fa2-79cd-4464-9f8a-de6c2ef6b6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4978835-d9d6-4bd9-9090-17f08503e7f7","name":"f4978835-d9d6-4bd9-9090-17f08503e7f7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"284792e4-d862-4f8a-a95c-5da79bfd3c5e","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d19f578-139c-4064-8be1-47be64f4285e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"99dadd8d-4acd-431a-b7f3-9b4cb6925ed9","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"23d29671-1fde-42a4-b10a-af9b95b35347","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b715fa2-79cd-4464-9f8a-de6c2ef6b6bc","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e1e32982-b0e4-4d65-9829-47a9b31990ca","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4978835-d9d6-4bd9-9090-17f08503e7f7","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"184f4138-aff7-414c-ad9b-da8d8f89d9b8","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"284792e4-d862-4f8a-a95c-5da79bfd3c5e","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d19f578-139c-4064-8be1-47be64f4285e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"99dadd8d-4acd-431a-b7f3-9b4cb6925ed9","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"23d29671-1fde-42a4-b10a-af9b95b35347","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b715fa2-79cd-4464-9f8a-de6c2ef6b6bc","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e1e32982-b0e4-4d65-9829-47a9b31990ca","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4978835-d9d6-4bd9-9090-17f08503e7f7","path":"sprites/spr_new_resource/spr_new_resource.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"184f4138-aff7-414c-ad9b-da8d8f89d9b8","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_new_ui/spr_new_ui.yy b/sprites/spr_new_ui/spr_new_ui.yy index 6c60cea1a0..b06921e5ef 100644 --- a/sprites/spr_new_ui/spr_new_ui.yy +++ b/sprites/spr_new_ui/spr_new_ui.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_new_ui", "bboxMode":0, "bbox_bottom":899, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"751eeb13-8d20-4ec3-a112-2614d1d1869c","name":"751eeb13-8d20-4ec3-a112-2614d1d1869c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8d415ed6-0e26-4ceb-81b7-9d0cbac59606","name":"8d415ed6-0e26-4ceb-81b7-9d0cbac59606","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"751eeb13-8d20-4ec3-a112-2614d1d1869c","name":"751eeb13-8d20-4ec3-a112-2614d1d1869c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d415ed6-0e26-4ceb-81b7-9d0cbac59606","name":"8d415ed6-0e26-4ceb-81b7-9d0cbac59606","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,12 +73,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"751eeb13-8d20-4ec3-a112-2614d1d1869c","path":"sprites/spr_new_ui/spr_new_ui.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78876266-578e-4c35-9427-365cd0f530f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d415ed6-0e26-4ceb-81b7-9d0cbac59606","path":"sprites/spr_new_ui/spr_new_ui.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"52b35884-ddd9-4ffa-9407-83da11883191","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"751eeb13-8d20-4ec3-a112-2614d1d1869c","path":"sprites/spr_new_ui/spr_new_ui.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78876266-578e-4c35-9427-365cd0f530f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d415ed6-0e26-4ceb-81b7-9d0cbac59606","path":"sprites/spr_new_ui/spr_new_ui.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"52b35884-ddd9-4ffa-9407-83da11883191","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_new_ui_cover/spr_new_ui_cover.yy b/sprites/spr_new_ui_cover/spr_new_ui_cover.yy index f2db196f68..6f1fc1d976 100644 --- a/sprites/spr_new_ui_cover/spr_new_ui_cover.yy +++ b/sprites/spr_new_ui_cover/spr_new_ui_cover.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_new_ui_cover", "bboxMode":0, "bbox_bottom":16, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"40857d9f-b7b0-460f-8da3-993db52e0aee","name":"40857d9f-b7b0-460f-8da3-993db52e0aee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40857d9f-b7b0-460f-8da3-993db52e0aee","name":"40857d9f-b7b0-460f-8da3-993db52e0aee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40857d9f-b7b0-460f-8da3-993db52e0aee","path":"sprites/spr_new_ui_cover/spr_new_ui_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf14c101-a0a4-4283-81ca-19d9c4c64d75","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40857d9f-b7b0-460f-8da3-993db52e0aee","path":"sprites/spr_new_ui_cover/spr_new_ui_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf14c101-a0a4-4283-81ca-19d9c4c64d75","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_noarmour_colors/spr_noarmour_colors.yy b/sprites/spr_noarmour_colors/spr_noarmour_colors.yy index 426778757f..4f002b7a4a 100644 --- a/sprites/spr_noarmour_colors/spr_noarmour_colors.yy +++ b/sprites/spr_noarmour_colors/spr_noarmour_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_noarmour_colors", "bboxMode":0, "bbox_bottom":223, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7fda383a-1b96-43ab-9b00-348ba94f24e3","name":"7fda383a-1b96-43ab-9b00-348ba94f24e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dfcef27b-ef94-422d-b312-1aeaffa3836e","name":"dfcef27b-ef94-422d-b312-1aeaffa3836e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7fda383a-1b96-43ab-9b00-348ba94f24e3","name":"7fda383a-1b96-43ab-9b00-348ba94f24e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfcef27b-ef94-422d-b312-1aeaffa3836e","name":"dfcef27b-ef94-422d-b312-1aeaffa3836e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -77,10 +79,7 @@ },"Disabled":false,"id":"38cc4662-e007-4c05-a7a0-3f86779d9c91","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, diff --git a/sprites/spr_none/spr_none.yy b/sprites/spr_none/spr_none.yy index 1259ef6117..0b964ea1cc 100644 --- a/sprites/spr_none/spr_none.yy +++ b/sprites/spr_none/spr_none.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_none", "bboxMode":0, "bbox_bottom":63, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4a6846e4-12cb-4abb-9404-633df612cd68","name":"4a6846e4-12cb-4abb-9404-633df612cd68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a6846e4-12cb-4abb-9404-633df612cd68","name":"4a6846e4-12cb-4abb-9404-633df612cd68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a6846e4-12cb-4abb-9404-633df612cd68","path":"sprites/spr_none/spr_none.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a859341-0d2d-4356-b87d-df4182e972bc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a6846e4-12cb-4abb-9404-633df612cd68","path":"sprites/spr_none/spr_none.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a859341-0d2d-4356-b87d-df4182e972bc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy b/sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy index 6bb656566a..8764a267df 100644 --- a/sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy +++ b/sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_numeral_left_knee", "bboxMode":0, "bbox_bottom":157, @@ -12,17 +12,17 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"29533519-c6e5-4bda-a613-b26007242bcb","name":"29533519-c6e5-4bda-a613-b26007242bcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c4049b43-1809-4728-924c-5444da8719b5","name":"c4049b43-1809-4728-924c-5444da8719b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"29533519-c6e5-4bda-a613-b26007242bcb","name":"29533519-c6e5-4bda-a613-b26007242bcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4049b43-1809-4728-924c-5444da8719b5","name":"c4049b43-1809-4728-924c-5444da8719b5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -78,39 +78,17 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"09b95042-aae6-492f-b786-b74c8c6e9263","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"47ab4ac3-1121-425c-9979-42936e389541","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"36a71730-fbce-4be8-b54c-fd8eaf732dad","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec4374be-3bbd-4d09-aeda-dd7c2f4b6da2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee25b373-1963-4f2e-9aa5-3532ed45cff6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"af3546e5-fb3f-4506-9654-5aafa55e19fd","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0cbf6635-ee09-47d2-a582-f271220c8676","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"29533519-c6e5-4bda-a613-b26007242bcb","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de7ee4b9-7b88-45f6-965e-8c99fe6bd60a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9729f53-ea1d-4a0d-adfe-4596f2e3bd5c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2c2462aa-f436-4f4a-97e8-831ed46702b7","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4049b43-1809-4728-924c-5444da8719b5","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"502ea72f-bafd-4719-b46e-178305e29cda","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e3f21a7-0c9e-42e8-b7b8-d88b3d32cdf5","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"09b95042-aae6-492f-b786-b74c8c6e9263","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"74541f65-2a87-4ba1-b43a-968fffc9b1a9","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"47ab4ac3-1121-425c-9979-42936e389541","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d6d3aec-7568-4b23-ad3c-5a7a6dfbfdf8","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36a71730-fbce-4be8-b54c-fd8eaf732dad","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1a1eaf9-13dc-467e-b01e-c9bc4b05b11d","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec4374be-3bbd-4d09-aeda-dd7c2f4b6da2","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83d0a8ac-8f98-4424-958c-95b882ab0e67","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee25b373-1963-4f2e-9aa5-3532ed45cff6","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4257bedb-e4c1-47ce-99d8-f9c6ed903889","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"af3546e5-fb3f-4506-9654-5aafa55e19fd","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"25b1f798-03df-4b5e-a0b2-11a6c49d2369","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0cbf6635-ee09-47d2-a582-f271220c8676","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"29533519-c6e5-4bda-a613-b26007242bcb","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de7ee4b9-7b88-45f6-965e-8c99fe6bd60a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4cc7d3c-52d3-4b40-8dfa-8e17c9c83fa6","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9729f53-ea1d-4a0d-adfe-4596f2e3bd5c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4b15ce1-2cf7-4657-b4de-036b06455aad","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2c2462aa-f436-4f4a-97e8-831ed46702b7","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4049b43-1809-4728-924c-5444da8719b5","path":"sprites/spr_numeral_left_knee/spr_numeral_left_knee.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"502ea72f-bafd-4719-b46e-178305e29cda","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ork_target/spr_ork_target.yy b/sprites/spr_ork_target/spr_ork_target.yy index 246116103c..2b855e4324 100644 --- a/sprites/spr_ork_target/spr_ork_target.yy +++ b/sprites/spr_ork_target/spr_ork_target.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ork_target", "bboxMode":2, "bbox_bottom":31, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"da401b80-f220-4151-8235-7d11983b9b40","name":"da401b80-f220-4151-8235-7d11983b9b40","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da401b80-f220-4151-8235-7d11983b9b40","name":"da401b80-f220-4151-8235-7d11983b9b40","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":36.0, + "seqWidth":41.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_p_name_bg/spr_p_name_bg.yy b/sprites/spr_p_name_bg/spr_p_name_bg.yy index 11a6cf1b03..635a960ec0 100644 --- a/sprites/spr_p_name_bg/spr_p_name_bg.yy +++ b/sprites/spr_p_name_bg/spr_p_name_bg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_p_name_bg", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a11f2334-9852-4e7b-b697-8d03d2b129a2","name":"a11f2334-9852-4e7b-b697-8d03d2b129a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a11f2334-9852-4e7b-b697-8d03d2b129a2","name":"a11f2334-9852-4e7b-b697-8d03d2b129a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":415.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_pa_arms/spr_pa_arms.yy b/sprites/spr_pa_arms/spr_pa_arms.yy index 0fa3e1b58d..b6845624d4 100644 --- a/sprites/spr_pa_arms/spr_pa_arms.yy +++ b/sprites/spr_pa_arms/spr_pa_arms.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pa_arms", "bboxMode":0, "bbox_bottom":126, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,12 +72,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_pa_arms/spr_pa_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c707c1b9-a614-4238-989e-e486b4848dbf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","path":"sprites/spr_pa_arms/spr_pa_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d39f4531-dd1e-4b87-878a-c5d11affd31f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_pa_arms/spr_pa_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c707c1b9-a614-4238-989e-e486b4848dbf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","path":"sprites/spr_pa_arms/spr_pa_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d39f4531-dd1e-4b87-878a-c5d11affd31f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy b/sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy index ec128d53f5..6f67fb6fcb 100644 --- a/sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy +++ b/sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pa_arms_ornate", "bboxMode":0, "bbox_bottom":126, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8363e074-6ccb-4eab-8cd5-9d0ea12c4e60","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","path":"sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1728fb22-de3b-4c95-872c-cc9250da60e5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8363e074-6ccb-4eab-8cd5-9d0ea12c4e60","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a98a9c8-9d01-439b-8b0a-d66fba9e548d","path":"sprites/spr_pa_arms_ornate/spr_pa_arms_ornate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1728fb22-de3b-4c95-872c-cc9250da60e5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_pa_hands/spr_pa_hands.yy b/sprites/spr_pa_hands/spr_pa_hands.yy index 6ccc6b749b..f34966c090 100644 --- a/sprites/spr_pa_hands/spr_pa_hands.yy +++ b/sprites/spr_pa_hands/spr_pa_hands.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pa_hands", "bboxMode":0, "bbox_bottom":126, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6827b9c-6f8a-4700-91e5-b7b0cf730f8a","name":"b6827b9c-6f8a-4700-91e5-b7b0cf730f8a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6eff66f0-db00-47d5-b4be-d57184964002","name":"6eff66f0-db00-47d5-b4be-d57184964002","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9dd4e8a9-3493-4422-8009-b60fa5153b4d","name":"9dd4e8a9-3493-4422-8009-b60fa5153b4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"155b1984-8759-413d-8092-2796ab1a3a09","name":"155b1984-8759-413d-8092-2796ab1a3a09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"20c640ed-d95e-40ec-bbda-7300bdb69b68","name":"20c640ed-d95e-40ec-bbda-7300bdb69b68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c85b1159-fa0f-48ec-93eb-753cf138faf3","name":"c85b1159-fa0f-48ec-93eb-753cf138faf3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"50dac15c-77fd-4ed1-8285-b9ad17031b87","name":"50dac15c-77fd-4ed1-8285-b9ad17031b87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a35b258a-44c7-430f-99de-c54f836b592a","name":"a35b258a-44c7-430f-99de-c54f836b592a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bbb28863-c4dc-4319-b68f-28f3eddb0958","name":"bbb28863-c4dc-4319-b68f-28f3eddb0958","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b630790-a06c-4a90-b3c5-720b7345b536","name":"9b630790-a06c-4a90-b3c5-720b7345b536","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84bcd5f4-d5f6-4fab-a2ae-15204455599d","name":"84bcd5f4-d5f6-4fab-a2ae-15204455599d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03fa6ac5-772e-4580-9e7e-3eaf30b21491","name":"03fa6ac5-772e-4580-9e7e-3eaf30b21491","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6827b9c-6f8a-4700-91e5-b7b0cf730f8a","name":"b6827b9c-6f8a-4700-91e5-b7b0cf730f8a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6eff66f0-db00-47d5-b4be-d57184964002","name":"6eff66f0-db00-47d5-b4be-d57184964002","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9dd4e8a9-3493-4422-8009-b60fa5153b4d","name":"9dd4e8a9-3493-4422-8009-b60fa5153b4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"155b1984-8759-413d-8092-2796ab1a3a09","name":"155b1984-8759-413d-8092-2796ab1a3a09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"20c640ed-d95e-40ec-bbda-7300bdb69b68","name":"20c640ed-d95e-40ec-bbda-7300bdb69b68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c85b1159-fa0f-48ec-93eb-753cf138faf3","name":"c85b1159-fa0f-48ec-93eb-753cf138faf3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"50dac15c-77fd-4ed1-8285-b9ad17031b87","name":"50dac15c-77fd-4ed1-8285-b9ad17031b87","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a35b258a-44c7-430f-99de-c54f836b592a","name":"a35b258a-44c7-430f-99de-c54f836b592a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bbb28863-c4dc-4319-b68f-28f3eddb0958","name":"bbb28863-c4dc-4319-b68f-28f3eddb0958","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b630790-a06c-4a90-b3c5-720b7345b536","name":"9b630790-a06c-4a90-b3c5-720b7345b536","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84bcd5f4-d5f6-4fab-a2ae-15204455599d","name":"84bcd5f4-d5f6-4fab-a2ae-15204455599d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03fa6ac5-772e-4580-9e7e-3eaf30b21491","name":"03fa6ac5-772e-4580-9e7e-3eaf30b21491","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,42 +81,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6827b9c-6f8a-4700-91e5-b7b0cf730f8a","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c995ba96-5312-4067-ac4e-80e3f9a3cfe3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6eff66f0-db00-47d5-b4be-d57184964002","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"036f006a-c105-4025-bfa6-f12fad434fba","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9dd4e8a9-3493-4422-8009-b60fa5153b4d","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f5500df-9a23-49bc-9bf9-acd7cb3706df","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"155b1984-8759-413d-8092-2796ab1a3a09","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64489bc4-4523-4692-af5f-6f1896df5dc9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"20c640ed-d95e-40ec-bbda-7300bdb69b68","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6341f511-a84d-4e6c-85a2-8e2eb49d7a37","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c85b1159-fa0f-48ec-93eb-753cf138faf3","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c9f00a5-3395-42bb-8316-ad0c9dd02fe9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"50dac15c-77fd-4ed1-8285-b9ad17031b87","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7e840d8a-dd19-4272-9d33-fd5aee23576d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a35b258a-44c7-430f-99de-c54f836b592a","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"66a8a65b-7d54-4c68-987c-ddeef4b4946a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbb28863-c4dc-4319-b68f-28f3eddb0958","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7e6b8980-b8a1-4a97-a7d0-a5c63705e814","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b630790-a06c-4a90-b3c5-720b7345b536","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3f8266ab-f08f-4789-bf17-d6bbc1172c5c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84bcd5f4-d5f6-4fab-a2ae-15204455599d","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d1c9d65e-2cea-414f-910a-6f8feea246d8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03fa6ac5-772e-4580-9e7e-3eaf30b21491","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f31a737-8fc9-4606-9bf4-63ab1f940942","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6827b9c-6f8a-4700-91e5-b7b0cf730f8a","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c995ba96-5312-4067-ac4e-80e3f9a3cfe3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6eff66f0-db00-47d5-b4be-d57184964002","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"036f006a-c105-4025-bfa6-f12fad434fba","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9dd4e8a9-3493-4422-8009-b60fa5153b4d","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f5500df-9a23-49bc-9bf9-acd7cb3706df","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"155b1984-8759-413d-8092-2796ab1a3a09","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64489bc4-4523-4692-af5f-6f1896df5dc9","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"20c640ed-d95e-40ec-bbda-7300bdb69b68","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6341f511-a84d-4e6c-85a2-8e2eb49d7a37","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c85b1159-fa0f-48ec-93eb-753cf138faf3","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c9f00a5-3395-42bb-8316-ad0c9dd02fe9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"50dac15c-77fd-4ed1-8285-b9ad17031b87","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e840d8a-dd19-4272-9d33-fd5aee23576d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a35b258a-44c7-430f-99de-c54f836b592a","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"66a8a65b-7d54-4c68-987c-ddeef4b4946a","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bbb28863-c4dc-4319-b68f-28f3eddb0958","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e6b8980-b8a1-4a97-a7d0-a5c63705e814","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b630790-a06c-4a90-b3c5-720b7345b536","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3f8266ab-f08f-4789-bf17-d6bbc1172c5c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84bcd5f4-d5f6-4fab-a2ae-15204455599d","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d1c9d65e-2cea-414f-910a-6f8feea246d8","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03fa6ac5-772e-4580-9e7e-3eaf30b21491","path":"sprites/spr_pa_hands/spr_pa_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f31a737-8fc9-4606-9bf4-63ab1f940942","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_pack_arm/spr_pack_arm.yy b/sprites/spr_pack_arm/spr_pack_arm.yy index 8161899e76..ae0f80af85 100644 --- a/sprites/spr_pack_arm/spr_pack_arm.yy +++ b/sprites/spr_pack_arm/spr_pack_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_arm", "bboxMode":0, "bbox_bottom":206, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"84b91922-cc04-47fc-989c-1f57e3b1fafe","name":"84b91922-cc04-47fc-989c-1f57e3b1fafe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"248cf0d9-174e-4863-8f84-e32382a7c773","name":"248cf0d9-174e-4863-8f84-e32382a7c773","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84b91922-cc04-47fc-989c-1f57e3b1fafe","name":"84b91922-cc04-47fc-989c-1f57e3b1fafe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"248cf0d9-174e-4863-8f84-e32382a7c773","name":"248cf0d9-174e-4863-8f84-e32382a7c773","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -77,10 +79,7 @@ },"Disabled":false,"id":"99c18d6d-89c3-455b-be9f-a6f49f0864d4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, diff --git a/sprites/spr_pack_arms/spr_pack_arms.yy b/sprites/spr_pack_arms/spr_pack_arms.yy index 70b7f6b02b..a906100f71 100644 --- a/sprites/spr_pack_arms/spr_pack_arms.yy +++ b/sprites/spr_pack_arms/spr_pack_arms.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_arms", "bboxMode":0, "bbox_bottom":206, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0a62add5-b009-4050-ad6b-642b81efdcee","name":"0a62add5-b009-4050-ad6b-642b81efdcee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bd9433c3-b178-4b5e-80c1-0f0daa3c9f1e","name":"bd9433c3-b178-4b5e-80c1-0f0daa3c9f1e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dce20ba2-abbe-43c0-b5a2-22334ddd6fc7","name":"dce20ba2-abbe-43c0-b5a2-22334ddd6fc7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a62add5-b009-4050-ad6b-642b81efdcee","name":"0a62add5-b009-4050-ad6b-642b81efdcee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd9433c3-b178-4b5e-80c1-0f0daa3c9f1e","name":"bd9433c3-b178-4b5e-80c1-0f0daa3c9f1e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dce20ba2-abbe-43c0-b5a2-22334ddd6fc7","name":"dce20ba2-abbe-43c0-b5a2-22334ddd6fc7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -65,6 +65,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_pack_brazier/3368318c-d87a-46c2-891b-f8d5cebbf275.png b/sprites/spr_pack_brazier/3368318c-d87a-46c2-891b-f8d5cebbf275.png index 445dbd9b43..267164237e 100644 Binary files a/sprites/spr_pack_brazier/3368318c-d87a-46c2-891b-f8d5cebbf275.png and b/sprites/spr_pack_brazier/3368318c-d87a-46c2-891b-f8d5cebbf275.png differ diff --git a/sprites/spr_pack_brazier/4dbb61b5-014b-49c6-90e2-0a89427c2fb6.png b/sprites/spr_pack_brazier/4dbb61b5-014b-49c6-90e2-0a89427c2fb6.png index 6a9ca6b5cb..77ff64cb63 100644 Binary files a/sprites/spr_pack_brazier/4dbb61b5-014b-49c6-90e2-0a89427c2fb6.png and b/sprites/spr_pack_brazier/4dbb61b5-014b-49c6-90e2-0a89427c2fb6.png differ diff --git a/sprites/spr_pack_brazier/fdac9a6c-2f3a-44f5-babc-322180e5b74a.png b/sprites/spr_pack_brazier/fdac9a6c-2f3a-44f5-babc-322180e5b74a.png index 640b7c46c6..4395381971 100644 Binary files a/sprites/spr_pack_brazier/fdac9a6c-2f3a-44f5-babc-322180e5b74a.png and b/sprites/spr_pack_brazier/fdac9a6c-2f3a-44f5-babc-322180e5b74a.png differ diff --git a/sprites/spr_pack_brazier/layers/3368318c-d87a-46c2-891b-f8d5cebbf275/1a16b695-842b-4c36-b421-733edb7d6a1c.png b/sprites/spr_pack_brazier/layers/3368318c-d87a-46c2-891b-f8d5cebbf275/1a16b695-842b-4c36-b421-733edb7d6a1c.png index 445dbd9b43..267164237e 100644 Binary files a/sprites/spr_pack_brazier/layers/3368318c-d87a-46c2-891b-f8d5cebbf275/1a16b695-842b-4c36-b421-733edb7d6a1c.png and b/sprites/spr_pack_brazier/layers/3368318c-d87a-46c2-891b-f8d5cebbf275/1a16b695-842b-4c36-b421-733edb7d6a1c.png differ diff --git a/sprites/spr_pack_brazier/layers/4dbb61b5-014b-49c6-90e2-0a89427c2fb6/1a16b695-842b-4c36-b421-733edb7d6a1c.png b/sprites/spr_pack_brazier/layers/4dbb61b5-014b-49c6-90e2-0a89427c2fb6/1a16b695-842b-4c36-b421-733edb7d6a1c.png index 6a9ca6b5cb..77ff64cb63 100644 Binary files a/sprites/spr_pack_brazier/layers/4dbb61b5-014b-49c6-90e2-0a89427c2fb6/1a16b695-842b-4c36-b421-733edb7d6a1c.png and b/sprites/spr_pack_brazier/layers/4dbb61b5-014b-49c6-90e2-0a89427c2fb6/1a16b695-842b-4c36-b421-733edb7d6a1c.png differ diff --git a/sprites/spr_pack_brazier/layers/fdac9a6c-2f3a-44f5-babc-322180e5b74a/1a16b695-842b-4c36-b421-733edb7d6a1c.png b/sprites/spr_pack_brazier/layers/fdac9a6c-2f3a-44f5-babc-322180e5b74a/1a16b695-842b-4c36-b421-733edb7d6a1c.png index 640b7c46c6..4395381971 100644 Binary files a/sprites/spr_pack_brazier/layers/fdac9a6c-2f3a-44f5-babc-322180e5b74a/1a16b695-842b-4c36-b421-733edb7d6a1c.png and b/sprites/spr_pack_brazier/layers/fdac9a6c-2f3a-44f5-babc-322180e5b74a/1a16b695-842b-4c36-b421-733edb7d6a1c.png differ diff --git a/sprites/spr_pack_brazier/spr_pack_brazier.yy b/sprites/spr_pack_brazier/spr_pack_brazier.yy index 3345415fa4..0bf3243c4a 100644 --- a/sprites/spr_pack_brazier/spr_pack_brazier.yy +++ b/sprites/spr_pack_brazier/spr_pack_brazier.yy @@ -1,31 +1,31 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_brazier", "bboxMode":0, - "bbox_bottom":53, + "bbox_bottom":98, "bbox_left":29, "bbox_right":141, - "bbox_top":0, + "bbox_top":45, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3368318c-d87a-46c2-891b-f8d5cebbf275","name":"3368318c-d87a-46c2-891b-f8d5cebbf275","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3368318c-d87a-46c2-891b-f8d5cebbf275","name":"3368318c-d87a-46c2-891b-f8d5cebbf275","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","name":"4dbb61b5-014b-49c6-90e2-0a89427c2fb6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","name":"fdac9a6c-2f3a-44f5-babc-322180e5b74a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, - "height":232, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"1a16b695-842b-4c36-b421-733edb7d6a1c","blendMode":0,"displayName":"default","isLocked":false,"name":"1a16b695-842b-4c36-b421-733edb7d6a1c","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"spr_pack_brazier", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"packs", "path":"folders/Sprites/Marine Viewer/packs.yy", @@ -65,6 +65,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -84,7 +86,7 @@ "visibleRange":null, "volume":1.0, "xorigin":0, - "yorigin":0, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_pack_brazier2/3368318c-d87a-46c2-891b-f8d5cebbf275.png b/sprites/spr_pack_brazier2/3368318c-d87a-46c2-891b-f8d5cebbf275.png index acfc734dc8..2a1b275531 100644 Binary files a/sprites/spr_pack_brazier2/3368318c-d87a-46c2-891b-f8d5cebbf275.png and b/sprites/spr_pack_brazier2/3368318c-d87a-46c2-891b-f8d5cebbf275.png differ diff --git a/sprites/spr_pack_brazier2/layers/3368318c-d87a-46c2-891b-f8d5cebbf275/98aca475-f03b-4cda-b4db-4409d657d963.png b/sprites/spr_pack_brazier2/layers/3368318c-d87a-46c2-891b-f8d5cebbf275/98aca475-f03b-4cda-b4db-4409d657d963.png index acfc734dc8..2a1b275531 100644 Binary files a/sprites/spr_pack_brazier2/layers/3368318c-d87a-46c2-891b-f8d5cebbf275/98aca475-f03b-4cda-b4db-4409d657d963.png and b/sprites/spr_pack_brazier2/layers/3368318c-d87a-46c2-891b-f8d5cebbf275/98aca475-f03b-4cda-b4db-4409d657d963.png differ diff --git a/sprites/spr_pack_brazier2/spr_pack_brazier2.yy b/sprites/spr_pack_brazier2/spr_pack_brazier2.yy index 530902bffa..fa17178d47 100644 --- a/sprites/spr_pack_brazier2/spr_pack_brazier2.yy +++ b/sprites/spr_pack_brazier2/spr_pack_brazier2.yy @@ -1,22 +1,22 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_brazier2", "bboxMode":0, - "bbox_bottom":97, + "bbox_bottom":117, "bbox_left":89, "bbox_right":195, - "bbox_top":16, + "bbox_top":36, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3368318c-d87a-46c2-891b-f8d5cebbf275","name":"3368318c-d87a-46c2-891b-f8d5cebbf275","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3368318c-d87a-46c2-891b-f8d5cebbf275","name":"3368318c-d87a-46c2-891b-f8d5cebbf275","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, - "height":282, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"98aca475-f03b-4cda-b4db-4409d657d963","blendMode":0,"displayName":"default","isLocked":false,"name":"98aca475-f03b-4cda-b4db-4409d657d963","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":281.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -76,7 +78,7 @@ "visibleRange":null, "volume":1.0, "xorigin":57, - "yorigin":61, + "yorigin":81, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_pack_brazier3/3368318c-d87a-46c2-891b-f8d5cebbf275.png b/sprites/spr_pack_brazier3/3368318c-d87a-46c2-891b-f8d5cebbf275.png index 0a65a67d2d..f9198ae1c5 100644 Binary files a/sprites/spr_pack_brazier3/3368318c-d87a-46c2-891b-f8d5cebbf275.png and b/sprites/spr_pack_brazier3/3368318c-d87a-46c2-891b-f8d5cebbf275.png differ diff --git a/sprites/spr_pack_brazier3/6633717b-8f5b-4785-b3fd-05a0b9b5ad4b.png b/sprites/spr_pack_brazier3/6633717b-8f5b-4785-b3fd-05a0b9b5ad4b.png new file mode 100644 index 0000000000..1a9daf9c4b Binary files /dev/null and b/sprites/spr_pack_brazier3/6633717b-8f5b-4785-b3fd-05a0b9b5ad4b.png differ diff --git a/sprites/spr_pack_brazier3/layers/3368318c-d87a-46c2-891b-f8d5cebbf275/23f60daa-fe76-4e85-9875-adbeb4cce378.png b/sprites/spr_pack_brazier3/layers/3368318c-d87a-46c2-891b-f8d5cebbf275/23f60daa-fe76-4e85-9875-adbeb4cce378.png index 0a65a67d2d..f9198ae1c5 100644 Binary files a/sprites/spr_pack_brazier3/layers/3368318c-d87a-46c2-891b-f8d5cebbf275/23f60daa-fe76-4e85-9875-adbeb4cce378.png and b/sprites/spr_pack_brazier3/layers/3368318c-d87a-46c2-891b-f8d5cebbf275/23f60daa-fe76-4e85-9875-adbeb4cce378.png differ diff --git a/sprites/spr_pack_brazier3/layers/6633717b-8f5b-4785-b3fd-05a0b9b5ad4b/23f60daa-fe76-4e85-9875-adbeb4cce378.png b/sprites/spr_pack_brazier3/layers/6633717b-8f5b-4785-b3fd-05a0b9b5ad4b/23f60daa-fe76-4e85-9875-adbeb4cce378.png new file mode 100644 index 0000000000..1a9daf9c4b Binary files /dev/null and b/sprites/spr_pack_brazier3/layers/6633717b-8f5b-4785-b3fd-05a0b9b5ad4b/23f60daa-fe76-4e85-9875-adbeb4cce378.png differ diff --git a/sprites/spr_pack_brazier3/spr_pack_brazier3.yy b/sprites/spr_pack_brazier3/spr_pack_brazier3.yy index c87e3aa5bd..b75d6bac00 100644 --- a/sprites/spr_pack_brazier3/spr_pack_brazier3.yy +++ b/sprites/spr_pack_brazier3/spr_pack_brazier3.yy @@ -1,22 +1,23 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_brazier3", "bboxMode":0, - "bbox_bottom":99, - "bbox_left":92, - "bbox_right":188, - "bbox_top":38, + "bbox_bottom":74, + "bbox_left":29, + "bbox_right":135, + "bbox_top":0, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3368318c-d87a-46c2-891b-f8d5cebbf275","name":"3368318c-d87a-46c2-891b-f8d5cebbf275","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6633717b-8f5b-4785-b3fd-05a0b9b5ad4b","name":"6633717b-8f5b-4785-b3fd-05a0b9b5ad4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3368318c-d87a-46c2-891b-f8d5cebbf275","name":"3368318c-d87a-46c2-891b-f8d5cebbf275","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, - "height":282, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"23f60daa-fe76-4e85-9875-adbeb4cce378","blendMode":0,"displayName":"default","isLocked":false,"name":"23f60daa-fe76-4e85-9875-adbeb4cce378","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, @@ -49,7 +50,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":1.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -63,20 +64,25 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6633717b-8f5b-4785-b3fd-05a0b9b5ad4b","path":"sprites/spr_pack_brazier3/spr_pack_brazier3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bc2a1a59-8f2e-4168-a3b3-8e32bf31cbef","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3368318c-d87a-46c2-891b-f8d5cebbf275","path":"sprites/spr_pack_brazier3/spr_pack_brazier3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0b8e1b7-c8a1-4b55-a2cf-21db63ae2b37","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"f0b8e1b7-c8a1-4b55-a2cf-21db63ae2b37","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, "volume":1.0, - "xorigin":57, - "yorigin":61, + "xorigin":0, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, @@ -86,5 +92,5 @@ }, "type":0, "VTile":false, - "width":281, + "width":164, } \ No newline at end of file diff --git a/sprites/spr_pack_devastator/979ae0e5-f063-4c2b-a97a-acb0b32a860f.png b/sprites/spr_pack_devastator/979ae0e5-f063-4c2b-a97a-acb0b32a860f.png index da05951c0d..7e2d284409 100644 Binary files a/sprites/spr_pack_devastator/979ae0e5-f063-4c2b-a97a-acb0b32a860f.png and b/sprites/spr_pack_devastator/979ae0e5-f063-4c2b-a97a-acb0b32a860f.png differ diff --git a/sprites/spr_pack_devastator/b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530.png b/sprites/spr_pack_devastator/b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530.png index a400be32ad..3b02905e3a 100644 Binary files a/sprites/spr_pack_devastator/b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530.png and b/sprites/spr_pack_devastator/b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530.png differ diff --git a/sprites/spr_pack_devastator/e5637504-add9-474b-ae10-1e954d497810.png b/sprites/spr_pack_devastator/e5637504-add9-474b-ae10-1e954d497810.png index 6bbdaf1412..364ec1460b 100644 Binary files a/sprites/spr_pack_devastator/e5637504-add9-474b-ae10-1e954d497810.png and b/sprites/spr_pack_devastator/e5637504-add9-474b-ae10-1e954d497810.png differ diff --git a/sprites/spr_pack_devastator/layers/979ae0e5-f063-4c2b-a97a-acb0b32a860f/330f878c-cc0f-48bf-a507-68961e6c03cd.png b/sprites/spr_pack_devastator/layers/979ae0e5-f063-4c2b-a97a-acb0b32a860f/330f878c-cc0f-48bf-a507-68961e6c03cd.png index da05951c0d..7e2d284409 100644 Binary files a/sprites/spr_pack_devastator/layers/979ae0e5-f063-4c2b-a97a-acb0b32a860f/330f878c-cc0f-48bf-a507-68961e6c03cd.png and b/sprites/spr_pack_devastator/layers/979ae0e5-f063-4c2b-a97a-acb0b32a860f/330f878c-cc0f-48bf-a507-68961e6c03cd.png differ diff --git a/sprites/spr_pack_devastator/layers/b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530/330f878c-cc0f-48bf-a507-68961e6c03cd.png b/sprites/spr_pack_devastator/layers/b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530/330f878c-cc0f-48bf-a507-68961e6c03cd.png index a400be32ad..3b02905e3a 100644 Binary files a/sprites/spr_pack_devastator/layers/b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530/330f878c-cc0f-48bf-a507-68961e6c03cd.png and b/sprites/spr_pack_devastator/layers/b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530/330f878c-cc0f-48bf-a507-68961e6c03cd.png differ diff --git a/sprites/spr_pack_devastator/layers/e5637504-add9-474b-ae10-1e954d497810/330f878c-cc0f-48bf-a507-68961e6c03cd.png b/sprites/spr_pack_devastator/layers/e5637504-add9-474b-ae10-1e954d497810/330f878c-cc0f-48bf-a507-68961e6c03cd.png index 6bbdaf1412..364ec1460b 100644 Binary files a/sprites/spr_pack_devastator/layers/e5637504-add9-474b-ae10-1e954d497810/330f878c-cc0f-48bf-a507-68961e6c03cd.png and b/sprites/spr_pack_devastator/layers/e5637504-add9-474b-ae10-1e954d497810/330f878c-cc0f-48bf-a507-68961e6c03cd.png differ diff --git a/sprites/spr_pack_devastator/spr_pack_devastator.yy b/sprites/spr_pack_devastator/spr_pack_devastator.yy index 66fb610765..299860feab 100644 --- a/sprites/spr_pack_devastator/spr_pack_devastator.yy +++ b/sprites/spr_pack_devastator/spr_pack_devastator.yy @@ -1,24 +1,24 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_devastator", "bboxMode":0, - "bbox_bottom":37, + "bbox_bottom":62, "bbox_left":35, "bbox_right":131, - "bbox_top":5, + "bbox_top":30, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e5637504-add9-474b-ae10-1e954d497810","name":"e5637504-add9-474b-ae10-1e954d497810","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e5637504-add9-474b-ae10-1e954d497810","name":"e5637504-add9-474b-ae10-1e954d497810","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","name":"979ae0e5-f063-4c2b-a97a-acb0b32a860f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","name":"b1e913d3-e6e0-41c1-9cdd-2e2fb3b41530","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, - "height":272, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"330f878c-cc0f-48bf-a507-68961e6c03cd","blendMode":0,"displayName":"default","isLocked":false,"name":"330f878c-cc0f-48bf-a507-68961e6c03cd","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, @@ -65,6 +65,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_pack_jump/spr_pack_jump.yy b/sprites/spr_pack_jump/spr_pack_jump.yy index c8144980c9..13fab30df9 100644 --- a/sprites/spr_pack_jump/spr_pack_jump.yy +++ b/sprites/spr_pack_jump/spr_pack_jump.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pack_jump", "bboxMode":0, "bbox_bottom":77, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"777ae2eb-75f6-4a1f-8633-057327b9a258","name":"777ae2eb-75f6-4a1f-8633-057327b9a258","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","name":"c5bc43cd-b567-4673-92b9-efede7a0b44f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","name":"f9fc03b0-0d35-4e00-b5c9-7c857679e38b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"777ae2eb-75f6-4a1f-8633-057327b9a258","name":"777ae2eb-75f6-4a1f-8633-057327b9a258","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -65,6 +65,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_pauldron_spikes_left/spr_pauldron_spikes_left.yy b/sprites/spr_pauldron_spikes_left/spr_pauldron_spikes_left.yy index 0cdb31f36c..098bc42341 100644 --- a/sprites/spr_pauldron_spikes_left/spr_pauldron_spikes_left.yy +++ b/sprites/spr_pauldron_spikes_left/spr_pauldron_spikes_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pauldron_spikes_left", "bboxMode":0, "bbox_bottom":75, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7fc53778-12a4-4b34-8591-e40108986c71","name":"7fc53778-12a4-4b34-8591-e40108986c71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7fc53778-12a4-4b34-8591-e40108986c71","name":"7fc53778-12a4-4b34-8591-e40108986c71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fc53778-12a4-4b34-8591-e40108986c71","path":"sprites/spr_pauldron_spikes_left/spr_pauldron_spikes_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1dca78a-a6a8-48f4-9199-bb30337ec2be","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fc53778-12a4-4b34-8591-e40108986c71","path":"sprites/spr_pauldron_spikes_left/spr_pauldron_spikes_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1dca78a-a6a8-48f4-9199-bb30337ec2be","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy b/sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy index 989232794e..c750d16d5d 100644 --- a/sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy +++ b/sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pauldron_spikes_right", "bboxMode":0, "bbox_bottom":75, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48f72680-cb96-4361-9276-5e8d8552ae9f","name":"48f72680-cb96-4361-9276-5e8d8552ae9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34a5702d-932b-4320-bbce-57b6f082d8a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48f72680-cb96-4361-9276-5e8d8552ae9f","path":"sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34a5702d-932b-4320-bbce-57b6f082d8a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_penitent_ui/spr_penitent_ui.yy b/sprites/spr_penitent_ui/spr_penitent_ui.yy index a1d1740000..5dd3e84514 100644 --- a/sprites/spr_penitent_ui/spr_penitent_ui.yy +++ b/sprites/spr_penitent_ui/spr_penitent_ui.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_penitent_ui", "bboxMode":0, "bbox_bottom":24, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ce5f6285-54f8-4aef-8e6f-596e2e822426","name":"ce5f6285-54f8-4aef-8e6f-596e2e822426","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce5f6285-54f8-4aef-8e6f-596e2e822426","name":"ce5f6285-54f8-4aef-8e6f-596e2e822426","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":25.0, + "seqWidth":194.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"e43885ff-f49c-42e0-9d0c-cfc22ce51284","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, diff --git a/sprites/spr_pixel_button_left/spr_pixel_button_left.yy b/sprites/spr_pixel_button_left/spr_pixel_button_left.yy index 0c9bb360ee..bd1753d363 100644 --- a/sprites/spr_pixel_button_left/spr_pixel_button_left.yy +++ b/sprites/spr_pixel_button_left/spr_pixel_button_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pixel_button_left", "bboxMode":0, "bbox_bottom":27, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8a326ff2-8fec-4031-abef-2b299f66f9b0","name":"8a326ff2-8fec-4031-abef-2b299f66f9b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a326ff2-8fec-4031-abef-2b299f66f9b0","name":"8a326ff2-8fec-4031-abef-2b299f66f9b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":28.0, + "seqWidth":14.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy b/sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy index 47f39abccc..5660d89173 100644 --- a/sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy +++ b/sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pixel_button_middle", "bboxMode":0, "bbox_bottom":27, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","name":"7ab35a5d-4138-4cd7-a5ce-654faab31f81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":28.0, + "seqWidth":14.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_pixel_button_right/531933e7-b10e-42c4-96fd-7b6aaf423b29.png b/sprites/spr_pixel_button_right/531933e7-b10e-42c4-96fd-7b6aaf423b29.png index b878b3c467..d5fc93deae 100644 Binary files a/sprites/spr_pixel_button_right/531933e7-b10e-42c4-96fd-7b6aaf423b29.png and b/sprites/spr_pixel_button_right/531933e7-b10e-42c4-96fd-7b6aaf423b29.png differ diff --git a/sprites/spr_pixel_button_right/7dc4c8c2-7af4-42fa-8949-052b7fe7a314.png b/sprites/spr_pixel_button_right/7dc4c8c2-7af4-42fa-8949-052b7fe7a314.png new file mode 100644 index 0000000000..485540ef49 Binary files /dev/null and b/sprites/spr_pixel_button_right/7dc4c8c2-7af4-42fa-8949-052b7fe7a314.png differ diff --git a/sprites/spr_pixel_button_right/layers/531933e7-b10e-42c4-96fd-7b6aaf423b29/a3934012-92f7-4b26-ba15-b4043a5867b4.png b/sprites/spr_pixel_button_right/layers/531933e7-b10e-42c4-96fd-7b6aaf423b29/a3934012-92f7-4b26-ba15-b4043a5867b4.png index b878b3c467..d5fc93deae 100644 Binary files a/sprites/spr_pixel_button_right/layers/531933e7-b10e-42c4-96fd-7b6aaf423b29/a3934012-92f7-4b26-ba15-b4043a5867b4.png and b/sprites/spr_pixel_button_right/layers/531933e7-b10e-42c4-96fd-7b6aaf423b29/a3934012-92f7-4b26-ba15-b4043a5867b4.png differ diff --git a/sprites/spr_pixel_button_right/layers/7dc4c8c2-7af4-42fa-8949-052b7fe7a314/a3934012-92f7-4b26-ba15-b4043a5867b4.png b/sprites/spr_pixel_button_right/layers/7dc4c8c2-7af4-42fa-8949-052b7fe7a314/a3934012-92f7-4b26-ba15-b4043a5867b4.png new file mode 100644 index 0000000000..485540ef49 Binary files /dev/null and b/sprites/spr_pixel_button_right/layers/7dc4c8c2-7af4-42fa-8949-052b7fe7a314/a3934012-92f7-4b26-ba15-b4043a5867b4.png differ diff --git a/sprites/spr_pixel_button_right/spr_pixel_button_right.yy b/sprites/spr_pixel_button_right/spr_pixel_button_right.yy index 9b86f78d93..dedd2a7436 100644 --- a/sprites/spr_pixel_button_right/spr_pixel_button_right.yy +++ b/sprites/spr_pixel_button_right/spr_pixel_button_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pixel_button_right", "bboxMode":0, "bbox_bottom":27, @@ -12,7 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7dc4c8c2-7af4-42fa-8949-052b7fe7a314","name":"7dc4c8c2-7af4-42fa-8949-052b7fe7a314","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -49,7 +50,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":1.0, + "length":2.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -63,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":28.0, + "seqWidth":14.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -71,6 +74,9 @@ {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"531933e7-b10e-42c4-96fd-7b6aaf423b29","path":"sprites/spr_pixel_button_right/spr_pixel_button_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"bb32a9c7-a6e7-47d3-86a8-a0bc2d995ce5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dc4c8c2-7af4-42fa-8949-052b7fe7a314","path":"sprites/spr_pixel_button_right/spr_pixel_button_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"48a1fccd-8bf3-4261-96af-634ed4221bbd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_pixel_camo_texture/ac0bc65d-eedb-4038-8246-9d648cc471a8.png b/sprites/spr_pixel_camo_texture/ac0bc65d-eedb-4038-8246-9d648cc471a8.png new file mode 100644 index 0000000000..a6c7f9445b Binary files /dev/null and b/sprites/spr_pixel_camo_texture/ac0bc65d-eedb-4038-8246-9d648cc471a8.png differ diff --git a/sprites/spr_pixel_camo_texture/layers/ac0bc65d-eedb-4038-8246-9d648cc471a8/fc4e0770-9f64-4233-9bc2-1e43eda609c0.png b/sprites/spr_pixel_camo_texture/layers/ac0bc65d-eedb-4038-8246-9d648cc471a8/fc4e0770-9f64-4233-9bc2-1e43eda609c0.png new file mode 100644 index 0000000000..79441edeba Binary files /dev/null and b/sprites/spr_pixel_camo_texture/layers/ac0bc65d-eedb-4038-8246-9d648cc471a8/fc4e0770-9f64-4233-9bc2-1e43eda609c0.png differ diff --git a/sprites/spr_pixel_camo_texture/spr_pixel_camo_texture.yy b/sprites/spr_pixel_camo_texture/spr_pixel_camo_texture.yy new file mode 100644 index 0000000000..5782a5d2b2 --- /dev/null +++ b/sprites/spr_pixel_camo_texture/spr_pixel_camo_texture.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_pixel_camo_texture", + "bboxMode":0, + "bbox_bottom":179, + "bbox_left":0, + "bbox_right":179, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":true, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"ac0bc65d-eedb-4038-8246-9d648cc471a8","name":"ac0bc65d-eedb-4038-8246-9d648cc471a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":180, + "HTile":true, + "layers":[ + {"$GMImageLayer":"","%Name":"fc4e0770-9f64-4233-9bc2-1e43eda609c0","blendMode":0,"displayName":"default","isLocked":false,"name":"fc4e0770-9f64-4233-9bc2-1e43eda609c0","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_pixel_camo_texture", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":0, + "parent":{ + "name":"textures", + "path":"folders/Sprites/Marine Viewer/textures.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_pixel_camo_texture", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_pixel_camo_texture", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":180.0, + "seqWidth":180.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac0bc65d-eedb-4038-8246-9d648cc471a8","path":"sprites/spr_pixel_camo_texture/spr_pixel_camo_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d0c1665c-676d-47bc-a5a3-5bee6be34f8d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":true, + "width":180, +} \ No newline at end of file diff --git a/sprites/spr_pixel_cherub/4f4eff5a-b332-4490-a78d-ea8a080f5b4a.png b/sprites/spr_pixel_cherub/4f4eff5a-b332-4490-a78d-ea8a080f5b4a.png new file mode 100644 index 0000000000..f6eda62c1d Binary files /dev/null and b/sprites/spr_pixel_cherub/4f4eff5a-b332-4490-a78d-ea8a080f5b4a.png differ diff --git a/sprites/spr_pixel_cherub/layers/4f4eff5a-b332-4490-a78d-ea8a080f5b4a/66e823b3-8534-49b1-b51c-5dbec99b0b88.png b/sprites/spr_pixel_cherub/layers/4f4eff5a-b332-4490-a78d-ea8a080f5b4a/66e823b3-8534-49b1-b51c-5dbec99b0b88.png new file mode 100644 index 0000000000..f6eda62c1d Binary files /dev/null and b/sprites/spr_pixel_cherub/layers/4f4eff5a-b332-4490-a78d-ea8a080f5b4a/66e823b3-8534-49b1-b51c-5dbec99b0b88.png differ diff --git a/sprites/spr_pixel_cherub/spr_pixel_cherub.yy b/sprites/spr_pixel_cherub/spr_pixel_cherub.yy new file mode 100644 index 0000000000..87cb1c36a2 --- /dev/null +++ b/sprites/spr_pixel_cherub/spr_pixel_cherub.yy @@ -0,0 +1,90 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_pixel_cherub", + "bboxMode":0, + "bbox_bottom":108, + "bbox_left":26, + "bbox_right":132, + "bbox_top":35, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"4f4eff5a-b332-4490-a78d-ea8a080f5b4a","name":"4f4eff5a-b332-4490-a78d-ea8a080f5b4a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":144, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"66e823b3-8534-49b1-b51c-5dbec99b0b88","blendMode":0,"displayName":"default","isLocked":false,"name":"66e823b3-8534-49b1-b51c-5dbec99b0b88","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_pixel_cherub", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"UI", + "path":"folders/Sprites/UI.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_pixel_cherub", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_pixel_cherub", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f4eff5a-b332-4490-a78d-ea8a080f5b4a","path":"sprites/spr_pixel_cherub/spr_pixel_cherub.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"af491800-80ae-45bd-8407-01a9bfc7a2ce","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":77, + "yorigin":92, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":160, +} \ No newline at end of file diff --git a/sprites/spr_pixel_servo_skull/555a212b-2e4a-477e-a9e1-0b5bce30128a.png b/sprites/spr_pixel_servo_skull/555a212b-2e4a-477e-a9e1-0b5bce30128a.png new file mode 100644 index 0000000000..a2c71a4196 Binary files /dev/null and b/sprites/spr_pixel_servo_skull/555a212b-2e4a-477e-a9e1-0b5bce30128a.png differ diff --git a/sprites/spr_pixel_servo_skull/layers/555a212b-2e4a-477e-a9e1-0b5bce30128a/21f9a8f2-0936-4ac2-98be-b901f4c62749.png b/sprites/spr_pixel_servo_skull/layers/555a212b-2e4a-477e-a9e1-0b5bce30128a/21f9a8f2-0936-4ac2-98be-b901f4c62749.png new file mode 100644 index 0000000000..a2c71a4196 Binary files /dev/null and b/sprites/spr_pixel_servo_skull/layers/555a212b-2e4a-477e-a9e1-0b5bce30128a/21f9a8f2-0936-4ac2-98be-b901f4c62749.png differ diff --git a/sprites/spr_pixel_servo_skull/spr_pixel_servo_skull.yy b/sprites/spr_pixel_servo_skull/spr_pixel_servo_skull.yy new file mode 100644 index 0000000000..dfd4a117df --- /dev/null +++ b/sprites/spr_pixel_servo_skull/spr_pixel_servo_skull.yy @@ -0,0 +1,90 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_pixel_servo_skull", + "bboxMode":0, + "bbox_bottom":133, + "bbox_left":9, + "bbox_right":150, + "bbox_top":9, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"555a212b-2e4a-477e-a9e1-0b5bce30128a","name":"555a212b-2e4a-477e-a9e1-0b5bce30128a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":144, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"21f9a8f2-0936-4ac2-98be-b901f4c62749","blendMode":0,"displayName":"default","isLocked":false,"name":"21f9a8f2-0936-4ac2-98be-b901f4c62749","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_pixel_servo_skull", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"UI", + "path":"folders/Sprites/UI.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_pixel_servo_skull", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_pixel_servo_skull", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"555a212b-2e4a-477e-a9e1-0b5bce30128a","path":"sprites/spr_pixel_servo_skull/spr_pixel_servo_skull.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"85ca9281-ab5a-4512-9d66-0cbe58e4708e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":160, +} \ No newline at end of file diff --git a/sprites/spr_planet_screen/spr_planet_screen.yy b/sprites/spr_planet_screen/spr_planet_screen.yy index e30d03ad29..f3749893eb 100644 --- a/sprites/spr_planet_screen/spr_planet_screen.yy +++ b/sprites/spr_planet_screen/spr_planet_screen.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_planet_screen", "bboxMode":0, "bbox_bottom":293, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1086920f-108b-4fc6-93c0-e148bf438fe6","name":"1086920f-108b-4fc6-93c0-e148bf438fe6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1086920f-108b-4fc6-93c0-e148bf438fe6","name":"1086920f-108b-4fc6-93c0-e148bf438fe6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1086920f-108b-4fc6-93c0-e148bf438fe6","path":"sprites/spr_planet_screen/spr_planet_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"73a40a92-c3a3-4dbc-9c6c-7be898649750","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1086920f-108b-4fc6-93c0-e148bf438fe6","path":"sprites/spr_planet_screen/spr_planet_screen.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"73a40a92-c3a3-4dbc-9c6c-7be898649750","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_planet_screen_servo_holder/0682bf19-98ad-4721-8091-1fced96f32c5.png b/sprites/spr_planet_screen_servo_holder/0682bf19-98ad-4721-8091-1fced96f32c5.png new file mode 100644 index 0000000000..a7108e45b1 Binary files /dev/null and b/sprites/spr_planet_screen_servo_holder/0682bf19-98ad-4721-8091-1fced96f32c5.png differ diff --git a/sprites/spr_planet_screen_servo_holder/1086920f-108b-4fc6-93c0-e148bf438fe6.png b/sprites/spr_planet_screen_servo_holder/1086920f-108b-4fc6-93c0-e148bf438fe6.png new file mode 100644 index 0000000000..86bedc89ac Binary files /dev/null and b/sprites/spr_planet_screen_servo_holder/1086920f-108b-4fc6-93c0-e148bf438fe6.png differ diff --git a/sprites/spr_planet_screen_servo_holder/layers/0682bf19-98ad-4721-8091-1fced96f32c5/51c224ea-cde1-46a2-a3c5-f2c81b64d106.png b/sprites/spr_planet_screen_servo_holder/layers/0682bf19-98ad-4721-8091-1fced96f32c5/51c224ea-cde1-46a2-a3c5-f2c81b64d106.png new file mode 100644 index 0000000000..a250663809 Binary files /dev/null and b/sprites/spr_planet_screen_servo_holder/layers/0682bf19-98ad-4721-8091-1fced96f32c5/51c224ea-cde1-46a2-a3c5-f2c81b64d106.png differ diff --git a/sprites/spr_planet_screen_servo_holder/layers/0682bf19-98ad-4721-8091-1fced96f32c5/6ba7ae7d-f6f0-40f2-a4aa-39f921a87071.png b/sprites/spr_planet_screen_servo_holder/layers/0682bf19-98ad-4721-8091-1fced96f32c5/6ba7ae7d-f6f0-40f2-a4aa-39f921a87071.png new file mode 100644 index 0000000000..389bfa80af Binary files /dev/null and b/sprites/spr_planet_screen_servo_holder/layers/0682bf19-98ad-4721-8091-1fced96f32c5/6ba7ae7d-f6f0-40f2-a4aa-39f921a87071.png differ diff --git a/sprites/spr_planet_screen_servo_holder/layers/1086920f-108b-4fc6-93c0-e148bf438fe6/51c224ea-cde1-46a2-a3c5-f2c81b64d106.png b/sprites/spr_planet_screen_servo_holder/layers/1086920f-108b-4fc6-93c0-e148bf438fe6/51c224ea-cde1-46a2-a3c5-f2c81b64d106.png new file mode 100644 index 0000000000..0f667ef69f Binary files /dev/null and b/sprites/spr_planet_screen_servo_holder/layers/1086920f-108b-4fc6-93c0-e148bf438fe6/51c224ea-cde1-46a2-a3c5-f2c81b64d106.png differ diff --git a/sprites/spr_planet_screen_servo_holder/layers/1086920f-108b-4fc6-93c0-e148bf438fe6/6ba7ae7d-f6f0-40f2-a4aa-39f921a87071.png b/sprites/spr_planet_screen_servo_holder/layers/1086920f-108b-4fc6-93c0-e148bf438fe6/6ba7ae7d-f6f0-40f2-a4aa-39f921a87071.png new file mode 100644 index 0000000000..86bedc89ac Binary files /dev/null and b/sprites/spr_planet_screen_servo_holder/layers/1086920f-108b-4fc6-93c0-e148bf438fe6/6ba7ae7d-f6f0-40f2-a4aa-39f921a87071.png differ diff --git a/sprites/spr_planet_screen_servo_holder/spr_planet_screen_servo_holder.yy b/sprites/spr_planet_screen_servo_holder/spr_planet_screen_servo_holder.yy new file mode 100644 index 0000000000..194fd64bab --- /dev/null +++ b/sprites/spr_planet_screen_servo_holder/spr_planet_screen_servo_holder.yy @@ -0,0 +1,95 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_planet_screen_servo_holder", + "bboxMode":0, + "bbox_bottom":293, + "bbox_left":96, + "bbox_right":700, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"1086920f-108b-4fc6-93c0-e148bf438fe6","name":"1086920f-108b-4fc6-93c0-e148bf438fe6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0682bf19-98ad-4721-8091-1fced96f32c5","name":"0682bf19-98ad-4721-8091-1fced96f32c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":294, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"51c224ea-cde1-46a2-a3c5-f2c81b64d106","blendMode":0,"displayName":"Layer 1","isLocked":false,"name":"51c224ea-cde1-46a2-a3c5-f2c81b64d106","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"6ba7ae7d-f6f0-40f2-a4aa-39f921a87071","blendMode":0,"displayName":"default","isLocked":false,"name":"6ba7ae7d-f6f0-40f2-a4aa-39f921a87071","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_planet_screen_servo_holder", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"UI", + "path":"folders/Sprites/UI.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_planet_screen_servo_holder", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_planet_screen_servo_holder", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1086920f-108b-4fc6-93c0-e148bf438fe6","path":"sprites/spr_planet_screen_servo_holder/spr_planet_screen_servo_holder.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"73a40a92-c3a3-4dbc-9c6c-7be898649750","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0682bf19-98ad-4721-8091-1fced96f32c5","path":"sprites/spr_planet_screen_servo_holder/spr_planet_screen_servo_holder.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2d3ef71f-b04d-4f0d-8c67-8bec71921855","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":314, + "yorigin":1, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":701, +} \ No newline at end of file diff --git a/sprites/spr_planet_splash/spr_planet_splash.yy b/sprites/spr_planet_splash/spr_planet_splash.yy index 9bb728b71e..4b73d5ec93 100644 --- a/sprites/spr_planet_splash/spr_planet_splash.yy +++ b/sprites/spr_planet_splash/spr_planet_splash.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_planet_splash", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2c9150bc-4398-4602-912c-ca4949edb320","name":"2c9150bc-4398-4602-912c-ca4949edb320","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c9150bc-4398-4602-912c-ca4949edb320","name":"2c9150bc-4398-4602-912c-ca4949edb320","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":128.0, + "seqWidth":128.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_planets/spr_planets.yy b/sprites/spr_planets/spr_planets.yy index de312cb614..cf32396d66 100644 --- a/sprites/spr_planets/spr_planets.yy +++ b/sprites/spr_planets/spr_planets.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_planets", "bboxMode":0, "bbox_bottom":31, @@ -12,27 +12,27 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"181a775a-4952-48db-90d2-1b3fef4cae06","name":"181a775a-4952-48db-90d2-1b3fef4cae06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7dc545d7-cb74-455f-9122-a8de598730d7","name":"7dc545d7-cb74-455f-9122-a8de598730d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"99571177-9e49-4765-861d-b8f711717ce2","name":"99571177-9e49-4765-861d-b8f711717ce2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1edf8291-4dc4-4034-a324-4a803e5b4d20","name":"1edf8291-4dc4-4034-a324-4a803e5b4d20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f773ac73-a560-46d1-9dc8-426c4bbda42f","name":"f773ac73-a560-46d1-9dc8-426c4bbda42f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b9e90a7c-1810-4687-95d1-8926bdc06e4b","name":"b9e90a7c-1810-4687-95d1-8926bdc06e4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"408c6368-40f2-4d72-80af-2a1756e36642","name":"408c6368-40f2-4d72-80af-2a1756e36642","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cf6c06a0-35df-418d-ac85-45ac5b8e285f","name":"cf6c06a0-35df-418d-ac85-45ac5b8e285f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7ba9fde6-e959-4a4d-a2d2-1ddcf7dba119","name":"7ba9fde6-e959-4a4d-a2d2-1ddcf7dba119","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eeab9bc1-ad30-4ec0-bdba-2dca30f6f4c2","name":"eeab9bc1-ad30-4ec0-bdba-2dca30f6f4c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f1e8ceb4-44fa-4951-9dc0-0fb91768ff96","name":"f1e8ceb4-44fa-4951-9dc0-0fb91768ff96","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c8cf5a99-d524-4ed0-8254-1c520010e5b8","name":"c8cf5a99-d524-4ed0-8254-1c520010e5b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2388d2cb-3c3c-4725-850a-aa27c32fd293","name":"2388d2cb-3c3c-4725-850a-aa27c32fd293","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8615a206-0f18-4722-a4ae-4899f089587c","name":"8615a206-0f18-4722-a4ae-4899f089587c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d60044a0-af82-4fb3-8e49-bb6520e52808","name":"d60044a0-af82-4fb3-8e49-bb6520e52808","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"93d1aa32-eb20-4c29-98f8-d59acf8219b2","name":"93d1aa32-eb20-4c29-98f8-d59acf8219b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ac0155df-72bd-4471-a1a3-f61e07a66d83","name":"ac0155df-72bd-4471-a1a3-f61e07a66d83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb8ebd46-efd0-493e-bd15-4d22c3f8fab5","name":"fb8ebd46-efd0-493e-bd15-4d22c3f8fab5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"62040f87-514e-47c8-9541-112685e3f530","name":"62040f87-514e-47c8-9541-112685e3f530","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5a3104e-ba0b-496f-8dc6-40b44fe501f6","name":"d5a3104e-ba0b-496f-8dc6-40b44fe501f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"adc60ca3-cfe9-46f9-afc1-870909f094e5","name":"adc60ca3-cfe9-46f9-afc1-870909f094e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"181a775a-4952-48db-90d2-1b3fef4cae06","name":"181a775a-4952-48db-90d2-1b3fef4cae06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7dc545d7-cb74-455f-9122-a8de598730d7","name":"7dc545d7-cb74-455f-9122-a8de598730d7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"99571177-9e49-4765-861d-b8f711717ce2","name":"99571177-9e49-4765-861d-b8f711717ce2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1edf8291-4dc4-4034-a324-4a803e5b4d20","name":"1edf8291-4dc4-4034-a324-4a803e5b4d20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f773ac73-a560-46d1-9dc8-426c4bbda42f","name":"f773ac73-a560-46d1-9dc8-426c4bbda42f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b9e90a7c-1810-4687-95d1-8926bdc06e4b","name":"b9e90a7c-1810-4687-95d1-8926bdc06e4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"408c6368-40f2-4d72-80af-2a1756e36642","name":"408c6368-40f2-4d72-80af-2a1756e36642","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cf6c06a0-35df-418d-ac85-45ac5b8e285f","name":"cf6c06a0-35df-418d-ac85-45ac5b8e285f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7ba9fde6-e959-4a4d-a2d2-1ddcf7dba119","name":"7ba9fde6-e959-4a4d-a2d2-1ddcf7dba119","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eeab9bc1-ad30-4ec0-bdba-2dca30f6f4c2","name":"eeab9bc1-ad30-4ec0-bdba-2dca30f6f4c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f1e8ceb4-44fa-4951-9dc0-0fb91768ff96","name":"f1e8ceb4-44fa-4951-9dc0-0fb91768ff96","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c8cf5a99-d524-4ed0-8254-1c520010e5b8","name":"c8cf5a99-d524-4ed0-8254-1c520010e5b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2388d2cb-3c3c-4725-850a-aa27c32fd293","name":"2388d2cb-3c3c-4725-850a-aa27c32fd293","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8615a206-0f18-4722-a4ae-4899f089587c","name":"8615a206-0f18-4722-a4ae-4899f089587c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d60044a0-af82-4fb3-8e49-bb6520e52808","name":"d60044a0-af82-4fb3-8e49-bb6520e52808","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93d1aa32-eb20-4c29-98f8-d59acf8219b2","name":"93d1aa32-eb20-4c29-98f8-d59acf8219b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ac0155df-72bd-4471-a1a3-f61e07a66d83","name":"ac0155df-72bd-4471-a1a3-f61e07a66d83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb8ebd46-efd0-493e-bd15-4d22c3f8fab5","name":"fb8ebd46-efd0-493e-bd15-4d22c3f8fab5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"62040f87-514e-47c8-9541-112685e3f530","name":"62040f87-514e-47c8-9541-112685e3f530","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5a3104e-ba0b-496f-8dc6-40b44fe501f6","name":"d5a3104e-ba0b-496f-8dc6-40b44fe501f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"adc60ca3-cfe9-46f9-afc1-870909f094e5","name":"adc60ca3-cfe9-46f9-afc1-870909f094e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -88,69 +88,27 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"181a775a-4952-48db-90d2-1b3fef4cae06","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3d9dacf7-ad8b-4edf-bfd0-624027251d40","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dc545d7-cb74-455f-9122-a8de598730d7","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d03183c7-6624-4a7a-bbca-e0cc0c0c09f6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"99571177-9e49-4765-861d-b8f711717ce2","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69a15a91-fcc1-4f28-a65e-e166b5751a52","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1edf8291-4dc4-4034-a324-4a803e5b4d20","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"395570ba-a096-4896-a1c4-7b7d90e9b1b1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f773ac73-a560-46d1-9dc8-426c4bbda42f","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f63676b1-5f8d-4ea3-9cb4-09f84bc95b5c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9e90a7c-1810-4687-95d1-8926bdc06e4b","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4d5e6c7-2b5a-431a-9e47-5c843d58a1ff","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"408c6368-40f2-4d72-80af-2a1756e36642","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c30d912d-4df4-404a-b38f-ce8dda5d458d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf6c06a0-35df-418d-ac85-45ac5b8e285f","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d4155acf-3e82-4cb2-92c7-10316d0ee9c3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ba9fde6-e959-4a4d-a2d2-1ddcf7dba119","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ae654d1-25d9-4269-940b-e1e7fc72d625","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeab9bc1-ad30-4ec0-bdba-2dca30f6f4c2","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de5bffaf-c831-43d4-9b48-89a5618b09ac","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1e8ceb4-44fa-4951-9dc0-0fb91768ff96","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1dbfd5f7-fe0f-494c-b4fa-3de37ffaa8be","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8cf5a99-d524-4ed0-8254-1c520010e5b8","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b56335f0-c594-468c-b9cf-257a4f546fa0","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2388d2cb-3c3c-4725-850a-aa27c32fd293","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bed3a042-e251-4d6e-89e6-5e544dcb1ff6","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8615a206-0f18-4722-a4ae-4899f089587c","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3524370c-3828-4c5f-8dec-dd6c226c217c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d60044a0-af82-4fb3-8e49-bb6520e52808","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"325d6ae0-a21f-4350-9c1c-3af98ab3c0cd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93d1aa32-eb20-4c29-98f8-d59acf8219b2","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0bb71ca1-af6d-4ae9-8614-22ebf352e3c9","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac0155df-72bd-4471-a1a3-f61e07a66d83","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78125f44-1c11-47ad-85ff-c496612e6b2c","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb8ebd46-efd0-493e-bd15-4d22c3f8fab5","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e7f41fba-0333-4687-b256-a1d38f6896d4","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"62040f87-514e-47c8-9541-112685e3f530","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"211e6999-babe-483d-8c39-1b83087d41bf","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5a3104e-ba0b-496f-8dc6-40b44fe501f6","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7a141fe-5907-401c-881a-37f7ae9f2f8d","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"adc60ca3-cfe9-46f9-afc1-870909f094e5","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"edfb3906-d795-4658-8ef4-e1065bbaf111","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"181a775a-4952-48db-90d2-1b3fef4cae06","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3d9dacf7-ad8b-4edf-bfd0-624027251d40","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dc545d7-cb74-455f-9122-a8de598730d7","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d03183c7-6624-4a7a-bbca-e0cc0c0c09f6","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"99571177-9e49-4765-861d-b8f711717ce2","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69a15a91-fcc1-4f28-a65e-e166b5751a52","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1edf8291-4dc4-4034-a324-4a803e5b4d20","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"395570ba-a096-4896-a1c4-7b7d90e9b1b1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f773ac73-a560-46d1-9dc8-426c4bbda42f","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f63676b1-5f8d-4ea3-9cb4-09f84bc95b5c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9e90a7c-1810-4687-95d1-8926bdc06e4b","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4d5e6c7-2b5a-431a-9e47-5c843d58a1ff","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"408c6368-40f2-4d72-80af-2a1756e36642","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c30d912d-4df4-404a-b38f-ce8dda5d458d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf6c06a0-35df-418d-ac85-45ac5b8e285f","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d4155acf-3e82-4cb2-92c7-10316d0ee9c3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ba9fde6-e959-4a4d-a2d2-1ddcf7dba119","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ae654d1-25d9-4269-940b-e1e7fc72d625","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eeab9bc1-ad30-4ec0-bdba-2dca30f6f4c2","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de5bffaf-c831-43d4-9b48-89a5618b09ac","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1e8ceb4-44fa-4951-9dc0-0fb91768ff96","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1dbfd5f7-fe0f-494c-b4fa-3de37ffaa8be","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c8cf5a99-d524-4ed0-8254-1c520010e5b8","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b56335f0-c594-468c-b9cf-257a4f546fa0","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2388d2cb-3c3c-4725-850a-aa27c32fd293","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bed3a042-e251-4d6e-89e6-5e544dcb1ff6","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8615a206-0f18-4722-a4ae-4899f089587c","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3524370c-3828-4c5f-8dec-dd6c226c217c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d60044a0-af82-4fb3-8e49-bb6520e52808","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"325d6ae0-a21f-4350-9c1c-3af98ab3c0cd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"93d1aa32-eb20-4c29-98f8-d59acf8219b2","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bb71ca1-af6d-4ae9-8614-22ebf352e3c9","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac0155df-72bd-4471-a1a3-f61e07a66d83","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78125f44-1c11-47ad-85ff-c496612e6b2c","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb8ebd46-efd0-493e-bd15-4d22c3f8fab5","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e7f41fba-0333-4687-b256-a1d38f6896d4","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"62040f87-514e-47c8-9541-112685e3f530","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"211e6999-babe-483d-8c39-1b83087d41bf","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5a3104e-ba0b-496f-8dc6-40b44fe501f6","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7a141fe-5907-401c-881a-37f7ae9f2f8d","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"adc60ca3-cfe9-46f9-afc1-870909f094e5","path":"sprites/spr_planets/spr_planets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"edfb3906-d795-4658-8ef4-e1065bbaf111","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_popup/spr_popup.yy b/sprites/spr_popup/spr_popup.yy index e4a6f32231..3f509030dc 100644 --- a/sprites/spr_popup/spr_popup.yy +++ b/sprites/spr_popup/spr_popup.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup", "bboxMode":0, "bbox_bottom":287, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"818b0ce5-b55a-4033-8366-844e3fb02b9c","name":"818b0ce5-b55a-4033-8366-844e3fb02b9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0b81ee58-349d-4e4a-87e2-44cc946f0a32","name":"0b81ee58-349d-4e4a-87e2-44cc946f0a32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"818b0ce5-b55a-4033-8366-844e3fb02b9c","name":"818b0ce5-b55a-4033-8366-844e3fb02b9c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0b81ee58-349d-4e4a-87e2-44cc946f0a32","name":"0b81ee58-349d-4e4a-87e2-44cc946f0a32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"818b0ce5-b55a-4033-8366-844e3fb02b9c","path":"sprites/spr_popup/spr_popup.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9ad78fbb-c358-45fd-88f9-e5369faed57a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b81ee58-349d-4e4a-87e2-44cc946f0a32","path":"sprites/spr_popup/spr_popup.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"34f81e50-3bc5-4ec7-92f2-f09b4c113e6e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"818b0ce5-b55a-4033-8366-844e3fb02b9c","path":"sprites/spr_popup/spr_popup.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9ad78fbb-c358-45fd-88f9-e5369faed57a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b81ee58-349d-4e4a-87e2-44cc946f0a32","path":"sprites/spr_popup/spr_popup.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"34f81e50-3bc5-4ec7-92f2-f09b4c113e6e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_popup_dialogue/spr_popup_dialogue.yy b/sprites/spr_popup_dialogue/spr_popup_dialogue.yy index e7841dac57..2795a77436 100644 --- a/sprites/spr_popup_dialogue/spr_popup_dialogue.yy +++ b/sprites/spr_popup_dialogue/spr_popup_dialogue.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_dialogue", "bboxMode":0, "bbox_bottom":146, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e9f89fec-8957-4b51-af6e-afe30a3bec04","name":"e9f89fec-8957-4b51-af6e-afe30a3bec04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9f89fec-8957-4b51-af6e-afe30a3bec04","name":"e9f89fec-8957-4b51-af6e-afe30a3bec04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":147.0, + "seqWidth":301.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"aa362568-b6a2-4a5b-be4a-271695972d87","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, diff --git a/sprites/spr_popup_event/spr_popup_event.yy b/sprites/spr_popup_event/spr_popup_event.yy index da6690cee9..0e8729d93d 100644 --- a/sprites/spr_popup_event/spr_popup_event.yy +++ b/sprites/spr_popup_event/spr_popup_event.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_event", "bboxMode":0, "bbox_bottom":602, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d76ef3fd-d887-4d0f-9bf8-dc0ffe1e9f60","name":"d76ef3fd-d887-4d0f-9bf8-dc0ffe1e9f60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a2fc932a-c165-4e00-9ee1-5377afd490a2","name":"a2fc932a-c165-4e00-9ee1-5377afd490a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d76ef3fd-d887-4d0f-9bf8-dc0ffe1e9f60","name":"d76ef3fd-d887-4d0f-9bf8-dc0ffe1e9f60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a2fc932a-c165-4e00-9ee1-5377afd490a2","name":"a2fc932a-c165-4e00-9ee1-5377afd490a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d76ef3fd-d887-4d0f-9bf8-dc0ffe1e9f60","path":"sprites/spr_popup_event/spr_popup_event.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e1550ec3-8ef7-4b66-b938-85de6e30b587","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2fc932a-c165-4e00-9ee1-5377afd490a2","path":"sprites/spr_popup_event/spr_popup_event.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fcfc72ea-4585-4003-8f57-fcd1e98e8d62","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d76ef3fd-d887-4d0f-9bf8-dc0ffe1e9f60","path":"sprites/spr_popup_event/spr_popup_event.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e1550ec3-8ef7-4b66-b938-85de6e30b587","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2fc932a-c165-4e00-9ee1-5377afd490a2","path":"sprites/spr_popup_event/spr_popup_event.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fcfc72ea-4585-4003-8f57-fcd1e98e8d62","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy b/sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy index c6cd61142a..85afb4429b 100644 --- a/sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy +++ b/sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_event_avatar", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"194603b5-15a9-40de-be4a-f33d87da14f9","name":"194603b5-15a9-40de-be4a-f33d87da14f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"194603b5-15a9-40de-be4a-f33d87da14f9","name":"194603b5-15a9-40de-be4a-f33d87da14f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"194603b5-15a9-40de-be4a-f33d87da14f9","path":"sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a54b2f11-3f4e-4e52-97b2-9e5eeeffa1ee","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"194603b5-15a9-40de-be4a-f33d87da14f9","path":"sprites/spr_popup_event_avatar/spr_popup_event_avatar.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a54b2f11-3f4e-4e52-97b2-9e5eeeffa1ee","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_popup_large/spr_popup_large.yy b/sprites/spr_popup_large/spr_popup_large.yy index 04031a662d..b441825f1f 100644 --- a/sprites/spr_popup_large/spr_popup_large.yy +++ b/sprites/spr_popup_large/spr_popup_large.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_large", "bboxMode":0, "bbox_bottom":431, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4bf2b29b-2d50-46ab-8c3a-ba6be1dfa0aa","name":"4bf2b29b-2d50-46ab-8c3a-ba6be1dfa0aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fcd8569d-481d-4125-8dd4-f909a8072676","name":"fcd8569d-481d-4125-8dd4-f909a8072676","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4bf2b29b-2d50-46ab-8c3a-ba6be1dfa0aa","name":"4bf2b29b-2d50-46ab-8c3a-ba6be1dfa0aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fcd8569d-481d-4125-8dd4-f909a8072676","name":"fcd8569d-481d-4125-8dd4-f909a8072676","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bf2b29b-2d50-46ab-8c3a-ba6be1dfa0aa","path":"sprites/spr_popup_large/spr_popup_large.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c89065fb-82cd-4a55-8377-98dfd5690db7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcd8569d-481d-4125-8dd4-f909a8072676","path":"sprites/spr_popup_large/spr_popup_large.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd94c960-1265-4fa8-b9f5-cd210600f0c3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4bf2b29b-2d50-46ab-8c3a-ba6be1dfa0aa","path":"sprites/spr_popup_large/spr_popup_large.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c89065fb-82cd-4a55-8377-98dfd5690db7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcd8569d-481d-4125-8dd4-f909a8072676","path":"sprites/spr_popup_large/spr_popup_large.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd94c960-1265-4fa8-b9f5-cd210600f0c3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_popup_manage/spr_popup_manage.yy b/sprites/spr_popup_manage/spr_popup_manage.yy index cb9f1743ed..d898c03dd3 100644 --- a/sprites/spr_popup_manage/spr_popup_manage.yy +++ b/sprites/spr_popup_manage/spr_popup_manage.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_manage", "bboxMode":0, "bbox_bottom":31, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a59dec74-1bb0-4342-876c-99ac5dfc80bc","name":"a59dec74-1bb0-4342-876c-99ac5dfc80bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a59dec74-1bb0-4342-876c-99ac5dfc80bc","name":"a59dec74-1bb0-4342-876c-99ac5dfc80bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a59dec74-1bb0-4342-876c-99ac5dfc80bc","path":"sprites/spr_popup_manage/spr_popup_manage.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8116bdaf-a3ea-46cd-b211-840747ff36d5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a59dec74-1bb0-4342-876c-99ac5dfc80bc","path":"sprites/spr_popup_manage/spr_popup_manage.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8116bdaf-a3ea-46cd-b211-840747ff36d5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_popup_medium/spr_popup_medium.yy b/sprites/spr_popup_medium/spr_popup_medium.yy index ca70fde681..4b88f3a669 100644 --- a/sprites/spr_popup_medium/spr_popup_medium.yy +++ b/sprites/spr_popup_medium/spr_popup_medium.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_medium", "bboxMode":0, "bbox_bottom":323, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e581ac8a-5bd5-49dc-b5fe-b4ee836ccb65","name":"e581ac8a-5bd5-49dc-b5fe-b4ee836ccb65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d335f5fa-340d-44d4-ad9a-69cd54c42237","name":"d335f5fa-340d-44d4-ad9a-69cd54c42237","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e581ac8a-5bd5-49dc-b5fe-b4ee836ccb65","name":"e581ac8a-5bd5-49dc-b5fe-b4ee836ccb65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d335f5fa-340d-44d4-ad9a-69cd54c42237","name":"d335f5fa-340d-44d4-ad9a-69cd54c42237","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e581ac8a-5bd5-49dc-b5fe-b4ee836ccb65","path":"sprites/spr_popup_medium/spr_popup_medium.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a0b9f7e-d70e-44bd-aef3-295ac159bfc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d335f5fa-340d-44d4-ad9a-69cd54c42237","path":"sprites/spr_popup_medium/spr_popup_medium.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ccf5fc1f-fcea-4c0e-a400-30e315180537","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e581ac8a-5bd5-49dc-b5fe-b4ee836ccb65","path":"sprites/spr_popup_medium/spr_popup_medium.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a0b9f7e-d70e-44bd-aef3-295ac159bfc7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d335f5fa-340d-44d4-ad9a-69cd54c42237","path":"sprites/spr_popup_medium/spr_popup_medium.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ccf5fc1f-fcea-4c0e-a400-30e315180537","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_popup_pic/spr_popup_pic.yy b/sprites/spr_popup_pic/spr_popup_pic.yy index ca684faa6c..1966058f14 100644 --- a/sprites/spr_popup_pic/spr_popup_pic.yy +++ b/sprites/spr_popup_pic/spr_popup_pic.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_pic", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9fc5b893-861d-414d-bb6f-a1000c7dd42d","name":"9fc5b893-861d-414d-bb6f-a1000c7dd42d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9fc5b893-861d-414d-bb6f-a1000c7dd42d","name":"9fc5b893-861d-414d-bb6f-a1000c7dd42d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fc5b893-861d-414d-bb6f-a1000c7dd42d","path":"sprites/spr_popup_pic/spr_popup_pic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aeba4c16-c958-463b-b3cf-e0f6230963a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9fc5b893-861d-414d-bb6f-a1000c7dd42d","path":"sprites/spr_popup_pic/spr_popup_pic.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aeba4c16-c958-463b-b3cf-e0f6230963a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_popup_select/spr_popup_select.yy b/sprites/spr_popup_select/spr_popup_select.yy index 640998425b..74fd1d09f4 100644 --- a/sprites/spr_popup_select/spr_popup_select.yy +++ b/sprites/spr_popup_select/spr_popup_select.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_select", "bboxMode":0, "bbox_bottom":14, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"51edd839-9f92-4390-bd00-98fd88f418f5","name":"51edd839-9f92-4390-bd00-98fd88f418f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"51edd839-9f92-4390-bd00-98fd88f418f5","name":"51edd839-9f92-4390-bd00-98fd88f418f5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":15.0, + "seqWidth":15.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_popup_small/spr_popup_small.yy b/sprites/spr_popup_small/spr_popup_small.yy index 063857151e..863e371331 100644 --- a/sprites/spr_popup_small/spr_popup_small.yy +++ b/sprites/spr_popup_small/spr_popup_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_popup_small", "bboxMode":0, "bbox_bottom":242, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"82319a6a-45e9-4485-8f08-078bc038a38e","name":"82319a6a-45e9-4485-8f08-078bc038a38e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82319a6a-45e9-4485-8f08-078bc038a38e","name":"82319a6a-45e9-4485-8f08-078bc038a38e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82319a6a-45e9-4485-8f08-078bc038a38e","path":"sprites/spr_popup_small/spr_popup_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97b4525a-1cad-40d4-9aad-bea97fde4a16","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82319a6a-45e9-4485-8f08-078bc038a38e","path":"sprites/spr_popup_small/spr_popup_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97b4525a-1cad-40d4-9aad-bea97fde4a16","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_postbattle/spr_postbattle.yy b/sprites/spr_postbattle/spr_postbattle.yy index 1bcf922ac7..aaa723e0bc 100644 --- a/sprites/spr_postbattle/spr_postbattle.yy +++ b/sprites/spr_postbattle/spr_postbattle.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_postbattle", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_postbattle_space/spr_postbattle_space.yy b/sprites/spr_postbattle_space/spr_postbattle_space.yy index e740a62d11..190267cbdc 100644 --- a/sprites/spr_postbattle_space/spr_postbattle_space.yy +++ b/sprites/spr_postbattle_space/spr_postbattle_space.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_postbattle_space", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_pow_sword_blade_additions/3734a08a-42ee-4fd0-9737-0dbb3f6d3a68.png b/sprites/spr_pow_sword_blade_additions/3734a08a-42ee-4fd0-9737-0dbb3f6d3a68.png new file mode 100644 index 0000000000..3f1e4cebc0 Binary files /dev/null and b/sprites/spr_pow_sword_blade_additions/3734a08a-42ee-4fd0-9737-0dbb3f6d3a68.png differ diff --git a/sprites/spr_pow_sword_blade_additions/443a40e3-969c-4155-b66d-32e2a541cfde.png b/sprites/spr_pow_sword_blade_additions/443a40e3-969c-4155-b66d-32e2a541cfde.png new file mode 100644 index 0000000000..5d2968090d Binary files /dev/null and b/sprites/spr_pow_sword_blade_additions/443a40e3-969c-4155-b66d-32e2a541cfde.png differ diff --git a/sprites/spr_pow_sword_blade_additions/d76e9ffc-a89c-41eb-bc8a-b41946b2e18b.png b/sprites/spr_pow_sword_blade_additions/d76e9ffc-a89c-41eb-bc8a-b41946b2e18b.png new file mode 100644 index 0000000000..6643a1d0d1 Binary files /dev/null and b/sprites/spr_pow_sword_blade_additions/d76e9ffc-a89c-41eb-bc8a-b41946b2e18b.png differ diff --git a/sprites/spr_pow_sword_blade_additions/layers/3734a08a-42ee-4fd0-9737-0dbb3f6d3a68/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png b/sprites/spr_pow_sword_blade_additions/layers/3734a08a-42ee-4fd0-9737-0dbb3f6d3a68/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png new file mode 100644 index 0000000000..3f1e4cebc0 Binary files /dev/null and b/sprites/spr_pow_sword_blade_additions/layers/3734a08a-42ee-4fd0-9737-0dbb3f6d3a68/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png differ diff --git a/sprites/spr_pow_sword_blade_additions/layers/443a40e3-969c-4155-b66d-32e2a541cfde/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png b/sprites/spr_pow_sword_blade_additions/layers/443a40e3-969c-4155-b66d-32e2a541cfde/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png new file mode 100644 index 0000000000..5d2968090d Binary files /dev/null and b/sprites/spr_pow_sword_blade_additions/layers/443a40e3-969c-4155-b66d-32e2a541cfde/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png differ diff --git a/sprites/spr_pow_sword_blade_additions/layers/d76e9ffc-a89c-41eb-bc8a-b41946b2e18b/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png b/sprites/spr_pow_sword_blade_additions/layers/d76e9ffc-a89c-41eb-bc8a-b41946b2e18b/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png new file mode 100644 index 0000000000..6643a1d0d1 Binary files /dev/null and b/sprites/spr_pow_sword_blade_additions/layers/d76e9ffc-a89c-41eb-bc8a-b41946b2e18b/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png differ diff --git a/sprites/spr_pow_sword_blade_additions/spr_pow_sword_blade_additions.yy b/sprites/spr_pow_sword_blade_additions/spr_pow_sword_blade_additions.yy new file mode 100644 index 0000000000..599fb42493 --- /dev/null +++ b/sprites/spr_pow_sword_blade_additions/spr_pow_sword_blade_additions.yy @@ -0,0 +1,100 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_pow_sword_blade_additions", + "bboxMode":0, + "bbox_bottom":220, + "bbox_left":20, + "bbox_right":119, + "bbox_top":59, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3734a08a-42ee-4fd0-9737-0dbb3f6d3a68","name":"3734a08a-42ee-4fd0-9737-0dbb3f6d3a68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"443a40e3-969c-4155-b66d-32e2a541cfde","name":"443a40e3-969c-4155-b66d-32e2a541cfde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8","blendMode":0,"displayName":"default","isLocked":false,"name":"d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_pow_sword_blade_additions", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"melee", + "path":"folders/Sprites/Marine Viewer/weapons/melee.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_pow_sword_blade_additions", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":3.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_pow_sword_blade_additions", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","path":"sprites/spr_pow_sword_blade_additions/spr_pow_sword_blade_additions.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c90840de-d6cc-483e-a57c-af59544fddb7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3734a08a-42ee-4fd0-9737-0dbb3f6d3a68","path":"sprites/spr_pow_sword_blade_additions/spr_pow_sword_blade_additions.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2a116933-474f-412f-bf3b-20cae74ade2b","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"443a40e3-969c-4155-b66d-32e2a541cfde","path":"sprites/spr_pow_sword_blade_additions/spr_pow_sword_blade_additions.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"663eb470-6d6f-4363-aea2-eb7ee8ea2943","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_pow_sword_cross_guard/235bd87f-2f4e-4fc9-bb10-1ebddcf91c8e.png b/sprites/spr_pow_sword_cross_guard/235bd87f-2f4e-4fc9-bb10-1ebddcf91c8e.png new file mode 100644 index 0000000000..877b98169a Binary files /dev/null and b/sprites/spr_pow_sword_cross_guard/235bd87f-2f4e-4fc9-bb10-1ebddcf91c8e.png differ diff --git a/sprites/spr_pow_sword_cross_guard/3e5f5a08-83de-438b-b0cb-cac34c23ab3c.png b/sprites/spr_pow_sword_cross_guard/3e5f5a08-83de-438b-b0cb-cac34c23ab3c.png new file mode 100644 index 0000000000..2cfb51f049 Binary files /dev/null and b/sprites/spr_pow_sword_cross_guard/3e5f5a08-83de-438b-b0cb-cac34c23ab3c.png differ diff --git a/sprites/spr_pow_sword_cross_guard/4d350e69-6eba-4604-83b1-0c4822d3ff68.png b/sprites/spr_pow_sword_cross_guard/4d350e69-6eba-4604-83b1-0c4822d3ff68.png new file mode 100644 index 0000000000..c05bb2e8f6 Binary files /dev/null and b/sprites/spr_pow_sword_cross_guard/4d350e69-6eba-4604-83b1-0c4822d3ff68.png differ diff --git a/sprites/spr_pow_sword_cross_guard/9229c4f8-7950-4cc1-a8fd-4e8a91eb0a3a.png b/sprites/spr_pow_sword_cross_guard/9229c4f8-7950-4cc1-a8fd-4e8a91eb0a3a.png new file mode 100644 index 0000000000..de70b791fd Binary files /dev/null and b/sprites/spr_pow_sword_cross_guard/9229c4f8-7950-4cc1-a8fd-4e8a91eb0a3a.png differ diff --git a/sprites/spr_pow_sword_cross_guard/ce487658-50ad-47c9-a1f1-ba211cdf48a0.png b/sprites/spr_pow_sword_cross_guard/ce487658-50ad-47c9-a1f1-ba211cdf48a0.png new file mode 100644 index 0000000000..6726819a0b Binary files /dev/null and b/sprites/spr_pow_sword_cross_guard/ce487658-50ad-47c9-a1f1-ba211cdf48a0.png differ diff --git a/sprites/spr_pow_sword_cross_guard/layers/235bd87f-2f4e-4fc9-bb10-1ebddcf91c8e/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png b/sprites/spr_pow_sword_cross_guard/layers/235bd87f-2f4e-4fc9-bb10-1ebddcf91c8e/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png new file mode 100644 index 0000000000..877b98169a Binary files /dev/null and b/sprites/spr_pow_sword_cross_guard/layers/235bd87f-2f4e-4fc9-bb10-1ebddcf91c8e/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png differ diff --git a/sprites/spr_pow_sword_cross_guard/layers/3e5f5a08-83de-438b-b0cb-cac34c23ab3c/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png b/sprites/spr_pow_sword_cross_guard/layers/3e5f5a08-83de-438b-b0cb-cac34c23ab3c/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png new file mode 100644 index 0000000000..2cfb51f049 Binary files /dev/null and b/sprites/spr_pow_sword_cross_guard/layers/3e5f5a08-83de-438b-b0cb-cac34c23ab3c/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png differ diff --git a/sprites/spr_pow_sword_cross_guard/layers/4d350e69-6eba-4604-83b1-0c4822d3ff68/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png b/sprites/spr_pow_sword_cross_guard/layers/4d350e69-6eba-4604-83b1-0c4822d3ff68/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png new file mode 100644 index 0000000000..c05bb2e8f6 Binary files /dev/null and b/sprites/spr_pow_sword_cross_guard/layers/4d350e69-6eba-4604-83b1-0c4822d3ff68/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png differ diff --git a/sprites/spr_pow_sword_cross_guard/layers/9229c4f8-7950-4cc1-a8fd-4e8a91eb0a3a/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png b/sprites/spr_pow_sword_cross_guard/layers/9229c4f8-7950-4cc1-a8fd-4e8a91eb0a3a/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png new file mode 100644 index 0000000000..de70b791fd Binary files /dev/null and b/sprites/spr_pow_sword_cross_guard/layers/9229c4f8-7950-4cc1-a8fd-4e8a91eb0a3a/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png differ diff --git a/sprites/spr_pow_sword_cross_guard/layers/ce487658-50ad-47c9-a1f1-ba211cdf48a0/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png b/sprites/spr_pow_sword_cross_guard/layers/ce487658-50ad-47c9-a1f1-ba211cdf48a0/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png new file mode 100644 index 0000000000..6726819a0b Binary files /dev/null and b/sprites/spr_pow_sword_cross_guard/layers/ce487658-50ad-47c9-a1f1-ba211cdf48a0/d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8.png differ diff --git a/sprites/spr_pow_sword_cross_guard/spr_pow_sword_cross_guard.yy b/sprites/spr_pow_sword_cross_guard/spr_pow_sword_cross_guard.yy new file mode 100644 index 0000000000..ea300366b0 --- /dev/null +++ b/sprites/spr_pow_sword_cross_guard/spr_pow_sword_cross_guard.yy @@ -0,0 +1,108 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_pow_sword_cross_guard", + "bboxMode":0, + "bbox_bottom":120, + "bbox_left":12, + "bbox_right":67, + "bbox_top":87, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"235bd87f-2f4e-4fc9-bb10-1ebddcf91c8e","name":"235bd87f-2f4e-4fc9-bb10-1ebddcf91c8e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ce487658-50ad-47c9-a1f1-ba211cdf48a0","name":"ce487658-50ad-47c9-a1f1-ba211cdf48a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3e5f5a08-83de-438b-b0cb-cac34c23ab3c","name":"3e5f5a08-83de-438b-b0cb-cac34c23ab3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d350e69-6eba-4604-83b1-0c4822d3ff68","name":"4d350e69-6eba-4604-83b1-0c4822d3ff68","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9229c4f8-7950-4cc1-a8fd-4e8a91eb0a3a","name":"9229c4f8-7950-4cc1-a8fd-4e8a91eb0a3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8","blendMode":0,"displayName":"default","isLocked":false,"name":"d6d4a4a7-b1f1-4f7c-a10d-1d6a1bd8fba8","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_pow_sword_cross_guard", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"melee", + "path":"folders/Sprites/Marine Viewer/weapons/melee.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_pow_sword_cross_guard", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":5.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_pow_sword_cross_guard", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"235bd87f-2f4e-4fc9-bb10-1ebddcf91c8e","path":"sprites/spr_pow_sword_cross_guard/spr_pow_sword_cross_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fd35cea4-6634-4b19-bb71-601bccce3796","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ce487658-50ad-47c9-a1f1-ba211cdf48a0","path":"sprites/spr_pow_sword_cross_guard/spr_pow_sword_cross_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"be668ce6-f660-4e92-aa58-bc33c32c355d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e5f5a08-83de-438b-b0cb-cac34c23ab3c","path":"sprites/spr_pow_sword_cross_guard/spr_pow_sword_cross_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8c067492-4480-48ae-8749-04cbe273ceb2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d350e69-6eba-4604-83b1-0c4822d3ff68","path":"sprites/spr_pow_sword_cross_guard/spr_pow_sword_cross_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a4224360-c05b-4742-97a4-7b54bab31c98","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9229c4f8-7950-4cc1-a8fd-4e8a91eb0a3a","path":"sprites/spr_pow_sword_cross_guard/spr_pow_sword_cross_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4daa7f39-a941-449a-aba4-5e428c6e9af9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_prussian_spike/spr_prussian_spike.yy b/sprites/spr_prussian_spike/spr_prussian_spike.yy index 2427bc7c35..d2bb270df6 100644 --- a/sprites/spr_prussian_spike/spr_prussian_spike.yy +++ b/sprites/spr_prussian_spike/spr_prussian_spike.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_prussian_spike", "bboxMode":0, "bbox_bottom":64, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"441fec2f-4b09-4221-8c3f-ea3cd809adeb","name":"441fec2f-4b09-4221-8c3f-ea3cd809adeb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cae929a5-f374-473f-a6d0-cf192764bb7e","name":"cae929a5-f374-473f-a6d0-cf192764bb7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f63f419a-507b-4755-ad2f-88e97c7be7f9","name":"f63f419a-507b-4755-ad2f-88e97c7be7f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15b2950d-a703-41a5-9fda-cf6e20097872","name":"15b2950d-a703-41a5-9fda-cf6e20097872","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","name":"5a405388-8efb-49b6-a38f-f27ec42f29e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"441fec2f-4b09-4221-8c3f-ea3cd809adeb","name":"441fec2f-4b09-4221-8c3f-ea3cd809adeb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cae929a5-f374-473f-a6d0-cf192764bb7e","name":"cae929a5-f374-473f-a6d0-cf192764bb7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f63f419a-507b-4755-ad2f-88e97c7be7f9","name":"f63f419a-507b-4755-ad2f-88e97c7be7f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15b2950d-a703-41a5-9fda-cf6e20097872","name":"15b2950d-a703-41a5-9fda-cf6e20097872","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -67,6 +67,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_psy_hood/spr_psy_hood.yy b/sprites/spr_psy_hood/spr_psy_hood.yy index 99d66f5664..13d52dc12c 100644 --- a/sprites/spr_psy_hood/spr_psy_hood.yy +++ b/sprites/spr_psy_hood/spr_psy_hood.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_psy_hood", "bboxMode":0, "bbox_bottom":203, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e9dab986-458a-47fd-80b0-9fe27508109d","name":"e9dab986-458a-47fd-80b0-9fe27508109d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"00179c07-d252-45ef-b3ab-ce1592356c5e","name":"00179c07-d252-45ef-b3ab-ce1592356c5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","name":"c00a412a-a9bc-45ec-9142-9d8a013a975a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9dab986-458a-47fd-80b0-9fe27508109d","name":"e9dab986-458a-47fd-80b0-9fe27508109d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00179c07-d252-45ef-b3ab-ce1592356c5e","name":"00179c07-d252-45ef-b3ab-ce1592356c5e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -66,6 +66,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_psy_hood_alpha/8d214563-cc0c-4310-a5c4-13f0a699a86f.png b/sprites/spr_psy_hood_alpha/8d214563-cc0c-4310-a5c4-13f0a699a86f.png new file mode 100644 index 0000000000..daf953e576 Binary files /dev/null and b/sprites/spr_psy_hood_alpha/8d214563-cc0c-4310-a5c4-13f0a699a86f.png differ diff --git a/sprites/spr_psy_hood_alpha/layers/8d214563-cc0c-4310-a5c4-13f0a699a86f/5a4891da-2115-41b1-bd6d-0a3eab1e83f7.png b/sprites/spr_psy_hood_alpha/layers/8d214563-cc0c-4310-a5c4-13f0a699a86f/5a4891da-2115-41b1-bd6d-0a3eab1e83f7.png new file mode 100644 index 0000000000..daf953e576 Binary files /dev/null and b/sprites/spr_psy_hood_alpha/layers/8d214563-cc0c-4310-a5c4-13f0a699a86f/5a4891da-2115-41b1-bd6d-0a3eab1e83f7.png differ diff --git a/sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy b/sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy new file mode 100644 index 0000000000..0bb769cfc1 --- /dev/null +++ b/sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy @@ -0,0 +1,90 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_psy_hood_alpha", + "bboxMode":0, + "bbox_bottom":145, + "bbox_left":57, + "bbox_right":106, + "bbox_top":101, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":322, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"5a4891da-2115-41b1-bd6d-0a3eab1e83f7","blendMode":0,"displayName":"default","isLocked":false,"name":"5a4891da-2115-41b1-bd6d-0a3eab1e83f7","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_psy_hood_alpha", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"gear", + "path":"folders/Sprites/Marine Viewer/gear.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_psy_hood_alpha", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_psy_hood_alpha", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","path":"sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"51ba9fd0-369a-4be7-b5c8-f8d75c8a38d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":-2, + "yorigin":90, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_psy_hood_alpha2/e8a1632c-8084-4d13-8d30-4732feda986c.png b/sprites/spr_psy_hood_alpha2/e8a1632c-8084-4d13-8d30-4732feda986c.png new file mode 100644 index 0000000000..45fafcc786 Binary files /dev/null and b/sprites/spr_psy_hood_alpha2/e8a1632c-8084-4d13-8d30-4732feda986c.png differ diff --git a/sprites/spr_psy_hood_alpha2/layers/e8a1632c-8084-4d13-8d30-4732feda986c/4e04fbbe-15f2-4571-aba0-3c07dcc066f0.png b/sprites/spr_psy_hood_alpha2/layers/e8a1632c-8084-4d13-8d30-4732feda986c/4e04fbbe-15f2-4571-aba0-3c07dcc066f0.png new file mode 100644 index 0000000000..45fafcc786 Binary files /dev/null and b/sprites/spr_psy_hood_alpha2/layers/e8a1632c-8084-4d13-8d30-4732feda986c/4e04fbbe-15f2-4571-aba0-3c07dcc066f0.png differ diff --git a/sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy b/sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy new file mode 100644 index 0000000000..adb3b5b37b --- /dev/null +++ b/sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy @@ -0,0 +1,90 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_psy_hood_alpha2", + "bboxMode":0, + "bbox_bottom":145, + "bbox_left":57, + "bbox_right":106, + "bbox_top":101, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"e8a1632c-8084-4d13-8d30-4732feda986c","name":"e8a1632c-8084-4d13-8d30-4732feda986c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":322, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"4e04fbbe-15f2-4571-aba0-3c07dcc066f0","blendMode":0,"displayName":"default","isLocked":false,"name":"4e04fbbe-15f2-4571-aba0-3c07dcc066f0","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_psy_hood_alpha2", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"gear", + "path":"folders/Sprites/Marine Viewer/gear.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_psy_hood_alpha2", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_psy_hood_alpha2", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8a1632c-8084-4d13-8d30-4732feda986c","path":"sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9985ee2-2374-47e6-89f4-6a2b25a8ec5b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":-2, + "yorigin":90, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy b/sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy index 2b6df338a5..47b18885af 100644 --- a/sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy +++ b/sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_psy_hood_complex", "bboxMode":0, "bbox_bottom":51, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,14 +63,14 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","path":"sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd2d4908-2e48-4f69-8c27-96c251f4d07e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da4d2ca5-ded6-4a96-bef4-a1c048f10f67","path":"sprites/spr_psy_hood_complex/spr_psy_hood_complex.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd2d4908-2e48-4f69-8c27-96c251f4d07e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_psy_hood_components/4a04d880-daf4-46bb-aff0-901a873b35eb.png b/sprites/spr_psy_hood_components/4a04d880-daf4-46bb-aff0-901a873b35eb.png new file mode 100644 index 0000000000..74cb60802a Binary files /dev/null and b/sprites/spr_psy_hood_components/4a04d880-daf4-46bb-aff0-901a873b35eb.png differ diff --git a/sprites/spr_psy_hood_components/c25a06b5-ba12-44c0-9b16-8dab1e63aa31.png b/sprites/spr_psy_hood_components/c25a06b5-ba12-44c0-9b16-8dab1e63aa31.png new file mode 100644 index 0000000000..4fa7833c61 Binary files /dev/null and b/sprites/spr_psy_hood_components/c25a06b5-ba12-44c0-9b16-8dab1e63aa31.png differ diff --git a/sprites/spr_psy_hood_components/c310d9f2-1bb1-4847-ac8e-fd6df2f81d28.png b/sprites/spr_psy_hood_components/c310d9f2-1bb1-4847-ac8e-fd6df2f81d28.png new file mode 100644 index 0000000000..e1ef2e1311 Binary files /dev/null and b/sprites/spr_psy_hood_components/c310d9f2-1bb1-4847-ac8e-fd6df2f81d28.png differ diff --git a/sprites/spr_psy_hood_components/ff1a90fe-9eaa-4220-a0f3-1295c62fdc29.png b/sprites/spr_psy_hood_components/ff1a90fe-9eaa-4220-a0f3-1295c62fdc29.png new file mode 100644 index 0000000000..c7bcdb751f Binary files /dev/null and b/sprites/spr_psy_hood_components/ff1a90fe-9eaa-4220-a0f3-1295c62fdc29.png differ diff --git a/sprites/spr_psy_hood_components/layers/4a04d880-daf4-46bb-aff0-901a873b35eb/0b5e7fba-d4a1-441e-a726-f45a72c56663.png b/sprites/spr_psy_hood_components/layers/4a04d880-daf4-46bb-aff0-901a873b35eb/0b5e7fba-d4a1-441e-a726-f45a72c56663.png new file mode 100644 index 0000000000..74cb60802a Binary files /dev/null and b/sprites/spr_psy_hood_components/layers/4a04d880-daf4-46bb-aff0-901a873b35eb/0b5e7fba-d4a1-441e-a726-f45a72c56663.png differ diff --git a/sprites/spr_psy_hood_components/layers/c25a06b5-ba12-44c0-9b16-8dab1e63aa31/0b5e7fba-d4a1-441e-a726-f45a72c56663.png b/sprites/spr_psy_hood_components/layers/c25a06b5-ba12-44c0-9b16-8dab1e63aa31/0b5e7fba-d4a1-441e-a726-f45a72c56663.png new file mode 100644 index 0000000000..4fa7833c61 Binary files /dev/null and b/sprites/spr_psy_hood_components/layers/c25a06b5-ba12-44c0-9b16-8dab1e63aa31/0b5e7fba-d4a1-441e-a726-f45a72c56663.png differ diff --git a/sprites/spr_psy_hood_components/layers/c310d9f2-1bb1-4847-ac8e-fd6df2f81d28/0b5e7fba-d4a1-441e-a726-f45a72c56663.png b/sprites/spr_psy_hood_components/layers/c310d9f2-1bb1-4847-ac8e-fd6df2f81d28/0b5e7fba-d4a1-441e-a726-f45a72c56663.png new file mode 100644 index 0000000000..e1ef2e1311 Binary files /dev/null and b/sprites/spr_psy_hood_components/layers/c310d9f2-1bb1-4847-ac8e-fd6df2f81d28/0b5e7fba-d4a1-441e-a726-f45a72c56663.png differ diff --git a/sprites/spr_psy_hood_components/layers/ff1a90fe-9eaa-4220-a0f3-1295c62fdc29/0b5e7fba-d4a1-441e-a726-f45a72c56663.png b/sprites/spr_psy_hood_components/layers/ff1a90fe-9eaa-4220-a0f3-1295c62fdc29/0b5e7fba-d4a1-441e-a726-f45a72c56663.png new file mode 100644 index 0000000000..c7bcdb751f Binary files /dev/null and b/sprites/spr_psy_hood_components/layers/ff1a90fe-9eaa-4220-a0f3-1295c62fdc29/0b5e7fba-d4a1-441e-a726-f45a72c56663.png differ diff --git a/sprites/spr_psy_hood_components/spr_psy_hood_components.yy b/sprites/spr_psy_hood_components/spr_psy_hood_components.yy new file mode 100644 index 0000000000..fb8bce212a --- /dev/null +++ b/sprites/spr_psy_hood_components/spr_psy_hood_components.yy @@ -0,0 +1,104 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_psy_hood_components", + "bboxMode":0, + "bbox_bottom":14, + "bbox_left":71, + "bbox_right":91, + "bbox_top":5, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"c310d9f2-1bb1-4847-ac8e-fd6df2f81d28","name":"c310d9f2-1bb1-4847-ac8e-fd6df2f81d28","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c25a06b5-ba12-44c0-9b16-8dab1e63aa31","name":"c25a06b5-ba12-44c0-9b16-8dab1e63aa31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ff1a90fe-9eaa-4220-a0f3-1295c62fdc29","name":"ff1a90fe-9eaa-4220-a0f3-1295c62fdc29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4a04d880-daf4-46bb-aff0-901a873b35eb","name":"4a04d880-daf4-46bb-aff0-901a873b35eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"0b5e7fba-d4a1-441e-a726-f45a72c56663","blendMode":0,"displayName":"default","isLocked":false,"name":"0b5e7fba-d4a1-441e-a726-f45a72c56663","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_psy_hood_components", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"gear", + "path":"folders/Sprites/Marine Viewer/gear.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_psy_hood_components", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":4.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_psy_hood_components", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c310d9f2-1bb1-4847-ac8e-fd6df2f81d28","path":"sprites/spr_psy_hood_components/spr_psy_hood_components.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8f728f8b-1884-497f-817d-67dc4974de99","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c25a06b5-ba12-44c0-9b16-8dab1e63aa31","path":"sprites/spr_psy_hood_components/spr_psy_hood_components.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"85404abc-1b98-466d-8439-37c48938f046","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff1a90fe-9eaa-4220-a0f3-1295c62fdc29","path":"sprites/spr_psy_hood_components/spr_psy_hood_components.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"dd962c54-4209-4bbd-af72-d9255dbc51bb","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4a04d880-daf4-46bb-aff0-901a873b35eb","path":"sprites/spr_psy_hood_components/spr_psy_hood_components.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5384b153-9d7a-4f06-8b9b-1fa568b15eaa","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":-2, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_pulse/spr_pulse.yy b/sprites/spr_pulse/spr_pulse.yy index 7af03e1903..3a5203ab9c 100644 --- a/sprites/spr_pulse/spr_pulse.yy +++ b/sprites/spr_pulse/spr_pulse.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_pulse", "bboxMode":0, "bbox_bottom":1, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"beb51875-fde0-449b-9feb-bdd9fc7e5b15","name":"beb51875-fde0-449b-9feb-bdd9fc7e5b15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"beb51875-fde0-449b-9feb-bdd9fc7e5b15","name":"beb51875-fde0-449b-9feb-bdd9fc7e5b15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"beb51875-fde0-449b-9feb-bdd9fc7e5b15","path":"sprites/spr_pulse/spr_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bea83358-4f2a-4a9d-ab40-f1a58e73e370","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"beb51875-fde0-449b-9feb-bdd9fc7e5b15","path":"sprites/spr_pulse/spr_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bea83358-4f2a-4a9d-ab40-f1a58e73e370","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_purge_1/spr_purge_1.yy b/sprites/spr_purge_1/spr_purge_1.yy index 198e747870..9af7d76b5c 100644 --- a/sprites/spr_purge_1/spr_purge_1.yy +++ b/sprites/spr_purge_1/spr_purge_1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_purge_1", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_purge_2/spr_purge_2.yy b/sprites/spr_purge_2/spr_purge_2.yy index 2b8450f3ed..471230fc5b 100644 --- a/sprites/spr_purge_2/spr_purge_2.yy +++ b/sprites/spr_purge_2/spr_purge_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_purge_2", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_purge_buttons/spr_purge_buttons.yy b/sprites/spr_purge_buttons/spr_purge_buttons.yy index 48ea8b9abd..4a22d0cd9b 100644 --- a/sprites/spr_purge_buttons/spr_purge_buttons.yy +++ b/sprites/spr_purge_buttons/spr_purge_buttons.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_purge_buttons", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d9a10719-dd38-43e2-82b7-62f03a6de243","name":"d9a10719-dd38-43e2-82b7-62f03a6de243","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9a10719-dd38-43e2-82b7-62f03a6de243","name":"d9a10719-dd38-43e2-82b7-62f03a6de243","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9a10719-dd38-43e2-82b7-62f03a6de243","path":"sprites/spr_purge_buttons/spr_purge_buttons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fed73b7e-5330-4e80-a7c6-0cec4a4ed761","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9a10719-dd38-43e2-82b7-62f03a6de243","path":"sprites/spr_purge_buttons/spr_purge_buttons.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fed73b7e-5330-4e80-a7c6-0cec4a4ed761","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_purge_panel/spr_purge_panel.yy b/sprites/spr_purge_panel/spr_purge_panel.yy index a49d40d9eb..9942712f36 100644 --- a/sprites/spr_purge_panel/spr_purge_panel.yy +++ b/sprites/spr_purge_panel/spr_purge_panel.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_purge_panel", "bboxMode":0, "bbox_bottom":399, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"92a13947-7100-4a9e-96d0-2af58cd2d330","name":"92a13947-7100-4a9e-96d0-2af58cd2d330","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92a13947-7100-4a9e-96d0-2af58cd2d330","name":"92a13947-7100-4a9e-96d0-2af58cd2d330","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":400.0, + "seqWidth":530.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"89cc209d-0fa1-4713-be02-efb2bfdf7d52","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, diff --git a/sprites/spr_purity_s/spr_purity_s.yy b/sprites/spr_purity_s/spr_purity_s.yy index 532b8b7108..122958dadb 100644 --- a/sprites/spr_purity_s/spr_purity_s.yy +++ b/sprites/spr_purity_s/spr_purity_s.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_purity_s", "bboxMode":0, "bbox_bottom":60, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4b074bea-caac-469b-9dc8-35be1593a7aa","name":"4b074bea-caac-469b-9dc8-35be1593a7aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ebc45331-ddb7-4801-be91-f23288c05447","name":"ebc45331-ddb7-4801-be91-f23288c05447","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b074bea-caac-469b-9dc8-35be1593a7aa","name":"4b074bea-caac-469b-9dc8-35be1593a7aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ebc45331-ddb7-4801-be91-f23288c05447","name":"ebc45331-ddb7-4801-be91-f23288c05447","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b074bea-caac-469b-9dc8-35be1593a7aa","path":"sprites/spr_purity_s/spr_purity_s.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ff55be1-b90d-4d5d-baed-3a98a57c2fb3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebc45331-ddb7-4801-be91-f23288c05447","path":"sprites/spr_purity_s/spr_purity_s.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44283d58-d9c9-4ca2-ac9d-2477d311bd16","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b074bea-caac-469b-9dc8-35be1593a7aa","path":"sprites/spr_purity_s/spr_purity_s.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ff55be1-b90d-4d5d-baed-3a98a57c2fb3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ebc45331-ddb7-4801-be91-f23288c05447","path":"sprites/spr_purity_s/spr_purity_s.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44283d58-d9c9-4ca2-ac9d-2477d311bd16","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_purity_seal/spr_purity_seal.yy b/sprites/spr_purity_seal/spr_purity_seal.yy index 08105fcd98..cedf7af02f 100644 --- a/sprites/spr_purity_seal/spr_purity_seal.yy +++ b/sprites/spr_purity_seal/spr_purity_seal.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_purity_seal", "bboxMode":0, "bbox_bottom":34, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"39dc5d62-01e8-4a52-99be-1d12790fcbfc","name":"39dc5d62-01e8-4a52-99be-1d12790fcbfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"595ff173-4df7-4f84-aebc-576f91f18c23","name":"595ff173-4df7-4f84-aebc-576f91f18c23","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40957cfc-9310-4d3e-82de-89b771ac8e99","name":"40957cfc-9310-4d3e-82de-89b771ac8e99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd65f936-1dae-4e5a-a681-a5d359010378","name":"cd65f936-1dae-4e5a-a681-a5d359010378","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39dc5d62-01e8-4a52-99be-1d12790fcbfc","name":"39dc5d62-01e8-4a52-99be-1d12790fcbfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"595ff173-4df7-4f84-aebc-576f91f18c23","name":"595ff173-4df7-4f84-aebc-576f91f18c23","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40957cfc-9310-4d3e-82de-89b771ac8e99","name":"40957cfc-9310-4d3e-82de-89b771ac8e99","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd65f936-1dae-4e5a-a681-a5d359010378","name":"cd65f936-1dae-4e5a-a681-a5d359010378","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39dc5d62-01e8-4a52-99be-1d12790fcbfc","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41685129-d244-497a-a3e8-0e14686d6982","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"595ff173-4df7-4f84-aebc-576f91f18c23","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cdca2c2b-2c35-469c-8ef2-2c9abf1ee822","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40957cfc-9310-4d3e-82de-89b771ac8e99","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b4fb4474-fd47-425f-9aa4-3f8a7dc7647b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd65f936-1dae-4e5a-a681-a5d359010378","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd004756-0650-4537-8065-75fdb6c773e5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39dc5d62-01e8-4a52-99be-1d12790fcbfc","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41685129-d244-497a-a3e8-0e14686d6982","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"595ff173-4df7-4f84-aebc-576f91f18c23","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cdca2c2b-2c35-469c-8ef2-2c9abf1ee822","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40957cfc-9310-4d3e-82de-89b771ac8e99","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b4fb4474-fd47-425f-9aa4-3f8a7dc7647b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd65f936-1dae-4e5a-a681-a5d359010378","path":"sprites/spr_purity_seal/spr_purity_seal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd004756-0650-4537-8065-75fdb6c773e5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_rack/spr_rack.yy b/sprites/spr_rack/spr_rack.yy index 3f07d72ebc..a2ee56947e 100644 --- a/sprites/spr_rack/spr_rack.yy +++ b/sprites/spr_rack/spr_rack.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rack", "bboxMode":0, "bbox_bottom":55, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3d9b8260-d4b2-4400-8a8b-5bebedbc126c","name":"3d9b8260-d4b2-4400-8a8b-5bebedbc126c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4d6ddd0e-c313-489e-80ed-a098199fe1ec","name":"4d6ddd0e-c313-489e-80ed-a098199fe1ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"200951dc-976d-43f5-b63c-55247595c3c4","name":"200951dc-976d-43f5-b63c-55247595c3c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3d9b8260-d4b2-4400-8a8b-5bebedbc126c","name":"3d9b8260-d4b2-4400-8a8b-5bebedbc126c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4d6ddd0e-c313-489e-80ed-a098199fe1ec","name":"4d6ddd0e-c313-489e-80ed-a098199fe1ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"200951dc-976d-43f5-b63c-55247595c3c4","name":"200951dc-976d-43f5-b63c-55247595c3c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d9b8260-d4b2-4400-8a8b-5bebedbc126c","path":"sprites/spr_rack/spr_rack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4a18159c-4459-42a4-8c29-8f30e8382d64","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d6ddd0e-c313-489e-80ed-a098199fe1ec","path":"sprites/spr_rack/spr_rack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"db36723d-e503-4b00-b23e-b55a501c4a13","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"200951dc-976d-43f5-b63c-55247595c3c4","path":"sprites/spr_rack/spr_rack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2bb5956b-927a-43e4-a043-90eeca134dbe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3d9b8260-d4b2-4400-8a8b-5bebedbc126c","path":"sprites/spr_rack/spr_rack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4a18159c-4459-42a4-8c29-8f30e8382d64","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4d6ddd0e-c313-489e-80ed-a098199fe1ec","path":"sprites/spr_rack/spr_rack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"db36723d-e503-4b00-b23e-b55a501c4a13","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"200951dc-976d-43f5-b63c-55247595c3c4","path":"sprites/spr_rack/spr_rack.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2bb5956b-927a-43e4-a043-90eeca134dbe","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy b/sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy index bdb3d387c7..dc149d7efa 100644 --- a/sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy +++ b/sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rack_and_pinion", "bboxMode":0, "bbox_bottom":98, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"43e1b595-b1d7-42e5-8bd5-8f57ab87f474","name":"43e1b595-b1d7-42e5-8bd5-8f57ab87f474","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"77b808e9-cf80-4505-82f1-e7844a0e438e","name":"77b808e9-cf80-4505-82f1-e7844a0e438e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"43e1b595-b1d7-42e5-8bd5-8f57ab87f474","name":"43e1b595-b1d7-42e5-8bd5-8f57ab87f474","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"77b808e9-cf80-4505-82f1-e7844a0e438e","name":"77b808e9-cf80-4505-82f1-e7844a0e438e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"43e1b595-b1d7-42e5-8bd5-8f57ab87f474","path":"sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c4e1e22-99f3-45f0-bbc7-9ffbbcc84d94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"77b808e9-cf80-4505-82f1-e7844a0e438e","path":"sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4d8925e-44b2-47d5-821b-ce6c5b56c499","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"43e1b595-b1d7-42e5-8bd5-8f57ab87f474","path":"sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c4e1e22-99f3-45f0-bbc7-9ffbbcc84d94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"77b808e9-cf80-4505-82f1-e7844a0e438e","path":"sprites/spr_rack_and_pinion/spr_rack_and_pinion.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4d8925e-44b2-47d5-821b-ce6c5b56c499","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_raid/spr_raid.yy b/sprites/spr_raid/spr_raid.yy index f0e636ae43..d60da68ecf 100644 --- a/sprites/spr_raid/spr_raid.yy +++ b/sprites/spr_raid/spr_raid.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_raid", "bboxMode":0, "bbox_bottom":0, diff --git a/sprites/spr_railgun/spr_railgun.yy b/sprites/spr_railgun/spr_railgun.yy index dba93f0a9c..654ba1e2e0 100644 --- a/sprites/spr_railgun/spr_railgun.yy +++ b/sprites/spr_railgun/spr_railgun.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_railgun", "bboxMode":0, "bbox_bottom":2, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cde6279c-d0b6-4214-8413-c1d4d6c9206e","name":"cde6279c-d0b6-4214-8413-c1d4d6c9206e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cde6279c-d0b6-4214-8413-c1d4d6c9206e","name":"cde6279c-d0b6-4214-8413-c1d4d6c9206e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cde6279c-d0b6-4214-8413-c1d4d6c9206e","path":"sprites/spr_railgun/spr_railgun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3e8013e-d7cb-4e2f-99bf-b1d015a71030","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cde6279c-d0b6-4214-8413-c1d4d6c9206e","path":"sprites/spr_railgun/spr_railgun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3e8013e-d7cb-4e2f-99bf-b1d015a71030","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_rectangle/spr_rectangle.yy b/sprites/spr_rectangle/spr_rectangle.yy index 08bb52c75b..ba18df5be6 100644 --- a/sprites/spr_rectangle/spr_rectangle.yy +++ b/sprites/spr_rectangle/spr_rectangle.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rectangle", "bboxMode":0, "bbox_bottom":63, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5c14ef64-e89b-4d3e-84fb-ae15783d918e","name":"5c14ef64-e89b-4d3e-84fb-ae15783d918e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c14ef64-e89b-4d3e-84fb-ae15783d918e","name":"5c14ef64-e89b-4d3e-84fb-ae15783d918e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c14ef64-e89b-4d3e-84fb-ae15783d918e","path":"sprites/spr_rectangle/spr_rectangle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a5922e9-fdf9-46ba-9e50-4e975a5185b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c14ef64-e89b-4d3e-84fb-ae15783d918e","path":"sprites/spr_rectangle/spr_rectangle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a5922e9-fdf9-46ba-9e50-4e975a5185b0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_red_button/spr_red_button.yy b/sprites/spr_red_button/spr_red_button.yy index b8897ea438..f7eea4e5dd 100644 --- a/sprites/spr_red_button/spr_red_button.yy +++ b/sprites/spr_red_button/spr_red_button.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_red_button", "bboxMode":0, "bbox_bottom":14, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1d99ce01-9a03-434f-bbf5-eaf445c38567","name":"1d99ce01-9a03-434f-bbf5-eaf445c38567","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"42d4f096-7a12-431c-b52e-70dfab70905b","name":"42d4f096-7a12-431c-b52e-70dfab70905b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"31b41486-9b21-47ca-a6a5-44fa61f6b67b","name":"31b41486-9b21-47ca-a6a5-44fa61f6b67b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2c2dd157-8cfe-46da-bdb0-787eb12ad230","name":"2c2dd157-8cfe-46da-bdb0-787eb12ad230","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b40951a-6001-451b-9b42-d414988c9166","name":"2b40951a-6001-451b-9b42-d414988c9166","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d99ce01-9a03-434f-bbf5-eaf445c38567","name":"1d99ce01-9a03-434f-bbf5-eaf445c38567","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42d4f096-7a12-431c-b52e-70dfab70905b","name":"42d4f096-7a12-431c-b52e-70dfab70905b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31b41486-9b21-47ca-a6a5-44fa61f6b67b","name":"31b41486-9b21-47ca-a6a5-44fa61f6b67b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c2dd157-8cfe-46da-bdb0-787eb12ad230","name":"2c2dd157-8cfe-46da-bdb0-787eb12ad230","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b40951a-6001-451b-9b42-d414988c9166","name":"2b40951a-6001-451b-9b42-d414988c9166","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,21 +72,11 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d99ce01-9a03-434f-bbf5-eaf445c38567","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c65371fa-e5df-4e1a-aa5f-0d7a9c9d5caa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42d4f096-7a12-431c-b52e-70dfab70905b","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"977e278b-9d59-4a1e-bc3a-10e616a2eb1a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31b41486-9b21-47ca-a6a5-44fa61f6b67b","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cce11ad7-1ee4-42c4-8f05-d1a8b12225ee","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c2dd157-8cfe-46da-bdb0-787eb12ad230","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a19fad0-1940-464a-9ac4-65537e18eba6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b40951a-6001-451b-9b42-d414988c9166","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d65637f-4e2b-4d02-b19a-4160209998dc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d99ce01-9a03-434f-bbf5-eaf445c38567","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c65371fa-e5df-4e1a-aa5f-0d7a9c9d5caa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"42d4f096-7a12-431c-b52e-70dfab70905b","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"977e278b-9d59-4a1e-bc3a-10e616a2eb1a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31b41486-9b21-47ca-a6a5-44fa61f6b67b","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cce11ad7-1ee4-42c4-8f05-d1a8b12225ee","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c2dd157-8cfe-46da-bdb0-787eb12ad230","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a19fad0-1940-464a-9ac4-65537e18eba6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b40951a-6001-451b-9b42-d414988c9166","path":"sprites/spr_red_button/spr_red_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d65637f-4e2b-4d02-b19a-4160209998dc","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_red_scale_texture/e7618234-0c05-4d39-9e6c-67e62a6b87ac.png b/sprites/spr_red_scale_texture/e7618234-0c05-4d39-9e6c-67e62a6b87ac.png new file mode 100644 index 0000000000..229ed73bb8 Binary files /dev/null and b/sprites/spr_red_scale_texture/e7618234-0c05-4d39-9e6c-67e62a6b87ac.png differ diff --git a/sprites/spr_red_scale_texture/layers/e7618234-0c05-4d39-9e6c-67e62a6b87ac/d459e4d3-7468-4be8-8cd6-1f40b937e503.png b/sprites/spr_red_scale_texture/layers/e7618234-0c05-4d39-9e6c-67e62a6b87ac/d459e4d3-7468-4be8-8cd6-1f40b937e503.png new file mode 100644 index 0000000000..229ed73bb8 Binary files /dev/null and b/sprites/spr_red_scale_texture/layers/e7618234-0c05-4d39-9e6c-67e62a6b87ac/d459e4d3-7468-4be8-8cd6-1f40b937e503.png differ diff --git a/sprites/spr_red_scale_texture/spr_red_scale_texture.yy b/sprites/spr_red_scale_texture/spr_red_scale_texture.yy new file mode 100644 index 0000000000..1b42ac313b --- /dev/null +++ b/sprites/spr_red_scale_texture/spr_red_scale_texture.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_red_scale_texture", + "bboxMode":0, + "bbox_bottom":179, + "bbox_left":0, + "bbox_right":179, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":true, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"e7618234-0c05-4d39-9e6c-67e62a6b87ac","name":"e7618234-0c05-4d39-9e6c-67e62a6b87ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":180, + "HTile":true, + "layers":[ + {"$GMImageLayer":"","%Name":"d459e4d3-7468-4be8-8cd6-1f40b937e503","blendMode":0,"displayName":"default","isLocked":false,"name":"d459e4d3-7468-4be8-8cd6-1f40b937e503","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_red_scale_texture", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":0, + "parent":{ + "name":"textures", + "path":"folders/Sprites/Marine Viewer/textures.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_red_scale_texture", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_red_scale_texture", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":180.0, + "seqWidth":180.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7618234-0c05-4d39-9e6c-67e62a6b87ac","path":"sprites/spr_red_scale_texture/spr_red_scale_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9d4a22ab-d631-47e7-955b-d19d2a69efb5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":true, + "width":180, +} \ No newline at end of file diff --git a/sprites/spr_requisition/spr_requisition.yy b/sprites/spr_requisition/spr_requisition.yy index c0dc9d03ca..314359ae77 100644 --- a/sprites/spr_requisition/spr_requisition.yy +++ b/sprites/spr_requisition/spr_requisition.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_requisition", "bboxMode":0, "bbox_bottom":12, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5ba3628f-40c8-428a-bce0-7e95d2db8ec4","name":"5ba3628f-40c8-428a-bce0-7e95d2db8ec4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5ba3628f-40c8-428a-bce0-7e95d2db8ec4","name":"5ba3628f-40c8-428a-bce0-7e95d2db8ec4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5ba3628f-40c8-428a-bce0-7e95d2db8ec4","path":"sprites/spr_requisition/spr_requisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f22ebed-4e20-47f6-8189-3f42d1a5f4d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5ba3628f-40c8-428a-bce0-7e95d2db8ec4","path":"sprites/spr_requisition/spr_requisition.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f22ebed-4e20-47f6-8189-3f42d1a5f4d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_research_bar/spr_research_bar.yy b/sprites/spr_research_bar/spr_research_bar.yy index 0916d96065..63bfdf4f1d 100644 --- a/sprites/spr_research_bar/spr_research_bar.yy +++ b/sprites/spr_research_bar/spr_research_bar.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_research_bar", "bboxMode":0, "bbox_bottom":361, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cd763fd7-8004-4d62-bc1a-be3268cef684","name":"cd763fd7-8004-4d62-bc1a-be3268cef684","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"63f140c0-9df0-45cf-bc48-c71f52cccbf1","name":"63f140c0-9df0-45cf-bc48-c71f52cccbf1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5b48025-2525-46d9-8c75-c549648ded91","name":"d5b48025-2525-46d9-8c75-c549648ded91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd763fd7-8004-4d62-bc1a-be3268cef684","name":"cd763fd7-8004-4d62-bc1a-be3268cef684","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"63f140c0-9df0-45cf-bc48-c71f52cccbf1","name":"63f140c0-9df0-45cf-bc48-c71f52cccbf1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5b48025-2525-46d9-8c75-c549648ded91","name":"d5b48025-2525-46d9-8c75-c549648ded91","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -65,6 +65,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":400.0, + "seqWidth":200.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy b/sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy index 636ae54657..d8ec7e0dc2 100644 --- a/sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy +++ b/sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rg_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2c0915b1-4f26-423a-a956-3a0630133ae1","name":"2c0915b1-4f26-423a-a956-3a0630133ae1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72defa52-0aba-434c-b51c-01507cb45ea6","name":"72defa52-0aba-434c-b51c-01507cb45ea6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2c0915b1-4f26-423a-a956-3a0630133ae1","name":"2c0915b1-4f26-423a-a956-3a0630133ae1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72defa52-0aba-434c-b51c-01507cb45ea6","name":"72defa52-0aba-434c-b51c-01507cb45ea6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c0915b1-4f26-423a-a956-3a0630133ae1","path":"sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9f67310a-5e8a-43c9-8389-ba3149221012","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72defa52-0aba-434c-b51c-01507cb45ea6","path":"sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6fcdc1b7-dc3c-43c9-8b6a-16e91f98fa20","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2c0915b1-4f26-423a-a956-3a0630133ae1","path":"sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f67310a-5e8a-43c9-8389-ba3149221012","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72defa52-0aba-434c-b51c-01507cb45ea6","path":"sprites/spr_rg_mk5_helm/spr_rg_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6fcdc1b7-dc3c-43c9-8b6a-16e91f98fa20","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy b/sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy index 25f60bf307..10e5e6ca30 100644 --- a/sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy +++ b/sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rg_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4ea300aa-38d8-4aee-99d8-c285deb673ee","name":"4ea300aa-38d8-4aee-99d8-c285deb673ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d894a82d-5ebc-4d95-85c3-77c1ea5a803e","name":"d894a82d-5ebc-4d95-85c3-77c1ea5a803e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4ea300aa-38d8-4aee-99d8-c285deb673ee","name":"4ea300aa-38d8-4aee-99d8-c285deb673ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d894a82d-5ebc-4d95-85c3-77c1ea5a803e","name":"d894a82d-5ebc-4d95-85c3-77c1ea5a803e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ea300aa-38d8-4aee-99d8-c285deb673ee","path":"sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f1677e0-0f38-4f52-a627-47e4289d2362","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d894a82d-5ebc-4d95-85c3-77c1ea5a803e","path":"sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9b689ef9-d60a-4607-8763-a4787092f4c9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ea300aa-38d8-4aee-99d8-c285deb673ee","path":"sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f1677e0-0f38-4f52-a627-47e4289d2362","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d894a82d-5ebc-4d95-85c3-77c1ea5a803e","path":"sprites/spr_rg_mk6_helm/spr_rg_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9b689ef9-d60a-4607-8763-a4787092f4c9","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy b/sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy index 20583297a0..7f829e9dd6 100644 --- a/sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy +++ b/sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rg_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d180ba81-7586-41b6-a6d4-50590e5bf476","name":"d180ba81-7586-41b6-a6d4-50590e5bf476","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"035dc48e-d054-4138-99c1-3c0ba9933028","name":"035dc48e-d054-4138-99c1-3c0ba9933028","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d180ba81-7586-41b6-a6d4-50590e5bf476","name":"d180ba81-7586-41b6-a6d4-50590e5bf476","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"035dc48e-d054-4138-99c1-3c0ba9933028","name":"035dc48e-d054-4138-99c1-3c0ba9933028","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d180ba81-7586-41b6-a6d4-50590e5bf476","path":"sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6daeef45-8813-4e6d-9ef8-7612a88be84c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"035dc48e-d054-4138-99c1-3c0ba9933028","path":"sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88334651-7f26-4851-be94-2d5a48c4c788","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d180ba81-7586-41b6-a6d4-50590e5bf476","path":"sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6daeef45-8813-4e6d-9ef8-7612a88be84c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"035dc48e-d054-4138-99c1-3c0ba9933028","path":"sprites/spr_rg_mk7_helm/spr_rg_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88334651-7f26-4851-be94-2d5a48c4c788","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy b/sprites/spr_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy index b33eb95a2f..0d5a461ced 100644 --- a/sprites/spr_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy +++ b/sprites/spr_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_right_pauldron_chainmail", "bboxMode":0, "bbox_bottom":101, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -34,13 +34,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -90,9 +84,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"476ba96b-7680-45aa-b001-fa8c00b30b9b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_right_pauldron_chainmail/spr_right_pauldron_chainmail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"476ba96b-7680-45aa-b001-fa8c00b30b9b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy b/sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy index 12ded5c93d..e9c5e959a5 100644 --- a/sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy +++ b/sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_right_pauldron_fur_hanging", "bboxMode":0, "bbox_bottom":117, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"52d5981c-c162-45da-84db-60501fe9d9f1","name":"52d5981c-c162-45da-84db-60501fe9d9f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"460206a5-318f-4048-bdf9-249e96846430","name":"460206a5-318f-4048-bdf9-249e96846430","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"52d5981c-c162-45da-84db-60501fe9d9f1","name":"52d5981c-c162-45da-84db-60501fe9d9f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"460206a5-318f-4048-bdf9-249e96846430","name":"460206a5-318f-4048-bdf9-249e96846430","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -38,13 +38,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":9, @@ -94,18 +88,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33d2e335-5dc5-4789-8de3-f0a1d7cd31eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a12ed751-04fc-4209-ac99-48bcdbbc6165","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d5981c-c162-45da-84db-60501fe9d9f1","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e69e0ac3-f154-4767-862b-5fa127764071","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"460206a5-318f-4048-bdf9-249e96846430","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9fa8ac9e-2744-463d-8742-e306d24015c5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33d2e335-5dc5-4789-8de3-f0a1d7cd31eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"79bd7af2-b597-4d04-9558-b8bc390d83d6","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a12ed751-04fc-4209-ac99-48bcdbbc6165","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"52d5981c-c162-45da-84db-60501fe9d9f1","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e69e0ac3-f154-4767-862b-5fa127764071","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"460206a5-318f-4048-bdf9-249e96846430","path":"sprites/spr_right_pauldron_fur_hanging/spr_right_pauldron_fur_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9fa8ac9e-2744-463d-8742-e306d24015c5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_right_shin_spikes/spr_right_shin_spikes.yy b/sprites/spr_right_shin_spikes/spr_right_shin_spikes.yy index f7253930c9..a9ed516189 100644 --- a/sprites/spr_right_shin_spikes/spr_right_shin_spikes.yy +++ b/sprites/spr_right_shin_spikes/spr_right_shin_spikes.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_right_shin_spikes", "bboxMode":0, "bbox_bottom":199, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_right_shin_spikes/spr_right_shin_spikes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a6d4dd-18ab-43ec-ad94-6adb0940fd20","path":"sprites/spr_right_shin_spikes/spr_right_shin_spikes.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4cca9923-5ca1-4f6c-8e91-f7ec56fa92a6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_rock_bg/spr_rock_bg.yy b/sprites/spr_rock_bg/spr_rock_bg.yy index 321f668fc0..a9eed43a6c 100644 --- a/sprites/spr_rock_bg/spr_rock_bg.yy +++ b/sprites/spr_rock_bg/spr_rock_bg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rock_bg", "bboxMode":0, "bbox_bottom":899, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5bb8bcb3-8511-4a40-b275-1455a28fda12","name":"5bb8bcb3-8511-4a40-b275-1455a28fda12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5bb8bcb3-8511-4a40-b275-1455a28fda12","name":"5bb8bcb3-8511-4a40-b275-1455a28fda12","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5bb8bcb3-8511-4a40-b275-1455a28fda12","path":"sprites/spr_rock_bg/spr_rock_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2c8c984-e1ff-4038-9274-cae4d4aba40d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5bb8bcb3-8511-4a40-b275-1455a28fda12","path":"sprites/spr_rock_bg/spr_rock_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2c8c984-e1ff-4038-9274-cae4d4aba40d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_rocket/spr_rocket.yy b/sprites/spr_rocket/spr_rocket.yy index e867945c85..dd6b45a0d3 100644 --- a/sprites/spr_rocket/spr_rocket.yy +++ b/sprites/spr_rocket/spr_rocket.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rocket", "bboxMode":0, "bbox_bottom":2, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fbdab96e-f60e-4aa7-a2c1-016c4609918a","name":"fbdab96e-f60e-4aa7-a2c1-016c4609918a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"31cd5292-4c56-490a-ac3b-bd6e71071eda","name":"31cd5292-4c56-490a-ac3b-bd6e71071eda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fbdab96e-f60e-4aa7-a2c1-016c4609918a","name":"fbdab96e-f60e-4aa7-a2c1-016c4609918a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31cd5292-4c56-490a-ac3b-bd6e71071eda","name":"31cd5292-4c56-490a-ac3b-bd6e71071eda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbdab96e-f60e-4aa7-a2c1-016c4609918a","path":"sprites/spr_rocket/spr_rocket.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a1f991b9-5dd3-499c-bcf3-a5e1a9a9dd46","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31cd5292-4c56-490a-ac3b-bd6e71071eda","path":"sprites/spr_rocket/spr_rocket.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"72f52d58-18c4-4aee-8d08-559c984219a0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbdab96e-f60e-4aa7-a2c1-016c4609918a","path":"sprites/spr_rocket/spr_rocket.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a1f991b9-5dd3-499c-bcf3-a5e1a9a9dd46","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"31cd5292-4c56-490a-ac3b-bd6e71071eda","path":"sprites/spr_rocket/spr_rocket.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"72f52d58-18c4-4aee-8d08-559c984219a0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_rocket_ork/spr_rocket_ork.yy b/sprites/spr_rocket_ork/spr_rocket_ork.yy index 7c2df176de..f3c4c9d32f 100644 --- a/sprites/spr_rocket_ork/spr_rocket_ork.yy +++ b/sprites/spr_rocket_ork/spr_rocket_ork.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rocket_ork", "bboxMode":0, "bbox_bottom":3, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b424104a-105d-41c8-bc78-ffc41dcb6a5b","name":"b424104a-105d-41c8-bc78-ffc41dcb6a5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b424104a-105d-41c8-bc78-ffc41dcb6a5b","name":"b424104a-105d-41c8-bc78-ffc41dcb6a5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b424104a-105d-41c8-bc78-ffc41dcb6a5b","path":"sprites/spr_rocket_ork/spr_rocket_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7edaff64-0a68-4835-9f47-726e08bf1f2c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b424104a-105d-41c8-bc78-ffc41dcb6a5b","path":"sprites/spr_rocket_ork/spr_rocket_ork.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7edaff64-0a68-4835-9f47-726e08bf1f2c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_rocket_whirl/spr_rocket_whirl.yy b/sprites/spr_rocket_whirl/spr_rocket_whirl.yy index 830a098fc1..cc163cea5c 100644 --- a/sprites/spr_rocket_whirl/spr_rocket_whirl.yy +++ b/sprites/spr_rocket_whirl/spr_rocket_whirl.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_rocket_whirl", "bboxMode":0, "bbox_bottom":3, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"46a69d36-f9b9-42e5-b49b-29e46f310d4d","name":"46a69d36-f9b9-42e5-b49b-29e46f310d4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"46a69d36-f9b9-42e5-b49b-29e46f310d4d","name":"46a69d36-f9b9-42e5-b49b-29e46f310d4d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46a69d36-f9b9-42e5-b49b-29e46f310d4d","path":"sprites/spr_rocket_whirl/spr_rocket_whirl.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dfd43af1-35a8-43b8-98e6-2b1a7a9f9aa4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"46a69d36-f9b9-42e5-b49b-29e46f310d4d","path":"sprites/spr_rocket_whirl/spr_rocket_whirl.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dfd43af1-35a8-43b8-98e6-2b1a7a9f9aa4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_roman_centurian_crest/08b44966-5437-4fcd-8103-4f567e0a2b6d.png b/sprites/spr_roman_centurian_crest/08b44966-5437-4fcd-8103-4f567e0a2b6d.png new file mode 100644 index 0000000000..4e14f44256 Binary files /dev/null and b/sprites/spr_roman_centurian_crest/08b44966-5437-4fcd-8103-4f567e0a2b6d.png differ diff --git a/sprites/spr_roman_centurian_crest/0ceb9280-e7f4-46b5-9428-9b85c4225bcb.png b/sprites/spr_roman_centurian_crest/0ceb9280-e7f4-46b5-9428-9b85c4225bcb.png new file mode 100644 index 0000000000..3cd87a6951 Binary files /dev/null and b/sprites/spr_roman_centurian_crest/0ceb9280-e7f4-46b5-9428-9b85c4225bcb.png differ diff --git a/sprites/spr_roman_centurian_crest/4222ce55-7f54-4a66-95c9-ff9eee82fe09.png b/sprites/spr_roman_centurian_crest/4222ce55-7f54-4a66-95c9-ff9eee82fe09.png new file mode 100644 index 0000000000..980ab02b1c Binary files /dev/null and b/sprites/spr_roman_centurian_crest/4222ce55-7f54-4a66-95c9-ff9eee82fe09.png differ diff --git a/sprites/spr_roman_centurian_crest/93ba81df-88f2-4d08-9f82-8e78097802e9.png b/sprites/spr_roman_centurian_crest/93ba81df-88f2-4d08-9f82-8e78097802e9.png deleted file mode 100644 index 0943435a5f..0000000000 Binary files a/sprites/spr_roman_centurian_crest/93ba81df-88f2-4d08-9f82-8e78097802e9.png and /dev/null differ diff --git a/sprites/spr_roman_centurian_crest/dd649fd8-7e35-4852-a36d-a78f4f914d36.png b/sprites/spr_roman_centurian_crest/dd649fd8-7e35-4852-a36d-a78f4f914d36.png deleted file mode 100644 index 1457703b17..0000000000 Binary files a/sprites/spr_roman_centurian_crest/dd649fd8-7e35-4852-a36d-a78f4f914d36.png and /dev/null differ diff --git a/sprites/spr_roman_centurian_crest/ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e.png b/sprites/spr_roman_centurian_crest/ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e.png deleted file mode 100644 index 306f9d6d46..0000000000 Binary files a/sprites/spr_roman_centurian_crest/ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e.png and /dev/null differ diff --git a/sprites/spr_roman_centurian_crest/layers/08b44966-5437-4fcd-8103-4f567e0a2b6d/64b58388-e289-40ea-a052-9e4c81b52b82.png b/sprites/spr_roman_centurian_crest/layers/08b44966-5437-4fcd-8103-4f567e0a2b6d/64b58388-e289-40ea-a052-9e4c81b52b82.png new file mode 100644 index 0000000000..4e14f44256 Binary files /dev/null and b/sprites/spr_roman_centurian_crest/layers/08b44966-5437-4fcd-8103-4f567e0a2b6d/64b58388-e289-40ea-a052-9e4c81b52b82.png differ diff --git a/sprites/spr_roman_centurian_crest/layers/0ceb9280-e7f4-46b5-9428-9b85c4225bcb/64b58388-e289-40ea-a052-9e4c81b52b82.png b/sprites/spr_roman_centurian_crest/layers/0ceb9280-e7f4-46b5-9428-9b85c4225bcb/64b58388-e289-40ea-a052-9e4c81b52b82.png new file mode 100644 index 0000000000..3cd87a6951 Binary files /dev/null and b/sprites/spr_roman_centurian_crest/layers/0ceb9280-e7f4-46b5-9428-9b85c4225bcb/64b58388-e289-40ea-a052-9e4c81b52b82.png differ diff --git a/sprites/spr_roman_centurian_crest/layers/4222ce55-7f54-4a66-95c9-ff9eee82fe09/64b58388-e289-40ea-a052-9e4c81b52b82.png b/sprites/spr_roman_centurian_crest/layers/4222ce55-7f54-4a66-95c9-ff9eee82fe09/64b58388-e289-40ea-a052-9e4c81b52b82.png new file mode 100644 index 0000000000..4e3dbd9a3f Binary files /dev/null and b/sprites/spr_roman_centurian_crest/layers/4222ce55-7f54-4a66-95c9-ff9eee82fe09/64b58388-e289-40ea-a052-9e4c81b52b82.png differ diff --git a/sprites/spr_roman_centurian_crest/layers/93ba81df-88f2-4d08-9f82-8e78097802e9/64b58388-e289-40ea-a052-9e4c81b52b82.png b/sprites/spr_roman_centurian_crest/layers/93ba81df-88f2-4d08-9f82-8e78097802e9/64b58388-e289-40ea-a052-9e4c81b52b82.png deleted file mode 100644 index 0943435a5f..0000000000 Binary files a/sprites/spr_roman_centurian_crest/layers/93ba81df-88f2-4d08-9f82-8e78097802e9/64b58388-e289-40ea-a052-9e4c81b52b82.png and /dev/null differ diff --git a/sprites/spr_roman_centurian_crest/layers/dd649fd8-7e35-4852-a36d-a78f4f914d36/64b58388-e289-40ea-a052-9e4c81b52b82.png b/sprites/spr_roman_centurian_crest/layers/dd649fd8-7e35-4852-a36d-a78f4f914d36/64b58388-e289-40ea-a052-9e4c81b52b82.png deleted file mode 100644 index 1457703b17..0000000000 Binary files a/sprites/spr_roman_centurian_crest/layers/dd649fd8-7e35-4852-a36d-a78f4f914d36/64b58388-e289-40ea-a052-9e4c81b52b82.png and /dev/null differ diff --git a/sprites/spr_roman_centurian_crest/layers/ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e/64b58388-e289-40ea-a052-9e4c81b52b82.png b/sprites/spr_roman_centurian_crest/layers/ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e/64b58388-e289-40ea-a052-9e4c81b52b82.png deleted file mode 100644 index 306f9d6d46..0000000000 Binary files a/sprites/spr_roman_centurian_crest/layers/ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e/64b58388-e289-40ea-a052-9e4c81b52b82.png and /dev/null differ diff --git a/sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy b/sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy index eee2f59f99..6c8eee63e2 100644 --- a/sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy +++ b/sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy @@ -1,10 +1,10 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_roman_centurian_crest", "bboxMode":0, "bbox_bottom":87, "bbox_left":18, - "bbox_right":105, + "bbox_right":118, "bbox_top":14, "collisionKind":1, "collisionTolerance":0, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e","name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"93ba81df-88f2-4d08-9f82-8e78097802e9","name":"93ba81df-88f2-4d08-9f82-8e78097802e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4222ce55-7f54-4a66-95c9-ff9eee82fe09","name":"4222ce55-7f54-4a66-95c9-ff9eee82fe09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0ceb9280-e7f4-46b5-9428-9b85c4225bcb","name":"0ceb9280-e7f4-46b5-9428-9b85c4225bcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"08b44966-5437-4fcd-8103-4f567e0a2b6d","name":"08b44966-5437-4fcd-8103-4f567e0a2b6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -65,26 +65,28 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"508f7cdc-6556-4fd2-ae19-caa00fdda7cd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4222ce55-7f54-4a66-95c9-ff9eee82fe09","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a284da04-ccd9-4298-9dca-3872d20dcfe4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecad98d1-bb1f-4cb3-b4f0-6d3bdd38418e","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"081e45b1-f437-4ec9-bca2-4b4d5bd6000f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ceb9280-e7f4-46b5-9428-9b85c4225bcb","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4c8bdcf6-0c0f-486e-b515-939638b9cbec","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93ba81df-88f2-4d08-9f82-8e78097802e9","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2c11e64b-0ad4-4a34-a388-29e5e02054b8","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"08b44966-5437-4fcd-8103-4f567e0a2b6d","path":"sprites/spr_roman_centurian_crest/spr_roman_centurian_crest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ff0385ab-3109-4154-8852-72c12e65f560","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, "volume":1.0, "xorigin":0, - "yorigin":40, + "yorigin":42, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_roman_centurian_crest_shadows/73fb2e54-bca2-4a05-a728-324abcb8c7b3.png b/sprites/spr_roman_centurian_crest_shadows/73fb2e54-bca2-4a05-a728-324abcb8c7b3.png new file mode 100644 index 0000000000..2d003d7a96 Binary files /dev/null and b/sprites/spr_roman_centurian_crest_shadows/73fb2e54-bca2-4a05-a728-324abcb8c7b3.png differ diff --git a/sprites/spr_roman_centurian_crest_shadows/a0b1ca09-62e6-4c9f-8416-e3bf08dc95a4.png b/sprites/spr_roman_centurian_crest_shadows/a0b1ca09-62e6-4c9f-8416-e3bf08dc95a4.png new file mode 100644 index 0000000000..e6a76029d2 Binary files /dev/null and b/sprites/spr_roman_centurian_crest_shadows/a0b1ca09-62e6-4c9f-8416-e3bf08dc95a4.png differ diff --git a/sprites/spr_roman_centurian_crest_shadows/dd649fd8-7e35-4852-a36d-a78f4f914d36.png b/sprites/spr_roman_centurian_crest_shadows/dd649fd8-7e35-4852-a36d-a78f4f914d36.png new file mode 100644 index 0000000000..48501a6f6b Binary files /dev/null and b/sprites/spr_roman_centurian_crest_shadows/dd649fd8-7e35-4852-a36d-a78f4f914d36.png differ diff --git a/sprites/spr_roman_centurian_crest_shadows/layers/73fb2e54-bca2-4a05-a728-324abcb8c7b3/7fceefbe-933c-4ffb-8ec7-96347aed443d.png b/sprites/spr_roman_centurian_crest_shadows/layers/73fb2e54-bca2-4a05-a728-324abcb8c7b3/7fceefbe-933c-4ffb-8ec7-96347aed443d.png new file mode 100644 index 0000000000..2938158f86 Binary files /dev/null and b/sprites/spr_roman_centurian_crest_shadows/layers/73fb2e54-bca2-4a05-a728-324abcb8c7b3/7fceefbe-933c-4ffb-8ec7-96347aed443d.png differ diff --git a/sprites/spr_roman_centurian_crest_shadows/layers/73fb2e54-bca2-4a05-a728-324abcb8c7b3/a7cbdfdc-637b-437a-a308-87fc8d052128.png b/sprites/spr_roman_centurian_crest_shadows/layers/73fb2e54-bca2-4a05-a728-324abcb8c7b3/a7cbdfdc-637b-437a-a308-87fc8d052128.png new file mode 100644 index 0000000000..2d003d7a96 Binary files /dev/null and b/sprites/spr_roman_centurian_crest_shadows/layers/73fb2e54-bca2-4a05-a728-324abcb8c7b3/a7cbdfdc-637b-437a-a308-87fc8d052128.png differ diff --git a/sprites/spr_roman_centurian_crest_shadows/layers/a0b1ca09-62e6-4c9f-8416-e3bf08dc95a4/7fceefbe-933c-4ffb-8ec7-96347aed443d.png b/sprites/spr_roman_centurian_crest_shadows/layers/a0b1ca09-62e6-4c9f-8416-e3bf08dc95a4/7fceefbe-933c-4ffb-8ec7-96347aed443d.png new file mode 100644 index 0000000000..e6a76029d2 Binary files /dev/null and b/sprites/spr_roman_centurian_crest_shadows/layers/a0b1ca09-62e6-4c9f-8416-e3bf08dc95a4/7fceefbe-933c-4ffb-8ec7-96347aed443d.png differ diff --git a/sprites/spr_roman_centurian_crest_shadows/layers/dd649fd8-7e35-4852-a36d-a78f4f914d36/7fceefbe-933c-4ffb-8ec7-96347aed443d.png b/sprites/spr_roman_centurian_crest_shadows/layers/dd649fd8-7e35-4852-a36d-a78f4f914d36/7fceefbe-933c-4ffb-8ec7-96347aed443d.png new file mode 100644 index 0000000000..48501a6f6b Binary files /dev/null and b/sprites/spr_roman_centurian_crest_shadows/layers/dd649fd8-7e35-4852-a36d-a78f4f914d36/7fceefbe-933c-4ffb-8ec7-96347aed443d.png differ diff --git a/sprites/spr_roman_centurian_crest_shadows/layers/dd649fd8-7e35-4852-a36d-a78f4f914d36/a7cbdfdc-637b-437a-a308-87fc8d052128.png b/sprites/spr_roman_centurian_crest_shadows/layers/dd649fd8-7e35-4852-a36d-a78f4f914d36/a7cbdfdc-637b-437a-a308-87fc8d052128.png new file mode 100644 index 0000000000..cb1c1317eb Binary files /dev/null and b/sprites/spr_roman_centurian_crest_shadows/layers/dd649fd8-7e35-4852-a36d-a78f4f914d36/a7cbdfdc-637b-437a-a308-87fc8d052128.png differ diff --git a/sprites/spr_roman_centurian_crest_shadows/spr_roman_centurian_crest_shadows.yy b/sprites/spr_roman_centurian_crest_shadows/spr_roman_centurian_crest_shadows.yy new file mode 100644 index 0000000000..221639d0f6 --- /dev/null +++ b/sprites/spr_roman_centurian_crest_shadows/spr_roman_centurian_crest_shadows.yy @@ -0,0 +1,100 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_roman_centurian_crest_shadows", + "bboxMode":0, + "bbox_bottom":87, + "bbox_left":18, + "bbox_right":118, + "bbox_top":14, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"73fb2e54-bca2-4a05-a728-324abcb8c7b3","name":"73fb2e54-bca2-4a05-a728-324abcb8c7b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a0b1ca09-62e6-4c9f-8416-e3bf08dc95a4","name":"a0b1ca09-62e6-4c9f-8416-e3bf08dc95a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"7fceefbe-933c-4ffb-8ec7-96347aed443d","blendMode":0,"displayName":"default","isLocked":false,"name":"7fceefbe-933c-4ffb-8ec7-96347aed443d","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_roman_centurian_crest_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"roman_theme", + "path":"folders/Sprites/Marine Viewer/body_types/specialist/roman_theme.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_roman_centurian_crest_shadows", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":3.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_roman_centurian_crest_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73fb2e54-bca2-4a05-a728-324abcb8c7b3","path":"sprites/spr_roman_centurian_crest_shadows/spr_roman_centurian_crest_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"001696c8-96cc-41d7-bab5-4b7c7b9064aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd649fd8-7e35-4852-a36d-a78f4f914d36","path":"sprites/spr_roman_centurian_crest_shadows/spr_roman_centurian_crest_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"508f7cdc-6556-4fd2-ae19-caa00fdda7cd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a0b1ca09-62e6-4c9f-8416-e3bf08dc95a4","path":"sprites/spr_roman_centurian_crest_shadows/spr_roman_centurian_crest_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9c501913-e408-4d53-892f-f15ccb3b6246","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":42, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_roman_cloak/spr_roman_cloak.yy b/sprites/spr_roman_cloak/spr_roman_cloak.yy index 67d20f28ba..68bd59f315 100644 --- a/sprites/spr_roman_cloak/spr_roman_cloak.yy +++ b/sprites/spr_roman_cloak/spr_roman_cloak.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_roman_cloak", "bboxMode":0, "bbox_bottom":198, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_roman_tabbard/spr_roman_tabbard.yy b/sprites/spr_roman_tabbard/spr_roman_tabbard.yy index d9a1bdc2ad..41e56a2f11 100644 --- a/sprites/spr_roman_tabbard/spr_roman_tabbard.yy +++ b/sprites/spr_roman_tabbard/spr_roman_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_roman_tabbard", "bboxMode":0, "bbox_bottom":167, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"438faf08-020c-4bdf-a878-8a0b45400e3a","name":"438faf08-020c-4bdf-a878-8a0b45400e3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b829e070-a074-46e9-8d94-6507222cc796","name":"b829e070-a074-46e9-8d94-6507222cc796","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"438faf08-020c-4bdf-a878-8a0b45400e3a","name":"438faf08-020c-4bdf-a878-8a0b45400e3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b829e070-a074-46e9-8d94-6507222cc796","name":"b829e070-a074-46e9-8d94-6507222cc796","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,18 +73,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"438faf08-020c-4bdf-a878-8a0b45400e3a","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4e16b319-3f1e-426c-b41e-a1334b774b27","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc2b5276-f541-4905-907d-6ff1d1db896d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b829e070-a074-46e9-8d94-6507222cc796","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"236d0bfc-7eb0-434a-936b-b17f5ed52954","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"438faf08-020c-4bdf-a878-8a0b45400e3a","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4e16b319-3f1e-426c-b41e-a1334b774b27","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ecc8abbc-4261-4c83-9cc1-81689ab505bf","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc2b5276-f541-4905-907d-6ff1d1db896d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b829e070-a074-46e9-8d94-6507222cc796","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"236d0bfc-7eb0-434a-936b-b17f5ed52954","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4a11296-f2eb-4f90-9581-bbca8ab08d78","path":"sprites/spr_roman_tabbard/spr_roman_tabbard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d0ab5f8-6b38-401e-ab12-57064b78101a","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_round/spr_round.yy b/sprites/spr_round/spr_round.yy index 49fdb14d54..6764226735 100644 --- a/sprites/spr_round/spr_round.yy +++ b/sprites/spr_round/spr_round.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_round", "bboxMode":0, "bbox_bottom":4, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8a689993-189b-4e77-b0e3-ce46b98da50f","name":"8a689993-189b-4e77-b0e3-ce46b98da50f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a689993-189b-4e77-b0e3-ce46b98da50f","name":"8a689993-189b-4e77-b0e3-ce46b98da50f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a689993-189b-4e77-b0e3-ce46b98da50f","path":"sprites/spr_round/spr_round.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3404087c-38fe-4166-a339-626d9a1dbf54","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a689993-189b-4e77-b0e3-ce46b98da50f","path":"sprites/spr_round/spr_round.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3404087c-38fe-4166-a339-626d9a1dbf54","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_runes_hanging/spr_runes_hanging.yy b/sprites/spr_runes_hanging/spr_runes_hanging.yy index 39a9060978..fa7278b636 100644 --- a/sprites/spr_runes_hanging/spr_runes_hanging.yy +++ b/sprites/spr_runes_hanging/spr_runes_hanging.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_runes_hanging", "bboxMode":0, "bbox_bottom":33, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a6549d5-f97d-40c9-99e2-44d6dfa275a9","name":"3a6549d5-f97d-40c9-99e2-44d6dfa275a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9ca26a83-de22-44ea-b6e3-881cdf1d011e","name":"9ca26a83-de22-44ea-b6e3-881cdf1d011e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a6549d5-f97d-40c9-99e2-44d6dfa275a9","name":"3a6549d5-f97d-40c9-99e2-44d6dfa275a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9ca26a83-de22-44ea-b6e3-881cdf1d011e","name":"9ca26a83-de22-44ea-b6e3-881cdf1d011e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_runes_hanging/spr_runes_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8063ca68-f497-45e7-a395-cefa25b8634d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a6549d5-f97d-40c9-99e2-44d6dfa275a9","path":"sprites/spr_runes_hanging/spr_runes_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0030ce9b-8b1d-4287-8146-0ee5744db08f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ca26a83-de22-44ea-b6e3-881cdf1d011e","path":"sprites/spr_runes_hanging/spr_runes_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b42a06ce-b79c-4c9f-91f7-7f2f50d3f451","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_runes_hanging/spr_runes_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8063ca68-f497-45e7-a395-cefa25b8634d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a6549d5-f97d-40c9-99e2-44d6dfa275a9","path":"sprites/spr_runes_hanging/spr_runes_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0030ce9b-8b1d-4287-8146-0ee5744db08f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9ca26a83-de22-44ea-b6e3-881cdf1d011e","path":"sprites/spr_runes_hanging/spr_runes_hanging.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b42a06ce-b79c-4c9f-91f7-7f2f50d3f451","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_runi/spr_runi.yy b/sprites/spr_runi/spr_runi.yy index 3d0e4f22d6..fa007b6c48 100644 --- a/sprites/spr_runi/spr_runi.yy +++ b/sprites/spr_runi/spr_runi.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_runi", "bboxMode":0, "bbox_bottom":594, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e8353308-fb32-4fe2-ba12-699e1c9324fe","name":"e8353308-fb32-4fe2-ba12-699e1c9324fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8353308-fb32-4fe2-ba12-699e1c9324fe","name":"e8353308-fb32-4fe2-ba12-699e1c9324fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8353308-fb32-4fe2-ba12-699e1c9324fe","path":"sprites/spr_runi/spr_runi.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"12a9f26e-4b5b-4a77-94da-1a7dcb969626","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8353308-fb32-4fe2-ba12-699e1c9324fe","path":"sprites/spr_runi/spr_runi.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"12a9f26e-4b5b-4a77-94da-1a7dcb969626","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy b/sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy index 091d0159f2..3d51596537 100644 --- a/sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy +++ b/sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sal_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2f64d54a-0827-4814-aa34-420768d2e26f","name":"2f64d54a-0827-4814-aa34-420768d2e26f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eddeafd5-5003-4157-91a2-8d4836dd19da","name":"eddeafd5-5003-4157-91a2-8d4836dd19da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2f64d54a-0827-4814-aa34-420768d2e26f","name":"2f64d54a-0827-4814-aa34-420768d2e26f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eddeafd5-5003-4157-91a2-8d4836dd19da","name":"eddeafd5-5003-4157-91a2-8d4836dd19da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f64d54a-0827-4814-aa34-420768d2e26f","path":"sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11e32477-62a6-4221-aed9-7427cfef7d74","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eddeafd5-5003-4157-91a2-8d4836dd19da","path":"sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2f67fbbb-e174-495e-8ddd-953b11ba345d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2f64d54a-0827-4814-aa34-420768d2e26f","path":"sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11e32477-62a6-4221-aed9-7427cfef7d74","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eddeafd5-5003-4157-91a2-8d4836dd19da","path":"sprites/spr_sal_mk5_helm/spr_sal_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2f67fbbb-e174-495e-8ddd-953b11ba345d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy b/sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy index 3c76fb79aa..2cf8084790 100644 --- a/sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy +++ b/sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sal_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"edc2bf09-71a9-4262-82e3-7d521f4df9b4","name":"edc2bf09-71a9-4262-82e3-7d521f4df9b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ac6be2f1-61f6-4dcb-8c1a-c8c4ce138dda","name":"ac6be2f1-61f6-4dcb-8c1a-c8c4ce138dda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"edc2bf09-71a9-4262-82e3-7d521f4df9b4","name":"edc2bf09-71a9-4262-82e3-7d521f4df9b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ac6be2f1-61f6-4dcb-8c1a-c8c4ce138dda","name":"ac6be2f1-61f6-4dcb-8c1a-c8c4ce138dda","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"edc2bf09-71a9-4262-82e3-7d521f4df9b4","path":"sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"179171d0-8a6b-49c9-aaf5-cf15c1fe2765","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac6be2f1-61f6-4dcb-8c1a-c8c4ce138dda","path":"sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc8b1087-d55f-49fb-8979-f211b1113861","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"edc2bf09-71a9-4262-82e3-7d521f4df9b4","path":"sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"179171d0-8a6b-49c9-aaf5-cf15c1fe2765","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ac6be2f1-61f6-4dcb-8c1a-c8c4ce138dda","path":"sprites/spr_sal_mk6_helm/spr_sal_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc8b1087-d55f-49fb-8979-f211b1113861","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy b/sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy index f586bafef3..f12df3e139 100644 --- a/sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy +++ b/sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sal_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"abe0f8e7-4465-4a93-aa4e-d3f59a6ea099","name":"abe0f8e7-4465-4a93-aa4e-d3f59a6ea099","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb9199c9-3066-4c7d-9c29-8d5d7acac4f2","name":"bb9199c9-3066-4c7d-9c29-8d5d7acac4f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"abe0f8e7-4465-4a93-aa4e-d3f59a6ea099","name":"abe0f8e7-4465-4a93-aa4e-d3f59a6ea099","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb9199c9-3066-4c7d-9c29-8d5d7acac4f2","name":"bb9199c9-3066-4c7d-9c29-8d5d7acac4f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"abe0f8e7-4465-4a93-aa4e-d3f59a6ea099","path":"sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"98f7ee0d-de6c-40e4-bea8-5cdb875c68aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb9199c9-3066-4c7d-9c29-8d5d7acac4f2","path":"sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f71d9fe5-e2bc-451e-8e76-ddc75512c23e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"abe0f8e7-4465-4a93-aa4e-d3f59a6ea099","path":"sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"98f7ee0d-de6c-40e4-bea8-5cdb875c68aa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb9199c9-3066-4c7d-9c29-8d5d7acac4f2","path":"sprites/spr_sal_mk7_helm/spr_sal_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f71d9fe5-e2bc-451e-8e76-ddc75512c23e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_sanguin_guard/spr_sanguin_guard.yy b/sprites/spr_sanguin_guard/spr_sanguin_guard.yy index 6d290489db..5e0cdb02b5 100644 --- a/sprites/spr_sanguin_guard/spr_sanguin_guard.yy +++ b/sprites/spr_sanguin_guard/spr_sanguin_guard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sanguin_guard", "bboxMode":0, "bbox_bottom":271, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1d39ed2e-1e13-4613-90de-a21b28017808","name":"1d39ed2e-1e13-4613-90de-a21b28017808","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6e84cd8e-d989-4364-8931-044b097b2c0b","name":"6e84cd8e-d989-4364-8931-044b097b2c0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d39ed2e-1e13-4613-90de-a21b28017808","name":"1d39ed2e-1e13-4613-90de-a21b28017808","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6e84cd8e-d989-4364-8931-044b097b2c0b","name":"6e84cd8e-d989-4364-8931-044b097b2c0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_save_data/spr_save_data.yy b/sprites/spr_save_data/spr_save_data.yy index 05029a0881..0299fd0e30 100644 --- a/sprites/spr_save_data/spr_save_data.yy +++ b/sprites/spr_save_data/spr_save_data.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_save_data", "bboxMode":0, "bbox_bottom":148, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a2573e7a-66aa-414c-a9e4-dba6d74b27ce","name":"a2573e7a-66aa-414c-a9e4-dba6d74b27ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b5c2bb2-6ea3-4af1-a773-dbf96c46133b","name":"9b5c2bb2-6ea3-4af1-a773-dbf96c46133b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a2573e7a-66aa-414c-a9e4-dba6d74b27ce","name":"a2573e7a-66aa-414c-a9e4-dba6d74b27ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b5c2bb2-6ea3-4af1-a773-dbf96c46133b","name":"9b5c2bb2-6ea3-4af1-a773-dbf96c46133b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2573e7a-66aa-414c-a9e4-dba6d74b27ce","path":"sprites/spr_save_data/spr_save_data.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fa10b32e-1760-4f33-a7de-ab420904efee","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b5c2bb2-6ea3-4af1-a773-dbf96c46133b","path":"sprites/spr_save_data/spr_save_data.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9ce4746-507b-478b-abb0-c66f8a91886a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2573e7a-66aa-414c-a9e4-dba6d74b27ce","path":"sprites/spr_save_data/spr_save_data.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fa10b32e-1760-4f33-a7de-ab420904efee","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9b5c2bb2-6ea3-4af1-a773-dbf96c46133b","path":"sprites/spr_save_data/spr_save_data.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9ce4746-507b-478b-abb0-c66f8a91886a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_save_footer/spr_save_footer.yy b/sprites/spr_save_footer/spr_save_footer.yy index d747c49060..eebb11ce8c 100644 --- a/sprites/spr_save_footer/spr_save_footer.yy +++ b/sprites/spr_save_footer/spr_save_footer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_save_footer", "bboxMode":0, "bbox_bottom":22, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7fac7063-30a5-452e-9407-1c9ff0a74081","name":"7fac7063-30a5-452e-9407-1c9ff0a74081","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7fac7063-30a5-452e-9407-1c9ff0a74081","name":"7fac7063-30a5-452e-9407-1c9ff0a74081","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fac7063-30a5-452e-9407-1c9ff0a74081","path":"sprites/spr_save_footer/spr_save_footer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d1dc09db-0d3d-47f3-95ad-8da60232d5c4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7fac7063-30a5-452e-9407-1c9ff0a74081","path":"sprites/spr_save_footer/spr_save_footer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d1dc09db-0d3d-47f3-95ad-8da60232d5c4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_save_header/spr_save_header.yy b/sprites/spr_save_header/spr_save_header.yy index 9026f30431..38d593c5e8 100644 --- a/sprites/spr_save_header/spr_save_header.yy +++ b/sprites/spr_save_header/spr_save_header.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_save_header", "bboxMode":0, "bbox_bottom":121, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"daa34b23-2885-4a5d-a159-a3a2a8fd2ee5","name":"daa34b23-2885-4a5d-a159-a3a2a8fd2ee5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"daa34b23-2885-4a5d-a159-a3a2a8fd2ee5","name":"daa34b23-2885-4a5d-a159-a3a2a8fd2ee5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daa34b23-2885-4a5d-a159-a3a2a8fd2ee5","path":"sprites/spr_save_header/spr_save_header.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dea20569-1407-453c-ad16-91a5dccef40c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daa34b23-2885-4a5d-a159-a3a2a8fd2ee5","path":"sprites/spr_save_header/spr_save_header.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dea20569-1407-453c-ad16-91a5dccef40c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_save_headers/spr_save_headers.yy b/sprites/spr_save_headers/spr_save_headers.yy index d9d16c670c..b8a5fa4240 100644 --- a/sprites/spr_save_headers/spr_save_headers.yy +++ b/sprites/spr_save_headers/spr_save_headers.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_save_headers", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ba4bb2da-0bb0-40ce-a88c-8e60a1914620","name":"ba4bb2da-0bb0-40ce-a88c-8e60a1914620","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"09e014e6-17f3-43e9-8c5c-f36cdf4973be","name":"09e014e6-17f3-43e9-8c5c-f36cdf4973be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba4bb2da-0bb0-40ce-a88c-8e60a1914620","name":"ba4bb2da-0bb0-40ce-a88c-8e60a1914620","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"09e014e6-17f3-43e9-8c5c-f36cdf4973be","name":"09e014e6-17f3-43e9-8c5c-f36cdf4973be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba4bb2da-0bb0-40ce-a88c-8e60a1914620","path":"sprites/spr_save_headers/spr_save_headers.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4265250d-287d-4acb-8680-f4646fa0c8ac","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"09e014e6-17f3-43e9-8c5c-f36cdf4973be","path":"sprites/spr_save_headers/spr_save_headers.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38bad956-b039-4cbb-9d79-eff1f3f84425","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba4bb2da-0bb0-40ce-a88c-8e60a1914620","path":"sprites/spr_save_headers/spr_save_headers.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4265250d-287d-4acb-8680-f4646fa0c8ac","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"09e014e6-17f3-43e9-8c5c-f36cdf4973be","path":"sprites/spr_save_headers/spr_save_headers.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38bad956-b039-4cbb-9d79-eff1f3f84425","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_saveload/spr_saveload.yy b/sprites/spr_saveload/spr_saveload.yy index 13a4b6ef27..56f23f4d44 100644 --- a/sprites/spr_saveload/spr_saveload.yy +++ b/sprites/spr_saveload/spr_saveload.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_saveload", "bboxMode":0, "bbox_bottom":134, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b8e32215-7622-4eef-af7b-824e15be42d2","name":"b8e32215-7622-4eef-af7b-824e15be42d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b8e32215-7622-4eef-af7b-824e15be42d2","name":"b8e32215-7622-4eef-af7b-824e15be42d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b8e32215-7622-4eef-af7b-824e15be42d2","path":"sprites/spr_saveload/spr_saveload.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"813303e0-d3ae-424e-b769-32da363af5c8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b8e32215-7622-4eef-af7b-824e15be42d2","path":"sprites/spr_saveload/spr_saveload.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"813303e0-d3ae-424e-b769-32da363af5c8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_scout_arms/spr_scout_arms.yy b/sprites/spr_scout_arms/spr_scout_arms.yy index f4bc0468e8..ace7e27f01 100644 --- a/sprites/spr_scout_arms/spr_scout_arms.yy +++ b/sprites/spr_scout_arms/spr_scout_arms.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_arms", "bboxMode":0, "bbox_bottom":148, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_arms/spr_scout_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c6bc053b-c894-460e-ac79-cd852f23c9c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","path":"sprites/spr_scout_arms/spr_scout_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41583aef-5412-457d-9744-f18a930b7a7c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_arms/spr_scout_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c6bc053b-c894-460e-ac79-cd852f23c9c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","path":"sprites/spr_scout_arms/spr_scout_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41583aef-5412-457d-9744-f18a930b7a7c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_scout_colors/spr_scout_colors.yy b/sprites/spr_scout_colors/spr_scout_colors.yy index c2d62c1425..40dae1500a 100644 --- a/sprites/spr_scout_colors/spr_scout_colors.yy +++ b/sprites/spr_scout_colors/spr_scout_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_colors", "bboxMode":0, "bbox_bottom":224, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e0bccee-8acd-43a6-b2a2-dde31188a7bd","name":"9e0bccee-8acd-43a6-b2a2-dde31188a7bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ef0f181d-ac35-46c7-a638-d4505b813415","name":"ef0f181d-ac35-46c7-a638-d4505b813415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"955d0257-722c-4028-932b-5740aecc7d30","name":"955d0257-722c-4028-932b-5740aecc7d30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bce9e34a-4a90-4f93-83c7-018f77addcdf","name":"bce9e34a-4a90-4f93-83c7-018f77addcdf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6da1856-79f0-4a6f-940c-bf95033834d1","name":"a6da1856-79f0-4a6f-940c-bf95033834d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"48e52af8-1443-4d50-8ab3-941caf166149","name":"48e52af8-1443-4d50-8ab3-941caf166149","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a291a646-2b5b-4a52-b47a-3814c77f4dfe","name":"a291a646-2b5b-4a52-b47a-3814c77f4dfe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e57071a6-5e15-446b-85b0-c663e938470c","name":"e57071a6-5e15-446b-85b0-c663e938470c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4e58d1f2-8813-4ca7-b477-8f85dfa5fb63","name":"4e58d1f2-8813-4ca7-b477-8f85dfa5fb63","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cf79f59c-ee61-423f-8697-26acae0d7361","name":"cf79f59c-ee61-423f-8697-26acae0d7361","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"faa1c73b-982b-4c8c-9302-14f9cdf5126a","name":"faa1c73b-982b-4c8c-9302-14f9cdf5126a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"38579090-ad10-4741-9b4a-7c6478e31a26","name":"38579090-ad10-4741-9b4a-7c6478e31a26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e0bccee-8acd-43a6-b2a2-dde31188a7bd","name":"9e0bccee-8acd-43a6-b2a2-dde31188a7bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ef0f181d-ac35-46c7-a638-d4505b813415","name":"ef0f181d-ac35-46c7-a638-d4505b813415","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"955d0257-722c-4028-932b-5740aecc7d30","name":"955d0257-722c-4028-932b-5740aecc7d30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bce9e34a-4a90-4f93-83c7-018f77addcdf","name":"bce9e34a-4a90-4f93-83c7-018f77addcdf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6da1856-79f0-4a6f-940c-bf95033834d1","name":"a6da1856-79f0-4a6f-940c-bf95033834d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48e52af8-1443-4d50-8ab3-941caf166149","name":"48e52af8-1443-4d50-8ab3-941caf166149","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a291a646-2b5b-4a52-b47a-3814c77f4dfe","name":"a291a646-2b5b-4a52-b47a-3814c77f4dfe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e57071a6-5e15-446b-85b0-c663e938470c","name":"e57071a6-5e15-446b-85b0-c663e938470c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4e58d1f2-8813-4ca7-b477-8f85dfa5fb63","name":"4e58d1f2-8813-4ca7-b477-8f85dfa5fb63","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cf79f59c-ee61-423f-8697-26acae0d7361","name":"cf79f59c-ee61-423f-8697-26acae0d7361","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"faa1c73b-982b-4c8c-9302-14f9cdf5126a","name":"faa1c73b-982b-4c8c-9302-14f9cdf5126a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38579090-ad10-4741-9b4a-7c6478e31a26","name":"38579090-ad10-4741-9b4a-7c6478e31a26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,42 +81,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e0bccee-8acd-43a6-b2a2-dde31188a7bd","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d5d4c8b-01fd-4390-8694-cf9ddd810069","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef0f181d-ac35-46c7-a638-d4505b813415","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4aa7b4ca-0c75-457b-a50f-13d5f19245cb","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"955d0257-722c-4028-932b-5740aecc7d30","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe7f9372-79c7-437e-bbb4-7790f934e59e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bce9e34a-4a90-4f93-83c7-018f77addcdf","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c507679e-8f8a-4ef4-8222-1b9ce635927b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6da1856-79f0-4a6f-940c-bf95033834d1","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a84c13f-6866-4eec-8bae-6be7cb7a0362","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48e52af8-1443-4d50-8ab3-941caf166149","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de2bac43-95c3-4de0-83e3-8f3de63440d4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a291a646-2b5b-4a52-b47a-3814c77f4dfe","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"147bd5ab-89e6-4a62-bfdc-8349bdc18418","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e57071a6-5e15-446b-85b0-c663e938470c","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff8965c0-516f-4910-be5f-29bbda2b7dad","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e58d1f2-8813-4ca7-b477-8f85dfa5fb63","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"17242221-c2eb-40aa-9597-b0fe258a7de0","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf79f59c-ee61-423f-8697-26acae0d7361","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"91cb7282-2dc4-44bc-8b17-2f5588596a4e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"faa1c73b-982b-4c8c-9302-14f9cdf5126a","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4cb8dde6-007f-4ada-a643-60e7a3e8795d","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"38579090-ad10-4741-9b4a-7c6478e31a26","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d40f65ca-ce19-40f9-9564-74c25672707f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e0bccee-8acd-43a6-b2a2-dde31188a7bd","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d5d4c8b-01fd-4390-8694-cf9ddd810069","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ef0f181d-ac35-46c7-a638-d4505b813415","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4aa7b4ca-0c75-457b-a50f-13d5f19245cb","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"955d0257-722c-4028-932b-5740aecc7d30","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe7f9372-79c7-437e-bbb4-7790f934e59e","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bce9e34a-4a90-4f93-83c7-018f77addcdf","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c507679e-8f8a-4ef4-8222-1b9ce635927b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6da1856-79f0-4a6f-940c-bf95033834d1","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a84c13f-6866-4eec-8bae-6be7cb7a0362","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48e52af8-1443-4d50-8ab3-941caf166149","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de2bac43-95c3-4de0-83e3-8f3de63440d4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a291a646-2b5b-4a52-b47a-3814c77f4dfe","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"147bd5ab-89e6-4a62-bfdc-8349bdc18418","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e57071a6-5e15-446b-85b0-c663e938470c","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff8965c0-516f-4910-be5f-29bbda2b7dad","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e58d1f2-8813-4ca7-b477-8f85dfa5fb63","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"17242221-c2eb-40aa-9597-b0fe258a7de0","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf79f59c-ee61-423f-8697-26acae0d7361","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"91cb7282-2dc4-44bc-8b17-2f5588596a4e","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"faa1c73b-982b-4c8c-9302-14f9cdf5126a","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4cb8dde6-007f-4ada-a643-60e7a3e8795d","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"38579090-ad10-4741-9b4a-7c6478e31a26","path":"sprites/spr_scout_colors/spr_scout_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d40f65ca-ce19-40f9-9564-74c25672707f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_scout_complex/2462092a-8f18-48d4-9694-48ea1de535d9.png b/sprites/spr_scout_complex/2462092a-8f18-48d4-9694-48ea1de535d9.png index 4b3f0b9f77..326f8d1bef 100644 Binary files a/sprites/spr_scout_complex/2462092a-8f18-48d4-9694-48ea1de535d9.png and b/sprites/spr_scout_complex/2462092a-8f18-48d4-9694-48ea1de535d9.png differ diff --git a/sprites/spr_scout_complex/layers/2462092a-8f18-48d4-9694-48ea1de535d9/6875771f-a0b5-4a59-8928-4f649aaa9035.png b/sprites/spr_scout_complex/layers/2462092a-8f18-48d4-9694-48ea1de535d9/6875771f-a0b5-4a59-8928-4f649aaa9035.png index 4b3f0b9f77..326f8d1bef 100644 Binary files a/sprites/spr_scout_complex/layers/2462092a-8f18-48d4-9694-48ea1de535d9/6875771f-a0b5-4a59-8928-4f649aaa9035.png and b/sprites/spr_scout_complex/layers/2462092a-8f18-48d4-9694-48ea1de535d9/6875771f-a0b5-4a59-8928-4f649aaa9035.png differ diff --git a/sprites/spr_scout_complex/spr_scout_complex.yy b/sprites/spr_scout_complex/spr_scout_complex.yy index cd69b27854..db5c746b8c 100644 --- a/sprites/spr_scout_complex/spr_scout_complex.yy +++ b/sprites/spr_scout_complex/spr_scout_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_complex", "bboxMode":0, "bbox_bottom":231, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2462092a-8f18-48d4-9694-48ea1de535d9","name":"2462092a-8f18-48d4-9694-48ea1de535d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2462092a-8f18-48d4-9694-48ea1de535d9","name":"2462092a-8f18-48d4-9694-48ea1de535d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, diff --git a/sprites/spr_scout_heads/spr_scout_heads.yy b/sprites/spr_scout_heads/spr_scout_heads.yy index 05336f619e..3953dba83f 100644 --- a/sprites/spr_scout_heads/spr_scout_heads.yy +++ b/sprites/spr_scout_heads/spr_scout_heads.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_heads", "bboxMode":0, "bbox_bottom":62, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f983ac49-49e4-493b-a33e-522f5e49f625","name":"f983ac49-49e4-493b-a33e-522f5e49f625","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84beb665-cb67-4e10-8b97-8a016f610d39","name":"84beb665-cb67-4e10-8b97-8a016f610d39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f983ac49-49e4-493b-a33e-522f5e49f625","name":"f983ac49-49e4-493b-a33e-522f5e49f625","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84beb665-cb67-4e10-8b97-8a016f610d39","name":"84beb665-cb67-4e10-8b97-8a016f610d39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f983ac49-49e4-493b-a33e-522f5e49f625","path":"sprites/spr_scout_heads/spr_scout_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d1556974-823e-42d5-aab9-580ae03ef33e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84beb665-cb67-4e10-8b97-8a016f610d39","path":"sprites/spr_scout_heads/spr_scout_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5a8357cc-4b19-4835-bf07-8e4e579ef6de","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f983ac49-49e4-493b-a33e-522f5e49f625","path":"sprites/spr_scout_heads/spr_scout_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d1556974-823e-42d5-aab9-580ae03ef33e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84beb665-cb67-4e10-8b97-8a016f610d39","path":"sprites/spr_scout_heads/spr_scout_heads.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5a8357cc-4b19-4835-bf07-8e4e579ef6de","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_scout_left/spr_scout_left.yy b/sprites/spr_scout_left/spr_scout_left.yy index 52766f5ab0..1ea10a311d 100644 --- a/sprites/spr_scout_left/spr_scout_left.yy +++ b/sprites/spr_scout_left/spr_scout_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_left", "bboxMode":0, "bbox_bottom":148, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_left/spr_scout_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a267d99-aaba-41f0-b003-f0a2fb5b595d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_left/spr_scout_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a267d99-aaba-41f0-b003-f0a2fb5b595d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_scout_new/spr_scout_new.yy b/sprites/spr_scout_new/spr_scout_new.yy index 62630facc7..e7a7e1bfcc 100644 --- a/sprites/spr_scout_new/spr_scout_new.yy +++ b/sprites/spr_scout_new/spr_scout_new.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_new", "bboxMode":0, "bbox_bottom":231, @@ -12,15 +12,15 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2462092a-8f18-48d4-9694-48ea1de535d9","name":"2462092a-8f18-48d4-9694-48ea1de535d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"82f2cb7a-a266-4656-8a58-99ba2e420640","name":"82f2cb7a-a266-4656-8a58-99ba2e420640","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df188ab0-15cc-489f-be4e-3c05681254e5","name":"df188ab0-15cc-489f-be4e-3c05681254e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2462092a-8f18-48d4-9694-48ea1de535d9","name":"2462092a-8f18-48d4-9694-48ea1de535d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82f2cb7a-a266-4656-8a58-99ba2e420640","name":"82f2cb7a-a266-4656-8a58-99ba2e420640","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df188ab0-15cc-489f-be4e-3c05681254e5","name":"df188ab0-15cc-489f-be4e-3c05681254e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -78,33 +78,15 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2462092a-8f18-48d4-9694-48ea1de535d9","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b31af662-ba1d-4d27-9df0-c883a9cb9df0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b9777d1-7fcc-4592-8be4-75b3800b827d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"162b08ca-f2e2-49d1-9537-d39b34544a88","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb4566d4-91b3-4db5-afc7-614fdcb9f276","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4849c4a7-07d6-40bc-99df-fba446ffb063","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"321ec812-a02f-41e5-b397-5d2b32198c0d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2c8eee3-df35-4327-9c95-9f658774bdfa","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82f2cb7a-a266-4656-8a58-99ba2e420640","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"31a14009-85d3-47a8-bdfb-d9f082fbb6da","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df188ab0-15cc-489f-be4e-3c05681254e5","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9c225af2-ada9-46d5-8d46-9959e85fc393","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2462092a-8f18-48d4-9694-48ea1de535d9","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b31af662-ba1d-4d27-9df0-c883a9cb9df0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fec1b1d-b8d8-4670-a500-898e3a451f83","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b9777d1-7fcc-4592-8be4-75b3800b827d","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64729cc4-00dc-45e2-9ea3-69e9224b631a","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"162b08ca-f2e2-49d1-9537-d39b34544a88","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5936ecb-6646-4a4a-a4a3-d5ef0e835c62","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb4566d4-91b3-4db5-afc7-614fdcb9f276","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"929493f8-01f3-4199-a6ce-a69c82f7cdf0","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4849c4a7-07d6-40bc-99df-fba446ffb063","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"321ec812-a02f-41e5-b397-5d2b32198c0d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a5a1c0d-1fdd-4ff5-ab6a-43ed5e540374","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2c8eee3-df35-4327-9c95-9f658774bdfa","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82f2cb7a-a266-4656-8a58-99ba2e420640","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"31a14009-85d3-47a8-bdfb-d9f082fbb6da","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df188ab0-15cc-489f-be4e-3c05681254e5","path":"sprites/spr_scout_new/spr_scout_new.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9c225af2-ada9-46d5-8d46-9959e85fc393","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_scout_right/spr_scout_right.yy b/sprites/spr_scout_right/spr_scout_right.yy index dae1c22b31..a7fcff52de 100644 --- a/sprites/spr_scout_right/spr_scout_right.yy +++ b/sprites/spr_scout_right/spr_scout_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_scout_right", "bboxMode":0, "bbox_bottom":148, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d0becbe-30f8-4a46-bedf-3d9495863023","name":"7d0becbe-30f8-4a46-bedf-3d9495863023","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_right/spr_scout_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff644c2f-3222-44a3-9955-1166309280e6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d0becbe-30f8-4a46-bedf-3d9495863023","path":"sprites/spr_scout_right/spr_scout_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff644c2f-3222-44a3-9955-1166309280e6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_sell_tiny/f686ba29-c495-47b6-96c4-6b5468d59af7.png b/sprites/spr_sell_tiny/f686ba29-c495-47b6-96c4-6b5468d59af7.png new file mode 100644 index 0000000000..a6ae442291 Binary files /dev/null and b/sprites/spr_sell_tiny/f686ba29-c495-47b6-96c4-6b5468d59af7.png differ diff --git a/sprites/spr_sell_tiny/layers/f686ba29-c495-47b6-96c4-6b5468d59af7/d98ba5e0-da02-48fb-8024-c2401b6f0f84.png b/sprites/spr_sell_tiny/layers/f686ba29-c495-47b6-96c4-6b5468d59af7/d98ba5e0-da02-48fb-8024-c2401b6f0f84.png new file mode 100644 index 0000000000..eba685929c Binary files /dev/null and b/sprites/spr_sell_tiny/layers/f686ba29-c495-47b6-96c4-6b5468d59af7/d98ba5e0-da02-48fb-8024-c2401b6f0f84.png differ diff --git a/sprites/spr_sell_tiny/spr_sell_tiny.yy b/sprites/spr_sell_tiny/spr_sell_tiny.yy new file mode 100644 index 0000000000..693e29dd37 --- /dev/null +++ b/sprites/spr_sell_tiny/spr_sell_tiny.yy @@ -0,0 +1,91 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_sell_tiny", + "bboxMode":0, + "bbox_bottom":11, + "bbox_left":0, + "bbox_right":44, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"f686ba29-c495-47b6-96c4-6b5468d59af7","name":"f686ba29-c495-47b6-96c4-6b5468d59af7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":12, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"d98ba5e0-da02-48fb-8024-c2401b6f0f84","blendMode":0,"displayName":"default","isLocked":false,"name":"d98ba5e0-da02-48fb-8024-c2401b6f0f84","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_sell_tiny", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"UI", + "path":"folders/Sprites/UI.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f686ba29-c495-47b6-96c4-6b5468d59af7","path":"sprites/spr_sell_tiny/spr_sell_tiny.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aac88065-ea52-440a-b15d-0d3ef7afe71d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":{ + "x":0.0, + "y":0.0, + }, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":45, +} \ No newline at end of file diff --git a/sprites/spr_servo_arm/spr_servo_arm.yy b/sprites/spr_servo_arm/spr_servo_arm.yy index d41a902fee..ec68a0573a 100644 --- a/sprites/spr_servo_arm/spr_servo_arm.yy +++ b/sprites/spr_servo_arm/spr_servo_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_servo_arm", "bboxMode":0, "bbox_bottom":84, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","path":"sprites/spr_servo_arm/spr_servo_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5207aa92-d126-4f55-aa26-68a203e9ca4e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","path":"sprites/spr_servo_arm/spr_servo_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5207aa92-d126-4f55-aa26-68a203e9ca4e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_servo_harness/spr_servo_harness.yy b/sprites/spr_servo_harness/spr_servo_harness.yy index f378056629..9ffcd2346b 100644 --- a/sprites/spr_servo_harness/spr_servo_harness.yy +++ b/sprites/spr_servo_harness/spr_servo_harness.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_servo_harness", "bboxMode":0, "bbox_bottom":240, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","name":"da5f0368-88c5-42b7-b6de-e4d62467b7ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":282.0, + "seqWidth":281.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_servo_left_arm/5af24088-6152-45c2-ab7c-4ff8f7931513.png b/sprites/spr_servo_left_arm/5af24088-6152-45c2-ab7c-4ff8f7931513.png new file mode 100644 index 0000000000..c7aa9aec20 Binary files /dev/null and b/sprites/spr_servo_left_arm/5af24088-6152-45c2-ab7c-4ff8f7931513.png differ diff --git a/sprites/spr_servo_left_arm/layers/5af24088-6152-45c2-ab7c-4ff8f7931513/22a94116-9c7e-4e0c-9f48-74a0ff3a5ace.png b/sprites/spr_servo_left_arm/layers/5af24088-6152-45c2-ab7c-4ff8f7931513/22a94116-9c7e-4e0c-9f48-74a0ff3a5ace.png new file mode 100644 index 0000000000..c7aa9aec20 Binary files /dev/null and b/sprites/spr_servo_left_arm/layers/5af24088-6152-45c2-ab7c-4ff8f7931513/22a94116-9c7e-4e0c-9f48-74a0ff3a5ace.png differ diff --git a/sprites/spr_servo_left_arm/spr_servo_left_arm.yy b/sprites/spr_servo_left_arm/spr_servo_left_arm.yy new file mode 100644 index 0000000000..3b6b23b244 --- /dev/null +++ b/sprites/spr_servo_left_arm/spr_servo_left_arm.yy @@ -0,0 +1,90 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_servo_left_arm", + "bboxMode":0, + "bbox_bottom":47, + "bbox_left":22, + "bbox_right":56, + "bbox_top":17, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"5af24088-6152-45c2-ab7c-4ff8f7931513","name":"5af24088-6152-45c2-ab7c-4ff8f7931513","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":64, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"22a94116-9c7e-4e0c-9f48-74a0ff3a5ace","blendMode":0,"displayName":"default","isLocked":false,"name":"22a94116-9c7e-4e0c-9f48-74a0ff3a5ace","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_servo_left_arm", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"servo_Skull", + "path":"folders/Sprites/UI/servo_Skull.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_servo_left_arm", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_servo_left_arm", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5af24088-6152-45c2-ab7c-4ff8f7931513","path":"sprites/spr_servo_left_arm/spr_servo_left_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ba551419-bf27-4c2d-90c8-7959ed7786d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":29, + "yorigin":35, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":64, +} \ No newline at end of file diff --git a/sprites/spr_servo_right_arm/49b4d097-9c6e-49e7-bc8a-9b6cab71fa69.png b/sprites/spr_servo_right_arm/49b4d097-9c6e-49e7-bc8a-9b6cab71fa69.png new file mode 100644 index 0000000000..8ecb6448d8 Binary files /dev/null and b/sprites/spr_servo_right_arm/49b4d097-9c6e-49e7-bc8a-9b6cab71fa69.png differ diff --git a/sprites/spr_servo_right_arm/layers/49b4d097-9c6e-49e7-bc8a-9b6cab71fa69/07deb44d-a134-467e-9bc6-3427052fa573.png b/sprites/spr_servo_right_arm/layers/49b4d097-9c6e-49e7-bc8a-9b6cab71fa69/07deb44d-a134-467e-9bc6-3427052fa573.png new file mode 100644 index 0000000000..8ecb6448d8 Binary files /dev/null and b/sprites/spr_servo_right_arm/layers/49b4d097-9c6e-49e7-bc8a-9b6cab71fa69/07deb44d-a134-467e-9bc6-3427052fa573.png differ diff --git a/sprites/spr_servo_right_arm/spr_servo_right_arm.yy b/sprites/spr_servo_right_arm/spr_servo_right_arm.yy new file mode 100644 index 0000000000..e2426507a5 --- /dev/null +++ b/sprites/spr_servo_right_arm/spr_servo_right_arm.yy @@ -0,0 +1,90 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_servo_right_arm", + "bboxMode":0, + "bbox_bottom":48, + "bbox_left":12, + "bbox_right":63, + "bbox_top":1, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"49b4d097-9c6e-49e7-bc8a-9b6cab71fa69","name":"49b4d097-9c6e-49e7-bc8a-9b6cab71fa69","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":64, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"07deb44d-a134-467e-9bc6-3427052fa573","blendMode":0,"displayName":"default","isLocked":false,"name":"07deb44d-a134-467e-9bc6-3427052fa573","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_servo_right_arm", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"servo_Skull", + "path":"folders/Sprites/UI/servo_Skull.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_servo_right_arm", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_servo_right_arm", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"49b4d097-9c6e-49e7-bc8a-9b6cab71fa69","path":"sprites/spr_servo_right_arm/spr_servo_right_arm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3ee92758-4937-4b7c-9469-982d9aeed51b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":37, + "yorigin":27, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":64, +} \ No newline at end of file diff --git a/sprites/spr_servo_skull_head/c06ff8da-4809-4c0f-adb8-cb848596bb7c.png b/sprites/spr_servo_skull_head/c06ff8da-4809-4c0f-adb8-cb848596bb7c.png new file mode 100644 index 0000000000..ef4a265a52 Binary files /dev/null and b/sprites/spr_servo_skull_head/c06ff8da-4809-4c0f-adb8-cb848596bb7c.png differ diff --git a/sprites/spr_servo_skull_head/layers/c06ff8da-4809-4c0f-adb8-cb848596bb7c/a9e008db-f197-48af-99cd-dcc9882d55e3.png b/sprites/spr_servo_skull_head/layers/c06ff8da-4809-4c0f-adb8-cb848596bb7c/a9e008db-f197-48af-99cd-dcc9882d55e3.png new file mode 100644 index 0000000000..ef4a265a52 Binary files /dev/null and b/sprites/spr_servo_skull_head/layers/c06ff8da-4809-4c0f-adb8-cb848596bb7c/a9e008db-f197-48af-99cd-dcc9882d55e3.png differ diff --git a/sprites/spr_servo_skull_head/spr_servo_skull_head.yy b/sprites/spr_servo_skull_head/spr_servo_skull_head.yy new file mode 100644 index 0000000000..2b8b22e8fc --- /dev/null +++ b/sprites/spr_servo_skull_head/spr_servo_skull_head.yy @@ -0,0 +1,90 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_servo_skull_head", + "bboxMode":0, + "bbox_bottom":50, + "bbox_left":6, + "bbox_right":58, + "bbox_top":11, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"c06ff8da-4809-4c0f-adb8-cb848596bb7c","name":"c06ff8da-4809-4c0f-adb8-cb848596bb7c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":64, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"a9e008db-f197-48af-99cd-dcc9882d55e3","blendMode":0,"displayName":"default","isLocked":false,"name":"a9e008db-f197-48af-99cd-dcc9882d55e3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_servo_skull_head", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"servo_Skull", + "path":"folders/Sprites/UI/servo_Skull.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_servo_skull_head", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_servo_skull_head", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c06ff8da-4809-4c0f-adb8-cb848596bb7c","path":"sprites/spr_servo_skull_head/spr_servo_skull_head.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"07aaf438-e4bf-40d2-9917-1cf34a22e312","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":35, + "yorigin":44, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":64, +} \ No newline at end of file diff --git a/sprites/spr_settings_bg/spr_settings_bg.yy b/sprites/spr_settings_bg/spr_settings_bg.yy index 7108fa64a0..1c9163d938 100644 --- a/sprites/spr_settings_bg/spr_settings_bg.yy +++ b/sprites/spr_settings_bg/spr_settings_bg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_settings_bg", "bboxMode":0, "bbox_bottom":899, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b5316788-02cb-4b6d-acca-4ed4d8672ce5","name":"b5316788-02cb-4b6d-acca-4ed4d8672ce5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b5316788-02cb-4b6d-acca-4ed4d8672ce5","name":"b5316788-02cb-4b6d-acca-4ed4d8672ce5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":900.0, + "seqWidth":1600.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_settings_button/spr_settings_button.yy b/sprites/spr_settings_button/spr_settings_button.yy index 19f9cbf23e..bee2101d3d 100644 --- a/sprites/spr_settings_button/spr_settings_button.yy +++ b/sprites/spr_settings_button/spr_settings_button.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_settings_button", "bboxMode":0, "bbox_bottom":115, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c756afca-6761-4c70-b4d1-b9bb0bc6059c","name":"c756afca-6761-4c70-b4d1-b9bb0bc6059c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c756afca-6761-4c70-b4d1-b9bb0bc6059c","name":"c756afca-6761-4c70-b4d1-b9bb0bc6059c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c756afca-6761-4c70-b4d1-b9bb0bc6059c","path":"sprites/spr_settings_button/spr_settings_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"65dc51be-7c3a-43b6-8534-c0d168564495","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c756afca-6761-4c70-b4d1-b9bb0bc6059c","path":"sprites/spr_settings_button/spr_settings_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"65dc51be-7c3a-43b6-8534-c0d168564495","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_sgt_forehead/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png b/sprites/spr_sgt_forehead/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png new file mode 100644 index 0000000000..1abd8ff743 Binary files /dev/null and b/sprites/spr_sgt_forehead/3dbaa400-5fe2-498d-abd8-9cc4b2bda693.png differ diff --git a/sprites/spr_sgt_forehead/61531cde-cd44-4806-ae39-3c63f51d65de.png b/sprites/spr_sgt_forehead/61531cde-cd44-4806-ae39-3c63f51d65de.png new file mode 100644 index 0000000000..e1666a5313 Binary files /dev/null and b/sprites/spr_sgt_forehead/61531cde-cd44-4806-ae39-3c63f51d65de.png differ diff --git a/sprites/spr_sgt_forehead/layers/3dbaa400-5fe2-498d-abd8-9cc4b2bda693/4ff43f57-b34a-4219-8298-0399265c623b.png b/sprites/spr_sgt_forehead/layers/3dbaa400-5fe2-498d-abd8-9cc4b2bda693/4ff43f57-b34a-4219-8298-0399265c623b.png new file mode 100644 index 0000000000..58dc547f3d Binary files /dev/null and b/sprites/spr_sgt_forehead/layers/3dbaa400-5fe2-498d-abd8-9cc4b2bda693/4ff43f57-b34a-4219-8298-0399265c623b.png differ diff --git a/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/4ff43f57-b34a-4219-8298-0399265c623b.png b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/4ff43f57-b34a-4219-8298-0399265c623b.png new file mode 100644 index 0000000000..0cdf0b209a Binary files /dev/null and b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/4ff43f57-b34a-4219-8298-0399265c623b.png differ diff --git a/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/a4c8b294-e4be-4fef-8912-4d706c9cec44.png b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/a4c8b294-e4be-4fef-8912-4d706c9cec44.png new file mode 100644 index 0000000000..4ebee00e69 Binary files /dev/null and b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/a4c8b294-e4be-4fef-8912-4d706c9cec44.png differ diff --git a/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/b7b29ef3-6ea3-4b38-893a-fb3da7d22800.png b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/b7b29ef3-6ea3-4b38-893a-fb3da7d22800.png new file mode 100644 index 0000000000..ca49a8f02c Binary files /dev/null and b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/b7b29ef3-6ea3-4b38-893a-fb3da7d22800.png differ diff --git a/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/d292644f-2a3b-4981-868a-a423161e3739.png b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/d292644f-2a3b-4981-868a-a423161e3739.png new file mode 100644 index 0000000000..ca49a8f02c Binary files /dev/null and b/sprites/spr_sgt_forehead/layers/61531cde-cd44-4806-ae39-3c63f51d65de/d292644f-2a3b-4981-868a-a423161e3739.png differ diff --git a/sprites/spr_sgt_forehead/spr_sgt_forehead.yy b/sprites/spr_sgt_forehead/spr_sgt_forehead.yy new file mode 100644 index 0000000000..38ebdd4f70 --- /dev/null +++ b/sprites/spr_sgt_forehead/spr_sgt_forehead.yy @@ -0,0 +1,96 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_sgt_forehead", + "bboxMode":0, + "bbox_bottom":78, + "bbox_left":79, + "bbox_right":87, + "bbox_top":70, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":272, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"4ff43f57-b34a-4219-8298-0399265c623b","blendMode":0,"displayName":"default","isLocked":false,"name":"4ff43f57-b34a-4219-8298-0399265c623b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_sgt_forehead", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"decorations", + "path":"folders/Sprites/Marine Viewer/decorations.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_sgt_forehead", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_sgt_forehead", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61531cde-cd44-4806-ae39-3c63f51d65de","path":"sprites/spr_sgt_forehead/spr_sgt_forehead.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"25bce6ef-bdd2-4be3-a82b-d734bbd145b9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3dbaa400-5fe2-498d-abd8-9cc4b2bda693","path":"sprites/spr_sgt_forehead/spr_sgt_forehead.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3fc23822-665e-44b1-b83d-a76e40600b42","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":51, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_ship_aconite/0135cb67-e9d4-47f9-ae29-035c8a8dfafa.png b/sprites/spr_ship_aconite/0135cb67-e9d4-47f9-ae29-035c8a8dfafa.png index 50d36041af..51be9a1a47 100644 Binary files a/sprites/spr_ship_aconite/0135cb67-e9d4-47f9-ae29-035c8a8dfafa.png and b/sprites/spr_ship_aconite/0135cb67-e9d4-47f9-ae29-035c8a8dfafa.png differ diff --git a/sprites/spr_ship_aconite/layers/0135cb67-e9d4-47f9-ae29-035c8a8dfafa/dbd2f6e9-16f8-4d28-b0ee-9c4c7c1666c3.png b/sprites/spr_ship_aconite/layers/0135cb67-e9d4-47f9-ae29-035c8a8dfafa/dbd2f6e9-16f8-4d28-b0ee-9c4c7c1666c3.png index 50d36041af..60e01c8e6c 100644 Binary files a/sprites/spr_ship_aconite/layers/0135cb67-e9d4-47f9-ae29-035c8a8dfafa/dbd2f6e9-16f8-4d28-b0ee-9c4c7c1666c3.png and b/sprites/spr_ship_aconite/layers/0135cb67-e9d4-47f9-ae29-035c8a8dfafa/dbd2f6e9-16f8-4d28-b0ee-9c4c7c1666c3.png differ diff --git a/sprites/spr_ship_aconite/spr_ship_aconite.yy b/sprites/spr_ship_aconite/spr_ship_aconite.yy index 860ea93221..2fc24c804a 100644 --- a/sprites/spr_ship_aconite/spr_ship_aconite.yy +++ b/sprites/spr_ship_aconite/spr_ship_aconite.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_aconite", "bboxMode":0, "bbox_bottom":28, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","name":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","name":"0135cb67-e9d4-47f9-ae29-035c8a8dfafa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":32.0, + "seqWidth":105.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"08b75cf2-26f5-4e6f-ad20-0821d2aa305a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":52, "yorigin":16, diff --git a/sprites/spr_ship_ammer/spr_ship_ammer.yy b/sprites/spr_ship_ammer/spr_ship_ammer.yy index 0dbbc04d5f..e068e85c9c 100644 --- a/sprites/spr_ship_ammer/spr_ship_ammer.yy +++ b/sprites/spr_ship_ammer/spr_ship_ammer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_ammer", "bboxMode":0, "bbox_bottom":57, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"aecbecdd-4094-46cf-8a12-6fa03388a226","name":"aecbecdd-4094-46cf-8a12-6fa03388a226","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aecbecdd-4094-46cf-8a12-6fa03388a226","name":"aecbecdd-4094-46cf-8a12-6fa03388a226","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aecbecdd-4094-46cf-8a12-6fa03388a226","path":"sprites/spr_ship_ammer/spr_ship_ammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c02728c4-68e1-453f-8fa8-598ef2561c23","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aecbecdd-4094-46cf-8a12-6fa03388a226","path":"sprites/spr_ship_ammer/spr_ship_ammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c02728c4-68e1-453f-8fa8-598ef2561c23","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_apoc/spr_ship_apoc.yy b/sprites/spr_ship_apoc/spr_ship_apoc.yy index 2c2faf3b7a..d3f3356615 100644 --- a/sprites/spr_ship_apoc/spr_ship_apoc.yy +++ b/sprites/spr_ship_apoc/spr_ship_apoc.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_apoc", "bboxMode":0, "bbox_bottom":91, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":92.0, + "seqWidth":230.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"0bee0e78-a619-4cda-9d54-12a929878829","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":80, "yorigin":45, diff --git a/sprites/spr_ship_aven/3b549580-f553-4212-b6bb-c41c3ff18e19.png b/sprites/spr_ship_aven/3b549580-f553-4212-b6bb-c41c3ff18e19.png index 25638fed98..8721d9eeaf 100644 Binary files a/sprites/spr_ship_aven/3b549580-f553-4212-b6bb-c41c3ff18e19.png and b/sprites/spr_ship_aven/3b549580-f553-4212-b6bb-c41c3ff18e19.png differ diff --git a/sprites/spr_ship_aven/layers/3b549580-f553-4212-b6bb-c41c3ff18e19/6f5088c2-6f2d-4a04-8639-918cc91d0e0f.png b/sprites/spr_ship_aven/layers/3b549580-f553-4212-b6bb-c41c3ff18e19/6f5088c2-6f2d-4a04-8639-918cc91d0e0f.png index 25638fed98..ec2c32da63 100644 Binary files a/sprites/spr_ship_aven/layers/3b549580-f553-4212-b6bb-c41c3ff18e19/6f5088c2-6f2d-4a04-8639-918cc91d0e0f.png and b/sprites/spr_ship_aven/layers/3b549580-f553-4212-b6bb-c41c3ff18e19/6f5088c2-6f2d-4a04-8639-918cc91d0e0f.png differ diff --git a/sprites/spr_ship_aven/spr_ship_aven.yy b/sprites/spr_ship_aven/spr_ship_aven.yy index 8e589bb085..adeacc17b9 100644 --- a/sprites/spr_ship_aven/spr_ship_aven.yy +++ b/sprites/spr_ship_aven/spr_ship_aven.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_aven", "bboxMode":0, "bbox_bottom":59, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3b549580-f553-4212-b6bb-c41c3ff18e19","name":"3b549580-f553-4212-b6bb-c41c3ff18e19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b549580-f553-4212-b6bb-c41c3ff18e19","name":"3b549580-f553-4212-b6bb-c41c3ff18e19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":60.0, + "seqWidth":165.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"5c4593dc-7dbb-404f-8004-0357ea802527","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":82, "yorigin":30, diff --git a/sprites/spr_ship_back_black/spr_ship_back_black.yy b/sprites/spr_ship_back_black/spr_ship_back_black.yy index d17a11420a..56de7d6ac3 100644 --- a/sprites/spr_ship_back_black/spr_ship_back_black.yy +++ b/sprites/spr_ship_back_black/spr_ship_back_black.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_back_black", "bboxMode":0, "bbox_bottom":116, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"41b410c3-01c1-440c-bd9d-40498f3ee679","name":"41b410c3-01c1-440c-bd9d-40498f3ee679","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f84f2a39-f16e-4874-809b-e99be35df387","name":"f84f2a39-f16e-4874-809b-e99be35df387","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f115bba-8dfa-467c-b850-6053b3321a30","name":"7f115bba-8dfa-467c-b850-6053b3321a30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41b410c3-01c1-440c-bd9d-40498f3ee679","name":"41b410c3-01c1-440c-bd9d-40498f3ee679","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","name":"00dd47db-65d6-4276-90cd-12c8e6708bcc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f84f2a39-f16e-4874-809b-e99be35df387","name":"f84f2a39-f16e-4874-809b-e99be35df387","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f115bba-8dfa-467c-b850-6053b3321a30","name":"7f115bba-8dfa-467c-b850-6053b3321a30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -66,6 +66,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":142.0, + "seqWidth":268.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_ship_back_white/spr_ship_back_white.yy b/sprites/spr_ship_back_white/spr_ship_back_white.yy index d13cbcd416..1b067cd323 100644 --- a/sprites/spr_ship_back_white/spr_ship_back_white.yy +++ b/sprites/spr_ship_back_white/spr_ship_back_white.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_back_white", "bboxMode":0, "bbox_bottom":116, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1aa71696-4ad5-412d-9f14-342cd38f5631","name":"1aa71696-4ad5-412d-9f14-342cd38f5631","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"36a2218b-dff1-41ce-890d-520e37171b31","name":"36a2218b-dff1-41ce-890d-520e37171b31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"965b4909-9ecd-4504-9ac1-ad7559c50805","name":"965b4909-9ecd-4504-9ac1-ad7559c50805","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1aa71696-4ad5-412d-9f14-342cd38f5631","name":"1aa71696-4ad5-412d-9f14-342cd38f5631","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"36a2218b-dff1-41ce-890d-520e37171b31","name":"36a2218b-dff1-41ce-890d-520e37171b31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","name":"5af2c4c0-c4b0-47ad-a7f1-8ec1d4aea4cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"965b4909-9ecd-4504-9ac1-ad7559c50805","name":"965b4909-9ecd-4504-9ac1-ad7559c50805","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -66,6 +66,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":142.0, + "seqWidth":268.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_ship_bb/spr_ship_bb.yy b/sprites/spr_ship_bb/spr_ship_bb.yy index 50acd34237..3d8709745b 100644 --- a/sprites/spr_ship_bb/spr_ship_bb.yy +++ b/sprites/spr_ship_bb/spr_ship_bb.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_bb", "bboxMode":0, "bbox_bottom":107, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"96ec14b1-8003-4935-8f74-42e9b2745881","name":"96ec14b1-8003-4935-8f74-42e9b2745881","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96ec14b1-8003-4935-8f74-42e9b2745881","name":"96ec14b1-8003-4935-8f74-42e9b2745881","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,14 +63,14 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":112.0, + "seqWidth":311.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96ec14b1-8003-4935-8f74-42e9b2745881","path":"sprites/spr_ship_bb/spr_ship_bb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6633c984-3753-45cd-96e4-8b814e874c8f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96ec14b1-8003-4935-8f74-42e9b2745881","path":"sprites/spr_ship_bb/spr_ship_bb.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6633c984-3753-45cd-96e4-8b814e874c8f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ship_black/spr_ship_black.yy b/sprites/spr_ship_black/spr_ship_black.yy index 88d9588b5d..2f96c2bfb1 100644 --- a/sprites/spr_ship_black/spr_ship_black.yy +++ b/sprites/spr_ship_black/spr_ship_black.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_black", "bboxMode":0, "bbox_bottom":59, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1160e664-0428-462e-a0fa-9720be0f263d","name":"1160e664-0428-462e-a0fa-9720be0f263d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1160e664-0428-462e-a0fa-9720be0f263d","name":"1160e664-0428-462e-a0fa-9720be0f263d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1160e664-0428-462e-a0fa-9720be0f263d","path":"sprites/spr_ship_black/spr_ship_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ac1354f0-7622-4cc8-8099-1ffdb0d0c310","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1160e664-0428-462e-a0fa-9720be0f263d","path":"sprites/spr_ship_black/spr_ship_black.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ac1354f0-7622-4cc8-8099-1ffdb0d0c310","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_cairn/spr_ship_cairn.yy b/sprites/spr_ship_cairn/spr_ship_cairn.yy index 493b59d7f2..98f171ad00 100644 --- a/sprites/spr_ship_cairn/spr_ship_cairn.yy +++ b/sprites/spr_ship_cairn/spr_ship_cairn.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_cairn", "bboxMode":0, "bbox_bottom":190, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"daf4a208-d2c2-43b3-9ac8-014c8f7d2d83","name":"daf4a208-d2c2-43b3-9ac8-014c8f7d2d83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"daf4a208-d2c2-43b3-9ac8-014c8f7d2d83","name":"daf4a208-d2c2-43b3-9ac8-014c8f7d2d83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daf4a208-d2c2-43b3-9ac8-014c8f7d2d83","path":"sprites/spr_ship_cairn/spr_ship_cairn.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"602e325e-4d92-43dc-baf7-5933f1213a55","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daf4a208-d2c2-43b3-9ac8-014c8f7d2d83","path":"sprites/spr_ship_cairn/spr_ship_cairn.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"602e325e-4d92-43dc-baf7-5933f1213a55","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_carnage/spr_ship_carnage.yy b/sprites/spr_ship_carnage/spr_ship_carnage.yy index 9886132837..962f5c3041 100644 --- a/sprites/spr_ship_carnage/spr_ship_carnage.yy +++ b/sprites/spr_ship_carnage/spr_ship_carnage.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_carnage", "bboxMode":0, "bbox_bottom":45, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cd11c84c-47ae-4e57-9b99-f34b1015940e","name":"cd11c84c-47ae-4e57-9b99-f34b1015940e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd11c84c-47ae-4e57-9b99-f34b1015940e","name":"cd11c84c-47ae-4e57-9b99-f34b1015940e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd11c84c-47ae-4e57-9b99-f34b1015940e","path":"sprites/spr_ship_carnage/spr_ship_carnage.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bee4553-fc2f-442d-9707-5190ea802b9f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd11c84c-47ae-4e57-9b99-f34b1015940e","path":"sprites/spr_ship_carnage/spr_ship_carnage.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bee4553-fc2f-442d-9707-5190ea802b9f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_castellan/spr_ship_castellan.yy b/sprites/spr_ship_castellan/spr_ship_castellan.yy index aed43c53c6..22d8ef5c2d 100644 --- a/sprites/spr_ship_castellan/spr_ship_castellan.yy +++ b/sprites/spr_ship_castellan/spr_ship_castellan.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_castellan", "bboxMode":0, "bbox_bottom":83, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3224b95f-84a0-4626-a51b-35b507429cc9","name":"3224b95f-84a0-4626-a51b-35b507429cc9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3224b95f-84a0-4626-a51b-35b507429cc9","name":"3224b95f-84a0-4626-a51b-35b507429cc9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3224b95f-84a0-4626-a51b-35b507429cc9","path":"sprites/spr_ship_castellan/spr_ship_castellan.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a2a64330-a52a-4a89-9633-babd1b2c633d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3224b95f-84a0-4626-a51b-35b507429cc9","path":"sprites/spr_ship_castellan/spr_ship_castellan.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a2a64330-a52a-4a89-9633-babd1b2c633d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_craftworld/spr_ship_craftworld.yy b/sprites/spr_ship_craftworld/spr_ship_craftworld.yy index 3b73f1bc63..b006c6fe9f 100644 --- a/sprites/spr_ship_craftworld/spr_ship_craftworld.yy +++ b/sprites/spr_ship_craftworld/spr_ship_craftworld.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_craftworld", "bboxMode":0, "bbox_bottom":319, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"277fd817-4103-4272-9c5e-bf244d349ad3","name":"277fd817-4103-4272-9c5e-bf244d349ad3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"277fd817-4103-4272-9c5e-bf244d349ad3","name":"277fd817-4103-4272-9c5e-bf244d349ad3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"277fd817-4103-4272-9c5e-bf244d349ad3","path":"sprites/spr_ship_craftworld/spr_ship_craftworld.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b33532c1-2896-4b70-ae77-1de4c9948658","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"277fd817-4103-4272-9c5e-bf244d349ad3","path":"sprites/spr_ship_craftworld/spr_ship_craftworld.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b33532c1-2896-4b70-ae77-1de4c9948658","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_custodian/spr_ship_custodian.yy b/sprites/spr_ship_custodian/spr_ship_custodian.yy index 96125f8653..fff5c7295b 100644 --- a/sprites/spr_ship_custodian/spr_ship_custodian.yy +++ b/sprites/spr_ship_custodian/spr_ship_custodian.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_custodian", "bboxMode":0, "bbox_bottom":222, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e58cb568-7cf6-4f96-881f-f23673f4daae","name":"e58cb568-7cf6-4f96-881f-f23673f4daae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e58cb568-7cf6-4f96-881f-f23673f4daae","name":"e58cb568-7cf6-4f96-881f-f23673f4daae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e58cb568-7cf6-4f96-881f-f23673f4daae","path":"sprites/spr_ship_custodian/spr_ship_custodian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1cb5bffe-8f97-4870-9150-067479ba4b19","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e58cb568-7cf6-4f96-881f-f23673f4daae","path":"sprites/spr_ship_custodian/spr_ship_custodian.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1cb5bffe-8f97-4870-9150-067479ba4b19","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_daemon/spr_ship_daemon.yy b/sprites/spr_ship_daemon/spr_ship_daemon.yy index 02fcb04b85..a39ed98c37 100644 --- a/sprites/spr_ship_daemon/spr_ship_daemon.yy +++ b/sprites/spr_ship_daemon/spr_ship_daemon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_daemon", "bboxMode":0, "bbox_bottom":49, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"90ed25d5-5cbb-46f8-a5f5-bd059e3a3240","name":"90ed25d5-5cbb-46f8-a5f5-bd059e3a3240","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90ed25d5-5cbb-46f8-a5f5-bd059e3a3240","name":"90ed25d5-5cbb-46f8-a5f5-bd059e3a3240","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90ed25d5-5cbb-46f8-a5f5-bd059e3a3240","path":"sprites/spr_ship_daemon/spr_ship_daemon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0600b960-8db3-43f5-ad86-98323bda79fe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90ed25d5-5cbb-46f8-a5f5-bd059e3a3240","path":"sprites/spr_ship_daemon/spr_ship_daemon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0600b960-8db3-43f5-ad86-98323bda79fe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_dese/spr_ship_dese.yy b/sprites/spr_ship_dese/spr_ship_dese.yy index 7d87f1738f..82e0346573 100644 --- a/sprites/spr_ship_dese/spr_ship_dese.yy +++ b/sprites/spr_ship_dese/spr_ship_dese.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_dese", "bboxMode":0, "bbox_bottom":80, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e92274f-9009-40ac-bc73-a614141501a6","name":"9e92274f-9009-40ac-bc73-a614141501a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e92274f-9009-40ac-bc73-a614141501a6","name":"9e92274f-9009-40ac-bc73-a614141501a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e92274f-9009-40ac-bc73-a614141501a6","path":"sprites/spr_ship_dese/spr_ship_dese.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ded885e-1a85-4322-86f3-622e3d240e2a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e92274f-9009-40ac-bc73-a614141501a6","path":"sprites/spr_ship_dese/spr_ship_dese.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ded885e-1a85-4322-86f3-622e3d240e2a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ship_deth/spr_ship_deth.yy b/sprites/spr_ship_deth/spr_ship_deth.yy index 559ed272b6..f8db12b1da 100644 --- a/sprites/spr_ship_deth/spr_ship_deth.yy +++ b/sprites/spr_ship_deth/spr_ship_deth.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_deth", "bboxMode":0, "bbox_bottom":79, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"32535205-6fbd-4e16-bcfa-b50dc43fa707","name":"32535205-6fbd-4e16-bcfa-b50dc43fa707","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"32535205-6fbd-4e16-bcfa-b50dc43fa707","name":"32535205-6fbd-4e16-bcfa-b50dc43fa707","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,20 +63,17 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":91.0, + "seqWidth":172.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"32535205-6fbd-4e16-bcfa-b50dc43fa707","path":"sprites/spr_ship_deth/spr_ship_deth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69824969-8aec-4e69-b60d-c2a00439a438","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"32535205-6fbd-4e16-bcfa-b50dc43fa707","path":"sprites/spr_ship_deth/spr_ship_deth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69824969-8aec-4e69-b60d-c2a00439a438","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":86, "yorigin":45, diff --git a/sprites/spr_ship_dirge/spr_ship_dirge.yy b/sprites/spr_ship_dirge/spr_ship_dirge.yy index 0861a1375b..92155fd0cd 100644 --- a/sprites/spr_ship_dirge/spr_ship_dirge.yy +++ b/sprites/spr_ship_dirge/spr_ship_dirge.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_dirge", "bboxMode":0, "bbox_bottom":90, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c5565f16-87ee-484b-a3fa-776d094d2629","name":"c5565f16-87ee-484b-a3fa-776d094d2629","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5565f16-87ee-484b-a3fa-776d094d2629","name":"c5565f16-87ee-484b-a3fa-776d094d2629","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5565f16-87ee-484b-a3fa-776d094d2629","path":"sprites/spr_ship_dirge/spr_ship_dirge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9a80a4a-48e8-47db-a92e-23554ce30ecc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5565f16-87ee-484b-a3fa-776d094d2629","path":"sprites/spr_ship_dirge/spr_ship_dirge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9a80a4a-48e8-47db-a92e-23554ce30ecc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_dreadclaw/spr_ship_dreadclaw.yy b/sprites/spr_ship_dreadclaw/spr_ship_dreadclaw.yy index 26dc0a5758..2c842669bd 100644 --- a/sprites/spr_ship_dreadclaw/spr_ship_dreadclaw.yy +++ b/sprites/spr_ship_dreadclaw/spr_ship_dreadclaw.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_dreadclaw", "bboxMode":0, "bbox_bottom":20, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d33e8f9e-1c99-40eb-8eda-e532cfe2194a","name":"d33e8f9e-1c99-40eb-8eda-e532cfe2194a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d33e8f9e-1c99-40eb-8eda-e532cfe2194a","name":"d33e8f9e-1c99-40eb-8eda-e532cfe2194a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d33e8f9e-1c99-40eb-8eda-e532cfe2194a","path":"sprites/spr_ship_dreadclaw/spr_ship_dreadclaw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97bff932-8634-4a28-b278-fb211a2d59fc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d33e8f9e-1c99-40eb-8eda-e532cfe2194a","path":"sprites/spr_ship_dreadclaw/spr_ship_dreadclaw.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97bff932-8634-4a28-b278-fb211a2d59fc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_emissary/spr_ship_emissary.yy b/sprites/spr_ship_emissary/spr_ship_emissary.yy index b542535371..43fe658e40 100644 --- a/sprites/spr_ship_emissary/spr_ship_emissary.yy +++ b/sprites/spr_ship_emissary/spr_ship_emissary.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_emissary", "bboxMode":0, "bbox_bottom":115, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"64bd879f-5681-42f8-a1ca-d51c0625d460","name":"64bd879f-5681-42f8-a1ca-d51c0625d460","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64bd879f-5681-42f8-a1ca-d51c0625d460","name":"64bd879f-5681-42f8-a1ca-d51c0625d460","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64bd879f-5681-42f8-a1ca-d51c0625d460","path":"sprites/spr_ship_emissary/spr_ship_emissary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"67fac36f-c8fb-4799-a125-1ae93af67e18","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64bd879f-5681-42f8-a1ca-d51c0625d460","path":"sprites/spr_ship_emissary/spr_ship_emissary.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67fac36f-c8fb-4799-a125-1ae93af67e18","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_glad/spr_ship_glad.yy b/sprites/spr_ship_glad/spr_ship_glad.yy index 9cc53775ef..8f67c0bf03 100644 --- a/sprites/spr_ship_glad/spr_ship_glad.yy +++ b/sprites/spr_ship_glad/spr_ship_glad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_glad", "bboxMode":0, "bbox_bottom":29, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,20 +63,17 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":30.0, + "seqWidth":79.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","path":"sprites/spr_ship_glad/spr_ship_glad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc542ebd-2f6e-43f1-b053-8b4014539608","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be2b8b48-0ab2-4b69-b879-4af5e4ede8a4","path":"sprites/spr_ship_glad/spr_ship_glad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc542ebd-2f6e-43f1-b053-8b4014539608","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":39, "yorigin":15, diff --git a/sprites/spr_ship_gorbag/spr_ship_gorbag.yy b/sprites/spr_ship_gorbag/spr_ship_gorbag.yy index c0aa6d77f8..b9f750856d 100644 --- a/sprites/spr_ship_gorbag/spr_ship_gorbag.yy +++ b/sprites/spr_ship_gorbag/spr_ship_gorbag.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_gorbag", "bboxMode":0, "bbox_bottom":92, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ba55eaf2-fb08-45e8-981a-cfa282a5a010","name":"ba55eaf2-fb08-45e8-981a-cfa282a5a010","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ba55eaf2-fb08-45e8-981a-cfa282a5a010","name":"ba55eaf2-fb08-45e8-981a-cfa282a5a010","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,20 +63,17 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":101.0, + "seqWidth":166.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba55eaf2-fb08-45e8-981a-cfa282a5a010","path":"sprites/spr_ship_gorbag/spr_ship_gorbag.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f104132a-3439-4d37-88e1-75d95f3f8607","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ba55eaf2-fb08-45e8-981a-cfa282a5a010","path":"sprites/spr_ship_gorbag/spr_ship_gorbag.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f104132a-3439-4d37-88e1-75d95f3f8607","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":83, "yorigin":50, diff --git a/sprites/spr_ship_hellebore/spr_ship_hellebore.yy b/sprites/spr_ship_hellebore/spr_ship_hellebore.yy index c58946c8a1..7575709a19 100644 --- a/sprites/spr_ship_hellebore/spr_ship_hellebore.yy +++ b/sprites/spr_ship_hellebore/spr_ship_hellebore.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_hellebore", "bboxMode":0, "bbox_bottom":29, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6b68f550-f04a-441f-a440-82ad542d0a30","name":"6b68f550-f04a-441f-a440-82ad542d0a30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6b68f550-f04a-441f-a440-82ad542d0a30","name":"6b68f550-f04a-441f-a440-82ad542d0a30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b68f550-f04a-441f-a440-82ad542d0a30","path":"sprites/spr_ship_hellebore/spr_ship_hellebore.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5969f53-a04e-459a-bcaf-8d79be1dd662","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b68f550-f04a-441f-a440-82ad542d0a30","path":"sprites/spr_ship_hellebore/spr_ship_hellebore.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5969f53-a04e-459a-bcaf-8d79be1dd662","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_hulk/spr_ship_hulk.yy b/sprites/spr_ship_hulk/spr_ship_hulk.yy index 1af5ec901e..9edd65bc16 100644 --- a/sprites/spr_ship_hulk/spr_ship_hulk.yy +++ b/sprites/spr_ship_hulk/spr_ship_hulk.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_hulk", "bboxMode":0, "bbox_bottom":407, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"81541e4e-2b46-4e16-8859-224aca1545b8","name":"81541e4e-2b46-4e16-8859-224aca1545b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"81541e4e-2b46-4e16-8859-224aca1545b8","name":"81541e4e-2b46-4e16-8859-224aca1545b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"81541e4e-2b46-4e16-8859-224aca1545b8","path":"sprites/spr_ship_hulk/spr_ship_hulk.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26ff0a1f-7db1-49af-b1cd-c7315bfcf762","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"81541e4e-2b46-4e16-8859-224aca1545b8","path":"sprites/spr_ship_hulk/spr_ship_hulk.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26ff0a1f-7db1-49af-b1cd-c7315bfcf762","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_hunt/spr_ship_hunt.yy b/sprites/spr_ship_hunt/spr_ship_hunt.yy index 71c7cd41d1..6375c77d2a 100644 --- a/sprites/spr_ship_hunt/spr_ship_hunt.yy +++ b/sprites/spr_ship_hunt/spr_ship_hunt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_hunt", "bboxMode":0, "bbox_bottom":23, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"691a7b56-f5f3-455c-971e-eb7d163628c2","name":"691a7b56-f5f3-455c-971e-eb7d163628c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"691a7b56-f5f3-455c-971e-eb7d163628c2","name":"691a7b56-f5f3-455c-971e-eb7d163628c2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,20 +63,17 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":25.0, + "seqWidth":70.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"691a7b56-f5f3-455c-971e-eb7d163628c2","path":"sprites/spr_ship_hunt/spr_ship_hunt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7c1b99c0-ab70-44a8-9a5a-0738a1058783","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"691a7b56-f5f3-455c-971e-eb7d163628c2","path":"sprites/spr_ship_hunt/spr_ship_hunt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7c1b99c0-ab70-44a8-9a5a-0738a1058783","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":35, "yorigin":12, diff --git a/sprites/spr_ship_icono/spr_ship_icono.yy b/sprites/spr_ship_icono/spr_ship_icono.yy index 0cd2646f99..3165c88287 100644 --- a/sprites/spr_ship_icono/spr_ship_icono.yy +++ b/sprites/spr_ship_icono/spr_ship_icono.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_icono", "bboxMode":0, "bbox_bottom":34, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d7b6e2bd-d9bc-4e49-83bc-d959fc26ba74","name":"d7b6e2bd-d9bc-4e49-83bc-d959fc26ba74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d7b6e2bd-d9bc-4e49-83bc-d959fc26ba74","name":"d7b6e2bd-d9bc-4e49-83bc-d959fc26ba74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7b6e2bd-d9bc-4e49-83bc-d959fc26ba74","path":"sprites/spr_ship_icono/spr_ship_icono.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3cf2dce6-1f4f-483b-8fcf-4856742320fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7b6e2bd-d9bc-4e49-83bc-d959fc26ba74","path":"sprites/spr_ship_icono/spr_ship_icono.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3cf2dce6-1f4f-483b-8fcf-4856742320fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_inter/spr_ship_inter.yy b/sprites/spr_ship_inter/spr_ship_inter.yy index 65425d0c97..f54842c376 100644 --- a/sprites/spr_ship_inter/spr_ship_inter.yy +++ b/sprites/spr_ship_inter/spr_ship_inter.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_inter", "bboxMode":0, "bbox_bottom":20, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"393aa440-3bae-402e-af32-abeecd9a0b5c","name":"393aa440-3bae-402e-af32-abeecd9a0b5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"393aa440-3bae-402e-af32-abeecd9a0b5c","name":"393aa440-3bae-402e-af32-abeecd9a0b5c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"393aa440-3bae-402e-af32-abeecd9a0b5c","path":"sprites/spr_ship_inter/spr_ship_inter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"65d75e07-bd0b-4485-925e-6b0873ef009f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"393aa440-3bae-402e-af32-abeecd9a0b5c","path":"sprites/spr_ship_inter/spr_ship_inter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"65d75e07-bd0b-4485-925e-6b0873ef009f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_jackal/spr_ship_jackal.yy b/sprites/spr_ship_jackal/spr_ship_jackal.yy index 5942c67b35..766b34cfda 100644 --- a/sprites/spr_ship_jackal/spr_ship_jackal.yy +++ b/sprites/spr_ship_jackal/spr_ship_jackal.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_jackal", "bboxMode":0, "bbox_bottom":103, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3063bdf1-a213-4fe3-a728-cc41b97965da","name":"3063bdf1-a213-4fe3-a728-cc41b97965da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3063bdf1-a213-4fe3-a728-cc41b97965da","name":"3063bdf1-a213-4fe3-a728-cc41b97965da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3063bdf1-a213-4fe3-a728-cc41b97965da","path":"sprites/spr_ship_jackal/spr_ship_jackal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cd273b51-3692-4062-b9a7-517780b9be01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3063bdf1-a213-4fe3-a728-cc41b97965da","path":"sprites/spr_ship_jackal/spr_ship_jackal.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cd273b51-3692-4062-b9a7-517780b9be01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_krool/spr_ship_krool.yy b/sprites/spr_ship_krool/spr_ship_krool.yy index 65da354558..cffad18d40 100644 --- a/sprites/spr_ship_krool/spr_ship_krool.yy +++ b/sprites/spr_ship_krool/spr_ship_krool.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_krool", "bboxMode":0, "bbox_bottom":74, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4f91b9df-9fa8-4f11-bb0d-dd33fcdcd75e","name":"4f91b9df-9fa8-4f11-bb0d-dd33fcdcd75e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f91b9df-9fa8-4f11-bb0d-dd33fcdcd75e","name":"4f91b9df-9fa8-4f11-bb0d-dd33fcdcd75e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f91b9df-9fa8-4f11-bb0d-dd33fcdcd75e","path":"sprites/spr_ship_krool/spr_ship_krool.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e7a4450f-59a6-451c-ba8f-d311b992363f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f91b9df-9fa8-4f11-bb0d-dd33fcdcd75e","path":"sprites/spr_ship_krool/spr_ship_krool.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e7a4450f-59a6-451c-ba8f-d311b992363f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_kroozer/spr_ship_kroozer.yy b/sprites/spr_ship_kroozer/spr_ship_kroozer.yy index beea25917d..81a594cafc 100644 --- a/sprites/spr_ship_kroozer/spr_ship_kroozer.yy +++ b/sprites/spr_ship_kroozer/spr_ship_kroozer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_kroozer", "bboxMode":0, "bbox_bottom":57, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c7ab190f-80bc-4a25-894a-0952346a02e3","name":"c7ab190f-80bc-4a25-894a-0952346a02e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c7ab190f-80bc-4a25-894a-0952346a02e3","name":"c7ab190f-80bc-4a25-894a-0952346a02e3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,20 +63,17 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":60.0, + "seqWidth":138.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7ab190f-80bc-4a25-894a-0952346a02e3","path":"sprites/spr_ship_kroozer/spr_ship_kroozer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7553d091-4021-4d8f-8705-9a7ea17ee8d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7ab190f-80bc-4a25-894a-0952346a02e3","path":"sprites/spr_ship_kroozer/spr_ship_kroozer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7553d091-4021-4d8f-8705-9a7ea17ee8d6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":69, "yorigin":30, diff --git a/sprites/spr_ship_leviathan/spr_ship_leviathan.yy b/sprites/spr_ship_leviathan/spr_ship_leviathan.yy index 0ec805bef7..a96a7b74cf 100644 --- a/sprites/spr_ship_leviathan/spr_ship_leviathan.yy +++ b/sprites/spr_ship_leviathan/spr_ship_leviathan.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_leviathan", "bboxMode":0, "bbox_bottom":90, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6cc70763-89ce-43c0-a254-cc94649feba6","name":"6cc70763-89ce-43c0-a254-cc94649feba6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6cc70763-89ce-43c0-a254-cc94649feba6","name":"6cc70763-89ce-43c0-a254-cc94649feba6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cc70763-89ce-43c0-a254-cc94649feba6","path":"sprites/spr_ship_leviathan/spr_ship_leviathan.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b0ac4187-2465-40eb-85b5-dc728746f758","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6cc70763-89ce-43c0-a254-cc94649feba6","path":"sprites/spr_ship_leviathan/spr_ship_leviathan.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b0ac4187-2465-40eb-85b5-dc728746f758","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_nem/spr_ship_nem.yy b/sprites/spr_ship_nem/spr_ship_nem.yy index 50e26038d8..8e55215f6d 100644 --- a/sprites/spr_ship_nem/spr_ship_nem.yy +++ b/sprites/spr_ship_nem/spr_ship_nem.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_nem", "bboxMode":0, "bbox_bottom":91, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":92.0, + "seqWidth":230.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"d9a533f1-3c83-49c3-9c5a-644d09d03580","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":100, "yorigin":45, diff --git a/sprites/spr_ship_protector/spr_ship_protector.yy b/sprites/spr_ship_protector/spr_ship_protector.yy index c3cd30076a..ffbed4213a 100644 --- a/sprites/spr_ship_protector/spr_ship_protector.yy +++ b/sprites/spr_ship_protector/spr_ship_protector.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_protector", "bboxMode":0, "bbox_bottom":163, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"aa829dc1-929b-4987-91e0-c6059198a0ac","name":"aa829dc1-929b-4987-91e0-c6059198a0ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aa829dc1-929b-4987-91e0-c6059198a0ac","name":"aa829dc1-929b-4987-91e0-c6059198a0ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa829dc1-929b-4987-91e0-c6059198a0ac","path":"sprites/spr_ship_protector/spr_ship_protector.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ae69cb97-130e-449c-a631-88426f264c8d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa829dc1-929b-4987-91e0-c6059198a0ac","path":"sprites/spr_ship_protector/spr_ship_protector.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ae69cb97-130e-449c-a631-88426f264c8d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_prowler/spr_ship_prowler.yy b/sprites/spr_ship_prowler/spr_ship_prowler.yy index a6bb4ca1e7..770df48f2a 100644 --- a/sprites/spr_ship_prowler/spr_ship_prowler.yy +++ b/sprites/spr_ship_prowler/spr_ship_prowler.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_prowler", "bboxMode":0, "bbox_bottom":44, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"44887184-b806-4f09-bcd1-814d58f1e37f","name":"44887184-b806-4f09-bcd1-814d58f1e37f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"44887184-b806-4f09-bcd1-814d58f1e37f","name":"44887184-b806-4f09-bcd1-814d58f1e37f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"44887184-b806-4f09-bcd1-814d58f1e37f","path":"sprites/spr_ship_prowler/spr_ship_prowler.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"369c475b-1a5f-4ff3-94f8-14a2ff02d272","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"44887184-b806-4f09-bcd1-814d58f1e37f","path":"sprites/spr_ship_prowler/spr_ship_prowler.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"369c475b-1a5f-4ff3-94f8-14a2ff02d272","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_ravager/spr_ship_ravager.yy b/sprites/spr_ship_ravager/spr_ship_ravager.yy index 93af5424ef..fb0c332183 100644 --- a/sprites/spr_ship_ravager/spr_ship_ravager.yy +++ b/sprites/spr_ship_ravager/spr_ship_ravager.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_ravager", "bboxMode":0, "bbox_bottom":32, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"707cc706-dd30-4efe-a19d-4aaa095f781a","name":"707cc706-dd30-4efe-a19d-4aaa095f781a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"707cc706-dd30-4efe-a19d-4aaa095f781a","name":"707cc706-dd30-4efe-a19d-4aaa095f781a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"707cc706-dd30-4efe-a19d-4aaa095f781a","path":"sprites/spr_ship_ravager/spr_ship_ravager.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d47814c5-4403-42e6-a7e1-813d00520084","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"707cc706-dd30-4efe-a19d-4aaa095f781a","path":"sprites/spr_ship_ravager/spr_ship_ravager.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d47814c5-4403-42e6-a7e1-813d00520084","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy b/sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy index 2e418882f3..19c898dfce 100644 --- a/sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy +++ b/sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_razorfiend", "bboxMode":0, "bbox_bottom":88, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0b9df6cb-28ec-4e75-b875-657f2f86c6a7","name":"0b9df6cb-28ec-4e75-b875-657f2f86c6a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0b9df6cb-28ec-4e75-b875-657f2f86c6a7","name":"0b9df6cb-28ec-4e75-b875-657f2f86c6a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b9df6cb-28ec-4e75-b875-657f2f86c6a7","path":"sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e4561a1-64f7-4e04-b03c-13b5699b5686","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b9df6cb-28ec-4e75-b875-657f2f86c6a7","path":"sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e4561a1-64f7-4e04-b03c-13b5699b5686","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_reaper/spr_ship_reaper.yy b/sprites/spr_ship_reaper/spr_ship_reaper.yy index b02d77c1b5..654b32ffe7 100644 --- a/sprites/spr_ship_reaper/spr_ship_reaper.yy +++ b/sprites/spr_ship_reaper/spr_ship_reaper.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_reaper", "bboxMode":0, "bbox_bottom":133, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9f3f9e9d-fc78-4a1c-bfa6-c8b415cac5f8","name":"9f3f9e9d-fc78-4a1c-bfa6-c8b415cac5f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f3f9e9d-fc78-4a1c-bfa6-c8b415cac5f8","name":"9f3f9e9d-fc78-4a1c-bfa6-c8b415cac5f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f3f9e9d-fc78-4a1c-bfa6-c8b415cac5f8","path":"sprites/spr_ship_reaper/spr_ship_reaper.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"039617f9-7696-438d-bdab-4e9fcf4ded4b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f3f9e9d-fc78-4a1c-bfa6-c8b415cac5f8","path":"sprites/spr_ship_reaper/spr_ship_reaper.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"039617f9-7696-438d-bdab-4e9fcf4ded4b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_shadow/spr_ship_shadow.yy b/sprites/spr_ship_shadow/spr_ship_shadow.yy index 6e0fe26314..45126851a7 100644 --- a/sprites/spr_ship_shadow/spr_ship_shadow.yy +++ b/sprites/spr_ship_shadow/spr_ship_shadow.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_shadow", "bboxMode":0, "bbox_bottom":107, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bb6866c4-a79e-4651-a7bb-7a7a530bf7d3","name":"bb6866c4-a79e-4651-a7bb-7a7a530bf7d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb6866c4-a79e-4651-a7bb-7a7a530bf7d3","name":"bb6866c4-a79e-4651-a7bb-7a7a530bf7d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":111.0, + "seqWidth":170.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -73,10 +75,7 @@ },"Disabled":false,"id":"3bf9d86d-79ff-4645-87d1-9c999e8b1c1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":85, "yorigin":55, diff --git a/sprites/spr_ship_shroud/spr_ship_shroud.yy b/sprites/spr_ship_shroud/spr_ship_shroud.yy index 0ee2f0e56c..d9143bad03 100644 --- a/sprites/spr_ship_shroud/spr_ship_shroud.yy +++ b/sprites/spr_ship_shroud/spr_ship_shroud.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_shroud", "bboxMode":0, "bbox_bottom":134, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7d4f0fc8-fba6-48fa-a81e-670dc23d1ce7","name":"7d4f0fc8-fba6-48fa-a81e-670dc23d1ce7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d4f0fc8-fba6-48fa-a81e-670dc23d1ce7","name":"7d4f0fc8-fba6-48fa-a81e-670dc23d1ce7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d4f0fc8-fba6-48fa-a81e-670dc23d1ce7","path":"sprites/spr_ship_shroud/spr_ship_shroud.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11e928b5-b85a-4cf4-88b6-c59c618a9f75","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7d4f0fc8-fba6-48fa-a81e-670dc23d1ce7","path":"sprites/spr_ship_shroud/spr_ship_shroud.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11e928b5-b85a-4cf4-88b6-c59c618a9f75","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_slam/spr_ship_slam.yy b/sprites/spr_ship_slam/spr_ship_slam.yy index 0064e6edd5..2ef5b5dff5 100644 --- a/sprites/spr_ship_slam/spr_ship_slam.yy +++ b/sprites/spr_ship_slam/spr_ship_slam.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_slam", "bboxMode":0, "bbox_bottom":72, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d237a8dc-12ac-44a8-8063-fc43c3c39fa6","name":"d237a8dc-12ac-44a8-8063-fc43c3c39fa6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d237a8dc-12ac-44a8-8063-fc43c3c39fa6","name":"d237a8dc-12ac-44a8-8063-fc43c3c39fa6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d237a8dc-12ac-44a8-8063-fc43c3c39fa6","path":"sprites/spr_ship_slam/spr_ship_slam.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc3eb73e-f4d8-43c8-8e66-26a1d3da703f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d237a8dc-12ac-44a8-8063-fc43c3c39fa6","path":"sprites/spr_ship_slam/spr_ship_slam.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc3eb73e-f4d8-43c8-8e66-26a1d3da703f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_song/spr_ship_song.yy b/sprites/spr_ship_song/spr_ship_song.yy index 73d98f425b..3b0b109fbd 100644 --- a/sprites/spr_ship_song/spr_ship_song.yy +++ b/sprites/spr_ship_song/spr_ship_song.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_song", "bboxMode":0, "bbox_bottom":144, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,14 +63,14 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":150.0, + "seqWidth":350.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","path":"sprites/spr_ship_song/spr_ship_song.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c049868-56f8-4a4a-b66e-0a379b5bd341","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f882f8a-eb3f-4429-b7ee-96426a62cfce","path":"sprites/spr_ship_song/spr_ship_song.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c049868-56f8-4a4a-b66e-0a379b5bd341","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ship_stalker/spr_ship_stalker.yy b/sprites/spr_ship_stalker/spr_ship_stalker.yy index 74c4e1ba27..01012e222c 100644 --- a/sprites/spr_ship_stalker/spr_ship_stalker.yy +++ b/sprites/spr_ship_stalker/spr_ship_stalker.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_stalker", "bboxMode":0, "bbox_bottom":40, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2db40a3c-713e-46c8-8e8f-b7874235cbee","name":"2db40a3c-713e-46c8-8e8f-b7874235cbee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2db40a3c-713e-46c8-8e8f-b7874235cbee","name":"2db40a3c-713e-46c8-8e8f-b7874235cbee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2db40a3c-713e-46c8-8e8f-b7874235cbee","path":"sprites/spr_ship_stalker/spr_ship_stalker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a4010b0-a750-414c-a074-7960ed916a8b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2db40a3c-713e-46c8-8e8f-b7874235cbee","path":"sprites/spr_ship_stalker/spr_ship_stalker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a4010b0-a750-414c-a074-7960ed916a8b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_stri/spr_ship_stri.yy b/sprites/spr_ship_stri/spr_ship_stri.yy index cb58b58721..134b41cd10 100644 --- a/sprites/spr_ship_stri/spr_ship_stri.yy +++ b/sprites/spr_ship_stri/spr_ship_stri.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_stri", "bboxMode":0, "bbox_bottom":50, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,20 +63,17 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":51.0, + "seqWidth":131.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","path":"sprites/spr_ship_stri/spr_ship_stri.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"43a254cb-346b-4949-bbdc-8440067748f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9f7a1f3-c0fb-4f8b-b270-14a3cb990890","path":"sprites/spr_ship_stri/spr_ship_stri.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"43a254cb-346b-4949-bbdc-8440067748f4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":65, "yorigin":25, diff --git a/sprites/spr_ship_sword/spr_ship_sword.yy b/sprites/spr_ship_sword/spr_ship_sword.yy index 8724fc38f1..bc0c935800 100644 --- a/sprites/spr_ship_sword/spr_ship_sword.yy +++ b/sprites/spr_ship_sword/spr_ship_sword.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_sword", "bboxMode":0, "bbox_bottom":22, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b0f97522-d3a1-44a4-955a-d60e67613c61","name":"b0f97522-d3a1-44a4-955a-d60e67613c61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b0f97522-d3a1-44a4-955a-d60e67613c61","name":"b0f97522-d3a1-44a4-955a-d60e67613c61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0f97522-d3a1-44a4-955a-d60e67613c61","path":"sprites/spr_ship_sword/spr_ship_sword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1a9df30a-a4ff-4310-981b-fd2b9038034a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0f97522-d3a1-44a4-955a-d60e67613c61","path":"sprites/spr_ship_sword/spr_ship_sword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1a9df30a-a4ff-4310-981b-fd2b9038034a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_th/spr_ship_th.yy b/sprites/spr_ship_th/spr_ship_th.yy index c63e4499b4..67ef0f9262 100644 --- a/sprites/spr_ship_th/spr_ship_th.yy +++ b/sprites/spr_ship_th/spr_ship_th.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_th", "bboxMode":0, "bbox_bottom":20, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"67140c44-e0e7-4b0d-b2f5-e9385f381067","name":"67140c44-e0e7-4b0d-b2f5-e9385f381067","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67140c44-e0e7-4b0d-b2f5-e9385f381067","name":"67140c44-e0e7-4b0d-b2f5-e9385f381067","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67140c44-e0e7-4b0d-b2f5-e9385f381067","path":"sprites/spr_ship_th/spr_ship_th.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04c54e34-ade2-4147-82b0-3f873c34c30a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67140c44-e0e7-4b0d-b2f5-e9385f381067","path":"sprites/spr_ship_th/spr_ship_th.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04c54e34-ade2-4147-82b0-3f873c34c30a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_veng/spr_ship_veng.yy b/sprites/spr_ship_veng/spr_ship_veng.yy index a29eda5f94..0f9682df11 100644 --- a/sprites/spr_ship_veng/spr_ship_veng.yy +++ b/sprites/spr_ship_veng/spr_ship_veng.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_veng", "bboxMode":0, "bbox_bottom":58, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c0b9020c-add6-4831-bc5f-f3d7d1a4030b","name":"c0b9020c-add6-4831-bc5f-f3d7d1a4030b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0b9020c-add6-4831-bc5f-f3d7d1a4030b","name":"c0b9020c-add6-4831-bc5f-f3d7d1a4030b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0b9020c-add6-4831-bc5f-f3d7d1a4030b","path":"sprites/spr_ship_veng/spr_ship_veng.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"127ec400-7ba9-4185-8a45-4c9a23e595a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0b9020c-add6-4831-bc5f-f3d7d1a4030b","path":"sprites/spr_ship_veng/spr_ship_veng.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"127ec400-7ba9-4185-8a45-4c9a23e595a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_void/spr_ship_void.yy b/sprites/spr_ship_void/spr_ship_void.yy index 84b427d583..f84483ae71 100644 --- a/sprites/spr_ship_void/spr_ship_void.yy +++ b/sprites/spr_ship_void/spr_ship_void.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_void", "bboxMode":0, "bbox_bottom":151, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0d2ddf8e-1645-4518-927f-068bd10ba6d0","name":"0d2ddf8e-1645-4518-927f-068bd10ba6d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0d2ddf8e-1645-4518-927f-068bd10ba6d0","name":"0d2ddf8e-1645-4518-927f-068bd10ba6d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d2ddf8e-1645-4518-927f-068bd10ba6d0","path":"sprites/spr_ship_void/spr_ship_void.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"712cdbb6-4651-48ff-ab35-b7c717708be8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d2ddf8e-1645-4518-927f-068bd10ba6d0","path":"sprites/spr_ship_void/spr_ship_void.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"712cdbb6-4651-48ff-ab35-b7c717708be8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ship_warden/spr_ship_warden.yy b/sprites/spr_ship_warden/spr_ship_warden.yy index e1af6526fb..6c1786db0f 100644 --- a/sprites/spr_ship_warden/spr_ship_warden.yy +++ b/sprites/spr_ship_warden/spr_ship_warden.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ship_warden", "bboxMode":0, "bbox_bottom":70, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a1ad8039-e998-4feb-a162-38d6960fe860","name":"a1ad8039-e998-4feb-a162-38d6960fe860","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a1ad8039-e998-4feb-a162-38d6960fe860","name":"a1ad8039-e998-4feb-a162-38d6960fe860","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a1ad8039-e998-4feb-a162-38d6960fe860","path":"sprites/spr_ship_warden/spr_ship_warden.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f81da50e-d3bb-4920-a16f-40b833647603","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a1ad8039-e998-4feb-a162-38d6960fe860","path":"sprites/spr_ship_warden/spr_ship_warden.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f81da50e-d3bb-4920-a16f-40b833647603","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_shutter_button/b15ff156-9439-4de5-a856-2c34927170fc.png b/sprites/spr_shutter_button/b15ff156-9439-4de5-a856-2c34927170fc.png new file mode 100644 index 0000000000..2beb9c24fb Binary files /dev/null and b/sprites/spr_shutter_button/b15ff156-9439-4de5-a856-2c34927170fc.png differ diff --git a/sprites/spr_shutter_button/layers/b15ff156-9439-4de5-a856-2c34927170fc/b201671b-7405-4bb4-ab4e-e9c0d0be9fe7.png b/sprites/spr_shutter_button/layers/b15ff156-9439-4de5-a856-2c34927170fc/b201671b-7405-4bb4-ab4e-e9c0d0be9fe7.png new file mode 100644 index 0000000000..2beb9c24fb Binary files /dev/null and b/sprites/spr_shutter_button/layers/b15ff156-9439-4de5-a856-2c34927170fc/b201671b-7405-4bb4-ab4e-e9c0d0be9fe7.png differ diff --git a/sprites/spr_shutter_button/spr_shutter_button.yy b/sprites/spr_shutter_button/spr_shutter_button.yy index 3e0d4ff753..bdc868d099 100644 --- a/sprites/spr_shutter_button/spr_shutter_button.yy +++ b/sprites/spr_shutter_button/spr_shutter_button.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_shutter_button", "bboxMode":0, "bbox_bottom":505, @@ -12,13 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a33f3820-f817-47b2-93f6-e09657a03620","name":"a33f3820-f817-47b2-93f6-e09657a03620","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aea54f21-da01-4b3e-9c86-4eea4991976a","name":"aea54f21-da01-4b3e-9c86-4eea4991976a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b44ab3a-cd61-4236-9265-0539c255cabf","name":"2b44ab3a-cd61-4236-9265-0539c255cabf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14089c53-1775-4c86-81db-815184b41de3","name":"14089c53-1775-4c86-81db-815184b41de3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a33f3820-f817-47b2-93f6-e09657a03620","name":"a33f3820-f817-47b2-93f6-e09657a03620","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aea54f21-da01-4b3e-9c86-4eea4991976a","name":"aea54f21-da01-4b3e-9c86-4eea4991976a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b15ff156-9439-4de5-a856-2c34927170fc","name":"b15ff156-9439-4de5-a856-2c34927170fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b44ab3a-cd61-4236-9265-0539c255cabf","name":"2b44ab3a-cd61-4236-9265-0539c255cabf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14089c53-1775-4c86-81db-815184b41de3","name":"14089c53-1775-4c86-81db-815184b41de3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -55,7 +56,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":7.0, + "length":8.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -69,6 +70,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":1080.0, + "seqWidth":1000.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -83,18 +86,21 @@ {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aea54f21-da01-4b3e-9c86-4eea4991976a","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"42f184d7-359c-409a-86f2-4fb35d8de685","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b15ff156-9439-4de5-a856-2c34927170fc","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0a228cdb-c153-462e-b5cc-f9d8a24e6b2d","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b44ab3a-cd61-4236-9265-0539c255cabf","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f847a9bf-64e9-41a5-8c31-b4b1085f5841","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"f847a9bf-64e9-41a5-8c31-b4b1085f5841","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b34f158b-68fc-4c52-a2e1-539e6e07fb3b","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b65eff6-9705-4575-b40b-fe35ca5b6b5e","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"2b65eff6-9705-4575-b40b-fe35ca5b6b5e","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"42138070-4e1e-4bfb-97a2-79941ef72bc0","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4045f3a4-6d84-4fc7-aa09-6af816c64206","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"4045f3a4-6d84-4fc7-aa09-6af816c64206","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14089c53-1775-4c86-81db-815184b41de3","path":"sprites/spr_shutter_button/spr_shutter_button.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8850346-d50b-45ab-a5d3-417dcfbe9311","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + },"Disabled":false,"id":"f8850346-d50b-45ab-a5d3-417dcfbe9311","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_shutter_button_cover/76267b7c-4ed6-4e13-80f8-12d83c354c19.png b/sprites/spr_shutter_button_cover/76267b7c-4ed6-4e13-80f8-12d83c354c19.png new file mode 100644 index 0000000000..cc14037903 Binary files /dev/null and b/sprites/spr_shutter_button_cover/76267b7c-4ed6-4e13-80f8-12d83c354c19.png differ diff --git a/sprites/spr_shutter_button_cover/layers/76267b7c-4ed6-4e13-80f8-12d83c354c19/b201671b-7405-4bb4-ab4e-e9c0d0be9fe7.png b/sprites/spr_shutter_button_cover/layers/76267b7c-4ed6-4e13-80f8-12d83c354c19/b201671b-7405-4bb4-ab4e-e9c0d0be9fe7.png new file mode 100644 index 0000000000..cc14037903 Binary files /dev/null and b/sprites/spr_shutter_button_cover/layers/76267b7c-4ed6-4e13-80f8-12d83c354c19/b201671b-7405-4bb4-ab4e-e9c0d0be9fe7.png differ diff --git a/sprites/spr_shutter_button_cover/spr_shutter_button_cover.yy b/sprites/spr_shutter_button_cover/spr_shutter_button_cover.yy new file mode 100644 index 0000000000..0bd0c8f503 --- /dev/null +++ b/sprites/spr_shutter_button_cover/spr_shutter_button_cover.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_shutter_button_cover", + "bboxMode":0, + "bbox_bottom":94, + "bbox_left":6, + "bbox_right":310, + "bbox_top":5, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":1080, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"b201671b-7405-4bb4-ab4e-e9c0d0be9fe7","blendMode":0,"displayName":"default","isLocked":false,"name":"b201671b-7405-4bb4-ab4e-e9c0d0be9fe7","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_shutter_button_cover", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"buttons", + "path":"folders/Sprites/UI/New UI/buttons.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_shutter_button_cover", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_shutter_button_cover", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":1080.0, + "seqWidth":1000.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76267b7c-4ed6-4e13-80f8-12d83c354c19","path":"sprites/spr_shutter_button_cover/spr_shutter_button_cover.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"131c5b6e-7e6d-4009-9f41-8c682fdbe6fa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":5, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":1000, +} \ No newline at end of file diff --git a/sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy b/sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy index cb91167053..4f8ff89929 100644 --- a/sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy +++ b/sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sister_hospitaler", "bboxMode":0, "bbox_bottom":230, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b70be9a4-24d9-4d7f-a8ae-38c71a83ddbe","name":"b70be9a4-24d9-4d7f-a8ae-38c71a83ddbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b70be9a4-24d9-4d7f-a8ae-38c71a83ddbe","name":"b70be9a4-24d9-4d7f-a8ae-38c71a83ddbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70be9a4-24d9-4d7f-a8ae-38c71a83ddbe","path":"sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5988268a-350a-499e-a70b-6cb6849b5f91","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b70be9a4-24d9-4d7f-a8ae-38c71a83ddbe","path":"sprites/spr_sister_hospitaler/spr_sister_hospitaler.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5988268a-350a-499e-a70b-6cb6849b5f91","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_sister_of_battle/spr_sister_of_battle.yy b/sprites/spr_sister_of_battle/spr_sister_of_battle.yy index 68c5aa00b5..ffce2a0e5e 100644 --- a/sprites/spr_sister_of_battle/spr_sister_of_battle.yy +++ b/sprites/spr_sister_of_battle/spr_sister_of_battle.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sister_of_battle", "bboxMode":0, "bbox_bottom":230, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ae300a7c-eb85-4b95-aded-5820a4156d85","name":"ae300a7c-eb85-4b95-aded-5820a4156d85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae300a7c-eb85-4b95-aded-5820a4156d85","name":"ae300a7c-eb85-4b95-aded-5820a4156d85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae300a7c-eb85-4b95-aded-5820a4156d85","path":"sprites/spr_sister_of_battle/spr_sister_of_battle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ed3578e-7db9-4027-bb0f-ec3180e86658","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae300a7c-eb85-4b95-aded-5820a4156d85","path":"sprites/spr_sister_of_battle/spr_sister_of_battle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ed3578e-7db9-4027-bb0f-ec3180e86658","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_skitarii/spr_skitarii.yy b/sprites/spr_skitarii/spr_skitarii.yy index 61fa473789..07fa112b3b 100644 --- a/sprites/spr_skitarii/spr_skitarii.yy +++ b/sprites/spr_skitarii/spr_skitarii.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_skitarii", "bboxMode":0, "bbox_bottom":230, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e7ee6da0-bb88-4354-8662-c4b6a15db73b","name":"e7ee6da0-bb88-4354-8662-c4b6a15db73b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7ee6da0-bb88-4354-8662-c4b6a15db73b","name":"e7ee6da0-bb88-4354-8662-c4b6a15db73b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7ee6da0-bb88-4354-8662-c4b6a15db73b","path":"sprites/spr_skitarii/spr_skitarii.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2c9f3812-394f-42f9-bb3c-d22560aa6c92","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7ee6da0-bb88-4354-8662-c4b6a15db73b","path":"sprites/spr_skitarii/spr_skitarii.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2c9f3812-394f-42f9-bb3c-d22560aa6c92","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_skull_on_chain/spr_skull_on_chain.yy b/sprites/spr_skull_on_chain/spr_skull_on_chain.yy index d5a6000d7d..8512da9e70 100644 --- a/sprites/spr_skull_on_chain/spr_skull_on_chain.yy +++ b/sprites/spr_skull_on_chain/spr_skull_on_chain.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_skull_on_chain", "bboxMode":0, "bbox_bottom":39, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_skull_on_chain/spr_skull_on_chain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d6e7ff8-cb18-4100-9159-42068b16e4c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_skull_on_chain/spr_skull_on_chain.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d6e7ff8-cb18-4100-9159-42068b16e4c3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_skulls_belt/spr_skulls_belt.yy b/sprites/spr_skulls_belt/spr_skulls_belt.yy index c87de44ac5..bdc90db20b 100644 --- a/sprites/spr_skulls_belt/spr_skulls_belt.yy +++ b/sprites/spr_skulls_belt/spr_skulls_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_skulls_belt", "bboxMode":0, "bbox_bottom":104, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","path":"sprites/spr_skulls_belt/spr_skulls_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"037f80d3-2475-45e9-9eea-477515faed6d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb220c9-62b6-4ca7-a13f-5951132d0d13","path":"sprites/spr_skulls_belt/spr_skulls_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"037f80d3-2475-45e9-9eea-477515faed6d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_slate_2/spr_slate_2.yy b/sprites/spr_slate_2/spr_slate_2.yy index 8339762259..23a68f879f 100644 --- a/sprites/spr_slate_2/spr_slate_2.yy +++ b/sprites/spr_slate_2/spr_slate_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_slate_2", "bboxMode":0, "bbox_bottom":417, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3fde6f7d-26b0-4214-b224-cb9cdf0cecc5","name":"3fde6f7d-26b0-4214-b224-cb9cdf0cecc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"58154a86-8657-4704-884c-466b6abbd78b","name":"58154a86-8657-4704-884c-466b6abbd78b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c7044a7b-17ba-4473-a4e1-8b1a36614a2c","name":"c7044a7b-17ba-4473-a4e1-8b1a36614a2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"da3ce017-7535-4db9-a251-65f496434a8d","name":"da3ce017-7535-4db9-a251-65f496434a8d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0f0a7b25-40f7-4263-8613-022aa4055c2b","name":"0f0a7b25-40f7-4263-8613-022aa4055c2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e082e106-f541-4c95-8004-18ff816e3609","name":"e082e106-f541-4c95-8004-18ff816e3609","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1dd526d6-d1e9-40a8-87f6-4152d387ead4","name":"1dd526d6-d1e9-40a8-87f6-4152d387ead4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7b072440-87d3-4d45-b8ab-894956f7df0c","name":"7b072440-87d3-4d45-b8ab-894956f7df0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73d93106-75ce-42b6-9dda-6a3d9b5d359c","name":"73d93106-75ce-42b6-9dda-6a3d9b5d359c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dfbb965a-c3eb-4d9f-8f3b-7e2b1fd0f6ce","name":"dfbb965a-c3eb-4d9f-8f3b-7e2b1fd0f6ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3fde6f7d-26b0-4214-b224-cb9cdf0cecc5","name":"3fde6f7d-26b0-4214-b224-cb9cdf0cecc5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"58154a86-8657-4704-884c-466b6abbd78b","name":"58154a86-8657-4704-884c-466b6abbd78b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c7044a7b-17ba-4473-a4e1-8b1a36614a2c","name":"c7044a7b-17ba-4473-a4e1-8b1a36614a2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"da3ce017-7535-4db9-a251-65f496434a8d","name":"da3ce017-7535-4db9-a251-65f496434a8d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0f0a7b25-40f7-4263-8613-022aa4055c2b","name":"0f0a7b25-40f7-4263-8613-022aa4055c2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e082e106-f541-4c95-8004-18ff816e3609","name":"e082e106-f541-4c95-8004-18ff816e3609","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1dd526d6-d1e9-40a8-87f6-4152d387ead4","name":"1dd526d6-d1e9-40a8-87f6-4152d387ead4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b072440-87d3-4d45-b8ab-894956f7df0c","name":"7b072440-87d3-4d45-b8ab-894956f7df0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73d93106-75ce-42b6-9dda-6a3d9b5d359c","name":"73d93106-75ce-42b6-9dda-6a3d9b5d359c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfbb965a-c3eb-4d9f-8f3b-7e2b1fd0f6ce","name":"dfbb965a-c3eb-4d9f-8f3b-7e2b1fd0f6ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3fde6f7d-26b0-4214-b224-cb9cdf0cecc5","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"caac8738-2aca-40a9-9ca5-6b67e73f3f53","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58154a86-8657-4704-884c-466b6abbd78b","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c0d605b5-5836-450b-94a2-3b35505908ab","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7044a7b-17ba-4473-a4e1-8b1a36614a2c","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04b94baa-e3c6-4a28-b9fa-a49c76f2ff8d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da3ce017-7535-4db9-a251-65f496434a8d","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3399fee2-a76a-4850-9fa5-bc2fc3a77313","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f0a7b25-40f7-4263-8613-022aa4055c2b","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7893b14b-0c17-4422-a83c-faa224efe77d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e082e106-f541-4c95-8004-18ff816e3609","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f6986fa2-28f3-4e7f-88d9-76f787d3b10c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1dd526d6-d1e9-40a8-87f6-4152d387ead4","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"390e46d1-0ccd-42b3-8e62-03b0311775a7","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b072440-87d3-4d45-b8ab-894956f7df0c","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"997d7151-a105-438a-b205-d685a0ff0489","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73d93106-75ce-42b6-9dda-6a3d9b5d359c","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a916ded-cadb-41f7-9fb3-2748557af882","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfbb965a-c3eb-4d9f-8f3b-7e2b1fd0f6ce","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bfdb174a-4cda-4108-a52d-9be62ca8b763","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3fde6f7d-26b0-4214-b224-cb9cdf0cecc5","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"caac8738-2aca-40a9-9ca5-6b67e73f3f53","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"58154a86-8657-4704-884c-466b6abbd78b","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c0d605b5-5836-450b-94a2-3b35505908ab","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7044a7b-17ba-4473-a4e1-8b1a36614a2c","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04b94baa-e3c6-4a28-b9fa-a49c76f2ff8d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"da3ce017-7535-4db9-a251-65f496434a8d","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3399fee2-a76a-4850-9fa5-bc2fc3a77313","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0f0a7b25-40f7-4263-8613-022aa4055c2b","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7893b14b-0c17-4422-a83c-faa224efe77d","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e082e106-f541-4c95-8004-18ff816e3609","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f6986fa2-28f3-4e7f-88d9-76f787d3b10c","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1dd526d6-d1e9-40a8-87f6-4152d387ead4","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"390e46d1-0ccd-42b3-8e62-03b0311775a7","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b072440-87d3-4d45-b8ab-894956f7df0c","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"997d7151-a105-438a-b205-d685a0ff0489","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73d93106-75ce-42b6-9dda-6a3d9b5d359c","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a916ded-cadb-41f7-9fb3-2748557af882","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfbb965a-c3eb-4d9f-8f3b-7e2b1fd0f6ce","path":"sprites/spr_slate_2/spr_slate_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bfdb174a-4cda-4108-a52d-9be62ca8b763","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_slate_featureless/bd12575d-6936-47ed-b150-8734d5c98140.png b/sprites/spr_slate_featureless/bd12575d-6936-47ed-b150-8734d5c98140.png new file mode 100644 index 0000000000..b12b7ad10b Binary files /dev/null and b/sprites/spr_slate_featureless/bd12575d-6936-47ed-b150-8734d5c98140.png differ diff --git a/sprites/spr_slate_featureless/f80bbb04-8bfb-4be3-b6f4-2914d55a9273.png b/sprites/spr_slate_featureless/f80bbb04-8bfb-4be3-b6f4-2914d55a9273.png new file mode 100644 index 0000000000..be45ffb4cc Binary files /dev/null and b/sprites/spr_slate_featureless/f80bbb04-8bfb-4be3-b6f4-2914d55a9273.png differ diff --git a/sprites/spr_slate_featureless/layers/bd12575d-6936-47ed-b150-8734d5c98140/6e76129b-a811-4d40-b548-3faeffb7e88e.png b/sprites/spr_slate_featureless/layers/bd12575d-6936-47ed-b150-8734d5c98140/6e76129b-a811-4d40-b548-3faeffb7e88e.png new file mode 100644 index 0000000000..c0670395d2 Binary files /dev/null and b/sprites/spr_slate_featureless/layers/bd12575d-6936-47ed-b150-8734d5c98140/6e76129b-a811-4d40-b548-3faeffb7e88e.png differ diff --git a/sprites/spr_slate_featureless/layers/f80bbb04-8bfb-4be3-b6f4-2914d55a9273/6e76129b-a811-4d40-b548-3faeffb7e88e.png b/sprites/spr_slate_featureless/layers/f80bbb04-8bfb-4be3-b6f4-2914d55a9273/6e76129b-a811-4d40-b548-3faeffb7e88e.png new file mode 100644 index 0000000000..be45ffb4cc Binary files /dev/null and b/sprites/spr_slate_featureless/layers/f80bbb04-8bfb-4be3-b6f4-2914d55a9273/6e76129b-a811-4d40-b548-3faeffb7e88e.png differ diff --git a/sprites/spr_slate_featureless/spr_slate_featureless.yy b/sprites/spr_slate_featureless/spr_slate_featureless.yy new file mode 100644 index 0000000000..a5e295fe46 --- /dev/null +++ b/sprites/spr_slate_featureless/spr_slate_featureless.yy @@ -0,0 +1,96 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_slate_featureless", + "bboxMode":0, + "bbox_bottom":859, + "bbox_left":0, + "bbox_right":849, + "bbox_top":9, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd12575d-6936-47ed-b150-8734d5c98140","name":"bd12575d-6936-47ed-b150-8734d5c98140","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":860, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"6e76129b-a811-4d40-b548-3faeffb7e88e","blendMode":0,"displayName":"default","isLocked":false,"name":"6e76129b-a811-4d40-b548-3faeffb7e88e","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_slate_featureless", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"Menu and Load", + "path":"folders/Sprites/UI/New UI/Menu and Load.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_slate_featureless", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_slate_featureless", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":860.0, + "seqWidth":850.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","path":"sprites/spr_slate_featureless/spr_slate_featureless.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e0535903-fd8e-4ce5-a8b1-44582bfc84b2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd12575d-6936-47ed-b150-8734d5c98140","path":"sprites/spr_slate_featureless/spr_slate_featureless.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"777e253c-d627-4024-b69e-8a0be5b877cf","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":850, +} \ No newline at end of file diff --git a/sprites/spr_slate_side/88d208ab-efc3-4c8a-a23a-ac1685249362.png b/sprites/spr_slate_side/88d208ab-efc3-4c8a-a23a-ac1685249362.png new file mode 100644 index 0000000000..e64de1343a Binary files /dev/null and b/sprites/spr_slate_side/88d208ab-efc3-4c8a-a23a-ac1685249362.png differ diff --git a/sprites/spr_slate_side/layers/88d208ab-efc3-4c8a-a23a-ac1685249362/0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png b/sprites/spr_slate_side/layers/88d208ab-efc3-4c8a-a23a-ac1685249362/0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png new file mode 100644 index 0000000000..e64de1343a Binary files /dev/null and b/sprites/spr_slate_side/layers/88d208ab-efc3-4c8a-a23a-ac1685249362/0c20ae10-2b03-43f4-b05e-7cb2256d0b71.png differ diff --git a/sprites/spr_slate_side/spr_slate_side.yy b/sprites/spr_slate_side/spr_slate_side.yy new file mode 100644 index 0000000000..5f838d12ab --- /dev/null +++ b/sprites/spr_slate_side/spr_slate_side.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_slate_side", + "bboxMode":0, + "bbox_bottom":377, + "bbox_left":0, + "bbox_right":571, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"88d208ab-efc3-4c8a-a23a-ac1685249362","name":"88d208ab-efc3-4c8a-a23a-ac1685249362","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":378, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"0c20ae10-2b03-43f4-b05e-7cb2256d0b71","blendMode":0,"displayName":"default","isLocked":false,"name":"0c20ae10-2b03-43f4-b05e-7cb2256d0b71","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_slate_side", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"Menu and Load", + "path":"folders/Sprites/UI/New UI/Menu and Load.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_slate_side", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_slate_side", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":378.0, + "seqWidth":572.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88d208ab-efc3-4c8a-a23a-ac1685249362","path":"sprites/spr_slate_side/spr_slate_side.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"04c63da1-0ff3-4f5f-96b4-c76aef79bd9a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":572, +} \ No newline at end of file diff --git a/sprites/spr_slate_top/bd12575d-6936-47ed-b150-8734d5c98140.png b/sprites/spr_slate_top/bd12575d-6936-47ed-b150-8734d5c98140.png new file mode 100644 index 0000000000..714db9f355 Binary files /dev/null and b/sprites/spr_slate_top/bd12575d-6936-47ed-b150-8734d5c98140.png differ diff --git a/sprites/spr_slate_top/f80bbb04-8bfb-4be3-b6f4-2914d55a9273.png b/sprites/spr_slate_top/f80bbb04-8bfb-4be3-b6f4-2914d55a9273.png new file mode 100644 index 0000000000..ea21a40939 Binary files /dev/null and b/sprites/spr_slate_top/f80bbb04-8bfb-4be3-b6f4-2914d55a9273.png differ diff --git a/sprites/spr_slate_top/layers/bd12575d-6936-47ed-b150-8734d5c98140/6e76129b-a811-4d40-b548-3faeffb7e88e.png b/sprites/spr_slate_top/layers/bd12575d-6936-47ed-b150-8734d5c98140/6e76129b-a811-4d40-b548-3faeffb7e88e.png new file mode 100644 index 0000000000..714db9f355 Binary files /dev/null and b/sprites/spr_slate_top/layers/bd12575d-6936-47ed-b150-8734d5c98140/6e76129b-a811-4d40-b548-3faeffb7e88e.png differ diff --git a/sprites/spr_slate_top/layers/f80bbb04-8bfb-4be3-b6f4-2914d55a9273/6e76129b-a811-4d40-b548-3faeffb7e88e.png b/sprites/spr_slate_top/layers/f80bbb04-8bfb-4be3-b6f4-2914d55a9273/6e76129b-a811-4d40-b548-3faeffb7e88e.png new file mode 100644 index 0000000000..ea21a40939 Binary files /dev/null and b/sprites/spr_slate_top/layers/f80bbb04-8bfb-4be3-b6f4-2914d55a9273/6e76129b-a811-4d40-b548-3faeffb7e88e.png differ diff --git a/sprites/spr_slate_top/spr_slate_top.yy b/sprites/spr_slate_top/spr_slate_top.yy new file mode 100644 index 0000000000..1a2caf7b82 --- /dev/null +++ b/sprites/spr_slate_top/spr_slate_top.yy @@ -0,0 +1,96 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_slate_top", + "bboxMode":0, + "bbox_bottom":54, + "bbox_left":0, + "bbox_right":206, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bd12575d-6936-47ed-b150-8734d5c98140","name":"bd12575d-6936-47ed-b150-8734d5c98140","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":80, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"6e76129b-a811-4d40-b548-3faeffb7e88e","blendMode":0,"displayName":"default","isLocked":false,"name":"6e76129b-a811-4d40-b548-3faeffb7e88e","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_slate_top", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"Menu and Load", + "path":"folders/Sprites/UI/New UI/Menu and Load.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_slate_top", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_slate_top", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":80.0, + "seqWidth":250.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f80bbb04-8bfb-4be3-b6f4-2914d55a9273","path":"sprites/spr_slate_top/spr_slate_top.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e0535903-fd8e-4ce5-a8b1-44582bfc84b2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bd12575d-6936-47ed-b150-8734d5c98140","path":"sprites/spr_slate_top/spr_slate_top.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"777e253c-d627-4024-b69e-8a0be5b877cf","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":250, +} \ No newline at end of file diff --git a/sprites/spr_sororitas1/spr_sororitas1.yy b/sprites/spr_sororitas1/spr_sororitas1.yy index d8a4bfd561..e41d1c24bd 100644 --- a/sprites/spr_sororitas1/spr_sororitas1.yy +++ b/sprites/spr_sororitas1/spr_sororitas1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sororitas1", "bboxMode":0, "bbox_bottom":230, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6194dec1-6893-4139-8e2f-af5dd83e9dbc","name":"6194dec1-6893-4139-8e2f-af5dd83e9dbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"66086a6e-1b58-4594-801d-a5e38212e3ad","name":"66086a6e-1b58-4594-801d-a5e38212e3ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6194dec1-6893-4139-8e2f-af5dd83e9dbc","name":"6194dec1-6893-4139-8e2f-af5dd83e9dbc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"66086a6e-1b58-4594-801d-a5e38212e3ad","name":"66086a6e-1b58-4594-801d-a5e38212e3ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6194dec1-6893-4139-8e2f-af5dd83e9dbc","path":"sprites/spr_sororitas1/spr_sororitas1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5effdf5d-1256-4cb9-8f03-14870afd2ebe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66086a6e-1b58-4594-801d-a5e38212e3ad","path":"sprites/spr_sororitas1/spr_sororitas1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d607d68-908c-419e-bea3-0ddb206bf1bf","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6194dec1-6893-4139-8e2f-af5dd83e9dbc","path":"sprites/spr_sororitas1/spr_sororitas1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5effdf5d-1256-4cb9-8f03-14870afd2ebe","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66086a6e-1b58-4594-801d-a5e38212e3ad","path":"sprites/spr_sororitas1/spr_sororitas1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d607d68-908c-419e-bea3-0ddb206bf1bf","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_space_bg/spr_space_bg.yy b/sprites/spr_space_bg/spr_space_bg.yy index ac58dc7061..c3afd6da65 100644 --- a/sprites/spr_space_bg/spr_space_bg.yy +++ b/sprites/spr_space_bg/spr_space_bg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_space_bg", "bboxMode":0, "bbox_bottom":959, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4e8c4f34-0cb6-4b5d-88e8-c6dcaa46cda2","name":"4e8c4f34-0cb6-4b5d-88e8-c6dcaa46cda2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4e8c4f34-0cb6-4b5d-88e8-c6dcaa46cda2","name":"4e8c4f34-0cb6-4b5d-88e8-c6dcaa46cda2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e8c4f34-0cb6-4b5d-88e8-c6dcaa46cda2","path":"sprites/spr_space_bg/spr_space_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c537d8f6-0233-4c6b-b155-7dc19778ee2d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e8c4f34-0cb6-4b5d-88e8-c6dcaa46cda2","path":"sprites/spr_space_bg/spr_space_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c537d8f6-0233-4c6b-b155-7dc19778ee2d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_special_helm/8362ac13-7231-4584-a993-c6d4f51343b0.png b/sprites/spr_special_helm/8362ac13-7231-4584-a993-c6d4f51343b0.png index 24bb53f732..da131a85b8 100644 Binary files a/sprites/spr_special_helm/8362ac13-7231-4584-a993-c6d4f51343b0.png and b/sprites/spr_special_helm/8362ac13-7231-4584-a993-c6d4f51343b0.png differ diff --git a/sprites/spr_special_helm/layers/8362ac13-7231-4584-a993-c6d4f51343b0/fa0c5af5-97a9-4e40-bd80-2da6efc51b16.png b/sprites/spr_special_helm/layers/8362ac13-7231-4584-a993-c6d4f51343b0/fa0c5af5-97a9-4e40-bd80-2da6efc51b16.png index 24bb53f732..b9d638d8ef 100644 Binary files a/sprites/spr_special_helm/layers/8362ac13-7231-4584-a993-c6d4f51343b0/fa0c5af5-97a9-4e40-bd80-2da6efc51b16.png and b/sprites/spr_special_helm/layers/8362ac13-7231-4584-a993-c6d4f51343b0/fa0c5af5-97a9-4e40-bd80-2da6efc51b16.png differ diff --git a/sprites/spr_special_helm/spr_special_helm.yy b/sprites/spr_special_helm/spr_special_helm.yy index edc4532213..a6e15f9557 100644 --- a/sprites/spr_special_helm/spr_special_helm.yy +++ b/sprites/spr_special_helm/spr_special_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_special_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8362ac13-7231-4584-a993-c6d4f51343b0","name":"8362ac13-7231-4584-a993-c6d4f51343b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8362ac13-7231-4584-a993-c6d4f51343b0","name":"8362ac13-7231-4584-a993-c6d4f51343b0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_star/spr_star.yy b/sprites/spr_star/spr_star.yy index 202a96a2af..06feadc660 100644 --- a/sprites/spr_star/spr_star.yy +++ b/sprites/spr_star/spr_star.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_star", "bboxMode":0, "bbox_bottom":72, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"61e9fd0f-8f10-45a6-8bc1-28717245fd09","name":"61e9fd0f-8f10-45a6-8bc1-28717245fd09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"282c87ae-537d-4711-a30b-867b90772a06","name":"282c87ae-537d-4711-a30b-867b90772a06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4ba5bd68-4c5a-4f6e-a30a-e5b257991933","name":"4ba5bd68-4c5a-4f6e-a30a-e5b257991933","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c2c97573-50d7-4380-97e7-912a14586164","name":"c2c97573-50d7-4380-97e7-912a14586164","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"38b74789-1504-4070-ad76-e81c8093ef03","name":"38b74789-1504-4070-ad76-e81c8093ef03","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b6bd31d7-a5f1-464f-ab35-5baed5926179","name":"b6bd31d7-a5f1-464f-ab35-5baed5926179","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61e9fd0f-8f10-45a6-8bc1-28717245fd09","name":"61e9fd0f-8f10-45a6-8bc1-28717245fd09","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"282c87ae-537d-4711-a30b-867b90772a06","name":"282c87ae-537d-4711-a30b-867b90772a06","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4ba5bd68-4c5a-4f6e-a30a-e5b257991933","name":"4ba5bd68-4c5a-4f6e-a30a-e5b257991933","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c2c97573-50d7-4380-97e7-912a14586164","name":"c2c97573-50d7-4380-97e7-912a14586164","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38b74789-1504-4070-ad76-e81c8093ef03","name":"38b74789-1504-4070-ad76-e81c8093ef03","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b6bd31d7-a5f1-464f-ab35-5baed5926179","name":"b6bd31d7-a5f1-464f-ab35-5baed5926179","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,6 +68,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":73.0, + "seqWidth":76.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_star_hulk/spr_star_hulk.yy b/sprites/spr_star_hulk/spr_star_hulk.yy index 2e27b25b38..86320406dc 100644 --- a/sprites/spr_star_hulk/spr_star_hulk.yy +++ b/sprites/spr_star_hulk/spr_star_hulk.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_star_hulk", "bboxMode":0, "bbox_bottom":21, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"16de02a6-5396-4e08-a02f-fd696ada6e19","name":"16de02a6-5396-4e08-a02f-fd696ada6e19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"16de02a6-5396-4e08-a02f-fd696ada6e19","name":"16de02a6-5396-4e08-a02f-fd696ada6e19","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16de02a6-5396-4e08-a02f-fd696ada6e19","path":"sprites/spr_star_hulk/spr_star_hulk.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75469e35-9e31-4205-864f-c31c0e2e7edc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"16de02a6-5396-4e08-a02f-fd696ada6e19","path":"sprites/spr_star_hulk/spr_star_hulk.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75469e35-9e31-4205-864f-c31c0e2e7edc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_star_pulse/spr_star_pulse.yy b/sprites/spr_star_pulse/spr_star_pulse.yy index 8f2bd4ce7c..815942bbb9 100644 --- a/sprites/spr_star_pulse/spr_star_pulse.yy +++ b/sprites/spr_star_pulse/spr_star_pulse.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_star_pulse", "bboxMode":0, "bbox_bottom":172, @@ -12,42 +12,42 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b17570c1-c47a-44d2-b51b-126fc579948d","name":"b17570c1-c47a-44d2-b51b-126fc579948d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0777e751-6431-464d-b099-418effdbd3a1","name":"0777e751-6431-464d-b099-418effdbd3a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"048f7bf1-9dd2-4350-a9b2-f4fbf8847b31","name":"048f7bf1-9dd2-4350-a9b2-f4fbf8847b31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea9ead90-c343-4b79-9686-7ec1be403072","name":"ea9ead90-c343-4b79-9686-7ec1be403072","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f4c1cb5-c95a-4abf-93e8-6a7be4c21352","name":"4f4c1cb5-c95a-4abf-93e8-6a7be4c21352","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"99cde262-86c1-4089-96d9-b8b54aa96b82","name":"99cde262-86c1-4089-96d9-b8b54aa96b82","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d094549a-5d8e-42fe-a706-fc7bc673123b","name":"d094549a-5d8e-42fe-a706-fc7bc673123b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b83f259f-eb38-4a40-8a70-3e9536a068b7","name":"b83f259f-eb38-4a40-8a70-3e9536a068b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a12fe0aa-a85c-49b1-bae8-b765e55b6d55","name":"a12fe0aa-a85c-49b1-bae8-b765e55b6d55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f7009f93-222f-46bb-84d1-12a94037855b","name":"f7009f93-222f-46bb-84d1-12a94037855b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a3258b60-39f8-48b1-a06e-45fd6f1c6850","name":"a3258b60-39f8-48b1-a06e-45fd6f1c6850","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72206475-ad68-4919-9969-2de3db0e18bc","name":"72206475-ad68-4919-9969-2de3db0e18bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8000c82d-f2ef-4200-a84e-92f1e1266b58","name":"8000c82d-f2ef-4200-a84e-92f1e1266b58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca7944d4-7f5a-4b40-86ae-0e7f8cf97fc6","name":"ca7944d4-7f5a-4b40-86ae-0e7f8cf97fc6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"568395ee-201e-45aa-9611-258858807004","name":"568395ee-201e-45aa-9611-258858807004","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"39c10657-aea4-44a7-bb34-2dcc25920d7e","name":"39c10657-aea4-44a7-bb34-2dcc25920d7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0d513c3-981a-4ef2-b197-8ef6de9ae580","name":"e0d513c3-981a-4ef2-b197-8ef6de9ae580","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0aade7f8-cffc-45f9-925d-25bd852fb0fb","name":"0aade7f8-cffc-45f9-925d-25bd852fb0fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eff16d73-dfd8-4eca-94ac-d7531d111fbb","name":"eff16d73-dfd8-4eca-94ac-d7531d111fbb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b19a9a19-b6a6-4664-ad56-f5fd59c964e5","name":"b19a9a19-b6a6-4664-ad56-f5fd59c964e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5427b7b0-a5b2-4c6f-9433-a334525b1518","name":"5427b7b0-a5b2-4c6f-9433-a334525b1518","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d036c9cb-4a41-4864-8113-d520943c398c","name":"d036c9cb-4a41-4864-8113-d520943c398c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f1981546-9720-4545-a78f-2b6bc11c32f4","name":"f1981546-9720-4545-a78f-2b6bc11c32f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"accaf748-55fa-4cd5-9d3a-00256a23ffed","name":"accaf748-55fa-4cd5-9d3a-00256a23ffed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b20fd01-2476-4442-8a3c-59bb2b6e251d","name":"1b20fd01-2476-4442-8a3c-59bb2b6e251d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"112097cd-6cb9-419f-bc06-c403bd9c6f77","name":"112097cd-6cb9-419f-bc06-c403bd9c6f77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01c90faf-0ab8-458b-8c6f-01aa222e841d","name":"01c90faf-0ab8-458b-8c6f-01aa222e841d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b102ba61-35fb-46bc-8cb4-58bdd86eb7b1","name":"b102ba61-35fb-46bc-8cb4-58bdd86eb7b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2a0f2afb-00f0-4c5f-95b3-9d06039c8513","name":"2a0f2afb-00f0-4c5f-95b3-9d06039c8513","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8208d694-5ad2-4bba-aa7c-a457f2a775a9","name":"8208d694-5ad2-4bba-aa7c-a457f2a775a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"896295c8-c0e5-48b8-af68-18eb27b600f2","name":"896295c8-c0e5-48b8-af68-18eb27b600f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e03c34c-4131-49d6-b4e7-f1f25042b6c0","name":"8e03c34c-4131-49d6-b4e7-f1f25042b6c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6cee4b5-13a3-4de6-9a74-1185a4b63a29","name":"a6cee4b5-13a3-4de6-9a74-1185a4b63a29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4529e739-ef42-43ed-8520-b8702a46b840","name":"4529e739-ef42-43ed-8520-b8702a46b840","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1cbb1dc0-723e-4686-9958-a5535884d7d8","name":"1cbb1dc0-723e-4686-9958-a5535884d7d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a156d4d7-b489-4793-b1dc-69f1046127f4","name":"a156d4d7-b489-4793-b1dc-69f1046127f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b17570c1-c47a-44d2-b51b-126fc579948d","name":"b17570c1-c47a-44d2-b51b-126fc579948d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0777e751-6431-464d-b099-418effdbd3a1","name":"0777e751-6431-464d-b099-418effdbd3a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"048f7bf1-9dd2-4350-a9b2-f4fbf8847b31","name":"048f7bf1-9dd2-4350-a9b2-f4fbf8847b31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea9ead90-c343-4b79-9686-7ec1be403072","name":"ea9ead90-c343-4b79-9686-7ec1be403072","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f4c1cb5-c95a-4abf-93e8-6a7be4c21352","name":"4f4c1cb5-c95a-4abf-93e8-6a7be4c21352","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"99cde262-86c1-4089-96d9-b8b54aa96b82","name":"99cde262-86c1-4089-96d9-b8b54aa96b82","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d094549a-5d8e-42fe-a706-fc7bc673123b","name":"d094549a-5d8e-42fe-a706-fc7bc673123b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b83f259f-eb38-4a40-8a70-3e9536a068b7","name":"b83f259f-eb38-4a40-8a70-3e9536a068b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a12fe0aa-a85c-49b1-bae8-b765e55b6d55","name":"a12fe0aa-a85c-49b1-bae8-b765e55b6d55","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7009f93-222f-46bb-84d1-12a94037855b","name":"f7009f93-222f-46bb-84d1-12a94037855b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a3258b60-39f8-48b1-a06e-45fd6f1c6850","name":"a3258b60-39f8-48b1-a06e-45fd6f1c6850","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72206475-ad68-4919-9969-2de3db0e18bc","name":"72206475-ad68-4919-9969-2de3db0e18bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8000c82d-f2ef-4200-a84e-92f1e1266b58","name":"8000c82d-f2ef-4200-a84e-92f1e1266b58","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca7944d4-7f5a-4b40-86ae-0e7f8cf97fc6","name":"ca7944d4-7f5a-4b40-86ae-0e7f8cf97fc6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"568395ee-201e-45aa-9611-258858807004","name":"568395ee-201e-45aa-9611-258858807004","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39c10657-aea4-44a7-bb34-2dcc25920d7e","name":"39c10657-aea4-44a7-bb34-2dcc25920d7e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0d513c3-981a-4ef2-b197-8ef6de9ae580","name":"e0d513c3-981a-4ef2-b197-8ef6de9ae580","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0aade7f8-cffc-45f9-925d-25bd852fb0fb","name":"0aade7f8-cffc-45f9-925d-25bd852fb0fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eff16d73-dfd8-4eca-94ac-d7531d111fbb","name":"eff16d73-dfd8-4eca-94ac-d7531d111fbb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b19a9a19-b6a6-4664-ad56-f5fd59c964e5","name":"b19a9a19-b6a6-4664-ad56-f5fd59c964e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5427b7b0-a5b2-4c6f-9433-a334525b1518","name":"5427b7b0-a5b2-4c6f-9433-a334525b1518","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d036c9cb-4a41-4864-8113-d520943c398c","name":"d036c9cb-4a41-4864-8113-d520943c398c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f1981546-9720-4545-a78f-2b6bc11c32f4","name":"f1981546-9720-4545-a78f-2b6bc11c32f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"accaf748-55fa-4cd5-9d3a-00256a23ffed","name":"accaf748-55fa-4cd5-9d3a-00256a23ffed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b20fd01-2476-4442-8a3c-59bb2b6e251d","name":"1b20fd01-2476-4442-8a3c-59bb2b6e251d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"112097cd-6cb9-419f-bc06-c403bd9c6f77","name":"112097cd-6cb9-419f-bc06-c403bd9c6f77","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01c90faf-0ab8-458b-8c6f-01aa222e841d","name":"01c90faf-0ab8-458b-8c6f-01aa222e841d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b102ba61-35fb-46bc-8cb4-58bdd86eb7b1","name":"b102ba61-35fb-46bc-8cb4-58bdd86eb7b1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a0f2afb-00f0-4c5f-95b3-9d06039c8513","name":"2a0f2afb-00f0-4c5f-95b3-9d06039c8513","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8208d694-5ad2-4bba-aa7c-a457f2a775a9","name":"8208d694-5ad2-4bba-aa7c-a457f2a775a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"896295c8-c0e5-48b8-af68-18eb27b600f2","name":"896295c8-c0e5-48b8-af68-18eb27b600f2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e03c34c-4131-49d6-b4e7-f1f25042b6c0","name":"8e03c34c-4131-49d6-b4e7-f1f25042b6c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6cee4b5-13a3-4de6-9a74-1185a4b63a29","name":"a6cee4b5-13a3-4de6-9a74-1185a4b63a29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4529e739-ef42-43ed-8520-b8702a46b840","name":"4529e739-ef42-43ed-8520-b8702a46b840","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1cbb1dc0-723e-4686-9958-a5535884d7d8","name":"1cbb1dc0-723e-4686-9958-a5535884d7d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a156d4d7-b489-4793-b1dc-69f1046127f4","name":"a156d4d7-b489-4793-b1dc-69f1046127f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -103,114 +103,42 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b17570c1-c47a-44d2-b51b-126fc579948d","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"022aa52b-6dcf-4392-ba1b-c135a09fb45b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0777e751-6431-464d-b099-418effdbd3a1","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ed53312-bf9a-4cd2-862a-13c542640202","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"048f7bf1-9dd2-4350-a9b2-f4fbf8847b31","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6edff08-437d-4ce7-a8c0-d505859e7f60","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea9ead90-c343-4b79-9686-7ec1be403072","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"339b3224-c7b4-4038-b63a-c47b7e8c714b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f4c1cb5-c95a-4abf-93e8-6a7be4c21352","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b712de29-3b00-4ecb-bed9-a462d3ac5db4","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"99cde262-86c1-4089-96d9-b8b54aa96b82","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b3a282a9-1b54-48ed-a31d-383bf7aa2570","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d094549a-5d8e-42fe-a706-fc7bc673123b","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c43e5851-8ca3-4cf1-82b0-56edfa8bcef1","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b83f259f-eb38-4a40-8a70-3e9536a068b7","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"28b0e804-a08a-4e7d-bdb0-cca10a53c611","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a12fe0aa-a85c-49b1-bae8-b765e55b6d55","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8dfeaee9-9b0f-4e18-806f-c9ef09a9fdb1","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7009f93-222f-46bb-84d1-12a94037855b","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f1711c68-311f-4f81-9607-87c5cfad5eaf","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3258b60-39f8-48b1-a06e-45fd6f1c6850","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75aeec36-56f3-4dc7-b4c9-e2c7719e997f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72206475-ad68-4919-9969-2de3db0e18bc","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b64f550e-ffd3-40ca-8b69-5b160dd0aab7","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8000c82d-f2ef-4200-a84e-92f1e1266b58","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04bd8c72-3118-4ed1-b208-c8ac4880e000","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca7944d4-7f5a-4b40-86ae-0e7f8cf97fc6","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4b5ea088-5d42-4613-a0ec-071190cf32ee","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"568395ee-201e-45aa-9611-258858807004","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ecb80c0b-8492-4e25-89f0-a70b67f448b9","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39c10657-aea4-44a7-bb34-2dcc25920d7e","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70321b1b-d944-482d-80c6-8075c413c313","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0d513c3-981a-4ef2-b197-8ef6de9ae580","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9b0f7b4-8c3f-4227-a8c6-5fa5ac9f7e41","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0aade7f8-cffc-45f9-925d-25bd852fb0fb","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"95ba5536-93a6-444e-b7a9-a3e4b64e7e61","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eff16d73-dfd8-4eca-94ac-d7531d111fbb","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"02a19f5a-045d-4731-9040-e7fff02841bb","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b19a9a19-b6a6-4664-ad56-f5fd59c964e5","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"05b9c39e-3d12-46db-8165-bdbfd2803879","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5427b7b0-a5b2-4c6f-9433-a334525b1518","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69e1440d-58bd-435d-a21a-aed34aa20da6","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d036c9cb-4a41-4864-8113-d520943c398c","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d191695b-32c4-4118-966f-df1022efd415","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1981546-9720-4545-a78f-2b6bc11c32f4","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5e51ed73-fa84-444e-8685-768804493025","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"accaf748-55fa-4cd5-9d3a-00256a23ffed","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7cfa1d74-7dda-4f30-8473-b912f6ab8527","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b20fd01-2476-4442-8a3c-59bb2b6e251d","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a4c44ea2-10a7-4d06-b956-29b9c1590ecc","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"112097cd-6cb9-419f-bc06-c403bd9c6f77","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8d9ef554-3d8e-4ea3-a3f8-f6753696fd68","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01c90faf-0ab8-458b-8c6f-01aa222e841d","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"85f84d1a-91fa-42c5-a570-ede9ac2de9d5","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b102ba61-35fb-46bc-8cb4-58bdd86eb7b1","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7a83bbd8-53e2-45dc-a8e3-3a44e3d96301","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a0f2afb-00f0-4c5f-95b3-9d06039c8513","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0db64db2-476d-48b3-9870-6807a514bc1a","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8208d694-5ad2-4bba-aa7c-a457f2a775a9","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5ce1af65-e4f0-4527-8b5b-a3950b8fb3e3","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"896295c8-c0e5-48b8-af68-18eb27b600f2","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc914f29-e38a-4e8c-9882-003d1af471b1","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e03c34c-4131-49d6-b4e7-f1f25042b6c0","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f6977aa-07f2-4021-8442-027421b15871","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6cee4b5-13a3-4de6-9a74-1185a4b63a29","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a26c223e-e49e-42e7-a245-8d8cb339920d","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4529e739-ef42-43ed-8520-b8702a46b840","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dda2b9c8-c8e0-4e78-a9bf-783b63564baa","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cbb1dc0-723e-4686-9958-a5535884d7d8","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e4783230-51be-41b8-8b71-a27d32398c5d","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a156d4d7-b489-4793-b1dc-69f1046127f4","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0b9c0da2-e18b-4a4d-91ea-643fe9c5d9a1","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b17570c1-c47a-44d2-b51b-126fc579948d","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"022aa52b-6dcf-4392-ba1b-c135a09fb45b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0777e751-6431-464d-b099-418effdbd3a1","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ed53312-bf9a-4cd2-862a-13c542640202","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"048f7bf1-9dd2-4350-a9b2-f4fbf8847b31","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6edff08-437d-4ce7-a8c0-d505859e7f60","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea9ead90-c343-4b79-9686-7ec1be403072","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"339b3224-c7b4-4038-b63a-c47b7e8c714b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f4c1cb5-c95a-4abf-93e8-6a7be4c21352","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b712de29-3b00-4ecb-bed9-a462d3ac5db4","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"99cde262-86c1-4089-96d9-b8b54aa96b82","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b3a282a9-1b54-48ed-a31d-383bf7aa2570","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d094549a-5d8e-42fe-a706-fc7bc673123b","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c43e5851-8ca3-4cf1-82b0-56edfa8bcef1","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b83f259f-eb38-4a40-8a70-3e9536a068b7","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"28b0e804-a08a-4e7d-bdb0-cca10a53c611","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a12fe0aa-a85c-49b1-bae8-b765e55b6d55","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8dfeaee9-9b0f-4e18-806f-c9ef09a9fdb1","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7009f93-222f-46bb-84d1-12a94037855b","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f1711c68-311f-4f81-9607-87c5cfad5eaf","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3258b60-39f8-48b1-a06e-45fd6f1c6850","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75aeec36-56f3-4dc7-b4c9-e2c7719e997f","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72206475-ad68-4919-9969-2de3db0e18bc","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b64f550e-ffd3-40ca-8b69-5b160dd0aab7","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8000c82d-f2ef-4200-a84e-92f1e1266b58","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04bd8c72-3118-4ed1-b208-c8ac4880e000","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca7944d4-7f5a-4b40-86ae-0e7f8cf97fc6","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4b5ea088-5d42-4613-a0ec-071190cf32ee","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"568395ee-201e-45aa-9611-258858807004","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ecb80c0b-8492-4e25-89f0-a70b67f448b9","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39c10657-aea4-44a7-bb34-2dcc25920d7e","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70321b1b-d944-482d-80c6-8075c413c313","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0d513c3-981a-4ef2-b197-8ef6de9ae580","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9b0f7b4-8c3f-4227-a8c6-5fa5ac9f7e41","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0aade7f8-cffc-45f9-925d-25bd852fb0fb","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"95ba5536-93a6-444e-b7a9-a3e4b64e7e61","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eff16d73-dfd8-4eca-94ac-d7531d111fbb","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"02a19f5a-045d-4731-9040-e7fff02841bb","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b19a9a19-b6a6-4664-ad56-f5fd59c964e5","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"05b9c39e-3d12-46db-8165-bdbfd2803879","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5427b7b0-a5b2-4c6f-9433-a334525b1518","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69e1440d-58bd-435d-a21a-aed34aa20da6","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d036c9cb-4a41-4864-8113-d520943c398c","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d191695b-32c4-4118-966f-df1022efd415","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1981546-9720-4545-a78f-2b6bc11c32f4","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5e51ed73-fa84-444e-8685-768804493025","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"accaf748-55fa-4cd5-9d3a-00256a23ffed","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7cfa1d74-7dda-4f30-8473-b912f6ab8527","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b20fd01-2476-4442-8a3c-59bb2b6e251d","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a4c44ea2-10a7-4d06-b956-29b9c1590ecc","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"112097cd-6cb9-419f-bc06-c403bd9c6f77","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8d9ef554-3d8e-4ea3-a3f8-f6753696fd68","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01c90faf-0ab8-458b-8c6f-01aa222e841d","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"85f84d1a-91fa-42c5-a570-ede9ac2de9d5","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b102ba61-35fb-46bc-8cb4-58bdd86eb7b1","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7a83bbd8-53e2-45dc-a8e3-3a44e3d96301","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a0f2afb-00f0-4c5f-95b3-9d06039c8513","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0db64db2-476d-48b3-9870-6807a514bc1a","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8208d694-5ad2-4bba-aa7c-a457f2a775a9","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5ce1af65-e4f0-4527-8b5b-a3950b8fb3e3","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"896295c8-c0e5-48b8-af68-18eb27b600f2","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc914f29-e38a-4e8c-9882-003d1af471b1","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e03c34c-4131-49d6-b4e7-f1f25042b6c0","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f6977aa-07f2-4021-8442-027421b15871","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6cee4b5-13a3-4de6-9a74-1185a4b63a29","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a26c223e-e49e-42e7-a245-8d8cb339920d","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4529e739-ef42-43ed-8520-b8702a46b840","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dda2b9c8-c8e0-4e78-a9bf-783b63564baa","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cbb1dc0-723e-4686-9958-a5535884d7d8","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e4783230-51be-41b8-8b71-a27d32398c5d","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a156d4d7-b489-4793-b1dc-69f1046127f4","path":"sprites/spr_star_pulse/spr_star_pulse.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0b9c0da2-e18b-4a4d-91ea-643fe9c5d9a1","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_star_screen/spr_star_screen.yy b/sprites/spr_star_screen/spr_star_screen.yy index e048d90e08..e787f3d344 100644 --- a/sprites/spr_star_screen/spr_star_screen.yy +++ b/sprites/spr_star_screen/spr_star_screen.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_star_screen", "bboxMode":0, "bbox_bottom":293, @@ -12,13 +12,13 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b40bc04c-5756-4025-969a-8000b0e6781c","name":"b40bc04c-5756-4025-969a-8000b0e6781c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"38363157-05ad-48d2-95a0-1566c8e597be","name":"38363157-05ad-48d2-95a0-1566c8e597be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"525040f2-1ff1-449c-bad6-f578ef258589","name":"525040f2-1ff1-449c-bad6-f578ef258589","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d8c7469-cf0c-43f8-8abd-9a9c1c62f51b","name":"7d8c7469-cf0c-43f8-8abd-9a9c1c62f51b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"45dbbde0-3065-4dc4-b203-e27a80367595","name":"45dbbde0-3065-4dc4-b203-e27a80367595","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3c5567e6-4464-474d-b78f-43a163963db2","name":"3c5567e6-4464-474d-b78f-43a163963db2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8247b76b-beb3-4777-9099-01fd1da955ba","name":"8247b76b-beb3-4777-9099-01fd1da955ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b40bc04c-5756-4025-969a-8000b0e6781c","name":"b40bc04c-5756-4025-969a-8000b0e6781c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"38363157-05ad-48d2-95a0-1566c8e597be","name":"38363157-05ad-48d2-95a0-1566c8e597be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"525040f2-1ff1-449c-bad6-f578ef258589","name":"525040f2-1ff1-449c-bad6-f578ef258589","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d8c7469-cf0c-43f8-8abd-9a9c1c62f51b","name":"7d8c7469-cf0c-43f8-8abd-9a9c1c62f51b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"45dbbde0-3065-4dc4-b203-e27a80367595","name":"45dbbde0-3065-4dc4-b203-e27a80367595","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3c5567e6-4464-474d-b78f-43a163963db2","name":"3c5567e6-4464-474d-b78f-43a163963db2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8247b76b-beb3-4777-9099-01fd1da955ba","name":"8247b76b-beb3-4777-9099-01fd1da955ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,6 +69,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":294.0, + "seqWidth":320.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_strength_icon/spr_strength_icon.yy b/sprites/spr_strength_icon/spr_strength_icon.yy index c3ecee1bde..8729f1e97a 100644 --- a/sprites/spr_strength_icon/spr_strength_icon.yy +++ b/sprites/spr_strength_icon/spr_strength_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_strength_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5da0d9be-bc73-40ef-98d3-44c7b92a34ac","name":"5da0d9be-bc73-40ef-98d3-44c7b92a34ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5da0d9be-bc73-40ef-98d3-44c7b92a34ac","name":"5da0d9be-bc73-40ef-98d3-44c7b92a34ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5da0d9be-bc73-40ef-98d3-44c7b92a34ac","path":"sprites/spr_strength_icon/spr_strength_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f495221-4734-4736-b81f-5356718081ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5da0d9be-bc73-40ef-98d3-44c7b92a34ac","path":"sprites/spr_strength_icon/spr_strength_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f495221-4734-4736-b81f-5356718081ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy b/sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy index d6cb43692b..4ba89741ec 100644 --- a/sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy +++ b/sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sw_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b89ece35-f459-4bfe-b4be-3b1eb341cdaa","name":"b89ece35-f459-4bfe-b4be-3b1eb341cdaa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8b39094a-4165-436a-b7e9-7abd097e059b","name":"8b39094a-4165-436a-b7e9-7abd097e059b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b89ece35-f459-4bfe-b4be-3b1eb341cdaa","name":"b89ece35-f459-4bfe-b4be-3b1eb341cdaa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8b39094a-4165-436a-b7e9-7abd097e059b","name":"8b39094a-4165-436a-b7e9-7abd097e059b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b89ece35-f459-4bfe-b4be-3b1eb341cdaa","path":"sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"44c4d073-b234-4412-b6f5-bfc150b3810b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b39094a-4165-436a-b7e9-7abd097e059b","path":"sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee3331fc-28ea-4a9e-b855-5a7083e36d58","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b89ece35-f459-4bfe-b4be-3b1eb341cdaa","path":"sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"44c4d073-b234-4412-b6f5-bfc150b3810b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b39094a-4165-436a-b7e9-7abd097e059b","path":"sprites/spr_sw_mk5_helm/spr_sw_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee3331fc-28ea-4a9e-b855-5a7083e36d58","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy b/sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy index b084a0a0f6..f20c9b957d 100644 --- a/sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy +++ b/sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sw_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"bb72a259-1e38-4149-8200-f6a5c4b33850","name":"bb72a259-1e38-4149-8200-f6a5c4b33850","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"df704fe9-0607-4d5d-b8c1-fe901cc78768","name":"df704fe9-0607-4d5d-b8c1-fe901cc78768","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb72a259-1e38-4149-8200-f6a5c4b33850","name":"bb72a259-1e38-4149-8200-f6a5c4b33850","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"df704fe9-0607-4d5d-b8c1-fe901cc78768","name":"df704fe9-0607-4d5d-b8c1-fe901cc78768","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb72a259-1e38-4149-8200-f6a5c4b33850","path":"sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c902c7a-223b-4233-9dc3-c191de3e4085","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"df704fe9-0607-4d5d-b8c1-fe901cc78768","path":"sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5570e42c-c74a-4c08-854d-b63a2516f277","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb72a259-1e38-4149-8200-f6a5c4b33850","path":"sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c902c7a-223b-4233-9dc3-c191de3e4085","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"df704fe9-0607-4d5d-b8c1-fe901cc78768","path":"sprites/spr_sw_mk6_helm/spr_sw_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5570e42c-c74a-4c08-854d-b63a2516f277","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy b/sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy index a69877a592..927d4c1e75 100644 --- a/sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy +++ b/sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sw_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"189e3236-d097-4322-8122-3e48d302a028","name":"189e3236-d097-4322-8122-3e48d302a028","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"45bc7c5e-ce8c-4ffb-859b-b358a1d5ad37","name":"45bc7c5e-ce8c-4ffb-859b-b358a1d5ad37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"189e3236-d097-4322-8122-3e48d302a028","name":"189e3236-d097-4322-8122-3e48d302a028","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"45bc7c5e-ce8c-4ffb-859b-b358a1d5ad37","name":"45bc7c5e-ce8c-4ffb-859b-b358a1d5ad37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"189e3236-d097-4322-8122-3e48d302a028","path":"sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca779862-985c-4a3f-9364-35773b53070d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"45bc7c5e-ce8c-4ffb-859b-b358a1d5ad37","path":"sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5de7c416-d037-453b-a42d-7a20173dd605","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"189e3236-d097-4322-8122-3e48d302a028","path":"sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca779862-985c-4a3f-9364-35773b53070d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"45bc7c5e-ce8c-4ffb-859b-b358a1d5ad37","path":"sprites/spr_sw_mk7_helm/spr_sw_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5de7c416-d037-453b-a42d-7a20173dd605","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_sword_pendant/spr_sword_pendant.yy b/sprites/spr_sword_pendant/spr_sword_pendant.yy index 929cd8ef53..6fa466365e 100644 --- a/sprites/spr_sword_pendant/spr_sword_pendant.yy +++ b/sprites/spr_sword_pendant/spr_sword_pendant.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_sword_pendant", "bboxMode":0, "bbox_bottom":25, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_sword_pendant/spr_sword_pendant.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fce0aede-094a-47b8-be8e-8f04a9807531","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0926bad1-dfb3-41bb-b6ee-7732d3036688","path":"sprites/spr_sword_pendant/spr_sword_pendant.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fce0aede-094a-47b8-be8e-8f04a9807531","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy b/sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy index 622844353d..4e74b45bce 100644 --- a/sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy +++ b/sprites/spr_tartaros2_colors/spr_tartaros2_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros2_colors", "bboxMode":0, "bbox_bottom":259, @@ -12,17 +12,17 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3f2bfc4a-6242-4b4f-b23a-1b9f2f6b6238","name":"3f2bfc4a-6242-4b4f-b23a-1b9f2f6b6238","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ec7335a2-5940-4d44-a57a-6ef2b18a7aa6","name":"ec7335a2-5940-4d44-a57a-6ef2b18a7aa6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d19f71d0-9c25-4938-8ff1-6ce05cbbaba0","name":"d19f71d0-9c25-4938-8ff1-6ce05cbbaba0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8c4ca248-93ee-410c-b68a-e9ecec54b32d","name":"8c4ca248-93ee-410c-b68a-e9ecec54b32d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0bcfa324-70be-491f-9c81-e421ae10e401","name":"0bcfa324-70be-491f-9c81-e421ae10e401","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d0346f6-0c14-4ba9-810c-e8ee0515c859","name":"1d0346f6-0c14-4ba9-810c-e8ee0515c859","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f3656b9-6717-4477-b5d1-05235b9bd903","name":"1f3656b9-6717-4477-b5d1-05235b9bd903","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"543bf910-3b46-44a3-b42d-585dec34b2e9","name":"543bf910-3b46-44a3-b42d-585dec34b2e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c8308dbd-f9c5-4d70-8f5b-3f8a96183706","name":"c8308dbd-f9c5-4d70-8f5b-3f8a96183706","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87e52bcf-0cde-4bd2-960a-18d56a5e5abf","name":"87e52bcf-0cde-4bd2-960a-18d56a5e5abf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40d1b2e1-aad0-465c-9688-32ada947f8ea","name":"40d1b2e1-aad0-465c-9688-32ada947f8ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f2bfc4a-6242-4b4f-b23a-1b9f2f6b6238","name":"3f2bfc4a-6242-4b4f-b23a-1b9f2f6b6238","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ec7335a2-5940-4d44-a57a-6ef2b18a7aa6","name":"ec7335a2-5940-4d44-a57a-6ef2b18a7aa6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d19f71d0-9c25-4938-8ff1-6ce05cbbaba0","name":"d19f71d0-9c25-4938-8ff1-6ce05cbbaba0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c4ca248-93ee-410c-b68a-e9ecec54b32d","name":"8c4ca248-93ee-410c-b68a-e9ecec54b32d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0bcfa324-70be-491f-9c81-e421ae10e401","name":"0bcfa324-70be-491f-9c81-e421ae10e401","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d0346f6-0c14-4ba9-810c-e8ee0515c859","name":"1d0346f6-0c14-4ba9-810c-e8ee0515c859","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f3656b9-6717-4477-b5d1-05235b9bd903","name":"1f3656b9-6717-4477-b5d1-05235b9bd903","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"543bf910-3b46-44a3-b42d-585dec34b2e9","name":"543bf910-3b46-44a3-b42d-585dec34b2e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c8308dbd-f9c5-4d70-8f5b-3f8a96183706","name":"c8308dbd-f9c5-4d70-8f5b-3f8a96183706","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87e52bcf-0cde-4bd2-960a-18d56a5e5abf","name":"87e52bcf-0cde-4bd2-960a-18d56a5e5abf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40d1b2e1-aad0-465c-9688-32ada947f8ea","name":"40d1b2e1-aad0-465c-9688-32ada947f8ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,6 +73,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_tartaros_arms/spr_tartaros_arms.yy b/sprites/spr_tartaros_arms/spr_tartaros_arms.yy index b482e5c5dc..37e43b3451 100644 --- a/sprites/spr_tartaros_arms/spr_tartaros_arms.yy +++ b/sprites/spr_tartaros_arms/spr_tartaros_arms.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_arms", "bboxMode":0, "bbox_bottom":178, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"72c8c22c-c531-4432-b060-e05b68525d15","name":"72c8c22c-c531-4432-b060-e05b68525d15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72c8c22c-c531-4432-b060-e05b68525d15","name":"72c8c22c-c531-4432-b060-e05b68525d15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72c8c22c-c531-4432-b060-e05b68525d15","path":"sprites/spr_tartaros_arms/spr_tartaros_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e6bb2b66-a648-4395-a38d-c93170a269e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72c8c22c-c531-4432-b060-e05b68525d15","path":"sprites/spr_tartaros_arms/spr_tartaros_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e6bb2b66-a648-4395-a38d-c93170a269e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_tartaros_chest/946bdde4-8095-44ad-83a5-1d5c8fe841cc.png b/sprites/spr_tartaros_chest/946bdde4-8095-44ad-83a5-1d5c8fe841cc.png index b78b8bb970..da13e1f8a6 100644 Binary files a/sprites/spr_tartaros_chest/946bdde4-8095-44ad-83a5-1d5c8fe841cc.png and b/sprites/spr_tartaros_chest/946bdde4-8095-44ad-83a5-1d5c8fe841cc.png differ diff --git a/sprites/spr_tartaros_chest/layers/946bdde4-8095-44ad-83a5-1d5c8fe841cc/ad6a6b27-874e-4748-9915-64a9a7bdaeed.png b/sprites/spr_tartaros_chest/layers/946bdde4-8095-44ad-83a5-1d5c8fe841cc/ad6a6b27-874e-4748-9915-64a9a7bdaeed.png index b78b8bb970..da13e1f8a6 100644 Binary files a/sprites/spr_tartaros_chest/layers/946bdde4-8095-44ad-83a5-1d5c8fe841cc/ad6a6b27-874e-4748-9915-64a9a7bdaeed.png and b/sprites/spr_tartaros_chest/layers/946bdde4-8095-44ad-83a5-1d5c8fe841cc/ad6a6b27-874e-4748-9915-64a9a7bdaeed.png differ diff --git a/sprites/spr_tartaros_chest/spr_tartaros_chest.yy b/sprites/spr_tartaros_chest/spr_tartaros_chest.yy index 67c1722d8f..86874b1b12 100644 --- a/sprites/spr_tartaros_chest/spr_tartaros_chest.yy +++ b/sprites/spr_tartaros_chest/spr_tartaros_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_chest", "bboxMode":0, "bbox_bottom":124, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"524957d3-4452-4fba-bc1d-d08e55003395","name":"524957d3-4452-4fba-bc1d-d08e55003395","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"946bdde4-8095-44ad-83a5-1d5c8fe841cc","name":"946bdde4-8095-44ad-83a5-1d5c8fe841cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b7e2c49c-625f-41b2-b038-8e96b289e8ed","name":"b7e2c49c-625f-41b2-b038-8e96b289e8ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c1fba91e-ad9a-43f5-9563-4660af64f354","name":"c1fba91e-ad9a-43f5-9563-4660af64f354","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"524957d3-4452-4fba-bc1d-d08e55003395","name":"524957d3-4452-4fba-bc1d-d08e55003395","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"946bdde4-8095-44ad-83a5-1d5c8fe841cc","name":"946bdde4-8095-44ad-83a5-1d5c8fe841cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b7e2c49c-625f-41b2-b038-8e96b289e8ed","name":"b7e2c49c-625f-41b2-b038-8e96b289e8ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c1fba91e-ad9a-43f5-9563-4660af64f354","name":"c1fba91e-ad9a-43f5-9563-4660af64f354","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -67,6 +67,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -91,7 +93,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":[ diff --git a/sprites/spr_tartaros_chest_shadows/3a335b0a-c79a-4dce-ae6d-823d512b0c53.png b/sprites/spr_tartaros_chest_shadows/3a335b0a-c79a-4dce-ae6d-823d512b0c53.png new file mode 100644 index 0000000000..cb36b265f1 Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/3a335b0a-c79a-4dce-ae6d-823d512b0c53.png differ diff --git a/sprites/spr_tartaros_chest_shadows/77c22ee4-8c36-4010-bb36-a483f3eb9263.png b/sprites/spr_tartaros_chest_shadows/77c22ee4-8c36-4010-bb36-a483f3eb9263.png new file mode 100644 index 0000000000..3311282c2c Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/77c22ee4-8c36-4010-bb36-a483f3eb9263.png differ diff --git a/sprites/spr_tartaros_chest_shadows/7b2e5457-70b3-4576-9c6e-f1ff7f76462b.png b/sprites/spr_tartaros_chest_shadows/7b2e5457-70b3-4576-9c6e-f1ff7f76462b.png new file mode 100644 index 0000000000..68e5f2a12e Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/7b2e5457-70b3-4576-9c6e-f1ff7f76462b.png differ diff --git a/sprites/spr_tartaros_chest_shadows/95ec6a03-17e7-4fb4-aeb5-335f9ef3b530.png b/sprites/spr_tartaros_chest_shadows/95ec6a03-17e7-4fb4-aeb5-335f9ef3b530.png new file mode 100644 index 0000000000..43523fc467 Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/95ec6a03-17e7-4fb4-aeb5-335f9ef3b530.png differ diff --git a/sprites/spr_tartaros_chest_shadows/f936957a-511c-4522-9cd5-dbe2411d039e.png b/sprites/spr_tartaros_chest_shadows/f936957a-511c-4522-9cd5-dbe2411d039e.png new file mode 100644 index 0000000000..cb36b265f1 Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/f936957a-511c-4522-9cd5-dbe2411d039e.png differ diff --git a/sprites/spr_tartaros_chest_shadows/layers/3a335b0a-c79a-4dce-ae6d-823d512b0c53/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png b/sprites/spr_tartaros_chest_shadows/layers/3a335b0a-c79a-4dce-ae6d-823d512b0c53/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png new file mode 100644 index 0000000000..cb36b265f1 Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/layers/3a335b0a-c79a-4dce-ae6d-823d512b0c53/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png differ diff --git a/sprites/spr_tartaros_chest_shadows/layers/77c22ee4-8c36-4010-bb36-a483f3eb9263/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png b/sprites/spr_tartaros_chest_shadows/layers/77c22ee4-8c36-4010-bb36-a483f3eb9263/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png new file mode 100644 index 0000000000..3311282c2c Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/layers/77c22ee4-8c36-4010-bb36-a483f3eb9263/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png differ diff --git a/sprites/spr_tartaros_chest_shadows/layers/7b2e5457-70b3-4576-9c6e-f1ff7f76462b/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png b/sprites/spr_tartaros_chest_shadows/layers/7b2e5457-70b3-4576-9c6e-f1ff7f76462b/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png new file mode 100644 index 0000000000..68e5f2a12e Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/layers/7b2e5457-70b3-4576-9c6e-f1ff7f76462b/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png differ diff --git a/sprites/spr_tartaros_chest_shadows/layers/95ec6a03-17e7-4fb4-aeb5-335f9ef3b530/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png b/sprites/spr_tartaros_chest_shadows/layers/95ec6a03-17e7-4fb4-aeb5-335f9ef3b530/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png new file mode 100644 index 0000000000..43523fc467 Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/layers/95ec6a03-17e7-4fb4-aeb5-335f9ef3b530/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png differ diff --git a/sprites/spr_tartaros_chest_shadows/layers/f936957a-511c-4522-9cd5-dbe2411d039e/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png b/sprites/spr_tartaros_chest_shadows/layers/f936957a-511c-4522-9cd5-dbe2411d039e/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png new file mode 100644 index 0000000000..cb36b265f1 Binary files /dev/null and b/sprites/spr_tartaros_chest_shadows/layers/f936957a-511c-4522-9cd5-dbe2411d039e/62408588-d2cd-4ba8-9fed-c84d5cd2f54f.png differ diff --git a/sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy b/sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy new file mode 100644 index 0000000000..027ef28b7c --- /dev/null +++ b/sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy @@ -0,0 +1,121 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_chest_shadows", + "bboxMode":0, + "bbox_bottom":124, + "bbox_left":54, + "bbox_right":127, + "bbox_top":69, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"3a335b0a-c79a-4dce-ae6d-823d512b0c53","name":"3a335b0a-c79a-4dce-ae6d-823d512b0c53","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"77c22ee4-8c36-4010-bb36-a483f3eb9263","name":"77c22ee4-8c36-4010-bb36-a483f3eb9263","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b2e5457-70b3-4576-9c6e-f1ff7f76462b","name":"7b2e5457-70b3-4576-9c6e-f1ff7f76462b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f936957a-511c-4522-9cd5-dbe2411d039e","name":"f936957a-511c-4522-9cd5-dbe2411d039e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95ec6a03-17e7-4fb4-aeb5-335f9ef3b530","name":"95ec6a03-17e7-4fb4-aeb5-335f9ef3b530","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"62408588-d2cd-4ba8-9fed-c84d5cd2f54f","blendMode":0,"displayName":"default","isLocked":false,"name":"62408588-d2cd-4ba8-9fed-c84d5cd2f54f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_chest_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_tartaros_chest_shadows", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":5.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tartaros_chest_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a335b0a-c79a-4dce-ae6d-823d512b0c53","path":"sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"02e45933-aaeb-42c1-b1da-920ef7e0bbbc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"77c22ee4-8c36-4010-bb36-a483f3eb9263","path":"sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"290746af-ce59-4c7f-baf3-e99525aaa188","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b2e5457-70b3-4576-9c6e-f1ff7f76462b","path":"sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"85c0eabe-1c88-43b0-9ff0-af415d7874b4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f936957a-511c-4522-9cd5-dbe2411d039e","path":"sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"40ecebf6-7139-4863-8d6c-8b3e05058fb4","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95ec6a03-17e7-4fb4-aeb5-335f9ef3b530","path":"sprites/spr_tartaros_chest_shadows/spr_tartaros_chest_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bf0e42f2-56c4-4d90-89ee-a000a4c201e9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":[ + 4278190335,4278255615,4278255360,4294967040,4294901760,4294902015,4294967295,4293717228,4293059298,4292335575, + 4291677645,4290230199,4287993237,4280556782,4278252287,4283540992,4293963264,4287770926,4287365357,4287203721, + 4286414205,4285558896,4284703587,4283782485,4281742902,4278190080,4286158839,4286688762,4287219453,4288280831, + 4288405444,4288468131,4288465538,4291349882,4294430829,4292454269,4291466115,4290675079,4290743485,4290943732, + 4288518390,4283395315,4283862775,4284329979,4285068799,4285781164,4285973884,4286101564,4290034460,4294164224, + 4291529796,4289289312,4289290373,4289291432,4289359601,4286410226,4280556782,4280444402,4280128760,4278252287, + 4282369933,4283086137,4283540992,4288522496,4293963264,4290540032,4289423360,4289090560,4287770926,4287704422, + 4287571858,4287365357,4284159214,4279176094,4279058848,4278870691,4278231211,4281367321,4278190080,4278190080, + 4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080, + 4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080, + 4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080, + 4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080,4278190080, + ], + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_tartaros_colors/spr_tartaros_colors.yy b/sprites/spr_tartaros_colors/spr_tartaros_colors.yy index 0b84ec4fd5..c97b0bd035 100644 --- a/sprites/spr_tartaros_colors/spr_tartaros_colors.yy +++ b/sprites/spr_tartaros_colors/spr_tartaros_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_colors", "bboxMode":0, "bbox_bottom":231, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ecafdcef-f511-430c-91a8-30ee6580a6a0","name":"ecafdcef-f511-430c-91a8-30ee6580a6a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5426d439-bb49-4082-84f2-452c2d01792d","name":"5426d439-bb49-4082-84f2-452c2d01792d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9b761b33-b38f-4ca4-b119-c55bc0a2e9e7","name":"9b761b33-b38f-4ca4-b119-c55bc0a2e9e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fcad843f-7d6a-4d7b-bce1-4c936c6d6716","name":"fcad843f-7d6a-4d7b-bce1-4c936c6d6716","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dfda7d39-c01c-40f5-9586-9eab35c2b6e7","name":"dfda7d39-c01c-40f5-9586-9eab35c2b6e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bf80a677-6b33-4cd5-947e-b85ecaa4fe02","name":"bf80a677-6b33-4cd5-947e-b85ecaa4fe02","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d19339a9-682c-4ecc-9fc6-75a6c034dea6","name":"d19339a9-682c-4ecc-9fc6-75a6c034dea6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"532e1c80-fbc6-423b-b4b7-054831518ddb","name":"532e1c80-fbc6-423b-b4b7-054831518ddb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f63c7a7a-9ec3-49cd-9f33-a951dfc4c97a","name":"f63c7a7a-9ec3-49cd-9f33-a951dfc4c97a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d222518e-ee62-4391-ba3b-eaf17a4e8460","name":"d222518e-ee62-4391-ba3b-eaf17a4e8460","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ecafdcef-f511-430c-91a8-30ee6580a6a0","name":"ecafdcef-f511-430c-91a8-30ee6580a6a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5426d439-bb49-4082-84f2-452c2d01792d","name":"5426d439-bb49-4082-84f2-452c2d01792d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9b761b33-b38f-4ca4-b119-c55bc0a2e9e7","name":"9b761b33-b38f-4ca4-b119-c55bc0a2e9e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fcad843f-7d6a-4d7b-bce1-4c936c6d6716","name":"fcad843f-7d6a-4d7b-bce1-4c936c6d6716","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfda7d39-c01c-40f5-9586-9eab35c2b6e7","name":"dfda7d39-c01c-40f5-9586-9eab35c2b6e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bf80a677-6b33-4cd5-947e-b85ecaa4fe02","name":"bf80a677-6b33-4cd5-947e-b85ecaa4fe02","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d19339a9-682c-4ecc-9fc6-75a6c034dea6","name":"d19339a9-682c-4ecc-9fc6-75a6c034dea6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"532e1c80-fbc6-423b-b4b7-054831518ddb","name":"532e1c80-fbc6-423b-b4b7-054831518ddb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f63c7a7a-9ec3-49cd-9f33-a951dfc4c97a","name":"f63c7a7a-9ec3-49cd-9f33-a951dfc4c97a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d222518e-ee62-4391-ba3b-eaf17a4e8460","name":"d222518e-ee62-4391-ba3b-eaf17a4e8460","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,6 +72,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -109,10 +111,7 @@ },"Disabled":false,"id":"b6d5d89e-ff91-442b-95ca-096f4946bc98","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":0, "yorigin":0, diff --git a/sprites/spr_tartaros_complex/8d99f92f-4aac-47e4-a142-c6ea6be47856.png b/sprites/spr_tartaros_complex/8d99f92f-4aac-47e4-a142-c6ea6be47856.png index aa88fdf8c7..a2676a41b7 100644 Binary files a/sprites/spr_tartaros_complex/8d99f92f-4aac-47e4-a142-c6ea6be47856.png and b/sprites/spr_tartaros_complex/8d99f92f-4aac-47e4-a142-c6ea6be47856.png differ diff --git a/sprites/spr_tartaros_complex/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/229b5182-d233-4896-9f67-630367846af5.png b/sprites/spr_tartaros_complex/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/229b5182-d233-4896-9f67-630367846af5.png index aa88fdf8c7..a2676a41b7 100644 Binary files a/sprites/spr_tartaros_complex/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/229b5182-d233-4896-9f67-630367846af5.png and b/sprites/spr_tartaros_complex/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/229b5182-d233-4896-9f67-630367846af5.png differ diff --git a/sprites/spr_tartaros_complex/spr_tartaros_complex.yy b/sprites/spr_tartaros_complex/spr_tartaros_complex.yy index 87ec6a4c02..4909f8060f 100644 --- a/sprites/spr_tartaros_complex/spr_tartaros_complex.yy +++ b/sprites/spr_tartaros_complex/spr_tartaros_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_complex", "bboxMode":0, "bbox_bottom":204, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy b/sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy index 9816929fd4..edf9a79c37 100644 --- a/sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy +++ b/sprites/spr_tartaros_faceplate/spr_tartaros_faceplate.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_faceplate", "bboxMode":0, "bbox_bottom":68, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1bbe2e76-e507-418e-8883-0db45afc0631","name":"1bbe2e76-e507-418e-8883-0db45afc0631","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d2594043-39aa-46d0-b252-cce3b13f1f83","name":"d2594043-39aa-46d0-b252-cce3b13f1f83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1bbe2e76-e507-418e-8883-0db45afc0631","name":"1bbe2e76-e507-418e-8883-0db45afc0631","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d2594043-39aa-46d0-b252-cce3b13f1f83","name":"d2594043-39aa-46d0-b252-cce3b13f1f83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -79,7 +81,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_forehead_shadows/40bc99d5-36c6-494f-ac41-97db7b1af50a.png b/sprites/spr_tartaros_forehead_shadows/40bc99d5-36c6-494f-ac41-97db7b1af50a.png new file mode 100644 index 0000000000..04fed7e84f Binary files /dev/null and b/sprites/spr_tartaros_forehead_shadows/40bc99d5-36c6-494f-ac41-97db7b1af50a.png differ diff --git a/sprites/spr_tartaros_forehead_shadows/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png b/sprites/spr_tartaros_forehead_shadows/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png new file mode 100644 index 0000000000..3b57f13a9a Binary files /dev/null and b/sprites/spr_tartaros_forehead_shadows/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png differ diff --git a/sprites/spr_tartaros_forehead_shadows/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png b/sprites/spr_tartaros_forehead_shadows/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png new file mode 100644 index 0000000000..5a9db12b6f Binary files /dev/null and b/sprites/spr_tartaros_forehead_shadows/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png differ diff --git a/sprites/spr_tartaros_forehead_shadows/fd6650e0-331d-4ca5-8853-0b5406c4134d.png b/sprites/spr_tartaros_forehead_shadows/fd6650e0-331d-4ca5-8853-0b5406c4134d.png new file mode 100644 index 0000000000..7c1af4a7dd Binary files /dev/null and b/sprites/spr_tartaros_forehead_shadows/fd6650e0-331d-4ca5-8853-0b5406c4134d.png differ diff --git a/sprites/spr_tartaros_forehead_shadows/layers/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_forehead_shadows/layers/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png new file mode 100644 index 0000000000..04fed7e84f Binary files /dev/null and b/sprites/spr_tartaros_forehead_shadows/layers/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png differ diff --git a/sprites/spr_tartaros_forehead_shadows/layers/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_forehead_shadows/layers/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png new file mode 100644 index 0000000000..3b57f13a9a Binary files /dev/null and b/sprites/spr_tartaros_forehead_shadows/layers/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png differ diff --git a/sprites/spr_tartaros_forehead_shadows/layers/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_forehead_shadows/layers/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png new file mode 100644 index 0000000000..5a9db12b6f Binary files /dev/null and b/sprites/spr_tartaros_forehead_shadows/layers/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png differ diff --git a/sprites/spr_tartaros_forehead_shadows/layers/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_forehead_shadows/layers/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png new file mode 100644 index 0000000000..ed36d9f90b Binary files /dev/null and b/sprites/spr_tartaros_forehead_shadows/layers/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png differ diff --git a/sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy b/sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy new file mode 100644 index 0000000000..00fe2f233f --- /dev/null +++ b/sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy @@ -0,0 +1,104 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_forehead_shadows", + "bboxMode":0, + "bbox_bottom":61, + "bbox_left":75, + "bbox_right":104, + "bbox_top":41, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"3156c4a2-0553-4e28-b1dd-29e32750bb31","blendMode":0,"displayName":"default","isLocked":false,"name":"3156c4a2-0553-4e28-b1dd-29e32750bb31","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_forehead_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_tartaros_forehead_shadows", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":4.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tartaros_forehead_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","path":"sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1a532018-4897-4836-9f0a-ad6b2a1e1ace","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","path":"sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4519c469-956a-4220-88e4-c3fae75eb452","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","path":"sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0b0fd24a-f8f4-4417-9118-843f3e258ebc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","path":"sprites/spr_tartaros_forehead_shadows/spr_tartaros_forehead_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5d4ff4a0-8f3e-42c8-8e21-60bfc6e311fb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_tartaros_forehead_variants/40bc99d5-36c6-494f-ac41-97db7b1af50a.png b/sprites/spr_tartaros_forehead_variants/40bc99d5-36c6-494f-ac41-97db7b1af50a.png new file mode 100644 index 0000000000..02172dc824 Binary files /dev/null and b/sprites/spr_tartaros_forehead_variants/40bc99d5-36c6-494f-ac41-97db7b1af50a.png differ diff --git a/sprites/spr_tartaros_forehead_variants/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png b/sprites/spr_tartaros_forehead_variants/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png new file mode 100644 index 0000000000..e5258e6ae9 Binary files /dev/null and b/sprites/spr_tartaros_forehead_variants/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png differ diff --git a/sprites/spr_tartaros_forehead_variants/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png b/sprites/spr_tartaros_forehead_variants/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png new file mode 100644 index 0000000000..5a55ce8f16 Binary files /dev/null and b/sprites/spr_tartaros_forehead_variants/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png differ diff --git a/sprites/spr_tartaros_forehead_variants/fd6650e0-331d-4ca5-8853-0b5406c4134d.png b/sprites/spr_tartaros_forehead_variants/fd6650e0-331d-4ca5-8853-0b5406c4134d.png new file mode 100644 index 0000000000..ed36d9f90b Binary files /dev/null and b/sprites/spr_tartaros_forehead_variants/fd6650e0-331d-4ca5-8853-0b5406c4134d.png differ diff --git a/sprites/spr_tartaros_forehead_variants/layers/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_forehead_variants/layers/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png new file mode 100644 index 0000000000..02172dc824 Binary files /dev/null and b/sprites/spr_tartaros_forehead_variants/layers/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png differ diff --git a/sprites/spr_tartaros_forehead_variants/layers/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_forehead_variants/layers/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png new file mode 100644 index 0000000000..e5258e6ae9 Binary files /dev/null and b/sprites/spr_tartaros_forehead_variants/layers/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png differ diff --git a/sprites/spr_tartaros_forehead_variants/layers/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_forehead_variants/layers/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png new file mode 100644 index 0000000000..5a55ce8f16 Binary files /dev/null and b/sprites/spr_tartaros_forehead_variants/layers/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png differ diff --git a/sprites/spr_tartaros_forehead_variants/layers/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_forehead_variants/layers/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png new file mode 100644 index 0000000000..ed36d9f90b Binary files /dev/null and b/sprites/spr_tartaros_forehead_variants/layers/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png differ diff --git a/sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy b/sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy new file mode 100644 index 0000000000..2a5c953d44 --- /dev/null +++ b/sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy @@ -0,0 +1,104 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_forehead_variants", + "bboxMode":0, + "bbox_bottom":61, + "bbox_left":75, + "bbox_right":104, + "bbox_top":41, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"3156c4a2-0553-4e28-b1dd-29e32750bb31","blendMode":0,"displayName":"default","isLocked":false,"name":"3156c4a2-0553-4e28-b1dd-29e32750bb31","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_forehead_variants", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_tartaros_forehead_variants", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":4.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tartaros_forehead_variants", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","path":"sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1a532018-4897-4836-9f0a-ad6b2a1e1ace","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","path":"sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4519c469-956a-4220-88e4-c3fae75eb452","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","path":"sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0b0fd24a-f8f4-4417-9118-843f3e258ebc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","path":"sprites/spr_tartaros_forehead_variants/spr_tartaros_forehead_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"5d4ff4a0-8f3e-42c8-8e21-60bfc6e311fb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy b/sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy index d40c80760d..e204286024 100644 --- a/sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy +++ b/sprites/spr_tartaros_gorget/spr_tartaros_gorget.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_gorget", "bboxMode":0, "bbox_bottom":87, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7183111f-9020-46b1-8c8d-6f3863650227","name":"7183111f-9020-46b1-8c8d-6f3863650227","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b5f0e39e-b410-44dc-ab65-854f6d158d85","name":"b5f0e39e-b410-44dc-ab65-854f6d158d85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"524957d3-4452-4fba-bc1d-d08e55003395","name":"524957d3-4452-4fba-bc1d-d08e55003395","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7183111f-9020-46b1-8c8d-6f3863650227","name":"7183111f-9020-46b1-8c8d-6f3863650227","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b5f0e39e-b410-44dc-ab65-854f6d158d85","name":"b5f0e39e-b410-44dc-ab65-854f6d158d85","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"524957d3-4452-4fba-bc1d-d08e55003395","name":"524957d3-4452-4fba-bc1d-d08e55003395","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -66,6 +66,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -87,7 +89,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_gorget_shadows/7183111f-9020-46b1-8c8d-6f3863650227.png b/sprites/spr_tartaros_gorget_shadows/7183111f-9020-46b1-8c8d-6f3863650227.png new file mode 100644 index 0000000000..129b0af09b Binary files /dev/null and b/sprites/spr_tartaros_gorget_shadows/7183111f-9020-46b1-8c8d-6f3863650227.png differ diff --git a/sprites/spr_tartaros_gorget_shadows/7f9b6976-da75-43c8-97e3-acfa8912ef0e.png b/sprites/spr_tartaros_gorget_shadows/7f9b6976-da75-43c8-97e3-acfa8912ef0e.png new file mode 100644 index 0000000000..b9eae291e1 Binary files /dev/null and b/sprites/spr_tartaros_gorget_shadows/7f9b6976-da75-43c8-97e3-acfa8912ef0e.png differ diff --git a/sprites/spr_tartaros_gorget_shadows/8d99f92f-4aac-47e4-a142-c6ea6be47856.png b/sprites/spr_tartaros_gorget_shadows/8d99f92f-4aac-47e4-a142-c6ea6be47856.png new file mode 100644 index 0000000000..70f128ca33 Binary files /dev/null and b/sprites/spr_tartaros_gorget_shadows/8d99f92f-4aac-47e4-a142-c6ea6be47856.png differ diff --git a/sprites/spr_tartaros_gorget_shadows/ead692b6-35d8-4ebb-bc75-76c2fbfae9ef.png b/sprites/spr_tartaros_gorget_shadows/ead692b6-35d8-4ebb-bc75-76c2fbfae9ef.png new file mode 100644 index 0000000000..ef378bc642 Binary files /dev/null and b/sprites/spr_tartaros_gorget_shadows/ead692b6-35d8-4ebb-bc75-76c2fbfae9ef.png differ diff --git a/sprites/spr_tartaros_gorget_shadows/layers/7183111f-9020-46b1-8c8d-6f3863650227/50a6880d-f9bf-4734-a44b-81b675bc6761.png b/sprites/spr_tartaros_gorget_shadows/layers/7183111f-9020-46b1-8c8d-6f3863650227/50a6880d-f9bf-4734-a44b-81b675bc6761.png new file mode 100644 index 0000000000..129b0af09b Binary files /dev/null and b/sprites/spr_tartaros_gorget_shadows/layers/7183111f-9020-46b1-8c8d-6f3863650227/50a6880d-f9bf-4734-a44b-81b675bc6761.png differ diff --git a/sprites/spr_tartaros_gorget_shadows/layers/7f9b6976-da75-43c8-97e3-acfa8912ef0e/50a6880d-f9bf-4734-a44b-81b675bc6761.png b/sprites/spr_tartaros_gorget_shadows/layers/7f9b6976-da75-43c8-97e3-acfa8912ef0e/50a6880d-f9bf-4734-a44b-81b675bc6761.png new file mode 100644 index 0000000000..b9eae291e1 Binary files /dev/null and b/sprites/spr_tartaros_gorget_shadows/layers/7f9b6976-da75-43c8-97e3-acfa8912ef0e/50a6880d-f9bf-4734-a44b-81b675bc6761.png differ diff --git a/sprites/spr_tartaros_gorget_shadows/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/50a6880d-f9bf-4734-a44b-81b675bc6761.png b/sprites/spr_tartaros_gorget_shadows/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/50a6880d-f9bf-4734-a44b-81b675bc6761.png new file mode 100644 index 0000000000..70f128ca33 Binary files /dev/null and b/sprites/spr_tartaros_gorget_shadows/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/50a6880d-f9bf-4734-a44b-81b675bc6761.png differ diff --git a/sprites/spr_tartaros_gorget_shadows/layers/ead692b6-35d8-4ebb-bc75-76c2fbfae9ef/50a6880d-f9bf-4734-a44b-81b675bc6761.png b/sprites/spr_tartaros_gorget_shadows/layers/ead692b6-35d8-4ebb-bc75-76c2fbfae9ef/50a6880d-f9bf-4734-a44b-81b675bc6761.png new file mode 100644 index 0000000000..ef378bc642 Binary files /dev/null and b/sprites/spr_tartaros_gorget_shadows/layers/ead692b6-35d8-4ebb-bc75-76c2fbfae9ef/50a6880d-f9bf-4734-a44b-81b675bc6761.png differ diff --git a/sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy b/sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy new file mode 100644 index 0000000000..878c8bf5b4 --- /dev/null +++ b/sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy @@ -0,0 +1,104 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_gorget_shadows", + "bboxMode":0, + "bbox_bottom":87, + "bbox_left":62, + "bbox_right":117, + "bbox_top":65, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7183111f-9020-46b1-8c8d-6f3863650227","name":"7183111f-9020-46b1-8c8d-6f3863650227","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ead692b6-35d8-4ebb-bc75-76c2fbfae9ef","name":"ead692b6-35d8-4ebb-bc75-76c2fbfae9ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f9b6976-da75-43c8-97e3-acfa8912ef0e","name":"7f9b6976-da75-43c8-97e3-acfa8912ef0e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"50a6880d-f9bf-4734-a44b-81b675bc6761","blendMode":0,"displayName":"default","isLocked":false,"name":"50a6880d-f9bf-4734-a44b-81b675bc6761","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_gorget_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_tartaros_gorget_shadows", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":4.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tartaros_gorget_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9235ed8a-8884-482b-beb0-ca7bd8d76034","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7183111f-9020-46b1-8c8d-6f3863650227","path":"sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"239b9ef2-147e-4638-b8bf-9fb260690813","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ead692b6-35d8-4ebb-bc75-76c2fbfae9ef","path":"sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"faab9019-f40d-4a3b-9335-53b1d7eb470b","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f9b6976-da75-43c8-97e3-acfa8912ef0e","path":"sprites/spr_tartaros_gorget_shadows/spr_tartaros_gorget_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c4ab6499-31ce-48c3-b639-e485f12c92de","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_tartaros_head_shadows/fd6650e0-331d-4ca5-8853-0b5406c4134d.png b/sprites/spr_tartaros_head_shadows/fd6650e0-331d-4ca5-8853-0b5406c4134d.png new file mode 100644 index 0000000000..73b53b11fe Binary files /dev/null and b/sprites/spr_tartaros_head_shadows/fd6650e0-331d-4ca5-8853-0b5406c4134d.png differ diff --git a/sprites/spr_tartaros_head_shadows/layers/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_head_shadows/layers/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png new file mode 100644 index 0000000000..73b53b11fe Binary files /dev/null and b/sprites/spr_tartaros_head_shadows/layers/fd6650e0-331d-4ca5-8853-0b5406c4134d/3156c4a2-0553-4e28-b1dd-29e32750bb31.png differ diff --git a/sprites/spr_tartaros_head_shadows/spr_tartaros_head_shadows.yy b/sprites/spr_tartaros_head_shadows/spr_tartaros_head_shadows.yy new file mode 100644 index 0000000000..20837e5cba --- /dev/null +++ b/sprites/spr_tartaros_head_shadows/spr_tartaros_head_shadows.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_head_shadows", + "bboxMode":0, + "bbox_bottom":68, + "bbox_left":69, + "bbox_right":110, + "bbox_top":41, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"3156c4a2-0553-4e28-b1dd-29e32750bb31","blendMode":0,"displayName":"default","isLocked":false,"name":"3156c4a2-0553-4e28-b1dd-29e32750bb31","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_head_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_tartaros_head_shadows", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tartaros_head_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","path":"sprites/spr_tartaros_head_shadows/spr_tartaros_head_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1a532018-4897-4836-9f0a-ad6b2a1e1ace","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_tartaros_head_variants/40bc99d5-36c6-494f-ac41-97db7b1af50a.png b/sprites/spr_tartaros_head_variants/40bc99d5-36c6-494f-ac41-97db7b1af50a.png deleted file mode 100644 index 7fad9d3733..0000000000 Binary files a/sprites/spr_tartaros_head_variants/40bc99d5-36c6-494f-ac41-97db7b1af50a.png and /dev/null differ diff --git a/sprites/spr_tartaros_head_variants/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png b/sprites/spr_tartaros_head_variants/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png deleted file mode 100644 index 163d09b375..0000000000 Binary files a/sprites/spr_tartaros_head_variants/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3.png and /dev/null differ diff --git a/sprites/spr_tartaros_head_variants/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png b/sprites/spr_tartaros_head_variants/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png deleted file mode 100644 index a51e5874e2..0000000000 Binary files a/sprites/spr_tartaros_head_variants/b529fb18-f4ec-47d1-b6b3-ed4a9f174496.png and /dev/null differ diff --git a/sprites/spr_tartaros_head_variants/layers/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_head_variants/layers/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png deleted file mode 100644 index 7fad9d3733..0000000000 Binary files a/sprites/spr_tartaros_head_variants/layers/40bc99d5-36c6-494f-ac41-97db7b1af50a/3156c4a2-0553-4e28-b1dd-29e32750bb31.png and /dev/null differ diff --git a/sprites/spr_tartaros_head_variants/layers/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_head_variants/layers/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png deleted file mode 100644 index 163d09b375..0000000000 Binary files a/sprites/spr_tartaros_head_variants/layers/9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3/3156c4a2-0553-4e28-b1dd-29e32750bb31.png and /dev/null differ diff --git a/sprites/spr_tartaros_head_variants/layers/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png b/sprites/spr_tartaros_head_variants/layers/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png deleted file mode 100644 index a51e5874e2..0000000000 Binary files a/sprites/spr_tartaros_head_variants/layers/b529fb18-f4ec-47d1-b6b3-ed4a9f174496/3156c4a2-0553-4e28-b1dd-29e32750bb31.png and /dev/null differ diff --git a/sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy b/sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy index 15f958ab85..d4af0a8401 100644 --- a/sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy +++ b/sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_head_variants", "bboxMode":0, "bbox_bottom":68, @@ -12,10 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -52,7 +49,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":4.0, + "length":1.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -66,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -74,20 +73,11 @@ {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd6650e0-331d-4ca5-8853-0b5406c4134d","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"1a532018-4897-4836-9f0a-ad6b2a1e1ace","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40bc99d5-36c6-494f-ac41-97db7b1af50a","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4519c469-956a-4220-88e4-c3fae75eb452","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b529fb18-f4ec-47d1-b6b3-ed4a9f174496","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0b0fd24a-f8f4-4417-9118-843f3e258ebc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d5b17e4-eb9a-46c2-a4a7-6dbbfac5dfe3","path":"sprites/spr_tartaros_head_variants/spr_tartaros_head_variants.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d4ff4a0-8f3e-42c8-8e21-60bfc6e311fb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy b/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy index d98b23c650..6d9118aded 100644 --- a/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy +++ b/sprites/spr_tartaros_left_arm/spr_tartaros_left_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_left_arm", "bboxMode":0, "bbox_bottom":169, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","name":"e3118bae-7ca8-4654-9c4b-7c1f23bab334","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy b/sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy index f71672f665..b9a4d7348c 100644 --- a/sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy +++ b/sprites/spr_tartaros_left_leg/spr_tartaros_left_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_left_leg", "bboxMode":0, "bbox_bottom":259, @@ -12,11 +12,11 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1b0c3505-55a7-478a-a52c-1c5aa3702630","name":"1b0c3505-55a7-478a-a52c-1c5aa3702630","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"03d9ca8d-b461-47ef-abbc-e53ae850d225","name":"03d9ca8d-b461-47ef-abbc-e53ae850d225","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b9a9cf23-f9c7-4d60-9393-c38dc6b2d0ed","name":"b9a9cf23-f9c7-4d60-9393-c38dc6b2d0ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e9bb0037-8489-4bbd-90a4-43bddaaff972","name":"e9bb0037-8489-4bbd-90a4-43bddaaff972","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f3b39034-cdc1-41f6-872e-22e6e9d5f55a","name":"f3b39034-cdc1-41f6-872e-22e6e9d5f55a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b0c3505-55a7-478a-a52c-1c5aa3702630","name":"1b0c3505-55a7-478a-a52c-1c5aa3702630","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03d9ca8d-b461-47ef-abbc-e53ae850d225","name":"03d9ca8d-b461-47ef-abbc-e53ae850d225","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b9a9cf23-f9c7-4d60-9393-c38dc6b2d0ed","name":"b9a9cf23-f9c7-4d60-9393-c38dc6b2d0ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e9bb0037-8489-4bbd-90a4-43bddaaff972","name":"e9bb0037-8489-4bbd-90a4-43bddaaff972","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f3b39034-cdc1-41f6-872e-22e6e9d5f55a","name":"f3b39034-cdc1-41f6-872e-22e6e9d5f55a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -67,6 +67,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -91,7 +93,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy b/sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy index 371f86a4f8..e78734c7a2 100644 --- a/sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy +++ b/sprites/spr_tartaros_left_trim/spr_tartaros_left_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_left_trim", "bboxMode":0, "bbox_bottom":179, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5defea7d-cb28-4fdc-8073-ce633c560aae","name":"5defea7d-cb28-4fdc-8073-ce633c560aae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"00046679-5075-4ad2-8995-2c6c2244ab41","name":"00046679-5075-4ad2-8995-2c6c2244ab41","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5defea7d-cb28-4fdc-8073-ce633c560aae","name":"5defea7d-cb28-4fdc-8073-ce633c560aae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00046679-5075-4ad2-8995-2c6c2244ab41","name":"00046679-5075-4ad2-8995-2c6c2244ab41","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -97,7 +97,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_leg_rivets/b53b7c9e-26af-4c4b-9b89-a15af4f7296c.png b/sprites/spr_tartaros_leg_rivets/b53b7c9e-26af-4c4b-9b89-a15af4f7296c.png new file mode 100644 index 0000000000..fa42744b1d Binary files /dev/null and b/sprites/spr_tartaros_leg_rivets/b53b7c9e-26af-4c4b-9b89-a15af4f7296c.png differ diff --git a/sprites/spr_tartaros_leg_rivets/layers/b53b7c9e-26af-4c4b-9b89-a15af4f7296c/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_leg_rivets/layers/b53b7c9e-26af-4c4b-9b89-a15af4f7296c/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png new file mode 100644 index 0000000000..fa42744b1d Binary files /dev/null and b/sprites/spr_tartaros_leg_rivets/layers/b53b7c9e-26af-4c4b-9b89-a15af4f7296c/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png differ diff --git a/sprites/spr_tartaros_leg_rivets/spr_tartaros_leg_rivets.yy b/sprites/spr_tartaros_leg_rivets/spr_tartaros_leg_rivets.yy new file mode 100644 index 0000000000..70a4d99101 --- /dev/null +++ b/sprites/spr_tartaros_leg_rivets/spr_tartaros_leg_rivets.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_leg_rivets", + "bboxMode":0, + "bbox_bottom":218, + "bbox_left":32, + "bbox_right":66, + "bbox_top":173, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"b1ad68ac-732f-42d2-971e-e7f6a4962e33","blendMode":0,"displayName":"default","isLocked":false,"name":"b1ad68ac-732f-42d2-971e-e7f6a4962e33","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_leg_rivets", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_tartaros_leg_rivets", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tartaros_leg_rivets", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","path":"sprites/spr_tartaros_leg_rivets/spr_tartaros_leg_rivets.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6b8fc32b-fe8a-41b2-8970-72f6bd2a6892","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy b/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy index 2a33d0c455..1737521381 100644 --- a/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy +++ b/sprites/spr_tartaros_right_arm/spr_tartaros_right_arm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_right_arm", "bboxMode":0, "bbox_bottom":169, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -75,7 +77,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_right_arm_shadows/87c9365b-ef0b-48e1-a764-b2b2b8937c67.png b/sprites/spr_tartaros_right_arm_shadows/87c9365b-ef0b-48e1-a764-b2b2b8937c67.png new file mode 100644 index 0000000000..943375828b Binary files /dev/null and b/sprites/spr_tartaros_right_arm_shadows/87c9365b-ef0b-48e1-a764-b2b2b8937c67.png differ diff --git a/sprites/spr_tartaros_right_arm_shadows/layers/87c9365b-ef0b-48e1-a764-b2b2b8937c67/c87e73e1-e866-4b39-8a1f-96167acb2eca.png b/sprites/spr_tartaros_right_arm_shadows/layers/87c9365b-ef0b-48e1-a764-b2b2b8937c67/c87e73e1-e866-4b39-8a1f-96167acb2eca.png new file mode 100644 index 0000000000..943375828b Binary files /dev/null and b/sprites/spr_tartaros_right_arm_shadows/layers/87c9365b-ef0b-48e1-a764-b2b2b8937c67/c87e73e1-e866-4b39-8a1f-96167acb2eca.png differ diff --git a/sprites/spr_tartaros_right_arm_shadows/spr_tartaros_right_arm_shadows.yy b/sprites/spr_tartaros_right_arm_shadows/spr_tartaros_right_arm_shadows.yy new file mode 100644 index 0000000000..58d9a4d37d --- /dev/null +++ b/sprites/spr_tartaros_right_arm_shadows/spr_tartaros_right_arm_shadows.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_right_arm_shadows", + "bboxMode":0, + "bbox_bottom":169, + "bbox_left":6, + "bbox_right":51, + "bbox_top":89, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"c87e73e1-e866-4b39-8a1f-96167acb2eca","blendMode":0,"displayName":"default","isLocked":false,"name":"c87e73e1-e866-4b39-8a1f-96167acb2eca","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_right_arm_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_tartaros_right_arm_shadows", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tartaros_right_arm_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87c9365b-ef0b-48e1-a764-b2b2b8937c67","path":"sprites/spr_tartaros_right_arm_shadows/spr_tartaros_right_arm_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f9665fe9-f2cc-4a6a-9121-57006f1160f8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_tartaros_right_leg/392ae0b5-e73f-4011-a77c-8cf14df79212.png b/sprites/spr_tartaros_right_leg/392ae0b5-e73f-4011-a77c-8cf14df79212.png index 5e10bf8bbf..e271e9bb55 100644 Binary files a/sprites/spr_tartaros_right_leg/392ae0b5-e73f-4011-a77c-8cf14df79212.png and b/sprites/spr_tartaros_right_leg/392ae0b5-e73f-4011-a77c-8cf14df79212.png differ diff --git a/sprites/spr_tartaros_right_leg/8d99f92f-4aac-47e4-a142-c6ea6be47856.png b/sprites/spr_tartaros_right_leg/8d99f92f-4aac-47e4-a142-c6ea6be47856.png index 5cbdd4d1e8..ccf0e26c7c 100644 Binary files a/sprites/spr_tartaros_right_leg/8d99f92f-4aac-47e4-a142-c6ea6be47856.png and b/sprites/spr_tartaros_right_leg/8d99f92f-4aac-47e4-a142-c6ea6be47856.png differ diff --git a/sprites/spr_tartaros_right_leg/b53b7c9e-26af-4c4b-9b89-a15af4f7296c.png b/sprites/spr_tartaros_right_leg/b53b7c9e-26af-4c4b-9b89-a15af4f7296c.png deleted file mode 100644 index c23a379154..0000000000 Binary files a/sprites/spr_tartaros_right_leg/b53b7c9e-26af-4c4b-9b89-a15af4f7296c.png and /dev/null differ diff --git a/sprites/spr_tartaros_right_leg/b89831c0-4b54-41e5-ad80-4d838fe31550.png b/sprites/spr_tartaros_right_leg/b89831c0-4b54-41e5-ad80-4d838fe31550.png index 81dacec169..ebddde7cf2 100644 Binary files a/sprites/spr_tartaros_right_leg/b89831c0-4b54-41e5-ad80-4d838fe31550.png and b/sprites/spr_tartaros_right_leg/b89831c0-4b54-41e5-ad80-4d838fe31550.png differ diff --git a/sprites/spr_tartaros_right_leg/f31258fb-8e42-40fa-9abe-d50ce4077249.png b/sprites/spr_tartaros_right_leg/f31258fb-8e42-40fa-9abe-d50ce4077249.png index a6afc5f943..0fdc24d80c 100644 Binary files a/sprites/spr_tartaros_right_leg/f31258fb-8e42-40fa-9abe-d50ce4077249.png and b/sprites/spr_tartaros_right_leg/f31258fb-8e42-40fa-9abe-d50ce4077249.png differ diff --git a/sprites/spr_tartaros_right_leg/layers/392ae0b5-e73f-4011-a77c-8cf14df79212/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_right_leg/layers/392ae0b5-e73f-4011-a77c-8cf14df79212/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png index 5e10bf8bbf..e271e9bb55 100644 Binary files a/sprites/spr_tartaros_right_leg/layers/392ae0b5-e73f-4011-a77c-8cf14df79212/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png and b/sprites/spr_tartaros_right_leg/layers/392ae0b5-e73f-4011-a77c-8cf14df79212/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png differ diff --git a/sprites/spr_tartaros_right_leg/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_right_leg/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png index 5cbdd4d1e8..ccf0e26c7c 100644 Binary files a/sprites/spr_tartaros_right_leg/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png and b/sprites/spr_tartaros_right_leg/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png differ diff --git a/sprites/spr_tartaros_right_leg/layers/b53b7c9e-26af-4c4b-9b89-a15af4f7296c/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_right_leg/layers/b53b7c9e-26af-4c4b-9b89-a15af4f7296c/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png deleted file mode 100644 index 071c3a5480..0000000000 Binary files a/sprites/spr_tartaros_right_leg/layers/b53b7c9e-26af-4c4b-9b89-a15af4f7296c/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png and /dev/null differ diff --git a/sprites/spr_tartaros_right_leg/layers/b89831c0-4b54-41e5-ad80-4d838fe31550/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_right_leg/layers/b89831c0-4b54-41e5-ad80-4d838fe31550/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png index 81dacec169..ebddde7cf2 100644 Binary files a/sprites/spr_tartaros_right_leg/layers/b89831c0-4b54-41e5-ad80-4d838fe31550/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png and b/sprites/spr_tartaros_right_leg/layers/b89831c0-4b54-41e5-ad80-4d838fe31550/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png differ diff --git a/sprites/spr_tartaros_right_leg/layers/f31258fb-8e42-40fa-9abe-d50ce4077249/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_right_leg/layers/f31258fb-8e42-40fa-9abe-d50ce4077249/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png index a6afc5f943..0fdc24d80c 100644 Binary files a/sprites/spr_tartaros_right_leg/layers/f31258fb-8e42-40fa-9abe-d50ce4077249/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png and b/sprites/spr_tartaros_right_leg/layers/f31258fb-8e42-40fa-9abe-d50ce4077249/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png differ diff --git a/sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy b/sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy index db9ca928b9..91b4e31127 100644 --- a/sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy +++ b/sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_right_leg", "bboxMode":0, "bbox_bottom":259, @@ -12,11 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b89831c0-4b54-41e5-ad80-4d838fe31550","name":"b89831c0-4b54-41e5-ad80-4d838fe31550","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"392ae0b5-e73f-4011-a77c-8cf14df79212","name":"392ae0b5-e73f-4011-a77c-8cf14df79212","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f31258fb-8e42-40fa-9abe-d50ce4077249","name":"f31258fb-8e42-40fa-9abe-d50ce4077249","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b89831c0-4b54-41e5-ad80-4d838fe31550","name":"b89831c0-4b54-41e5-ad80-4d838fe31550","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"392ae0b5-e73f-4011-a77c-8cf14df79212","name":"392ae0b5-e73f-4011-a77c-8cf14df79212","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f31258fb-8e42-40fa-9abe-d50ce4077249","name":"f31258fb-8e42-40fa-9abe-d50ce4077249","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -53,7 +52,7 @@ }, "eventStubScript":null, "eventToFunction":{}, - "length":5.0, + "length":4.0, "lockOrigin":false, "moments":{ "$KeyframeStore":"", @@ -67,6 +66,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -84,14 +85,11 @@ {"$Keyframe":"","Channels":{ "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f31258fb-8e42-40fa-9abe-d50ce4077249","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"b458f2e1-0c00-407a-bf09-7a64ef6bf3e0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b53b7c9e-26af-4c4b-9b89-a15af4f7296c","path":"sprites/spr_tartaros_right_leg/spr_tartaros_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b8fc32b-fe8a-41b2-8970-72f6bd2a6892","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_right_leg_shadows/8d99f92f-4aac-47e4-a142-c6ea6be47856.png b/sprites/spr_tartaros_right_leg_shadows/8d99f92f-4aac-47e4-a142-c6ea6be47856.png new file mode 100644 index 0000000000..1baa5ab169 Binary files /dev/null and b/sprites/spr_tartaros_right_leg_shadows/8d99f92f-4aac-47e4-a142-c6ea6be47856.png differ diff --git a/sprites/spr_tartaros_right_leg_shadows/efcff506-8258-4e7c-89aa-82cc9816fb9f.png b/sprites/spr_tartaros_right_leg_shadows/efcff506-8258-4e7c-89aa-82cc9816fb9f.png new file mode 100644 index 0000000000..55aba861e9 Binary files /dev/null and b/sprites/spr_tartaros_right_leg_shadows/efcff506-8258-4e7c-89aa-82cc9816fb9f.png differ diff --git a/sprites/spr_tartaros_right_leg_shadows/f31258fb-8e42-40fa-9abe-d50ce4077249.png b/sprites/spr_tartaros_right_leg_shadows/f31258fb-8e42-40fa-9abe-d50ce4077249.png new file mode 100644 index 0000000000..d42fffccb3 Binary files /dev/null and b/sprites/spr_tartaros_right_leg_shadows/f31258fb-8e42-40fa-9abe-d50ce4077249.png differ diff --git a/sprites/spr_tartaros_right_leg_shadows/fa086401-4b32-4bee-a3f9-fb5ec4f5bfa2.png b/sprites/spr_tartaros_right_leg_shadows/fa086401-4b32-4bee-a3f9-fb5ec4f5bfa2.png new file mode 100644 index 0000000000..55aba861e9 Binary files /dev/null and b/sprites/spr_tartaros_right_leg_shadows/fa086401-4b32-4bee-a3f9-fb5ec4f5bfa2.png differ diff --git a/sprites/spr_tartaros_right_leg_shadows/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_right_leg_shadows/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png new file mode 100644 index 0000000000..4fa94f6b44 Binary files /dev/null and b/sprites/spr_tartaros_right_leg_shadows/layers/8d99f92f-4aac-47e4-a142-c6ea6be47856/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png differ diff --git a/sprites/spr_tartaros_right_leg_shadows/layers/efcff506-8258-4e7c-89aa-82cc9816fb9f/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_right_leg_shadows/layers/efcff506-8258-4e7c-89aa-82cc9816fb9f/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png new file mode 100644 index 0000000000..55aba861e9 Binary files /dev/null and b/sprites/spr_tartaros_right_leg_shadows/layers/efcff506-8258-4e7c-89aa-82cc9816fb9f/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png differ diff --git a/sprites/spr_tartaros_right_leg_shadows/layers/f31258fb-8e42-40fa-9abe-d50ce4077249/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_right_leg_shadows/layers/f31258fb-8e42-40fa-9abe-d50ce4077249/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png new file mode 100644 index 0000000000..d42fffccb3 Binary files /dev/null and b/sprites/spr_tartaros_right_leg_shadows/layers/f31258fb-8e42-40fa-9abe-d50ce4077249/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png differ diff --git a/sprites/spr_tartaros_right_leg_shadows/layers/fa086401-4b32-4bee-a3f9-fb5ec4f5bfa2/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png b/sprites/spr_tartaros_right_leg_shadows/layers/fa086401-4b32-4bee-a3f9-fb5ec4f5bfa2/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png new file mode 100644 index 0000000000..55aba861e9 Binary files /dev/null and b/sprites/spr_tartaros_right_leg_shadows/layers/fa086401-4b32-4bee-a3f9-fb5ec4f5bfa2/b1ad68ac-732f-42d2-971e-e7f6a4962e33.png differ diff --git a/sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy b/sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy new file mode 100644 index 0000000000..288c3d187a --- /dev/null +++ b/sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy @@ -0,0 +1,104 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_right_leg_shadows", + "bboxMode":0, + "bbox_bottom":259, + "bbox_left":16, + "bbox_right":73, + "bbox_top":168, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"efcff506-8258-4e7c-89aa-82cc9816fb9f","name":"efcff506-8258-4e7c-89aa-82cc9816fb9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fa086401-4b32-4bee-a3f9-fb5ec4f5bfa2","name":"fa086401-4b32-4bee-a3f9-fb5ec4f5bfa2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f31258fb-8e42-40fa-9abe-d50ce4077249","name":"f31258fb-8e42-40fa-9abe-d50ce4077249","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"b1ad68ac-732f-42d2-971e-e7f6a4962e33","blendMode":0,"displayName":"default","isLocked":false,"name":"b1ad68ac-732f-42d2-971e-e7f6a4962e33","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_right_leg_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_tartaros_right_leg_shadows", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":4.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tartaros_right_leg_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","path":"sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"33b4a69d-c4a8-4d97-b35c-86e75a42672f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"efcff506-8258-4e7c-89aa-82cc9816fb9f","path":"sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b593ab0b-6afe-418f-9f61-ed3d66804bc1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fa086401-4b32-4bee-a3f9-fb5ec4f5bfa2","path":"sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"bde8a6fe-7fdf-41ed-99f6-c421cef407dc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f31258fb-8e42-40fa-9abe-d50ce4077249","path":"sprites/spr_tartaros_right_leg_shadows/spr_tartaros_right_leg_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b458f2e1-0c00-407a-bf09-7a64ef6bf3e0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_tartaros_right_trim/7d968db5-be75-47d2-9c6a-3cb4f41b09fc.png b/sprites/spr_tartaros_right_trim/7d968db5-be75-47d2-9c6a-3cb4f41b09fc.png index fac8b6ebb2..2e358ad42c 100644 Binary files a/sprites/spr_tartaros_right_trim/7d968db5-be75-47d2-9c6a-3cb4f41b09fc.png and b/sprites/spr_tartaros_right_trim/7d968db5-be75-47d2-9c6a-3cb4f41b09fc.png differ diff --git a/sprites/spr_tartaros_right_trim/96a0b084-110c-46b1-b8e4-cde02fa49c20.png b/sprites/spr_tartaros_right_trim/96a0b084-110c-46b1-b8e4-cde02fa49c20.png index 1efd363d76..2e358ad42c 100644 Binary files a/sprites/spr_tartaros_right_trim/96a0b084-110c-46b1-b8e4-cde02fa49c20.png and b/sprites/spr_tartaros_right_trim/96a0b084-110c-46b1-b8e4-cde02fa49c20.png differ diff --git a/sprites/spr_tartaros_right_trim/9ac0f902-e80a-4de4-b09c-2700ec2dfaf6.png b/sprites/spr_tartaros_right_trim/9ac0f902-e80a-4de4-b09c-2700ec2dfaf6.png index 5f7e25ebb1..6e9c4a9bd3 100644 Binary files a/sprites/spr_tartaros_right_trim/9ac0f902-e80a-4de4-b09c-2700ec2dfaf6.png and b/sprites/spr_tartaros_right_trim/9ac0f902-e80a-4de4-b09c-2700ec2dfaf6.png differ diff --git a/sprites/spr_tartaros_right_trim/layers/7d968db5-be75-47d2-9c6a-3cb4f41b09fc/229b5182-d233-4896-9f67-630367846af5.png b/sprites/spr_tartaros_right_trim/layers/7d968db5-be75-47d2-9c6a-3cb4f41b09fc/229b5182-d233-4896-9f67-630367846af5.png index fac8b6ebb2..2e358ad42c 100644 Binary files a/sprites/spr_tartaros_right_trim/layers/7d968db5-be75-47d2-9c6a-3cb4f41b09fc/229b5182-d233-4896-9f67-630367846af5.png and b/sprites/spr_tartaros_right_trim/layers/7d968db5-be75-47d2-9c6a-3cb4f41b09fc/229b5182-d233-4896-9f67-630367846af5.png differ diff --git a/sprites/spr_tartaros_right_trim/layers/96a0b084-110c-46b1-b8e4-cde02fa49c20/229b5182-d233-4896-9f67-630367846af5.png b/sprites/spr_tartaros_right_trim/layers/96a0b084-110c-46b1-b8e4-cde02fa49c20/229b5182-d233-4896-9f67-630367846af5.png index 1efd363d76..2e358ad42c 100644 Binary files a/sprites/spr_tartaros_right_trim/layers/96a0b084-110c-46b1-b8e4-cde02fa49c20/229b5182-d233-4896-9f67-630367846af5.png and b/sprites/spr_tartaros_right_trim/layers/96a0b084-110c-46b1-b8e4-cde02fa49c20/229b5182-d233-4896-9f67-630367846af5.png differ diff --git a/sprites/spr_tartaros_right_trim/layers/9ac0f902-e80a-4de4-b09c-2700ec2dfaf6/229b5182-d233-4896-9f67-630367846af5.png b/sprites/spr_tartaros_right_trim/layers/9ac0f902-e80a-4de4-b09c-2700ec2dfaf6/229b5182-d233-4896-9f67-630367846af5.png index 5f7e25ebb1..6e9c4a9bd3 100644 Binary files a/sprites/spr_tartaros_right_trim/layers/9ac0f902-e80a-4de4-b09c-2700ec2dfaf6/229b5182-d233-4896-9f67-630367846af5.png and b/sprites/spr_tartaros_right_trim/layers/9ac0f902-e80a-4de4-b09c-2700ec2dfaf6/229b5182-d233-4896-9f67-630367846af5.png differ diff --git a/sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy b/sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy index c4056ee666..349dbfb8de 100644 --- a/sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy +++ b/sprites/spr_tartaros_right_trim/spr_tartaros_right_trim.yy @@ -1,23 +1,23 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_right_trim", "bboxMode":0, "bbox_bottom":179, - "bbox_left":0, + "bbox_left":10, "bbox_right":139, - "bbox_top":0, + "bbox_top":44, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5defea7d-cb28-4fdc-8073-ce633c560aae","name":"5defea7d-cb28-4fdc-8073-ce633c560aae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"00046679-5075-4ad2-8995-2c6c2244ab41","name":"00046679-5075-4ad2-8995-2c6c2244ab41","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","name":"9ac0f902-e80a-4de4-b09c-2700ec2dfaf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5defea7d-cb28-4fdc-8073-ce633c560aae","name":"5defea7d-cb28-4fdc-8073-ce633c560aae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","name":"7d968db5-be75-47d2-9c6a-3cb4f41b09fc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","name":"96a0b084-110c-46b1-b8e4-cde02fa49c20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","name":"a9a234af-e448-43ae-8540-2e6aebb4cd38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"00046679-5075-4ad2-8995-2c6c2244ab41","name":"00046679-5075-4ad2-8995-2c6c2244ab41","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,6 +68,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -95,7 +97,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_tartaros_right_trim_shadows/100b29ea-fe77-4be7-9047-263452df1459.png b/sprites/spr_tartaros_right_trim_shadows/100b29ea-fe77-4be7-9047-263452df1459.png new file mode 100644 index 0000000000..81c0b4e7b8 Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/100b29ea-fe77-4be7-9047-263452df1459.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/4e5d2eac-be4d-4fc6-8015-eee3c1a49cc9.png b/sprites/spr_tartaros_right_trim_shadows/4e5d2eac-be4d-4fc6-8015-eee3c1a49cc9.png new file mode 100644 index 0000000000..b041c792ed Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/4e5d2eac-be4d-4fc6-8015-eee3c1a49cc9.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/93daf279-d2ce-404f-a78a-bf2452370123.png b/sprites/spr_tartaros_right_trim_shadows/93daf279-d2ce-404f-a78a-bf2452370123.png new file mode 100644 index 0000000000..81c0b4e7b8 Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/93daf279-d2ce-404f-a78a-bf2452370123.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/f0854253-f7d6-415f-a231-821c06d4b85b.png b/sprites/spr_tartaros_right_trim_shadows/f0854253-f7d6-415f-a231-821c06d4b85b.png new file mode 100644 index 0000000000..81c0b4e7b8 Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/f0854253-f7d6-415f-a231-821c06d4b85b.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/fcc398f5-9f0f-43e7-a8eb-d61aea01512a.png b/sprites/spr_tartaros_right_trim_shadows/fcc398f5-9f0f-43e7-a8eb-d61aea01512a.png new file mode 100644 index 0000000000..a406108c57 Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/fcc398f5-9f0f-43e7-a8eb-d61aea01512a.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/layers/100b29ea-fe77-4be7-9047-263452df1459/bfad4db2-459b-493b-943a-cecb6336858c.png b/sprites/spr_tartaros_right_trim_shadows/layers/100b29ea-fe77-4be7-9047-263452df1459/bfad4db2-459b-493b-943a-cecb6336858c.png new file mode 100644 index 0000000000..81c0b4e7b8 Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/layers/100b29ea-fe77-4be7-9047-263452df1459/bfad4db2-459b-493b-943a-cecb6336858c.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/layers/4e5d2eac-be4d-4fc6-8015-eee3c1a49cc9/bfad4db2-459b-493b-943a-cecb6336858c.png b/sprites/spr_tartaros_right_trim_shadows/layers/4e5d2eac-be4d-4fc6-8015-eee3c1a49cc9/bfad4db2-459b-493b-943a-cecb6336858c.png new file mode 100644 index 0000000000..b041c792ed Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/layers/4e5d2eac-be4d-4fc6-8015-eee3c1a49cc9/bfad4db2-459b-493b-943a-cecb6336858c.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/layers/93daf279-d2ce-404f-a78a-bf2452370123/bfad4db2-459b-493b-943a-cecb6336858c.png b/sprites/spr_tartaros_right_trim_shadows/layers/93daf279-d2ce-404f-a78a-bf2452370123/bfad4db2-459b-493b-943a-cecb6336858c.png new file mode 100644 index 0000000000..81c0b4e7b8 Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/layers/93daf279-d2ce-404f-a78a-bf2452370123/bfad4db2-459b-493b-943a-cecb6336858c.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/layers/f0854253-f7d6-415f-a231-821c06d4b85b/bfad4db2-459b-493b-943a-cecb6336858c.png b/sprites/spr_tartaros_right_trim_shadows/layers/f0854253-f7d6-415f-a231-821c06d4b85b/bfad4db2-459b-493b-943a-cecb6336858c.png new file mode 100644 index 0000000000..81c0b4e7b8 Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/layers/f0854253-f7d6-415f-a231-821c06d4b85b/bfad4db2-459b-493b-943a-cecb6336858c.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/layers/fcc398f5-9f0f-43e7-a8eb-d61aea01512a/bfad4db2-459b-493b-943a-cecb6336858c.png b/sprites/spr_tartaros_right_trim_shadows/layers/fcc398f5-9f0f-43e7-a8eb-d61aea01512a/bfad4db2-459b-493b-943a-cecb6336858c.png new file mode 100644 index 0000000000..a406108c57 Binary files /dev/null and b/sprites/spr_tartaros_right_trim_shadows/layers/fcc398f5-9f0f-43e7-a8eb-d61aea01512a/bfad4db2-459b-493b-943a-cecb6336858c.png differ diff --git a/sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy b/sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy new file mode 100644 index 0000000000..cea044916e --- /dev/null +++ b/sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy @@ -0,0 +1,108 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_right_trim_shadows", + "bboxMode":0, + "bbox_bottom":93, + "bbox_left":11, + "bbox_right":57, + "bbox_top":46, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"4e5d2eac-be4d-4fc6-8015-eee3c1a49cc9","name":"4e5d2eac-be4d-4fc6-8015-eee3c1a49cc9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fcc398f5-9f0f-43e7-a8eb-d61aea01512a","name":"fcc398f5-9f0f-43e7-a8eb-d61aea01512a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"93daf279-d2ce-404f-a78a-bf2452370123","name":"93daf279-d2ce-404f-a78a-bf2452370123","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0854253-f7d6-415f-a231-821c06d4b85b","name":"f0854253-f7d6-415f-a231-821c06d4b85b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"100b29ea-fe77-4be7-9047-263452df1459","name":"100b29ea-fe77-4be7-9047-263452df1459","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"bfad4db2-459b-493b-943a-cecb6336858c","blendMode":0,"displayName":"default","isLocked":false,"name":"bfad4db2-459b-493b-943a-cecb6336858c","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_right_trim_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_tartaros_right_trim_shadows", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":5.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tartaros_right_trim_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e5d2eac-be4d-4fc6-8015-eee3c1a49cc9","path":"sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f5ac5148-8ab5-4fb1-81e5-f079d5797165","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcc398f5-9f0f-43e7-a8eb-d61aea01512a","path":"sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a79add2e-68ca-41c2-b22a-70f4087bb6c4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"93daf279-d2ce-404f-a78a-bf2452370123","path":"sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2ec1b88a-2ae1-479a-983e-921019b57728","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0854253-f7d6-415f-a231-821c06d4b85b","path":"sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7e34c074-c6e9-4d58-b2ca-308716ac64f7","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"100b29ea-fe77-4be7-9047-263452df1459","path":"sprites/spr_tartaros_right_trim_shadows/spr_tartaros_right_trim_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"3e8ca64d-0de9-46a5-8e65-8be73363f418","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_tartaros_shadows/548e11a0-6b13-4fa6-93be-4121736d914f.png b/sprites/spr_tartaros_shadows/548e11a0-6b13-4fa6-93be-4121736d914f.png new file mode 100644 index 0000000000..e7bb9bdc64 Binary files /dev/null and b/sprites/spr_tartaros_shadows/548e11a0-6b13-4fa6-93be-4121736d914f.png differ diff --git a/sprites/spr_tartaros_shadows/layers/548e11a0-6b13-4fa6-93be-4121736d914f/229b5182-d233-4896-9f67-630367846af5.png b/sprites/spr_tartaros_shadows/layers/548e11a0-6b13-4fa6-93be-4121736d914f/229b5182-d233-4896-9f67-630367846af5.png new file mode 100644 index 0000000000..ac1fa5318f Binary files /dev/null and b/sprites/spr_tartaros_shadows/layers/548e11a0-6b13-4fa6-93be-4121736d914f/229b5182-d233-4896-9f67-630367846af5.png differ diff --git a/sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy b/sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy new file mode 100644 index 0000000000..ec0010c582 --- /dev/null +++ b/sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tartaros_shadows", + "bboxMode":0, + "bbox_bottom":204, + "bbox_left":10, + "bbox_right":169, + "bbox_top":32, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"548e11a0-6b13-4fa6-93be-4121736d914f","name":"548e11a0-6b13-4fa6-93be-4121736d914f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":271, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"229b5182-d233-4896-9f67-630367846af5","blendMode":0,"displayName":"default","isLocked":false,"name":"229b5182-d233-4896-9f67-630367846af5","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tartaros_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"tartaros_complex", + "path":"folders/Sprites/Marine Viewer/body_types/tartaros_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_tartaros_shadows", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tartaros_shadows", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"548e11a0-6b13-4fa6-93be-4121736d914f","path":"sprites/spr_tartaros_shadows/spr_tartaros_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b2b5bad7-34d4-4dfe-8037-a5bf1df0c661","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy b/sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy index 59d048a09b..3c612bd174 100644 --- a/sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy +++ b/sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tartaros_wep_fix", "bboxMode":0, "bbox_bottom":121, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8a5005ac-6216-44bc-b706-2bd323adfdca","name":"8a5005ac-6216-44bc-b706-2bd323adfdca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0e289447-ea02-402e-bbb6-93bf479dd88b","name":"0e289447-ea02-402e-bbb6-93bf479dd88b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fc96bc38-34b5-4115-974e-6be49247a8d8","name":"fc96bc38-34b5-4115-974e-6be49247a8d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eafd1478-fad7-40fe-87b6-a72eeddaadd7","name":"eafd1478-fad7-40fe-87b6-a72eeddaadd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dabfefca-b76d-4d72-911a-69234fe7e85e","name":"dabfefca-b76d-4d72-911a-69234fe7e85e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"08a3520b-2f42-4a1e-bc25-4e4c42c4ddd7","name":"08a3520b-2f42-4a1e-bc25-4e4c42c4ddd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"366cf225-a6ef-410a-822d-f0af9092e681","name":"366cf225-a6ef-410a-822d-f0af9092e681","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"349e147a-6dce-4007-a48c-60232e9137bf","name":"349e147a-6dce-4007-a48c-60232e9137bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a5005ac-6216-44bc-b706-2bd323adfdca","name":"8a5005ac-6216-44bc-b706-2bd323adfdca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0e289447-ea02-402e-bbb6-93bf479dd88b","name":"0e289447-ea02-402e-bbb6-93bf479dd88b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fc96bc38-34b5-4115-974e-6be49247a8d8","name":"fc96bc38-34b5-4115-974e-6be49247a8d8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eafd1478-fad7-40fe-87b6-a72eeddaadd7","name":"eafd1478-fad7-40fe-87b6-a72eeddaadd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dabfefca-b76d-4d72-911a-69234fe7e85e","name":"dabfefca-b76d-4d72-911a-69234fe7e85e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"08a3520b-2f42-4a1e-bc25-4e4c42c4ddd7","name":"08a3520b-2f42-4a1e-bc25-4e4c42c4ddd7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"366cf225-a6ef-410a-822d-f0af9092e681","name":"366cf225-a6ef-410a-822d-f0af9092e681","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"349e147a-6dce-4007-a48c-60232e9137bf","name":"349e147a-6dce-4007-a48c-60232e9137bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,30 +75,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a5005ac-6216-44bc-b706-2bd323adfdca","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed85afa1-11fe-436b-a3ae-3497b17b914f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e289447-ea02-402e-bbb6-93bf479dd88b","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fc128896-cc76-4c73-bf7f-f66d2d6a761c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc96bc38-34b5-4115-974e-6be49247a8d8","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d757176-73e1-41d5-a3c2-5416efd47f06","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eafd1478-fad7-40fe-87b6-a72eeddaadd7","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6abe1c9-0906-41c5-8e32-137ad16cd932","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dabfefca-b76d-4d72-911a-69234fe7e85e","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b60fe942-8a18-4ece-9d11-8eb0cdaade49","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"08a3520b-2f42-4a1e-bc25-4e4c42c4ddd7","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bac48702-3627-4115-a9ee-84a4eefee624","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"366cf225-a6ef-410a-822d-f0af9092e681","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1b7cfa11-bce0-489d-93a7-5f40c6aa9e14","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"349e147a-6dce-4007-a48c-60232e9137bf","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cd7d60f6-9862-4cdc-8a31-e4df4f1905cf","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a5005ac-6216-44bc-b706-2bd323adfdca","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed85afa1-11fe-436b-a3ae-3497b17b914f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e289447-ea02-402e-bbb6-93bf479dd88b","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fc128896-cc76-4c73-bf7f-f66d2d6a761c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fc96bc38-34b5-4115-974e-6be49247a8d8","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d757176-73e1-41d5-a3c2-5416efd47f06","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eafd1478-fad7-40fe-87b6-a72eeddaadd7","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6abe1c9-0906-41c5-8e32-137ad16cd932","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dabfefca-b76d-4d72-911a-69234fe7e85e","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b60fe942-8a18-4ece-9d11-8eb0cdaade49","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"08a3520b-2f42-4a1e-bc25-4e4c42c4ddd7","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bac48702-3627-4115-a9ee-84a4eefee624","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"366cf225-a6ef-410a-822d-f0af9092e681","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1b7cfa11-bce0-489d-93a7-5f40c6aa9e14","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"349e147a-6dce-4007-a48c-60232e9137bf","path":"sprites/spr_tartaros_wep_fix/spr_tartaros_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cd7d60f6-9862-4cdc-8a31-e4df4f1905cf","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_tech_area_pad/spr_tech_area_pad.yy b/sprites/spr_tech_area_pad/spr_tech_area_pad.yy index 7236c43e8b..ff49f92fe1 100644 --- a/sprites/spr_tech_area_pad/spr_tech_area_pad.yy +++ b/sprites/spr_tech_area_pad/spr_tech_area_pad.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tech_area_pad", "bboxMode":0, "bbox_bottom":157, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"51e26b33-bfb7-4894-bec1-aaa1490e5412","name":"51e26b33-bfb7-4894-bec1-aaa1490e5412","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"51e26b33-bfb7-4894-bec1-aaa1490e5412","name":"51e26b33-bfb7-4894-bec1-aaa1490e5412","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"51e26b33-bfb7-4894-bec1-aaa1490e5412","path":"sprites/spr_tech_area_pad/spr_tech_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cc6ac14-847e-4e48-85ea-c50a7d853055","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"51e26b33-bfb7-4894-bec1-aaa1490e5412","path":"sprites/spr_tech_area_pad/spr_tech_area_pad.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cc6ac14-847e-4e48-85ea-c50a7d853055","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_tech_belt/spr_tech_belt.yy b/sprites/spr_tech_belt/spr_tech_belt.yy index b18d5a194c..6b5e6d0613 100644 --- a/sprites/spr_tech_belt/spr_tech_belt.yy +++ b/sprites/spr_tech_belt/spr_tech_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tech_belt", "bboxMode":0, "bbox_bottom":113, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6f5f8280-1432-4189-ba71-5cb47411b603","name":"6f5f8280-1432-4189-ba71-5cb47411b603","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f5f8280-1432-4189-ba71-5cb47411b603","name":"6f5f8280-1432-4189-ba71-5cb47411b603","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f5f8280-1432-4189-ba71-5cb47411b603","path":"sprites/spr_tech_belt/spr_tech_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e80f57ce-b07a-4131-bc96-09b91013c0e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f5f8280-1432-4189-ba71-5cb47411b603","path":"sprites/spr_tech_belt/spr_tech_belt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e80f57ce-b07a-4131-bc96-09b91013c0e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_tech_face_plate/6f5f8280-1432-4189-ba71-5cb47411b603.png b/sprites/spr_tech_face_plate/a0a387e6-c15b-4401-9454-9f89dd2faee8.png similarity index 78% rename from sprites/spr_tech_face_plate/6f5f8280-1432-4189-ba71-5cb47411b603.png rename to sprites/spr_tech_face_plate/a0a387e6-c15b-4401-9454-9f89dd2faee8.png index 2a77344fa2..f76adf3595 100644 Binary files a/sprites/spr_tech_face_plate/6f5f8280-1432-4189-ba71-5cb47411b603.png and b/sprites/spr_tech_face_plate/a0a387e6-c15b-4401-9454-9f89dd2faee8.png differ diff --git a/sprites/spr_tech_face_plate/layers/6f5f8280-1432-4189-ba71-5cb47411b603/dbe27ba7-9000-4566-81f3-7688029dd83a.png b/sprites/spr_tech_face_plate/layers/a0a387e6-c15b-4401-9454-9f89dd2faee8/dbe27ba7-9000-4566-81f3-7688029dd83a.png similarity index 78% rename from sprites/spr_tech_face_plate/layers/6f5f8280-1432-4189-ba71-5cb47411b603/dbe27ba7-9000-4566-81f3-7688029dd83a.png rename to sprites/spr_tech_face_plate/layers/a0a387e6-c15b-4401-9454-9f89dd2faee8/dbe27ba7-9000-4566-81f3-7688029dd83a.png index 2a77344fa2..f76adf3595 100644 Binary files a/sprites/spr_tech_face_plate/layers/6f5f8280-1432-4189-ba71-5cb47411b603/dbe27ba7-9000-4566-81f3-7688029dd83a.png and b/sprites/spr_tech_face_plate/layers/a0a387e6-c15b-4401-9454-9f89dd2faee8/dbe27ba7-9000-4566-81f3-7688029dd83a.png differ diff --git a/sprites/spr_tech_face_plate/spr_tech_face_plate.yy b/sprites/spr_tech_face_plate/spr_tech_face_plate.yy index 1b08313cfe..1e56069c1f 100644 --- a/sprites/spr_tech_face_plate/spr_tech_face_plate.yy +++ b/sprites/spr_tech_face_plate/spr_tech_face_plate.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tech_face_plate", "bboxMode":0, "bbox_bottom":44, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6f5f8280-1432-4189-ba71-5cb47411b603","name":"6f5f8280-1432-4189-ba71-5cb47411b603","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a0a387e6-c15b-4401-9454-9f89dd2faee8","name":"a0a387e6-c15b-4401-9454-9f89dd2faee8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,14 +63,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6f5f8280-1432-4189-ba71-5cb47411b603","path":"sprites/spr_tech_face_plate/spr_tech_face_plate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a68cfe1-8533-4723-9fc1-c27fb8484d51","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a0a387e6-c15b-4401-9454-9f89dd2faee8","path":"sprites/spr_tech_face_plate/spr_tech_face_plate.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fde3ba78-d20f-481b-8c10-186fc62260a7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_tech_face_plate_shadow/02aa504f-1d8a-4378-ab3f-b96a24275c97.png b/sprites/spr_tech_face_plate_shadow/02aa504f-1d8a-4378-ab3f-b96a24275c97.png new file mode 100644 index 0000000000..e75f235093 Binary files /dev/null and b/sprites/spr_tech_face_plate_shadow/02aa504f-1d8a-4378-ab3f-b96a24275c97.png differ diff --git a/sprites/spr_tech_face_plate_shadow/layers/02aa504f-1d8a-4378-ab3f-b96a24275c97/dbe27ba7-9000-4566-81f3-7688029dd83a.png b/sprites/spr_tech_face_plate_shadow/layers/02aa504f-1d8a-4378-ab3f-b96a24275c97/dbe27ba7-9000-4566-81f3-7688029dd83a.png new file mode 100644 index 0000000000..e75f235093 Binary files /dev/null and b/sprites/spr_tech_face_plate_shadow/layers/02aa504f-1d8a-4378-ab3f-b96a24275c97/dbe27ba7-9000-4566-81f3-7688029dd83a.png differ diff --git a/sprites/spr_tech_face_plate_shadow/spr_tech_face_plate_shadow.yy b/sprites/spr_tech_face_plate_shadow/spr_tech_face_plate_shadow.yy new file mode 100644 index 0000000000..04022c841a --- /dev/null +++ b/sprites/spr_tech_face_plate_shadow/spr_tech_face_plate_shadow.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_tech_face_plate_shadow", + "bboxMode":0, + "bbox_bottom":43, + "bbox_left":72, + "bbox_right":91, + "bbox_top":30, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"02aa504f-1d8a-4378-ab3f-b96a24275c97","name":"02aa504f-1d8a-4378-ab3f-b96a24275c97","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"dbe27ba7-9000-4566-81f3-7688029dd83a","blendMode":0,"displayName":"default","isLocked":false,"name":"dbe27ba7-9000-4566-81f3-7688029dd83a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_tech_face_plate_shadow", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"techmarine_complex", + "path":"folders/Sprites/Marine Viewer/body_types/techmarine_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_tech_face_plate_shadow", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_tech_face_plate_shadow", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"02aa504f-1d8a-4378-ab3f-b96a24275c97","path":"sprites/spr_tech_face_plate_shadow/spr_tech_face_plate_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1c813b0a-4bc6-4db8-8ee0-373cff635ae2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":164, +} \ No newline at end of file diff --git a/sprites/spr_techmarine_chest/spr_techmarine_chest.yy b/sprites/spr_techmarine_chest/spr_techmarine_chest.yy index 0a7491f813..f74fba905c 100644 --- a/sprites/spr_techmarine_chest/spr_techmarine_chest.yy +++ b/sprites/spr_techmarine_chest/spr_techmarine_chest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_chest", "bboxMode":0, "bbox_bottom":89, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b569e059-78e5-4c50-b871-22eb94b0b506","name":"b569e059-78e5-4c50-b871-22eb94b0b506","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b569e059-78e5-4c50-b871-22eb94b0b506","name":"b569e059-78e5-4c50-b871-22eb94b0b506","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_techmarine_complex/spr_techmarine_complex.yy b/sprites/spr_techmarine_complex/spr_techmarine_complex.yy index 4cc15edf0d..a6221a64f2 100644 --- a/sprites/spr_techmarine_complex/spr_techmarine_complex.yy +++ b/sprites/spr_techmarine_complex/spr_techmarine_complex.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_complex", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6f5f8280-1432-4189-ba71-5cb47411b603","name":"6f5f8280-1432-4189-ba71-5cb47411b603","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6f5f8280-1432-4189-ba71-5cb47411b603","name":"6f5f8280-1432-4189-ba71-5cb47411b603","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_techmarine_core/spr_techmarine_core.yy b/sprites/spr_techmarine_core/spr_techmarine_core.yy index 78bb655f5f..cc46eaa7b4 100644 --- a/sprites/spr_techmarine_core/spr_techmarine_core.yy +++ b/sprites/spr_techmarine_core/spr_techmarine_core.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_core", "bboxMode":0, "bbox_bottom":259, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d6fd5b26-5a16-4837-83e7-762349cad0fe","name":"d6fd5b26-5a16-4837-83e7-762349cad0fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d51b2fb6-4915-4181-8c98-cae57deb4866","name":"d51b2fb6-4915-4181-8c98-cae57deb4866","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3d110598-0228-4efe-ba5e-08cf667ed23b","name":"3d110598-0228-4efe-ba5e-08cf667ed23b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"41baa262-b761-43e7-85eb-08b7824a9899","name":"41baa262-b761-43e7-85eb-08b7824a9899","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7ee93fc8-dd78-44d7-bb05-85445635e575","name":"7ee93fc8-dd78-44d7-bb05-85445635e575","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a5226976-0539-4c1e-9467-9092d8ec7697","name":"a5226976-0539-4c1e-9467-9092d8ec7697","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d6fd5b26-5a16-4837-83e7-762349cad0fe","name":"d6fd5b26-5a16-4837-83e7-762349cad0fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","name":"1952fa2a-5957-4a85-9c65-f7e12109ff46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","name":"0d3ae218-098c-4af6-af9e-9fa85eda6b9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d51b2fb6-4915-4181-8c98-cae57deb4866","name":"d51b2fb6-4915-4181-8c98-cae57deb4866","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3d110598-0228-4efe-ba5e-08cf667ed23b","name":"3d110598-0228-4efe-ba5e-08cf667ed23b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41baa262-b761-43e7-85eb-08b7824a9899","name":"41baa262-b761-43e7-85eb-08b7824a9899","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7ee93fc8-dd78-44d7-bb05-85445635e575","name":"7ee93fc8-dd78-44d7-bb05-85445635e575","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","name":"26fe8275-a7d5-4ab8-9cfc-53c852839746","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a5226976-0539-4c1e-9467-9092d8ec7697","name":"a5226976-0539-4c1e-9467-9092d8ec7697","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","name":"a5a5bb6b-2ee7-474c-b749-bde2db13ad9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,6 +72,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_techmarine_head/spr_techmarine_head.yy b/sprites/spr_techmarine_head/spr_techmarine_head.yy index 2547bee8db..493cb000c6 100644 --- a/sprites/spr_techmarine_head/spr_techmarine_head.yy +++ b/sprites/spr_techmarine_head/spr_techmarine_head.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_head", "bboxMode":0, "bbox_bottom":46, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"166553ae-f0f5-4307-94a0-6ec02a14a5c7","name":"166553ae-f0f5-4307-94a0-6ec02a14a5c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"166553ae-f0f5-4307-94a0-6ec02a14a5c7","name":"166553ae-f0f5-4307-94a0-6ec02a14a5c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_techmarine_left_leg/spr_techmarine_left_leg.yy b/sprites/spr_techmarine_left_leg/spr_techmarine_left_leg.yy index e20b77191d..b55922217f 100644 --- a/sprites/spr_techmarine_left_leg/spr_techmarine_left_leg.yy +++ b/sprites/spr_techmarine_left_leg/spr_techmarine_left_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_left_leg", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_techmarine_left_leg_shadow/ee943f4b-54c7-4438-bfb8-5c29e4c07c74.png b/sprites/spr_techmarine_left_leg_shadow/ee943f4b-54c7-4438-bfb8-5c29e4c07c74.png new file mode 100644 index 0000000000..b287048dc1 Binary files /dev/null and b/sprites/spr_techmarine_left_leg_shadow/ee943f4b-54c7-4438-bfb8-5c29e4c07c74.png differ diff --git a/sprites/spr_techmarine_left_leg_shadow/layers/ee943f4b-54c7-4438-bfb8-5c29e4c07c74/dbe27ba7-9000-4566-81f3-7688029dd83a.png b/sprites/spr_techmarine_left_leg_shadow/layers/ee943f4b-54c7-4438-bfb8-5c29e4c07c74/dbe27ba7-9000-4566-81f3-7688029dd83a.png new file mode 100644 index 0000000000..b287048dc1 Binary files /dev/null and b/sprites/spr_techmarine_left_leg_shadow/layers/ee943f4b-54c7-4438-bfb8-5c29e4c07c74/dbe27ba7-9000-4566-81f3-7688029dd83a.png differ diff --git a/sprites/spr_techmarine_left_leg_shadow/spr_techmarine_left_leg_shadow.yy b/sprites/spr_techmarine_left_leg_shadow/spr_techmarine_left_leg_shadow.yy new file mode 100644 index 0000000000..96443dd446 --- /dev/null +++ b/sprites/spr_techmarine_left_leg_shadow/spr_techmarine_left_leg_shadow.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_techmarine_left_leg_shadow", + "bboxMode":0, + "bbox_bottom":220, + "bbox_left":101, + "bbox_right":152, + "bbox_top":132, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"ee943f4b-54c7-4438-bfb8-5c29e4c07c74","name":"ee943f4b-54c7-4438-bfb8-5c29e4c07c74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"dbe27ba7-9000-4566-81f3-7688029dd83a","blendMode":0,"displayName":"default","isLocked":false,"name":"dbe27ba7-9000-4566-81f3-7688029dd83a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_techmarine_left_leg_shadow", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"techmarine_complex", + "path":"folders/Sprites/Marine Viewer/body_types/techmarine_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_techmarine_left_leg_shadow", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_techmarine_left_leg_shadow", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee943f4b-54c7-4438-bfb8-5c29e4c07c74","path":"sprites/spr_techmarine_left_leg_shadow/spr_techmarine_left_leg_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"cd12632a-a37e-41a1-9590-2425b3d2507b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":164, +} \ No newline at end of file diff --git a/sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy b/sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy index 5a19a5f656..a192ea3494 100644 --- a/sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy +++ b/sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_left_trim", "bboxMode":0, "bbox_bottom":80, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","path":"sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8610019-e23e-458a-aa65-2af7f50f6808","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","path":"sprites/spr_techmarine_left_trim/spr_techmarine_left_trim.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8610019-e23e-458a-aa65-2af7f50f6808","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy b/sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy index c4edf5534c..841ed18538 100644 --- a/sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy +++ b/sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_right_leg", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","path":"sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0fa489e4-21d5-4860-b8a0-45f9bc4cfbe3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","path":"sprites/spr_techmarine_right_leg/spr_techmarine_right_leg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0fa489e4-21d5-4860-b8a0-45f9bc4cfbe3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_techmarine_right_leg_shadow/22c1fc63-eee0-48f2-842f-3bb5727ed6bc.png b/sprites/spr_techmarine_right_leg_shadow/22c1fc63-eee0-48f2-842f-3bb5727ed6bc.png new file mode 100644 index 0000000000..df77c21594 Binary files /dev/null and b/sprites/spr_techmarine_right_leg_shadow/22c1fc63-eee0-48f2-842f-3bb5727ed6bc.png differ diff --git a/sprites/spr_techmarine_right_leg_shadow/layers/22c1fc63-eee0-48f2-842f-3bb5727ed6bc/dbe27ba7-9000-4566-81f3-7688029dd83a.png b/sprites/spr_techmarine_right_leg_shadow/layers/22c1fc63-eee0-48f2-842f-3bb5727ed6bc/dbe27ba7-9000-4566-81f3-7688029dd83a.png new file mode 100644 index 0000000000..df77c21594 Binary files /dev/null and b/sprites/spr_techmarine_right_leg_shadow/layers/22c1fc63-eee0-48f2-842f-3bb5727ed6bc/dbe27ba7-9000-4566-81f3-7688029dd83a.png differ diff --git a/sprites/spr_techmarine_right_leg_shadow/spr_techmarine_right_leg_shadow.yy b/sprites/spr_techmarine_right_leg_shadow/spr_techmarine_right_leg_shadow.yy new file mode 100644 index 0000000000..84d6e1574b --- /dev/null +++ b/sprites/spr_techmarine_right_leg_shadow/spr_techmarine_right_leg_shadow.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_techmarine_right_leg_shadow", + "bboxMode":0, + "bbox_bottom":220, + "bbox_left":11, + "bbox_right":62, + "bbox_top":132, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":232, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"dbe27ba7-9000-4566-81f3-7688029dd83a","blendMode":0,"displayName":"default","isLocked":false,"name":"dbe27ba7-9000-4566-81f3-7688029dd83a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_techmarine_right_leg_shadow", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"techmarine_complex", + "path":"folders/Sprites/Marine Viewer/body_types/techmarine_complex.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_techmarine_right_leg_shadow", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_techmarine_right_leg_shadow", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"22c1fc63-eee0-48f2-842f-3bb5727ed6bc","path":"sprites/spr_techmarine_right_leg_shadow/spr_techmarine_right_leg_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0fa489e4-21d5-4860-b8a0-45f9bc4cfbe3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":164, +} \ No newline at end of file diff --git a/sprites/spr_techmarine_right_trim/spr_techmarine_right_trim.yy b/sprites/spr_techmarine_right_trim/spr_techmarine_right_trim.yy index 38c87de4ff..b00dcacaa9 100644 --- a/sprites/spr_techmarine_right_trim/spr_techmarine_right_trim.yy +++ b/sprites/spr_techmarine_right_trim/spr_techmarine_right_trim.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techmarine_right_trim", "bboxMode":0, "bbox_bottom":81, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","name":"7dcc7f70-2bb6-483b-8ab5-6f567496472f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_technology_icon/spr_technology_icon.yy b/sprites/spr_technology_icon/spr_technology_icon.yy index 7621b61176..3a3654385d 100644 --- a/sprites/spr_technology_icon/spr_technology_icon.yy +++ b/sprites/spr_technology_icon/spr_technology_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_technology_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fb6ec02b-e2c8-41fa-93d0-58242851a5d2","name":"fb6ec02b-e2c8-41fa-93d0-58242851a5d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb6ec02b-e2c8-41fa-93d0-58242851a5d2","name":"fb6ec02b-e2c8-41fa-93d0-58242851a5d2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb6ec02b-e2c8-41fa-93d0-58242851a5d2","path":"sprites/spr_technology_icon/spr_technology_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c875136c-f820-405d-bbe3-72fa5365a15c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb6ec02b-e2c8-41fa-93d0-58242851a5d2","path":"sprites/spr_technology_icon/spr_technology_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c875136c-f820-405d-bbe3-72fa5365a15c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_techpriest/spr_techpriest.yy b/sprites/spr_techpriest/spr_techpriest.yy index 591f980331..1d583891a9 100644 --- a/sprites/spr_techpriest/spr_techpriest.yy +++ b/sprites/spr_techpriest/spr_techpriest.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_techpriest", "bboxMode":0, "bbox_bottom":230, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"15cd6a2d-e361-4e25-861e-4d350855c408","name":"15cd6a2d-e361-4e25-861e-4d350855c408","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15cd6a2d-e361-4e25-861e-4d350855c408","name":"15cd6a2d-e361-4e25-861e-4d350855c408","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15cd6a2d-e361-4e25-861e-4d350855c408","path":"sprites/spr_techpriest/spr_techpriest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf5066ba-7cb7-42ea-8018-8d5ef42ff4ba","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15cd6a2d-e361-4e25-861e-4d350855c408","path":"sprites/spr_techpriest/spr_techpriest.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf5066ba-7cb7-42ea-8018-8d5ef42ff4ba","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_teeth/spr_teeth.yy b/sprites/spr_teeth/spr_teeth.yy index 313e1556a2..4824b7a8dd 100644 --- a/sprites/spr_teeth/spr_teeth.yy +++ b/sprites/spr_teeth/spr_teeth.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_teeth", "bboxMode":0, "bbox_bottom":36, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0314e59f-510c-49f1-aa68-e46181aa4b51","name":"0314e59f-510c-49f1-aa68-e46181aa4b51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0314e59f-510c-49f1-aa68-e46181aa4b51","name":"0314e59f-510c-49f1-aa68-e46181aa4b51","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","path":"sprites/spr_teeth/spr_teeth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e66df479-4ca7-4bf7-822b-3fc0248a8aa3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0314e59f-510c-49f1-aa68-e46181aa4b51","path":"sprites/spr_teeth/spr_teeth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"69b23246-750d-4901-9bbc-be89ea989385","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e2e4772-e0b4-40d5-93de-3eeb449e4cc3","path":"sprites/spr_teeth/spr_teeth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e66df479-4ca7-4bf7-822b-3fc0248a8aa3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0314e59f-510c-49f1-aa68-e46181aa4b51","path":"sprites/spr_teeth/spr_teeth.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"69b23246-750d-4901-9bbc-be89ea989385","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy b/sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy index 468798dcd4..c68ddf7584 100644 --- a/sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy +++ b/sprites/spr_term_left_fur_hanging/spr_term_left_fur_hanging.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_term_left_fur_hanging", "bboxMode":0, "bbox_bottom":155, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74192f69-3886-451a-a93e-9abf268c1261","name":"74192f69-3886-451a-a93e-9abf268c1261","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"893636fd-19a3-4e79-adaf-0dac89d583cc","name":"893636fd-19a3-4e79-adaf-0dac89d583cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74192f69-3886-451a-a93e-9abf268c1261","name":"74192f69-3886-451a-a93e-9abf268c1261","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"893636fd-19a3-4e79-adaf-0dac89d583cc","name":"893636fd-19a3-4e79-adaf-0dac89d583cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -89,7 +89,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy b/sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy index 0df527690b..aedc21e108 100644 --- a/sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy +++ b/sprites/spr_term_right_fur_hanging/spr_term_right_fur_hanging.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_term_right_fur_hanging", "bboxMode":0, "bbox_bottom":155, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"74192f69-3886-451a-a93e-9abf268c1261","name":"74192f69-3886-451a-a93e-9abf268c1261","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"893636fd-19a3-4e79-adaf-0dac89d583cc","name":"893636fd-19a3-4e79-adaf-0dac89d583cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","name":"8d99f92f-4aac-47e4-a142-c6ea6be47856","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","name":"774a5c3b-bdbb-4b1c-a5dc-59f4a285f096","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"74192f69-3886-451a-a93e-9abf268c1261","name":"74192f69-3886-451a-a93e-9abf268c1261","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"893636fd-19a3-4e79-adaf-0dac89d583cc","name":"893636fd-19a3-4e79-adaf-0dac89d583cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -89,7 +89,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy b/sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy index 339bba7996..867ecfa1a7 100644 --- a/sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy +++ b/sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_termi_wep_fix", "bboxMode":0, "bbox_bottom":139, @@ -12,14 +12,14 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7b2081b0-946f-4804-b87c-fbc39e60f0f9","name":"7b2081b0-946f-4804-b87c-fbc39e60f0f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"361b46bb-fdae-41f5-91b1-79b798fa3fe4","name":"361b46bb-fdae-41f5-91b1-79b798fa3fe4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76ca9422-3f5c-4b17-8948-15e41c41ff18","name":"76ca9422-3f5c-4b17-8948-15e41c41ff18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"db1f3dfd-acef-4c04-ac9e-35477823aa2a","name":"db1f3dfd-acef-4c04-ac9e-35477823aa2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40eaad45-da50-4f29-b260-ed0ef85dadb7","name":"40eaad45-da50-4f29-b260-ed0ef85dadb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fb8574cd-c10b-4e81-ac18-bad9f72369dc","name":"fb8574cd-c10b-4e81-ac18-bad9f72369dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c1c9bde6-ad3a-4ec0-9664-abae066ad480","name":"c1c9bde6-ad3a-4ec0-9664-abae066ad480","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b2081b0-946f-4804-b87c-fbc39e60f0f9","name":"7b2081b0-946f-4804-b87c-fbc39e60f0f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"361b46bb-fdae-41f5-91b1-79b798fa3fe4","name":"361b46bb-fdae-41f5-91b1-79b798fa3fe4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76ca9422-3f5c-4b17-8948-15e41c41ff18","name":"76ca9422-3f5c-4b17-8948-15e41c41ff18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db1f3dfd-acef-4c04-ac9e-35477823aa2a","name":"db1f3dfd-acef-4c04-ac9e-35477823aa2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40eaad45-da50-4f29-b260-ed0ef85dadb7","name":"40eaad45-da50-4f29-b260-ed0ef85dadb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fb8574cd-c10b-4e81-ac18-bad9f72369dc","name":"fb8574cd-c10b-4e81-ac18-bad9f72369dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c1c9bde6-ad3a-4ec0-9664-abae066ad480","name":"c1c9bde6-ad3a-4ec0-9664-abae066ad480","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -75,30 +75,14 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b2081b0-946f-4804-b87c-fbc39e60f0f9","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c7f5060d-befd-419e-978e-26f94b09df6d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"361b46bb-fdae-41f5-91b1-79b798fa3fe4","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5087a9dd-196d-445f-9d19-3b9102cea74f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76ca9422-3f5c-4b17-8948-15e41c41ff18","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"39ae0826-1777-409f-9b0c-762605a42bcd","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db1f3dfd-acef-4c04-ac9e-35477823aa2a","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24f060a5-653f-4c12-b358-84f0e969b4b1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eef702d1-4ab0-489b-9e99-97967d25ae95","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40eaad45-da50-4f29-b260-ed0ef85dadb7","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"01f21f77-4c70-4a7c-a6fa-92ec378523e4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb8574cd-c10b-4e81-ac18-bad9f72369dc","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33828376-57c0-46da-89d5-bae01389c0ab","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1c9bde6-ad3a-4ec0-9664-abae066ad480","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"beb051e3-4f2f-473c-b6d4-25240a448170","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b2081b0-946f-4804-b87c-fbc39e60f0f9","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c7f5060d-befd-419e-978e-26f94b09df6d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"361b46bb-fdae-41f5-91b1-79b798fa3fe4","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5087a9dd-196d-445f-9d19-3b9102cea74f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76ca9422-3f5c-4b17-8948-15e41c41ff18","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"39ae0826-1777-409f-9b0c-762605a42bcd","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db1f3dfd-acef-4c04-ac9e-35477823aa2a","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24f060a5-653f-4c12-b358-84f0e969b4b1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eef702d1-4ab0-489b-9e99-97967d25ae95","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40eaad45-da50-4f29-b260-ed0ef85dadb7","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"01f21f77-4c70-4a7c-a6fa-92ec378523e4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fb8574cd-c10b-4e81-ac18-bad9f72369dc","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33828376-57c0-46da-89d5-bae01389c0ab","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c1c9bde6-ad3a-4ec0-9664-abae066ad480","path":"sprites/spr_termi_wep_fix/spr_termi_wep_fix.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"beb051e3-4f2f-473c-b6d4-25240a448170","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator2_colors/spr_terminator2_colors.yy b/sprites/spr_terminator2_colors/spr_terminator2_colors.yy index 4362f1ca99..e81fa73bb9 100644 --- a/sprites/spr_terminator2_colors/spr_terminator2_colors.yy +++ b/sprites/spr_terminator2_colors/spr_terminator2_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator2_colors", "bboxMode":0, "bbox_bottom":231, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dea64601-3301-4a88-8591-c05858f4ec64","name":"dea64601-3301-4a88-8591-c05858f4ec64","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6e270d34-f629-4db1-b875-a3c1808f6f05","name":"6e270d34-f629-4db1-b875-a3c1808f6f05","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be251def-f87a-4059-94ba-a09de050afdc","name":"be251def-f87a-4059-94ba-a09de050afdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dea64601-3301-4a88-8591-c05858f4ec64","name":"dea64601-3301-4a88-8591-c05858f4ec64","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6e270d34-f629-4db1-b875-a3c1808f6f05","name":"6e270d34-f629-4db1-b875-a3c1808f6f05","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be251def-f87a-4059-94ba-a09de050afdc","name":"be251def-f87a-4059-94ba-a09de050afdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,42 +79,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15d6e70e-8247-486a-8771-f55c9188252c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"333955e2-646a-4678-90de-02bdb66acbae","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"758eda71-efce-4d1f-86b0-7c09df9b3aea","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"351d45da-f5a1-42b3-a9b7-2ce5b4d193eb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dea64601-3301-4a88-8591-c05858f4ec64","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a3c46260-ff1e-4bf1-85f7-c7903dbf8513","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2619edd9-345d-453f-a40c-71ad1c64b88b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"30c72042-f5e7-4073-a52f-925da8c7edf2","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e270d34-f629-4db1-b875-a3c1808f6f05","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"14ac3aed-c026-47e2-8c23-dcd2ae00b98c","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cb57dc31-66bb-42b4-b17d-7d02635b9562","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8cdf5e5c-fc40-4b60-b9cb-c120abb54761","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6fcb211-2e05-4940-8086-0bd3b0be05ed","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be251def-f87a-4059-94ba-a09de050afdc","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33f97624-918b-460c-bfe4-b461a4e66276","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15d6e70e-8247-486a-8771-f55c9188252c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"333955e2-646a-4678-90de-02bdb66acbae","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"758eda71-efce-4d1f-86b0-7c09df9b3aea","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"351d45da-f5a1-42b3-a9b7-2ce5b4d193eb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dea64601-3301-4a88-8591-c05858f4ec64","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a3c46260-ff1e-4bf1-85f7-c7903dbf8513","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2619edd9-345d-453f-a40c-71ad1c64b88b","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"30c72042-f5e7-4073-a52f-925da8c7edf2","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e270d34-f629-4db1-b875-a3c1808f6f05","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"14ac3aed-c026-47e2-8c23-dcd2ae00b98c","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cb57dc31-66bb-42b4-b17d-7d02635b9562","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8cdf5e5c-fc40-4b60-b9cb-c120abb54761","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6fcb211-2e05-4940-8086-0bd3b0be05ed","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be251def-f87a-4059-94ba-a09de050afdc","path":"sprites/spr_terminator2_colors/spr_terminator2_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33f97624-918b-460c-bfe4-b461a4e66276","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator3_colors/spr_terminator3_colors.yy b/sprites/spr_terminator3_colors/spr_terminator3_colors.yy index 38fceee5e5..e87e378d0a 100644 --- a/sprites/spr_terminator3_colors/spr_terminator3_colors.yy +++ b/sprites/spr_terminator3_colors/spr_terminator3_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator3_colors", "bboxMode":0, "bbox_bottom":259, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8c839fec-817d-4ad9-ace8-1447ac216a20","name":"8c839fec-817d-4ad9-ace8-1447ac216a20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"49d3f799-75d7-4265-8808-dda0f3c715b2","name":"49d3f799-75d7-4265-8808-dda0f3c715b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2efb5d92-2428-42cd-89e7-be4069186f6b","name":"2efb5d92-2428-42cd-89e7-be4069186f6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"613ba06e-d34f-431d-b4d6-5d3fcc290338","name":"613ba06e-d34f-431d-b4d6-5d3fcc290338","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0d8b94b8-297f-427c-9561-544ca75f5f93","name":"0d8b94b8-297f-427c-9561-544ca75f5f93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f485d637-9734-449b-b878-674a7bf45002","name":"f485d637-9734-449b-b878-674a7bf45002","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb04902e-b65b-4002-af27-3bf803bac80a","name":"bb04902e-b65b-4002-af27-3bf803bac80a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"66a3a618-8916-41e7-8773-6f81850bf428","name":"66a3a618-8916-41e7-8773-6f81850bf428","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"55e4eb93-91e3-4251-a610-7a88ef44e295","name":"55e4eb93-91e3-4251-a610-7a88ef44e295","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c839fec-817d-4ad9-ace8-1447ac216a20","name":"8c839fec-817d-4ad9-ace8-1447ac216a20","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"49d3f799-75d7-4265-8808-dda0f3c715b2","name":"49d3f799-75d7-4265-8808-dda0f3c715b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2efb5d92-2428-42cd-89e7-be4069186f6b","name":"2efb5d92-2428-42cd-89e7-be4069186f6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"613ba06e-d34f-431d-b4d6-5d3fcc290338","name":"613ba06e-d34f-431d-b4d6-5d3fcc290338","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0d8b94b8-297f-427c-9561-544ca75f5f93","name":"0d8b94b8-297f-427c-9561-544ca75f5f93","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f485d637-9734-449b-b878-674a7bf45002","name":"f485d637-9734-449b-b878-674a7bf45002","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb04902e-b65b-4002-af27-3bf803bac80a","name":"bb04902e-b65b-4002-af27-3bf803bac80a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"66a3a618-8916-41e7-8773-6f81850bf428","name":"66a3a618-8916-41e7-8773-6f81850bf428","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"55e4eb93-91e3-4251-a610-7a88ef44e295","name":"55e4eb93-91e3-4251-a610-7a88ef44e295","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,36 +79,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"568febcf-ab7f-4a87-b5c0-735a58b1b9d4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c839fec-817d-4ad9-ace8-1447ac216a20","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"846e9905-1def-45d8-bb7c-5fdb5825102e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"49d3f799-75d7-4265-8808-dda0f3c715b2","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eafd5b88-2fb5-44b7-9676-b8ff110d59ba","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2efb5d92-2428-42cd-89e7-be4069186f6b","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e21150b8-8296-4101-b8cb-41c1afd8bbfc","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"613ba06e-d34f-431d-b4d6-5d3fcc290338","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6084a88b-01b6-41fd-91bf-3aea97f8d78c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d8b94b8-297f-427c-9561-544ca75f5f93","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"06ebf596-560c-48c8-ac9c-ecacf45b2cee","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f485d637-9734-449b-b878-674a7bf45002","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd1adfdd-e046-4734-9496-5123b9733a3e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb04902e-b65b-4002-af27-3bf803bac80a","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8a651216-c6e5-41d6-aca8-a9c5e3f6090c","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"66a3a618-8916-41e7-8773-6f81850bf428","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a089cf52-ca81-41d6-97ae-9599874de3bd","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e4eb93-91e3-4251-a610-7a88ef44e295","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3c54f96e-b78f-4a27-ac45-b600d7239fea","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8cb6d9eb-f4d0-4e70-8a60-33dd017f0b50","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"568febcf-ab7f-4a87-b5c0-735a58b1b9d4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c839fec-817d-4ad9-ace8-1447ac216a20","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"846e9905-1def-45d8-bb7c-5fdb5825102e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"49d3f799-75d7-4265-8808-dda0f3c715b2","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eafd5b88-2fb5-44b7-9676-b8ff110d59ba","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2efb5d92-2428-42cd-89e7-be4069186f6b","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e21150b8-8296-4101-b8cb-41c1afd8bbfc","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"613ba06e-d34f-431d-b4d6-5d3fcc290338","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6084a88b-01b6-41fd-91bf-3aea97f8d78c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d8b94b8-297f-427c-9561-544ca75f5f93","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"06ebf596-560c-48c8-ac9c-ecacf45b2cee","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f485d637-9734-449b-b878-674a7bf45002","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd1adfdd-e046-4734-9496-5123b9733a3e","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb04902e-b65b-4002-af27-3bf803bac80a","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8a651216-c6e5-41d6-aca8-a9c5e3f6090c","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"66a3a618-8916-41e7-8773-6f81850bf428","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a089cf52-ca81-41d6-97ae-9599874de3bd","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e4eb93-91e3-4251-a610-7a88ef44e295","path":"sprites/spr_terminator3_colors/spr_terminator3_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3c54f96e-b78f-4a27-ac45-b600d7239fea","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_arms/spr_terminator_arms.yy b/sprites/spr_terminator_arms/spr_terminator_arms.yy index b512d6092a..b43aa11ab9 100644 --- a/sprites/spr_terminator_arms/spr_terminator_arms.yy +++ b/sprites/spr_terminator_arms/spr_terminator_arms.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_arms", "bboxMode":0, "bbox_bottom":170, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26935846-dc87-49ea-95f0-8d93e784b6b3","name":"26935846-dc87-49ea-95f0-8d93e784b6b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"213953e7-d335-4a83-a9b8-496335dda7be","name":"213953e7-d335-4a83-a9b8-496335dda7be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"daf2e325-3fef-4afd-8c05-47a593d56b46","name":"daf2e325-3fef-4afd-8c05-47a593d56b46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26935846-dc87-49ea-95f0-8d93e784b6b3","name":"26935846-dc87-49ea-95f0-8d93e784b6b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"213953e7-d335-4a83-a9b8-496335dda7be","name":"213953e7-d335-4a83-a9b8-496335dda7be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"daf2e325-3fef-4afd-8c05-47a593d56b46","name":"daf2e325-3fef-4afd-8c05-47a593d56b46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -74,24 +74,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cae7e18c-f5e7-4d50-8455-689d9f07259e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f758ccb5-a5a2-4ba8-826a-d935358c0750","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97dafcc0-9581-43e8-9b5a-3b85dcce74b7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33ca7639-cb77-432a-983c-83471f91f6ad","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7d6d9eef-0cb3-4ce9-b9be-cb53d0a55eac","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daf2e325-3fef-4afd-8c05-47a593d56b46","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8f618068-e910-457d-a3f3-bb9b274821f5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cae7e18c-f5e7-4d50-8455-689d9f07259e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5bf1d95d-31c3-4092-99f8-fe6b18cc077d","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f758ccb5-a5a2-4ba8-826a-d935358c0750","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97dafcc0-9581-43e8-9b5a-3b85dcce74b7","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e9f5065-f35e-4408-835f-e8fbfcd63878","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33ca7639-cb77-432a-983c-83471f91f6ad","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7d6d9eef-0cb3-4ce9-b9be-cb53d0a55eac","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daf2e325-3fef-4afd-8c05-47a593d56b46","path":"sprites/spr_terminator_arms/spr_terminator_arms.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8f618068-e910-457d-a3f3-bb9b274821f5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_chap/spr_terminator_chap.yy b/sprites/spr_terminator_chap/spr_terminator_chap.yy index e1a0fdf32a..62042c56bf 100644 --- a/sprites/spr_terminator_chap/spr_terminator_chap.yy +++ b/sprites/spr_terminator_chap/spr_terminator_chap.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_chap", "bboxMode":0, "bbox_bottom":231, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dea64601-3301-4a88-8591-c05858f4ec64","name":"dea64601-3301-4a88-8591-c05858f4ec64","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6e270d34-f629-4db1-b875-a3c1808f6f05","name":"6e270d34-f629-4db1-b875-a3c1808f6f05","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be251def-f87a-4059-94ba-a09de050afdc","name":"be251def-f87a-4059-94ba-a09de050afdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dea64601-3301-4a88-8591-c05858f4ec64","name":"dea64601-3301-4a88-8591-c05858f4ec64","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6e270d34-f629-4db1-b875-a3c1808f6f05","name":"6e270d34-f629-4db1-b875-a3c1808f6f05","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be251def-f87a-4059-94ba-a09de050afdc","name":"be251def-f87a-4059-94ba-a09de050afdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,42 +79,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"230c632b-8b24-4edd-be9b-3b70311fede3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e30d48bc-b249-4c2c-8797-ac883a14cfa1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"92ef3eef-ea36-4c59-bcb2-61ce66d885c1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3ff366b-1d0a-45c4-a250-955c5934a1f1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dea64601-3301-4a88-8591-c05858f4ec64","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"83303542-6444-4807-b269-79920c8d5df9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"66d85fca-2193-4a3a-8f67-de3d3f8922dd","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ea0f1fe6-fe3d-4ec0-b0f6-73fa978ed634","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e270d34-f629-4db1-b875-a3c1808f6f05","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2cc2aa60-cff6-47b5-aa55-58f9710ba1ed","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b44f8488-ca89-4feb-8ecb-da711bef2914","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c014eae2-8bcb-4344-9475-1ef52c9b4dc4","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4a840c4-e82f-4893-9b83-03cc66741b24","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be251def-f87a-4059-94ba-a09de050afdc","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6c711e59-d9af-4da6-a07d-12138197879b","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9376330-15f7-4f2d-8eaf-98953ffc1010","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"230c632b-8b24-4edd-be9b-3b70311fede3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cbce1c2-d21a-4ad6-8ac0-b4a14c138991","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e30d48bc-b249-4c2c-8797-ac883a14cfa1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a77b2a2-ba69-417c-95ff-5efbc54ea115","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"92ef3eef-ea36-4c59-bcb2-61ce66d885c1","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"333055d8-0c87-403d-94cb-ee0b6b5dbfd1","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3ff366b-1d0a-45c4-a250-955c5934a1f1","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dea64601-3301-4a88-8591-c05858f4ec64","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"83303542-6444-4807-b269-79920c8d5df9","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87a78cdd-01d7-45c0-b3e5-26fa1e9871c6","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"66d85fca-2193-4a3a-8f67-de3d3f8922dd","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d5f69ea-c8b4-48b8-8ba4-8a11ce8e72e2","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ea0f1fe6-fe3d-4ec0-b0f6-73fa978ed634","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6e270d34-f629-4db1-b875-a3c1808f6f05","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2cc2aa60-cff6-47b5-aa55-58f9710ba1ed","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7fe6bc8-5e13-48dc-99f8-fa8279af6138","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b44f8488-ca89-4feb-8ecb-da711bef2914","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4008e6a5-0c0b-42ba-ab53-6a1aa5a32ada","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c014eae2-8bcb-4344-9475-1ef52c9b4dc4","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8b300ea3-053a-4c9f-9251-851dbd6d1d37","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4a840c4-e82f-4893-9b83-03cc66741b24","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be251def-f87a-4059-94ba-a09de050afdc","path":"sprites/spr_terminator_chap/spr_terminator_chap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6c711e59-d9af-4da6-a07d-12138197879b","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_colors/spr_terminator_colors.yy b/sprites/spr_terminator_colors/spr_terminator_colors.yy index 57ce5b8168..2874cfee78 100644 --- a/sprites/spr_terminator_colors/spr_terminator_colors.yy +++ b/sprites/spr_terminator_colors/spr_terminator_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_colors", "bboxMode":0, "bbox_bottom":231, @@ -12,16 +12,16 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fcaca781-a900-4083-84c4-7f2a75eac321","name":"fcaca781-a900-4083-84c4-7f2a75eac321","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"808a543b-f546-43fd-8c27-2819a37091e4","name":"808a543b-f546-43fd-8c27-2819a37091e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b803a6b-b887-4855-bf65-c4b658859507","name":"3b803a6b-b887-4855-bf65-c4b658859507","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ad1367f6-3787-419c-afa0-72a8892b8b60","name":"ad1367f6-3787-419c-afa0-72a8892b8b60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b2b44691-5048-4d17-a254-0346bf451baa","name":"b2b44691-5048-4d17-a254-0346bf451baa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"24589d5c-b88d-4827-923f-ec967cf9be73","name":"24589d5c-b88d-4827-923f-ec967cf9be73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"af3947b7-9b4a-4772-89ae-4c5fbeb2addc","name":"af3947b7-9b4a-4772-89ae-4c5fbeb2addc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d48d753f-bbf1-4967-894d-5d7c23f5c16d","name":"d48d753f-bbf1-4967-894d-5d7c23f5c16d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4f9f3dd8-6abd-4d43-8588-e98d1b703138","name":"4f9f3dd8-6abd-4d43-8588-e98d1b703138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d35811e0-8a35-4516-9c17-df5e3a4e8d2c","name":"d35811e0-8a35-4516-9c17-df5e3a4e8d2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fcaca781-a900-4083-84c4-7f2a75eac321","name":"fcaca781-a900-4083-84c4-7f2a75eac321","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"808a543b-f546-43fd-8c27-2819a37091e4","name":"808a543b-f546-43fd-8c27-2819a37091e4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b803a6b-b887-4855-bf65-c4b658859507","name":"3b803a6b-b887-4855-bf65-c4b658859507","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ad1367f6-3787-419c-afa0-72a8892b8b60","name":"ad1367f6-3787-419c-afa0-72a8892b8b60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b2b44691-5048-4d17-a254-0346bf451baa","name":"b2b44691-5048-4d17-a254-0346bf451baa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"24589d5c-b88d-4827-923f-ec967cf9be73","name":"24589d5c-b88d-4827-923f-ec967cf9be73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"af3947b7-9b4a-4772-89ae-4c5fbeb2addc","name":"af3947b7-9b4a-4772-89ae-4c5fbeb2addc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d48d753f-bbf1-4967-894d-5d7c23f5c16d","name":"d48d753f-bbf1-4967-894d-5d7c23f5c16d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4f9f3dd8-6abd-4d43-8588-e98d1b703138","name":"4f9f3dd8-6abd-4d43-8588-e98d1b703138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d35811e0-8a35-4516-9c17-df5e3a4e8d2c","name":"d35811e0-8a35-4516-9c17-df5e3a4e8d2c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -77,36 +77,16 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcaca781-a900-4083-84c4-7f2a75eac321","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bfe7026a-90f3-4a8f-bb25-41c7fba9dc0b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"808a543b-f546-43fd-8c27-2819a37091e4","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0ae4b2fa-fb4f-4166-97c3-11383620af61","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b803a6b-b887-4855-bf65-c4b658859507","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"61289444-32c6-413b-9141-4c5f2e798dc3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ad1367f6-3787-419c-afa0-72a8892b8b60","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1f2f4c8a-388a-4719-b904-8d7d0624cd3b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2b44691-5048-4d17-a254-0346bf451baa","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c818b3bc-0a48-4247-b3c7-e0a3051361a3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"24589d5c-b88d-4827-923f-ec967cf9be73","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec550e3a-2927-4fcc-bfa9-65c11f93f979","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"af3947b7-9b4a-4772-89ae-4c5fbeb2addc","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"47150cad-f2df-4feb-bf6e-93583cafaae5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d48d753f-bbf1-4967-894d-5d7c23f5c16d","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c1fa22b-94ff-4bcb-a006-d1ace0cea132","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f9f3dd8-6abd-4d43-8588-e98d1b703138","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1590e362-11fa-4259-b686-c4b8aaf76429","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d35811e0-8a35-4516-9c17-df5e3a4e8d2c","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"37a23ee8-2217-45cf-856e-ccc2de0266ea","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fcaca781-a900-4083-84c4-7f2a75eac321","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bfe7026a-90f3-4a8f-bb25-41c7fba9dc0b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"808a543b-f546-43fd-8c27-2819a37091e4","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0ae4b2fa-fb4f-4166-97c3-11383620af61","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b803a6b-b887-4855-bf65-c4b658859507","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"61289444-32c6-413b-9141-4c5f2e798dc3","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ad1367f6-3787-419c-afa0-72a8892b8b60","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1f2f4c8a-388a-4719-b904-8d7d0624cd3b","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2b44691-5048-4d17-a254-0346bf451baa","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c818b3bc-0a48-4247-b3c7-e0a3051361a3","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"24589d5c-b88d-4827-923f-ec967cf9be73","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec550e3a-2927-4fcc-bfa9-65c11f93f979","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"af3947b7-9b4a-4772-89ae-4c5fbeb2addc","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"47150cad-f2df-4feb-bf6e-93583cafaae5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d48d753f-bbf1-4967-894d-5d7c23f5c16d","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c1fa22b-94ff-4bcb-a006-d1ace0cea132","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4f9f3dd8-6abd-4d43-8588-e98d1b703138","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1590e362-11fa-4259-b686-c4b8aaf76429","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d35811e0-8a35-4516-9c17-df5e3a4e8d2c","path":"sprites/spr_terminator_colors/spr_terminator_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"37a23ee8-2217-45cf-856e-ccc2de0266ea","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy b/sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy index f01c241b5a..d84f269ab1 100644 --- a/sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy +++ b/sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_complex_arm_hidden_left", "bboxMode":0, "bbox_bottom":111, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"213953e7-d335-4a83-a9b8-496335dda7be","name":"213953e7-d335-4a83-a9b8-496335dda7be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"213953e7-d335-4a83-a9b8-496335dda7be","name":"213953e7-d335-4a83-a9b8-496335dda7be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cf842654-6328-43ef-8ca1-e08413ff4d7f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_complex_arm_hidden_left/spr_terminator_complex_arm_hidden_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cf842654-6328-43ef-8ca1-e08413ff4d7f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy b/sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy index e23fd435ce..9477551e70 100644 --- a/sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy +++ b/sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_complex_arm_hidden_right", "bboxMode":0, "bbox_bottom":111, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"213953e7-d335-4a83-a9b8-496335dda7be","name":"213953e7-d335-4a83-a9b8-496335dda7be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"213953e7-d335-4a83-a9b8-496335dda7be","name":"213953e7-d335-4a83-a9b8-496335dda7be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94ffb408-3cda-47a2-a578-63fe4f6cbb8c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"213953e7-d335-4a83-a9b8-496335dda7be","path":"sprites/spr_terminator_complex_arm_hidden_right/spr_terminator_complex_arm_hidden_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94ffb408-3cda-47a2-a578-63fe4f6cbb8c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy b/sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy index dc09c6f962..cb639298fa 100644 --- a/sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy +++ b/sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_complex_arms_upper_left", "bboxMode":0, "bbox_bottom":119, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"26935846-dc87-49ea-95f0-8d93e784b6b3","name":"26935846-dc87-49ea-95f0-8d93e784b6b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26935846-dc87-49ea-95f0-8d93e784b6b3","name":"26935846-dc87-49ea-95f0-8d93e784b6b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"164674aa-5a00-48ec-8be0-d61e90a3902e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_complex_arms_upper_left/spr_terminator_complex_arms_upper_left.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"164674aa-5a00-48ec-8be0-d61e90a3902e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy b/sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy index 813a485f4f..f2cb3f7f68 100644 --- a/sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy +++ b/sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_complex_arms_upper_right", "bboxMode":0, "bbox_bottom":119, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"26935846-dc87-49ea-95f0-8d93e784b6b3","name":"26935846-dc87-49ea-95f0-8d93e784b6b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26935846-dc87-49ea-95f0-8d93e784b6b3","name":"26935846-dc87-49ea-95f0-8d93e784b6b3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,9 +69,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b4c9688-dfe5-4837-b62a-be5562d846e3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26935846-dc87-49ea-95f0-8d93e784b6b3","path":"sprites/spr_terminator_complex_arms_upper_right/spr_terminator_complex_arms_upper_right.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b4c9688-dfe5-4837-b62a-be5562d846e3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_hands/spr_terminator_hands.yy b/sprites/spr_terminator_hands/spr_terminator_hands.yy index a6291464cf..e3f8761e1b 100644 --- a/sprites/spr_terminator_hands/spr_terminator_hands.yy +++ b/sprites/spr_terminator_hands/spr_terminator_hands.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_hands", "bboxMode":0, "bbox_bottom":170, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e7f88754-373e-4c98-b38b-01592d149b7f","name":"e7f88754-373e-4c98-b38b-01592d149b7f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2d84098c-5069-4226-bf10-452f97e7bc36","name":"2d84098c-5069-4226-bf10-452f97e7bc36","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a27c954e-44c1-40a3-bcf2-5aacdd344336","name":"a27c954e-44c1-40a3-bcf2-5aacdd344336","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba","name":"1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f69d1ae6-a10b-417d-8b85-05d7bc54cd18","name":"f69d1ae6-a10b-417d-8b85-05d7bc54cd18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f139d01c-05ed-4a48-a7c8-d338729ebbe1","name":"f139d01c-05ed-4a48-a7c8-d338729ebbe1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f25745b4-f637-4dc0-b247-5ed451b3d993","name":"f25745b4-f637-4dc0-b247-5ed451b3d993","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a8fd4c1-6d5a-456e-a53f-943fb521fa31","name":"5a8fd4c1-6d5a-456e-a53f-943fb521fa31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d226d814-c4b6-4e08-a965-e240faedfb37","name":"d226d814-c4b6-4e08-a965-e240faedfb37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"261d6f69-5b51-4493-84f5-5d0a6adfe813","name":"261d6f69-5b51-4493-84f5-5d0a6adfe813","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"60a62808-3182-4af9-8fd4-270907296914","name":"60a62808-3182-4af9-8fd4-270907296914","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7f88754-373e-4c98-b38b-01592d149b7f","name":"e7f88754-373e-4c98-b38b-01592d149b7f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2d84098c-5069-4226-bf10-452f97e7bc36","name":"2d84098c-5069-4226-bf10-452f97e7bc36","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a27c954e-44c1-40a3-bcf2-5aacdd344336","name":"a27c954e-44c1-40a3-bcf2-5aacdd344336","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba","name":"1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f69d1ae6-a10b-417d-8b85-05d7bc54cd18","name":"f69d1ae6-a10b-417d-8b85-05d7bc54cd18","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f139d01c-05ed-4a48-a7c8-d338729ebbe1","name":"f139d01c-05ed-4a48-a7c8-d338729ebbe1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f25745b4-f637-4dc0-b247-5ed451b3d993","name":"f25745b4-f637-4dc0-b247-5ed451b3d993","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a8fd4c1-6d5a-456e-a53f-943fb521fa31","name":"5a8fd4c1-6d5a-456e-a53f-943fb521fa31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d226d814-c4b6-4e08-a965-e240faedfb37","name":"d226d814-c4b6-4e08-a965-e240faedfb37","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"261d6f69-5b51-4493-84f5-5d0a6adfe813","name":"261d6f69-5b51-4493-84f5-5d0a6adfe813","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"60a62808-3182-4af9-8fd4-270907296914","name":"60a62808-3182-4af9-8fd4-270907296914","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,42 +79,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7f88754-373e-4c98-b38b-01592d149b7f","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ffaa650d-4969-43f0-9503-b08d22a74013","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d84098c-5069-4226-bf10-452f97e7bc36","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d2a749b-6f7e-47c5-830f-569d5c64dc0f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c65edbe1-4212-4661-9faf-d1270db576cc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a27c954e-44c1-40a3-bcf2-5aacdd344336","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2964c64c-a1e2-4763-bba6-a3ef3f32e6e0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78f97633-afc9-4c33-856e-6659dbc7c6e5","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f69d1ae6-a10b-417d-8b85-05d7bc54cd18","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7c7bd0a8-2f7e-4d98-ac98-7647b7d675f7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f139d01c-05ed-4a48-a7c8-d338729ebbe1","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a944bf98-a036-4ecc-afd7-1987e62f78f3","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f25745b4-f637-4dc0-b247-5ed451b3d993","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"653d9ae6-2cdb-411f-b2fd-47e04abfe186","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a8fd4c1-6d5a-456e-a53f-943fb521fa31","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"67ab9298-07a3-42f3-a2d7-5a59455df6b2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d226d814-c4b6-4e08-a965-e240faedfb37","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cc7a3a36-b779-40d6-b240-3a38616306ca","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"261d6f69-5b51-4493-84f5-5d0a6adfe813","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de1cf54a-f77d-4692-9d6e-a84c4af4b970","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"60a62808-3182-4af9-8fd4-270907296914","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"29910d4b-d509-441b-ac03-d6940e4c88e3","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7f88754-373e-4c98-b38b-01592d149b7f","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ffaa650d-4969-43f0-9503-b08d22a74013","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d84098c-5069-4226-bf10-452f97e7bc36","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d2a749b-6f7e-47c5-830f-569d5c64dc0f","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9be93fb-8a44-449a-9b86-8579b9a9f1b7","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c65edbe1-4212-4661-9faf-d1270db576cc","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a27c954e-44c1-40a3-bcf2-5aacdd344336","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2964c64c-a1e2-4763-bba6-a3ef3f32e6e0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1a8d1d83-1727-4de5-9a03-b0dbea5bd2ba","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78f97633-afc9-4c33-856e-6659dbc7c6e5","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f69d1ae6-a10b-417d-8b85-05d7bc54cd18","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7c7bd0a8-2f7e-4d98-ac98-7647b7d675f7","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f139d01c-05ed-4a48-a7c8-d338729ebbe1","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a944bf98-a036-4ecc-afd7-1987e62f78f3","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f25745b4-f637-4dc0-b247-5ed451b3d993","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"653d9ae6-2cdb-411f-b2fd-47e04abfe186","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a8fd4c1-6d5a-456e-a53f-943fb521fa31","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"67ab9298-07a3-42f3-a2d7-5a59455df6b2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d226d814-c4b6-4e08-a965-e240faedfb37","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cc7a3a36-b779-40d6-b240-3a38616306ca","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"261d6f69-5b51-4493-84f5-5d0a6adfe813","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de1cf54a-f77d-4692-9d6e-a84c4af4b970","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"60a62808-3182-4af9-8fd4-270907296914","path":"sprites/spr_terminator_hands/spr_terminator_hands.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"29910d4b-d509-441b-ac03-d6940e4c88e3","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_terminator_laurel/spr_terminator_laurel.yy b/sprites/spr_terminator_laurel/spr_terminator_laurel.yy index 50e954824c..85710db900 100644 --- a/sprites/spr_terminator_laurel/spr_terminator_laurel.yy +++ b/sprites/spr_terminator_laurel/spr_terminator_laurel.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_laurel", "bboxMode":0, "bbox_bottom":57, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61531cde-cd44-4806-ae39-3c63f51d65de","name":"61531cde-cd44-4806-ae39-3c63f51d65de","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy b/sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy index 594cb01199..1458671fcf 100644 --- a/sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy +++ b/sprites/spr_terminator_metal_tabbard/spr_terminator_metal_tabbard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_terminator_metal_tabbard", "bboxMode":0, "bbox_bottom":242, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2d32fdf3-ec18-40a7-85c8-10ec10ae01b8","name":"2d32fdf3-ec18-40a7-85c8-10ec10ae01b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2d32fdf3-ec18-40a7-85c8-10ec10ae01b8","name":"2d32fdf3-ec18-40a7-85c8-10ec10ae01b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":271.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_tooltip1/spr_tooltip1.yy b/sprites/spr_tooltip1/spr_tooltip1.yy index 73347d0f66..c6040b869c 100644 --- a/sprites/spr_tooltip1/spr_tooltip1.yy +++ b/sprites/spr_tooltip1/spr_tooltip1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_tooltip1", "bboxMode":0, "bbox_bottom":131, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5f227bbe-a460-4056-9458-870160c7d5c8","name":"5f227bbe-a460-4056-9458-870160c7d5c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"db95f5e8-ecd5-41bb-814d-1689bdd311ae","name":"db95f5e8-ecd5-41bb-814d-1689bdd311ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5f227bbe-a460-4056-9458-870160c7d5c8","name":"5f227bbe-a460-4056-9458-870160c7d5c8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db95f5e8-ecd5-41bb-814d-1689bdd311ae","name":"db95f5e8-ecd5-41bb-814d-1689bdd311ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":200.0, + "seqWidth":300.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_torpedo/spr_torpedo.yy b/sprites/spr_torpedo/spr_torpedo.yy index ec01c2c2b5..a524800ffa 100644 --- a/sprites/spr_torpedo/spr_torpedo.yy +++ b/sprites/spr_torpedo/spr_torpedo.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_torpedo", "bboxMode":0, "bbox_bottom":7, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6871a763-b22c-4883-89d4-c6acba0cf229","name":"6871a763-b22c-4883-89d4-c6acba0cf229","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6871a763-b22c-4883-89d4-c6acba0cf229","name":"6871a763-b22c-4883-89d4-c6acba0cf229","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6871a763-b22c-4883-89d4-c6acba0cf229","path":"sprites/spr_torpedo/spr_torpedo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3db329f9-e41b-4f3a-81f9-53caee66e1f7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6871a763-b22c-4883-89d4-c6acba0cf229","path":"sprites/spr_torpedo/spr_torpedo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3db329f9-e41b-4f3a-81f9-53caee66e1f7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_torpedo_board/spr_torpedo_board.yy b/sprites/spr_torpedo_board/spr_torpedo_board.yy index 9880d05dd2..31f08c49fd 100644 --- a/sprites/spr_torpedo_board/spr_torpedo_board.yy +++ b/sprites/spr_torpedo_board/spr_torpedo_board.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_torpedo_board", "bboxMode":0, "bbox_bottom":11, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dfa16445-7acd-4ae3-8091-96d05ce59546","name":"dfa16445-7acd-4ae3-8091-96d05ce59546","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfa16445-7acd-4ae3-8091-96d05ce59546","name":"dfa16445-7acd-4ae3-8091-96d05ce59546","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfa16445-7acd-4ae3-8091-96d05ce59546","path":"sprites/spr_torpedo_board/spr_torpedo_board.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"13fc9487-2cf1-4cc6-b4fe-155e29ad4ca9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfa16445-7acd-4ae3-8091-96d05ce59546","path":"sprites/spr_torpedo_board/spr_torpedo_board.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"13fc9487-2cf1-4cc6-b4fe-155e29ad4ca9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ui_but_1/spr_ui_but_1.yy b/sprites/spr_ui_but_1/spr_ui_but_1.yy index 71432ef41d..b4627f3501 100644 --- a/sprites/spr_ui_but_1/spr_ui_but_1.yy +++ b/sprites/spr_ui_but_1/spr_ui_but_1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_but_1", "bboxMode":0, "bbox_bottom":42, @@ -12,31 +12,31 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"adada15b-9e9b-4a92-88b9-7418b297a89f","name":"adada15b-9e9b-4a92-88b9-7418b297a89f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"607f6aa9-11a4-4a5a-9e6c-dff591594cd6","name":"607f6aa9-11a4-4a5a-9e6c-dff591594cd6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"54c75ea1-53a2-4903-b512-cadd4950cb27","name":"54c75ea1-53a2-4903-b512-cadd4950cb27","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3af7d883-39a3-415f-bd13-2bda3e760c66","name":"3af7d883-39a3-415f-bd13-2bda3e760c66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5469ed7b-3506-4131-a1ff-23d0901c9dba","name":"5469ed7b-3506-4131-a1ff-23d0901c9dba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7215913e-e4f6-4660-b2a4-3e3cd3232ce3","name":"7215913e-e4f6-4660-b2a4-3e3cd3232ce3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a7baf71a-58d9-463d-830f-bdee29d45ff0","name":"a7baf71a-58d9-463d-830f-bdee29d45ff0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f4999508-ec82-4b20-bb80-c76f281711fb","name":"f4999508-ec82-4b20-bb80-c76f281711fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0a8768b0-ccc3-49c6-80b1-0fd1cdd28b7b","name":"0a8768b0-ccc3-49c6-80b1-0fd1cdd28b7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"21434961-aaa1-416e-8888-0757f0f6ddae","name":"21434961-aaa1-416e-8888-0757f0f6ddae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4b8a203-a6df-4bd2-a69a-94de0dd85370","name":"d4b8a203-a6df-4bd2-a69a-94de0dd85370","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"97d12877-7427-4885-a031-30f4f30017be","name":"97d12877-7427-4885-a031-30f4f30017be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e128c96e-d1ed-4894-a53a-aae834b9d903","name":"e128c96e-d1ed-4894-a53a-aae834b9d903","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9909c3c8-1249-421a-9f37-e54a6276e0df","name":"9909c3c8-1249-421a-9f37-e54a6276e0df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"68b34ed1-1f6a-4cd6-86db-96eca4842cca","name":"68b34ed1-1f6a-4cd6-86db-96eca4842cca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1ec4fd85-b79f-4953-9e24-28a4a0f913e9","name":"1ec4fd85-b79f-4953-9e24-28a4a0f913e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b0fc16c7-ffd1-49e3-b7d6-5a891a3e3bc2","name":"b0fc16c7-ffd1-49e3-b7d6-5a891a3e3bc2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d23878c9-1647-4718-944c-21aa313bc7e1","name":"d23878c9-1647-4718-944c-21aa313bc7e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40ba564b-330b-4ff2-afd2-8434cc00fd83","name":"40ba564b-330b-4ff2-afd2-8434cc00fd83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0fef5db-974e-492e-8780-db5188a55a08","name":"e0fef5db-974e-492e-8780-db5188a55a08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7962988f-ba97-4ab0-854e-014da9ad5acd","name":"7962988f-ba97-4ab0-854e-014da9ad5acd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b7515219-dffa-4275-bb96-170d3f9c727c","name":"b7515219-dffa-4275-bb96-170d3f9c727c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d003a3a0-d06b-4fe3-9f46-e6c394243fee","name":"d003a3a0-d06b-4fe3-9f46-e6c394243fee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1628e434-61cb-4106-8789-9f3c47db7a90","name":"1628e434-61cb-4106-8789-9f3c47db7a90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5a5c683d-34b6-459b-bfe7-7bfc415b529b","name":"5a5c683d-34b6-459b-bfe7-7bfc415b529b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"adada15b-9e9b-4a92-88b9-7418b297a89f","name":"adada15b-9e9b-4a92-88b9-7418b297a89f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"607f6aa9-11a4-4a5a-9e6c-dff591594cd6","name":"607f6aa9-11a4-4a5a-9e6c-dff591594cd6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"54c75ea1-53a2-4903-b512-cadd4950cb27","name":"54c75ea1-53a2-4903-b512-cadd4950cb27","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3af7d883-39a3-415f-bd13-2bda3e760c66","name":"3af7d883-39a3-415f-bd13-2bda3e760c66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5469ed7b-3506-4131-a1ff-23d0901c9dba","name":"5469ed7b-3506-4131-a1ff-23d0901c9dba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7215913e-e4f6-4660-b2a4-3e3cd3232ce3","name":"7215913e-e4f6-4660-b2a4-3e3cd3232ce3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a7baf71a-58d9-463d-830f-bdee29d45ff0","name":"a7baf71a-58d9-463d-830f-bdee29d45ff0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4999508-ec82-4b20-bb80-c76f281711fb","name":"f4999508-ec82-4b20-bb80-c76f281711fb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0a8768b0-ccc3-49c6-80b1-0fd1cdd28b7b","name":"0a8768b0-ccc3-49c6-80b1-0fd1cdd28b7b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"21434961-aaa1-416e-8888-0757f0f6ddae","name":"21434961-aaa1-416e-8888-0757f0f6ddae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4b8a203-a6df-4bd2-a69a-94de0dd85370","name":"d4b8a203-a6df-4bd2-a69a-94de0dd85370","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"97d12877-7427-4885-a031-30f4f30017be","name":"97d12877-7427-4885-a031-30f4f30017be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e128c96e-d1ed-4894-a53a-aae834b9d903","name":"e128c96e-d1ed-4894-a53a-aae834b9d903","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9909c3c8-1249-421a-9f37-e54a6276e0df","name":"9909c3c8-1249-421a-9f37-e54a6276e0df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"68b34ed1-1f6a-4cd6-86db-96eca4842cca","name":"68b34ed1-1f6a-4cd6-86db-96eca4842cca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ec4fd85-b79f-4953-9e24-28a4a0f913e9","name":"1ec4fd85-b79f-4953-9e24-28a4a0f913e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b0fc16c7-ffd1-49e3-b7d6-5a891a3e3bc2","name":"b0fc16c7-ffd1-49e3-b7d6-5a891a3e3bc2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d23878c9-1647-4718-944c-21aa313bc7e1","name":"d23878c9-1647-4718-944c-21aa313bc7e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40ba564b-330b-4ff2-afd2-8434cc00fd83","name":"40ba564b-330b-4ff2-afd2-8434cc00fd83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0fef5db-974e-492e-8780-db5188a55a08","name":"e0fef5db-974e-492e-8780-db5188a55a08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7962988f-ba97-4ab0-854e-014da9ad5acd","name":"7962988f-ba97-4ab0-854e-014da9ad5acd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b7515219-dffa-4275-bb96-170d3f9c727c","name":"b7515219-dffa-4275-bb96-170d3f9c727c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d003a3a0-d06b-4fe3-9f46-e6c394243fee","name":"d003a3a0-d06b-4fe3-9f46-e6c394243fee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1628e434-61cb-4106-8789-9f3c47db7a90","name":"1628e434-61cb-4106-8789-9f3c47db7a90","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5a5c683d-34b6-459b-bfe7-7bfc415b529b","name":"5a5c683d-34b6-459b-bfe7-7bfc415b529b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -92,81 +92,31 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"adada15b-9e9b-4a92-88b9-7418b297a89f","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"080ebb22-a2ff-4ebe-a0d4-6043111e28ed","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"607f6aa9-11a4-4a5a-9e6c-dff591594cd6","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3c124125-0489-4f4f-b8c4-71ff09d9b1c4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"54c75ea1-53a2-4903-b512-cadd4950cb27","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5317e36a-0b7c-42f7-b0c9-06cf928260e4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3af7d883-39a3-415f-bd13-2bda3e760c66","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c80677e6-1d14-441c-b6d2-e74a13309d69","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5469ed7b-3506-4131-a1ff-23d0901c9dba","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"387a500e-d698-46ae-bcc4-04a5a69fda99","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7215913e-e4f6-4660-b2a4-3e3cd3232ce3","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15c75a0f-f0f2-40b0-8811-999fe25f18a4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7baf71a-58d9-463d-830f-bdee29d45ff0","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4fcd619f-8e03-4075-809d-60865a3596c5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4999508-ec82-4b20-bb80-c76f281711fb","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6d7c65fe-a6f0-4873-b563-03f38fd2f0eb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a8768b0-ccc3-49c6-80b1-0fd1cdd28b7b","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19fd6272-d87c-4085-b34c-15c903ffbf03","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"21434961-aaa1-416e-8888-0757f0f6ddae","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef51cec7-852f-476f-97ab-c9d03f9e9302","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4b8a203-a6df-4bd2-a69a-94de0dd85370","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6a9cd7e9-eccc-4434-bf6e-fe014ef69ece","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"97d12877-7427-4885-a031-30f4f30017be","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0a01148f-6b67-4401-95ff-f995408bc13f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e128c96e-d1ed-4894-a53a-aae834b9d903","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3a34b877-55d0-4c94-a5a2-151beac5369d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9909c3c8-1249-421a-9f37-e54a6276e0df","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff37e96d-ca69-4ad8-84ef-6b5d57497e71","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"68b34ed1-1f6a-4cd6-86db-96eca4842cca","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d9e8f02a-6474-4434-ab59-3a08395d9477","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ec4fd85-b79f-4953-9e24-28a4a0f913e9","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"baab1585-3631-442d-96a9-c5fe07c43fd5","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0fc16c7-ffd1-49e3-b7d6-5a891a3e3bc2","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"96085a69-cce7-4af0-8f77-2d805ebe24e8","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d23878c9-1647-4718-944c-21aa313bc7e1","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f448b033-1869-4141-8113-339a55a01fe7","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40ba564b-330b-4ff2-afd2-8434cc00fd83","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"39eafe35-924a-4608-8d94-e2c82159a660","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0fef5db-974e-492e-8780-db5188a55a08","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c7f71d9-9d4a-4de8-8ab3-34557dc0fcef","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7962988f-ba97-4ab0-854e-014da9ad5acd","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3125b75e-2216-418d-913e-3ad58c1c3647","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7515219-dffa-4275-bb96-170d3f9c727c","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0d222029-c724-4c2c-9965-0d1af3e85e3a","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d003a3a0-d06b-4fe3-9f46-e6c394243fee","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"97644162-9a37-471f-8679-8e87deac23db","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1628e434-61cb-4106-8789-9f3c47db7a90","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89472afa-526e-45a2-b2ec-777729447035","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a5c683d-34b6-459b-bfe7-7bfc415b529b","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9f422d94-9d62-4e97-902f-10ebdf436c36","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"adada15b-9e9b-4a92-88b9-7418b297a89f","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"080ebb22-a2ff-4ebe-a0d4-6043111e28ed","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"607f6aa9-11a4-4a5a-9e6c-dff591594cd6","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3c124125-0489-4f4f-b8c4-71ff09d9b1c4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"54c75ea1-53a2-4903-b512-cadd4950cb27","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5317e36a-0b7c-42f7-b0c9-06cf928260e4","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3af7d883-39a3-415f-bd13-2bda3e760c66","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c80677e6-1d14-441c-b6d2-e74a13309d69","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5469ed7b-3506-4131-a1ff-23d0901c9dba","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"387a500e-d698-46ae-bcc4-04a5a69fda99","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7215913e-e4f6-4660-b2a4-3e3cd3232ce3","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15c75a0f-f0f2-40b0-8811-999fe25f18a4","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a7baf71a-58d9-463d-830f-bdee29d45ff0","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4fcd619f-8e03-4075-809d-60865a3596c5","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4999508-ec82-4b20-bb80-c76f281711fb","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6d7c65fe-a6f0-4873-b563-03f38fd2f0eb","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0a8768b0-ccc3-49c6-80b1-0fd1cdd28b7b","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"19fd6272-d87c-4085-b34c-15c903ffbf03","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"21434961-aaa1-416e-8888-0757f0f6ddae","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef51cec7-852f-476f-97ab-c9d03f9e9302","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4b8a203-a6df-4bd2-a69a-94de0dd85370","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6a9cd7e9-eccc-4434-bf6e-fe014ef69ece","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"97d12877-7427-4885-a031-30f4f30017be","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0a01148f-6b67-4401-95ff-f995408bc13f","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e128c96e-d1ed-4894-a53a-aae834b9d903","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3a34b877-55d0-4c94-a5a2-151beac5369d","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9909c3c8-1249-421a-9f37-e54a6276e0df","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff37e96d-ca69-4ad8-84ef-6b5d57497e71","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"68b34ed1-1f6a-4cd6-86db-96eca4842cca","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9e8f02a-6474-4434-ab59-3a08395d9477","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ec4fd85-b79f-4953-9e24-28a4a0f913e9","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"baab1585-3631-442d-96a9-c5fe07c43fd5","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b0fc16c7-ffd1-49e3-b7d6-5a891a3e3bc2","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"96085a69-cce7-4af0-8f77-2d805ebe24e8","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d23878c9-1647-4718-944c-21aa313bc7e1","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f448b033-1869-4141-8113-339a55a01fe7","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40ba564b-330b-4ff2-afd2-8434cc00fd83","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"39eafe35-924a-4608-8d94-e2c82159a660","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0fef5db-974e-492e-8780-db5188a55a08","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c7f71d9-9d4a-4de8-8ab3-34557dc0fcef","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7962988f-ba97-4ab0-854e-014da9ad5acd","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3125b75e-2216-418d-913e-3ad58c1c3647","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7515219-dffa-4275-bb96-170d3f9c727c","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0d222029-c724-4c2c-9965-0d1af3e85e3a","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d003a3a0-d06b-4fe3-9f46-e6c394243fee","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"97644162-9a37-471f-8679-8e87deac23db","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1628e434-61cb-4106-8789-9f3c47db7a90","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89472afa-526e-45a2-b2ec-777729447035","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5a5c683d-34b6-459b-bfe7-7bfc415b529b","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9f422d94-9d62-4e97-902f-10ebdf436c36","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ui_but_2/spr_ui_but_2.yy b/sprites/spr_ui_but_2/spr_ui_but_2.yy index 44132ab460..15c27c0740 100644 --- a/sprites/spr_ui_but_2/spr_ui_but_2.yy +++ b/sprites/spr_ui_but_2/spr_ui_but_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_but_2", "bboxMode":0, "bbox_bottom":42, @@ -12,31 +12,31 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cccd3204-9ed5-43d4-ba20-c31e029caa9f","name":"cccd3204-9ed5-43d4-ba20-c31e029caa9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4ea10bc0-d23c-4423-98d6-c7f84609f712","name":"4ea10bc0-d23c-4423-98d6-c7f84609f712","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0aa9b148-e83f-47ac-a6e1-62e8c14fc071","name":"0aa9b148-e83f-47ac-a6e1-62e8c14fc071","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c0cce997-da2e-43c1-89ee-8e6eca9549c3","name":"c0cce997-da2e-43c1-89ee-8e6eca9549c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"37bcdb41-c3a2-4dae-9cb4-91f598a14ca5","name":"37bcdb41-c3a2-4dae-9cb4-91f598a14ca5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1ee7b0d9-9f05-4351-8fc3-5011036b92d3","name":"1ee7b0d9-9f05-4351-8fc3-5011036b92d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8934fb74-73bd-475b-861c-676b2d824e46","name":"8934fb74-73bd-475b-861c-676b2d824e46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d3df87c9-95ec-4c6e-b4bc-581c5d32476c","name":"d3df87c9-95ec-4c6e-b4bc-581c5d32476c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d6f5378a-34c2-4d27-8d99-cb731dd9a138","name":"d6f5378a-34c2-4d27-8d99-cb731dd9a138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d5c7d655-ff6c-42ed-83fb-53aa2a9f67f6","name":"d5c7d655-ff6c-42ed-83fb-53aa2a9f67f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7961d161-e69c-4ac0-a866-ab2a984bde10","name":"7961d161-e69c-4ac0-a866-ab2a984bde10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"46efdad8-ef3b-41aa-8215-0108e296e3a2","name":"46efdad8-ef3b-41aa-8215-0108e296e3a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"571878b9-29aa-47d6-b8df-932284191e73","name":"571878b9-29aa-47d6-b8df-932284191e73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3eca5a29-d1cd-4ab2-9d95-7ac9cdde93ed","name":"3eca5a29-d1cd-4ab2-9d95-7ac9cdde93ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9983ba7c-f2d3-4251-b544-963e79996dde","name":"9983ba7c-f2d3-4251-b544-963e79996dde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4ea5fc36-4111-4fe7-abfa-2738146e71e7","name":"4ea5fc36-4111-4fe7-abfa-2738146e71e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3e144b78-28e5-48e6-8de3-912b34723b01","name":"3e144b78-28e5-48e6-8de3-912b34723b01","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eded6056-0881-483a-88f3-7b96675b4b25","name":"eded6056-0881-483a-88f3-7b96675b4b25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"75fc782d-8ba7-40cf-96b6-df6c376b9e5b","name":"75fc782d-8ba7-40cf-96b6-df6c376b9e5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"57217e6c-a521-4c47-bc25-445da6c139ad","name":"57217e6c-a521-4c47-bc25-445da6c139ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3975b47a-b5f7-4655-b87f-befe9792e54a","name":"3975b47a-b5f7-4655-b87f-befe9792e54a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b31b0fb5-db84-404b-a44d-b79c6335e558","name":"b31b0fb5-db84-404b-a44d-b79c6335e558","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0d7ab904-07a4-4ac6-b92f-2f317b5b0577","name":"0d7ab904-07a4-4ac6-b92f-2f317b5b0577","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea02ef7e-060f-406f-8dc2-c4eb992d6094","name":"ea02ef7e-060f-406f-8dc2-c4eb992d6094","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e6f427d2-b9c5-4a15-beb5-1e4bf54cf93d","name":"e6f427d2-b9c5-4a15-beb5-1e4bf54cf93d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cccd3204-9ed5-43d4-ba20-c31e029caa9f","name":"cccd3204-9ed5-43d4-ba20-c31e029caa9f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4ea10bc0-d23c-4423-98d6-c7f84609f712","name":"4ea10bc0-d23c-4423-98d6-c7f84609f712","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0aa9b148-e83f-47ac-a6e1-62e8c14fc071","name":"0aa9b148-e83f-47ac-a6e1-62e8c14fc071","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0cce997-da2e-43c1-89ee-8e6eca9549c3","name":"c0cce997-da2e-43c1-89ee-8e6eca9549c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"37bcdb41-c3a2-4dae-9cb4-91f598a14ca5","name":"37bcdb41-c3a2-4dae-9cb4-91f598a14ca5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ee7b0d9-9f05-4351-8fc3-5011036b92d3","name":"1ee7b0d9-9f05-4351-8fc3-5011036b92d3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8934fb74-73bd-475b-861c-676b2d824e46","name":"8934fb74-73bd-475b-861c-676b2d824e46","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d3df87c9-95ec-4c6e-b4bc-581c5d32476c","name":"d3df87c9-95ec-4c6e-b4bc-581c5d32476c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d6f5378a-34c2-4d27-8d99-cb731dd9a138","name":"d6f5378a-34c2-4d27-8d99-cb731dd9a138","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d5c7d655-ff6c-42ed-83fb-53aa2a9f67f6","name":"d5c7d655-ff6c-42ed-83fb-53aa2a9f67f6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7961d161-e69c-4ac0-a866-ab2a984bde10","name":"7961d161-e69c-4ac0-a866-ab2a984bde10","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"46efdad8-ef3b-41aa-8215-0108e296e3a2","name":"46efdad8-ef3b-41aa-8215-0108e296e3a2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"571878b9-29aa-47d6-b8df-932284191e73","name":"571878b9-29aa-47d6-b8df-932284191e73","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3eca5a29-d1cd-4ab2-9d95-7ac9cdde93ed","name":"3eca5a29-d1cd-4ab2-9d95-7ac9cdde93ed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9983ba7c-f2d3-4251-b544-963e79996dde","name":"9983ba7c-f2d3-4251-b544-963e79996dde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4ea5fc36-4111-4fe7-abfa-2738146e71e7","name":"4ea5fc36-4111-4fe7-abfa-2738146e71e7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3e144b78-28e5-48e6-8de3-912b34723b01","name":"3e144b78-28e5-48e6-8de3-912b34723b01","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eded6056-0881-483a-88f3-7b96675b4b25","name":"eded6056-0881-483a-88f3-7b96675b4b25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"75fc782d-8ba7-40cf-96b6-df6c376b9e5b","name":"75fc782d-8ba7-40cf-96b6-df6c376b9e5b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"57217e6c-a521-4c47-bc25-445da6c139ad","name":"57217e6c-a521-4c47-bc25-445da6c139ad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3975b47a-b5f7-4655-b87f-befe9792e54a","name":"3975b47a-b5f7-4655-b87f-befe9792e54a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b31b0fb5-db84-404b-a44d-b79c6335e558","name":"b31b0fb5-db84-404b-a44d-b79c6335e558","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0d7ab904-07a4-4ac6-b92f-2f317b5b0577","name":"0d7ab904-07a4-4ac6-b92f-2f317b5b0577","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea02ef7e-060f-406f-8dc2-c4eb992d6094","name":"ea02ef7e-060f-406f-8dc2-c4eb992d6094","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e6f427d2-b9c5-4a15-beb5-1e4bf54cf93d","name":"e6f427d2-b9c5-4a15-beb5-1e4bf54cf93d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -92,81 +92,31 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cccd3204-9ed5-43d4-ba20-c31e029caa9f","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd9d7c36-60e2-4bd3-be78-b67018db5d9c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ea10bc0-d23c-4423-98d6-c7f84609f712","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b2b5e04f-52a3-484c-a3f0-e6248e39e813","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0aa9b148-e83f-47ac-a6e1-62e8c14fc071","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"924a4af9-4c80-41a0-b53d-269d9796df02","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0cce997-da2e-43c1-89ee-8e6eca9549c3","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8ef31f9c-031d-45a0-9c1e-0a6114bbf70e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"37bcdb41-c3a2-4dae-9cb4-91f598a14ca5","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f4161c65-77b3-4556-9c62-2d5ee9f4a274","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ee7b0d9-9f05-4351-8fc3-5011036b92d3","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e90cf8ec-2c8f-4040-8533-1e43a1942caf","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8934fb74-73bd-475b-861c-676b2d824e46","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b3aed46-abd7-4417-a706-e9b7d1ecf67d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3df87c9-95ec-4c6e-b4bc-581c5d32476c","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3d7b27dc-edab-4fbe-ad50-b1e370e70dde","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6f5378a-34c2-4d27-8d99-cb731dd9a138","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f042eddf-f0a8-4180-8737-b9e1ebe614a0","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5c7d655-ff6c-42ed-83fb-53aa2a9f67f6","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dc3600a6-1d5e-44f3-ba63-ac970d1fea3c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7961d161-e69c-4ac0-a866-ab2a984bde10","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"db4ef68c-62f0-4933-9862-cbef7d042477","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"46efdad8-ef3b-41aa-8215-0108e296e3a2","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ac1759c6-e84c-4c55-b545-92e2927a1ebe","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"571878b9-29aa-47d6-b8df-932284191e73","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7480413c-78e0-45aa-8638-58a4d121a5d8","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3eca5a29-d1cd-4ab2-9d95-7ac9cdde93ed","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"57971459-6928-41cb-8b9b-31aa3fd9d766","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9983ba7c-f2d3-4251-b544-963e79996dde","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe199c40-a75c-472d-876b-8e544bfec907","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ea5fc36-4111-4fe7-abfa-2738146e71e7","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d018fda9-188b-401c-bbbd-b7ea3121d3fc","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e144b78-28e5-48e6-8de3-912b34723b01","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eea97408-c808-4495-a31e-9d40bf72985d","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eded6056-0881-483a-88f3-7b96675b4b25","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19820bcd-6fbc-43a0-9804-cbaf52f76eaa","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"75fc782d-8ba7-40cf-96b6-df6c376b9e5b","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a54e2959-e2d1-446d-bac5-1cb762394580","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"57217e6c-a521-4c47-bc25-445da6c139ad","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6942a962-7fc6-4ffb-9a52-0aa8c4900f2d","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3975b47a-b5f7-4655-b87f-befe9792e54a","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"282e4378-7cd1-460d-92b9-73077dd0e036","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b31b0fb5-db84-404b-a44d-b79c6335e558","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"447a9809-421a-44dd-a408-7b293f9360ee","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d7ab904-07a4-4ac6-b92f-2f317b5b0577","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e39939f5-f1e1-477d-90b3-72625a9ffa3c","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea02ef7e-060f-406f-8dc2-c4eb992d6094","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f8444770-1893-4ada-a497-251014444a65","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6f427d2-b9c5-4a15-beb5-1e4bf54cf93d","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d8f7b482-fca6-443f-9aa9-610217617d22","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cccd3204-9ed5-43d4-ba20-c31e029caa9f","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd9d7c36-60e2-4bd3-be78-b67018db5d9c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ea10bc0-d23c-4423-98d6-c7f84609f712","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b2b5e04f-52a3-484c-a3f0-e6248e39e813","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0aa9b148-e83f-47ac-a6e1-62e8c14fc071","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"924a4af9-4c80-41a0-b53d-269d9796df02","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0cce997-da2e-43c1-89ee-8e6eca9549c3","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8ef31f9c-031d-45a0-9c1e-0a6114bbf70e","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"37bcdb41-c3a2-4dae-9cb4-91f598a14ca5","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f4161c65-77b3-4556-9c62-2d5ee9f4a274","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ee7b0d9-9f05-4351-8fc3-5011036b92d3","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e90cf8ec-2c8f-4040-8533-1e43a1942caf","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8934fb74-73bd-475b-861c-676b2d824e46","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b3aed46-abd7-4417-a706-e9b7d1ecf67d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d3df87c9-95ec-4c6e-b4bc-581c5d32476c","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3d7b27dc-edab-4fbe-ad50-b1e370e70dde","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d6f5378a-34c2-4d27-8d99-cb731dd9a138","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f042eddf-f0a8-4180-8737-b9e1ebe614a0","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d5c7d655-ff6c-42ed-83fb-53aa2a9f67f6","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dc3600a6-1d5e-44f3-ba63-ac970d1fea3c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7961d161-e69c-4ac0-a866-ab2a984bde10","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"db4ef68c-62f0-4933-9862-cbef7d042477","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"46efdad8-ef3b-41aa-8215-0108e296e3a2","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ac1759c6-e84c-4c55-b545-92e2927a1ebe","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"571878b9-29aa-47d6-b8df-932284191e73","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7480413c-78e0-45aa-8638-58a4d121a5d8","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3eca5a29-d1cd-4ab2-9d95-7ac9cdde93ed","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"57971459-6928-41cb-8b9b-31aa3fd9d766","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9983ba7c-f2d3-4251-b544-963e79996dde","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe199c40-a75c-472d-876b-8e544bfec907","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4ea5fc36-4111-4fe7-abfa-2738146e71e7","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d018fda9-188b-401c-bbbd-b7ea3121d3fc","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3e144b78-28e5-48e6-8de3-912b34723b01","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eea97408-c808-4495-a31e-9d40bf72985d","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eded6056-0881-483a-88f3-7b96675b4b25","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"19820bcd-6fbc-43a0-9804-cbaf52f76eaa","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"75fc782d-8ba7-40cf-96b6-df6c376b9e5b","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a54e2959-e2d1-446d-bac5-1cb762394580","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"57217e6c-a521-4c47-bc25-445da6c139ad","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6942a962-7fc6-4ffb-9a52-0aa8c4900f2d","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3975b47a-b5f7-4655-b87f-befe9792e54a","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"282e4378-7cd1-460d-92b9-73077dd0e036","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b31b0fb5-db84-404b-a44d-b79c6335e558","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"447a9809-421a-44dd-a408-7b293f9360ee","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0d7ab904-07a4-4ac6-b92f-2f317b5b0577","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e39939f5-f1e1-477d-90b3-72625a9ffa3c","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea02ef7e-060f-406f-8dc2-c4eb992d6094","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f8444770-1893-4ada-a497-251014444a65","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6f427d2-b9c5-4a15-beb5-1e4bf54cf93d","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d8f7b482-fca6-443f-9aa9-610217617d22","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ui_but_3/spr_ui_but_3.yy b/sprites/spr_ui_but_3/spr_ui_but_3.yy index ff2c5f5737..32d0e16aa3 100644 --- a/sprites/spr_ui_but_3/spr_ui_but_3.yy +++ b/sprites/spr_ui_but_3/spr_ui_but_3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_but_3", "bboxMode":0, "bbox_bottom":42, @@ -12,31 +12,31 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"350ad62b-e5b8-4594-b2b6-e24a2b0da025","name":"350ad62b-e5b8-4594-b2b6-e24a2b0da025","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76c49802-aae4-4cf2-89e2-f16d003e6cde","name":"76c49802-aae4-4cf2-89e2-f16d003e6cde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b19c1bfa-e650-45a0-952b-5bc202e55225","name":"b19c1bfa-e650-45a0-952b-5bc202e55225","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"67ec2a03-0c41-4925-b069-d58f70fd8a34","name":"67ec2a03-0c41-4925-b069-d58f70fd8a34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dd82b965-6df6-46d3-9a66-859a2456e495","name":"dd82b965-6df6-46d3-9a66-859a2456e495","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9a8bff66-e1fe-4372-857b-af4c482695a0","name":"9a8bff66-e1fe-4372-857b-af4c482695a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cf4461ea-6979-4ce1-a17f-707abfba8624","name":"cf4461ea-6979-4ce1-a17f-707abfba8624","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5126edfc-1ae5-4667-a5f9-de745b787f6c","name":"5126edfc-1ae5-4667-a5f9-de745b787f6c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"87004b16-4dc1-4a80-b5a6-cf1089f6569a","name":"87004b16-4dc1-4a80-b5a6-cf1089f6569a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8d587773-f96a-4919-b748-8cf7e449442f","name":"8d587773-f96a-4919-b748-8cf7e449442f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"62fd7750-714b-4738-a2af-d1d703c4a01e","name":"62fd7750-714b-4738-a2af-d1d703c4a01e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cae631bf-8006-40ac-a71a-3057c3db5a25","name":"cae631bf-8006-40ac-a71a-3057c3db5a25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"13daf569-0fcb-4609-97c0-e08b74ed424e","name":"13daf569-0fcb-4609-97c0-e08b74ed424e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4748ed9-14e2-4d8b-81cb-5675c62b8cdc","name":"d4748ed9-14e2-4d8b-81cb-5675c62b8cdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"037906f6-019f-4e8a-9813-2677c37e344e","name":"037906f6-019f-4e8a-9813-2677c37e344e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c2481719-724d-4920-9dd2-6c0fe0bf23ef","name":"c2481719-724d-4920-9dd2-6c0fe0bf23ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e03fd35f-3183-40eb-81ff-0dfd8fbb92c4","name":"e03fd35f-3183-40eb-81ff-0dfd8fbb92c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e1ef6c03-9172-4d98-bfcc-afdf7e46747a","name":"e1ef6c03-9172-4d98-bfcc-afdf7e46747a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a485b00d-a08c-4159-945f-c0eebba537e9","name":"a485b00d-a08c-4159-945f-c0eebba537e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"19099c5b-0325-4b4b-9e16-5a79c66fd564","name":"19099c5b-0325-4b4b-9e16-5a79c66fd564","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"aa7adb15-3dfc-4fdc-9fbe-db2524c8bf72","name":"aa7adb15-3dfc-4fdc-9fbe-db2524c8bf72","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"61663474-1b43-4f7b-b61a-cf3b8f161094","name":"61663474-1b43-4f7b-b61a-cf3b8f161094","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a3608284-8d42-45d8-b55f-2478c344446a","name":"a3608284-8d42-45d8-b55f-2478c344446a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9d2a174c-84ab-4de9-acab-903b907a162e","name":"9d2a174c-84ab-4de9-acab-903b907a162e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d9e46016-1374-4d24-9c62-4d58e3fa875c","name":"d9e46016-1374-4d24-9c62-4d58e3fa875c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"350ad62b-e5b8-4594-b2b6-e24a2b0da025","name":"350ad62b-e5b8-4594-b2b6-e24a2b0da025","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76c49802-aae4-4cf2-89e2-f16d003e6cde","name":"76c49802-aae4-4cf2-89e2-f16d003e6cde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b19c1bfa-e650-45a0-952b-5bc202e55225","name":"b19c1bfa-e650-45a0-952b-5bc202e55225","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67ec2a03-0c41-4925-b069-d58f70fd8a34","name":"67ec2a03-0c41-4925-b069-d58f70fd8a34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd82b965-6df6-46d3-9a66-859a2456e495","name":"dd82b965-6df6-46d3-9a66-859a2456e495","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9a8bff66-e1fe-4372-857b-af4c482695a0","name":"9a8bff66-e1fe-4372-857b-af4c482695a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cf4461ea-6979-4ce1-a17f-707abfba8624","name":"cf4461ea-6979-4ce1-a17f-707abfba8624","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5126edfc-1ae5-4667-a5f9-de745b787f6c","name":"5126edfc-1ae5-4667-a5f9-de745b787f6c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"87004b16-4dc1-4a80-b5a6-cf1089f6569a","name":"87004b16-4dc1-4a80-b5a6-cf1089f6569a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d587773-f96a-4919-b748-8cf7e449442f","name":"8d587773-f96a-4919-b748-8cf7e449442f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"62fd7750-714b-4738-a2af-d1d703c4a01e","name":"62fd7750-714b-4738-a2af-d1d703c4a01e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cae631bf-8006-40ac-a71a-3057c3db5a25","name":"cae631bf-8006-40ac-a71a-3057c3db5a25","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"13daf569-0fcb-4609-97c0-e08b74ed424e","name":"13daf569-0fcb-4609-97c0-e08b74ed424e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4748ed9-14e2-4d8b-81cb-5675c62b8cdc","name":"d4748ed9-14e2-4d8b-81cb-5675c62b8cdc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"037906f6-019f-4e8a-9813-2677c37e344e","name":"037906f6-019f-4e8a-9813-2677c37e344e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c2481719-724d-4920-9dd2-6c0fe0bf23ef","name":"c2481719-724d-4920-9dd2-6c0fe0bf23ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e03fd35f-3183-40eb-81ff-0dfd8fbb92c4","name":"e03fd35f-3183-40eb-81ff-0dfd8fbb92c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e1ef6c03-9172-4d98-bfcc-afdf7e46747a","name":"e1ef6c03-9172-4d98-bfcc-afdf7e46747a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a485b00d-a08c-4159-945f-c0eebba537e9","name":"a485b00d-a08c-4159-945f-c0eebba537e9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"19099c5b-0325-4b4b-9e16-5a79c66fd564","name":"19099c5b-0325-4b4b-9e16-5a79c66fd564","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"aa7adb15-3dfc-4fdc-9fbe-db2524c8bf72","name":"aa7adb15-3dfc-4fdc-9fbe-db2524c8bf72","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61663474-1b43-4f7b-b61a-cf3b8f161094","name":"61663474-1b43-4f7b-b61a-cf3b8f161094","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a3608284-8d42-45d8-b55f-2478c344446a","name":"a3608284-8d42-45d8-b55f-2478c344446a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9d2a174c-84ab-4de9-acab-903b907a162e","name":"9d2a174c-84ab-4de9-acab-903b907a162e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d9e46016-1374-4d24-9c62-4d58e3fa875c","name":"d9e46016-1374-4d24-9c62-4d58e3fa875c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -92,81 +92,31 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"350ad62b-e5b8-4594-b2b6-e24a2b0da025","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7197cc09-b4e2-45c8-b193-db10e25a1c6c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76c49802-aae4-4cf2-89e2-f16d003e6cde","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6bac2a03-c27e-4f03-ae42-2f3f3a3a6a06","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b19c1bfa-e650-45a0-952b-5bc202e55225","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d5decf9-eee2-4b1c-8203-038116df0f88","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67ec2a03-0c41-4925-b069-d58f70fd8a34","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8bc2842a-946b-4461-85ad-9472e1eec1f6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd82b965-6df6-46d3-9a66-859a2456e495","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec1a80bf-faf4-481a-aa21-7841856b7162","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a8bff66-e1fe-4372-857b-af4c482695a0","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"484943a7-f851-4366-8f11-50dd26c77e0d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf4461ea-6979-4ce1-a17f-707abfba8624","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26a52af6-802b-4cad-80d7-76fb09994b88","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5126edfc-1ae5-4667-a5f9-de745b787f6c","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5f5ae753-0dbc-47a8-940b-b175b269f2a0","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"87004b16-4dc1-4a80-b5a6-cf1089f6569a","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3e40f725-c0e0-453e-9590-2dfc6afcf51e","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d587773-f96a-4919-b748-8cf7e449442f","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5f634dde-74b5-4f03-85d2-e74c0e67e21b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"62fd7750-714b-4738-a2af-d1d703c4a01e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"300f25a6-06d8-458c-998c-78886def1d25","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cae631bf-8006-40ac-a71a-3057c3db5a25","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9a461f15-a50a-4068-afda-a4411fb8a7ee","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"13daf569-0fcb-4609-97c0-e08b74ed424e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e37b8a3c-0740-49fa-9f21-fc0e073c281e","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4748ed9-14e2-4d8b-81cb-5675c62b8cdc","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"57ddaaf6-a52a-4776-8e6c-f8ee6fe03d13","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"037906f6-019f-4e8a-9813-2677c37e344e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9a03f7c-6d9e-416b-99f0-db6bd007e5fb","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2481719-724d-4920-9dd2-6c0fe0bf23ef","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3d833322-7d0f-4548-91e6-ca8c2f1da2c8","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e03fd35f-3183-40eb-81ff-0dfd8fbb92c4","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"788e8986-a7ce-4358-ba9e-446326b0ee2f","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1ef6c03-9172-4d98-bfcc-afdf7e46747a","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c8da750b-a83c-4bfa-a62a-27a2fb4449bf","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a485b00d-a08c-4159-945f-c0eebba537e9","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"669b4f36-62bc-442e-8603-c13a8092b880","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"19099c5b-0325-4b4b-9e16-5a79c66fd564","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3bc03858-9781-4b26-8124-ceb72e85f05a","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa7adb15-3dfc-4fdc-9fbe-db2524c8bf72","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"08c2532c-f0de-4494-b15c-f6a37c82af09","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61663474-1b43-4f7b-b61a-cf3b8f161094","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"88aaa8b6-49f3-4ec7-bbca-324de3244128","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3608284-8d42-45d8-b55f-2478c344446a","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"63a06827-b3ad-48cb-bab0-700b21d29b5f","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d2a174c-84ab-4de9-acab-903b907a162e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7bbbb64-9be2-40ea-bd5b-37220eb1b71b","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9e46016-1374-4d24-9c62-4d58e3fa875c","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d6651953-2d6f-4025-9383-a3b639dafe8f","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"350ad62b-e5b8-4594-b2b6-e24a2b0da025","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7197cc09-b4e2-45c8-b193-db10e25a1c6c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76c49802-aae4-4cf2-89e2-f16d003e6cde","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6bac2a03-c27e-4f03-ae42-2f3f3a3a6a06","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b19c1bfa-e650-45a0-952b-5bc202e55225","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d5decf9-eee2-4b1c-8203-038116df0f88","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67ec2a03-0c41-4925-b069-d58f70fd8a34","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8bc2842a-946b-4461-85ad-9472e1eec1f6","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd82b965-6df6-46d3-9a66-859a2456e495","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec1a80bf-faf4-481a-aa21-7841856b7162","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9a8bff66-e1fe-4372-857b-af4c482695a0","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"484943a7-f851-4366-8f11-50dd26c77e0d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf4461ea-6979-4ce1-a17f-707abfba8624","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26a52af6-802b-4cad-80d7-76fb09994b88","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5126edfc-1ae5-4667-a5f9-de745b787f6c","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5f5ae753-0dbc-47a8-940b-b175b269f2a0","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"87004b16-4dc1-4a80-b5a6-cf1089f6569a","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3e40f725-c0e0-453e-9590-2dfc6afcf51e","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d587773-f96a-4919-b748-8cf7e449442f","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5f634dde-74b5-4f03-85d2-e74c0e67e21b","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"62fd7750-714b-4738-a2af-d1d703c4a01e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"300f25a6-06d8-458c-998c-78886def1d25","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cae631bf-8006-40ac-a71a-3057c3db5a25","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9a461f15-a50a-4068-afda-a4411fb8a7ee","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"13daf569-0fcb-4609-97c0-e08b74ed424e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e37b8a3c-0740-49fa-9f21-fc0e073c281e","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4748ed9-14e2-4d8b-81cb-5675c62b8cdc","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"57ddaaf6-a52a-4776-8e6c-f8ee6fe03d13","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"037906f6-019f-4e8a-9813-2677c37e344e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9a03f7c-6d9e-416b-99f0-db6bd007e5fb","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c2481719-724d-4920-9dd2-6c0fe0bf23ef","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3d833322-7d0f-4548-91e6-ca8c2f1da2c8","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e03fd35f-3183-40eb-81ff-0dfd8fbb92c4","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"788e8986-a7ce-4358-ba9e-446326b0ee2f","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e1ef6c03-9172-4d98-bfcc-afdf7e46747a","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c8da750b-a83c-4bfa-a62a-27a2fb4449bf","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a485b00d-a08c-4159-945f-c0eebba537e9","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"669b4f36-62bc-442e-8603-c13a8092b880","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"19099c5b-0325-4b4b-9e16-5a79c66fd564","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3bc03858-9781-4b26-8124-ceb72e85f05a","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa7adb15-3dfc-4fdc-9fbe-db2524c8bf72","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08c2532c-f0de-4494-b15c-f6a37c82af09","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61663474-1b43-4f7b-b61a-cf3b8f161094","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"88aaa8b6-49f3-4ec7-bbca-324de3244128","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3608284-8d42-45d8-b55f-2478c344446a","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"63a06827-b3ad-48cb-bab0-700b21d29b5f","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9d2a174c-84ab-4de9-acab-903b907a162e","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7bbbb64-9be2-40ea-bd5b-37220eb1b71b","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d9e46016-1374-4d24-9c62-4d58e3fa875c","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d6651953-2d6f-4025-9383-a3b639dafe8f","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ui_but_4/spr_ui_but_4.yy b/sprites/spr_ui_but_4/spr_ui_but_4.yy index 9e7f73fc15..874ada82d1 100644 --- a/sprites/spr_ui_but_4/spr_ui_but_4.yy +++ b/sprites/spr_ui_but_4/spr_ui_but_4.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_but_4", "bboxMode":0, "bbox_bottom":41, @@ -12,31 +12,31 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8c008ff9-0d27-4c52-b93f-f9e077f7226a","name":"8c008ff9-0d27-4c52-b93f-f9e077f7226a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3257fe5d-b59c-4c84-aa13-f1f069dcc25f","name":"3257fe5d-b59c-4c84-aa13-f1f069dcc25f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b3adf45c-b672-4f22-8b5d-ed9c2eea38da","name":"b3adf45c-b672-4f22-8b5d-ed9c2eea38da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"878ebbd7-11dc-40f7-aaee-e16bd8b91172","name":"878ebbd7-11dc-40f7-aaee-e16bd8b91172","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6b06cfff-b6d2-4974-be71-68067158ef33","name":"6b06cfff-b6d2-4974-be71-68067158ef33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"680abfbe-e0fe-4109-9f11-16f3c1785d11","name":"680abfbe-e0fe-4109-9f11-16f3c1785d11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3a2ae2bd-e045-4557-8327-36f557c329aa","name":"3a2ae2bd-e045-4557-8327-36f557c329aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7f3cfe30-a3f9-498a-94de-82f115c28652","name":"7f3cfe30-a3f9-498a-94de-82f115c28652","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f7e2e91b-d7cf-4e1f-877f-6a7e95c12a14","name":"f7e2e91b-d7cf-4e1f-877f-6a7e95c12a14","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f52a5ab5-a140-41e6-9a01-9928e1acba57","name":"f52a5ab5-a140-41e6-9a01-9928e1acba57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"124dd8de-1a4a-47a2-9696-e4c05204c065","name":"124dd8de-1a4a-47a2-9696-e4c05204c065","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"40d4918d-d5d7-446c-8bc2-90332e7ec739","name":"40d4918d-d5d7-446c-8bc2-90332e7ec739","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d0d4dd0c-f9f4-4306-a724-b96561d145d1","name":"d0d4dd0c-f9f4-4306-a724-b96561d145d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc4bc30c-179d-4671-b776-19e72103d392","name":"bc4bc30c-179d-4671-b776-19e72103d392","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9274ee8e-3af5-44a7-a86c-be4cfa7fde6f","name":"9274ee8e-3af5-44a7-a86c-be4cfa7fde6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"90c2a1f1-228b-4ee2-bc08-e857db16188f","name":"90c2a1f1-228b-4ee2-bc08-e857db16188f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7888771d-9a42-4932-aed2-90f3bf880b2d","name":"7888771d-9a42-4932-aed2-90f3bf880b2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"06fd6b35-2b99-4f38-8df4-7f82f27b5fab","name":"06fd6b35-2b99-4f38-8df4-7f82f27b5fab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2e50159e-2391-44fa-a0d9-15767963df6f","name":"2e50159e-2391-44fa-a0d9-15767963df6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01f0604a-68c1-4941-b6c7-a164010680ca","name":"01f0604a-68c1-4941-b6c7-a164010680ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee84364d-3744-4b90-94b8-c8282ddcaa66","name":"ee84364d-3744-4b90-94b8-c8282ddcaa66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0b57cf88-36c6-4b37-afa7-394b56e0e889","name":"0b57cf88-36c6-4b37-afa7-394b56e0e889","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"492a7f2b-78df-4812-8216-cb9d7d5a8692","name":"492a7f2b-78df-4812-8216-cb9d7d5a8692","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"65b176bb-5474-4930-b447-8832faf16571","name":"65b176bb-5474-4930-b447-8832faf16571","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e211daf3-d0eb-4a0e-8783-6684ad819022","name":"e211daf3-d0eb-4a0e-8783-6684ad819022","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c008ff9-0d27-4c52-b93f-f9e077f7226a","name":"8c008ff9-0d27-4c52-b93f-f9e077f7226a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3257fe5d-b59c-4c84-aa13-f1f069dcc25f","name":"3257fe5d-b59c-4c84-aa13-f1f069dcc25f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b3adf45c-b672-4f22-8b5d-ed9c2eea38da","name":"b3adf45c-b672-4f22-8b5d-ed9c2eea38da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"878ebbd7-11dc-40f7-aaee-e16bd8b91172","name":"878ebbd7-11dc-40f7-aaee-e16bd8b91172","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6b06cfff-b6d2-4974-be71-68067158ef33","name":"6b06cfff-b6d2-4974-be71-68067158ef33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"680abfbe-e0fe-4109-9f11-16f3c1785d11","name":"680abfbe-e0fe-4109-9f11-16f3c1785d11","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3a2ae2bd-e045-4557-8327-36f557c329aa","name":"3a2ae2bd-e045-4557-8327-36f557c329aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7f3cfe30-a3f9-498a-94de-82f115c28652","name":"7f3cfe30-a3f9-498a-94de-82f115c28652","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7e2e91b-d7cf-4e1f-877f-6a7e95c12a14","name":"f7e2e91b-d7cf-4e1f-877f-6a7e95c12a14","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f52a5ab5-a140-41e6-9a01-9928e1acba57","name":"f52a5ab5-a140-41e6-9a01-9928e1acba57","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"124dd8de-1a4a-47a2-9696-e4c05204c065","name":"124dd8de-1a4a-47a2-9696-e4c05204c065","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40d4918d-d5d7-446c-8bc2-90332e7ec739","name":"40d4918d-d5d7-446c-8bc2-90332e7ec739","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d0d4dd0c-f9f4-4306-a724-b96561d145d1","name":"d0d4dd0c-f9f4-4306-a724-b96561d145d1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc4bc30c-179d-4671-b776-19e72103d392","name":"bc4bc30c-179d-4671-b776-19e72103d392","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9274ee8e-3af5-44a7-a86c-be4cfa7fde6f","name":"9274ee8e-3af5-44a7-a86c-be4cfa7fde6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90c2a1f1-228b-4ee2-bc08-e857db16188f","name":"90c2a1f1-228b-4ee2-bc08-e857db16188f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7888771d-9a42-4932-aed2-90f3bf880b2d","name":"7888771d-9a42-4932-aed2-90f3bf880b2d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"06fd6b35-2b99-4f38-8df4-7f82f27b5fab","name":"06fd6b35-2b99-4f38-8df4-7f82f27b5fab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2e50159e-2391-44fa-a0d9-15767963df6f","name":"2e50159e-2391-44fa-a0d9-15767963df6f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01f0604a-68c1-4941-b6c7-a164010680ca","name":"01f0604a-68c1-4941-b6c7-a164010680ca","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee84364d-3744-4b90-94b8-c8282ddcaa66","name":"ee84364d-3744-4b90-94b8-c8282ddcaa66","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0b57cf88-36c6-4b37-afa7-394b56e0e889","name":"0b57cf88-36c6-4b37-afa7-394b56e0e889","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"492a7f2b-78df-4812-8216-cb9d7d5a8692","name":"492a7f2b-78df-4812-8216-cb9d7d5a8692","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"65b176bb-5474-4930-b447-8832faf16571","name":"65b176bb-5474-4930-b447-8832faf16571","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e211daf3-d0eb-4a0e-8783-6684ad819022","name":"e211daf3-d0eb-4a0e-8783-6684ad819022","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -92,81 +92,31 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c008ff9-0d27-4c52-b93f-f9e077f7226a","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"411f19cb-ce7b-482f-96b9-31835411993a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3257fe5d-b59c-4c84-aa13-f1f069dcc25f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"daa8a33a-c566-40e2-a1a4-bb7c88a424dd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3adf45c-b672-4f22-8b5d-ed9c2eea38da","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3efbd178-cde1-413f-a6f5-5a144c592311","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"878ebbd7-11dc-40f7-aaee-e16bd8b91172","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c62d52d-4378-4e1e-992f-6a5176a62c55","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b06cfff-b6d2-4974-be71-68067158ef33","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"58092874-4226-475c-b084-de7983bba446","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"680abfbe-e0fe-4109-9f11-16f3c1785d11","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"80959158-4fb7-4724-948a-1b44e36df2b9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a2ae2bd-e045-4557-8327-36f557c329aa","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a928b0f6-11f0-4132-b09c-eeb528d8ce3a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f3cfe30-a3f9-498a-94de-82f115c28652","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"06d4e678-f2b1-47f9-99ad-5b49bb44aaf3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7e2e91b-d7cf-4e1f-877f-6a7e95c12a14","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"609f9913-5913-48f5-a8a3-984e074c1e4d","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f52a5ab5-a140-41e6-9a01-9928e1acba57","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c00d552-9c3b-4b72-96ef-db5722628b56","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"124dd8de-1a4a-47a2-9696-e4c05204c065","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"38150b07-3784-4397-bb1f-89c4a55b7cfb","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40d4918d-d5d7-446c-8bc2-90332e7ec739","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee750f0c-dc38-4cba-be12-458c3e2cfc70","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0d4dd0c-f9f4-4306-a724-b96561d145d1","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6ba36882-78b9-4fd8-ac93-a1e0effbec9c","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc4bc30c-179d-4671-b776-19e72103d392","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"520923c2-217a-4510-b30f-f65b4b1e3b13","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9274ee8e-3af5-44a7-a86c-be4cfa7fde6f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c0d87ff7-6e0e-4ac3-9146-de27c2995580","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90c2a1f1-228b-4ee2-bc08-e857db16188f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"06cdef33-822e-4d79-9238-279fbba5edfe","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7888771d-9a42-4932-aed2-90f3bf880b2d","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"27f5ee17-b1d8-4220-b643-42ed7e70817c","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"06fd6b35-2b99-4f38-8df4-7f82f27b5fab","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"df181df8-d7d3-4786-bedd-5142b4f0c90c","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e50159e-2391-44fa-a0d9-15767963df6f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b8faa552-bb10-4f2b-9913-75f20518a305","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01f0604a-68c1-4941-b6c7-a164010680ca","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a0f71e53-9dc3-440b-b3c5-dc3da4aaf80d","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee84364d-3744-4b90-94b8-c8282ddcaa66","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f0c56f4-2c53-4bce-9692-b7491176547c","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b57cf88-36c6-4b37-afa7-394b56e0e889","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f695d0d-cc52-4c54-aa8f-cbc52ec0d1a4","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"492a7f2b-78df-4812-8216-cb9d7d5a8692","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"abcd421f-5a21-47ec-a3ff-44abe4458df8","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"65b176bb-5474-4930-b447-8832faf16571","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"81b935b7-128d-4eee-9353-e124f71cc21a","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e211daf3-d0eb-4a0e-8783-6684ad819022","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d5f929b-9a02-4aad-9973-00fa19030d75","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c008ff9-0d27-4c52-b93f-f9e077f7226a","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"411f19cb-ce7b-482f-96b9-31835411993a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3257fe5d-b59c-4c84-aa13-f1f069dcc25f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"daa8a33a-c566-40e2-a1a4-bb7c88a424dd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3adf45c-b672-4f22-8b5d-ed9c2eea38da","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3efbd178-cde1-413f-a6f5-5a144c592311","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"878ebbd7-11dc-40f7-aaee-e16bd8b91172","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c62d52d-4378-4e1e-992f-6a5176a62c55","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b06cfff-b6d2-4974-be71-68067158ef33","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"58092874-4226-475c-b084-de7983bba446","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"680abfbe-e0fe-4109-9f11-16f3c1785d11","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"80959158-4fb7-4724-948a-1b44e36df2b9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3a2ae2bd-e045-4557-8327-36f557c329aa","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a928b0f6-11f0-4132-b09c-eeb528d8ce3a","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f3cfe30-a3f9-498a-94de-82f115c28652","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"06d4e678-f2b1-47f9-99ad-5b49bb44aaf3","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7e2e91b-d7cf-4e1f-877f-6a7e95c12a14","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"609f9913-5913-48f5-a8a3-984e074c1e4d","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f52a5ab5-a140-41e6-9a01-9928e1acba57","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c00d552-9c3b-4b72-96ef-db5722628b56","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"124dd8de-1a4a-47a2-9696-e4c05204c065","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"38150b07-3784-4397-bb1f-89c4a55b7cfb","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40d4918d-d5d7-446c-8bc2-90332e7ec739","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee750f0c-dc38-4cba-be12-458c3e2cfc70","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d0d4dd0c-f9f4-4306-a724-b96561d145d1","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6ba36882-78b9-4fd8-ac93-a1e0effbec9c","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc4bc30c-179d-4671-b776-19e72103d392","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"520923c2-217a-4510-b30f-f65b4b1e3b13","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9274ee8e-3af5-44a7-a86c-be4cfa7fde6f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c0d87ff7-6e0e-4ac3-9146-de27c2995580","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90c2a1f1-228b-4ee2-bc08-e857db16188f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"06cdef33-822e-4d79-9238-279fbba5edfe","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7888771d-9a42-4932-aed2-90f3bf880b2d","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"27f5ee17-b1d8-4220-b643-42ed7e70817c","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"06fd6b35-2b99-4f38-8df4-7f82f27b5fab","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"df181df8-d7d3-4786-bedd-5142b4f0c90c","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e50159e-2391-44fa-a0d9-15767963df6f","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b8faa552-bb10-4f2b-9913-75f20518a305","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01f0604a-68c1-4941-b6c7-a164010680ca","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a0f71e53-9dc3-440b-b3c5-dc3da4aaf80d","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee84364d-3744-4b90-94b8-c8282ddcaa66","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f0c56f4-2c53-4bce-9692-b7491176547c","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b57cf88-36c6-4b37-afa7-394b56e0e889","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f695d0d-cc52-4c54-aa8f-cbc52ec0d1a4","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"492a7f2b-78df-4812-8216-cb9d7d5a8692","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"abcd421f-5a21-47ec-a3ff-44abe4458df8","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"65b176bb-5474-4930-b447-8832faf16571","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"81b935b7-128d-4eee-9353-e124f71cc21a","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e211daf3-d0eb-4a0e-8783-6684ad819022","path":"sprites/spr_ui_but_4/spr_ui_but_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d5f929b-9a02-4aad-9973-00fa19030d75","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ui_hov_1/spr_ui_hov_1.yy b/sprites/spr_ui_hov_1/spr_ui_hov_1.yy index b9750d56e1..88ff0507ed 100644 --- a/sprites/spr_ui_hov_1/spr_ui_hov_1.yy +++ b/sprites/spr_ui_hov_1/spr_ui_hov_1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_hov_1", "bboxMode":0, "bbox_bottom":41, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c3d25c08-9726-4ae3-b43a-7ceaac22d706","name":"c3d25c08-9726-4ae3-b43a-7ceaac22d706","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c3d25c08-9726-4ae3-b43a-7ceaac22d706","name":"c3d25c08-9726-4ae3-b43a-7ceaac22d706","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3d25c08-9726-4ae3-b43a-7ceaac22d706","path":"sprites/spr_ui_hov_1/spr_ui_hov_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"26cb05a6-2933-4a19-be70-e7d873a80e52","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c3d25c08-9726-4ae3-b43a-7ceaac22d706","path":"sprites/spr_ui_hov_1/spr_ui_hov_1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"26cb05a6-2933-4a19-be70-e7d873a80e52","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ui_hov_2/spr_ui_hov_2.yy b/sprites/spr_ui_hov_2/spr_ui_hov_2.yy index 96db48963a..f039921690 100644 --- a/sprites/spr_ui_hov_2/spr_ui_hov_2.yy +++ b/sprites/spr_ui_hov_2/spr_ui_hov_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_hov_2", "bboxMode":0, "bbox_bottom":40, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e370036d-36fe-4307-b289-976fd9062928","name":"e370036d-36fe-4307-b289-976fd9062928","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e370036d-36fe-4307-b289-976fd9062928","name":"e370036d-36fe-4307-b289-976fd9062928","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e370036d-36fe-4307-b289-976fd9062928","path":"sprites/spr_ui_hov_2/spr_ui_hov_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3334c5e1-3e66-4ea4-8778-d7165ffb448c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e370036d-36fe-4307-b289-976fd9062928","path":"sprites/spr_ui_hov_2/spr_ui_hov_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3334c5e1-3e66-4ea4-8778-d7165ffb448c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ui_hov_3/spr_ui_hov_3.yy b/sprites/spr_ui_hov_3/spr_ui_hov_3.yy index ba4a361dd9..7bec610aa5 100644 --- a/sprites/spr_ui_hov_3/spr_ui_hov_3.yy +++ b/sprites/spr_ui_hov_3/spr_ui_hov_3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_hov_3", "bboxMode":0, "bbox_bottom":41, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"40ad52a6-de6d-468c-bd75-b23a6e706c9e","name":"40ad52a6-de6d-468c-bd75-b23a6e706c9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"40ad52a6-de6d-468c-bd75-b23a6e706c9e","name":"40ad52a6-de6d-468c-bd75-b23a6e706c9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"40ad52a6-de6d-468c-bd75-b23a6e706c9e","path":"sprites/spr_ui_hov_3/spr_ui_hov_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff8a594e-c2e7-464e-b33f-aaf90999c6ab","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"40ad52a6-de6d-468c-bd75-b23a6e706c9e","path":"sprites/spr_ui_hov_3/spr_ui_hov_3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff8a594e-c2e7-464e-b33f-aaf90999c6ab","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ui_hov_4/spr_ui_hov_4.yy b/sprites/spr_ui_hov_4/spr_ui_hov_4.yy index 8518f36e4e..01ecf23b1f 100644 --- a/sprites/spr_ui_hov_4/spr_ui_hov_4.yy +++ b/sprites/spr_ui_hov_4/spr_ui_hov_4.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ui_hov_4", "bboxMode":0, "bbox_bottom":41, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f00dbe29-b1d3-4801-a8de-89465a852ed6","name":"f00dbe29-b1d3-4801-a8de-89465a852ed6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f00dbe29-b1d3-4801-a8de-89465a852ed6","name":"f00dbe29-b1d3-4801-a8de-89465a852ed6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f00dbe29-b1d3-4801-a8de-89465a852ed6","path":"sprites/spr_ui_hov_4/spr_ui_hov_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"61089074-401d-4028-bc16-4e504e1a2eb6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f00dbe29-b1d3-4801-a8de-89465a852ed6","path":"sprites/spr_ui_hov_4/spr_ui_hov_4.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"61089074-401d-4028-bc16-4e504e1a2eb6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_ultra_backpack/8e269d92-a1bd-4360-9ab3-d9310feae634.png b/sprites/spr_ultra_backpack/8e269d92-a1bd-4360-9ab3-d9310feae634.png index a93adbc8b6..b091ae9014 100644 Binary files a/sprites/spr_ultra_backpack/8e269d92-a1bd-4360-9ab3-d9310feae634.png and b/sprites/spr_ultra_backpack/8e269d92-a1bd-4360-9ab3-d9310feae634.png differ diff --git a/sprites/spr_ultra_backpack/layers/8e269d92-a1bd-4360-9ab3-d9310feae634/a3482820-22c0-4934-a6c1-87b382d13fad.png b/sprites/spr_ultra_backpack/layers/8e269d92-a1bd-4360-9ab3-d9310feae634/a3482820-22c0-4934-a6c1-87b382d13fad.png index a93adbc8b6..b091ae9014 100644 Binary files a/sprites/spr_ultra_backpack/layers/8e269d92-a1bd-4360-9ab3-d9310feae634/a3482820-22c0-4934-a6c1-87b382d13fad.png and b/sprites/spr_ultra_backpack/layers/8e269d92-a1bd-4360-9ab3-d9310feae634/a3482820-22c0-4934-a6c1-87b382d13fad.png differ diff --git a/sprites/spr_ultra_backpack/spr_ultra_backpack.yy b/sprites/spr_ultra_backpack/spr_ultra_backpack.yy index 804d095f21..c9a0b4bb4e 100644 --- a/sprites/spr_ultra_backpack/spr_ultra_backpack.yy +++ b/sprites/spr_ultra_backpack/spr_ultra_backpack.yy @@ -1,29 +1,29 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ultra_backpack", "bboxMode":0, - "bbox_bottom":37, + "bbox_bottom":82, "bbox_left":20, "bbox_right":145, - "bbox_top":10, + "bbox_top":55, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8e269d92-a1bd-4360-9ab3-d9310feae634","name":"8e269d92-a1bd-4360-9ab3-d9310feae634","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e269d92-a1bd-4360-9ab3-d9310feae634","name":"8e269d92-a1bd-4360-9ab3-d9310feae634","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, - "height":232, + "height":322, "HTile":false, "layers":[ {"$GMImageLayer":"","%Name":"a3482820-22c0-4934-a6c1-87b382d13fad","blendMode":0,"displayName":"default","isLocked":false,"name":"a3482820-22c0-4934-a6c1-87b382d13fad","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"spr_ultra_backpack", "nineSlice":null, - "origin":0, + "origin":9, "parent":{ "name":"specialist", "path":"folders/Sprites/Marine Viewer/body_types/specialist.yy", @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -76,7 +78,7 @@ "visibleRange":null, "volume":1.0, "xorigin":0, - "yorigin":0, + "yorigin":45, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_ultra_belt/spr_ultra_belt.yy b/sprites/spr_ultra_belt/spr_ultra_belt.yy index 78a2cdf309..8f8c332226 100644 --- a/sprites/spr_ultra_belt/spr_ultra_belt.yy +++ b/sprites/spr_ultra_belt/spr_ultra_belt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ultra_belt", "bboxMode":0, "bbox_bottom":164, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy b/sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy index f67b24f5af..582a6b9bb7 100644 --- a/sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy +++ b/sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ultra_honor_guard", "bboxMode":0, "bbox_bottom":220, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4c90a81d-cb09-420f-9d3e-a2717d044ee8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"da164d7e-dcc6-41fb-890d-2599cfa5ddf8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"31138557-a4ef-465c-99bd-789c14b16264","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4c90a81d-cb09-420f-9d3e-a2717d044ee8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8a2b3d9f-db94-4f5a-8b6c-c14863b33cb4","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"da164d7e-dcc6-41fb-890d-2599cfa5ddf8","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","path":"sprites/spr_ultra_honor_guard/spr_ultra_honor_guard.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"31138557-a4ef-465c-99bd-789c14b16264","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy b/sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy index 5162c3dee2..ed6039129e 100644 --- a/sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy +++ b/sprites/spr_ultra_honor_guard2/spr_ultra_honor_guard2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ultra_honor_guard2", "bboxMode":0, "bbox_bottom":220, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2991de12-c521-4ae7-b522-93889e9d98df","name":"2991de12-c521-4ae7-b522-93889e9d98df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2991de12-c521-4ae7-b522-93889e9d98df","name":"2991de12-c521-4ae7-b522-93889e9d98df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","name":"a480dd5e-cfcb-474b-a59c-731ac71985a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,6 +72,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_ultra_right_shoulder_hanging/88b996d0-3ce9-4c6f-bc17-518446f0995d.png b/sprites/spr_ultra_right_shoulder_hanging/88b996d0-3ce9-4c6f-bc17-518446f0995d.png index 8892fed75a..c581b81028 100644 Binary files a/sprites/spr_ultra_right_shoulder_hanging/88b996d0-3ce9-4c6f-bc17-518446f0995d.png and b/sprites/spr_ultra_right_shoulder_hanging/88b996d0-3ce9-4c6f-bc17-518446f0995d.png differ diff --git a/sprites/spr_ultra_right_shoulder_hanging/layers/88b996d0-3ce9-4c6f-bc17-518446f0995d/a3482820-22c0-4934-a6c1-87b382d13fad.png b/sprites/spr_ultra_right_shoulder_hanging/layers/88b996d0-3ce9-4c6f-bc17-518446f0995d/a3482820-22c0-4934-a6c1-87b382d13fad.png index 8892fed75a..c581b81028 100644 Binary files a/sprites/spr_ultra_right_shoulder_hanging/layers/88b996d0-3ce9-4c6f-bc17-518446f0995d/a3482820-22c0-4934-a6c1-87b382d13fad.png and b/sprites/spr_ultra_right_shoulder_hanging/layers/88b996d0-3ce9-4c6f-bc17-518446f0995d/a3482820-22c0-4934-a6c1-87b382d13fad.png differ diff --git a/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy b/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy index 9bd8ce6e12..354e5d0dc0 100644 --- a/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy +++ b/sprites/spr_ultra_right_shoulder_hanging/spr_ultra_right_shoulder_hanging.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ultra_right_shoulder_hanging", "bboxMode":0, "bbox_bottom":73, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","name":"88b996d0-3ce9-4c6f-bc17-518446f0995d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_ultra_tassels/spr_ultra_tassels.yy b/sprites/spr_ultra_tassels/spr_ultra_tassels.yy index c49ae9c078..66a6228a09 100644 --- a/sprites/spr_ultra_tassels/spr_ultra_tassels.yy +++ b/sprites/spr_ultra_tassels/spr_ultra_tassels.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ultra_tassels", "bboxMode":0, "bbox_bottom":23, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","name":"f40bb243-5f2e-4891-8cb0-e9ef181276bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy b/sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy index 39f772fcca..f57da1db34 100644 --- a/sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy +++ b/sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_um_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a34a5a7c-0087-4f88-9e1b-1f6b0de26c98","name":"a34a5a7c-0087-4f88-9e1b-1f6b0de26c98","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dbbaa29f-f078-4bb6-b016-3dea79733535","name":"dbbaa29f-f078-4bb6-b016-3dea79733535","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a34a5a7c-0087-4f88-9e1b-1f6b0de26c98","name":"a34a5a7c-0087-4f88-9e1b-1f6b0de26c98","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbbaa29f-f078-4bb6-b016-3dea79733535","name":"dbbaa29f-f078-4bb6-b016-3dea79733535","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a34a5a7c-0087-4f88-9e1b-1f6b0de26c98","path":"sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cd995780-905a-4fd2-994a-da7c0e54abf5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbbaa29f-f078-4bb6-b016-3dea79733535","path":"sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1803705e-b04d-49c6-8502-f2e093464157","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a34a5a7c-0087-4f88-9e1b-1f6b0de26c98","path":"sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cd995780-905a-4fd2-994a-da7c0e54abf5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbbaa29f-f078-4bb6-b016-3dea79733535","path":"sprites/spr_um_mk5_helm/spr_um_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1803705e-b04d-49c6-8502-f2e093464157","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy b/sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy index cbf616c1e8..207c229307 100644 --- a/sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy +++ b/sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_um_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d2a2dc43-d898-4e23-bf95-47e59674c1ae","name":"d2a2dc43-d898-4e23-bf95-47e59674c1ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"123e63f4-8786-4da9-80c0-eed2c2787aee","name":"123e63f4-8786-4da9-80c0-eed2c2787aee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d2a2dc43-d898-4e23-bf95-47e59674c1ae","name":"d2a2dc43-d898-4e23-bf95-47e59674c1ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"123e63f4-8786-4da9-80c0-eed2c2787aee","name":"123e63f4-8786-4da9-80c0-eed2c2787aee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2a2dc43-d898-4e23-bf95-47e59674c1ae","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5891a35a-57e8-4258-8689-2ad35315f960","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"123e63f4-8786-4da9-80c0-eed2c2787aee","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"334c5b1d-c7e3-4507-8389-bfc24b3f72bd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2a2dc43-d898-4e23-bf95-47e59674c1ae","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5891a35a-57e8-4258-8689-2ad35315f960","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"123e63f4-8786-4da9-80c0-eed2c2787aee","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"334c5b1d-c7e3-4507-8389-bfc24b3f72bd","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy b/sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy index 65070b033b..b50b3637b1 100644 --- a/sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy +++ b/sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_um_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6b9a8c79-6936-465c-8cb4-6f189dcc7b56","name":"6b9a8c79-6936-465c-8cb4-6f189dcc7b56","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"95af43b6-33c2-4b19-acf4-ecbfec47cfb2","name":"95af43b6-33c2-4b19-acf4-ecbfec47cfb2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6b9a8c79-6936-465c-8cb4-6f189dcc7b56","name":"6b9a8c79-6936-465c-8cb4-6f189dcc7b56","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95af43b6-33c2-4b19-acf4-ecbfec47cfb2","name":"95af43b6-33c2-4b19-acf4-ecbfec47cfb2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b9a8c79-6936-465c-8cb4-6f189dcc7b56","path":"sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"35cad202-64b0-4c42-9e1b-8e0763a24590","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95af43b6-33c2-4b19-acf4-ecbfec47cfb2","path":"sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"046ff00a-8c12-467b-809f-e646aa3cd3a3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6b9a8c79-6936-465c-8cb4-6f189dcc7b56","path":"sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"35cad202-64b0-4c42-9e1b-8e0763a24590","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95af43b6-33c2-4b19-acf4-ecbfec47cfb2","path":"sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"046ff00a-8c12-467b-809f-e646aa3cd3a3","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_view_small/spr_view_small.yy b/sprites/spr_view_small/spr_view_small.yy index 64c9edaca1..0d10cf3803 100644 --- a/sprites/spr_view_small/spr_view_small.yy +++ b/sprites/spr_view_small/spr_view_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_view_small", "bboxMode":0, "bbox_bottom":9, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"044440c9-d329-4c30-ba70-5a2c9f23292a","name":"044440c9-d329-4c30-ba70-5a2c9f23292a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e73e39b8-5523-45a3-b6d6-1c516f84aa03","name":"e73e39b8-5523-45a3-b6d6-1c516f84aa03","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"044440c9-d329-4c30-ba70-5a2c9f23292a","name":"044440c9-d329-4c30-ba70-5a2c9f23292a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e73e39b8-5523-45a3-b6d6-1c516f84aa03","name":"e73e39b8-5523-45a3-b6d6-1c516f84aa03","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"044440c9-d329-4c30-ba70-5a2c9f23292a","path":"sprites/spr_view_small/spr_view_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c3202c5a-6b87-4d2b-a168-f5cf52f95634","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e73e39b8-5523-45a3-b6d6-1c516f84aa03","path":"sprites/spr_view_small/spr_view_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e4933e1-4e75-431e-bf92-5aad96fc0535","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"044440c9-d329-4c30-ba70-5a2c9f23292a","path":"sprites/spr_view_small/spr_view_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c3202c5a-6b87-4d2b-a168-f5cf52f95634","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e73e39b8-5523-45a3-b6d6-1c516f84aa03","path":"sprites/spr_view_small/spr_view_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e4933e1-4e75-431e-bf92-5aad96fc0535","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_warp_level_icon/spr_warp_level_icon.yy b/sprites/spr_warp_level_icon/spr_warp_level_icon.yy index 4293e5972e..19f698600a 100644 --- a/sprites/spr_warp_level_icon/spr_warp_level_icon.yy +++ b/sprites/spr_warp_level_icon/spr_warp_level_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_warp_level_icon", "bboxMode":0, "bbox_bottom":62, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1ac1c13e-8fe0-4857-964b-4a822f33a1ba","name":"1ac1c13e-8fe0-4857-964b-4a822f33a1ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bf4eeb68-da62-40ff-b77e-5f1be70badf6","name":"bf4eeb68-da62-40ff-b77e-5f1be70badf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"30ae56f9-3afc-4604-9923-40e8ff1f399a","name":"30ae56f9-3afc-4604-9923-40e8ff1f399a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2adee574-b7ac-4be9-ac02-15eb6bc9c7df","name":"2adee574-b7ac-4be9-ac02-15eb6bc9c7df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ac1c13e-8fe0-4857-964b-4a822f33a1ba","name":"1ac1c13e-8fe0-4857-964b-4a822f33a1ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bf4eeb68-da62-40ff-b77e-5f1be70badf6","name":"bf4eeb68-da62-40ff-b77e-5f1be70badf6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"30ae56f9-3afc-4604-9923-40e8ff1f399a","name":"30ae56f9-3afc-4604-9923-40e8ff1f399a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2adee574-b7ac-4be9-ac02-15eb6bc9c7df","name":"2adee574-b7ac-4be9-ac02-15eb6bc9c7df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ac1c13e-8fe0-4857-964b-4a822f33a1ba","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"89ce9d96-cb84-4577-9b51-09f273069236","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf4eeb68-da62-40ff-b77e-5f1be70badf6","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"adaedfb1-be72-4784-9929-7a52ad3f6807","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"30ae56f9-3afc-4604-9923-40e8ff1f399a","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fb3df69a-aa7e-408b-bfef-1dc28a7406cf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2adee574-b7ac-4be9-ac02-15eb6bc9c7df","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee80c0e6-271a-41bc-ac1c-aae420931a80","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ac1c13e-8fe0-4857-964b-4a822f33a1ba","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"89ce9d96-cb84-4577-9b51-09f273069236","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf4eeb68-da62-40ff-b77e-5f1be70badf6","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"adaedfb1-be72-4784-9929-7a52ad3f6807","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"30ae56f9-3afc-4604-9923-40e8ff1f399a","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fb3df69a-aa7e-408b-bfef-1dc28a7406cf","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2adee574-b7ac-4be9-ac02-15eb6bc9c7df","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee80c0e6-271a-41bc-ac1c-aae420931a80","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_warp_storm/spr_warp_storm.yy b/sprites/spr_warp_storm/spr_warp_storm.yy index b7e23e0631..9d61e5085f 100644 --- a/sprites/spr_warp_storm/spr_warp_storm.yy +++ b/sprites/spr_warp_storm/spr_warp_storm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_warp_storm", "bboxMode":0, "bbox_bottom":89, @@ -12,63 +12,63 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"001dd472-8ab4-44d2-857c-71cf6472fadd","name":"001dd472-8ab4-44d2-857c-71cf6472fadd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b7812180-2591-44d2-a367-4a4e5159130d","name":"b7812180-2591-44d2-a367-4a4e5159130d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5fe9664e-69ca-4c3e-b5bc-1e71a131c83e","name":"5fe9664e-69ca-4c3e-b5bc-1e71a131c83e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8f7034b6-35b1-487a-bc58-bf84f7ac2ce9","name":"8f7034b6-35b1-487a-bc58-bf84f7ac2ce9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15800b58-edc0-496c-8195-459145884aed","name":"15800b58-edc0-496c-8195-459145884aed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd13b7b8-ae5a-4c9a-b596-f5e78de151ab","name":"cd13b7b8-ae5a-4c9a-b596-f5e78de151ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"47f748bd-33d0-49da-9208-46164b6aa6cb","name":"47f748bd-33d0-49da-9208-46164b6aa6cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fbb75ad3-480f-4c3e-a1b0-234a28c9e258","name":"fbb75ad3-480f-4c3e-a1b0-234a28c9e258","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6843e0dd-a564-4504-906f-4e4d1e6447b6","name":"6843e0dd-a564-4504-906f-4e4d1e6447b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cad9e2ca-cd8e-4207-a85c-dec58569fedb","name":"cad9e2ca-cd8e-4207-a85c-dec58569fedb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1461ee31-e5fa-4ea7-a8b0-a55491c8da6b","name":"1461ee31-e5fa-4ea7-a8b0-a55491c8da6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"92a96d16-ea6a-485e-b6eb-ff9f66f95a0c","name":"92a96d16-ea6a-485e-b6eb-ff9f66f95a0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e581d13e-93fb-40ae-b19e-16d38a3217df","name":"e581d13e-93fb-40ae-b19e-16d38a3217df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"80eee4c3-0717-4b6e-b919-97aa47b0a103","name":"80eee4c3-0717-4b6e-b919-97aa47b0a103","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"303f19a6-a0cf-48c9-85a6-046ce33e2399","name":"303f19a6-a0cf-48c9-85a6-046ce33e2399","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"39d631c4-756c-49fc-8ce9-af1c3231c3f8","name":"39d631c4-756c-49fc-8ce9-af1c3231c3f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"121911da-5579-46f2-b971-a6cc9da0a7b2","name":"121911da-5579-46f2-b971-a6cc9da0a7b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5f4f938e-8cf8-449f-b4e7-8c421b415453","name":"5f4f938e-8cf8-449f-b4e7-8c421b415453","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"55e57ab6-5985-4329-9d0d-32a05dde7774","name":"55e57ab6-5985-4329-9d0d-32a05dde7774","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6ec68ea6-1b16-4887-b804-10cd74d6b55b","name":"6ec68ea6-1b16-4887-b804-10cd74d6b55b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e4ef10a7-d448-47a0-be37-03caef13d8e6","name":"e4ef10a7-d448-47a0-be37-03caef13d8e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"661f3ddd-9963-417c-81e1-794259b20aaa","name":"661f3ddd-9963-417c-81e1-794259b20aaa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"26774b20-a68d-4c3d-9c53-d15c97c155cd","name":"26774b20-a68d-4c3d-9c53-d15c97c155cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"35bb266c-48a5-498b-8386-866a264b4397","name":"35bb266c-48a5-498b-8386-866a264b4397","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1b9c7128-f748-48de-b091-803704177c56","name":"1b9c7128-f748-48de-b091-803704177c56","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e3879639-cd44-49bf-aac7-57c56e75f00a","name":"e3879639-cd44-49bf-aac7-57c56e75f00a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4b72d7ea-628b-44cf-ac6a-3b4172ad57fe","name":"4b72d7ea-628b-44cf-ac6a-3b4172ad57fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fd2a9e9c-5615-4b9e-ab22-cf01174a5bbe","name":"fd2a9e9c-5615-4b9e-ab22-cf01174a5bbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"18be2b45-1a9a-45df-9262-6a56d53bbb0a","name":"18be2b45-1a9a-45df-9262-6a56d53bbb0a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0ccbcee6-b55b-4539-b54b-d9f637a48eb7","name":"0ccbcee6-b55b-4539-b54b-d9f637a48eb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd7ede87-197b-4d41-9eea-5a3b95dd8a84","name":"cd7ede87-197b-4d41-9eea-5a3b95dd8a84","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"35b09eed-ac7f-4524-b585-4cf7bcfc98cb","name":"35b09eed-ac7f-4524-b585-4cf7bcfc98cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f1c63c53-94e1-4d93-bded-e1ae682060ec","name":"f1c63c53-94e1-4d93-bded-e1ae682060ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5ac3c194-9e9d-4297-a7dd-9278ea9cd0a8","name":"5ac3c194-9e9d-4297-a7dd-9278ea9cd0a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d7274cf6-c9f9-4622-8690-b8934364bc08","name":"d7274cf6-c9f9-4622-8690-b8934364bc08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"067d2cb3-7817-4e1b-92bb-44c36ee68ce8","name":"067d2cb3-7817-4e1b-92bb-44c36ee68ce8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6488d0f3-2239-435a-8cd8-41c1f7a89594","name":"6488d0f3-2239-435a-8cd8-41c1f7a89594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e096e0cb-49ca-489a-822d-adb750e9f30a","name":"e096e0cb-49ca-489a-822d-adb750e9f30a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ab90fdde-6786-422a-8ac9-f0d893554b1d","name":"ab90fdde-6786-422a-8ac9-f0d893554b1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"64be9c1a-01d5-43f6-95ab-eba1a35ea61a","name":"64be9c1a-01d5-43f6-95ab-eba1a35ea61a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1ca4762c-fa6c-41f9-b365-78f92b122102","name":"1ca4762c-fa6c-41f9-b365-78f92b122102","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dfedc27a-a776-448b-9370-0ce0dc899e44","name":"dfedc27a-a776-448b-9370-0ce0dc899e44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"90f1bc52-4b49-4104-b25b-192ba372a072","name":"90f1bc52-4b49-4104-b25b-192ba372a072","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"69756b5f-11ee-4f6e-9dfc-bbf3f8a2b40d","name":"69756b5f-11ee-4f6e-9dfc-bbf3f8a2b40d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a3b4b5e6-9afd-4890-b3e9-0e36c74d14fd","name":"a3b4b5e6-9afd-4890-b3e9-0e36c74d14fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c7ca78fa-2f27-433e-a97f-1d0095b44faf","name":"c7ca78fa-2f27-433e-a97f-1d0095b44faf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4562253a-7206-4cb2-ae4e-9d9926e4cf15","name":"4562253a-7206-4cb2-ae4e-9d9926e4cf15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"509b9c29-630b-4c5f-b019-fb14d550d8a9","name":"509b9c29-630b-4c5f-b019-fb14d550d8a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0b9fe318-5f8a-4626-aafa-cb25f8e6a34f","name":"0b9fe318-5f8a-4626-aafa-cb25f8e6a34f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f99542a3-b3aa-4e38-9bd8-c5d8c3fbf992","name":"f99542a3-b3aa-4e38-9bd8-c5d8c3fbf992","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"39edf8d3-2669-4256-8150-4c784b28c518","name":"39edf8d3-2669-4256-8150-4c784b28c518","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6afb60f5-0470-4681-86c3-256940a372a7","name":"6afb60f5-0470-4681-86c3-256940a372a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"16695788-3b0d-4ad8-87e1-d537b0ec3373","name":"16695788-3b0d-4ad8-87e1-d537b0ec3373","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"823b1414-4a78-4745-9234-0f5df53e74cc","name":"823b1414-4a78-4745-9234-0f5df53e74cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83fb8bf3-a467-4679-be90-6f5833b64f26","name":"83fb8bf3-a467-4679-be90-6f5833b64f26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b76958d1-6360-41df-8352-7cb6850d1100","name":"b76958d1-6360-41df-8352-7cb6850d1100","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a025e794-d660-4430-a914-cd4b735734db","name":"a025e794-d660-4430-a914-cd4b735734db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"001dd472-8ab4-44d2-857c-71cf6472fadd","name":"001dd472-8ab4-44d2-857c-71cf6472fadd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b7812180-2591-44d2-a367-4a4e5159130d","name":"b7812180-2591-44d2-a367-4a4e5159130d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5fe9664e-69ca-4c3e-b5bc-1e71a131c83e","name":"5fe9664e-69ca-4c3e-b5bc-1e71a131c83e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8f7034b6-35b1-487a-bc58-bf84f7ac2ce9","name":"8f7034b6-35b1-487a-bc58-bf84f7ac2ce9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15800b58-edc0-496c-8195-459145884aed","name":"15800b58-edc0-496c-8195-459145884aed","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd13b7b8-ae5a-4c9a-b596-f5e78de151ab","name":"cd13b7b8-ae5a-4c9a-b596-f5e78de151ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"47f748bd-33d0-49da-9208-46164b6aa6cb","name":"47f748bd-33d0-49da-9208-46164b6aa6cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fbb75ad3-480f-4c3e-a1b0-234a28c9e258","name":"fbb75ad3-480f-4c3e-a1b0-234a28c9e258","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6843e0dd-a564-4504-906f-4e4d1e6447b6","name":"6843e0dd-a564-4504-906f-4e4d1e6447b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cad9e2ca-cd8e-4207-a85c-dec58569fedb","name":"cad9e2ca-cd8e-4207-a85c-dec58569fedb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1461ee31-e5fa-4ea7-a8b0-a55491c8da6b","name":"1461ee31-e5fa-4ea7-a8b0-a55491c8da6b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92a96d16-ea6a-485e-b6eb-ff9f66f95a0c","name":"92a96d16-ea6a-485e-b6eb-ff9f66f95a0c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e581d13e-93fb-40ae-b19e-16d38a3217df","name":"e581d13e-93fb-40ae-b19e-16d38a3217df","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"80eee4c3-0717-4b6e-b919-97aa47b0a103","name":"80eee4c3-0717-4b6e-b919-97aa47b0a103","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"303f19a6-a0cf-48c9-85a6-046ce33e2399","name":"303f19a6-a0cf-48c9-85a6-046ce33e2399","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39d631c4-756c-49fc-8ce9-af1c3231c3f8","name":"39d631c4-756c-49fc-8ce9-af1c3231c3f8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"121911da-5579-46f2-b971-a6cc9da0a7b2","name":"121911da-5579-46f2-b971-a6cc9da0a7b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5f4f938e-8cf8-449f-b4e7-8c421b415453","name":"5f4f938e-8cf8-449f-b4e7-8c421b415453","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"55e57ab6-5985-4329-9d0d-32a05dde7774","name":"55e57ab6-5985-4329-9d0d-32a05dde7774","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6ec68ea6-1b16-4887-b804-10cd74d6b55b","name":"6ec68ea6-1b16-4887-b804-10cd74d6b55b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e4ef10a7-d448-47a0-be37-03caef13d8e6","name":"e4ef10a7-d448-47a0-be37-03caef13d8e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"661f3ddd-9963-417c-81e1-794259b20aaa","name":"661f3ddd-9963-417c-81e1-794259b20aaa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"26774b20-a68d-4c3d-9c53-d15c97c155cd","name":"26774b20-a68d-4c3d-9c53-d15c97c155cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"35bb266c-48a5-498b-8386-866a264b4397","name":"35bb266c-48a5-498b-8386-866a264b4397","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1b9c7128-f748-48de-b091-803704177c56","name":"1b9c7128-f748-48de-b091-803704177c56","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e3879639-cd44-49bf-aac7-57c56e75f00a","name":"e3879639-cd44-49bf-aac7-57c56e75f00a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4b72d7ea-628b-44cf-ac6a-3b4172ad57fe","name":"4b72d7ea-628b-44cf-ac6a-3b4172ad57fe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fd2a9e9c-5615-4b9e-ab22-cf01174a5bbe","name":"fd2a9e9c-5615-4b9e-ab22-cf01174a5bbe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"18be2b45-1a9a-45df-9262-6a56d53bbb0a","name":"18be2b45-1a9a-45df-9262-6a56d53bbb0a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0ccbcee6-b55b-4539-b54b-d9f637a48eb7","name":"0ccbcee6-b55b-4539-b54b-d9f637a48eb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd7ede87-197b-4d41-9eea-5a3b95dd8a84","name":"cd7ede87-197b-4d41-9eea-5a3b95dd8a84","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"35b09eed-ac7f-4524-b585-4cf7bcfc98cb","name":"35b09eed-ac7f-4524-b585-4cf7bcfc98cb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f1c63c53-94e1-4d93-bded-e1ae682060ec","name":"f1c63c53-94e1-4d93-bded-e1ae682060ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5ac3c194-9e9d-4297-a7dd-9278ea9cd0a8","name":"5ac3c194-9e9d-4297-a7dd-9278ea9cd0a8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d7274cf6-c9f9-4622-8690-b8934364bc08","name":"d7274cf6-c9f9-4622-8690-b8934364bc08","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"067d2cb3-7817-4e1b-92bb-44c36ee68ce8","name":"067d2cb3-7817-4e1b-92bb-44c36ee68ce8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6488d0f3-2239-435a-8cd8-41c1f7a89594","name":"6488d0f3-2239-435a-8cd8-41c1f7a89594","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e096e0cb-49ca-489a-822d-adb750e9f30a","name":"e096e0cb-49ca-489a-822d-adb750e9f30a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ab90fdde-6786-422a-8ac9-f0d893554b1d","name":"ab90fdde-6786-422a-8ac9-f0d893554b1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64be9c1a-01d5-43f6-95ab-eba1a35ea61a","name":"64be9c1a-01d5-43f6-95ab-eba1a35ea61a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ca4762c-fa6c-41f9-b365-78f92b122102","name":"1ca4762c-fa6c-41f9-b365-78f92b122102","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dfedc27a-a776-448b-9370-0ce0dc899e44","name":"dfedc27a-a776-448b-9370-0ce0dc899e44","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"90f1bc52-4b49-4104-b25b-192ba372a072","name":"90f1bc52-4b49-4104-b25b-192ba372a072","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"69756b5f-11ee-4f6e-9dfc-bbf3f8a2b40d","name":"69756b5f-11ee-4f6e-9dfc-bbf3f8a2b40d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a3b4b5e6-9afd-4890-b3e9-0e36c74d14fd","name":"a3b4b5e6-9afd-4890-b3e9-0e36c74d14fd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c7ca78fa-2f27-433e-a97f-1d0095b44faf","name":"c7ca78fa-2f27-433e-a97f-1d0095b44faf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4562253a-7206-4cb2-ae4e-9d9926e4cf15","name":"4562253a-7206-4cb2-ae4e-9d9926e4cf15","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"509b9c29-630b-4c5f-b019-fb14d550d8a9","name":"509b9c29-630b-4c5f-b019-fb14d550d8a9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0b9fe318-5f8a-4626-aafa-cb25f8e6a34f","name":"0b9fe318-5f8a-4626-aafa-cb25f8e6a34f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f99542a3-b3aa-4e38-9bd8-c5d8c3fbf992","name":"f99542a3-b3aa-4e38-9bd8-c5d8c3fbf992","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"39edf8d3-2669-4256-8150-4c784b28c518","name":"39edf8d3-2669-4256-8150-4c784b28c518","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6afb60f5-0470-4681-86c3-256940a372a7","name":"6afb60f5-0470-4681-86c3-256940a372a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"16695788-3b0d-4ad8-87e1-d537b0ec3373","name":"16695788-3b0d-4ad8-87e1-d537b0ec3373","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"823b1414-4a78-4745-9234-0f5df53e74cc","name":"823b1414-4a78-4745-9234-0f5df53e74cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83fb8bf3-a467-4679-be90-6f5833b64f26","name":"83fb8bf3-a467-4679-be90-6f5833b64f26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b76958d1-6360-41df-8352-7cb6850d1100","name":"b76958d1-6360-41df-8352-7cb6850d1100","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a025e794-d660-4430-a914-cd4b735734db","name":"a025e794-d660-4430-a914-cd4b735734db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -124,177 +124,63 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"001dd472-8ab4-44d2-857c-71cf6472fadd","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc0213e9-0f07-4f37-bcc0-59d734fcc547","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7812180-2591-44d2-a367-4a4e5159130d","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9c16fe8-62b2-480f-bb59-23522e6c9155","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fe9664e-69ca-4c3e-b5bc-1e71a131c83e","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"82ba1773-23d9-482c-a199-1d042d22b8a2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f7034b6-35b1-487a-bc58-bf84f7ac2ce9","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c22a8424-dbc7-47b9-832d-e4a7d7e6c0cb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15800b58-edc0-496c-8195-459145884aed","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cfed53ee-1707-4303-80aa-334236fbff87","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd13b7b8-ae5a-4c9a-b596-f5e78de151ab","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ddbc2049-164d-4c14-8f1a-fffe11f83710","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"47f748bd-33d0-49da-9208-46164b6aa6cb","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de342073-23a5-4a54-a0fd-52288c702a2d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbb75ad3-480f-4c3e-a1b0-234a28c9e258","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff42abb4-2dc9-4d5c-8748-7e65b61ed85d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6843e0dd-a564-4504-906f-4e4d1e6447b6","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4f6777da-2fa6-4f33-b6f2-6ad9f8e0b5b2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cad9e2ca-cd8e-4207-a85c-dec58569fedb","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e1681c32-37d4-4c3f-b957-b1d96a110dac","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1461ee31-e5fa-4ea7-a8b0-a55491c8da6b","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7bb3c0f0-1e42-4e91-8698-493bde9659d1","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92a96d16-ea6a-485e-b6eb-ff9f66f95a0c","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70559650-b60d-4cb3-8348-2bd34811ab23","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e581d13e-93fb-40ae-b19e-16d38a3217df","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5654832b-c20d-45ac-a0a8-6f5639238060","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"80eee4c3-0717-4b6e-b919-97aa47b0a103","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"516921ed-fc1f-401f-9cc4-a8b101d332ee","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"303f19a6-a0cf-48c9-85a6-046ce33e2399","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9821bcb1-27ba-4391-a995-993c20bb45bd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39d631c4-756c-49fc-8ce9-af1c3231c3f8","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d1f5ba6-9212-4283-970b-88c2cf1031b0","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"121911da-5579-46f2-b971-a6cc9da0a7b2","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a16c0ec9-5a5e-4847-a3b9-55195e11e22d","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f4f938e-8cf8-449f-b4e7-8c421b415453","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"85f3e091-2afa-4213-baa2-765dc2453c24","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e57ab6-5985-4329-9d0d-32a05dde7774","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e9c3f45-7582-455d-9e6e-a1b2242a2c13","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ec68ea6-1b16-4887-b804-10cd74d6b55b","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ffb6cacf-c077-445a-aefc-b9c843d1b7e8","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4ef10a7-d448-47a0-be37-03caef13d8e6","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ee80225-8f0d-4f9e-bca0-c6a5f8e9c290","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"661f3ddd-9963-417c-81e1-794259b20aaa","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bee71346-7830-4757-8201-8a7eef780e20","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"26774b20-a68d-4c3d-9c53-d15c97c155cd","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"47e8acd1-546e-4481-bda0-49c2c7637c94","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"35bb266c-48a5-498b-8386-866a264b4397","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"06791d29-0924-4ebd-8dcb-840e31b8e679","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b9c7128-f748-48de-b091-803704177c56","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a49d31e5-e7db-4323-bc62-c30f7d1a6a15","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3879639-cd44-49bf-aac7-57c56e75f00a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"222cd3d0-81f1-4200-94ec-804f7cb67c97","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b72d7ea-628b-44cf-ac6a-3b4172ad57fe","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1e3c5b8a-db72-44e2-8aee-028dc208f855","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd2a9e9c-5615-4b9e-ab22-cf01174a5bbe","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"938b0f67-9fe6-4514-82be-e8a8aa1ba1a3","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"18be2b45-1a9a-45df-9262-6a56d53bbb0a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"85d58801-0661-44d8-9385-a2a9269f833f","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ccbcee6-b55b-4539-b54b-d9f637a48eb7","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cd615b80-86de-453e-a55f-902d5a7e79ec","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd7ede87-197b-4d41-9eea-5a3b95dd8a84","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04964e4b-5fc5-4052-86e1-449e86854587","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"35b09eed-ac7f-4524-b585-4cf7bcfc98cb","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cc7bbb99-44a3-4101-9d14-1fc6fa70944d","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1c63c53-94e1-4d93-bded-e1ae682060ec","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fea695af-8be0-4e93-979f-44179b4bd03c","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5ac3c194-9e9d-4297-a7dd-9278ea9cd0a8","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b6f2012f-cb6b-48ba-a217-e9eb61564848","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7274cf6-c9f9-4622-8690-b8934364bc08","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d335ee2-98b4-4c47-8010-68f24ba1998a","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"067d2cb3-7817-4e1b-92bb-44c36ee68ce8","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e1e5bd2-a0c2-4e7a-905e-6281a1ad8443","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6488d0f3-2239-435a-8cd8-41c1f7a89594","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b4eb452a-1654-4cd3-bd9b-3fea7dfa9e3e","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e096e0cb-49ca-489a-822d-adb750e9f30a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"94f8b21e-3f7c-440a-acf2-feac47ae2440","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab90fdde-6786-422a-8ac9-f0d893554b1d","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6f618c26-b531-489d-88ff-9f512843fabc","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64be9c1a-01d5-43f6-95ab-eba1a35ea61a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c774f978-8b5b-46a3-9792-e7b689aa0876","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ca4762c-fa6c-41f9-b365-78f92b122102","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2236f732-976a-48a1-8ac7-4b0ec0a0b011","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfedc27a-a776-448b-9370-0ce0dc899e44","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"33d60de5-7b19-429e-a2a9-a3766e7b6c37","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"90f1bc52-4b49-4104-b25b-192ba372a072","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8477deb9-517b-496e-91cd-3bceb9508b29","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"69756b5f-11ee-4f6e-9dfc-bbf3f8a2b40d","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"757787a7-2519-45c0-b048-b58ac607cafd","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3b4b5e6-9afd-4890-b3e9-0e36c74d14fd","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"98c8fb73-a99d-4ab2-8c4a-8f41505916d8","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7ca78fa-2f27-433e-a97f-1d0095b44faf","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6319c0d3-7730-4f13-8117-29bf1d8863c2","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4562253a-7206-4cb2-ae4e-9d9926e4cf15","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41baf1dc-d4d9-425f-844e-9587420504bb","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"509b9c29-630b-4c5f-b019-fb14d550d8a9","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"45cd24f6-6851-4042-a0b9-c6b268fef1f0","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b9fe318-5f8a-4626-aafa-cb25f8e6a34f","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bb5399b0-9447-4211-b852-b735a0fe43f9","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f99542a3-b3aa-4e38-9bd8-c5d8c3fbf992","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f919bf3f-c9fc-40c8-a568-537a6dc1a476","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"39edf8d3-2669-4256-8150-4c784b28c518","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fe5c46b8-8e03-43a0-9355-1d3d9d22809c","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6afb60f5-0470-4681-86c3-256940a372a7","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"545913ed-e73c-4262-b149-932369ff4b33","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"16695788-3b0d-4ad8-87e1-d537b0ec3373","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6e5590cf-7d4b-488d-beea-6906b5ad8381","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"823b1414-4a78-4745-9234-0f5df53e74cc","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4b196899-8812-4c1e-85ec-d93ee27fdef6","IsCreationKey":false,"Key":53.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83fb8bf3-a467-4679-be90-6f5833b64f26","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f0f6cc36-a783-4220-ac9f-e02df0d5e39d","IsCreationKey":false,"Key":54.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b76958d1-6360-41df-8352-7cb6850d1100","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"057783d5-4726-41c2-9bf3-203247453f94","IsCreationKey":false,"Key":55.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a025e794-d660-4430-a914-cd4b735734db","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7e000970-be30-436b-a58d-b6ad3bfc468d","IsCreationKey":false,"Key":56.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"001dd472-8ab4-44d2-857c-71cf6472fadd","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc0213e9-0f07-4f37-bcc0-59d734fcc547","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b7812180-2591-44d2-a367-4a4e5159130d","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9c16fe8-62b2-480f-bb59-23522e6c9155","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5fe9664e-69ca-4c3e-b5bc-1e71a131c83e","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82ba1773-23d9-482c-a199-1d042d22b8a2","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8f7034b6-35b1-487a-bc58-bf84f7ac2ce9","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c22a8424-dbc7-47b9-832d-e4a7d7e6c0cb","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15800b58-edc0-496c-8195-459145884aed","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cfed53ee-1707-4303-80aa-334236fbff87","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd13b7b8-ae5a-4c9a-b596-f5e78de151ab","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ddbc2049-164d-4c14-8f1a-fffe11f83710","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"47f748bd-33d0-49da-9208-46164b6aa6cb","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de342073-23a5-4a54-a0fd-52288c702a2d","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fbb75ad3-480f-4c3e-a1b0-234a28c9e258","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff42abb4-2dc9-4d5c-8748-7e65b61ed85d","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6843e0dd-a564-4504-906f-4e4d1e6447b6","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4f6777da-2fa6-4f33-b6f2-6ad9f8e0b5b2","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cad9e2ca-cd8e-4207-a85c-dec58569fedb","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e1681c32-37d4-4c3f-b957-b1d96a110dac","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1461ee31-e5fa-4ea7-a8b0-a55491c8da6b","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7bb3c0f0-1e42-4e91-8698-493bde9659d1","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92a96d16-ea6a-485e-b6eb-ff9f66f95a0c","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70559650-b60d-4cb3-8348-2bd34811ab23","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e581d13e-93fb-40ae-b19e-16d38a3217df","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5654832b-c20d-45ac-a0a8-6f5639238060","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"80eee4c3-0717-4b6e-b919-97aa47b0a103","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"516921ed-fc1f-401f-9cc4-a8b101d332ee","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"303f19a6-a0cf-48c9-85a6-046ce33e2399","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9821bcb1-27ba-4391-a995-993c20bb45bd","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39d631c4-756c-49fc-8ce9-af1c3231c3f8","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d1f5ba6-9212-4283-970b-88c2cf1031b0","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"121911da-5579-46f2-b971-a6cc9da0a7b2","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a16c0ec9-5a5e-4847-a3b9-55195e11e22d","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f4f938e-8cf8-449f-b4e7-8c421b415453","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"85f3e091-2afa-4213-baa2-765dc2453c24","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"55e57ab6-5985-4329-9d0d-32a05dde7774","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e9c3f45-7582-455d-9e6e-a1b2242a2c13","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6ec68ea6-1b16-4887-b804-10cd74d6b55b","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ffb6cacf-c077-445a-aefc-b9c843d1b7e8","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e4ef10a7-d448-47a0-be37-03caef13d8e6","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ee80225-8f0d-4f9e-bca0-c6a5f8e9c290","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"661f3ddd-9963-417c-81e1-794259b20aaa","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bee71346-7830-4757-8201-8a7eef780e20","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"26774b20-a68d-4c3d-9c53-d15c97c155cd","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"47e8acd1-546e-4481-bda0-49c2c7637c94","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"35bb266c-48a5-498b-8386-866a264b4397","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"06791d29-0924-4ebd-8dcb-840e31b8e679","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b9c7128-f748-48de-b091-803704177c56","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a49d31e5-e7db-4323-bc62-c30f7d1a6a15","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e3879639-cd44-49bf-aac7-57c56e75f00a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"222cd3d0-81f1-4200-94ec-804f7cb67c97","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4b72d7ea-628b-44cf-ac6a-3b4172ad57fe","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1e3c5b8a-db72-44e2-8aee-028dc208f855","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fd2a9e9c-5615-4b9e-ab22-cf01174a5bbe","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"938b0f67-9fe6-4514-82be-e8a8aa1ba1a3","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"18be2b45-1a9a-45df-9262-6a56d53bbb0a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"85d58801-0661-44d8-9385-a2a9269f833f","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ccbcee6-b55b-4539-b54b-d9f637a48eb7","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cd615b80-86de-453e-a55f-902d5a7e79ec","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd7ede87-197b-4d41-9eea-5a3b95dd8a84","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"04964e4b-5fc5-4052-86e1-449e86854587","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"35b09eed-ac7f-4524-b585-4cf7bcfc98cb","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cc7bbb99-44a3-4101-9d14-1fc6fa70944d","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f1c63c53-94e1-4d93-bded-e1ae682060ec","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fea695af-8be0-4e93-979f-44179b4bd03c","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5ac3c194-9e9d-4297-a7dd-9278ea9cd0a8","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b6f2012f-cb6b-48ba-a217-e9eb61564848","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7274cf6-c9f9-4622-8690-b8934364bc08","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d335ee2-98b4-4c47-8010-68f24ba1998a","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"067d2cb3-7817-4e1b-92bb-44c36ee68ce8","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e1e5bd2-a0c2-4e7a-905e-6281a1ad8443","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6488d0f3-2239-435a-8cd8-41c1f7a89594","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b4eb452a-1654-4cd3-bd9b-3fea7dfa9e3e","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e096e0cb-49ca-489a-822d-adb750e9f30a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"94f8b21e-3f7c-440a-acf2-feac47ae2440","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab90fdde-6786-422a-8ac9-f0d893554b1d","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6f618c26-b531-489d-88ff-9f512843fabc","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64be9c1a-01d5-43f6-95ab-eba1a35ea61a","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c774f978-8b5b-46a3-9792-e7b689aa0876","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ca4762c-fa6c-41f9-b365-78f92b122102","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2236f732-976a-48a1-8ac7-4b0ec0a0b011","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dfedc27a-a776-448b-9370-0ce0dc899e44","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"33d60de5-7b19-429e-a2a9-a3766e7b6c37","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"90f1bc52-4b49-4104-b25b-192ba372a072","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8477deb9-517b-496e-91cd-3bceb9508b29","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"69756b5f-11ee-4f6e-9dfc-bbf3f8a2b40d","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"757787a7-2519-45c0-b048-b58ac607cafd","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a3b4b5e6-9afd-4890-b3e9-0e36c74d14fd","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"98c8fb73-a99d-4ab2-8c4a-8f41505916d8","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c7ca78fa-2f27-433e-a97f-1d0095b44faf","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6319c0d3-7730-4f13-8117-29bf1d8863c2","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4562253a-7206-4cb2-ae4e-9d9926e4cf15","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41baf1dc-d4d9-425f-844e-9587420504bb","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"509b9c29-630b-4c5f-b019-fb14d550d8a9","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"45cd24f6-6851-4042-a0b9-c6b268fef1f0","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b9fe318-5f8a-4626-aafa-cb25f8e6a34f","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bb5399b0-9447-4211-b852-b735a0fe43f9","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f99542a3-b3aa-4e38-9bd8-c5d8c3fbf992","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f919bf3f-c9fc-40c8-a568-537a6dc1a476","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"39edf8d3-2669-4256-8150-4c784b28c518","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fe5c46b8-8e03-43a0-9355-1d3d9d22809c","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6afb60f5-0470-4681-86c3-256940a372a7","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"545913ed-e73c-4262-b149-932369ff4b33","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"16695788-3b0d-4ad8-87e1-d537b0ec3373","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6e5590cf-7d4b-488d-beea-6906b5ad8381","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"823b1414-4a78-4745-9234-0f5df53e74cc","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4b196899-8812-4c1e-85ec-d93ee27fdef6","IsCreationKey":false,"Key":53.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83fb8bf3-a467-4679-be90-6f5833b64f26","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f0f6cc36-a783-4220-ac9f-e02df0d5e39d","IsCreationKey":false,"Key":54.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b76958d1-6360-41df-8352-7cb6850d1100","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"057783d5-4726-41c2-9bf3-203247453f94","IsCreationKey":false,"Key":55.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a025e794-d660-4430-a914-cd4b735734db","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7e000970-be30-436b-a58d-b6ad3bfc468d","IsCreationKey":false,"Key":56.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_assca/spr_weapon_assca.yy b/sprites/spr_weapon_assca/spr_weapon_assca.yy index ef8f28aafa..9e708bb475 100644 --- a/sprites/spr_weapon_assca/spr_weapon_assca.yy +++ b/sprites/spr_weapon_assca/spr_weapon_assca.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_assca", "bboxMode":0, "bbox_bottom":181, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"21efedf4-9277-4473-97ad-ebd8ccfaaf83","name":"21efedf4-9277-4473-97ad-ebd8ccfaaf83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"21efedf4-9277-4473-97ad-ebd8ccfaaf83","name":"21efedf4-9277-4473-97ad-ebd8ccfaaf83","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":221.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -79,8 +81,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":27, - "yorigin":38, + "xorigin":20, + "yorigin":30, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_weapon_autocannon/2ed06758-6cd0-4527-9927-973e6e725413.png b/sprites/spr_weapon_autocannon/2ed06758-6cd0-4527-9927-973e6e725413.png deleted file mode 100644 index cfc76adfad..0000000000 Binary files a/sprites/spr_weapon_autocannon/2ed06758-6cd0-4527-9927-973e6e725413.png and /dev/null differ diff --git a/sprites/spr_weapon_autocannon/c4e4f840-8ea0-4c85-bb84-84e04542593d.png b/sprites/spr_weapon_autocannon/c4e4f840-8ea0-4c85-bb84-84e04542593d.png new file mode 100644 index 0000000000..493441a536 Binary files /dev/null and b/sprites/spr_weapon_autocannon/c4e4f840-8ea0-4c85-bb84-84e04542593d.png differ diff --git a/sprites/spr_weapon_autocannon/layers/2ed06758-6cd0-4527-9927-973e6e725413/66d899f0-585a-4030-a5a2-ef609d560ae4.png b/sprites/spr_weapon_autocannon/layers/2ed06758-6cd0-4527-9927-973e6e725413/66d899f0-585a-4030-a5a2-ef609d560ae4.png deleted file mode 100644 index 2057c0a1b1..0000000000 Binary files a/sprites/spr_weapon_autocannon/layers/2ed06758-6cd0-4527-9927-973e6e725413/66d899f0-585a-4030-a5a2-ef609d560ae4.png and /dev/null differ diff --git a/sprites/spr_weapon_autocannon/layers/2ed06758-6cd0-4527-9927-973e6e725413/cb494c49-00cb-493b-af38-95df8d096948.png b/sprites/spr_weapon_autocannon/layers/2ed06758-6cd0-4527-9927-973e6e725413/cb494c49-00cb-493b-af38-95df8d096948.png deleted file mode 100644 index 765337daec..0000000000 Binary files a/sprites/spr_weapon_autocannon/layers/2ed06758-6cd0-4527-9927-973e6e725413/cb494c49-00cb-493b-af38-95df8d096948.png and /dev/null differ diff --git a/sprites/spr_weapon_autocannon/layers/c4e4f840-8ea0-4c85-bb84-84e04542593d/59449464-4def-425e-b64e-b57eb4ac3d47.png b/sprites/spr_weapon_autocannon/layers/c4e4f840-8ea0-4c85-bb84-84e04542593d/59449464-4def-425e-b64e-b57eb4ac3d47.png new file mode 100644 index 0000000000..493441a536 Binary files /dev/null and b/sprites/spr_weapon_autocannon/layers/c4e4f840-8ea0-4c85-bb84-84e04542593d/59449464-4def-425e-b64e-b57eb4ac3d47.png differ diff --git a/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy b/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy index 82919e06e6..8fec19ce9d 100644 --- a/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy +++ b/sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy @@ -1,26 +1,25 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_autocannon", "bboxMode":0, - "bbox_bottom":188, - "bbox_left":49, - "bbox_right":300, - "bbox_top":115, + "bbox_bottom":169, + "bbox_left":52, + "bbox_right":298, + "bbox_top":89, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2ed06758-6cd0-4527-9927-973e6e725413","name":"2ed06758-6cd0-4527-9927-973e6e725413","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c4e4f840-8ea0-4c85-bb84-84e04542593d","name":"c4e4f840-8ea0-4c85-bb84-84e04542593d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":272, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"66d899f0-585a-4030-a5a2-ef609d560ae4","blendMode":0,"displayName":"pasteLayer","isLocked":false,"name":"66d899f0-585a-4030-a5a2-ef609d560ae4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - {"$GMImageLayer":"","%Name":"cb494c49-00cb-493b-af38-95df8d096948","blendMode":0,"displayName":"pasteLayer","isLocked":false,"name":"cb494c49-00cb-493b-af38-95df8d096948","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"59449464-4def-425e-b64e-b57eb4ac3d47","blendMode":0,"displayName":"default","isLocked":false,"name":"59449464-4def-425e-b64e-b57eb4ac3d47","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"spr_weapon_autocannon", "nineSlice":null, @@ -64,14 +63,16 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":301.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ed06758-6cd0-4527-9927-973e6e725413","path":"sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9022dec-ead4-4be3-bd89-24d1a6fa9782","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c4e4f840-8ea0-4c85-bb84-84e04542593d","path":"sprites/spr_weapon_autocannon/spr_weapon_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"cec24aa7-f692-404c-91a0-df1a7dab023a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy b/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy index 512595a5b8..cb4dd301f4 100644 --- a/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy +++ b/sprites/spr_weapon_autocannon2/spr_weapon_autocannon2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_autocannon2", "bboxMode":0, "bbox_bottom":269, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"49d770e0-45f5-4f6a-932b-88984416b02a","name":"49d770e0-45f5-4f6a-932b-88984416b02a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"49d770e0-45f5-4f6a-932b-88984416b02a","name":"49d770e0-45f5-4f6a-932b-88984416b02a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":281.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_weapon_blank/spr_weapon_blank.yy b/sprites/spr_weapon_blank/spr_weapon_blank.yy index cafa8b7e9c..17a7680e33 100644 --- a/sprites/spr_weapon_blank/spr_weapon_blank.yy +++ b/sprites/spr_weapon_blank/spr_weapon_blank.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_blank", "bboxMode":0, "bbox_bottom":0, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"95a59f16-a359-4576-b23d-15ce21d9c9b4","name":"95a59f16-a359-4576-b23d-15ce21d9c9b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95a59f16-a359-4576-b23d-15ce21d9c9b4","name":"95a59f16-a359-4576-b23d-15ce21d9c9b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95a59f16-a359-4576-b23d-15ce21d9c9b4","path":"sprites/spr_weapon_blank/spr_weapon_blank.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"637be8ff-668a-4e8e-b6bb-0ad812ba2aea","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95a59f16-a359-4576-b23d-15ce21d9c9b4","path":"sprites/spr_weapon_blank/spr_weapon_blank.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"637be8ff-668a-4e8e-b6bb-0ad812ba2aea","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_boarding/spr_weapon_boarding.yy b/sprites/spr_weapon_boarding/spr_weapon_boarding.yy index b0885c72f6..7cb589803d 100644 --- a/sprites/spr_weapon_boarding/spr_weapon_boarding.yy +++ b/sprites/spr_weapon_boarding/spr_weapon_boarding.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_boarding", "bboxMode":0, "bbox_bottom":221, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"daea238a-4d48-48a6-be27-b0685c438110","name":"daea238a-4d48-48a6-be27-b0685c438110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8c633911-5e02-436d-a544-2990dee696c7","name":"8c633911-5e02-436d-a544-2990dee696c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"78efcc98-51d3-4128-bf26-28a0f57243ea","name":"78efcc98-51d3-4128-bf26-28a0f57243ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2e3e4782-27f6-4bba-b0c4-7307106ef862","name":"2e3e4782-27f6-4bba-b0c4-7307106ef862","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"daea238a-4d48-48a6-be27-b0685c438110","name":"daea238a-4d48-48a6-be27-b0685c438110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8c633911-5e02-436d-a544-2990dee696c7","name":"8c633911-5e02-436d-a544-2990dee696c7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"78efcc98-51d3-4128-bf26-28a0f57243ea","name":"78efcc98-51d3-4128-bf26-28a0f57243ea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2e3e4782-27f6-4bba-b0c4-7307106ef862","name":"2e3e4782-27f6-4bba-b0c4-7307106ef862","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daea238a-4d48-48a6-be27-b0685c438110","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"511cc112-62e5-435d-aaf5-1cf7d8c9f862","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c633911-5e02-436d-a544-2990dee696c7","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b0869fef-9abb-49aa-bc3e-10c9f6f85865","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"78efcc98-51d3-4128-bf26-28a0f57243ea","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0bd72083-8186-40fb-a39d-e2816ed306fa","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e3e4782-27f6-4bba-b0c4-7307106ef862","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5596390f-1d0c-49a4-8c8d-073828523967","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daea238a-4d48-48a6-be27-b0685c438110","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"511cc112-62e5-435d-aaf5-1cf7d8c9f862","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8c633911-5e02-436d-a544-2990dee696c7","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b0869fef-9abb-49aa-bc3e-10c9f6f85865","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"78efcc98-51d3-4128-bf26-28a0f57243ea","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bd72083-8186-40fb-a39d-e2816ed306fa","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e3e4782-27f6-4bba-b0c4-7307106ef862","path":"sprites/spr_weapon_boarding/spr_weapon_boarding.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5596390f-1d0c-49a4-8c8d-073828523967","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_bolter/spr_weapon_bolter.yy b/sprites/spr_weapon_bolter/spr_weapon_bolter.yy index 03522382e3..eb1cbe9e28 100644 --- a/sprites/spr_weapon_bolter/spr_weapon_bolter.yy +++ b/sprites/spr_weapon_bolter/spr_weapon_bolter.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_bolter", "bboxMode":0, "bbox_bottom":186, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -82,6 +82,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy b/sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy index ca61f285fe..6dc78e478f 100644 --- a/sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy +++ b/sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_boltpis", "bboxMode":0, "bbox_bottom":157, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","path":"sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c722af6-a209-4472-8eb0-1060349ba7d3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dd687c2e-3025-40e4-a63d-1de5355c1cb7","path":"sprites/spr_weapon_boltpis/spr_weapon_boltpis.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c722af6-a209-4472-8eb0-1060349ba7d3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy b/sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy index 4a46b0a0ad..3d1624c555 100644 --- a/sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy +++ b/sprites/spr_weapon_boltstorm_gauntlet/spr_weapon_boltstorm_gauntlet.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_boltstorm_gauntlet", "bboxMode":0, "bbox_bottom":188, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -65,6 +65,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":221.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -80,7 +82,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":27, + "xorigin":20, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_weapon_boltstorm_gauntlet_shadows/8e090f2a-a77c-4b20-b80c-d231322ff1f1.png b/sprites/spr_weapon_boltstorm_gauntlet_shadows/8e090f2a-a77c-4b20-b80c-d231322ff1f1.png new file mode 100644 index 0000000000..e62009005e Binary files /dev/null and b/sprites/spr_weapon_boltstorm_gauntlet_shadows/8e090f2a-a77c-4b20-b80c-d231322ff1f1.png differ diff --git a/sprites/spr_weapon_boltstorm_gauntlet_shadows/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png b/sprites/spr_weapon_boltstorm_gauntlet_shadows/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png new file mode 100644 index 0000000000..539404c228 Binary files /dev/null and b/sprites/spr_weapon_boltstorm_gauntlet_shadows/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png differ diff --git a/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/8e090f2a-a77c-4b20-b80c-d231322ff1f1/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png b/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/8e090f2a-a77c-4b20-b80c-d231322ff1f1/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png new file mode 100644 index 0000000000..e9aaa3547b Binary files /dev/null and b/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/8e090f2a-a77c-4b20-b80c-d231322ff1f1/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png differ diff --git a/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/8e090f2a-a77c-4b20-b80c-d231322ff1f1/b2ef360d-eaaf-4dfa-9281-5566cda46ec2.png b/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/8e090f2a-a77c-4b20-b80c-d231322ff1f1/b2ef360d-eaaf-4dfa-9281-5566cda46ec2.png new file mode 100644 index 0000000000..9a98369e52 Binary files /dev/null and b/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/8e090f2a-a77c-4b20-b80c-d231322ff1f1/b2ef360d-eaaf-4dfa-9281-5566cda46ec2.png differ diff --git a/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png b/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png new file mode 100644 index 0000000000..28cfaaffcf Binary files /dev/null and b/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png differ diff --git a/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/b2ef360d-eaaf-4dfa-9281-5566cda46ec2.png b/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/b2ef360d-eaaf-4dfa-9281-5566cda46ec2.png new file mode 100644 index 0000000000..09ff7f6b7a Binary files /dev/null and b/sprites/spr_weapon_boltstorm_gauntlet_shadows/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/b2ef360d-eaaf-4dfa-9281-5566cda46ec2.png differ diff --git a/sprites/spr_weapon_boltstorm_gauntlet_shadows/spr_weapon_boltstorm_gauntlet_shadows.yy b/sprites/spr_weapon_boltstorm_gauntlet_shadows/spr_weapon_boltstorm_gauntlet_shadows.yy new file mode 100644 index 0000000000..483a48a7ba --- /dev/null +++ b/sprites/spr_weapon_boltstorm_gauntlet_shadows/spr_weapon_boltstorm_gauntlet_shadows.yy @@ -0,0 +1,97 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_boltstorm_gauntlet_shadows", + "bboxMode":0, + "bbox_bottom":188, + "bbox_left":3, + "bbox_right":217, + "bbox_top":118, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":262, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"a21d01bb-7c16-4f98-8ff5-fe8c08bdac52","blendMode":0,"displayName":"default","isLocked":false,"name":"a21d01bb-7c16-4f98-8ff5-fe8c08bdac52","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"b2ef360d-eaaf-4dfa-9281-5566cda46ec2","blendMode":0,"displayName":"pasteLayer","isLocked":false,"name":"b2ef360d-eaaf-4dfa-9281-5566cda46ec2","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_boltstorm_gauntlet_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"weapons_terminator", + "path":"folders/Sprites/Marine Viewer/weapons_terminator.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_boltstorm_gauntlet_shadows", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_boltstorm_gauntlet_shadows", + "playback":1, + "playbackSpeed":2.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":221.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","path":"sprites/spr_weapon_boltstorm_gauntlet_shadows/spr_weapon_boltstorm_gauntlet_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"c2388d3e-d30e-46b1-a568-dd53914a27be","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8e090f2a-a77c-4b20-b80c-d231322ff1f1","path":"sprites/spr_weapon_boltstorm_gauntlet_shadows/spr_weapon_boltstorm_gauntlet_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"97a52d30-b572-4541-8f4c-46d0ee48254e","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":20, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":221, +} \ No newline at end of file diff --git a/sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy b/sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy index 4939741bd6..707c2bfb55 100644 --- a/sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy +++ b/sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_boltstorm_gauntlet_small", "bboxMode":0, "bbox_bottom":182, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b72324e5-1184-447b-810f-30d301bb38bd","name":"b72324e5-1184-447b-810f-30d301bb38bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"67a93404-3327-48e0-b33e-42e8aae7cf9e","name":"67a93404-3327-48e0-b33e-42e8aae7cf9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b72324e5-1184-447b-810f-30d301bb38bd","name":"b72324e5-1184-447b-810f-30d301bb38bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"67a93404-3327-48e0-b33e-42e8aae7cf9e","name":"67a93404-3327-48e0-b33e-42e8aae7cf9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b72324e5-1184-447b-810f-30d301bb38bd","path":"sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a9997dd8-c5ac-4a1a-817d-9fd94e568823","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"67a93404-3327-48e0-b33e-42e8aae7cf9e","path":"sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed24bd0a-4896-40c9-838c-cc10b1e39025","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b72324e5-1184-447b-810f-30d301bb38bd","path":"sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a9997dd8-c5ac-4a1a-817d-9fd94e568823","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"67a93404-3327-48e0-b33e-42e8aae7cf9e","path":"sprites/spr_weapon_boltstorm_gauntlet_small/spr_weapon_boltstorm_gauntlet_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed24bd0a-4896-40c9-838c-cc10b1e39025","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_chainfist/14f21d91-8b62-4ba2-8899-49d496bd87a1.png b/sprites/spr_weapon_chainfist/14f21d91-8b62-4ba2-8899-49d496bd87a1.png index 03cc118e86..7e68ddb7c6 100644 Binary files a/sprites/spr_weapon_chainfist/14f21d91-8b62-4ba2-8899-49d496bd87a1.png and b/sprites/spr_weapon_chainfist/14f21d91-8b62-4ba2-8899-49d496bd87a1.png differ diff --git a/sprites/spr_weapon_chainfist/33dc232c-077a-436b-a8c8-a0f1d5790709.png b/sprites/spr_weapon_chainfist/33dc232c-077a-436b-a8c8-a0f1d5790709.png index a5f21a8cb7..ba8dfe206d 100644 Binary files a/sprites/spr_weapon_chainfist/33dc232c-077a-436b-a8c8-a0f1d5790709.png and b/sprites/spr_weapon_chainfist/33dc232c-077a-436b-a8c8-a0f1d5790709.png differ diff --git a/sprites/spr_weapon_chainfist/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png b/sprites/spr_weapon_chainfist/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png index 3f42b4aa1e..7e68ddb7c6 100644 Binary files a/sprites/spr_weapon_chainfist/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png and b/sprites/spr_weapon_chainfist/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png differ diff --git a/sprites/spr_weapon_chainfist/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png b/sprites/spr_weapon_chainfist/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png index 9070ab83d5..ba8dfe206d 100644 Binary files a/sprites/spr_weapon_chainfist/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png and b/sprites/spr_weapon_chainfist/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png differ diff --git a/sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy b/sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy index 6acc547264..492bc6e1df 100644 --- a/sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy +++ b/sprites/spr_weapon_chainfist/spr_weapon_chainfist.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_chainfist", "bboxMode":0, "bbox_bottom":238, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"33dc232c-077a-436b-a8c8-a0f1d5790709","name":"33dc232c-077a-436b-a8c8-a0f1d5790709","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"33dc232c-077a-436b-a8c8-a0f1d5790709","name":"33dc232c-077a-436b-a8c8-a0f1d5790709","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -65,6 +65,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":221.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -80,7 +82,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":27, + "xorigin":20, "yorigin":42, }, "swatchColours":null, diff --git a/sprites/spr_weapon_chainfist_shadows/14f21d91-8b62-4ba2-8899-49d496bd87a1.png b/sprites/spr_weapon_chainfist_shadows/14f21d91-8b62-4ba2-8899-49d496bd87a1.png new file mode 100644 index 0000000000..bb6635c9b8 Binary files /dev/null and b/sprites/spr_weapon_chainfist_shadows/14f21d91-8b62-4ba2-8899-49d496bd87a1.png differ diff --git a/sprites/spr_weapon_chainfist_shadows/33dc232c-077a-436b-a8c8-a0f1d5790709.png b/sprites/spr_weapon_chainfist_shadows/33dc232c-077a-436b-a8c8-a0f1d5790709.png new file mode 100644 index 0000000000..d984affdeb Binary files /dev/null and b/sprites/spr_weapon_chainfist_shadows/33dc232c-077a-436b-a8c8-a0f1d5790709.png differ diff --git a/sprites/spr_weapon_chainfist_shadows/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png b/sprites/spr_weapon_chainfist_shadows/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png new file mode 100644 index 0000000000..bb6635c9b8 Binary files /dev/null and b/sprites/spr_weapon_chainfist_shadows/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png differ diff --git a/sprites/spr_weapon_chainfist_shadows/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/5d4201b0-3c51-4b59-bcde-6d726e214b64.png b/sprites/spr_weapon_chainfist_shadows/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/5d4201b0-3c51-4b59-bcde-6d726e214b64.png new file mode 100644 index 0000000000..79cfd74396 Binary files /dev/null and b/sprites/spr_weapon_chainfist_shadows/layers/14f21d91-8b62-4ba2-8899-49d496bd87a1/5d4201b0-3c51-4b59-bcde-6d726e214b64.png differ diff --git a/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png b/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png new file mode 100644 index 0000000000..d984affdeb Binary files /dev/null and b/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/1385643a-0ec8-4f25-9bc7-7ce770ecd73a.png differ diff --git a/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/5d4201b0-3c51-4b59-bcde-6d726e214b64.png b/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/5d4201b0-3c51-4b59-bcde-6d726e214b64.png new file mode 100644 index 0000000000..3a8fb4658b Binary files /dev/null and b/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/5d4201b0-3c51-4b59-bcde-6d726e214b64.png differ diff --git a/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/5db4aa6b-c505-41f8-abee-53cfabe27885.png b/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/5db4aa6b-c505-41f8-abee-53cfabe27885.png new file mode 100644 index 0000000000..3578cc5250 Binary files /dev/null and b/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/5db4aa6b-c505-41f8-abee-53cfabe27885.png differ diff --git a/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/aaadcd6e-2015-4e18-94cb-fe99bcbb9134.png b/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/aaadcd6e-2015-4e18-94cb-fe99bcbb9134.png new file mode 100644 index 0000000000..1c9e787629 Binary files /dev/null and b/sprites/spr_weapon_chainfist_shadows/layers/33dc232c-077a-436b-a8c8-a0f1d5790709/aaadcd6e-2015-4e18-94cb-fe99bcbb9134.png differ diff --git a/sprites/spr_weapon_chainfist_shadows/spr_weapon_chainfist_shadows.yy b/sprites/spr_weapon_chainfist_shadows/spr_weapon_chainfist_shadows.yy new file mode 100644 index 0000000000..41a95c65eb --- /dev/null +++ b/sprites/spr_weapon_chainfist_shadows/spr_weapon_chainfist_shadows.yy @@ -0,0 +1,97 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_chainfist_shadows", + "bboxMode":0, + "bbox_bottom":238, + "bbox_left":5, + "bbox_right":215, + "bbox_top":118, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"33dc232c-077a-436b-a8c8-a0f1d5790709","name":"33dc232c-077a-436b-a8c8-a0f1d5790709","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":262, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"1385643a-0ec8-4f25-9bc7-7ce770ecd73a","blendMode":0,"displayName":"pasteLayer","isLocked":false,"name":"1385643a-0ec8-4f25-9bc7-7ce770ecd73a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"5d4201b0-3c51-4b59-bcde-6d726e214b64","blendMode":0,"displayName":"default","isLocked":false,"name":"5d4201b0-3c51-4b59-bcde-6d726e214b64","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_chainfist_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"weapons_terminator", + "path":"folders/Sprites/Marine Viewer/weapons_terminator.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_chainfist_shadows", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_chainfist_shadows", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":221.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"33dc232c-077a-436b-a8c8-a0f1d5790709","path":"sprites/spr_weapon_chainfist_shadows/spr_weapon_chainfist_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2aca1500-1e46-48ba-8d39-8832199ad865","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14f21d91-8b62-4ba2-8899-49d496bd87a1","path":"sprites/spr_weapon_chainfist_shadows/spr_weapon_chainfist_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ad3078d7-4d64-4c24-b5db-17c175c043d1","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":20, + "yorigin":42, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":221, +} \ No newline at end of file diff --git a/sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy b/sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy index 0e5097c879..a951407ccf 100644 --- a/sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy +++ b/sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_chainfist_small", "bboxMode":0, "bbox_bottom":231, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b72324e5-1184-447b-810f-30d301bb38bd","name":"b72324e5-1184-447b-810f-30d301bb38bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed640cbb-a482-497a-8c41-5bf4ef9883ae","name":"ed640cbb-a482-497a-8c41-5bf4ef9883ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b72324e5-1184-447b-810f-30d301bb38bd","name":"b72324e5-1184-447b-810f-30d301bb38bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed640cbb-a482-497a-8c41-5bf4ef9883ae","name":"ed640cbb-a482-497a-8c41-5bf4ef9883ae","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b72324e5-1184-447b-810f-30d301bb38bd","path":"sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"64a7d678-a244-456b-b317-31f452cd6459","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed640cbb-a482-497a-8c41-5bf4ef9883ae","path":"sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7eb962ec-d2a6-41ba-b53d-b74c98fa6374","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b72324e5-1184-447b-810f-30d301bb38bd","path":"sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"64a7d678-a244-456b-b317-31f452cd6459","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed640cbb-a482-497a-8c41-5bf4ef9883ae","path":"sprites/spr_weapon_chainfist_small/spr_weapon_chainfist_small.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7eb962ec-d2a6-41ba-b53d-b74c98fa6374","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy b/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy index 20751a496b..8d4b35744d 100644 --- a/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy +++ b/sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_chaxe", "bboxMode":0, "bbox_bottom":218, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3c650843-7b9c-42f1-a8b5-86dfe07f4222","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"53399b32-65ae-42fe-aeba-a917fde0dbe8","path":"sprites/spr_weapon_chaxe/spr_weapon_chaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3c650843-7b9c-42f1-a8b5-86dfe07f4222","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_chsword/cf403b7b-a831-4dd7-94fc-490b330d9a3b.png b/sprites/spr_weapon_chsword/cf403b7b-a831-4dd7-94fc-490b330d9a3b.png index 435e10cc68..b56daf11dd 100644 Binary files a/sprites/spr_weapon_chsword/cf403b7b-a831-4dd7-94fc-490b330d9a3b.png and b/sprites/spr_weapon_chsword/cf403b7b-a831-4dd7-94fc-490b330d9a3b.png differ diff --git a/sprites/spr_weapon_chsword/layers/cf403b7b-a831-4dd7-94fc-490b330d9a3b/024d846f-72e0-44e2-890e-84ac065f8b62.png b/sprites/spr_weapon_chsword/layers/cf403b7b-a831-4dd7-94fc-490b330d9a3b/024d846f-72e0-44e2-890e-84ac065f8b62.png index 435e10cc68..1aa5798ae2 100644 Binary files a/sprites/spr_weapon_chsword/layers/cf403b7b-a831-4dd7-94fc-490b330d9a3b/024d846f-72e0-44e2-890e-84ac065f8b62.png and b/sprites/spr_weapon_chsword/layers/cf403b7b-a831-4dd7-94fc-490b330d9a3b/024d846f-72e0-44e2-890e-84ac065f8b62.png differ diff --git a/sprites/spr_weapon_chsword/spr_weapon_chsword.yy b/sprites/spr_weapon_chsword/spr_weapon_chsword.yy index 9b4e4d5827..b6f27b39f0 100644 --- a/sprites/spr_weapon_chsword/spr_weapon_chsword.yy +++ b/sprites/spr_weapon_chsword/spr_weapon_chsword.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_chsword", "bboxMode":0, "bbox_bottom":222, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_weapon_colors/spr_weapon_colors.yy b/sprites/spr_weapon_colors/spr_weapon_colors.yy index bf5dbf26ce..121ad35f6b 100644 --- a/sprites/spr_weapon_colors/spr_weapon_colors.yy +++ b/sprites/spr_weapon_colors/spr_weapon_colors.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_colors", "bboxMode":0, "bbox_bottom":230, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"29c7b8be-ce2a-48e9-b580-b0dec2cc9125","name":"29c7b8be-ce2a-48e9-b580-b0dec2cc9125","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"50502d0a-b361-459e-8c5b-7430a68f0599","name":"50502d0a-b361-459e-8c5b-7430a68f0599","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"8420bbe7-ec74-473b-b6d8-775b6c217447","name":"8420bbe7-ec74-473b-b6d8-775b6c217447","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"29c7b8be-ce2a-48e9-b580-b0dec2cc9125","name":"29c7b8be-ce2a-48e9-b580-b0dec2cc9125","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"50502d0a-b361-459e-8c5b-7430a68f0599","name":"50502d0a-b361-459e-8c5b-7430a68f0599","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8420bbe7-ec74-473b-b6d8-775b6c217447","name":"8420bbe7-ec74-473b-b6d8-775b6c217447","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"29c7b8be-ce2a-48e9-b580-b0dec2cc9125","path":"sprites/spr_weapon_colors/spr_weapon_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e5a82c97-521e-49f1-ae7d-1c6cdc38c3fd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"50502d0a-b361-459e-8c5b-7430a68f0599","path":"sprites/spr_weapon_colors/spr_weapon_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6fbbe5d-1522-44ee-8aeb-a63323355a15","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8420bbe7-ec74-473b-b6d8-775b6c217447","path":"sprites/spr_weapon_colors/spr_weapon_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"41137b6f-df33-45c8-b42e-8e28dd5fd26d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"29c7b8be-ce2a-48e9-b580-b0dec2cc9125","path":"sprites/spr_weapon_colors/spr_weapon_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e5a82c97-521e-49f1-ae7d-1c6cdc38c3fd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"50502d0a-b361-459e-8c5b-7430a68f0599","path":"sprites/spr_weapon_colors/spr_weapon_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6fbbe5d-1522-44ee-8aeb-a63323355a15","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8420bbe7-ec74-473b-b6d8-775b6c217447","path":"sprites/spr_weapon_colors/spr_weapon_colors.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"41137b6f-df33-45c8-b42e-8e28dd5fd26d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy b/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy index dcfc7e4c3d..25f684f289 100644 --- a/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy +++ b/sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_comflamer", "bboxMode":0, "bbox_bottom":214, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7b484c45-0fb4-4a0e-9361-40cc333730bb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_comflamer/spr_weapon_comflamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7b484c45-0fb4-4a0e-9361-40cc333730bb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy b/sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy index c5905aa976..dbae71492f 100644 --- a/sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy +++ b/sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_comgrav", "bboxMode":0, "bbox_bottom":190, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fa3e98b7-e1af-483f-a0e2-4bb9b2eaa6a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_comgrav/spr_weapon_comgrav.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fa3e98b7-e1af-483f-a0e2-4bb9b2eaa6a3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_commelta/spr_weapon_commelta.yy b/sprites/spr_weapon_commelta/spr_weapon_commelta.yy index 6c995b7646..bb1f2b882c 100644 --- a/sprites/spr_weapon_commelta/spr_weapon_commelta.yy +++ b/sprites/spr_weapon_commelta/spr_weapon_commelta.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_commelta", "bboxMode":0, "bbox_bottom":193, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_commelta/spr_weapon_commelta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46d36c12-1869-4661-9233-2359ea03459a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_commelta/spr_weapon_commelta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46d36c12-1869-4661-9233-2359ea03459a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_complas/spr_weapon_complas.yy b/sprites/spr_weapon_complas/spr_weapon_complas.yy index a2d32dd693..823e0f07a0 100644 --- a/sprites/spr_weapon_complas/spr_weapon_complas.yy +++ b/sprites/spr_weapon_complas/spr_weapon_complas.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_complas", "bboxMode":0, "bbox_bottom":188, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_complas/spr_weapon_complas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0e5740de-eb74-4f25-9419-097f6d429f97","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d182e05-2b04-4c1a-8e51-95230a7b0ce0","path":"sprites/spr_weapon_complas/spr_weapon_complas.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0e5740de-eb74-4f25-9419-097f6d429f97","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy b/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy index c7ab92734a..314a1a2410 100644 --- a/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy +++ b/sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_crozarc", "bboxMode":0, "bbox_bottom":216, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ff8f3b8f-e6d3-4ab5-9964-7d942b49dc26","name":"ff8f3b8f-e6d3-4ab5-9964-7d942b49dc26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dc91fe9c-4af9-4355-9a5b-8026131bffcb","name":"dc91fe9c-4af9-4355-9a5b-8026131bffcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ff8f3b8f-e6d3-4ab5-9964-7d942b49dc26","name":"ff8f3b8f-e6d3-4ab5-9964-7d942b49dc26","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dc91fe9c-4af9-4355-9a5b-8026131bffcb","name":"dc91fe9c-4af9-4355-9a5b-8026131bffcb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff8f3b8f-e6d3-4ab5-9964-7d942b49dc26","path":"sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9eab9f74-15b4-456c-8c7c-ae59842340a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc91fe9c-4af9-4355-9a5b-8026131bffcb","path":"sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"24773002-9e70-4bb6-8e4e-25af34700cd4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff8f3b8f-e6d3-4ab5-9964-7d942b49dc26","path":"sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9eab9f74-15b4-456c-8c7c-ae59842340a8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dc91fe9c-4af9-4355-9a5b-8026131bffcb","path":"sprites/spr_weapon_crozarc/spr_weapon_crozarc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"24773002-9e70-4bb6-8e4e-25af34700cd4","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_cthon_autocannon/aa914076-5f16-4d9a-8ffd-af365eab523c.png b/sprites/spr_weapon_cthon_autocannon/aa914076-5f16-4d9a-8ffd-af365eab523c.png new file mode 100644 index 0000000000..6b44754be7 Binary files /dev/null and b/sprites/spr_weapon_cthon_autocannon/aa914076-5f16-4d9a-8ffd-af365eab523c.png differ diff --git a/sprites/spr_weapon_cthon_autocannon/layers/aa914076-5f16-4d9a-8ffd-af365eab523c/9b762d64-5050-4c57-83db-1af2276db342.png b/sprites/spr_weapon_cthon_autocannon/layers/aa914076-5f16-4d9a-8ffd-af365eab523c/9b762d64-5050-4c57-83db-1af2276db342.png new file mode 100644 index 0000000000..6b44754be7 Binary files /dev/null and b/sprites/spr_weapon_cthon_autocannon/layers/aa914076-5f16-4d9a-8ffd-af365eab523c/9b762d64-5050-4c57-83db-1af2276db342.png differ diff --git a/sprites/spr_weapon_cthon_autocannon/spr_weapon_cthon_autocannon.yy b/sprites/spr_weapon_cthon_autocannon/spr_weapon_cthon_autocannon.yy new file mode 100644 index 0000000000..1281dba072 --- /dev/null +++ b/sprites/spr_weapon_cthon_autocannon/spr_weapon_cthon_autocannon.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_cthon_autocannon", + "bboxMode":0, + "bbox_bottom":195, + "bbox_left":52, + "bbox_right":300, + "bbox_top":89, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"aa914076-5f16-4d9a-8ffd-af365eab523c","name":"aa914076-5f16-4d9a-8ffd-af365eab523c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":272, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"9b762d64-5050-4c57-83db-1af2276db342","blendMode":0,"displayName":"default","isLocked":false,"name":"9b762d64-5050-4c57-83db-1af2276db342","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_cthon_autocannon", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"heavy_ranged", + "path":"folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_cthon_autocannon", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_cthon_autocannon", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":301.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"aa914076-5f16-4d9a-8ffd-af365eab523c","path":"sprites/spr_weapon_cthon_autocannon/spr_weapon_cthon_autocannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"00b42439-99d9-4f31-9d0d-55a01f286dcb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":39, + "yorigin":21, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":301, +} \ No newline at end of file diff --git a/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy b/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy index 9cea05b3ce..511a4b8061 100644 --- a/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy +++ b/sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_eldsword", "bboxMode":0, "bbox_bottom":211, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"75b84618-33d2-48de-be45-cbf2383a7323","name":"75b84618-33d2-48de-be45-cbf2383a7323","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"27510bd8-a89a-4cd8-abc9-d39b1f92f0ff","name":"27510bd8-a89a-4cd8-abc9-d39b1f92f0ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"75b84618-33d2-48de-be45-cbf2383a7323","name":"75b84618-33d2-48de-be45-cbf2383a7323","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"27510bd8-a89a-4cd8-abc9-d39b1f92f0ff","name":"27510bd8-a89a-4cd8-abc9-d39b1f92f0ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"75b84618-33d2-48de-be45-cbf2383a7323","path":"sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"15ac1141-71a9-490d-ab55-2df178b0cd36","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"27510bd8-a89a-4cd8-abc9-d39b1f92f0ff","path":"sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0cdb8b25-52a3-4a26-8d12-8518e68d6995","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"75b84618-33d2-48de-be45-cbf2383a7323","path":"sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"15ac1141-71a9-490d-ab55-2df178b0cd36","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"27510bd8-a89a-4cd8-abc9-d39b1f92f0ff","path":"sprites/spr_weapon_eldsword/spr_weapon_eldsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0cdb8b25-52a3-4a26-8d12-8518e68d6995","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_evisc/774b09dd-5c0c-4e15-8357-7f2df7fe94b8.png b/sprites/spr_weapon_evisc/774b09dd-5c0c-4e15-8357-7f2df7fe94b8.png index 9bfcf6ec87..79f5f58006 100644 Binary files a/sprites/spr_weapon_evisc/774b09dd-5c0c-4e15-8357-7f2df7fe94b8.png and b/sprites/spr_weapon_evisc/774b09dd-5c0c-4e15-8357-7f2df7fe94b8.png differ diff --git a/sprites/spr_weapon_evisc/f1061812-3385-46d3-abc9-570c9b907700.png b/sprites/spr_weapon_evisc/f1061812-3385-46d3-abc9-570c9b907700.png index dd1d037c7d..da537e546d 100644 Binary files a/sprites/spr_weapon_evisc/f1061812-3385-46d3-abc9-570c9b907700.png and b/sprites/spr_weapon_evisc/f1061812-3385-46d3-abc9-570c9b907700.png differ diff --git a/sprites/spr_weapon_evisc/layers/774b09dd-5c0c-4e15-8357-7f2df7fe94b8/0273a489-1892-4cb4-834b-31fe10ec8fdf.png b/sprites/spr_weapon_evisc/layers/774b09dd-5c0c-4e15-8357-7f2df7fe94b8/0273a489-1892-4cb4-834b-31fe10ec8fdf.png index c714b2327d..eaed65a346 100644 Binary files a/sprites/spr_weapon_evisc/layers/774b09dd-5c0c-4e15-8357-7f2df7fe94b8/0273a489-1892-4cb4-834b-31fe10ec8fdf.png and b/sprites/spr_weapon_evisc/layers/774b09dd-5c0c-4e15-8357-7f2df7fe94b8/0273a489-1892-4cb4-834b-31fe10ec8fdf.png differ diff --git a/sprites/spr_weapon_evisc/layers/774b09dd-5c0c-4e15-8357-7f2df7fe94b8/e92b3c07-a0af-494a-b9d9-c49cd5efb952.png b/sprites/spr_weapon_evisc/layers/774b09dd-5c0c-4e15-8357-7f2df7fe94b8/e92b3c07-a0af-494a-b9d9-c49cd5efb952.png index 09ea76c3d7..fc4a3c61a1 100644 Binary files a/sprites/spr_weapon_evisc/layers/774b09dd-5c0c-4e15-8357-7f2df7fe94b8/e92b3c07-a0af-494a-b9d9-c49cd5efb952.png and b/sprites/spr_weapon_evisc/layers/774b09dd-5c0c-4e15-8357-7f2df7fe94b8/e92b3c07-a0af-494a-b9d9-c49cd5efb952.png differ diff --git a/sprites/spr_weapon_evisc/layers/f1061812-3385-46d3-abc9-570c9b907700/0273a489-1892-4cb4-834b-31fe10ec8fdf.png b/sprites/spr_weapon_evisc/layers/f1061812-3385-46d3-abc9-570c9b907700/0273a489-1892-4cb4-834b-31fe10ec8fdf.png index d0d9f46c8c..92b1a7a45b 100644 Binary files a/sprites/spr_weapon_evisc/layers/f1061812-3385-46d3-abc9-570c9b907700/0273a489-1892-4cb4-834b-31fe10ec8fdf.png and b/sprites/spr_weapon_evisc/layers/f1061812-3385-46d3-abc9-570c9b907700/0273a489-1892-4cb4-834b-31fe10ec8fdf.png differ diff --git a/sprites/spr_weapon_evisc/layers/f1061812-3385-46d3-abc9-570c9b907700/e92b3c07-a0af-494a-b9d9-c49cd5efb952.png b/sprites/spr_weapon_evisc/layers/f1061812-3385-46d3-abc9-570c9b907700/e92b3c07-a0af-494a-b9d9-c49cd5efb952.png index 9c69c0a268..64c68aefcf 100644 Binary files a/sprites/spr_weapon_evisc/layers/f1061812-3385-46d3-abc9-570c9b907700/e92b3c07-a0af-494a-b9d9-c49cd5efb952.png and b/sprites/spr_weapon_evisc/layers/f1061812-3385-46d3-abc9-570c9b907700/e92b3c07-a0af-494a-b9d9-c49cd5efb952.png differ diff --git a/sprites/spr_weapon_evisc/spr_weapon_evisc.yy b/sprites/spr_weapon_evisc/spr_weapon_evisc.yy index a31d464f18..ee557b4f32 100644 --- a/sprites/spr_weapon_evisc/spr_weapon_evisc.yy +++ b/sprites/spr_weapon_evisc/spr_weapon_evisc.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_evisc", "bboxMode":0, "bbox_bottom":271, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"774b09dd-5c0c-4e15-8357-7f2df7fe94b8","name":"774b09dd-5c0c-4e15-8357-7f2df7fe94b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f1061812-3385-46d3-abc9-570c9b907700","name":"f1061812-3385-46d3-abc9-570c9b907700","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"774b09dd-5c0c-4e15-8357-7f2df7fe94b8","name":"774b09dd-5c0c-4e15-8357-7f2df7fe94b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f1061812-3385-46d3-abc9-570c9b907700","name":"f1061812-3385-46d3-abc9-570c9b907700","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -65,6 +65,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":187.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_weapon_flamer/spr_weapon_flamer.yy b/sprites/spr_weapon_flamer/spr_weapon_flamer.yy index f64483d9eb..418f7970ab 100644 --- a/sprites/spr_weapon_flamer/spr_weapon_flamer.yy +++ b/sprites/spr_weapon_flamer/spr_weapon_flamer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_flamer", "bboxMode":0, "bbox_bottom":217, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","path":"sprites/spr_weapon_flamer/spr_weapon_flamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"51e2ff14-868a-47ef-a428-a84bd622c9df","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"64e8679b-d5d0-4274-a174-32724ce1f8ec","path":"sprites/spr_weapon_flamer/spr_weapon_flamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"51e2ff14-868a-47ef-a428-a84bd622c9df","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_frcaxe/7e323b40-4d75-4c0f-9c71-ade5cce4038e.png b/sprites/spr_weapon_frcaxe/7e323b40-4d75-4c0f-9c71-ade5cce4038e.png new file mode 100644 index 0000000000..9dec60d31e Binary files /dev/null and b/sprites/spr_weapon_frcaxe/7e323b40-4d75-4c0f-9c71-ade5cce4038e.png differ diff --git a/sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/ea93f36a-f600-49c5-852d-94e130eda274.png b/sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/ea93f36a-f600-49c5-852d-94e130eda274.png new file mode 100644 index 0000000000..9dec60d31e Binary files /dev/null and b/sprites/spr_weapon_frcaxe/layers/7e323b40-4d75-4c0f-9c71-ade5cce4038e/ea93f36a-f600-49c5-852d-94e130eda274.png differ diff --git a/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy b/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy new file mode 100644 index 0000000000..b3fc93c629 --- /dev/null +++ b/sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy @@ -0,0 +1,90 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_frcaxe", + "bboxMode":0, + "bbox_bottom":220, + "bbox_left":0, + "bbox_right":83, + "bbox_top":67, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"ea93f36a-f600-49c5-852d-94e130eda274","blendMode":0,"displayName":"default","isLocked":false,"name":"ea93f36a-f600-49c5-852d-94e130eda274","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_frcaxe", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"melee", + "path":"folders/Sprites/Marine Viewer/weapons/melee.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_frcaxe", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_frcaxe", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7e323b40-4d75-4c0f-9c71-ade5cce4038e","path":"sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d1cbf5d8-ad42-4a35-b45b-c36bbcb08988","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":7, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy b/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy index 0379a1a5f3..2b559c4f6c 100644 --- a/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy +++ b/sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_frcstaff", "bboxMode":0, "bbox_bottom":271, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","name":"a09fc4ff-b696-45c3-b5ae-6b73250622a7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_weapon_frcsword/b38dc224-c08d-42f1-9f78-d517a6dc7b0d.png b/sprites/spr_weapon_frcsword/b38dc224-c08d-42f1-9f78-d517a6dc7b0d.png new file mode 100644 index 0000000000..8ed5bfb370 Binary files /dev/null and b/sprites/spr_weapon_frcsword/b38dc224-c08d-42f1-9f78-d517a6dc7b0d.png differ diff --git a/sprites/spr_weapon_frcsword/layers/b38dc224-c08d-42f1-9f78-d517a6dc7b0d/956e8d0a-af47-4b63-b116-fea81d656413.png b/sprites/spr_weapon_frcsword/layers/b38dc224-c08d-42f1-9f78-d517a6dc7b0d/956e8d0a-af47-4b63-b116-fea81d656413.png new file mode 100644 index 0000000000..8ed5bfb370 Binary files /dev/null and b/sprites/spr_weapon_frcsword/layers/b38dc224-c08d-42f1-9f78-d517a6dc7b0d/956e8d0a-af47-4b63-b116-fea81d656413.png differ diff --git a/sprites/spr_weapon_frcsword/spr_weapon_frcsword.yy b/sprites/spr_weapon_frcsword/spr_weapon_frcsword.yy new file mode 100644 index 0000000000..4b6b9eb3a5 --- /dev/null +++ b/sprites/spr_weapon_frcsword/spr_weapon_frcsword.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_frcsword", + "bboxMode":0, + "bbox_bottom":222, + "bbox_left":20, + "bbox_right":59, + "bbox_top":59, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b38dc224-c08d-42f1-9f78-d517a6dc7b0d","name":"b38dc224-c08d-42f1-9f78-d517a6dc7b0d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"956e8d0a-af47-4b63-b116-fea81d656413","blendMode":0,"displayName":"default","isLocked":false,"name":"956e8d0a-af47-4b63-b116-fea81d656413","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_frcsword", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"melee", + "path":"folders/Sprites/Marine Viewer/weapons/melee.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_frcsword", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_frcsword", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b38dc224-c08d-42f1-9f78-d517a6dc7b0d","path":"sprites/spr_weapon_frcsword/spr_weapon_frcsword.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e37fa24f-c0ad-482b-ae93-ea01da41025e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_grav_cannon/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be.png b/sprites/spr_weapon_grav_cannon/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be.png index 7718a4de25..bf51f1fbd1 100644 Binary files a/sprites/spr_weapon_grav_cannon/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be.png and b/sprites/spr_weapon_grav_cannon/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be.png differ diff --git a/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/1300598b-ffe2-4a1c-a7c8-7db8b3078acf.png b/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/1300598b-ffe2-4a1c-a7c8-7db8b3078acf.png index 269cff4b95..5394afc610 100644 Binary files a/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/1300598b-ffe2-4a1c-a7c8-7db8b3078acf.png and b/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/1300598b-ffe2-4a1c-a7c8-7db8b3078acf.png differ diff --git a/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/234b02f3-1afc-4539-ad33-93955d6e0288.png b/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/234b02f3-1afc-4539-ad33-93955d6e0288.png new file mode 100644 index 0000000000..efc82ffa18 Binary files /dev/null and b/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/234b02f3-1afc-4539-ad33-93955d6e0288.png differ diff --git a/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/4c68dd2d-a1e6-4382-b7bf-d242a78c6b49.png b/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/4c68dd2d-a1e6-4382-b7bf-d242a78c6b49.png deleted file mode 100644 index fae7a115a2..0000000000 Binary files a/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/4c68dd2d-a1e6-4382-b7bf-d242a78c6b49.png and /dev/null differ diff --git a/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/a14db8e2-fda1-4cbf-99ab-1f40858bdedd.png b/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/a14db8e2-fda1-4cbf-99ab-1f40858bdedd.png new file mode 100644 index 0000000000..1b7c35222a Binary files /dev/null and b/sprites/spr_weapon_grav_cannon/layers/cbb0ffd1-9108-4578-8690-2b8c6fc3c0be/a14db8e2-fda1-4cbf-99ab-1f40858bdedd.png differ diff --git a/sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy b/sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy index 7eb98f4919..851543cd8a 100644 --- a/sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy +++ b/sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy @@ -1,25 +1,26 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_grav_cannon", "bboxMode":0, "bbox_bottom":173, "bbox_left":33, "bbox_right":226, - "bbox_top":55, + "bbox_top":58, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":232, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"4c68dd2d-a1e6-4382-b7bf-d242a78c6b49","blendMode":0,"displayName":"pasteLayer","isLocked":false,"name":"4c68dd2d-a1e6-4382-b7bf-d242a78c6b49","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"a14db8e2-fda1-4cbf-99ab-1f40858bdedd","blendMode":0,"displayName":"pasteLayer","isLocked":false,"name":"a14db8e2-fda1-4cbf-99ab-1f40858bdedd","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"234b02f3-1afc-4539-ad33-93955d6e0288","blendMode":0,"displayName":"pasteLayer","isLocked":false,"name":"234b02f3-1afc-4539-ad33-93955d6e0288","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, {"$GMImageLayer":"","%Name":"1300598b-ffe2-4a1c-a7c8-7db8b3078acf","blendMode":0,"displayName":"default","isLocked":false,"name":"1300598b-ffe2-4a1c-a7c8-7db8b3078acf","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"spr_weapon_grav_cannon", @@ -64,14 +65,14 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":227.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ae74c7da-b7f7-4015-941e-562f4bc25c9a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cbb0ffd1-9108-4578-8690-2b8c6fc3c0be","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ae74c7da-b7f7-4015-941e-562f4bc25c9a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy b/sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy index 5e18270c50..f4501210ce 100644 --- a/sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy +++ b/sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_grav_gun", "bboxMode":0, "bbox_bottom":213, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","path":"sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"be6c4d78-c251-45e2-8172-2dc6160772eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d2fab1ed-1a51-46c1-b8ed-f95498960735","path":"sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"be6c4d78-c251-45e2-8172-2dc6160772eb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy b/sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy index 6f4ca9aeae..6f4e55081e 100644 --- a/sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy +++ b/sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_grav_pistol", "bboxMode":0, "bbox_bottom":166, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","path":"sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"020a30d9-3988-4c55-91ae-54f299601401","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","path":"sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"020a30d9-3988-4c55-91ae-54f299601401","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy b/sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy index f11fb5b43f..13ec0a9846 100644 --- a/sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy +++ b/sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_hand_flamer", "bboxMode":0, "bbox_bottom":178, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -87,9 +81,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","path":"sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b33db15d-4ea7-4f57-85fd-d001d7688cfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d11b11a-02d6-47f8-87c7-87206d0c9588","path":"sprites/spr_weapon_hand_flamer/spr_weapon_hand_flamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b33db15d-4ea7-4f57-85fd-d001d7688cfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy b/sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy index 5290d28052..50ceca4194 100644 --- a/sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy +++ b/sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_hbolt", "bboxMode":0, "bbox_bottom":133, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ed216edf-c023-4a02-94fb-993a99341d45","name":"ed216edf-c023-4a02-94fb-993a99341d45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed216edf-c023-4a02-94fb-993a99341d45","name":"ed216edf-c023-4a02-94fb-993a99341d45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed216edf-c023-4a02-94fb-993a99341d45","path":"sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"35c065d1-b902-4e0f-857d-f95192fa3239","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed216edf-c023-4a02-94fb-993a99341d45","path":"sprites/spr_weapon_hbolt/spr_weapon_hbolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"35c065d1-b902-4e0f-857d-f95192fa3239","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy b/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy index 03211ae8d9..59fb59583e 100644 --- a/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy +++ b/sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_hflamer", "bboxMode":0, "bbox_bottom":136, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f0be8474-9bc1-498a-b91d-326ea3104fd1","name":"f0be8474-9bc1-498a-b91d-326ea3104fd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0be8474-9bc1-498a-b91d-326ea3104fd1","name":"f0be8474-9bc1-498a-b91d-326ea3104fd1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,9 +71,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0be8474-9bc1-498a-b91d-326ea3104fd1","path":"sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ecc17719-e804-4983-9e75-9919e5f62d17","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0be8474-9bc1-498a-b91d-326ea3104fd1","path":"sprites/spr_weapon_hflamer/spr_weapon_hflamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ecc17719-e804-4983-9e75-9919e5f62d17","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy b/sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy index 338cf648b7..812f104ca4 100644 --- a/sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy +++ b/sprites/spr_weapon_hflamer_term/spr_weapon_hflamer_term.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_hflamer_term", "bboxMode":0, "bbox_bottom":194, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3458bbca-83b5-4d11-82fc-4c5ec0ec0153","name":"3458bbca-83b5-4d11-82fc-4c5ec0ec0153","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3458bbca-83b5-4d11-82fc-4c5ec0ec0153","name":"3458bbca-83b5-4d11-82fc-4c5ec0ec0153","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,8 +81,8 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":27, - "yorigin":38, + "xorigin":20, + "yorigin":30, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy b/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy index 451edf57cf..41e972b387 100644 --- a/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy +++ b/sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_hthhammer", "bboxMode":0, "bbox_bottom":162, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2a817a4a-7cab-4ff8-88f6-251cd37fca3a","name":"2a817a4a-7cab-4ff8-88f6-251cd37fca3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"68979b3b-c9d1-41ce-aac2-210269b23c45","name":"68979b3b-c9d1-41ce-aac2-210269b23c45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2a817a4a-7cab-4ff8-88f6-251cd37fca3a","name":"2a817a4a-7cab-4ff8-88f6-251cd37fca3a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"68979b3b-c9d1-41ce-aac2-210269b23c45","name":"68979b3b-c9d1-41ce-aac2-210269b23c45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a817a4a-7cab-4ff8-88f6-251cd37fca3a","path":"sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0926682d-beb3-42a1-b68c-fa3b9bb08a8a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"68979b3b-c9d1-41ce-aac2-210269b23c45","path":"sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fd4cffd8-3ff0-40de-8f00-829015b1349a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2a817a4a-7cab-4ff8-88f6-251cd37fca3a","path":"sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0926682d-beb3-42a1-b68c-fa3b9bb08a8a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"68979b3b-c9d1-41ce-aac2-210269b23c45","path":"sprites/spr_weapon_hthhammer/spr_weapon_hthhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fd4cffd8-3ff0-40de-8f00-829015b1349a","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_inferno/spr_weapon_inferno.yy b/sprites/spr_weapon_inferno/spr_weapon_inferno.yy index 176d41e34b..5462bbcfff 100644 --- a/sprites/spr_weapon_inferno/spr_weapon_inferno.yy +++ b/sprites/spr_weapon_inferno/spr_weapon_inferno.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_inferno", "bboxMode":0, "bbox_bottom":172, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f788d341-e281-426b-99a8-576cdbb660ce","name":"f788d341-e281-426b-99a8-576cdbb660ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f788d341-e281-426b-99a8-576cdbb660ce","name":"f788d341-e281-426b-99a8-576cdbb660ce","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f788d341-e281-426b-99a8-576cdbb660ce","path":"sprites/spr_weapon_inferno/spr_weapon_inferno.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f3ad698-f0ed-487e-b9f1-ad0c95f7d469","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f788d341-e281-426b-99a8-576cdbb660ce","path":"sprites/spr_weapon_inferno/spr_weapon_inferno.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f3ad698-f0ed-487e-b9f1-ad0c95f7d469","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_infernus_hbolt/spr_weapon_infernus_hbolt.yy b/sprites/spr_weapon_infernus_hbolt/spr_weapon_infernus_hbolt.yy index e553ddff29..5febc28d4d 100644 --- a/sprites/spr_weapon_infernus_hbolt/spr_weapon_infernus_hbolt.yy +++ b/sprites/spr_weapon_infernus_hbolt/spr_weapon_infernus_hbolt.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_infernus_hbolt", "bboxMode":0, "bbox_bottom":147, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b8951bd7-5548-4acb-82c8-16e78b0f5610","name":"b8951bd7-5548-4acb-82c8-16e78b0f5610","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b8951bd7-5548-4acb-82c8-16e78b0f5610","name":"b8951bd7-5548-4acb-82c8-16e78b0f5610","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -33,13 +33,7 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], + "tileMode":[0,0,0,0,0,], "top":0, }, "origin":0, @@ -89,9 +83,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b8951bd7-5548-4acb-82c8-16e78b0f5610","path":"sprites/spr_weapon_infernus_hbolt/spr_weapon_infernus_hbolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"46fa86a2-155a-4eb6-bf8f-4e12804bbb94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b8951bd7-5548-4acb-82c8-16e78b0f5610","path":"sprites/spr_weapon_infernus_hbolt/spr_weapon_infernus_hbolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"46fa86a2-155a-4eb6-bf8f-4e12804bbb94","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_knife/spr_weapon_knife.yy b/sprites/spr_weapon_knife/spr_weapon_knife.yy index b8599a09ea..601bc88326 100644 --- a/sprites/spr_weapon_knife/spr_weapon_knife.yy +++ b/sprites/spr_weapon_knife/spr_weapon_knife.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_knife", "bboxMode":0, "bbox_bottom":164, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","path":"sprites/spr_weapon_knife/spr_weapon_knife.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"aa85f45a-777f-4198-a19d-33ec37678e1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c5c496b3-8d87-42ea-9625-89bf253c33d0","path":"sprites/spr_weapon_knife/spr_weapon_knife.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"aa85f45a-777f-4198-a19d-33ec37678e1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_lasca/spr_weapon_lasca.yy b/sprites/spr_weapon_lasca/spr_weapon_lasca.yy index 4abcf0081c..f972e9f4a1 100644 --- a/sprites/spr_weapon_lasca/spr_weapon_lasca.yy +++ b/sprites/spr_weapon_lasca/spr_weapon_lasca.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_lasca", "bboxMode":0, "bbox_bottom":119, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c9a5a357-3cfc-4c90-b844-56ac38b0e0ff","name":"c9a5a357-3cfc-4c90-b844-56ac38b0e0ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9a5a357-3cfc-4c90-b844-56ac38b0e0ff","name":"c9a5a357-3cfc-4c90-b844-56ac38b0e0ff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9a5a357-3cfc-4c90-b844-56ac38b0e0ff","path":"sprites/spr_weapon_lasca/spr_weapon_lasca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6e0e1e3-52cb-44dc-a20f-6be1ae1d90b8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9a5a357-3cfc-4c90-b844-56ac38b0e0ff","path":"sprites/spr_weapon_lasca/spr_weapon_lasca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6e0e1e3-52cb-44dc-a20f-6be1ae1d90b8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy b/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy index 8a68f8e1b7..4493002092 100644 --- a/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy +++ b/sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_lightning1", "bboxMode":0, "bbox_bottom":192, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b1c6a391-2103-4634-8d8d-639c44dfdc61","name":"b1c6a391-2103-4634-8d8d-639c44dfdc61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1ded3c78-16a8-4653-a48b-3dc1b2e1e824","name":"1ded3c78-16a8-4653-a48b-3dc1b2e1e824","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1c6a391-2103-4634-8d8d-639c44dfdc61","name":"b1c6a391-2103-4634-8d8d-639c44dfdc61","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1ded3c78-16a8-4653-a48b-3dc1b2e1e824","name":"1ded3c78-16a8-4653-a48b-3dc1b2e1e824","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1c6a391-2103-4634-8d8d-639c44dfdc61","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c502156f-5600-4fd7-b57c-dbad9c3b4c1c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ded3c78-16a8-4653-a48b-3dc1b2e1e824","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f24b1116-c8d7-44b5-b845-94444938cf9c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1c6a391-2103-4634-8d8d-639c44dfdc61","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c502156f-5600-4fd7-b57c-dbad9c3b4c1c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1ded3c78-16a8-4653-a48b-3dc1b2e1e824","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f24b1116-c8d7-44b5-b845-94444938cf9c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_lightning2/c9653695-b70a-4b29-8291-cce821c9115f.png b/sprites/spr_weapon_lightning2/c9653695-b70a-4b29-8291-cce821c9115f.png index c8ac60919a..b7eef51075 100644 Binary files a/sprites/spr_weapon_lightning2/c9653695-b70a-4b29-8291-cce821c9115f.png and b/sprites/spr_weapon_lightning2/c9653695-b70a-4b29-8291-cce821c9115f.png differ diff --git a/sprites/spr_weapon_lightning2/layers/c9653695-b70a-4b29-8291-cce821c9115f/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png b/sprites/spr_weapon_lightning2/layers/c9653695-b70a-4b29-8291-cce821c9115f/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png index c8ac60919a..b7eef51075 100644 Binary files a/sprites/spr_weapon_lightning2/layers/c9653695-b70a-4b29-8291-cce821c9115f/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png and b/sprites/spr_weapon_lightning2/layers/c9653695-b70a-4b29-8291-cce821c9115f/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png differ diff --git a/sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy b/sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy index f356ab3ae9..d8171a60fe 100644 --- a/sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy +++ b/sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_lightning2", "bboxMode":0, "bbox_bottom":213, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c9653695-b70a-4b29-8291-cce821c9115f","name":"c9653695-b70a-4b29-8291-cce821c9115f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9653695-b70a-4b29-8291-cce821c9115f","name":"c9653695-b70a-4b29-8291-cce821c9115f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":221.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -79,7 +81,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":27, + "xorigin":20, "yorigin":42, }, "swatchColours":null, diff --git a/sprites/spr_weapon_lightning2_shadows/3b7f909d-5ebb-4c2b-b818-ed5cf4504109.png b/sprites/spr_weapon_lightning2_shadows/3b7f909d-5ebb-4c2b-b818-ed5cf4504109.png new file mode 100644 index 0000000000..d538c8be52 Binary files /dev/null and b/sprites/spr_weapon_lightning2_shadows/3b7f909d-5ebb-4c2b-b818-ed5cf4504109.png differ diff --git a/sprites/spr_weapon_lightning2_shadows/c9653695-b70a-4b29-8291-cce821c9115f.png b/sprites/spr_weapon_lightning2_shadows/c9653695-b70a-4b29-8291-cce821c9115f.png new file mode 100644 index 0000000000..3ad753a6dd Binary files /dev/null and b/sprites/spr_weapon_lightning2_shadows/c9653695-b70a-4b29-8291-cce821c9115f.png differ diff --git a/sprites/spr_weapon_lightning2_shadows/layers/3b7f909d-5ebb-4c2b-b818-ed5cf4504109/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png b/sprites/spr_weapon_lightning2_shadows/layers/3b7f909d-5ebb-4c2b-b818-ed5cf4504109/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png new file mode 100644 index 0000000000..d538c8be52 Binary files /dev/null and b/sprites/spr_weapon_lightning2_shadows/layers/3b7f909d-5ebb-4c2b-b818-ed5cf4504109/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png differ diff --git a/sprites/spr_weapon_lightning2_shadows/layers/c9653695-b70a-4b29-8291-cce821c9115f/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png b/sprites/spr_weapon_lightning2_shadows/layers/c9653695-b70a-4b29-8291-cce821c9115f/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png new file mode 100644 index 0000000000..3ad753a6dd Binary files /dev/null and b/sprites/spr_weapon_lightning2_shadows/layers/c9653695-b70a-4b29-8291-cce821c9115f/6b78fafc-510d-4b93-90fa-40d14bd3c0ce.png differ diff --git a/sprites/spr_weapon_lightning2_shadows/spr_weapon_lightning2_shadows.yy b/sprites/spr_weapon_lightning2_shadows/spr_weapon_lightning2_shadows.yy new file mode 100644 index 0000000000..74db098007 --- /dev/null +++ b/sprites/spr_weapon_lightning2_shadows/spr_weapon_lightning2_shadows.yy @@ -0,0 +1,96 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_lightning2_shadows", + "bboxMode":0, + "bbox_bottom":213, + "bbox_left":18, + "bbox_right":202, + "bbox_top":118, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"c9653695-b70a-4b29-8291-cce821c9115f","name":"c9653695-b70a-4b29-8291-cce821c9115f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":262, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"6b78fafc-510d-4b93-90fa-40d14bd3c0ce","blendMode":0,"displayName":"default","isLocked":false,"name":"6b78fafc-510d-4b93-90fa-40d14bd3c0ce","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_lightning2_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"weapons_terminator", + "path":"folders/Sprites/Marine Viewer/weapons_terminator.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_lightning2_shadows", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_lightning2_shadows", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":221.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9653695-b70a-4b29-8291-cce821c9115f","path":"sprites/spr_weapon_lightning2_shadows/spr_weapon_lightning2_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0986b23f-598a-4bf0-b8a2-77a37ff8a0f2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3b7f909d-5ebb-4c2b-b818-ed5cf4504109","path":"sprites/spr_weapon_lightning2_shadows/spr_weapon_lightning2_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"55509048-bb06-4c81-8f41-961cde83eacc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":20, + "yorigin":42, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":221, +} \ No newline at end of file diff --git a/sprites/spr_weapon_mace_of_absolution/630e8d95-baaa-4950-8761-35b8ccf4848c.png b/sprites/spr_weapon_mace_of_absolution/630e8d95-baaa-4950-8761-35b8ccf4848c.png index 6d60690ea2..782831f20c 100644 Binary files a/sprites/spr_weapon_mace_of_absolution/630e8d95-baaa-4950-8761-35b8ccf4848c.png and b/sprites/spr_weapon_mace_of_absolution/630e8d95-baaa-4950-8761-35b8ccf4848c.png differ diff --git a/sprites/spr_weapon_mace_of_absolution/layers/630e8d95-baaa-4950-8761-35b8ccf4848c/a09831c3-3081-40fc-8d7d-4b4f2da95434.png b/sprites/spr_weapon_mace_of_absolution/layers/630e8d95-baaa-4950-8761-35b8ccf4848c/a09831c3-3081-40fc-8d7d-4b4f2da95434.png new file mode 100644 index 0000000000..782831f20c Binary files /dev/null and b/sprites/spr_weapon_mace_of_absolution/layers/630e8d95-baaa-4950-8761-35b8ccf4848c/a09831c3-3081-40fc-8d7d-4b4f2da95434.png differ diff --git a/sprites/spr_weapon_mace_of_absolution/layers/630e8d95-baaa-4950-8761-35b8ccf4848c/dd5c4d52-a4e9-4e96-b0f6-3da408ee2ec1.png b/sprites/spr_weapon_mace_of_absolution/layers/630e8d95-baaa-4950-8761-35b8ccf4848c/dd5c4d52-a4e9-4e96-b0f6-3da408ee2ec1.png deleted file mode 100644 index 6d60690ea2..0000000000 Binary files a/sprites/spr_weapon_mace_of_absolution/layers/630e8d95-baaa-4950-8761-35b8ccf4848c/dd5c4d52-a4e9-4e96-b0f6-3da408ee2ec1.png and /dev/null differ diff --git a/sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy b/sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy index 7af2a30023..20baa9fddd 100644 --- a/sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy +++ b/sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy @@ -1,25 +1,25 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_mace_of_absolution", "bboxMode":0, - "bbox_bottom":261, - "bbox_left":13, - "bbox_right":75, - "bbox_top":103, + "bbox_bottom":256, + "bbox_left":27, + "bbox_right":87, + "bbox_top":91, "collisionKind":1, "collisionTolerance":0, "DynamicTexturePage":false, "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"630e8d95-baaa-4950-8761-35b8ccf4848c","name":"630e8d95-baaa-4950-8761-35b8ccf4848c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"630e8d95-baaa-4950-8761-35b8ccf4848c","name":"630e8d95-baaa-4950-8761-35b8ccf4848c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, "height":262, "HTile":false, "layers":[ - {"$GMImageLayer":"","%Name":"dd5c4d52-a4e9-4e96-b0f6-3da408ee2ec1","blendMode":0,"displayName":"default","isLocked":false,"name":"dd5c4d52-a4e9-4e96-b0f6-3da408ee2ec1","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"a09831c3-3081-40fc-8d7d-4b4f2da95434","blendMode":0,"displayName":"default","isLocked":false,"name":"a09831c3-3081-40fc-8d7d-4b4f2da95434","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], "name":"spr_weapon_mace_of_absolution", "nineSlice":null, @@ -63,20 +63,20 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"630e8d95-baaa-4950-8761-35b8ccf4848c","path":"sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"03644e7c-f6ca-4447-91f5-b7c7c2d15ce1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"630e8d95-baaa-4950-8761-35b8ccf4848c","path":"sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"03644e7c-f6ca-4447-91f5-b7c7c2d15ce1","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, "volume":1.0, "xorigin":7, - "yorigin":30, + "yorigin":20, }, "swatchColours":null, "swfPrecision":2.525, diff --git a/sprites/spr_weapon_mars_hbolt/98934121-510d-447a-ad2c-d09856d6ea01.png b/sprites/spr_weapon_mars_hbolt/98934121-510d-447a-ad2c-d09856d6ea01.png new file mode 100644 index 0000000000..1fa17157f5 Binary files /dev/null and b/sprites/spr_weapon_mars_hbolt/98934121-510d-447a-ad2c-d09856d6ea01.png differ diff --git a/sprites/spr_weapon_mars_hbolt/layers/98934121-510d-447a-ad2c-d09856d6ea01/f8d667c7-b860-44f8-8273-9a2e330a1b8e.png b/sprites/spr_weapon_mars_hbolt/layers/98934121-510d-447a-ad2c-d09856d6ea01/f8d667c7-b860-44f8-8273-9a2e330a1b8e.png new file mode 100644 index 0000000000..c9a37497c3 Binary files /dev/null and b/sprites/spr_weapon_mars_hbolt/layers/98934121-510d-447a-ad2c-d09856d6ea01/f8d667c7-b860-44f8-8273-9a2e330a1b8e.png differ diff --git a/sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy b/sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy new file mode 100644 index 0000000000..f3160cd532 --- /dev/null +++ b/sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_mars_hbolt", + "bboxMode":0, + "bbox_bottom":210, + "bbox_left":64, + "bbox_right":220, + "bbox_top":96, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"98934121-510d-447a-ad2c-d09856d6ea01","name":"98934121-510d-447a-ad2c-d09856d6ea01","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":272, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"f8d667c7-b860-44f8-8273-9a2e330a1b8e","blendMode":0,"displayName":"default","isLocked":false,"name":"f8d667c7-b860-44f8-8273-9a2e330a1b8e","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_mars_hbolt", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"heavy_ranged", + "path":"folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_mars_hbolt", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_mars_hbolt", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":301.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"98934121-510d-447a-ad2c-d09856d6ea01","path":"sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7083e8c1-3489-46f9-a5e6-9a3de2110e2e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":39, + "yorigin":21, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":301, +} \ No newline at end of file diff --git a/sprites/spr_weapon_mars_plasc/56d53598-e41a-4814-a85d-43df630bc638.png b/sprites/spr_weapon_mars_plasc/56d53598-e41a-4814-a85d-43df630bc638.png new file mode 100644 index 0000000000..6da895ed1a Binary files /dev/null and b/sprites/spr_weapon_mars_plasc/56d53598-e41a-4814-a85d-43df630bc638.png differ diff --git a/sprites/spr_weapon_mars_plasc/layers/56d53598-e41a-4814-a85d-43df630bc638/c5e2032c-1118-47da-b38a-f1a322a71a20.png b/sprites/spr_weapon_mars_plasc/layers/56d53598-e41a-4814-a85d-43df630bc638/c5e2032c-1118-47da-b38a-f1a322a71a20.png new file mode 100644 index 0000000000..6da895ed1a Binary files /dev/null and b/sprites/spr_weapon_mars_plasc/layers/56d53598-e41a-4814-a85d-43df630bc638/c5e2032c-1118-47da-b38a-f1a322a71a20.png differ diff --git a/sprites/spr_weapon_mars_plasc/spr_weapon_mars_plasc.yy b/sprites/spr_weapon_mars_plasc/spr_weapon_mars_plasc.yy new file mode 100644 index 0000000000..1d024c5ae4 --- /dev/null +++ b/sprites/spr_weapon_mars_plasc/spr_weapon_mars_plasc.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_mars_plasc", + "bboxMode":0, + "bbox_bottom":182, + "bbox_left":64, + "bbox_right":240, + "bbox_top":96, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"56d53598-e41a-4814-a85d-43df630bc638","name":"56d53598-e41a-4814-a85d-43df630bc638","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":272, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"c5e2032c-1118-47da-b38a-f1a322a71a20","blendMode":0,"displayName":"default","isLocked":false,"name":"c5e2032c-1118-47da-b38a-f1a322a71a20","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_mars_plasc", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"heavy_ranged", + "path":"folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_mars_plasc", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_mars_plasc", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":301.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"56d53598-e41a-4814-a85d-43df630bc638","path":"sprites/spr_weapon_mars_plasc/spr_weapon_mars_plasc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6ec6c55b-a7d7-45d4-9ee2-fb3ead827420","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":39, + "yorigin":21, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":301, +} \ No newline at end of file diff --git a/sprites/spr_weapon_melta/spr_weapon_melta.yy b/sprites/spr_weapon_melta/spr_weapon_melta.yy index 53ec32f54e..a3277d2bc7 100644 --- a/sprites/spr_weapon_melta/spr_weapon_melta.yy +++ b/sprites/spr_weapon_melta/spr_weapon_melta.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_melta", "bboxMode":0, "bbox_bottom":212, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"881d2fb1-5056-4735-8d84-8ca6614caff0","name":"881d2fb1-5056-4735-8d84-8ca6614caff0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"881d2fb1-5056-4735-8d84-8ca6614caff0","name":"881d2fb1-5056-4735-8d84-8ca6614caff0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"881d2fb1-5056-4735-8d84-8ca6614caff0","path":"sprites/spr_weapon_melta/spr_weapon_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"74cd6908-01ec-4465-b482-4435e04d4f02","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"881d2fb1-5056-4735-8d84-8ca6614caff0","path":"sprites/spr_weapon_melta/spr_weapon_melta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"74cd6908-01ec-4465-b482-4435e04d4f02","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_missile/spr_weapon_missile.yy b/sprites/spr_weapon_missile/spr_weapon_missile.yy index 122aab8fdb..e250858a0c 100644 --- a/sprites/spr_weapon_missile/spr_weapon_missile.yy +++ b/sprites/spr_weapon_missile/spr_weapon_missile.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_missile", "bboxMode":0, "bbox_bottom":160, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2250a315-f18a-45f1-956e-3e196b64c3b6","name":"2250a315-f18a-45f1-956e-3e196b64c3b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2250a315-f18a-45f1-956e-3e196b64c3b6","name":"2250a315-f18a-45f1-956e-3e196b64c3b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2250a315-f18a-45f1-956e-3e196b64c3b6","path":"sprites/spr_weapon_missile/spr_weapon_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c1cf7e78-050c-4d04-bbb5-967f84a51577","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2250a315-f18a-45f1-956e-3e196b64c3b6","path":"sprites/spr_weapon_missile/spr_weapon_missile.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c1cf7e78-050c-4d04-bbb5-967f84a51577","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy b/sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy index 14129074fe..59e67fde7d 100644 --- a/sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy +++ b/sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_mmelta", "bboxMode":0, "bbox_bottom":155, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed216edf-c023-4a02-94fb-993a99341d45","name":"ed216edf-c023-4a02-94fb-993a99341d45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed216edf-c023-4a02-94fb-993a99341d45","name":"ed216edf-c023-4a02-94fb-993a99341d45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dd31ff2a-f4ee-48f0-af23-769fa634ed88","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed216edf-c023-4a02-94fb-993a99341d45","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d315b60f-aeb7-4131-98ba-f1b38c072733","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dd31ff2a-f4ee-48f0-af23-769fa634ed88","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed216edf-c023-4a02-94fb-993a99341d45","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d315b60f-aeb7-4131-98ba-f1b38c072733","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_omnissian_axe/cf403b7b-a831-4dd7-94fc-490b330d9a3b.png b/sprites/spr_weapon_omnissian_axe/cf403b7b-a831-4dd7-94fc-490b330d9a3b.png new file mode 100644 index 0000000000..8dec0f8143 Binary files /dev/null and b/sprites/spr_weapon_omnissian_axe/cf403b7b-a831-4dd7-94fc-490b330d9a3b.png differ diff --git a/sprites/spr_weapon_omnissian_axe/layers/cf403b7b-a831-4dd7-94fc-490b330d9a3b/3f223d5d-3d0b-4c23-9457-1ae722299b06.png b/sprites/spr_weapon_omnissian_axe/layers/cf403b7b-a831-4dd7-94fc-490b330d9a3b/3f223d5d-3d0b-4c23-9457-1ae722299b06.png new file mode 100644 index 0000000000..8dec0f8143 Binary files /dev/null and b/sprites/spr_weapon_omnissian_axe/layers/cf403b7b-a831-4dd7-94fc-490b330d9a3b/3f223d5d-3d0b-4c23-9457-1ae722299b06.png differ diff --git a/sprites/spr_weapon_omnissian_axe/spr_weapon_omnissian_axe.yy b/sprites/spr_weapon_omnissian_axe/spr_weapon_omnissian_axe.yy new file mode 100644 index 0000000000..66bd248f42 --- /dev/null +++ b/sprites/spr_weapon_omnissian_axe/spr_weapon_omnissian_axe.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"", + "%Name":"spr_weapon_omnissian_axe", + "bboxMode":0, + "bbox_bottom":222, + "bbox_left":33, + "bbox_right":82, + "bbox_top":63, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"3f223d5d-3d0b-4c23-9457-1ae722299b06","blendMode":0,"displayName":"default","isLocked":false,"name":"3f223d5d-3d0b-4c23-9457-1ae722299b06","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_omnissian_axe", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"melee", + "path":"folders/Sprites/Marine Viewer/weapons/melee.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_omnissian_axe", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_omnissian_axe", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cf403b7b-a831-4dd7-94fc-490b330d9a3b","path":"sprites/spr_weapon_omnissian_axe/spr_weapon_omnissian_axe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"877d958c-0ba3-4cf7-b6c6-61d21827c596","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_ph_flmr/4264355a-06ac-4588-8864-b741565dcd32.png b/sprites/spr_weapon_ph_flmr/4264355a-06ac-4588-8864-b741565dcd32.png new file mode 100644 index 0000000000..c28c7fb7ae Binary files /dev/null and b/sprites/spr_weapon_ph_flmr/4264355a-06ac-4588-8864-b741565dcd32.png differ diff --git a/sprites/spr_weapon_ph_flmr/layers/4264355a-06ac-4588-8864-b741565dcd32/e33dd1a2-cee4-48aa-a3b4-db455a74ccc8.png b/sprites/spr_weapon_ph_flmr/layers/4264355a-06ac-4588-8864-b741565dcd32/e33dd1a2-cee4-48aa-a3b4-db455a74ccc8.png new file mode 100644 index 0000000000..c28c7fb7ae Binary files /dev/null and b/sprites/spr_weapon_ph_flmr/layers/4264355a-06ac-4588-8864-b741565dcd32/e33dd1a2-cee4-48aa-a3b4-db455a74ccc8.png differ diff --git a/sprites/spr_weapon_ph_flmr/spr_weapon_ph_flmr.yy b/sprites/spr_weapon_ph_flmr/spr_weapon_ph_flmr.yy new file mode 100644 index 0000000000..bc81d3e34e --- /dev/null +++ b/sprites/spr_weapon_ph_flmr/spr_weapon_ph_flmr.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_ph_flmr", + "bboxMode":0, + "bbox_bottom":211, + "bbox_left":0, + "bbox_right":57, + "bbox_top":101, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"4264355a-06ac-4588-8864-b741565dcd32","name":"4264355a-06ac-4588-8864-b741565dcd32","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"e33dd1a2-cee4-48aa-a3b4-db455a74ccc8","blendMode":0,"displayName":"default","isLocked":false,"name":"e33dd1a2-cee4-48aa-a3b4-db455a74ccc8","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_ph_flmr", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":0, + "parent":{ + "name":"ranged", + "path":"folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_ph_flmr", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_ph_flmr", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4264355a-06ac-4588-8864-b741565dcd32","path":"sprites/spr_weapon_ph_flmr/spr_weapon_ph_flmr.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"35a6740c-1144-45e2-9cac-778ff2991598","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_phobos_bolter/0feb2b87-1efd-47dd-9f23-14a4113b369c.png b/sprites/spr_weapon_phobos_bolter/0feb2b87-1efd-47dd-9f23-14a4113b369c.png new file mode 100644 index 0000000000..9b571ba670 Binary files /dev/null and b/sprites/spr_weapon_phobos_bolter/0feb2b87-1efd-47dd-9f23-14a4113b369c.png differ diff --git a/sprites/spr_weapon_phobos_bolter/layers/0feb2b87-1efd-47dd-9f23-14a4113b369c/664d1dec-58bd-4b0a-abf0-6249a1377b2b.png b/sprites/spr_weapon_phobos_bolter/layers/0feb2b87-1efd-47dd-9f23-14a4113b369c/664d1dec-58bd-4b0a-abf0-6249a1377b2b.png new file mode 100644 index 0000000000..9b571ba670 Binary files /dev/null and b/sprites/spr_weapon_phobos_bolter/layers/0feb2b87-1efd-47dd-9f23-14a4113b369c/664d1dec-58bd-4b0a-abf0-6249a1377b2b.png differ diff --git a/sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy b/sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy new file mode 100644 index 0000000000..4caa33666e --- /dev/null +++ b/sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_phobos_bolter", + "bboxMode":0, + "bbox_bottom":198, + "bbox_left":0, + "bbox_right":64, + "bbox_top":95, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"0feb2b87-1efd-47dd-9f23-14a4113b369c","name":"0feb2b87-1efd-47dd-9f23-14a4113b369c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"664d1dec-58bd-4b0a-abf0-6249a1377b2b","blendMode":0,"displayName":"default","isLocked":false,"name":"664d1dec-58bd-4b0a-abf0-6249a1377b2b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_phobos_bolter", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":9, + "parent":{ + "name":"ranged", + "path":"folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_phobos_bolter", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_phobos_bolter", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0feb2b87-1efd-47dd-9f23-14a4113b369c","path":"sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"549bcfaa-6460-412e-b475-43070065cdc3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":4, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_phobos_boltpis/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f.png b/sprites/spr_weapon_phobos_boltpis/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f.png new file mode 100644 index 0000000000..1ac602f720 Binary files /dev/null and b/sprites/spr_weapon_phobos_boltpis/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f.png differ diff --git a/sprites/spr_weapon_phobos_boltpis/layers/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f/874c87bf-544a-4c32-a371-509dc9981ec4.png b/sprites/spr_weapon_phobos_boltpis/layers/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f/874c87bf-544a-4c32-a371-509dc9981ec4.png new file mode 100644 index 0000000000..1ac602f720 Binary files /dev/null and b/sprites/spr_weapon_phobos_boltpis/layers/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f/874c87bf-544a-4c32-a371-509dc9981ec4.png differ diff --git a/sprites/spr_weapon_phobos_boltpis/spr_weapon_phobos_boltpis.yy b/sprites/spr_weapon_phobos_boltpis/spr_weapon_phobos_boltpis.yy new file mode 100644 index 0000000000..92ebcbf443 --- /dev/null +++ b/sprites/spr_weapon_phobos_boltpis/spr_weapon_phobos_boltpis.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_phobos_boltpis", + "bboxMode":0, + "bbox_bottom":176, + "bbox_left":4, + "bbox_right":58, + "bbox_top":105, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"7bf54d5b-eb4f-4225-8043-c7bbdfefe28f","name":"7bf54d5b-eb4f-4225-8043-c7bbdfefe28f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"874c87bf-544a-4c32-a371-509dc9981ec4","blendMode":0,"displayName":"default","isLocked":false,"name":"874c87bf-544a-4c32-a371-509dc9981ec4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_phobos_boltpis", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":0, + "parent":{ + "name":"ranged", + "path":"folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_phobos_boltpis", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_phobos_boltpis", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7bf54d5b-eb4f-4225-8043-c7bbdfefe28f","path":"sprites/spr_weapon_phobos_boltpis/spr_weapon_phobos_boltpis.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"2bc5e8a7-0d4d-416c-a6e4-608bded7e2ae","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_plasc/spr_weapon_plasc.yy b/sprites/spr_weapon_plasc/spr_weapon_plasc.yy index 93e2389bd5..da5d64f7f3 100644 --- a/sprites/spr_weapon_plasc/spr_weapon_plasc.yy +++ b/sprites/spr_weapon_plasc/spr_weapon_plasc.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_plasc", "bboxMode":0, "bbox_bottom":122, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cd611ad5-3140-4b0f-afc5-f6566415e601","name":"cd611ad5-3140-4b0f-afc5-f6566415e601","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cd611ad5-3140-4b0f-afc5-f6566415e601","name":"cd611ad5-3140-4b0f-afc5-f6566415e601","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce6676cf-5a3c-4f75-90a3-654dbcecc670","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd611ad5-3140-4b0f-afc5-f6566415e601","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"58c402f8-99e1-4962-9fae-deec1a64ba03","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f0ff24f9-bb86-49c8-9679-44c56735a77c","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce6676cf-5a3c-4f75-90a3-654dbcecc670","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"cd611ad5-3140-4b0f-afc5-f6566415e601","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"58c402f8-99e1-4962-9fae-deec1a64ba03","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_plasg/spr_weapon_plasg.yy b/sprites/spr_weapon_plasg/spr_weapon_plasg.yy index 973baf9def..7083e69c60 100644 --- a/sprites/spr_weapon_plasg/spr_weapon_plasg.yy +++ b/sprites/spr_weapon_plasg/spr_weapon_plasg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_plasg", "bboxMode":0, "bbox_bottom":195, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","path":"sprites/spr_weapon_plasg/spr_weapon_plasg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e8b5a45b-814c-49dc-9fc4-16d6bf9347bd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","path":"sprites/spr_weapon_plasg/spr_weapon_plasg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e8b5a45b-814c-49dc-9fc4-16d6bf9347bd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy b/sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy index 6096621d64..4cab20e06c 100644 --- a/sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy +++ b/sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_plasma_cannon_term", "bboxMode":0, "bbox_bottom":224, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b3de42d5-27c7-4349-82ce-0d82b0f1b555","name":"b3de42d5-27c7-4349-82ce-0d82b0f1b555","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","name":"a881943a-e7b3-4a2d-aa8e-4482d90446bf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b3de42d5-27c7-4349-82ce-0d82b0f1b555","name":"b3de42d5-27c7-4349-82ce-0d82b0f1b555","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -81,7 +81,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":27, + "xorigin":20, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_weapon_plasp/spr_weapon_plasp.yy b/sprites/spr_weapon_plasp/spr_weapon_plasp.yy index 62ba733af5..adae2517b6 100644 --- a/sprites/spr_weapon_plasp/spr_weapon_plasp.yy +++ b/sprites/spr_weapon_plasp/spr_weapon_plasp.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_plasp", "bboxMode":0, "bbox_bottom":172, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","name":"8fe8f87d-cc4c-49b1-a8c7-5b595d9a9e9d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy b/sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy index 8819cc4a07..085d8ff017 100644 --- a/sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy +++ b/sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powaxe", "bboxMode":0, "bbox_bottom":231, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","path":"sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"90a9b82b-dd4a-488d-87a8-50b3fff5dc34","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"45ac5706-a0cb-4b2b-aeee-ad707b9c98af","path":"sprites/spr_weapon_powaxe/spr_weapon_powaxe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"90a9b82b-dd4a-488d-87a8-50b3fff5dc34","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powfist/spr_weapon_powfist.yy b/sprites/spr_weapon_powfist/spr_weapon_powfist.yy index bc020f0b89..b07fc3769c 100644 --- a/sprites/spr_weapon_powfist/spr_weapon_powfist.yy +++ b/sprites/spr_weapon_powfist/spr_weapon_powfist.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powfist", "bboxMode":0, "bbox_bottom":182, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"b72324e5-1184-447b-810f-30d301bb38bd","name":"b72324e5-1184-447b-810f-30d301bb38bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4e1395a0-97b4-428f-8884-85c870d1d70d","name":"4e1395a0-97b4-428f-8884-85c870d1d70d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b72324e5-1184-447b-810f-30d301bb38bd","name":"b72324e5-1184-447b-810f-30d301bb38bd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4e1395a0-97b4-428f-8884-85c870d1d70d","name":"4e1395a0-97b4-428f-8884-85c870d1d70d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b72324e5-1184-447b-810f-30d301bb38bd","path":"sprites/spr_weapon_powfist/spr_weapon_powfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"78267efe-7cf7-46a7-acf5-b376e96873ba","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e1395a0-97b4-428f-8884-85c870d1d70d","path":"sprites/spr_weapon_powfist/spr_weapon_powfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"36e190c8-ca3b-4cf2-b14b-2c7e1b5c5cad","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b72324e5-1184-447b-810f-30d301bb38bd","path":"sprites/spr_weapon_powfist/spr_weapon_powfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"78267efe-7cf7-46a7-acf5-b376e96873ba","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4e1395a0-97b4-428f-8884-85c870d1d70d","path":"sprites/spr_weapon_powfist/spr_weapon_powfist.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"36e190c8-ca3b-4cf2-b14b-2c7e1b5c5cad","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy b/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy index db51650d86..461d587a7d 100644 --- a/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy +++ b/sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powfist2", "bboxMode":0, "bbox_bottom":212, @@ -12,12 +12,12 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"55265bf4-8dbc-40d1-ba7d-eb810f73a01b","name":"55265bf4-8dbc-40d1-ba7d-eb810f73a01b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3fd0e236-dc6d-4e8f-85b7-b0a052be83b2","name":"3fd0e236-dc6d-4e8f-85b7-b0a052be83b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ea311519-a01c-426c-a8c0-10475dfaee04","name":"ea311519-a01c-426c-a8c0-10475dfaee04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"050ce403-9d9f-43b0-8e0e-a96e27bc40b9","name":"050ce403-9d9f-43b0-8e0e-a96e27bc40b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"73c69746-f941-4d24-9de1-f145a13328b7","name":"73c69746-f941-4d24-9de1-f145a13328b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0376a19f-82c2-445b-988c-3f02c34315b8","name":"0376a19f-82c2-445b-988c-3f02c34315b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"55265bf4-8dbc-40d1-ba7d-eb810f73a01b","name":"55265bf4-8dbc-40d1-ba7d-eb810f73a01b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3fd0e236-dc6d-4e8f-85b7-b0a052be83b2","name":"3fd0e236-dc6d-4e8f-85b7-b0a052be83b2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ea311519-a01c-426c-a8c0-10475dfaee04","name":"ea311519-a01c-426c-a8c0-10475dfaee04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"050ce403-9d9f-43b0-8e0e-a96e27bc40b9","name":"050ce403-9d9f-43b0-8e0e-a96e27bc40b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73c69746-f941-4d24-9de1-f145a13328b7","name":"73c69746-f941-4d24-9de1-f145a13328b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0376a19f-82c2-445b-988c-3f02c34315b8","name":"0376a19f-82c2-445b-988c-3f02c34315b8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -73,24 +73,12 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"55265bf4-8dbc-40d1-ba7d-eb810f73a01b","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3278e4ea-7460-40e6-8145-962dc0de12d5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3fd0e236-dc6d-4e8f-85b7-b0a052be83b2","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c2b1795c-a15e-46b4-a00b-3db25b561e32","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea311519-a01c-426c-a8c0-10475dfaee04","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e16fdb3-fff1-4be4-a1e4-35f56ad7a560","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"050ce403-9d9f-43b0-8e0e-a96e27bc40b9","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4317d34f-5720-4a6d-a8a1-710e4331b846","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73c69746-f941-4d24-9de1-f145a13328b7","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9814f170-a29e-419d-a816-cc341f192907","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0376a19f-82c2-445b-988c-3f02c34315b8","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c923798f-ab68-4624-8da2-c3643898906d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"55265bf4-8dbc-40d1-ba7d-eb810f73a01b","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3278e4ea-7460-40e6-8145-962dc0de12d5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3fd0e236-dc6d-4e8f-85b7-b0a052be83b2","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c2b1795c-a15e-46b4-a00b-3db25b561e32","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ea311519-a01c-426c-a8c0-10475dfaee04","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e16fdb3-fff1-4be4-a1e4-35f56ad7a560","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"050ce403-9d9f-43b0-8e0e-a96e27bc40b9","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4317d34f-5720-4a6d-a8a1-710e4331b846","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73c69746-f941-4d24-9de1-f145a13328b7","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9814f170-a29e-419d-a816-cc341f192907","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0376a19f-82c2-445b-988c-3f02c34315b8","path":"sprites/spr_weapon_powfist2/spr_weapon_powfist2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c923798f-ab68-4624-8da2-c3643898906d","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/spr_weapon_powfist4/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png b/sprites/spr_weapon_powfist4/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png index 6e4bc47e4d..130ee528ac 100644 Binary files a/sprites/spr_weapon_powfist4/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png and b/sprites/spr_weapon_powfist4/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png differ diff --git a/sprites/spr_weapon_powfist4/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png b/sprites/spr_weapon_powfist4/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png index 6e4bc47e4d..130ee528ac 100644 Binary files a/sprites/spr_weapon_powfist4/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png and b/sprites/spr_weapon_powfist4/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png differ diff --git a/sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy b/sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy index 991886319a..abe6085e9b 100644 --- a/sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy +++ b/sprites/spr_weapon_powfist4/spr_weapon_powfist4.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powfist4", "bboxMode":0, "bbox_bottom":188, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -64,6 +64,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":181.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, @@ -79,7 +81,7 @@ ], "visibleRange":null, "volume":1.0, - "xorigin":7, + "xorigin":0, "yorigin":38, }, "swatchColours":null, diff --git a/sprites/spr_weapon_powfist4_shadows/4410e334-93f0-4b8b-8b06-2247349c1ba2.png b/sprites/spr_weapon_powfist4_shadows/4410e334-93f0-4b8b-8b06-2247349c1ba2.png new file mode 100644 index 0000000000..f4cfa3f307 Binary files /dev/null and b/sprites/spr_weapon_powfist4_shadows/4410e334-93f0-4b8b-8b06-2247349c1ba2.png differ diff --git a/sprites/spr_weapon_powfist4_shadows/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png b/sprites/spr_weapon_powfist4_shadows/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png new file mode 100644 index 0000000000..dbb238e683 Binary files /dev/null and b/sprites/spr_weapon_powfist4_shadows/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c.png differ diff --git a/sprites/spr_weapon_powfist4_shadows/layers/4410e334-93f0-4b8b-8b06-2247349c1ba2/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png b/sprites/spr_weapon_powfist4_shadows/layers/4410e334-93f0-4b8b-8b06-2247349c1ba2/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png new file mode 100644 index 0000000000..f4cfa3f307 Binary files /dev/null and b/sprites/spr_weapon_powfist4_shadows/layers/4410e334-93f0-4b8b-8b06-2247349c1ba2/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png differ diff --git a/sprites/spr_weapon_powfist4_shadows/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png b/sprites/spr_weapon_powfist4_shadows/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png new file mode 100644 index 0000000000..dbb238e683 Binary files /dev/null and b/sprites/spr_weapon_powfist4_shadows/layers/de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c/a21d01bb-7c16-4f98-8ff5-fe8c08bdac52.png differ diff --git a/sprites/spr_weapon_powfist4_shadows/spr_weapon_powfist4_shadows.yy b/sprites/spr_weapon_powfist4_shadows/spr_weapon_powfist4_shadows.yy new file mode 100644 index 0000000000..6abb6f4ad1 --- /dev/null +++ b/sprites/spr_weapon_powfist4_shadows/spr_weapon_powfist4_shadows.yy @@ -0,0 +1,96 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_powfist4_shadows", + "bboxMode":0, + "bbox_bottom":188, + "bbox_left":1, + "bbox_right":179, + "bbox_top":118, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":262, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"a21d01bb-7c16-4f98-8ff5-fe8c08bdac52","blendMode":0,"displayName":"default","isLocked":false,"name":"a21d01bb-7c16-4f98-8ff5-fe8c08bdac52","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_powfist4_shadows", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"weapons_terminator", + "path":"folders/Sprites/Marine Viewer/weapons_terminator.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_powfist4_shadows", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_powfist4_shadows", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":181.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de3dcbc3-1a69-4b3c-ad1b-9c3dbaae504c","path":"sprites/spr_weapon_powfist4_shadows/spr_weapon_powfist4_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"47151b1c-9cef-45fe-883f-ffbcadc946d8","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4410e334-93f0-4b8b-8b06-2247349c1ba2","path":"sprites/spr_weapon_powfist4_shadows/spr_weapon_powfist4_shadows.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"a0047329-f211-4ad9-9557-0d0295d68efc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":181, +} \ No newline at end of file diff --git a/sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy b/sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy index 86e0c15636..52674ca02e 100644 --- a/sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy +++ b/sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powfist_old", "bboxMode":0, "bbox_bottom":144, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0be31cfe-78c4-471d-b859-e254532372b9","name":"0be31cfe-78c4-471d-b859-e254532372b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"01579dc0-615a-49a2-9b4d-ea41758f00db","name":"01579dc0-615a-49a2-9b4d-ea41758f00db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"726ce5d7-3fbd-4c4e-bfc9-623155e5a082","name":"726ce5d7-3fbd-4c4e-bfc9-623155e5a082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"984d3389-f9ab-456a-9fa4-08daa820a402","name":"984d3389-f9ab-456a-9fa4-08daa820a402","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0be31cfe-78c4-471d-b859-e254532372b9","name":"0be31cfe-78c4-471d-b859-e254532372b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"01579dc0-615a-49a2-9b4d-ea41758f00db","name":"01579dc0-615a-49a2-9b4d-ea41758f00db","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"726ce5d7-3fbd-4c4e-bfc9-623155e5a082","name":"726ce5d7-3fbd-4c4e-bfc9-623155e5a082","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"984d3389-f9ab-456a-9fa4-08daa820a402","name":"984d3389-f9ab-456a-9fa4-08daa820a402","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0be31cfe-78c4-471d-b859-e254532372b9","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"510c3907-1247-443e-b8b5-1c65f1520ef2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"01579dc0-615a-49a2-9b4d-ea41758f00db","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bf80a95d-0048-4e86-bd8b-3fd9c5c85d47","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"726ce5d7-3fbd-4c4e-bfc9-623155e5a082","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5451e330-335c-43db-a09f-024a21e42b94","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"984d3389-f9ab-456a-9fa4-08daa820a402","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b9a418e-eac9-490f-9230-2751e6a5bc6f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0be31cfe-78c4-471d-b859-e254532372b9","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"510c3907-1247-443e-b8b5-1c65f1520ef2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"01579dc0-615a-49a2-9b4d-ea41758f00db","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bf80a95d-0048-4e86-bd8b-3fd9c5c85d47","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"726ce5d7-3fbd-4c4e-bfc9-623155e5a082","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5451e330-335c-43db-a09f-024a21e42b94","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"984d3389-f9ab-456a-9fa4-08daa820a402","path":"sprites/spr_weapon_powfist_old/spr_weapon_powfist_old.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b9a418e-eac9-490f-9230-2751e6a5bc6f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powmace/spr_weapon_powmace.yy b/sprites/spr_weapon_powmace/spr_weapon_powmace.yy index 643716c4fe..72f95d9407 100644 --- a/sprites/spr_weapon_powmace/spr_weapon_powmace.yy +++ b/sprites/spr_weapon_powmace/spr_weapon_powmace.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powmace", "bboxMode":0, "bbox_bottom":261, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"316e0e0f-a739-4bb0-b052-89d4b964924d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"97b672d1-9ce4-474d-b0cc-23fd0503f0cd","path":"sprites/spr_weapon_powmace/spr_weapon_powmace.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"316e0e0f-a739-4bb0-b052-89d4b964924d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy b/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy index 79f1f81edd..0b10ac8a3d 100644 --- a/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy +++ b/sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powmaul", "bboxMode":0, "bbox_bottom":223, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0411c512-ab45-4528-8744-8f5cc93375d9","name":"0411c512-ab45-4528-8744-8f5cc93375d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0411c512-ab45-4528-8744-8f5cc93375d9","name":"0411c512-ab45-4528-8744-8f5cc93375d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0411c512-ab45-4528-8744-8f5cc93375d9","path":"sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"562e79ed-f23d-4371-8a19-59b8c0541d4a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0411c512-ab45-4528-8744-8f5cc93375d9","path":"sprites/spr_weapon_powmaul/spr_weapon_powmaul.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"562e79ed-f23d-4371-8a19-59b8c0541d4a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powscythe/79186301-baf7-450c-883c-ee1e52cb08c9.png b/sprites/spr_weapon_powscythe/79186301-baf7-450c-883c-ee1e52cb08c9.png new file mode 100644 index 0000000000..1b559548ec Binary files /dev/null and b/sprites/spr_weapon_powscythe/79186301-baf7-450c-883c-ee1e52cb08c9.png differ diff --git a/sprites/spr_weapon_powscythe/layers/79186301-baf7-450c-883c-ee1e52cb08c9/aa6942f2-99bf-4276-913b-132d5bf1e522.png b/sprites/spr_weapon_powscythe/layers/79186301-baf7-450c-883c-ee1e52cb08c9/aa6942f2-99bf-4276-913b-132d5bf1e522.png new file mode 100644 index 0000000000..1b559548ec Binary files /dev/null and b/sprites/spr_weapon_powscythe/layers/79186301-baf7-450c-883c-ee1e52cb08c9/aa6942f2-99bf-4276-913b-132d5bf1e522.png differ diff --git a/sprites/spr_weapon_powscythe/spr_weapon_powscythe.yy b/sprites/spr_weapon_powscythe/spr_weapon_powscythe.yy new file mode 100644 index 0000000000..bafdcad1e2 --- /dev/null +++ b/sprites/spr_weapon_powscythe/spr_weapon_powscythe.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_powscythe", + "bboxMode":0, + "bbox_bottom":261, + "bbox_left":2, + "bbox_right":154, + "bbox_top":7, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"79186301-baf7-450c-883c-ee1e52cb08c9","name":"79186301-baf7-450c-883c-ee1e52cb08c9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":281, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"aa6942f2-99bf-4276-913b-132d5bf1e522","blendMode":0,"displayName":"default","isLocked":false,"name":"aa6942f2-99bf-4276-913b-132d5bf1e522","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_powscythe", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"melee", + "path":"folders/Sprites/Marine Viewer/weapons/melee.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_powscythe", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_powscythe", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":281.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"79186301-baf7-450c-883c-ee1e52cb08c9","path":"sprites/spr_weapon_powscythe/spr_weapon_powscythe.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4920967f-fc97-4d08-b57c-737bf686efb0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":-3, + "yorigin":50, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_powspear/spr_weapon_powspear.yy b/sprites/spr_weapon_powspear/spr_weapon_powspear.yy index aeca124146..31e4726545 100644 --- a/sprites/spr_weapon_powspear/spr_weapon_powspear.yy +++ b/sprites/spr_weapon_powspear/spr_weapon_powspear.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powspear", "bboxMode":0, "bbox_bottom":275, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"49d770e0-45f5-4f6a-932b-88984416b02a","name":"49d770e0-45f5-4f6a-932b-88984416b02a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"49d770e0-45f5-4f6a-932b-88984416b02a","name":"49d770e0-45f5-4f6a-932b-88984416b02a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"49d770e0-45f5-4f6a-932b-88984416b02a","path":"sprites/spr_weapon_powspear/spr_weapon_powspear.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b384452c-57a9-4471-867e-57707dc0e6f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"49d770e0-45f5-4f6a-932b-88984416b02a","path":"sprites/spr_weapon_powspear/spr_weapon_powspear.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b384452c-57a9-4471-867e-57707dc0e6f9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy b/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy index 8763191879..390a3b2995 100644 --- a/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy +++ b/sprites/spr_weapon_powspear2/spr_weapon_powspear2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powspear2", "bboxMode":0, "bbox_bottom":281, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e7a5116f-9003-4fe0-a3a6-22b578284d0f","name":"e7a5116f-9003-4fe0-a3a6-22b578284d0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a02ce5c0-2d43-4023-80b7-6fcfe2f77d94","name":"a02ce5c0-2d43-4023-80b7-6fcfe2f77d94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"152b7978-2299-46a9-8659-9d3fa7ea8162","name":"152b7978-2299-46a9-8659-9d3fa7ea8162","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7a5116f-9003-4fe0-a3a6-22b578284d0f","name":"e7a5116f-9003-4fe0-a3a6-22b578284d0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a02ce5c0-2d43-4023-80b7-6fcfe2f77d94","name":"a02ce5c0-2d43-4023-80b7-6fcfe2f77d94","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"152b7978-2299-46a9-8659-9d3fa7ea8162","name":"152b7978-2299-46a9-8659-9d3fa7ea8162","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,6 +68,8 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":282.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy b/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy index 6dd8447800..8b184dbb0e 100644 --- a/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy +++ b/sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powspear3", "bboxMode":0, "bbox_bottom":281, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -72,9 +72,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","path":"sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bfafdbb3-42c5-4130-bc4e-ac9fd5f89808","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e672385-98c8-4ea0-ae1e-13d49a097f5d","path":"sprites/spr_weapon_powspear3/spr_weapon_powspear3.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bfafdbb3-42c5-4130-bc4e-ac9fd5f89808","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_powswo/spr_weapon_powswo.yy b/sprites/spr_weapon_powswo/spr_weapon_powswo.yy index 1cdc4c0489..42f98df256 100644 --- a/sprites/spr_weapon_powswo/spr_weapon_powswo.yy +++ b/sprites/spr_weapon_powswo/spr_weapon_powswo.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_powswo", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c90840de-d6cc-483e-a57c-af59544fddb7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d76e9ffc-a89c-41eb-bc8a-b41946b2e18b","path":"sprites/spr_weapon_powswo/spr_weapon_powswo.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c90840de-d6cc-483e-a57c-af59544fddb7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_prim_mltg/a551c05b-4094-4e7e-bd14-4c22162e3033.png b/sprites/spr_weapon_prim_mltg/a551c05b-4094-4e7e-bd14-4c22162e3033.png new file mode 100644 index 0000000000..7c3a0a9dda Binary files /dev/null and b/sprites/spr_weapon_prim_mltg/a551c05b-4094-4e7e-bd14-4c22162e3033.png differ diff --git a/sprites/spr_weapon_prim_mltg/layers/a551c05b-4094-4e7e-bd14-4c22162e3033/94f7586f-b8fe-4a7c-abbe-fa4777dff1ce.png b/sprites/spr_weapon_prim_mltg/layers/a551c05b-4094-4e7e-bd14-4c22162e3033/94f7586f-b8fe-4a7c-abbe-fa4777dff1ce.png new file mode 100644 index 0000000000..7c3a0a9dda Binary files /dev/null and b/sprites/spr_weapon_prim_mltg/layers/a551c05b-4094-4e7e-bd14-4c22162e3033/94f7586f-b8fe-4a7c-abbe-fa4777dff1ce.png differ diff --git a/sprites/spr_weapon_prim_mltg/spr_weapon_prim_mltg.yy b/sprites/spr_weapon_prim_mltg/spr_weapon_prim_mltg.yy new file mode 100644 index 0000000000..9dd3d21360 --- /dev/null +++ b/sprites/spr_weapon_prim_mltg/spr_weapon_prim_mltg.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_prim_mltg", + "bboxMode":0, + "bbox_bottom":227, + "bbox_left":24, + "bbox_right":58, + "bbox_top":101, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"a551c05b-4094-4e7e-bd14-4c22162e3033","name":"a551c05b-4094-4e7e-bd14-4c22162e3033","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"94f7586f-b8fe-4a7c-abbe-fa4777dff1ce","blendMode":0,"displayName":"default","isLocked":false,"name":"94f7586f-b8fe-4a7c-abbe-fa4777dff1ce","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_prim_mltg", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":0, + "parent":{ + "name":"ranged", + "path":"folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_prim_mltg", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_prim_mltg", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a551c05b-4094-4e7e-bd14-4c22162e3033","path":"sprites/spr_weapon_prim_mltg/spr_weapon_prim_mltg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"07480215-0913-4f6f-b8bb-e9248d2cdd68","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_prot_mmlt/da81bce1-5ee4-40cf-81c1-38b2a9f6e905.png b/sprites/spr_weapon_prot_mmlt/da81bce1-5ee4-40cf-81c1-38b2a9f6e905.png new file mode 100644 index 0000000000..c6d19936ac Binary files /dev/null and b/sprites/spr_weapon_prot_mmlt/da81bce1-5ee4-40cf-81c1-38b2a9f6e905.png differ diff --git a/sprites/spr_weapon_prot_mmlt/layers/da81bce1-5ee4-40cf-81c1-38b2a9f6e905/061823a4-a3eb-4de5-891f-4ed134331f63.png b/sprites/spr_weapon_prot_mmlt/layers/da81bce1-5ee4-40cf-81c1-38b2a9f6e905/061823a4-a3eb-4de5-891f-4ed134331f63.png new file mode 100644 index 0000000000..c6d19936ac Binary files /dev/null and b/sprites/spr_weapon_prot_mmlt/layers/da81bce1-5ee4-40cf-81c1-38b2a9f6e905/061823a4-a3eb-4de5-891f-4ed134331f63.png differ diff --git a/sprites/spr_weapon_prot_mmlt/spr_weapon_prot_mmlt.yy b/sprites/spr_weapon_prot_mmlt/spr_weapon_prot_mmlt.yy new file mode 100644 index 0000000000..4b42090aea --- /dev/null +++ b/sprites/spr_weapon_prot_mmlt/spr_weapon_prot_mmlt.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_prot_mmlt", + "bboxMode":0, + "bbox_bottom":177, + "bbox_left":60, + "bbox_right":227, + "bbox_top":93, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"da81bce1-5ee4-40cf-81c1-38b2a9f6e905","name":"da81bce1-5ee4-40cf-81c1-38b2a9f6e905","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":272, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"061823a4-a3eb-4de5-891f-4ed134331f63","blendMode":0,"displayName":"default","isLocked":false,"name":"061823a4-a3eb-4de5-891f-4ed134331f63","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_prot_mmlt", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"heavy_ranged", + "path":"folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_prot_mmlt", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_prot_mmlt", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":301.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"da81bce1-5ee4-40cf-81c1-38b2a9f6e905","path":"sprites/spr_weapon_prot_mmlt/spr_weapon_prot_mmlt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"029e1c78-88c8-4933-99cc-a72eacd7faac","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":39, + "yorigin":21, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":301, +} \ No newline at end of file diff --git a/sprites/spr_weapon_relbla/spr_weapon_relbla.yy b/sprites/spr_weapon_relbla/spr_weapon_relbla.yy index a299183662..8b2cf17b70 100644 --- a/sprites/spr_weapon_relbla/spr_weapon_relbla.yy +++ b/sprites/spr_weapon_relbla/spr_weapon_relbla.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_relbla", "bboxMode":0, "bbox_bottom":230, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"96d5ab85-1eea-4ab9-8c1e-2fea4e82785a","name":"96d5ab85-1eea-4ab9-8c1e-2fea4e82785a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"08907d07-7132-4c10-8132-430b9ebec89a","name":"08907d07-7132-4c10-8132-430b9ebec89a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"fef7faa3-ce59-4fc8-a6ad-2c89c10fed92","name":"fef7faa3-ce59-4fc8-a6ad-2c89c10fed92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"eb77f72c-3aea-4fef-aab3-30c0b3649335","name":"eb77f72c-3aea-4fef-aab3-30c0b3649335","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96d5ab85-1eea-4ab9-8c1e-2fea4e82785a","name":"96d5ab85-1eea-4ab9-8c1e-2fea4e82785a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"08907d07-7132-4c10-8132-430b9ebec89a","name":"08907d07-7132-4c10-8132-430b9ebec89a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fef7faa3-ce59-4fc8-a6ad-2c89c10fed92","name":"fef7faa3-ce59-4fc8-a6ad-2c89c10fed92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"eb77f72c-3aea-4fef-aab3-30c0b3649335","name":"eb77f72c-3aea-4fef-aab3-30c0b3649335","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,18 +71,10 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96d5ab85-1eea-4ab9-8c1e-2fea4e82785a","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2f8678c0-8af9-4d94-a719-002848218458","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"08907d07-7132-4c10-8132-430b9ebec89a","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2b3f6409-1338-410e-b86c-2a0d4af07980","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"fef7faa3-ce59-4fc8-a6ad-2c89c10fed92","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b98b33ea-aa3f-4a1e-837d-3b713f0059f6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb77f72c-3aea-4fef-aab3-30c0b3649335","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53a6ed03-3962-49b4-924f-ccb66edc1df0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96d5ab85-1eea-4ab9-8c1e-2fea4e82785a","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2f8678c0-8af9-4d94-a719-002848218458","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"08907d07-7132-4c10-8132-430b9ebec89a","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2b3f6409-1338-410e-b86c-2a0d4af07980","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"fef7faa3-ce59-4fc8-a6ad-2c89c10fed92","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b98b33ea-aa3f-4a1e-837d-3b713f0059f6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"eb77f72c-3aea-4fef-aab3-30c0b3649335","path":"sprites/spr_weapon_relbla/spr_weapon_relbla.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53a6ed03-3962-49b4-924f-ccb66edc1df0","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy b/sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy index 7d4e6bacf4..13417a6fb1 100644 --- a/sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy +++ b/sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_relic_blade", "bboxMode":0, "bbox_bottom":271, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a9e77be2-64e4-4dd1-a478-6b5a0b0a6ba8","name":"a9e77be2-64e4-4dd1-a478-6b5a0b0a6ba8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0ab801f3-77b9-4897-baa2-21d1b1a66a59","name":"0ab801f3-77b9-4897-baa2-21d1b1a66a59","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a9e77be2-64e4-4dd1-a478-6b5a0b0a6ba8","name":"a9e77be2-64e4-4dd1-a478-6b5a0b0a6ba8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0ab801f3-77b9-4897-baa2-21d1b1a66a59","name":"0ab801f3-77b9-4897-baa2-21d1b1a66a59","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,12 +70,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9e77be2-64e4-4dd1-a478-6b5a0b0a6ba8","path":"sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"551ad9d7-f899-49d8-824c-c4aa630cc24b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ab801f3-77b9-4897-baa2-21d1b1a66a59","path":"sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93d5883f-4bed-45b6-9c83-3b88ce7201db","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a9e77be2-64e4-4dd1-a478-6b5a0b0a6ba8","path":"sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"551ad9d7-f899-49d8-824c-c4aa630cc24b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ab801f3-77b9-4897-baa2-21d1b1a66a59","path":"sprites/spr_weapon_relic_blade/spr_weapon_relic_blade.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93d5883f-4bed-45b6-9c83-3b88ce7201db","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_ryza_lasca/067bef0d-fca7-4bad-89fe-62dbd91dcd48.png b/sprites/spr_weapon_ryza_lasca/067bef0d-fca7-4bad-89fe-62dbd91dcd48.png new file mode 100644 index 0000000000..4730b04dbb Binary files /dev/null and b/sprites/spr_weapon_ryza_lasca/067bef0d-fca7-4bad-89fe-62dbd91dcd48.png differ diff --git a/sprites/spr_weapon_ryza_lasca/layers/067bef0d-fca7-4bad-89fe-62dbd91dcd48/3cc59cbf-fb62-4db5-a101-7c1c9698e24a.png b/sprites/spr_weapon_ryza_lasca/layers/067bef0d-fca7-4bad-89fe-62dbd91dcd48/3cc59cbf-fb62-4db5-a101-7c1c9698e24a.png new file mode 100644 index 0000000000..4730b04dbb Binary files /dev/null and b/sprites/spr_weapon_ryza_lasca/layers/067bef0d-fca7-4bad-89fe-62dbd91dcd48/3cc59cbf-fb62-4db5-a101-7c1c9698e24a.png differ diff --git a/sprites/spr_weapon_ryza_lasca/spr_weapon_ryza_lasca.yy b/sprites/spr_weapon_ryza_lasca/spr_weapon_ryza_lasca.yy new file mode 100644 index 0000000000..43a75549c4 --- /dev/null +++ b/sprites/spr_weapon_ryza_lasca/spr_weapon_ryza_lasca.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_ryza_lasca", + "bboxMode":0, + "bbox_bottom":171, + "bbox_left":61, + "bbox_right":298, + "bbox_top":96, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"067bef0d-fca7-4bad-89fe-62dbd91dcd48","name":"067bef0d-fca7-4bad-89fe-62dbd91dcd48","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":272, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"3cc59cbf-fb62-4db5-a101-7c1c9698e24a","blendMode":0,"displayName":"default","isLocked":false,"name":"3cc59cbf-fb62-4db5-a101-7c1c9698e24a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_ryza_lasca", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"heavy_ranged", + "path":"folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_ryza_lasca", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_ryza_lasca", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":301.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"067bef0d-fca7-4bad-89fe-62dbd91dcd48","path":"sprites/spr_weapon_ryza_lasca/spr_weapon_ryza_lasca.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"19660636-e8a8-4fcd-9358-1991c58309e0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":39, + "yorigin":21, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":301, +} \ No newline at end of file diff --git a/sprites/spr_weapon_ryza_plasg/8baa401d-fcf9-46d7-b840-bd2164b100ef.png b/sprites/spr_weapon_ryza_plasg/8baa401d-fcf9-46d7-b840-bd2164b100ef.png new file mode 100644 index 0000000000..8474826f38 Binary files /dev/null and b/sprites/spr_weapon_ryza_plasg/8baa401d-fcf9-46d7-b840-bd2164b100ef.png differ diff --git a/sprites/spr_weapon_ryza_plasg/layers/8baa401d-fcf9-46d7-b840-bd2164b100ef/2401f208-6b0e-4e06-8e13-c37a028d23b2.png b/sprites/spr_weapon_ryza_plasg/layers/8baa401d-fcf9-46d7-b840-bd2164b100ef/2401f208-6b0e-4e06-8e13-c37a028d23b2.png new file mode 100644 index 0000000000..8474826f38 Binary files /dev/null and b/sprites/spr_weapon_ryza_plasg/layers/8baa401d-fcf9-46d7-b840-bd2164b100ef/2401f208-6b0e-4e06-8e13-c37a028d23b2.png differ diff --git a/sprites/spr_weapon_ryza_plasg/spr_weapon_ryza_plasg.yy b/sprites/spr_weapon_ryza_plasg/spr_weapon_ryza_plasg.yy new file mode 100644 index 0000000000..ad0e6873a8 --- /dev/null +++ b/sprites/spr_weapon_ryza_plasg/spr_weapon_ryza_plasg.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_ryza_plasg", + "bboxMode":0, + "bbox_bottom":218, + "bbox_left":10, + "bbox_right":66, + "bbox_top":102, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"8baa401d-fcf9-46d7-b840-bd2164b100ef","name":"8baa401d-fcf9-46d7-b840-bd2164b100ef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"2401f208-6b0e-4e06-8e13-c37a028d23b2","blendMode":0,"displayName":"default","isLocked":false,"name":"2401f208-6b0e-4e06-8e13-c37a028d23b2","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_ryza_plasg", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"ranged", + "path":"folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_ryza_plasg", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_ryza_plasg", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8baa401d-fcf9-46d7-b840-bd2164b100ef","path":"sprites/spr_weapon_ryza_plasg/spr_weapon_ryza_plasg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1a1d58e1-a542-4b05-8eef-1f05965010fd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_ryza_plasp/187943a3-b1b6-4aee-8064-6942dae163d4.png b/sprites/spr_weapon_ryza_plasp/187943a3-b1b6-4aee-8064-6942dae163d4.png new file mode 100644 index 0000000000..921dcbadd3 Binary files /dev/null and b/sprites/spr_weapon_ryza_plasp/187943a3-b1b6-4aee-8064-6942dae163d4.png differ diff --git a/sprites/spr_weapon_ryza_plasp/layers/187943a3-b1b6-4aee-8064-6942dae163d4/8c36642c-c5e7-4e05-97b8-4b302c6f569a.png b/sprites/spr_weapon_ryza_plasp/layers/187943a3-b1b6-4aee-8064-6942dae163d4/8c36642c-c5e7-4e05-97b8-4b302c6f569a.png new file mode 100644 index 0000000000..921dcbadd3 Binary files /dev/null and b/sprites/spr_weapon_ryza_plasp/layers/187943a3-b1b6-4aee-8064-6942dae163d4/8c36642c-c5e7-4e05-97b8-4b302c6f569a.png differ diff --git a/sprites/spr_weapon_ryza_plasp/spr_weapon_ryza_plasp.yy b/sprites/spr_weapon_ryza_plasp/spr_weapon_ryza_plasp.yy new file mode 100644 index 0000000000..e19eef17f5 --- /dev/null +++ b/sprites/spr_weapon_ryza_plasp/spr_weapon_ryza_plasp.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_ryza_plasp", + "bboxMode":0, + "bbox_bottom":173, + "bbox_left":7, + "bbox_right":54, + "bbox_top":99, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"187943a3-b1b6-4aee-8064-6942dae163d4","name":"187943a3-b1b6-4aee-8064-6942dae163d4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"8c36642c-c5e7-4e05-97b8-4b302c6f569a","blendMode":0,"displayName":"default","isLocked":false,"name":"8c36642c-c5e7-4e05-97b8-4b302c6f569a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_ryza_plasp", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"ranged", + "path":"folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_ryza_plasp", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_ryza_plasp", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"187943a3-b1b6-4aee-8064-6942dae163d4","path":"sprites/spr_weapon_ryza_plasp/spr_weapon_ryza_plasp.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"9fb6b57d-3ba5-48c4-bee7-014fefcb6a3f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy b/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy index 6d5dd765a9..e6d328a315 100644 --- a/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy +++ b/sprites/spr_weapon_sbolter/spr_weapon_sbolter.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_sbolter", "bboxMode":0, "bbox_bottom":168, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","name":"f0dc16e8-bbd2-4823-87a1-ba3601853ffe","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -63,6 +63,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_weapon_shotgun/ed54fad2-a39b-4f07-9737-5b8f916bee92.png b/sprites/spr_weapon_shotgun/ed54fad2-a39b-4f07-9737-5b8f916bee92.png new file mode 100644 index 0000000000..986f85620d Binary files /dev/null and b/sprites/spr_weapon_shotgun/ed54fad2-a39b-4f07-9737-5b8f916bee92.png differ diff --git a/sprites/spr_weapon_shotgun/layers/ed54fad2-a39b-4f07-9737-5b8f916bee92/11b4c573-f844-42a2-905a-d6dace60762b.png b/sprites/spr_weapon_shotgun/layers/ed54fad2-a39b-4f07-9737-5b8f916bee92/11b4c573-f844-42a2-905a-d6dace60762b.png new file mode 100644 index 0000000000..986f85620d Binary files /dev/null and b/sprites/spr_weapon_shotgun/layers/ed54fad2-a39b-4f07-9737-5b8f916bee92/11b4c573-f844-42a2-905a-d6dace60762b.png differ diff --git a/sprites/spr_weapon_shotgun/spr_weapon_shotgun.yy b/sprites/spr_weapon_shotgun/spr_weapon_shotgun.yy new file mode 100644 index 0000000000..3b80d39ea6 --- /dev/null +++ b/sprites/spr_weapon_shotgun/spr_weapon_shotgun.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"", + "%Name":"spr_weapon_shotgun", + "bboxMode":0, + "bbox_bottom":192, + "bbox_left":31, + "bbox_right":62, + "bbox_top":99, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"11b4c573-f844-42a2-905a-d6dace60762b","blendMode":0,"displayName":"default","isLocked":false,"name":"11b4c573-f844-42a2-905a-d6dace60762b","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_shotgun", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":0, + "parent":{ + "name":"ranged", + "path":"folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_shotgun", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_shotgun", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed54fad2-a39b-4f07-9737-5b8f916bee92","path":"sprites/spr_weapon_shotgun/spr_weapon_shotgun.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1f0fec53-317a-4842-bc53-a72fcbb31466","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy b/sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy index c2164a8d03..6e901609ed 100644 --- a/sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy +++ b/sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_skill_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5c9ad60b-aa51-4a12-a391-cc9a458aa714","name":"5c9ad60b-aa51-4a12-a391-cc9a458aa714","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c9ad60b-aa51-4a12-a391-cc9a458aa714","name":"5c9ad60b-aa51-4a12-a391-cc9a458aa714","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c9ad60b-aa51-4a12-a391-cc9a458aa714","path":"sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b2f2a734-5d3b-4329-b118-519351df5fb9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c9ad60b-aa51-4a12-a391-cc9a458aa714","path":"sprites/spr_weapon_skill_icon/spr_weapon_skill_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b2f2a734-5d3b-4329-b118-519351df5fb9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_sniper/spr_weapon_sniper.yy b/sprites/spr_weapon_sniper/spr_weapon_sniper.yy index 24261b5e71..bdf2f96bc5 100644 --- a/sprites/spr_weapon_sniper/spr_weapon_sniper.yy +++ b/sprites/spr_weapon_sniper/spr_weapon_sniper.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_sniper", "bboxMode":0, "bbox_bottom":230, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","path":"sprites/spr_weapon_sniper/spr_weapon_sniper.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a7fe76e7-cc09-48ac-9bb7-983d65dd2ac7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"09e772d4-7976-49cd-a2e3-9dce1939fed0","path":"sprites/spr_weapon_sniper/spr_weapon_sniper.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a7fe76e7-cc09-48ac-9bb7-983d65dd2ac7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_stalker/spr_weapon_stalker.yy b/sprites/spr_weapon_stalker/spr_weapon_stalker.yy index 30d49bc521..336734d0b0 100644 --- a/sprites/spr_weapon_stalker/spr_weapon_stalker.yy +++ b/sprites/spr_weapon_stalker/spr_weapon_stalker.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_stalker", "bboxMode":0, "bbox_bottom":222, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"14db339f-7395-4530-87dc-3a3aace86211","name":"14db339f-7395-4530-87dc-3a3aace86211","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14db339f-7395-4530-87dc-3a3aace86211","name":"14db339f-7395-4530-87dc-3a3aace86211","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14db339f-7395-4530-87dc-3a3aace86211","path":"sprites/spr_weapon_stalker/spr_weapon_stalker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"160c40ae-6978-467b-a08b-d4ae57c05d2b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14db339f-7395-4530-87dc-3a3aace86211","path":"sprites/spr_weapon_stalker/spr_weapon_stalker.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"160c40ae-6978-467b-a08b-d4ae57c05d2b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_standard/spr_weapon_standard.yy b/sprites/spr_weapon_standard/spr_weapon_standard.yy index ef822e374e..9e9c106d96 100644 --- a/sprites/spr_weapon_standard/spr_weapon_standard.yy +++ b/sprites/spr_weapon_standard/spr_weapon_standard.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_standard", "bboxMode":0, "bbox_bottom":271, @@ -12,10 +12,10 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7a4a520a-7a19-4f59-bc07-dde98452c760","name":"7a4a520a-7a19-4f59-bc07-dde98452c760","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f2936088-e4f0-4a05-881d-20ac9d75bb29","name":"f2936088-e4f0-4a05-881d-20ac9d75bb29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cbce5203-3778-468e-b7c8-7515f6e18fde","name":"cbce5203-3778-468e-b7c8-7515f6e18fde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee70063b-766f-4ba8-8b3f-51fdb1ec6ec5","name":"ee70063b-766f-4ba8-8b3f-51fdb1ec6ec5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a4a520a-7a19-4f59-bc07-dde98452c760","name":"7a4a520a-7a19-4f59-bc07-dde98452c760","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f2936088-e4f0-4a05-881d-20ac9d75bb29","name":"f2936088-e4f0-4a05-881d-20ac9d75bb29","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"cbce5203-3778-468e-b7c8-7515f6e18fde","name":"cbce5203-3778-468e-b7c8-7515f6e18fde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee70063b-766f-4ba8-8b3f-51fdb1ec6ec5","name":"ee70063b-766f-4ba8-8b3f-51fdb1ec6ec5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -66,6 +66,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":167.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_weapon_standard2/spr_weapon_standard2.yy b/sprites/spr_weapon_standard2/spr_weapon_standard2.yy index f6a4e046fa..cef5915ae3 100644 --- a/sprites/spr_weapon_standard2/spr_weapon_standard2.yy +++ b/sprites/spr_weapon_standard2/spr_weapon_standard2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_standard2", "bboxMode":0, "bbox_bottom":281, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"fc5175d3-d91f-4714-a7cf-f97f841078f9","name":"fc5175d3-d91f-4714-a7cf-f97f841078f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3e954feb-84ef-4aa3-9cde-3ff472c5b06b","name":"3e954feb-84ef-4aa3-9cde-3ff472c5b06b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"fc5175d3-d91f-4714-a7cf-f97f841078f9","name":"fc5175d3-d91f-4714-a7cf-f97f841078f9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3e954feb-84ef-4aa3-9cde-3ff472c5b06b","name":"3e954feb-84ef-4aa3-9cde-3ff472c5b06b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -65,6 +65,8 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":282.0, + "seqWidth":207.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, diff --git a/sprites/spr_weapon_storm/spr_weapon_storm.yy b/sprites/spr_weapon_storm/spr_weapon_storm.yy index 92da4f20fc..fd92cfb168 100644 --- a/sprites/spr_weapon_storm/spr_weapon_storm.yy +++ b/sprites/spr_weapon_storm/spr_weapon_storm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_storm", "bboxMode":0, "bbox_bottom":178, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"daea238a-4d48-48a6-be27-b0685c438110","name":"daea238a-4d48-48a6-be27-b0685c438110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"daea238a-4d48-48a6-be27-b0685c438110","name":"daea238a-4d48-48a6-be27-b0685c438110","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"daea238a-4d48-48a6-be27-b0685c438110","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ee3e6256-19ea-4071-91e7-fdc1b74bcdff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c0636cd-15ad-4c13-934c-2259a4748348","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"daea238a-4d48-48a6-be27-b0685c438110","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ee3e6256-19ea-4071-91e7-fdc1b74bcdff","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ee465ab4-6f68-4a2c-9730-d75939fe4cdb","path":"sprites/spr_weapon_storm/spr_weapon_storm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c0636cd-15ad-4c13-934c-2259a4748348","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_storm2/spr_weapon_storm2.yy b/sprites/spr_weapon_storm2/spr_weapon_storm2.yy index 1f20f6e4f6..5f65d5500c 100644 --- a/sprites/spr_weapon_storm2/spr_weapon_storm2.yy +++ b/sprites/spr_weapon_storm2/spr_weapon_storm2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_storm2", "bboxMode":0, "bbox_bottom":156, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"2d1cb628-a0f2-4600-b7e6-b5bd352c12b6","name":"2d1cb628-a0f2-4600-b7e6-b5bd352c12b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"92b335a7-bf24-4f08-8e25-68f66ea594da","name":"92b335a7-bf24-4f08-8e25-68f66ea594da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2d1cb628-a0f2-4600-b7e6-b5bd352c12b6","name":"2d1cb628-a0f2-4600-b7e6-b5bd352c12b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"92b335a7-bf24-4f08-8e25-68f66ea594da","name":"92b335a7-bf24-4f08-8e25-68f66ea594da","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d1cb628-a0f2-4600-b7e6-b5bd352c12b6","path":"sprites/spr_weapon_storm2/spr_weapon_storm2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"652f8a4e-ce6f-49f9-bdfc-7ed6eb9bb380","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"92b335a7-bf24-4f08-8e25-68f66ea594da","path":"sprites/spr_weapon_storm2/spr_weapon_storm2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9105c9ef-4d04-49b9-af90-81abd84cb227","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2d1cb628-a0f2-4600-b7e6-b5bd352c12b6","path":"sprites/spr_weapon_storm2/spr_weapon_storm2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"652f8a4e-ce6f-49f9-bdfc-7ed6eb9bb380","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"92b335a7-bf24-4f08-8e25-68f66ea594da","path":"sprites/spr_weapon_storm2/spr_weapon_storm2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9105c9ef-4d04-49b9-af90-81abd84cb227","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy b/sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy index 8d1c0d7c90..f26aeeaf43 100644 --- a/sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy +++ b/sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_storm_tall", "bboxMode":0, "bbox_bottom":221, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f6262674-c261-4da7-aa0e-506e3196aa81","name":"f6262674-c261-4da7-aa0e-506e3196aa81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f6262674-c261-4da7-aa0e-506e3196aa81","name":"f6262674-c261-4da7-aa0e-506e3196aa81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6262674-c261-4da7-aa0e-506e3196aa81","path":"sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2995137d-6005-4690-8d87-3db7ccdd4a8f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","path":"sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d37d0b5a-f4ff-4e58-a47e-444660a0acf0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f6262674-c261-4da7-aa0e-506e3196aa81","path":"sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2995137d-6005-4690-8d87-3db7ccdd4a8f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c0e369b0-ce8e-42eb-8a69-e7058b47bcff","path":"sprites/spr_weapon_storm_tall/spr_weapon_storm_tall.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d37d0b5a-f4ff-4e58-a47e-444660a0acf0","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy b/sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy index 25ff52f98a..95d9666d6c 100644 --- a/sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy +++ b/sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_storm_tall_2", "bboxMode":0, "bbox_bottom":231, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"05d4f358-c637-4959-b4f8-043dddfe5af9","name":"05d4f358-c637-4959-b4f8-043dddfe5af9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"0ae042dd-6007-483e-a319-a21e64ff24ac","name":"0ae042dd-6007-483e-a319-a21e64ff24ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"05d4f358-c637-4959-b4f8-043dddfe5af9","name":"05d4f358-c637-4959-b4f8-043dddfe5af9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0ae042dd-6007-483e-a319-a21e64ff24ac","name":"0ae042dd-6007-483e-a319-a21e64ff24ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -71,12 +71,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"05d4f358-c637-4959-b4f8-043dddfe5af9","path":"sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"08ecee5b-0d7d-4070-b8ec-270dfd0e535c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ae042dd-6007-483e-a319-a21e64ff24ac","path":"sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"82b4df8c-0dbd-4454-99f2-0cd556e14669","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"05d4f358-c637-4959-b4f8-043dddfe5af9","path":"sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"08ecee5b-0d7d-4070-b8ec-270dfd0e535c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ae042dd-6007-483e-a319-a21e64ff24ac","path":"sprites/spr_weapon_storm_tall_2/spr_weapon_storm_tall_2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"82b4df8c-0dbd-4454-99f2-0cd556e14669","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy b/sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy index d0d37c7e13..94e577d46e 100644 --- a/sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy +++ b/sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_sword_oriental", "bboxMode":0, "bbox_bottom":231, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"c811cdad-6281-47b5-bc49-194a06afa81a","name":"c811cdad-6281-47b5-bc49-194a06afa81a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c811cdad-6281-47b5-bc49-194a06afa81a","name":"c811cdad-6281-47b5-bc49-194a06afa81a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c811cdad-6281-47b5-bc49-194a06afa81a","path":"sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f5366391-42ac-4772-bf63-3a1f398c0acc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c811cdad-6281-47b5-bc49-194a06afa81a","path":"sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f5366391-42ac-4772-bf63-3a1f398c0acc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy b/sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy index 79ea6bd9ab..fb8329d946 100644 --- a/sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy +++ b/sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_sword_turk", "bboxMode":0, "bbox_bottom":221, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"88d55934-39f8-4cf5-b787-e8fcfa454635","name":"88d55934-39f8-4cf5-b787-e8fcfa454635","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"88d55934-39f8-4cf5-b787-e8fcfa454635","name":"88d55934-39f8-4cf5-b787-e8fcfa454635","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"88d55934-39f8-4cf5-b787-e8fcfa454635","path":"sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cfdbccb1-0a44-4898-a80b-736ec777a6e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"88d55934-39f8-4cf5-b787-e8fcfa454635","path":"sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cfdbccb1-0a44-4898-a80b-736ec777a6e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy b/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy index 553d5c8398..0e3530514c 100644 --- a/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy +++ b/sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_thhammer", "bboxMode":0, "bbox_bottom":220, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"6d683d25-adba-4942-a5d9-ef5f267f4485","name":"6d683d25-adba-4942-a5d9-ef5f267f4485","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7091a0da-79ce-4cc8-90f4-c0cc1f33d26f","name":"7091a0da-79ce-4cc8-90f4-c0cc1f33d26f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6d683d25-adba-4942-a5d9-ef5f267f4485","name":"6d683d25-adba-4942-a5d9-ef5f267f4485","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7091a0da-79ce-4cc8-90f4-c0cc1f33d26f","name":"7091a0da-79ce-4cc8-90f4-c0cc1f33d26f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d683d25-adba-4942-a5d9-ef5f267f4485","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2ff65f5b-1f6b-4784-8772-4baedbf78fa4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7091a0da-79ce-4cc8-90f4-c0cc1f33d26f","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1174f450-c54c-4b3f-91db-ea2d44f77ee5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6d683d25-adba-4942-a5d9-ef5f267f4485","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2ff65f5b-1f6b-4784-8772-4baedbf78fa4","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7091a0da-79ce-4cc8-90f4-c0cc1f33d26f","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1174f450-c54c-4b3f-91db-ea2d44f77ee5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapon_tigris_combi/b3d7b70f-4483-4f84-8860-eab1782faab0.png b/sprites/spr_weapon_tigris_combi/b3d7b70f-4483-4f84-8860-eab1782faab0.png new file mode 100644 index 0000000000..564689074d Binary files /dev/null and b/sprites/spr_weapon_tigris_combi/b3d7b70f-4483-4f84-8860-eab1782faab0.png differ diff --git a/sprites/spr_weapon_tigris_combi/layers/b3d7b70f-4483-4f84-8860-eab1782faab0/5ea71bce-75c2-4ee0-b0da-6d7aa5a267c2.png b/sprites/spr_weapon_tigris_combi/layers/b3d7b70f-4483-4f84-8860-eab1782faab0/5ea71bce-75c2-4ee0-b0da-6d7aa5a267c2.png new file mode 100644 index 0000000000..564689074d Binary files /dev/null and b/sprites/spr_weapon_tigris_combi/layers/b3d7b70f-4483-4f84-8860-eab1782faab0/5ea71bce-75c2-4ee0-b0da-6d7aa5a267c2.png differ diff --git a/sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy b/sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy new file mode 100644 index 0000000000..b524790f40 --- /dev/null +++ b/sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_tigris_combi", + "bboxMode":0, + "bbox_bottom":194, + "bbox_left":0, + "bbox_right":61, + "bbox_top":93, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b3d7b70f-4483-4f84-8860-eab1782faab0","name":"b3d7b70f-4483-4f84-8860-eab1782faab0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"5ea71bce-75c2-4ee0-b0da-6d7aa5a267c2","blendMode":0,"displayName":"default","isLocked":false,"name":"5ea71bce-75c2-4ee0-b0da-6d7aa5a267c2","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_tigris_combi", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":0, + "parent":{ + "name":"ranged", + "path":"folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_tigris_combi", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_tigris_combi", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b3d7b70f-4483-4f84-8860-eab1782faab0","path":"sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6c97b54a-b92f-4c35-851d-c3c9c616fc1e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_volkite_caliver/85c35f09-7885-4620-994b-f2cdea15616f.png b/sprites/spr_weapon_volkite_caliver/85c35f09-7885-4620-994b-f2cdea15616f.png new file mode 100644 index 0000000000..a617d83031 Binary files /dev/null and b/sprites/spr_weapon_volkite_caliver/85c35f09-7885-4620-994b-f2cdea15616f.png differ diff --git a/sprites/spr_weapon_volkite_caliver/layers/85c35f09-7885-4620-994b-f2cdea15616f/013b86b2-2c2c-4f20-bd1d-d814a1d77f93.png b/sprites/spr_weapon_volkite_caliver/layers/85c35f09-7885-4620-994b-f2cdea15616f/013b86b2-2c2c-4f20-bd1d-d814a1d77f93.png new file mode 100644 index 0000000000..a617d83031 Binary files /dev/null and b/sprites/spr_weapon_volkite_caliver/layers/85c35f09-7885-4620-994b-f2cdea15616f/013b86b2-2c2c-4f20-bd1d-d814a1d77f93.png differ diff --git a/sprites/spr_weapon_volkite_caliver/spr_weapon_volkite_caliver.yy b/sprites/spr_weapon_volkite_caliver/spr_weapon_volkite_caliver.yy new file mode 100644 index 0000000000..c761e69726 --- /dev/null +++ b/sprites/spr_weapon_volkite_caliver/spr_weapon_volkite_caliver.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_volkite_caliver", + "bboxMode":0, + "bbox_bottom":132, + "bbox_left":64, + "bbox_right":213, + "bbox_top":74, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"85c35f09-7885-4620-994b-f2cdea15616f","name":"85c35f09-7885-4620-994b-f2cdea15616f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":272, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"013b86b2-2c2c-4f20-bd1d-d814a1d77f93","blendMode":0,"displayName":"default","isLocked":false,"name":"013b86b2-2c2c-4f20-bd1d-d814a1d77f93","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_volkite_caliver", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"heavy_ranged", + "path":"folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_volkite_caliver", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_volkite_caliver", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":301.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"85c35f09-7885-4620-994b-f2cdea15616f","path":"sprites/spr_weapon_volkite_caliver/spr_weapon_volkite_caliver.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1599d57c-ba2a-41d2-9614-5a630edf1201","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":39, + "yorigin":21, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":301, +} \ No newline at end of file diff --git a/sprites/spr_weapon_volkite_charger/b91b3e74-91d9-46d1-b954-65c7a49d8b7d.png b/sprites/spr_weapon_volkite_charger/b91b3e74-91d9-46d1-b954-65c7a49d8b7d.png new file mode 100644 index 0000000000..8ed5fecb09 Binary files /dev/null and b/sprites/spr_weapon_volkite_charger/b91b3e74-91d9-46d1-b954-65c7a49d8b7d.png differ diff --git a/sprites/spr_weapon_volkite_charger/layers/b91b3e74-91d9-46d1-b954-65c7a49d8b7d/e98a4021-39fb-45ff-81e5-78fc2e913c77.png b/sprites/spr_weapon_volkite_charger/layers/b91b3e74-91d9-46d1-b954-65c7a49d8b7d/e98a4021-39fb-45ff-81e5-78fc2e913c77.png new file mode 100644 index 0000000000..8ed5fecb09 Binary files /dev/null and b/sprites/spr_weapon_volkite_charger/layers/b91b3e74-91d9-46d1-b954-65c7a49d8b7d/e98a4021-39fb-45ff-81e5-78fc2e913c77.png differ diff --git a/sprites/spr_weapon_volkite_charger/spr_weapon_volkite_charger.yy b/sprites/spr_weapon_volkite_charger/spr_weapon_volkite_charger.yy new file mode 100644 index 0000000000..0ec12375f6 --- /dev/null +++ b/sprites/spr_weapon_volkite_charger/spr_weapon_volkite_charger.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_volkite_charger", + "bboxMode":0, + "bbox_bottom":196, + "bbox_left":3, + "bbox_right":61, + "bbox_top":98, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b91b3e74-91d9-46d1-b954-65c7a49d8b7d","name":"b91b3e74-91d9-46d1-b954-65c7a49d8b7d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"e98a4021-39fb-45ff-81e5-78fc2e913c77","blendMode":0,"displayName":"default","isLocked":false,"name":"e98a4021-39fb-45ff-81e5-78fc2e913c77","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_volkite_charger", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":0, + "parent":{ + "name":"ranged", + "path":"folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_volkite_charger", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_volkite_charger", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b91b3e74-91d9-46d1-b954-65c7a49d8b7d","path":"sprites/spr_weapon_volkite_charger/spr_weapon_volkite_charger.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"4fd01b85-2055-4135-b8d2-6b4b621d9ab0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_volkite_culverin/7b3c2e59-eccf-4cac-a8b2-eae514f15c3c.png b/sprites/spr_weapon_volkite_culverin/7b3c2e59-eccf-4cac-a8b2-eae514f15c3c.png new file mode 100644 index 0000000000..84d146a54c Binary files /dev/null and b/sprites/spr_weapon_volkite_culverin/7b3c2e59-eccf-4cac-a8b2-eae514f15c3c.png differ diff --git a/sprites/spr_weapon_volkite_culverin/layers/7b3c2e59-eccf-4cac-a8b2-eae514f15c3c/7be89fef-b0dd-4ad6-b42c-9e1dac1d31b8.png b/sprites/spr_weapon_volkite_culverin/layers/7b3c2e59-eccf-4cac-a8b2-eae514f15c3c/7be89fef-b0dd-4ad6-b42c-9e1dac1d31b8.png new file mode 100644 index 0000000000..84d146a54c Binary files /dev/null and b/sprites/spr_weapon_volkite_culverin/layers/7b3c2e59-eccf-4cac-a8b2-eae514f15c3c/7be89fef-b0dd-4ad6-b42c-9e1dac1d31b8.png differ diff --git a/sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy b/sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy new file mode 100644 index 0000000000..9ebff9c171 --- /dev/null +++ b/sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_volkite_culverin", + "bboxMode":0, + "bbox_bottom":205, + "bbox_left":62, + "bbox_right":292, + "bbox_top":48, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"7b3c2e59-eccf-4cac-a8b2-eae514f15c3c","name":"7b3c2e59-eccf-4cac-a8b2-eae514f15c3c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":272, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"7be89fef-b0dd-4ad6-b42c-9e1dac1d31b8","blendMode":0,"displayName":"default","isLocked":false,"name":"7be89fef-b0dd-4ad6-b42c-9e1dac1d31b8","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_volkite_culverin", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"heavy_ranged", + "path":"folders/Sprites/Marine Viewer/weapons/heavy_ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_volkite_culverin", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_volkite_culverin", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":272.0, + "seqWidth":301.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b3c2e59-eccf-4cac-a8b2-eae514f15c3c","path":"sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b2036d21-4883-45d2-b1e5-9c4e107df919","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":39, + "yorigin":21, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":301, +} \ No newline at end of file diff --git a/sprites/spr_weapon_volkite_culverin_term/175b3fc0-27ea-4b35-bab7-7867c6fa811b.png b/sprites/spr_weapon_volkite_culverin_term/175b3fc0-27ea-4b35-bab7-7867c6fa811b.png new file mode 100644 index 0000000000..8f107824d8 Binary files /dev/null and b/sprites/spr_weapon_volkite_culverin_term/175b3fc0-27ea-4b35-bab7-7867c6fa811b.png differ diff --git a/sprites/spr_weapon_volkite_culverin_term/layers/175b3fc0-27ea-4b35-bab7-7867c6fa811b/929a717e-45ba-45eb-915b-7e0136b8f8d3.png b/sprites/spr_weapon_volkite_culverin_term/layers/175b3fc0-27ea-4b35-bab7-7867c6fa811b/929a717e-45ba-45eb-915b-7e0136b8f8d3.png new file mode 100644 index 0000000000..8f107824d8 Binary files /dev/null and b/sprites/spr_weapon_volkite_culverin_term/layers/175b3fc0-27ea-4b35-bab7-7867c6fa811b/929a717e-45ba-45eb-915b-7e0136b8f8d3.png differ diff --git a/sprites/spr_weapon_volkite_culverin_term/spr_weapon_volkite_culverin_term.yy b/sprites/spr_weapon_volkite_culverin_term/spr_weapon_volkite_culverin_term.yy new file mode 100644 index 0000000000..9560c5517a --- /dev/null +++ b/sprites/spr_weapon_volkite_culverin_term/spr_weapon_volkite_culverin_term.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_volkite_culverin_term", + "bboxMode":0, + "bbox_bottom":203, + "bbox_left":31, + "bbox_right":64, + "bbox_top":104, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"175b3fc0-27ea-4b35-bab7-7867c6fa811b","name":"175b3fc0-27ea-4b35-bab7-7867c6fa811b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":262, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"929a717e-45ba-45eb-915b-7e0136b8f8d3","blendMode":0,"displayName":"default","isLocked":false,"name":"929a717e-45ba-45eb-915b-7e0136b8f8d3","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_volkite_culverin_term", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"weapons_terminator", + "path":"folders/Sprites/Marine Viewer/weapons_terminator.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_volkite_culverin_term", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_volkite_culverin_term", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":262.0, + "seqWidth":221.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"175b3fc0-27ea-4b35-bab7-7867c6fa811b","path":"sprites/spr_weapon_volkite_culverin_term/spr_weapon_volkite_culverin_term.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"56beb6db-0944-4439-80f6-ba38c9511580","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":20, + "yorigin":38, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":221, +} \ No newline at end of file diff --git a/sprites/spr_weapon_volkite_serpenta/73214df0-5c58-4848-aae2-d68778f0fe65.png b/sprites/spr_weapon_volkite_serpenta/73214df0-5c58-4848-aae2-d68778f0fe65.png new file mode 100644 index 0000000000..2490d00c84 Binary files /dev/null and b/sprites/spr_weapon_volkite_serpenta/73214df0-5c58-4848-aae2-d68778f0fe65.png differ diff --git a/sprites/spr_weapon_volkite_serpenta/layers/73214df0-5c58-4848-aae2-d68778f0fe65/9b9d7ab4-6736-4bc5-b3cc-4d650606eedb.png b/sprites/spr_weapon_volkite_serpenta/layers/73214df0-5c58-4848-aae2-d68778f0fe65/9b9d7ab4-6736-4bc5-b3cc-4d650606eedb.png new file mode 100644 index 0000000000..2490d00c84 Binary files /dev/null and b/sprites/spr_weapon_volkite_serpenta/layers/73214df0-5c58-4848-aae2-d68778f0fe65/9b9d7ab4-6736-4bc5-b3cc-4d650606eedb.png differ diff --git a/sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy b/sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy new file mode 100644 index 0000000000..5bf98b47ea --- /dev/null +++ b/sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_volkite_serpenta", + "bboxMode":0, + "bbox_bottom":204, + "bbox_left":16, + "bbox_right":63, + "bbox_top":94, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"73214df0-5c58-4848-aae2-d68778f0fe65","name":"73214df0-5c58-4848-aae2-d68778f0fe65","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"9b9d7ab4-6736-4bc5-b3cc-4d650606eedb","blendMode":0,"displayName":"default","isLocked":false,"name":"9b9d7ab4-6736-4bc5-b3cc-4d650606eedb","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_volkite_serpenta", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":0, + "parent":{ + "name":"ranged", + "path":"folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_volkite_serpenta", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_volkite_serpenta", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73214df0-5c58-4848-aae2-d68778f0fe65","path":"sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"fbb0a04d-9eb3-48d6-9bbd-379d17e44217","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_webber/bf9a239f-9a87-46c1-8e5a-f7fffe7f92b6.png b/sprites/spr_weapon_webber/bf9a239f-9a87-46c1-8e5a-f7fffe7f92b6.png new file mode 100644 index 0000000000..78eb1285e1 Binary files /dev/null and b/sprites/spr_weapon_webber/bf9a239f-9a87-46c1-8e5a-f7fffe7f92b6.png differ diff --git a/sprites/spr_weapon_webber/layers/bf9a239f-9a87-46c1-8e5a-f7fffe7f92b6/ce2787ec-c8b6-4e14-80e1-84383b3a7d85.png b/sprites/spr_weapon_webber/layers/bf9a239f-9a87-46c1-8e5a-f7fffe7f92b6/ce2787ec-c8b6-4e14-80e1-84383b3a7d85.png new file mode 100644 index 0000000000..78eb1285e1 Binary files /dev/null and b/sprites/spr_weapon_webber/layers/bf9a239f-9a87-46c1-8e5a-f7fffe7f92b6/ce2787ec-c8b6-4e14-80e1-84383b3a7d85.png differ diff --git a/sprites/spr_weapon_webber/spr_weapon_webber.yy b/sprites/spr_weapon_webber/spr_weapon_webber.yy new file mode 100644 index 0000000000..35fb8ca9b3 --- /dev/null +++ b/sprites/spr_weapon_webber/spr_weapon_webber.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_webber", + "bboxMode":0, + "bbox_bottom":214, + "bbox_left":8, + "bbox_right":58, + "bbox_top":103, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"bf9a239f-9a87-46c1-8e5a-f7fffe7f92b6","name":"bf9a239f-9a87-46c1-8e5a-f7fffe7f92b6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"ce2787ec-c8b6-4e14-80e1-84383b3a7d85","blendMode":0,"displayName":"default","isLocked":false,"name":"ce2787ec-c8b6-4e14-80e1-84383b3a7d85","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_webber", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"ranged", + "path":"folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_webber", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_webber", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bf9a239f-9a87-46c1-8e5a-f7fffe7f92b6","path":"sprites/spr_weapon_webber/spr_weapon_webber.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b3409a9f-5b49-4e43-9adb-7a381e746c1f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_webber_shadow/e49211b4-dae2-4246-8992-dba7743f6434.png b/sprites/spr_weapon_webber_shadow/e49211b4-dae2-4246-8992-dba7743f6434.png new file mode 100644 index 0000000000..6cb5ed5fba Binary files /dev/null and b/sprites/spr_weapon_webber_shadow/e49211b4-dae2-4246-8992-dba7743f6434.png differ diff --git a/sprites/spr_weapon_webber_shadow/layers/e49211b4-dae2-4246-8992-dba7743f6434/d4c4f377-b8d5-4aae-aad3-c8aefb391a14.png b/sprites/spr_weapon_webber_shadow/layers/e49211b4-dae2-4246-8992-dba7743f6434/d4c4f377-b8d5-4aae-aad3-c8aefb391a14.png new file mode 100644 index 0000000000..6cb5ed5fba Binary files /dev/null and b/sprites/spr_weapon_webber_shadow/layers/e49211b4-dae2-4246-8992-dba7743f6434/d4c4f377-b8d5-4aae-aad3-c8aefb391a14.png differ diff --git a/sprites/spr_weapon_webber_shadow/spr_weapon_webber_shadow.yy b/sprites/spr_weapon_webber_shadow/spr_weapon_webber_shadow.yy new file mode 100644 index 0000000000..4f7f2b6302 --- /dev/null +++ b/sprites/spr_weapon_webber_shadow/spr_weapon_webber_shadow.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapon_webber_shadow", + "bboxMode":0, + "bbox_bottom":156, + "bbox_left":31, + "bbox_right":55, + "bbox_top":132, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"e49211b4-dae2-4246-8992-dba7743f6434","name":"e49211b4-dae2-4246-8992-dba7743f6434","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":231, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"d4c4f377-b8d5-4aae-aad3-c8aefb391a14","blendMode":0,"displayName":"default","isLocked":false,"name":"d4c4f377-b8d5-4aae-aad3-c8aefb391a14","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapon_webber_shadow", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"ranged", + "path":"folders/Sprites/Marine Viewer/weapons/ranged.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapon_webber_shadow", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapon_webber_shadow", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":231.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e49211b4-dae2-4246-8992-dba7743f6434","path":"sprites/spr_weapon_webber_shadow/spr_weapon_webber_shadow.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"961a7f78-bccc-455a-ad86-a378abf2cba3","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy b/sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy index e5646cd0ff..8ad2bdb8bd 100644 --- a/sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy +++ b/sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_weapon_xenophase_blade_var1", "bboxMode":0, "bbox_bottom":220, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9f12e580-11d2-41e9-a836-732806ddd9e1","name":"9f12e580-11d2-41e9-a836-732806ddd9e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9f12e580-11d2-41e9-a836-732806ddd9e1","name":"9f12e580-11d2-41e9-a836-732806ddd9e1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f12e580-11d2-41e9-a836-732806ddd9e1","path":"sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"460f9a3b-0ee2-44d7-804f-d40f568a1d51","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9f12e580-11d2-41e9-a836-732806ddd9e1","path":"sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"460f9a3b-0ee2-44d7-804f-d40f568a1d51","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_weapoon_powso_flamberge/b9e276c7-1d8b-4129-82dc-1842ecff6f07.png b/sprites/spr_weapoon_powso_flamberge/b9e276c7-1d8b-4129-82dc-1842ecff6f07.png new file mode 100644 index 0000000000..beb610c16e Binary files /dev/null and b/sprites/spr_weapoon_powso_flamberge/b9e276c7-1d8b-4129-82dc-1842ecff6f07.png differ diff --git a/sprites/spr_weapoon_powso_flamberge/layers/b9e276c7-1d8b-4129-82dc-1842ecff6f07/14afc33a-1a1a-4c24-bf75-ee4e1cb523e8.png b/sprites/spr_weapoon_powso_flamberge/layers/b9e276c7-1d8b-4129-82dc-1842ecff6f07/14afc33a-1a1a-4c24-bf75-ee4e1cb523e8.png new file mode 100644 index 0000000000..beb610c16e Binary files /dev/null and b/sprites/spr_weapoon_powso_flamberge/layers/b9e276c7-1d8b-4129-82dc-1842ecff6f07/14afc33a-1a1a-4c24-bf75-ee4e1cb523e8.png differ diff --git a/sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy b/sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy new file mode 100644 index 0000000000..4be445fa19 --- /dev/null +++ b/sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy @@ -0,0 +1,90 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_weapoon_powso_flamberge", + "bboxMode":0, + "bbox_bottom":219, + "bbox_left":19, + "bbox_right":61, + "bbox_top":39, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b9e276c7-1d8b-4129-82dc-1842ecff6f07","name":"b9e276c7-1d8b-4129-82dc-1842ecff6f07","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":322, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"14afc33a-1a1a-4c24-bf75-ee4e1cb523e8","blendMode":0,"displayName":"default","isLocked":false,"name":"14afc33a-1a1a-4c24-bf75-ee4e1cb523e8","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_weapoon_powso_flamberge", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"melee", + "path":"folders/Sprites/Marine Viewer/weapons/melee.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_weapoon_powso_flamberge", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_weapoon_powso_flamberge", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":322.0, + "seqWidth":167.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9e276c7-1d8b-4129-82dc-1842ecff6f07","path":"sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93646429-a51d-45af-b161-669f4ae09116","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":167, +} \ No newline at end of file diff --git a/sprites/spr_welcome_bg/spr_welcome_bg.yy b/sprites/spr_welcome_bg/spr_welcome_bg.yy index 820c193573..e07329010c 100644 --- a/sprites/spr_welcome_bg/spr_welcome_bg.yy +++ b/sprites/spr_welcome_bg/spr_welcome_bg.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_welcome_bg", "bboxMode":0, "bbox_bottom":717, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"0e4d5dc2-9e3f-47bf-8eb3-29b65da13289","name":"0e4d5dc2-9e3f-47bf-8eb3-29b65da13289","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"0e4d5dc2-9e3f-47bf-8eb3-29b65da13289","name":"0e4d5dc2-9e3f-47bf-8eb3-29b65da13289","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e4d5dc2-9e3f-47bf-8eb3-29b65da13289","path":"sprites/spr_welcome_bg/spr_welcome_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2271bb95-4e9b-40ac-9214-44ff3a002300","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"0e4d5dc2-9e3f-47bf-8eb3-29b65da13289","path":"sprites/spr_welcome_bg/spr_welcome_bg.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2271bb95-4e9b-40ac-9214-44ff3a002300","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_wings/spr_wings.yy b/sprites/spr_wings/spr_wings.yy index 9fad0d3742..ca71e2281d 100644 --- a/sprites/spr_wings/spr_wings.yy +++ b/sprites/spr_wings/spr_wings.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_wings", "bboxMode":0, "bbox_bottom":199, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"633f09f2-db3b-4b35-afd5-d04b2ce031b9","name":"633f09f2-db3b-4b35-afd5-d04b2ce031b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"633f09f2-db3b-4b35-afd5-d04b2ce031b9","name":"633f09f2-db3b-4b35-afd5-d04b2ce031b9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"633f09f2-db3b-4b35-afd5-d04b2ce031b9","path":"sprites/spr_wings/spr_wings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9592866-0134-4230-8307-ca1670527c95","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"633f09f2-db3b-4b35-afd5-d04b2ce031b9","path":"sprites/spr_wings/spr_wings.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9592866-0134-4230-8307-ca1670527c95","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_wisdom_icon/spr_wisdom_icon.yy b/sprites/spr_wisdom_icon/spr_wisdom_icon.yy index 76abac1c73..aeefde3e55 100644 --- a/sprites/spr_wisdom_icon/spr_wisdom_icon.yy +++ b/sprites/spr_wisdom_icon/spr_wisdom_icon.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_wisdom_icon", "bboxMode":0, "bbox_bottom":56, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"3bbcf618-5a44-4096-8419-d1f5a0080164","name":"3bbcf618-5a44-4096-8419-d1f5a0080164","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3bbcf618-5a44-4096-8419-d1f5a0080164","name":"3bbcf618-5a44-4096-8419-d1f5a0080164","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bbcf618-5a44-4096-8419-d1f5a0080164","path":"sprites/spr_wisdom_icon/spr_wisdom_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7aeb2f92-2fa6-410a-9c77-f83f039bc28f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3bbcf618-5a44-4096-8419-d1f5a0080164","path":"sprites/spr_wisdom_icon/spr_wisdom_icon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7aeb2f92-2fa6-410a-9c77-f83f039bc28f","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_wolf_tail/spr_wolf_tail.yy b/sprites/spr_wolf_tail/spr_wolf_tail.yy index d5bdb393fb..e43d16b69a 100644 --- a/sprites/spr_wolf_tail/spr_wolf_tail.yy +++ b/sprites/spr_wolf_tail/spr_wolf_tail.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_wolf_tail", "bboxMode":0, "bbox_bottom":66, @@ -12,9 +12,9 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b90f1a4f-e127-4476-a034-e7e662bfb45c","name":"b90f1a4f-e127-4476-a034-e7e662bfb45c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"86713530-ec28-4099-9e88-05c203661df3","name":"86713530-ec28-4099-9e88-05c203661df3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b90f1a4f-e127-4476-a034-e7e662bfb45c","name":"b90f1a4f-e127-4476-a034-e7e662bfb45c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"86713530-ec28-4099-9e88-05c203661df3","name":"86713530-ec28-4099-9e88-05c203661df3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,15 +70,9 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d5a2f0ae-ed1f-4c48-a9c9-8bef775b955e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b90f1a4f-e127-4476-a034-e7e662bfb45c","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba562b9d-ac8b-4e7c-8d71-0c6b9581c167","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"86713530-ec28-4099-9e88-05c203661df3","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ce5a623c-7be4-487f-81b2-de39672f4cfa","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"db6935ae-cfa8-4c74-b21c-6a3fc6b9ec5d","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d5a2f0ae-ed1f-4c48-a9c9-8bef775b955e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b90f1a4f-e127-4476-a034-e7e662bfb45c","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba562b9d-ac8b-4e7c-8d71-0c6b9581c167","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"86713530-ec28-4099-9e88-05c203661df3","path":"sprites/spr_wolf_tail/spr_wolf_tail.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ce5a623c-7be4-487f-81b2-de39672f4cfa","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_woodland_camo_texture/84d3070e-3990-4645-82fd-0e5bef034f40.png b/sprites/spr_woodland_camo_texture/84d3070e-3990-4645-82fd-0e5bef034f40.png new file mode 100644 index 0000000000..7a10a342ac Binary files /dev/null and b/sprites/spr_woodland_camo_texture/84d3070e-3990-4645-82fd-0e5bef034f40.png differ diff --git a/sprites/spr_woodland_camo_texture/layers/84d3070e-3990-4645-82fd-0e5bef034f40/33d3ce3c-a730-49af-b57c-695abc0d76f5.png b/sprites/spr_woodland_camo_texture/layers/84d3070e-3990-4645-82fd-0e5bef034f40/33d3ce3c-a730-49af-b57c-695abc0d76f5.png new file mode 100644 index 0000000000..29174afe40 Binary files /dev/null and b/sprites/spr_woodland_camo_texture/layers/84d3070e-3990-4645-82fd-0e5bef034f40/33d3ce3c-a730-49af-b57c-695abc0d76f5.png differ diff --git a/sprites/spr_woodland_camo_texture/spr_woodland_camo_texture.yy b/sprites/spr_woodland_camo_texture/spr_woodland_camo_texture.yy new file mode 100644 index 0000000000..c7edb34b31 --- /dev/null +++ b/sprites/spr_woodland_camo_texture/spr_woodland_camo_texture.yy @@ -0,0 +1,111 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_woodland_camo_texture", + "bboxMode":0, + "bbox_bottom":179, + "bbox_left":0, + "bbox_right":179, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":true, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"84d3070e-3990-4645-82fd-0e5bef034f40","name":"84d3070e-3990-4645-82fd-0e5bef034f40","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":180, + "HTile":true, + "layers":[ + {"$GMImageLayer":"","%Name":"33d3ce3c-a730-49af-b57c-695abc0d76f5","blendMode":0,"displayName":"default","isLocked":false,"name":"33d3ce3c-a730-49af-b57c-695abc0d76f5","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_woodland_camo_texture", + "nineSlice":{ + "$GMNineSliceData":"", + "bottom":0, + "enabled":false, + "guideColour":[4294902015,4294902015,4294902015,4294902015,], + "highlightColour":1728023040, + "highlightStyle":0, + "left":0, + "resourceType":"GMNineSliceData", + "resourceVersion":"2.0", + "right":0, + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], + "top":0, + }, + "origin":0, + "parent":{ + "name":"textures", + "path":"folders/Sprites/Marine Viewer/textures.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_woodland_camo_texture", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_woodland_camo_texture", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":180.0, + "seqWidth":180.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84d3070e-3990-4645-82fd-0e5bef034f40","path":"sprites/spr_woodland_camo_texture/spr_woodland_camo_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1d42e4f1-3864-4fe2-8712-c1d90d124ebf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":true, + "width":180, +} \ No newline at end of file diff --git a/sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy b/sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy index 9871db8935..de9237b701 100644 --- a/sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy +++ b/sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ws_mk3__pualdron_veteran", "bboxMode":0, "bbox_bottom":121, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","path":"sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6bfe4dd-ff75-4365-af6c-fadbb12914f0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"41a2cc3c-da75-4ae5-957f-4605884d3c33","path":"sprites/spr_ws_mk3__pualdron_veteran/spr_ws_mk3__pualdron_veteran.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6bfe4dd-ff75-4365-af6c-fadbb12914f0","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy b/sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy index 3561f75c07..dee019e50c 100644 --- a/sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy +++ b/sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ws_mk4_monovisor", "bboxMode":0, "bbox_bottom":83, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","path":"sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2f7020a2-698f-4265-8a00-5d2988511edc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f4b0c099-c3b8-4ad8-9d54-538fd3bf5226","path":"sprites/spr_ws_mk4_monovisor/spr_ws_mk4_monovisor.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2f7020a2-698f-4265-8a00-5d2988511edc","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy b/sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy index 96a29b3a75..18437a3e84 100644 --- a/sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy +++ b/sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ws_mk5_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"03a198ae-96cd-4c20-8cc7-9b6a1b9d53cf","name":"03a198ae-96cd-4c20-8cc7-9b6a1b9d53cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7a87ea04-33d2-4453-a402-33a139b3742b","name":"7a87ea04-33d2-4453-a402-33a139b3742b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"03a198ae-96cd-4c20-8cc7-9b6a1b9d53cf","name":"03a198ae-96cd-4c20-8cc7-9b6a1b9d53cf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a87ea04-33d2-4453-a402-33a139b3742b","name":"7a87ea04-33d2-4453-a402-33a139b3742b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"03a198ae-96cd-4c20-8cc7-9b6a1b9d53cf","path":"sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9ac808ab-f109-4dfc-af94-029a6be8186c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a87ea04-33d2-4453-a402-33a139b3742b","path":"sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f29cf236-99c6-43ae-a485-1e516a3dca76","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"03a198ae-96cd-4c20-8cc7-9b6a1b9d53cf","path":"sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9ac808ab-f109-4dfc-af94-029a6be8186c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a87ea04-33d2-4453-a402-33a139b3742b","path":"sprites/spr_ws_mk5_helm/spr_ws_mk5_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f29cf236-99c6-43ae-a485-1e516a3dca76","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy b/sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy index c2abdf8b12..ebf6142bc5 100644 --- a/sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy +++ b/sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ws_mk6_helm", "bboxMode":0, "bbox_bottom":47, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"ace61ddf-2a3c-423b-86ea-b56b31a0533d","name":"ace61ddf-2a3c-423b-86ea-b56b31a0533d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9dbd87d8-a84a-4a59-810f-85199bcae9b7","name":"9dbd87d8-a84a-4a59-810f-85199bcae9b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ace61ddf-2a3c-423b-86ea-b56b31a0533d","name":"ace61ddf-2a3c-423b-86ea-b56b31a0533d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9dbd87d8-a84a-4a59-810f-85199bcae9b7","name":"9dbd87d8-a84a-4a59-810f-85199bcae9b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ace61ddf-2a3c-423b-86ea-b56b31a0533d","path":"sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f663dea8-4248-4425-b3fd-962c9d79c68a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9dbd87d8-a84a-4a59-810f-85199bcae9b7","path":"sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f66e0f37-9262-4300-a3d6-a0b6a2b18e67","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ace61ddf-2a3c-423b-86ea-b56b31a0533d","path":"sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f663dea8-4248-4425-b3fd-962c9d79c68a","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9dbd87d8-a84a-4a59-810f-85199bcae9b7","path":"sprites/spr_ws_mk6_helm/spr_ws_mk6_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f66e0f37-9262-4300-a3d6-a0b6a2b18e67","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy b/sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy index 2a46ab972c..7177900376 100644 --- a/sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy +++ b/sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ws_mk7_helm", "bboxMode":0, "bbox_bottom":43, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d741c8ac-e09c-4942-8ffa-99bb0eaa246e","name":"d741c8ac-e09c-4942-8ffa-99bb0eaa246e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7b0ac816-9e4f-436c-8858-8ece96a57c75","name":"7b0ac816-9e4f-436c-8858-8ece96a57c75","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d741c8ac-e09c-4942-8ffa-99bb0eaa246e","name":"d741c8ac-e09c-4942-8ffa-99bb0eaa246e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7b0ac816-9e4f-436c-8858-8ece96a57c75","name":"7b0ac816-9e4f-436c-8858-8ece96a57c75","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d741c8ac-e09c-4942-8ffa-99bb0eaa246e","path":"sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1b78bdea-9192-4b19-b573-26e0b3c39c6b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b0ac816-9e4f-436c-8858-8ece96a57c75","path":"sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3fb83486-3ae3-40aa-b06b-a1ddf367f6dc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d741c8ac-e09c-4942-8ffa-99bb0eaa246e","path":"sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1b78bdea-9192-4b19-b573-26e0b3c39c6b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7b0ac816-9e4f-436c-8858-8ece96a57c75","path":"sprites/spr_ws_mk7_helm/spr_ws_mk7_helm.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3fb83486-3ae3-40aa-b06b-a1ddf367f6dc","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy b/sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy index 18d76ec3f6..3c0f958bab 100644 --- a/sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy +++ b/sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_ws_mk7_scar_of_the_ancients", "bboxMode":0, "bbox_bottom":73, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"5c43a742-205d-4a15-b030-7a635381bb2e","name":"5c43a742-205d-4a15-b030-7a635381bb2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5c43a742-205d-4a15-b030-7a635381bb2e","name":"5c43a742-205d-4a15-b030-7a635381bb2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c43a742-205d-4a15-b030-7a635381bb2e","path":"sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93fb0caf-9576-4f30-be2c-b8caebd494e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5c43a742-205d-4a15-b030-7a635381bb2e","path":"sprites/spr_ws_mk7_scar_of_the_ancients/spr_ws_mk7_scar_of_the_ancients.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93fb0caf-9576-4f30-be2c-b8caebd494e2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/sprite134/sprite134.yy b/sprites/sprite134/sprite134.yy index fcffeafa8d..72b3c254ad 100644 --- a/sprites/sprite134/sprite134.yy +++ b/sprites/sprite134/sprite134.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite134", "bboxMode":0, "bbox_bottom":47, @@ -12,19 +12,19 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"d8273305-4465-4d22-a64b-780734cd03ba","name":"d8273305-4465-4d22-a64b-780734cd03ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14ef9ee2-f1bd-4b24-bb51-d2c98d5b183e","name":"14ef9ee2-f1bd-4b24-bb51-d2c98d5b183e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a69cf538-5a49-4518-8015-49d79ddec83d","name":"a69cf538-5a49-4518-8015-49d79ddec83d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2891688e-79f2-40e2-b98d-566120a66fbd","name":"2891688e-79f2-40e2-b98d-566120a66fbd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"08792547-4006-4d96-8882-e37f089d5a8b","name":"08792547-4006-4d96-8882-e37f089d5a8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1bb1c266-8b39-4d83-a984-899e4addf463","name":"1bb1c266-8b39-4d83-a984-899e4addf463","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b920cd3a-4de5-481a-bb61-4f7d057b5234","name":"b920cd3a-4de5-481a-bb61-4f7d057b5234","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7596e5a1-ed7b-4db2-9876-6c80751c76a3","name":"7596e5a1-ed7b-4db2-9876-6c80751c76a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ab4b69c8-1611-4deb-840c-ec3856709168","name":"ab4b69c8-1611-4deb-840c-ec3856709168","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"797f4d51-679b-4a32-aa48-a310f3da1ab6","name":"797f4d51-679b-4a32-aa48-a310f3da1ab6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5f4dd0c3-c4cb-487b-bd5d-936cfb4cd950","name":"5f4dd0c3-c4cb-487b-bd5d-936cfb4cd950","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"772af5e9-273a-461c-9125-555b64ac5ba3","name":"772af5e9-273a-461c-9125-555b64ac5ba3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc1477ea-64f8-4039-988c-b33365cfea60","name":"bc1477ea-64f8-4039-988c-b33365cfea60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d8273305-4465-4d22-a64b-780734cd03ba","name":"d8273305-4465-4d22-a64b-780734cd03ba","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14ef9ee2-f1bd-4b24-bb51-d2c98d5b183e","name":"14ef9ee2-f1bd-4b24-bb51-d2c98d5b183e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a69cf538-5a49-4518-8015-49d79ddec83d","name":"a69cf538-5a49-4518-8015-49d79ddec83d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2891688e-79f2-40e2-b98d-566120a66fbd","name":"2891688e-79f2-40e2-b98d-566120a66fbd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"08792547-4006-4d96-8882-e37f089d5a8b","name":"08792547-4006-4d96-8882-e37f089d5a8b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1bb1c266-8b39-4d83-a984-899e4addf463","name":"1bb1c266-8b39-4d83-a984-899e4addf463","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b920cd3a-4de5-481a-bb61-4f7d057b5234","name":"b920cd3a-4de5-481a-bb61-4f7d057b5234","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7596e5a1-ed7b-4db2-9876-6c80751c76a3","name":"7596e5a1-ed7b-4db2-9876-6c80751c76a3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ab4b69c8-1611-4deb-840c-ec3856709168","name":"ab4b69c8-1611-4deb-840c-ec3856709168","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"797f4d51-679b-4a32-aa48-a310f3da1ab6","name":"797f4d51-679b-4a32-aa48-a310f3da1ab6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5f4dd0c3-c4cb-487b-bd5d-936cfb4cd950","name":"5f4dd0c3-c4cb-487b-bd5d-936cfb4cd950","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"772af5e9-273a-461c-9125-555b64ac5ba3","name":"772af5e9-273a-461c-9125-555b64ac5ba3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc1477ea-64f8-4039-988c-b33365cfea60","name":"bc1477ea-64f8-4039-988c-b33365cfea60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -80,45 +80,19 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8273305-4465-4d22-a64b-780734cd03ba","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fbd64374-4333-4b4d-8c2e-f5a2ce2a5811","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14ef9ee2-f1bd-4b24-bb51-d2c98d5b183e","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"841a3b27-dbab-4bdd-8a9b-cb9ee744b0af","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a69cf538-5a49-4518-8015-49d79ddec83d","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ca53b7c3-c844-4983-a706-bf106c2297d6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2891688e-79f2-40e2-b98d-566120a66fbd","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c4dfaa0-85ae-4712-99b5-7b1a54302096","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"08792547-4006-4d96-8882-e37f089d5a8b","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"49816e7d-4407-4f43-852b-17bea81e7571","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1bb1c266-8b39-4d83-a984-899e4addf463","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d69b6664-ce96-4ca7-a51f-6642065adfe9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b920cd3a-4de5-481a-bb61-4f7d057b5234","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b26ab3c9-4f0b-4b3d-b9d8-0fd7dc84f175","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7596e5a1-ed7b-4db2-9876-6c80751c76a3","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b7594d23-549b-42ee-84e8-b0e52725e9a5","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab4b69c8-1611-4deb-840c-ec3856709168","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cd9e724d-2e43-4906-9c4b-c3ad12a8c01b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"797f4d51-679b-4a32-aa48-a310f3da1ab6","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"68bb4843-55ae-4c03-be3b-59caf4504a0d","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f4dd0c3-c4cb-487b-bd5d-936cfb4cd950","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ba7905a7-e2dd-4a17-8f9c-5baf7660b40b","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"772af5e9-273a-461c-9125-555b64ac5ba3","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8323034a-0e2d-4cef-b102-fe538e3ffdc0","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc1477ea-64f8-4039-988c-b33365cfea60","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f3f2e6ec-1bf2-4f17-8c24-bf4419ed1830","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d8273305-4465-4d22-a64b-780734cd03ba","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fbd64374-4333-4b4d-8c2e-f5a2ce2a5811","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14ef9ee2-f1bd-4b24-bb51-d2c98d5b183e","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"841a3b27-dbab-4bdd-8a9b-cb9ee744b0af","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a69cf538-5a49-4518-8015-49d79ddec83d","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ca53b7c3-c844-4983-a706-bf106c2297d6","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2891688e-79f2-40e2-b98d-566120a66fbd","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c4dfaa0-85ae-4712-99b5-7b1a54302096","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"08792547-4006-4d96-8882-e37f089d5a8b","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"49816e7d-4407-4f43-852b-17bea81e7571","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1bb1c266-8b39-4d83-a984-899e4addf463","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d69b6664-ce96-4ca7-a51f-6642065adfe9","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b920cd3a-4de5-481a-bb61-4f7d057b5234","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b26ab3c9-4f0b-4b3d-b9d8-0fd7dc84f175","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7596e5a1-ed7b-4db2-9876-6c80751c76a3","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b7594d23-549b-42ee-84e8-b0e52725e9a5","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ab4b69c8-1611-4deb-840c-ec3856709168","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"cd9e724d-2e43-4906-9c4b-c3ad12a8c01b","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"797f4d51-679b-4a32-aa48-a310f3da1ab6","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"68bb4843-55ae-4c03-be3b-59caf4504a0d","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5f4dd0c3-c4cb-487b-bd5d-936cfb4cd950","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ba7905a7-e2dd-4a17-8f9c-5baf7660b40b","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"772af5e9-273a-461c-9125-555b64ac5ba3","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8323034a-0e2d-4cef-b102-fe538e3ffdc0","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc1477ea-64f8-4039-988c-b33365cfea60","path":"sprites/sprite134/sprite134.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f3f2e6ec-1bf2-4f17-8c24-bf4419ed1830","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/sprite156/sprite156.yy b/sprites/sprite156/sprite156.yy index 9003cde1ab..7911927ca8 100644 --- a/sprites/sprite156/sprite156.yy +++ b/sprites/sprite156/sprite156.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite156", "bboxMode":0, "bbox_bottom":116, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e2948b50-50ff-42f8-ba8b-b81b72a05d60","name":"e2948b50-50ff-42f8-ba8b-b81b72a05d60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e2948b50-50ff-42f8-ba8b-b81b72a05d60","name":"e2948b50-50ff-42f8-ba8b-b81b72a05d60","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e2948b50-50ff-42f8-ba8b-b81b72a05d60","path":"sprites/sprite156/sprite156.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d68a0c0-92c4-4151-9b34-0a50793ad97d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e2948b50-50ff-42f8-ba8b-b81b72a05d60","path":"sprites/sprite156/sprite156.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d68a0c0-92c4-4151-9b34-0a50793ad97d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/sprite158/sprite158.yy b/sprites/sprite158/sprite158.yy index 59fda13fa3..71472adfbb 100644 --- a/sprites/sprite158/sprite158.yy +++ b/sprites/sprite158/sprite158.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite158", "bboxMode":0, "bbox_bottom":161, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4eb9f516-6525-48ee-8a72-0fe9cc7a53a1","name":"4eb9f516-6525-48ee-8a72-0fe9cc7a53a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4eb9f516-6525-48ee-8a72-0fe9cc7a53a1","name":"4eb9f516-6525-48ee-8a72-0fe9cc7a53a1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4eb9f516-6525-48ee-8a72-0fe9cc7a53a1","path":"sprites/sprite158/sprite158.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e4b3a683-7ac5-4c0c-a411-2784b6229a01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4eb9f516-6525-48ee-8a72-0fe9cc7a53a1","path":"sprites/sprite158/sprite158.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e4b3a683-7ac5-4c0c-a411-2784b6229a01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/sprite160/sprite160.yy b/sprites/sprite160/sprite160.yy index cd9bcfe7a4..c708d9e9e1 100644 --- a/sprites/sprite160/sprite160.yy +++ b/sprites/sprite160/sprite160.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite160", "bboxMode":0, "bbox_bottom":67, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"73cf3a8a-5e04-4474-ac5d-3f327957e02d","name":"73cf3a8a-5e04-4474-ac5d-3f327957e02d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"73cf3a8a-5e04-4474-ac5d-3f327957e02d","name":"73cf3a8a-5e04-4474-ac5d-3f327957e02d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"73cf3a8a-5e04-4474-ac5d-3f327957e02d","path":"sprites/sprite160/sprite160.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b653cca5-0503-453c-87e1-1c766f7b6be6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"73cf3a8a-5e04-4474-ac5d-3f327957e02d","path":"sprites/sprite160/sprite160.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b653cca5-0503-453c-87e1-1c766f7b6be6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/sprite205/sprite205.yy b/sprites/sprite205/sprite205.yy index 4c8b1348df..f1fd3708e6 100644 --- a/sprites/sprite205/sprite205.yy +++ b/sprites/sprite205/sprite205.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite205", "bboxMode":0, "bbox_bottom":89, @@ -12,68 +12,68 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"60ac8d66-8f1b-41fb-b5d3-9a392c503232","name":"60ac8d66-8f1b-41fb-b5d3-9a392c503232","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2607afba-bd5d-4cf8-98bf-379fb4a063c4","name":"2607afba-bd5d-4cf8-98bf-379fb4a063c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"20187b7b-038c-4892-a9c1-8f74807691cc","name":"20187b7b-038c-4892-a9c1-8f74807691cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"19600006-5d16-45a4-8554-f6c3ff3f9d2b","name":"19600006-5d16-45a4-8554-f6c3ff3f9d2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e398dfd3-d86d-476e-baa3-3dad5d89e1ab","name":"e398dfd3-d86d-476e-baa3-3dad5d89e1ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"948f3853-433a-4d70-9e76-5bf277b69d7f","name":"948f3853-433a-4d70-9e76-5bf277b69d7f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1f938192-8a38-4af0-9eb6-1cf001029629","name":"1f938192-8a38-4af0-9eb6-1cf001029629","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"84e9ae94-69d2-47e9-8a8b-045569940e74","name":"84e9ae94-69d2-47e9-8a8b-045569940e74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d7fe316e-612d-40c7-bf4e-cb3c322c5355","name":"d7fe316e-612d-40c7-bf4e-cb3c322c5355","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"4c66a00b-df26-451e-b820-a5b9fb7929c5","name":"4c66a00b-df26-451e-b820-a5b9fb7929c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ca79c445-092d-42e1-af3a-bcf4c107fca7","name":"ca79c445-092d-42e1-af3a-bcf4c107fca7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"08b6c661-4eaf-4953-b2ca-b50fbd52e7d9","name":"08b6c661-4eaf-4953-b2ca-b50fbd52e7d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d75a4f8e-556f-43f1-9532-c0b2e171a8c0","name":"d75a4f8e-556f-43f1-9532-c0b2e171a8c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a0f9ea07-182f-46fd-8a9d-97ecb4966e45","name":"a0f9ea07-182f-46fd-8a9d-97ecb4966e45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"596a5858-6bfc-4d39-9aff-87b1ec02d7a0","name":"596a5858-6bfc-4d39-9aff-87b1ec02d7a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"713882f5-5933-468c-9b6b-ded602dfa95c","name":"713882f5-5933-468c-9b6b-ded602dfa95c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b1ea20b4-22e3-41e1-b125-231adc4ea25a","name":"b1ea20b4-22e3-41e1-b125-231adc4ea25a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c9afdd1b-aa2d-4488-8576-17ff8b3e5348","name":"c9afdd1b-aa2d-4488-8576-17ff8b3e5348","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d12c9028-3151-4ff0-af7a-71126a9eef72","name":"d12c9028-3151-4ff0-af7a-71126a9eef72","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2e0eea1c-e2f8-4ebe-bab3-180ab5d9edad","name":"2e0eea1c-e2f8-4ebe-bab3-180ab5d9edad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"72e2b11b-39ae-474c-a8fc-04ac2330fea9","name":"72e2b11b-39ae-474c-a8fc-04ac2330fea9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2b9e0f9c-f62b-4088-85dc-1159b01d4aea","name":"2b9e0f9c-f62b-4088-85dc-1159b01d4aea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f8dc011f-7ea1-48c4-a1ad-c6288238b610","name":"f8dc011f-7ea1-48c4-a1ad-c6288238b610","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ed597f49-74bb-4554-be3b-f8396d43330e","name":"ed597f49-74bb-4554-be3b-f8396d43330e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"572abf2c-f688-451c-86ad-7ae450ebf09b","name":"572abf2c-f688-451c-86ad-7ae450ebf09b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"89a7d63a-1643-4d53-8cdd-862c4b2b0931","name":"89a7d63a-1643-4d53-8cdd-862c4b2b0931","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a2ec40a2-1e71-41a0-90d4-60e04ca7039b","name":"a2ec40a2-1e71-41a0-90d4-60e04ca7039b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"83fbca9d-40f5-4c2d-90e3-712e0e665a50","name":"83fbca9d-40f5-4c2d-90e3-712e0e665a50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d31e0391-fddc-48f2-aaa5-cdc6041884e5","name":"d31e0391-fddc-48f2-aaa5-cdc6041884e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3aa432cd-3da0-45e8-8ebe-d14cd2d30f6d","name":"3aa432cd-3da0-45e8-8ebe-d14cd2d30f6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2af12c7e-de77-468a-9b8f-d14df64683d6","name":"2af12c7e-de77-468a-9b8f-d14df64683d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1464fb39-aba1-4946-8e95-a2a730849c4b","name":"1464fb39-aba1-4946-8e95-a2a730849c4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"76c7c0ab-d65e-4c8f-8a80-e0017f92b87f","name":"76c7c0ab-d65e-4c8f-8a80-e0017f92b87f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7159807f-7ffb-4c46-a38b-ce11ae89a567","name":"7159807f-7ffb-4c46-a38b-ce11ae89a567","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"c38969c1-c382-48b4-889e-2b704786075b","name":"c38969c1-c382-48b4-889e-2b704786075b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"15796572-346e-4a2d-b76d-7dec6f12c885","name":"15796572-346e-4a2d-b76d-7dec6f12c885","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"256a727a-239a-47ea-acab-fc1298ed61e2","name":"256a727a-239a-47ea-acab-fc1298ed61e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"986e1b76-0fed-49b5-bdaf-9affe1f09636","name":"986e1b76-0fed-49b5-bdaf-9affe1f09636","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d4622fa4-9ca3-4859-8309-ccccddc7e86b","name":"d4622fa4-9ca3-4859-8309-ccccddc7e86b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a6486fe6-7ba6-468b-ab3c-eac51120c800","name":"a6486fe6-7ba6-468b-ab3c-eac51120c800","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"95e9f5f9-08dc-4c46-9578-c1a47900a710","name":"95e9f5f9-08dc-4c46-9578-c1a47900a710","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"7a757ca2-f275-48a2-b0da-78a3639c5b2a","name":"7a757ca2-f275-48a2-b0da-78a3639c5b2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bdd957a0-f8ad-4292-9018-bef34ccf2e84","name":"bdd957a0-f8ad-4292-9018-bef34ccf2e84","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"f7687056-5b88-4134-8cea-e50b8bc34382","name":"f7687056-5b88-4134-8cea-e50b8bc34382","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"99391a19-306d-425e-bf27-a3d8448a675f","name":"99391a19-306d-425e-bf27-a3d8448a675f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"56266570-4945-49e0-a71c-bcf06cd9dac0","name":"56266570-4945-49e0-a71c-bcf06cd9dac0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1aeb8dc6-92a6-449d-8eb9-6d7857832485","name":"1aeb8dc6-92a6-449d-8eb9-6d7857832485","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"464320dd-9757-4029-a3ad-319447951151","name":"464320dd-9757-4029-a3ad-319447951151","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5780a724-ceda-47f4-b408-3054627786eb","name":"5780a724-ceda-47f4-b408-3054627786eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"a4477e45-963e-46b7-94ec-85e932d2cdb8","name":"a4477e45-963e-46b7-94ec-85e932d2cdb8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d58e08aa-0785-471c-bfcc-db0d3d385728","name":"d58e08aa-0785-471c-bfcc-db0d3d385728","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dbb99977-f483-4227-8b9e-f1cc43280e39","name":"dbb99977-f483-4227-8b9e-f1cc43280e39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"b9058249-50e6-4b75-99da-8fe5042da131","name":"b9058249-50e6-4b75-99da-8fe5042da131","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ae1cc1cc-181f-41bd-a44f-c9841760947d","name":"ae1cc1cc-181f-41bd-a44f-c9841760947d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"82c64d4a-d421-488a-8b81-ddab5542a642","name":"82c64d4a-d421-488a-8b81-ddab5542a642","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"866c182a-607d-4a51-a4b5-703faa5a955f","name":"866c182a-607d-4a51-a4b5-703faa5a955f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6953b7ca-cb1a-44ad-b33f-1f687e83b95f","name":"6953b7ca-cb1a-44ad-b33f-1f687e83b95f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"28dc9fde-1843-4f47-9929-6bb6782e4209","name":"28dc9fde-1843-4f47-9929-6bb6782e4209","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bb93e4a1-19f1-4b78-88e8-26b6938e7a38","name":"bb93e4a1-19f1-4b78-88e8-26b6938e7a38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e6d72988-dc32-41f8-9003-a8efbfcf3d9e","name":"e6d72988-dc32-41f8-9003-a8efbfcf3d9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"14245612-2105-4fe4-a0d0-b6c41880dd78","name":"14245612-2105-4fe4-a0d0-b6c41880dd78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e7e3af5a-8994-4462-86e2-b64ea2567102","name":"e7e3af5a-8994-4462-86e2-b64ea2567102","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"60ac8d66-8f1b-41fb-b5d3-9a392c503232","name":"60ac8d66-8f1b-41fb-b5d3-9a392c503232","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2607afba-bd5d-4cf8-98bf-379fb4a063c4","name":"2607afba-bd5d-4cf8-98bf-379fb4a063c4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"20187b7b-038c-4892-a9c1-8f74807691cc","name":"20187b7b-038c-4892-a9c1-8f74807691cc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"19600006-5d16-45a4-8554-f6c3ff3f9d2b","name":"19600006-5d16-45a4-8554-f6c3ff3f9d2b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e398dfd3-d86d-476e-baa3-3dad5d89e1ab","name":"e398dfd3-d86d-476e-baa3-3dad5d89e1ab","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"948f3853-433a-4d70-9e76-5bf277b69d7f","name":"948f3853-433a-4d70-9e76-5bf277b69d7f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1f938192-8a38-4af0-9eb6-1cf001029629","name":"1f938192-8a38-4af0-9eb6-1cf001029629","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"84e9ae94-69d2-47e9-8a8b-045569940e74","name":"84e9ae94-69d2-47e9-8a8b-045569940e74","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d7fe316e-612d-40c7-bf4e-cb3c322c5355","name":"d7fe316e-612d-40c7-bf4e-cb3c322c5355","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4c66a00b-df26-451e-b820-a5b9fb7929c5","name":"4c66a00b-df26-451e-b820-a5b9fb7929c5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ca79c445-092d-42e1-af3a-bcf4c107fca7","name":"ca79c445-092d-42e1-af3a-bcf4c107fca7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"08b6c661-4eaf-4953-b2ca-b50fbd52e7d9","name":"08b6c661-4eaf-4953-b2ca-b50fbd52e7d9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d75a4f8e-556f-43f1-9532-c0b2e171a8c0","name":"d75a4f8e-556f-43f1-9532-c0b2e171a8c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a0f9ea07-182f-46fd-8a9d-97ecb4966e45","name":"a0f9ea07-182f-46fd-8a9d-97ecb4966e45","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"596a5858-6bfc-4d39-9aff-87b1ec02d7a0","name":"596a5858-6bfc-4d39-9aff-87b1ec02d7a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"713882f5-5933-468c-9b6b-ded602dfa95c","name":"713882f5-5933-468c-9b6b-ded602dfa95c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b1ea20b4-22e3-41e1-b125-231adc4ea25a","name":"b1ea20b4-22e3-41e1-b125-231adc4ea25a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c9afdd1b-aa2d-4488-8576-17ff8b3e5348","name":"c9afdd1b-aa2d-4488-8576-17ff8b3e5348","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d12c9028-3151-4ff0-af7a-71126a9eef72","name":"d12c9028-3151-4ff0-af7a-71126a9eef72","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2e0eea1c-e2f8-4ebe-bab3-180ab5d9edad","name":"2e0eea1c-e2f8-4ebe-bab3-180ab5d9edad","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"72e2b11b-39ae-474c-a8fc-04ac2330fea9","name":"72e2b11b-39ae-474c-a8fc-04ac2330fea9","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2b9e0f9c-f62b-4088-85dc-1159b01d4aea","name":"2b9e0f9c-f62b-4088-85dc-1159b01d4aea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f8dc011f-7ea1-48c4-a1ad-c6288238b610","name":"f8dc011f-7ea1-48c4-a1ad-c6288238b610","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ed597f49-74bb-4554-be3b-f8396d43330e","name":"ed597f49-74bb-4554-be3b-f8396d43330e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"572abf2c-f688-451c-86ad-7ae450ebf09b","name":"572abf2c-f688-451c-86ad-7ae450ebf09b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"89a7d63a-1643-4d53-8cdd-862c4b2b0931","name":"89a7d63a-1643-4d53-8cdd-862c4b2b0931","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a2ec40a2-1e71-41a0-90d4-60e04ca7039b","name":"a2ec40a2-1e71-41a0-90d4-60e04ca7039b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"83fbca9d-40f5-4c2d-90e3-712e0e665a50","name":"83fbca9d-40f5-4c2d-90e3-712e0e665a50","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d31e0391-fddc-48f2-aaa5-cdc6041884e5","name":"d31e0391-fddc-48f2-aaa5-cdc6041884e5","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3aa432cd-3da0-45e8-8ebe-d14cd2d30f6d","name":"3aa432cd-3da0-45e8-8ebe-d14cd2d30f6d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2af12c7e-de77-468a-9b8f-d14df64683d6","name":"2af12c7e-de77-468a-9b8f-d14df64683d6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1464fb39-aba1-4946-8e95-a2a730849c4b","name":"1464fb39-aba1-4946-8e95-a2a730849c4b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"76c7c0ab-d65e-4c8f-8a80-e0017f92b87f","name":"76c7c0ab-d65e-4c8f-8a80-e0017f92b87f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7159807f-7ffb-4c46-a38b-ce11ae89a567","name":"7159807f-7ffb-4c46-a38b-ce11ae89a567","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"c38969c1-c382-48b4-889e-2b704786075b","name":"c38969c1-c382-48b4-889e-2b704786075b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15796572-346e-4a2d-b76d-7dec6f12c885","name":"15796572-346e-4a2d-b76d-7dec6f12c885","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"256a727a-239a-47ea-acab-fc1298ed61e2","name":"256a727a-239a-47ea-acab-fc1298ed61e2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"986e1b76-0fed-49b5-bdaf-9affe1f09636","name":"986e1b76-0fed-49b5-bdaf-9affe1f09636","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d4622fa4-9ca3-4859-8309-ccccddc7e86b","name":"d4622fa4-9ca3-4859-8309-ccccddc7e86b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a6486fe6-7ba6-468b-ab3c-eac51120c800","name":"a6486fe6-7ba6-468b-ab3c-eac51120c800","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"95e9f5f9-08dc-4c46-9578-c1a47900a710","name":"95e9f5f9-08dc-4c46-9578-c1a47900a710","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7a757ca2-f275-48a2-b0da-78a3639c5b2a","name":"7a757ca2-f275-48a2-b0da-78a3639c5b2a","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bdd957a0-f8ad-4292-9018-bef34ccf2e84","name":"bdd957a0-f8ad-4292-9018-bef34ccf2e84","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f7687056-5b88-4134-8cea-e50b8bc34382","name":"f7687056-5b88-4134-8cea-e50b8bc34382","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"99391a19-306d-425e-bf27-a3d8448a675f","name":"99391a19-306d-425e-bf27-a3d8448a675f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"56266570-4945-49e0-a71c-bcf06cd9dac0","name":"56266570-4945-49e0-a71c-bcf06cd9dac0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1aeb8dc6-92a6-449d-8eb9-6d7857832485","name":"1aeb8dc6-92a6-449d-8eb9-6d7857832485","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"464320dd-9757-4029-a3ad-319447951151","name":"464320dd-9757-4029-a3ad-319447951151","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5780a724-ceda-47f4-b408-3054627786eb","name":"5780a724-ceda-47f4-b408-3054627786eb","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a4477e45-963e-46b7-94ec-85e932d2cdb8","name":"a4477e45-963e-46b7-94ec-85e932d2cdb8","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d58e08aa-0785-471c-bfcc-db0d3d385728","name":"d58e08aa-0785-471c-bfcc-db0d3d385728","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dbb99977-f483-4227-8b9e-f1cc43280e39","name":"dbb99977-f483-4227-8b9e-f1cc43280e39","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"b9058249-50e6-4b75-99da-8fe5042da131","name":"b9058249-50e6-4b75-99da-8fe5042da131","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ae1cc1cc-181f-41bd-a44f-c9841760947d","name":"ae1cc1cc-181f-41bd-a44f-c9841760947d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"82c64d4a-d421-488a-8b81-ddab5542a642","name":"82c64d4a-d421-488a-8b81-ddab5542a642","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"866c182a-607d-4a51-a4b5-703faa5a955f","name":"866c182a-607d-4a51-a4b5-703faa5a955f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6953b7ca-cb1a-44ad-b33f-1f687e83b95f","name":"6953b7ca-cb1a-44ad-b33f-1f687e83b95f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"28dc9fde-1843-4f47-9929-6bb6782e4209","name":"28dc9fde-1843-4f47-9929-6bb6782e4209","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bb93e4a1-19f1-4b78-88e8-26b6938e7a38","name":"bb93e4a1-19f1-4b78-88e8-26b6938e7a38","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e6d72988-dc32-41f8-9003-a8efbfcf3d9e","name":"e6d72988-dc32-41f8-9003-a8efbfcf3d9e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"14245612-2105-4fe4-a0d0-b6c41880dd78","name":"14245612-2105-4fe4-a0d0-b6c41880dd78","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7e3af5a-8994-4462-86e2-b64ea2567102","name":"e7e3af5a-8994-4462-86e2-b64ea2567102","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -129,192 +129,68 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"60ac8d66-8f1b-41fb-b5d3-9a392c503232","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c26af98b-dc2a-433f-bc29-1720b15d1be9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2607afba-bd5d-4cf8-98bf-379fb4a063c4","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a78a35f7-ae08-4af8-b3b7-4272b331b176","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"20187b7b-038c-4892-a9c1-8f74807691cc","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"dcd98c6d-522c-4884-9fd0-1495cdd2592d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"19600006-5d16-45a4-8554-f6c3ff3f9d2b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2e036c0c-af20-4d84-884d-77b93095fc49","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e398dfd3-d86d-476e-baa3-3dad5d89e1ab","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5c330d83-ca2e-42b1-97a8-f572b3b2563c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"948f3853-433a-4d70-9e76-5bf277b69d7f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a74ec994-f514-4110-a038-02458347f6fa","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f938192-8a38-4af0-9eb6-1cf001029629","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"6b088956-0479-4b8d-a182-c477012c08a0","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"84e9ae94-69d2-47e9-8a8b-045569940e74","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"b75b6f93-11eb-4961-8366-6c0902c02268","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7fe316e-612d-40c7-bf4e-cb3c322c5355","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0f725165-8268-44ff-8c1d-d91dc0802148","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c66a00b-df26-451e-b820-a5b9fb7929c5","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7652d5a-c5b3-4e53-829f-dc1df0f44e3c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca79c445-092d-42e1-af3a-bcf4c107fca7","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f654dff-36b1-4f79-b858-641df43ff6b3","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"08b6c661-4eaf-4953-b2ca-b50fbd52e7d9","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4940dbf7-b6df-4eeb-9517-2bdbc6e8f7b3","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d75a4f8e-556f-43f1-9532-c0b2e171a8c0","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"615fa685-7b45-4d5d-9d10-294a2675647f","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a0f9ea07-182f-46fd-8a9d-97ecb4966e45","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"877ea5c1-1244-4c51-bf92-21cb2c61403f","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"596a5858-6bfc-4d39-9aff-87b1ec02d7a0","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c03aa812-0003-4523-9457-b4bb56f0da6d","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"713882f5-5933-468c-9b6b-ded602dfa95c","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"312ee670-e08c-4c31-9c70-8ed40f6ad91e","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ea20b4-22e3-41e1-b125-231adc4ea25a","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"12468898-9cff-4501-9ce1-35984b543471","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9afdd1b-aa2d-4488-8576-17ff8b3e5348","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"11d29fc7-c1d4-4bb6-a261-0c69c739814f","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d12c9028-3151-4ff0-af7a-71126a9eef72","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3844657d-eb55-467b-904f-adb38da21212","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e0eea1c-e2f8-4ebe-bab3-180ab5d9edad","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d31be4d-8388-480a-8dc4-8ccd5d5da073","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"72e2b11b-39ae-474c-a8fc-04ac2330fea9","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4220a72b-3cfa-47c2-ab46-293c7b5a2da8","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b9e0f9c-f62b-4088-85dc-1159b01d4aea","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"c37e1ae7-c04e-4a5d-9ad2-142a39badfe5","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f8dc011f-7ea1-48c4-a1ad-c6288238b610","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53572527-7dfa-470b-80fc-f6ed37adb9a4","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed597f49-74bb-4554-be3b-f8396d43330e","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d7e8b093-a7f6-4e17-94e8-e5f97de878cc","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"572abf2c-f688-451c-86ad-7ae450ebf09b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"104b58e9-d4f9-4014-90f9-3ab206e8cbca","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a7d63a-1643-4d53-8cdd-862c4b2b0931","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f2397701-8f34-4abe-b1c0-7f33a5654a20","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2ec40a2-1e71-41a0-90d4-60e04ca7039b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21b766bb-2f49-4bc7-a058-aa03ef27eed2","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"83fbca9d-40f5-4c2d-90e3-712e0e665a50","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3ae2e161-596e-462b-9af7-b845bfcd3a15","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d31e0391-fddc-48f2-aaa5-cdc6041884e5","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"4d446b18-ea81-4133-9cb0-3009dc718e7d","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3aa432cd-3da0-45e8-8ebe-d14cd2d30f6d","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fbd85722-9516-48b2-9d7c-1d6d60df18f9","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2af12c7e-de77-468a-9b8f-d14df64683d6","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd0ed600-6016-4083-be67-de5f4bb3aed6","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1464fb39-aba1-4946-8e95-a2a730849c4b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1dae602f-db65-42e8-b84a-b71e1024e5ac","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"76c7c0ab-d65e-4c8f-8a80-e0017f92b87f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8e1aedee-9eb0-41fc-befb-144a674bad75","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7159807f-7ffb-4c46-a38b-ce11ae89a567","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5e2cc7eb-0172-41d1-9644-131dd0e43e9d","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"c38969c1-c382-48b4-889e-2b704786075b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed5c6bec-23f1-4f20-a038-86ac3ec94d58","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15796572-346e-4a2d-b76d-7dec6f12c885","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d5c8e79-806e-452d-8a96-154d58956094","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"256a727a-239a-47ea-acab-fc1298ed61e2","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5c5f4260-f449-46fe-a6e0-590761c2472e","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"986e1b76-0fed-49b5-bdaf-9affe1f09636","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bc057fe4-8b3e-42d5-a520-7eea412389e4","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4622fa4-9ca3-4859-8309-ccccddc7e86b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"84f69a5e-4265-47bf-a9bc-9ffcd9a6b815","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6486fe6-7ba6-468b-ab3c-eac51120c800","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fcf4e6a2-69ee-48c1-b78f-0e5d00ccf8a2","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"95e9f5f9-08dc-4c46-9578-c1a47900a710","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2d627ee4-442f-4c19-9493-0e251d5d7aa2","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a757ca2-f275-48a2-b0da-78a3639c5b2a","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d89792ac-02d6-442d-bba3-d0af163ee1d8","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bdd957a0-f8ad-4292-9018-bef34ccf2e84","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40782400-7b56-4337-bb93-6084856c5199","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7687056-5b88-4134-8cea-e50b8bc34382","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1fd7a900-0be0-49fc-91fd-a523376d97e3","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"99391a19-306d-425e-bf27-a3d8448a675f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9ce2752-9394-4a6c-b72c-2d7139e0329c","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"56266570-4945-49e0-a71c-bcf06cd9dac0","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"54c8ad82-d213-4478-9a7b-f8111144e37e","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1aeb8dc6-92a6-449d-8eb9-6d7857832485","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5d92e1e5-d295-4057-80ab-1b5b3652d24f","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"464320dd-9757-4029-a3ad-319447951151","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3b3a35a5-9d2c-4187-bdaa-8abc2761b90d","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5780a724-ceda-47f4-b408-3054627786eb","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"acee4c47-6e2e-4e89-903b-a40e10ad918e","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4477e45-963e-46b7-94ec-85e932d2cdb8","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"40c5845c-3a36-430e-857e-6f0199377ba8","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d58e08aa-0785-471c-bfcc-db0d3d385728","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"70d75d83-71a2-45fd-96ad-2a71d48c234d","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb99977-f483-4227-8b9e-f1cc43280e39","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ddb6b09d-eeb7-4daf-bcdf-890f7839b48b","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9058249-50e6-4b75-99da-8fe5042da131","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"53e9b533-2c57-4049-b344-a1b47ad5ce21","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae1cc1cc-181f-41bd-a44f-c9841760947d","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"75f14c91-a6de-4a1d-94eb-ff22f6863dfe","IsCreationKey":false,"Key":53.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"82c64d4a-d421-488a-8b81-ddab5542a642","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"421da936-db93-479e-86b1-58020a2209e5","IsCreationKey":false,"Key":54.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"866c182a-607d-4a51-a4b5-703faa5a955f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"8b4799db-7675-44f5-ab0f-1098459be066","IsCreationKey":false,"Key":55.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6953b7ca-cb1a-44ad-b33f-1f687e83b95f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"96221e44-125f-4004-9e41-ddfc2289d072","IsCreationKey":false,"Key":56.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"28dc9fde-1843-4f47-9929-6bb6782e4209","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2fb6640f-fbb7-4447-b54f-c397310fdb49","IsCreationKey":false,"Key":57.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb93e4a1-19f1-4b78-88e8-26b6938e7a38","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9b02dfcb-b7f4-40b6-b600-14befa8da52a","IsCreationKey":false,"Key":58.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6d72988-dc32-41f8-9003-a8efbfcf3d9e","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ff4ced38-5f98-42f3-98c6-9a96a9826adf","IsCreationKey":false,"Key":59.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"14245612-2105-4fe4-a0d0-b6c41880dd78","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"9e4285d3-345e-4a3c-a534-378c4026c407","IsCreationKey":false,"Key":60.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7e3af5a-8994-4462-86e2-b64ea2567102","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"237ef745-c957-45bb-b2f3-fc84f1257b95","IsCreationKey":false,"Key":61.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"60ac8d66-8f1b-41fb-b5d3-9a392c503232","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c26af98b-dc2a-433f-bc29-1720b15d1be9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2607afba-bd5d-4cf8-98bf-379fb4a063c4","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a78a35f7-ae08-4af8-b3b7-4272b331b176","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"20187b7b-038c-4892-a9c1-8f74807691cc","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"dcd98c6d-522c-4884-9fd0-1495cdd2592d","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"19600006-5d16-45a4-8554-f6c3ff3f9d2b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2e036c0c-af20-4d84-884d-77b93095fc49","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e398dfd3-d86d-476e-baa3-3dad5d89e1ab","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c330d83-ca2e-42b1-97a8-f572b3b2563c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"948f3853-433a-4d70-9e76-5bf277b69d7f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a74ec994-f514-4110-a038-02458347f6fa","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1f938192-8a38-4af0-9eb6-1cf001029629","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"6b088956-0479-4b8d-a182-c477012c08a0","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"84e9ae94-69d2-47e9-8a8b-045569940e74","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"b75b6f93-11eb-4961-8366-6c0902c02268","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d7fe316e-612d-40c7-bf4e-cb3c322c5355","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0f725165-8268-44ff-8c1d-d91dc0802148","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c66a00b-df26-451e-b820-a5b9fb7929c5","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7652d5a-c5b3-4e53-829f-dc1df0f44e3c","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ca79c445-092d-42e1-af3a-bcf4c107fca7","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f654dff-36b1-4f79-b858-641df43ff6b3","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"08b6c661-4eaf-4953-b2ca-b50fbd52e7d9","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4940dbf7-b6df-4eeb-9517-2bdbc6e8f7b3","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d75a4f8e-556f-43f1-9532-c0b2e171a8c0","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"615fa685-7b45-4d5d-9d10-294a2675647f","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a0f9ea07-182f-46fd-8a9d-97ecb4966e45","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"877ea5c1-1244-4c51-bf92-21cb2c61403f","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"596a5858-6bfc-4d39-9aff-87b1ec02d7a0","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c03aa812-0003-4523-9457-b4bb56f0da6d","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"713882f5-5933-468c-9b6b-ded602dfa95c","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"312ee670-e08c-4c31-9c70-8ed40f6ad91e","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b1ea20b4-22e3-41e1-b125-231adc4ea25a","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"12468898-9cff-4501-9ce1-35984b543471","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c9afdd1b-aa2d-4488-8576-17ff8b3e5348","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"11d29fc7-c1d4-4bb6-a261-0c69c739814f","IsCreationKey":false,"Key":17.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d12c9028-3151-4ff0-af7a-71126a9eef72","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3844657d-eb55-467b-904f-adb38da21212","IsCreationKey":false,"Key":18.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2e0eea1c-e2f8-4ebe-bab3-180ab5d9edad","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d31be4d-8388-480a-8dc4-8ccd5d5da073","IsCreationKey":false,"Key":19.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"72e2b11b-39ae-474c-a8fc-04ac2330fea9","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4220a72b-3cfa-47c2-ab46-293c7b5a2da8","IsCreationKey":false,"Key":20.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2b9e0f9c-f62b-4088-85dc-1159b01d4aea","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"c37e1ae7-c04e-4a5d-9ad2-142a39badfe5","IsCreationKey":false,"Key":21.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f8dc011f-7ea1-48c4-a1ad-c6288238b610","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53572527-7dfa-470b-80fc-f6ed37adb9a4","IsCreationKey":false,"Key":22.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ed597f49-74bb-4554-be3b-f8396d43330e","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d7e8b093-a7f6-4e17-94e8-e5f97de878cc","IsCreationKey":false,"Key":23.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"572abf2c-f688-451c-86ad-7ae450ebf09b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"104b58e9-d4f9-4014-90f9-3ab206e8cbca","IsCreationKey":false,"Key":24.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"89a7d63a-1643-4d53-8cdd-862c4b2b0931","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f2397701-8f34-4abe-b1c0-7f33a5654a20","IsCreationKey":false,"Key":25.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a2ec40a2-1e71-41a0-90d4-60e04ca7039b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21b766bb-2f49-4bc7-a058-aa03ef27eed2","IsCreationKey":false,"Key":26.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"83fbca9d-40f5-4c2d-90e3-712e0e665a50","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3ae2e161-596e-462b-9af7-b845bfcd3a15","IsCreationKey":false,"Key":27.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d31e0391-fddc-48f2-aaa5-cdc6041884e5","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"4d446b18-ea81-4133-9cb0-3009dc718e7d","IsCreationKey":false,"Key":28.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3aa432cd-3da0-45e8-8ebe-d14cd2d30f6d","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fbd85722-9516-48b2-9d7c-1d6d60df18f9","IsCreationKey":false,"Key":29.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2af12c7e-de77-468a-9b8f-d14df64683d6","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd0ed600-6016-4083-be67-de5f4bb3aed6","IsCreationKey":false,"Key":30.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1464fb39-aba1-4946-8e95-a2a730849c4b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1dae602f-db65-42e8-b84a-b71e1024e5ac","IsCreationKey":false,"Key":31.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"76c7c0ab-d65e-4c8f-8a80-e0017f92b87f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8e1aedee-9eb0-41fc-befb-144a674bad75","IsCreationKey":false,"Key":32.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7159807f-7ffb-4c46-a38b-ce11ae89a567","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5e2cc7eb-0172-41d1-9644-131dd0e43e9d","IsCreationKey":false,"Key":33.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"c38969c1-c382-48b4-889e-2b704786075b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed5c6bec-23f1-4f20-a038-86ac3ec94d58","IsCreationKey":false,"Key":34.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"15796572-346e-4a2d-b76d-7dec6f12c885","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d5c8e79-806e-452d-8a96-154d58956094","IsCreationKey":false,"Key":35.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"256a727a-239a-47ea-acab-fc1298ed61e2","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5c5f4260-f449-46fe-a6e0-590761c2472e","IsCreationKey":false,"Key":36.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"986e1b76-0fed-49b5-bdaf-9affe1f09636","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bc057fe4-8b3e-42d5-a520-7eea412389e4","IsCreationKey":false,"Key":37.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d4622fa4-9ca3-4859-8309-ccccddc7e86b","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"84f69a5e-4265-47bf-a9bc-9ffcd9a6b815","IsCreationKey":false,"Key":38.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a6486fe6-7ba6-468b-ab3c-eac51120c800","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fcf4e6a2-69ee-48c1-b78f-0e5d00ccf8a2","IsCreationKey":false,"Key":39.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"95e9f5f9-08dc-4c46-9578-c1a47900a710","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2d627ee4-442f-4c19-9493-0e251d5d7aa2","IsCreationKey":false,"Key":40.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7a757ca2-f275-48a2-b0da-78a3639c5b2a","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d89792ac-02d6-442d-bba3-d0af163ee1d8","IsCreationKey":false,"Key":41.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bdd957a0-f8ad-4292-9018-bef34ccf2e84","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40782400-7b56-4337-bb93-6084856c5199","IsCreationKey":false,"Key":42.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f7687056-5b88-4134-8cea-e50b8bc34382","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1fd7a900-0be0-49fc-91fd-a523376d97e3","IsCreationKey":false,"Key":43.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"99391a19-306d-425e-bf27-a3d8448a675f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9ce2752-9394-4a6c-b72c-2d7139e0329c","IsCreationKey":false,"Key":44.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"56266570-4945-49e0-a71c-bcf06cd9dac0","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"54c8ad82-d213-4478-9a7b-f8111144e37e","IsCreationKey":false,"Key":45.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1aeb8dc6-92a6-449d-8eb9-6d7857832485","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5d92e1e5-d295-4057-80ab-1b5b3652d24f","IsCreationKey":false,"Key":46.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"464320dd-9757-4029-a3ad-319447951151","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"3b3a35a5-9d2c-4187-bdaa-8abc2761b90d","IsCreationKey":false,"Key":47.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5780a724-ceda-47f4-b408-3054627786eb","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"acee4c47-6e2e-4e89-903b-a40e10ad918e","IsCreationKey":false,"Key":48.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a4477e45-963e-46b7-94ec-85e932d2cdb8","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"40c5845c-3a36-430e-857e-6f0199377ba8","IsCreationKey":false,"Key":49.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d58e08aa-0785-471c-bfcc-db0d3d385728","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"70d75d83-71a2-45fd-96ad-2a71d48c234d","IsCreationKey":false,"Key":50.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dbb99977-f483-4227-8b9e-f1cc43280e39","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ddb6b09d-eeb7-4daf-bcdf-890f7839b48b","IsCreationKey":false,"Key":51.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b9058249-50e6-4b75-99da-8fe5042da131","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"53e9b533-2c57-4049-b344-a1b47ad5ce21","IsCreationKey":false,"Key":52.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ae1cc1cc-181f-41bd-a44f-c9841760947d","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"75f14c91-a6de-4a1d-94eb-ff22f6863dfe","IsCreationKey":false,"Key":53.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"82c64d4a-d421-488a-8b81-ddab5542a642","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"421da936-db93-479e-86b1-58020a2209e5","IsCreationKey":false,"Key":54.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"866c182a-607d-4a51-a4b5-703faa5a955f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"8b4799db-7675-44f5-ab0f-1098459be066","IsCreationKey":false,"Key":55.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6953b7ca-cb1a-44ad-b33f-1f687e83b95f","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"96221e44-125f-4004-9e41-ddfc2289d072","IsCreationKey":false,"Key":56.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"28dc9fde-1843-4f47-9929-6bb6782e4209","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"2fb6640f-fbb7-4447-b54f-c397310fdb49","IsCreationKey":false,"Key":57.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bb93e4a1-19f1-4b78-88e8-26b6938e7a38","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9b02dfcb-b7f4-40b6-b600-14befa8da52a","IsCreationKey":false,"Key":58.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e6d72988-dc32-41f8-9003-a8efbfcf3d9e","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ff4ced38-5f98-42f3-98c6-9a96a9826adf","IsCreationKey":false,"Key":59.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"14245612-2105-4fe4-a0d0-b6c41880dd78","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"9e4285d3-345e-4a3c-a534-378c4026c407","IsCreationKey":false,"Key":60.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7e3af5a-8994-4462-86e2-b64ea2567102","path":"sprites/sprite205/sprite205.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"237ef745-c957-45bb-b2f3-fc84f1257b95","IsCreationKey":false,"Key":61.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/sprite221/sprite221.yy b/sprites/sprite221/sprite221.yy index fba5a72e29..853d3fb4f3 100644 --- a/sprites/sprite221/sprite221.yy +++ b/sprites/sprite221/sprite221.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite221", "bboxMode":0, "bbox_bottom":142, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"f17b0368-0c5d-4b61-b9c6-a71ae5d6d8a6","name":"f17b0368-0c5d-4b61-b9c6-a71ae5d6d8a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"f17b0368-0c5d-4b61-b9c6-a71ae5d6d8a6","name":"f17b0368-0c5d-4b61-b9c6-a71ae5d6d8a6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f17b0368-0c5d-4b61-b9c6-a71ae5d6d8a6","path":"sprites/sprite221/sprite221.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"00942437-fc4a-44e1-82ba-71afe70103ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"f17b0368-0c5d-4b61-b9c6-a71ae5d6d8a6","path":"sprites/sprite221/sprite221.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"00942437-fc4a-44e1-82ba-71afe70103ec","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/sprite230/sprite230.yy b/sprites/sprite230/sprite230.yy index 912a845c0e..d91923af0a 100644 --- a/sprites/sprite230/sprite230.yy +++ b/sprites/sprite230/sprite230.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite230", "bboxMode":0, "bbox_bottom":14, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"323ac7c3-7087-4ed0-9b70-3a3ad70cf299","name":"323ac7c3-7087-4ed0-9b70-3a3ad70cf299","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"323ac7c3-7087-4ed0-9b70-3a3ad70cf299","name":"323ac7c3-7087-4ed0-9b70-3a3ad70cf299","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"323ac7c3-7087-4ed0-9b70-3a3ad70cf299","path":"sprites/sprite230/sprite230.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d3aa82a1-63b2-4fa8-9879-382551ff4562","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"323ac7c3-7087-4ed0-9b70-3a3ad70cf299","path":"sprites/sprite230/sprite230.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d3aa82a1-63b2-4fa8-9879-382551ff4562","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/sprite235/sprite235.yy b/sprites/sprite235/sprite235.yy index 066ec267be..621d0cd1d7 100644 --- a/sprites/sprite235/sprite235.yy +++ b/sprites/sprite235/sprite235.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite235", "bboxMode":0, "bbox_bottom":144, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"9eb64083-b01d-475f-b7fb-b488e2255abd","name":"9eb64083-b01d-475f-b7fb-b488e2255abd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9eb64083-b01d-475f-b7fb-b488e2255abd","name":"9eb64083-b01d-475f-b7fb-b488e2255abd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9eb64083-b01d-475f-b7fb-b488e2255abd","path":"sprites/sprite235/sprite235.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ac93298c-518d-4c5f-94ac-058b0a29d115","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9eb64083-b01d-475f-b7fb-b488e2255abd","path":"sprites/sprite235/sprite235.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ac93298c-518d-4c5f-94ac-058b0a29d115","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/sprite245/sprite245.yy b/sprites/sprite245/sprite245.yy index 2ca36e95af..58dff6f64a 100644 --- a/sprites/sprite245/sprite245.yy +++ b/sprites/sprite245/sprite245.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite245", "bboxMode":0, "bbox_bottom":41, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"4c0d94ce-c927-4cb2-94cb-eb1d829e6859","name":"4c0d94ce-c927-4cb2-94cb-eb1d829e6859","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"4c0d94ce-c927-4cb2-94cb-eb1d829e6859","name":"4c0d94ce-c927-4cb2-94cb-eb1d829e6859","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -68,9 +68,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c0d94ce-c927-4cb2-94cb-eb1d829e6859","path":"sprites/sprite245/sprite245.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a5f8e957-69c2-4cd4-8045-13fe17b94f01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"4c0d94ce-c927-4cb2-94cb-eb1d829e6859","path":"sprites/sprite245/sprite245.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a5f8e957-69c2-4cd4-8045-13fe17b94f01","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/sprite266/sprite266.yy b/sprites/sprite266/sprite266.yy index 512507f9bc..9850e78b65 100644 --- a/sprites/sprite266/sprite266.yy +++ b/sprites/sprite266/sprite266.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite266", "bboxMode":0, "bbox_bottom":91, @@ -12,8 +12,8 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"61bfa4bb-2e45-4bcb-962f-2fd5a15e65b4","name":"61bfa4bb-2e45-4bcb-962f-2fd5a15e65b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"490f001a-c449-42ac-bc26-286c2d57d439","name":"490f001a-c449-42ac-bc26-286c2d57d439","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"61bfa4bb-2e45-4bcb-962f-2fd5a15e65b4","name":"61bfa4bb-2e45-4bcb-962f-2fd5a15e65b4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"490f001a-c449-42ac-bc26-286c2d57d439","name":"490f001a-c449-42ac-bc26-286c2d57d439","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -69,12 +69,8 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"61bfa4bb-2e45-4bcb-962f-2fd5a15e65b4","path":"sprites/sprite266/sprite266.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"21f73b8d-9fb1-4758-a596-31ebf4daff11","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"490f001a-c449-42ac-bc26-286c2d57d439","path":"sprites/sprite266/sprite266.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"d8f1a35c-fb4e-4576-8331-ca347235b814","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"61bfa4bb-2e45-4bcb-962f-2fd5a15e65b4","path":"sprites/sprite266/sprite266.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"21f73b8d-9fb1-4758-a596-31ebf4daff11","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"490f001a-c449-42ac-bc26-286c2d57d439","path":"sprites/sprite266/sprite266.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d8f1a35c-fb4e-4576-8331-ca347235b814","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/sprite267/sprite267.yy b/sprites/sprite267/sprite267.yy index 456c1b0d2a..da380150a6 100644 --- a/sprites/sprite267/sprite267.yy +++ b/sprites/sprite267/sprite267.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite267", "bboxMode":0, "bbox_bottom":479, @@ -12,18 +12,18 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"7ea52bfd-5fa6-48a2-add4-48a262a6a7a0","name":"7ea52bfd-5fa6-48a2-add4-48a262a6a7a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d10268f1-5242-4fec-b503-09bd2d966fbf","name":"d10268f1-5242-4fec-b503-09bd2d966fbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e17715e2-75a5-400d-bda2-b10c9b3f80dd","name":"e17715e2-75a5-400d-bda2-b10c9b3f80dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"472439bf-2235-45b0-8408-a582c8e4feb4","name":"472439bf-2235-45b0-8408-a582c8e4feb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e0d528ef-8f76-4cac-92dd-2394f7650407","name":"e0d528ef-8f76-4cac-92dd-2394f7650407","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"715a306f-fbbe-4982-8f1b-1af7e29e8980","name":"715a306f-fbbe-4982-8f1b-1af7e29e8980","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"bc4a1b5e-6f06-4f6c-b7e7-d85ea78297b7","name":"bc4a1b5e-6f06-4f6c-b7e7-d85ea78297b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1cf8dd5b-3be1-4e92-93c6-252a86c21bb2","name":"1cf8dd5b-3be1-4e92-93c6-252a86c21bb2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"ff171f68-da9a-4b80-999a-541e07c9802d","name":"ff171f68-da9a-4b80-999a-541e07c9802d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5b891142-339b-44a3-ad4d-ad21539a301b","name":"5b891142-339b-44a3-ad4d-ad21539a301b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"de7dfe22-6475-4fa4-9f51-198fe54ff011","name":"de7dfe22-6475-4fa4-9f51-198fe54ff011","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"257d8024-9824-43ad-8813-307c289c0e47","name":"257d8024-9824-43ad-8813-307c289c0e47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7ea52bfd-5fa6-48a2-add4-48a262a6a7a0","name":"7ea52bfd-5fa6-48a2-add4-48a262a6a7a0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d10268f1-5242-4fec-b503-09bd2d966fbf","name":"d10268f1-5242-4fec-b503-09bd2d966fbf","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e17715e2-75a5-400d-bda2-b10c9b3f80dd","name":"e17715e2-75a5-400d-bda2-b10c9b3f80dd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"472439bf-2235-45b0-8408-a582c8e4feb4","name":"472439bf-2235-45b0-8408-a582c8e4feb4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e0d528ef-8f76-4cac-92dd-2394f7650407","name":"e0d528ef-8f76-4cac-92dd-2394f7650407","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"715a306f-fbbe-4982-8f1b-1af7e29e8980","name":"715a306f-fbbe-4982-8f1b-1af7e29e8980","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"bc4a1b5e-6f06-4f6c-b7e7-d85ea78297b7","name":"bc4a1b5e-6f06-4f6c-b7e7-d85ea78297b7","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"1cf8dd5b-3be1-4e92-93c6-252a86c21bb2","name":"1cf8dd5b-3be1-4e92-93c6-252a86c21bb2","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ff171f68-da9a-4b80-999a-541e07c9802d","name":"ff171f68-da9a-4b80-999a-541e07c9802d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5b891142-339b-44a3-ad4d-ad21539a301b","name":"5b891142-339b-44a3-ad4d-ad21539a301b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"de7dfe22-6475-4fa4-9f51-198fe54ff011","name":"de7dfe22-6475-4fa4-9f51-198fe54ff011","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"257d8024-9824-43ad-8813-307c289c0e47","name":"257d8024-9824-43ad-8813-307c289c0e47","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -79,42 +79,18 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ea52bfd-5fa6-48a2-add4-48a262a6a7a0","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a3109ba7-a554-445a-93e1-af9bf24c6b10","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d10268f1-5242-4fec-b503-09bd2d966fbf","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5bdcd633-b77f-45ed-8ec2-73091bc9b6ee","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e17715e2-75a5-400d-bda2-b10c9b3f80dd","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"017a8296-69f5-4a63-85c6-9027867e2a7a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"472439bf-2235-45b0-8408-a582c8e4feb4","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0c46d0de-8ccd-4d4a-9a45-ae7d02f3bee5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0d528ef-8f76-4cac-92dd-2394f7650407","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a07ce368-ea35-42b6-b87f-52ab20da4767","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"715a306f-fbbe-4982-8f1b-1af7e29e8980","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"bd1cbf43-f31c-4331-ab25-50b4c7b984a2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc4a1b5e-6f06-4f6c-b7e7-d85ea78297b7","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f05d0012-d481-4718-92aa-a1708d1c4fdc","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cf8dd5b-3be1-4e92-93c6-252a86c21bb2","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"95adb502-9d7a-41dd-9e0d-1dd44b237961","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff171f68-da9a-4b80-999a-541e07c9802d","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"de1cb9d0-329e-441c-bdcc-fae3dc0b3361","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b891142-339b-44a3-ad4d-ad21539a301b","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ec84286c-ddf6-4269-99fd-c17529eabe69","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de7dfe22-6475-4fa4-9f51-198fe54ff011","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"93ccf62d-cdc9-4fce-9f20-724524f373a6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"257d8024-9824-43ad-8813-307c289c0e47","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7c9801f5-dc63-49f8-82df-920a647afc4c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"7ea52bfd-5fa6-48a2-add4-48a262a6a7a0","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a3109ba7-a554-445a-93e1-af9bf24c6b10","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d10268f1-5242-4fec-b503-09bd2d966fbf","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"5bdcd633-b77f-45ed-8ec2-73091bc9b6ee","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e17715e2-75a5-400d-bda2-b10c9b3f80dd","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"017a8296-69f5-4a63-85c6-9027867e2a7a","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"472439bf-2235-45b0-8408-a582c8e4feb4","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0c46d0de-8ccd-4d4a-9a45-ae7d02f3bee5","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e0d528ef-8f76-4cac-92dd-2394f7650407","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a07ce368-ea35-42b6-b87f-52ab20da4767","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"715a306f-fbbe-4982-8f1b-1af7e29e8980","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"bd1cbf43-f31c-4331-ab25-50b4c7b984a2","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"bc4a1b5e-6f06-4f6c-b7e7-d85ea78297b7","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f05d0012-d481-4718-92aa-a1708d1c4fdc","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"1cf8dd5b-3be1-4e92-93c6-252a86c21bb2","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"95adb502-9d7a-41dd-9e0d-1dd44b237961","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff171f68-da9a-4b80-999a-541e07c9802d","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"de1cb9d0-329e-441c-bdcc-fae3dc0b3361","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5b891142-339b-44a3-ad4d-ad21539a301b","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ec84286c-ddf6-4269-99fd-c17529eabe69","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"de7dfe22-6475-4fa4-9f51-198fe54ff011","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"93ccf62d-cdc9-4fce-9f20-724524f373a6","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"257d8024-9824-43ad-8813-307c289c0e47","path":"sprites/sprite267/sprite267.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7c9801f5-dc63-49f8-82df-920a647afc4c","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/sprite269/sprite269.yy b/sprites/sprite269/sprite269.yy index e1ba8979da..bb6354e9dc 100644 --- a/sprites/sprite269/sprite269.yy +++ b/sprites/sprite269/sprite269.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"sprite269", "bboxMode":0, "bbox_bottom":37, @@ -12,23 +12,23 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"a073afca-5924-4620-8e3c-51c617e567dc","name":"a073afca-5924-4620-8e3c-51c617e567dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"5d523a48-4412-4d7b-8c14-6867ce042d04","name":"5d523a48-4412-4d7b-8c14-6867ce042d04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"496dca9c-7c1e-4bc9-a178-a95da77e7f1d","name":"496dca9c-7c1e-4bc9-a178-a95da77e7f1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"3f03d714-5096-4e08-bac7-0e9e2d90ba30","name":"3f03d714-5096-4e08-bac7-0e9e2d90ba30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"d438dbcf-4161-42f6-b539-ce4ed494069e","name":"d438dbcf-4161-42f6-b539-ce4ed494069e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"96628852-dfc1-4166-a1ca-7461aee00d71","name":"96628852-dfc1-4166-a1ca-7461aee00d71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"e7029bf5-3690-4dcc-89d2-5d431df67b17","name":"e7029bf5-3690-4dcc-89d2-5d431df67b17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"dce71047-c025-431f-81f3-e617e163ffc0","name":"dce71047-c025-431f-81f3-e617e163ffc0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"be8d6592-8364-405c-a9a1-095c0695c9aa","name":"be8d6592-8364-405c-a9a1-095c0695c9aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"2ee6323f-f81c-40dc-aeb5-be47dc5cf8c0","name":"2ee6323f-f81c-40dc-aeb5-be47dc5cf8c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"48cbc4c2-b582-4a30-838f-5c464f4c0e8f","name":"48cbc4c2-b582-4a30-838f-5c464f4c0e8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"473f0628-ddbe-404b-9a82-26d821253c62","name":"473f0628-ddbe-404b-9a82-26d821253c62","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"032afc88-4208-4b2e-9b64-43e4694015ac","name":"032afc88-4208-4b2e-9b64-43e4694015ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9e9f94d2-ffaf-48e0-815c-416b7b00a375","name":"9e9f94d2-ffaf-48e0-815c-416b7b00a375","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"6fe2cfbf-8a7e-4d80-84fa-29a83f641401","name":"6fe2cfbf-8a7e-4d80-84fa-29a83f641401","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"331027b0-c1c6-4440-8cf1-1af0367abe81","name":"331027b0-c1c6-4440-8cf1-1af0367abe81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"9c2ea474-5efe-4235-a8c1-c50e3d076bfd","name":"9c2ea474-5efe-4235-a8c1-c50e3d076bfd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a073afca-5924-4620-8e3c-51c617e567dc","name":"a073afca-5924-4620-8e3c-51c617e567dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5d523a48-4412-4d7b-8c14-6867ce042d04","name":"5d523a48-4412-4d7b-8c14-6867ce042d04","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"496dca9c-7c1e-4bc9-a178-a95da77e7f1d","name":"496dca9c-7c1e-4bc9-a178-a95da77e7f1d","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"3f03d714-5096-4e08-bac7-0e9e2d90ba30","name":"3f03d714-5096-4e08-bac7-0e9e2d90ba30","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"d438dbcf-4161-42f6-b539-ce4ed494069e","name":"d438dbcf-4161-42f6-b539-ce4ed494069e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"96628852-dfc1-4166-a1ca-7461aee00d71","name":"96628852-dfc1-4166-a1ca-7461aee00d71","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e7029bf5-3690-4dcc-89d2-5d431df67b17","name":"e7029bf5-3690-4dcc-89d2-5d431df67b17","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"dce71047-c025-431f-81f3-e617e163ffc0","name":"dce71047-c025-431f-81f3-e617e163ffc0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"be8d6592-8364-405c-a9a1-095c0695c9aa","name":"be8d6592-8364-405c-a9a1-095c0695c9aa","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"2ee6323f-f81c-40dc-aeb5-be47dc5cf8c0","name":"2ee6323f-f81c-40dc-aeb5-be47dc5cf8c0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"48cbc4c2-b582-4a30-838f-5c464f4c0e8f","name":"48cbc4c2-b582-4a30-838f-5c464f4c0e8f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"473f0628-ddbe-404b-9a82-26d821253c62","name":"473f0628-ddbe-404b-9a82-26d821253c62","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"032afc88-4208-4b2e-9b64-43e4694015ac","name":"032afc88-4208-4b2e-9b64-43e4694015ac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9e9f94d2-ffaf-48e0-815c-416b7b00a375","name":"9e9f94d2-ffaf-48e0-815c-416b7b00a375","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"6fe2cfbf-8a7e-4d80-84fa-29a83f641401","name":"6fe2cfbf-8a7e-4d80-84fa-29a83f641401","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"331027b0-c1c6-4440-8cf1-1af0367abe81","name":"331027b0-c1c6-4440-8cf1-1af0367abe81","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"9c2ea474-5efe-4235-a8c1-c50e3d076bfd","name":"9c2ea474-5efe-4235-a8c1-c50e3d076bfd","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -84,57 +84,23 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a073afca-5924-4620-8e3c-51c617e567dc","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"0581599c-2f3c-4ce5-ad28-f3e015ddaa40","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d523a48-4412-4d7b-8c14-6867ce042d04","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"fcac7175-ab87-4f9f-b44f-dd12662f22c5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"496dca9c-7c1e-4bc9-a178-a95da77e7f1d","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"a6656fff-9c5d-482f-9460-55bc461660ec","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f03d714-5096-4e08-bac7-0e9e2d90ba30","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7f1d9d5c-661b-42a7-997a-39adc322408f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d438dbcf-4161-42f6-b539-ce4ed494069e","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"535bed8d-0c26-404f-ba29-a3c24b59cc06","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96628852-dfc1-4166-a1ca-7461aee00d71","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"92e84616-accc-4665-af0f-9fec1f2b9bc5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7029bf5-3690-4dcc-89d2-5d431df67b17","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"7ea65ba1-304c-4de3-b957-19bfb4c08d68","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"dce71047-c025-431f-81f3-e617e163ffc0","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"68200938-40f8-468b-a1ae-0939b1a37575","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"be8d6592-8364-405c-a9a1-095c0695c9aa","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"abb42097-8f47-4164-801a-3f3abe9cb1d7","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ee6323f-f81c-40dc-aeb5-be47dc5cf8c0","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ccd81133-8876-4e1b-8826-ffdb05d0efe8","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"48cbc4c2-b582-4a30-838f-5c464f4c0e8f","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"1d972cb5-8045-4a6b-acff-5ba375ca3368","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"473f0628-ddbe-404b-9a82-26d821253c62","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f9f2405c-9feb-4591-9e7c-3726f729a4ec","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"032afc88-4208-4b2e-9b64-43e4694015ac","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"932e0576-09cc-405f-9bdf-5d2be8acb4d1","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e9f94d2-ffaf-48e0-815c-416b7b00a375","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ef369565-fc5f-4e59-aad9-876de3a0c00c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6fe2cfbf-8a7e-4d80-84fa-29a83f641401","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ed93683a-0a88-4504-b522-d9e05069b883","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"331027b0-c1c6-4440-8cf1-1af0367abe81","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eecddf30-9f15-4733-96f0-51ac2f554848","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c2ea474-5efe-4235-a8c1-c50e3d076bfd","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"ffc3fc14-3204-43b7-87af-21d871c970d3","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"a073afca-5924-4620-8e3c-51c617e567dc","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0581599c-2f3c-4ce5-ad28-f3e015ddaa40","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"5d523a48-4412-4d7b-8c14-6867ce042d04","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"fcac7175-ab87-4f9f-b44f-dd12662f22c5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"496dca9c-7c1e-4bc9-a178-a95da77e7f1d","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"a6656fff-9c5d-482f-9460-55bc461660ec","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"3f03d714-5096-4e08-bac7-0e9e2d90ba30","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7f1d9d5c-661b-42a7-997a-39adc322408f","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"d438dbcf-4161-42f6-b539-ce4ed494069e","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"535bed8d-0c26-404f-ba29-a3c24b59cc06","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"96628852-dfc1-4166-a1ca-7461aee00d71","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"92e84616-accc-4665-af0f-9fec1f2b9bc5","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e7029bf5-3690-4dcc-89d2-5d431df67b17","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ea65ba1-304c-4de3-b957-19bfb4c08d68","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"dce71047-c025-431f-81f3-e617e163ffc0","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"68200938-40f8-468b-a1ae-0939b1a37575","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"be8d6592-8364-405c-a9a1-095c0695c9aa","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"abb42097-8f47-4164-801a-3f3abe9cb1d7","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"2ee6323f-f81c-40dc-aeb5-be47dc5cf8c0","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ccd81133-8876-4e1b-8826-ffdb05d0efe8","IsCreationKey":false,"Key":9.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"48cbc4c2-b582-4a30-838f-5c464f4c0e8f","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1d972cb5-8045-4a6b-acff-5ba375ca3368","IsCreationKey":false,"Key":10.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"473f0628-ddbe-404b-9a82-26d821253c62","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"f9f2405c-9feb-4591-9e7c-3726f729a4ec","IsCreationKey":false,"Key":11.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"032afc88-4208-4b2e-9b64-43e4694015ac","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"932e0576-09cc-405f-9bdf-5d2be8acb4d1","IsCreationKey":false,"Key":12.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9e9f94d2-ffaf-48e0-815c-416b7b00a375","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ef369565-fc5f-4e59-aad9-876de3a0c00c","IsCreationKey":false,"Key":13.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6fe2cfbf-8a7e-4d80-84fa-29a83f641401","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ed93683a-0a88-4504-b522-d9e05069b883","IsCreationKey":false,"Key":14.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"331027b0-c1c6-4440-8cf1-1af0367abe81","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"eecddf30-9f15-4733-96f0-51ac2f554848","IsCreationKey":false,"Key":15.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c2ea474-5efe-4235-a8c1-c50e3d076bfd","path":"sprites/sprite269/sprite269.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"ffc3fc14-3204-43b7-87af-21d871c970d3","IsCreationKey":false,"Key":16.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":{ diff --git a/sprites/sword_Works/15bdf6d1-36e2-4fa6-98a3-03a159744f13.png b/sprites/sword_Works/15bdf6d1-36e2-4fa6-98a3-03a159744f13.png new file mode 100644 index 0000000000..7355bd3195 Binary files /dev/null and b/sprites/sword_Works/15bdf6d1-36e2-4fa6-98a3-03a159744f13.png differ diff --git a/sprites/sword_Works/31d5cc7c-0525-4085-a433-2ed3013cef4e.png b/sprites/sword_Works/31d5cc7c-0525-4085-a433-2ed3013cef4e.png new file mode 100644 index 0000000000..fd13c5f71d Binary files /dev/null and b/sprites/sword_Works/31d5cc7c-0525-4085-a433-2ed3013cef4e.png differ diff --git a/sprites/sword_Works/5051efa5-01a3-4db4-acd8-74048d2eddea.png b/sprites/sword_Works/5051efa5-01a3-4db4-acd8-74048d2eddea.png new file mode 100644 index 0000000000..1240b6f25b Binary files /dev/null and b/sprites/sword_Works/5051efa5-01a3-4db4-acd8-74048d2eddea.png differ diff --git a/sprites/sword_Works/58d181d9-62d4-4157-8758-88a6adc79e7c.png b/sprites/sword_Works/58d181d9-62d4-4157-8758-88a6adc79e7c.png new file mode 100644 index 0000000000..22c71f3d6d Binary files /dev/null and b/sprites/sword_Works/58d181d9-62d4-4157-8758-88a6adc79e7c.png differ diff --git a/sprites/sword_Works/637ec865-a195-4b67-8535-b6c09dd4b59c.png b/sprites/sword_Works/637ec865-a195-4b67-8535-b6c09dd4b59c.png new file mode 100644 index 0000000000..2262437842 Binary files /dev/null and b/sprites/sword_Works/637ec865-a195-4b67-8535-b6c09dd4b59c.png differ diff --git a/sprites/sword_Works/7dad12e8-9912-4c01-8374-c263d839f8ee.png b/sprites/sword_Works/7dad12e8-9912-4c01-8374-c263d839f8ee.png new file mode 100644 index 0000000000..4cfd3da730 Binary files /dev/null and b/sprites/sword_Works/7dad12e8-9912-4c01-8374-c263d839f8ee.png differ diff --git a/sprites/sword_Works/97e23b71-7ea0-4b29-8d54-08786d1abb0b.png b/sprites/sword_Works/97e23b71-7ea0-4b29-8d54-08786d1abb0b.png new file mode 100644 index 0000000000..033991aa2d Binary files /dev/null and b/sprites/sword_Works/97e23b71-7ea0-4b29-8d54-08786d1abb0b.png differ diff --git a/sprites/sword_Works/a61b19e9-4e12-413c-a563-c73c840247af.png b/sprites/sword_Works/a61b19e9-4e12-413c-a563-c73c840247af.png new file mode 100644 index 0000000000..e9e3cf7bd1 Binary files /dev/null and b/sprites/sword_Works/a61b19e9-4e12-413c-a563-c73c840247af.png differ diff --git a/sprites/sword_Works/e42b9269-9ffe-4f24-bb8f-c51d50da6fcc.png b/sprites/sword_Works/e42b9269-9ffe-4f24-bb8f-c51d50da6fcc.png new file mode 100644 index 0000000000..50b10b0426 Binary files /dev/null and b/sprites/sword_Works/e42b9269-9ffe-4f24-bb8f-c51d50da6fcc.png differ diff --git a/sprites/sword_Works/layers/15bdf6d1-36e2-4fa6-98a3-03a159744f13/6ccd8587-c054-408f-906b-426b7a9b5d5f.png b/sprites/sword_Works/layers/15bdf6d1-36e2-4fa6-98a3-03a159744f13/6ccd8587-c054-408f-906b-426b7a9b5d5f.png new file mode 100644 index 0000000000..7355bd3195 Binary files /dev/null and b/sprites/sword_Works/layers/15bdf6d1-36e2-4fa6-98a3-03a159744f13/6ccd8587-c054-408f-906b-426b7a9b5d5f.png differ diff --git a/sprites/sword_Works/layers/31d5cc7c-0525-4085-a433-2ed3013cef4e/6ccd8587-c054-408f-906b-426b7a9b5d5f.png b/sprites/sword_Works/layers/31d5cc7c-0525-4085-a433-2ed3013cef4e/6ccd8587-c054-408f-906b-426b7a9b5d5f.png new file mode 100644 index 0000000000..fd13c5f71d Binary files /dev/null and b/sprites/sword_Works/layers/31d5cc7c-0525-4085-a433-2ed3013cef4e/6ccd8587-c054-408f-906b-426b7a9b5d5f.png differ diff --git a/sprites/sword_Works/layers/5051efa5-01a3-4db4-acd8-74048d2eddea/6ccd8587-c054-408f-906b-426b7a9b5d5f.png b/sprites/sword_Works/layers/5051efa5-01a3-4db4-acd8-74048d2eddea/6ccd8587-c054-408f-906b-426b7a9b5d5f.png new file mode 100644 index 0000000000..1240b6f25b Binary files /dev/null and b/sprites/sword_Works/layers/5051efa5-01a3-4db4-acd8-74048d2eddea/6ccd8587-c054-408f-906b-426b7a9b5d5f.png differ diff --git a/sprites/sword_Works/layers/58d181d9-62d4-4157-8758-88a6adc79e7c/6ccd8587-c054-408f-906b-426b7a9b5d5f.png b/sprites/sword_Works/layers/58d181d9-62d4-4157-8758-88a6adc79e7c/6ccd8587-c054-408f-906b-426b7a9b5d5f.png new file mode 100644 index 0000000000..22c71f3d6d Binary files /dev/null and b/sprites/sword_Works/layers/58d181d9-62d4-4157-8758-88a6adc79e7c/6ccd8587-c054-408f-906b-426b7a9b5d5f.png differ diff --git a/sprites/sword_Works/layers/637ec865-a195-4b67-8535-b6c09dd4b59c/6ccd8587-c054-408f-906b-426b7a9b5d5f.png b/sprites/sword_Works/layers/637ec865-a195-4b67-8535-b6c09dd4b59c/6ccd8587-c054-408f-906b-426b7a9b5d5f.png new file mode 100644 index 0000000000..2262437842 Binary files /dev/null and b/sprites/sword_Works/layers/637ec865-a195-4b67-8535-b6c09dd4b59c/6ccd8587-c054-408f-906b-426b7a9b5d5f.png differ diff --git a/sprites/sword_Works/layers/7dad12e8-9912-4c01-8374-c263d839f8ee/6ccd8587-c054-408f-906b-426b7a9b5d5f.png b/sprites/sword_Works/layers/7dad12e8-9912-4c01-8374-c263d839f8ee/6ccd8587-c054-408f-906b-426b7a9b5d5f.png new file mode 100644 index 0000000000..4cfd3da730 Binary files /dev/null and b/sprites/sword_Works/layers/7dad12e8-9912-4c01-8374-c263d839f8ee/6ccd8587-c054-408f-906b-426b7a9b5d5f.png differ diff --git a/sprites/sword_Works/layers/97e23b71-7ea0-4b29-8d54-08786d1abb0b/6ccd8587-c054-408f-906b-426b7a9b5d5f.png b/sprites/sword_Works/layers/97e23b71-7ea0-4b29-8d54-08786d1abb0b/6ccd8587-c054-408f-906b-426b7a9b5d5f.png new file mode 100644 index 0000000000..033991aa2d Binary files /dev/null and b/sprites/sword_Works/layers/97e23b71-7ea0-4b29-8d54-08786d1abb0b/6ccd8587-c054-408f-906b-426b7a9b5d5f.png differ diff --git a/sprites/sword_Works/layers/a61b19e9-4e12-413c-a563-c73c840247af/6ccd8587-c054-408f-906b-426b7a9b5d5f.png b/sprites/sword_Works/layers/a61b19e9-4e12-413c-a563-c73c840247af/6ccd8587-c054-408f-906b-426b7a9b5d5f.png new file mode 100644 index 0000000000..e9e3cf7bd1 Binary files /dev/null and b/sprites/sword_Works/layers/a61b19e9-4e12-413c-a563-c73c840247af/6ccd8587-c054-408f-906b-426b7a9b5d5f.png differ diff --git a/sprites/sword_Works/layers/e42b9269-9ffe-4f24-bb8f-c51d50da6fcc/6ccd8587-c054-408f-906b-426b7a9b5d5f.png b/sprites/sword_Works/layers/e42b9269-9ffe-4f24-bb8f-c51d50da6fcc/6ccd8587-c054-408f-906b-426b7a9b5d5f.png new file mode 100644 index 0000000000..50b10b0426 Binary files /dev/null and b/sprites/sword_Works/layers/e42b9269-9ffe-4f24-bb8f-c51d50da6fcc/6ccd8587-c054-408f-906b-426b7a9b5d5f.png differ diff --git a/sprites/sword_Works/sword_Works.yy b/sprites/sword_Works/sword_Works.yy new file mode 100644 index 0000000000..4a984b9e54 --- /dev/null +++ b/sprites/sword_Works/sword_Works.yy @@ -0,0 +1,124 @@ +{ + "$GMSprite":"v2", + "%Name":"sword_Works", + "bboxMode":0, + "bbox_bottom":336, + "bbox_left":0, + "bbox_right":238, + "bbox_top":0, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"58d181d9-62d4-4157-8758-88a6adc79e7c","name":"58d181d9-62d4-4157-8758-88a6adc79e7c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"7dad12e8-9912-4c01-8374-c263d839f8ee","name":"7dad12e8-9912-4c01-8374-c263d839f8ee","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e42b9269-9ffe-4f24-bb8f-c51d50da6fcc","name":"e42b9269-9ffe-4f24-bb8f-c51d50da6fcc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"15bdf6d1-36e2-4fa6-98a3-03a159744f13","name":"15bdf6d1-36e2-4fa6-98a3-03a159744f13","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"97e23b71-7ea0-4b29-8d54-08786d1abb0b","name":"97e23b71-7ea0-4b29-8d54-08786d1abb0b","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"637ec865-a195-4b67-8535-b6c09dd4b59c","name":"637ec865-a195-4b67-8535-b6c09dd4b59c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"a61b19e9-4e12-413c-a563-c73c840247af","name":"a61b19e9-4e12-413c-a563-c73c840247af","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"5051efa5-01a3-4db4-acd8-74048d2eddea","name":"5051efa5-01a3-4db4-acd8-74048d2eddea","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"31d5cc7c-0525-4085-a433-2ed3013cef4e","name":"31d5cc7c-0525-4085-a433-2ed3013cef4e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":337, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"6ccd8587-c054-408f-906b-426b7a9b5d5f","blendMode":0,"displayName":"default","isLocked":false,"name":"6ccd8587-c054-408f-906b-426b7a9b5d5f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"sword_Works", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"melee", + "path":"folders/Sprites/Marine Viewer/weapons/melee.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"sword_Works", + "autoRecord":true, + "backdropHeight":1080, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1920, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":9.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"sword_Works", + "playback":1, + "playbackSpeed":1.0, + "playbackSpeedType":1, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":337.0, + "seqWidth":239.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58d181d9-62d4-4157-8758-88a6adc79e7c","path":"sprites/sword_Works/sword_Works.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"e551df83-ab48-4c30-a455-d0f3ca76e6d7","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7dad12e8-9912-4c01-8374-c263d839f8ee","path":"sprites/sword_Works/sword_Works.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"6bfa1097-3e17-4fe3-a81b-725ee27e9583","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e42b9269-9ffe-4f24-bb8f-c51d50da6fcc","path":"sprites/sword_Works/sword_Works.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"93aaa094-5ce0-4841-ad01-bffcf1835759","IsCreationKey":false,"Key":2.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"15bdf6d1-36e2-4fa6-98a3-03a159744f13","path":"sprites/sword_Works/sword_Works.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b63c33f5-fff5-4e60-86e3-5c1ceefa8070","IsCreationKey":false,"Key":3.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"97e23b71-7ea0-4b29-8d54-08786d1abb0b","path":"sprites/sword_Works/sword_Works.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ef772864-dc3f-400a-b15b-a7d6a54d903c","IsCreationKey":false,"Key":4.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"637ec865-a195-4b67-8535-b6c09dd4b59c","path":"sprites/sword_Works/sword_Works.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"8931dc04-3176-4e96-8c30-e8b42b0f7c55","IsCreationKey":false,"Key":5.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a61b19e9-4e12-413c-a563-c73c840247af","path":"sprites/sword_Works/sword_Works.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7304e600-a21a-4360-939d-6ec58369f42c","IsCreationKey":false,"Key":6.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"5051efa5-01a3-4db4-acd8-74048d2eddea","path":"sprites/sword_Works/sword_Works.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"ec546c39-0bab-45fb-99a4-4cb5cde66969","IsCreationKey":false,"Key":7.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"31d5cc7c-0525-4085-a433-2ed3013cef4e","path":"sprites/sword_Works/sword_Works.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"979a4b4f-d1c3-4dd7-8311-37d166d5c21c","IsCreationKey":false,"Key":8.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":239, +} \ No newline at end of file