Skip to content

Commit

Permalink
fix: sprite artifacts 2 (#1044)
Browse files Browse the repository at this point in the history
Follow-up to #1041.

## Changes

- Fix the rest of the sprite artifacts in `ship_decorations`

## Things Worth Mentioning

- Changed levels 3 & 8 to use YAML flow style so that I could find tiles
by position (e.g. by searching for `pos: [13, 10]`:

    Before: 
    ```yaml
    tiles:
    - pos:
      - 1
      - 2
      idx: 3
      collision: Solid
    ```
    After:
    ```yaml
    tiles:
    - { pos: [1, 2], idx: 3, collision: Solid }
    ```

- Add script to get the layer names in any level files that use specific
tile indexes of a tilemap:

    ```yaml
    # Find all crow's nests (indexes 30-32) from ship_decorations
$ ./scripts/find-atlas-tiles.sh ship_decorations.atlas.yaml '[30,31,32]'

    ./assets/map/levels/level_3.map.yaml
    - foreground

    ./assets/map/levels/level_8.map.yaml
    - foreground

# This tells us levels 3 and 8 have crow's nests in their "foreground"
layer
    ```

- Fix git attributes for text files in `assets/` & `old_assets/` which
shouldn't be treated as binary (yaml, txt, ftl)
  • Loading branch information
nelson137 authored Nov 22, 2024
1 parent 62fb20c commit 0f51b9f
Show file tree
Hide file tree
Showing 17 changed files with 10,183 additions and 12,396 deletions.
11 changes: 7 additions & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ web/* linguist-vendored

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.{txt,md,rs,py,js,jsx,ts,tsx,css,scss,html,xml,json,yaml,yml,toml} text
*.{txt,md,rs,lua,py,js,jsx,ts,tsx,css,scss,html,xml,json,yaml,yml,toml} text

# Declare files that will always have LF line endings on checkout.
*.sh text eol=lf
Expand All @@ -17,11 +17,14 @@ web/* linguist-vendored
# Denote all files that are truly binary and should not be modified.
*.{png,jpg,jpeg,gif,ico,webp,woff,woff2,ttf,otf,eot,mp3,mp4,wav,webm,ogg} binary

# Treat all files in the assets directory as binary
# Treat all files in the assets directory as binary (except text files)
assets/** binary
old_assets/** binary

*.ftl diff
*.txt -binary
*.lua -binary
*.yml -binary
*.yaml -binary
*.ftl -binary

# If you have other directories with mostly binary files, add them like this:
# other_binary_directory/** binary
36 changes: 18 additions & 18 deletions assets/map/levels/level_1.map.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1022,22 +1022,22 @@ layers:
- pos:
- 9
- 9
idx: 23
idx: 24
collision: Empty
- pos:
- 10
- 9
idx: 24
idx: 25
collision: Empty
- pos:
- 16
- 9
idx: 24
idx: 25
collision: Empty
- pos:
- 17
- 9
idx: 25
idx: 26
collision: Empty
elements:
- pos:
Expand Down Expand Up @@ -1125,12 +1125,12 @@ layers:
- pos:
- 9
- 7
idx: 20
idx: 9
collision: Empty
- pos:
- 17
- 7
idx: 20
idx: 9
collision: Empty
elements: []
- id: platforms
Expand All @@ -1139,62 +1139,62 @@ layers:
- pos:
- 11
- 4
idx: 41
idx: 52
collision: JumpThrough
- pos:
- 12
- 4
idx: 42
idx: 53
collision: JumpThrough
- pos:
- 13
- 4
idx: 42
idx: 53
collision: JumpThrough
- pos:
- 14
- 4
idx: 42
idx: 53
collision: JumpThrough
- pos:
- 15
- 4
idx: 43
idx: 54
collision: JumpThrough
- pos:
- 10
- 16
idx: 42
idx: 53
collision: JumpThrough
- pos:
- 11
- 16
idx: 42
idx: 53
collision: JumpThrough
- pos:
- 12
- 16
idx: 42
idx: 53
collision: JumpThrough
- pos:
- 13
- 16
idx: 42
idx: 53
collision: JumpThrough
- pos:
- 14
- 16
idx: 42
idx: 53
collision: JumpThrough
- pos:
- 15
- 16
idx: 42
idx: 53
collision: JumpThrough
- pos:
- 16
- 16
idx: 42
idx: 53
collision: JumpThrough
elements: []
- id: items
Expand Down
Loading

0 comments on commit 0f51b9f

Please sign in to comment.