Make terrain in fall maps look more fall-like #66

cooljeanius · 2022-05-29T17:11:29Z

Closes #63
(hopefully; let's see if the action works...)

should be a dup of cooljeanius/A_New_Order@7f2eb6d

cooljeanius · 2022-05-29T17:13:53Z

Darn @macabeus it didn't work... help?

Add to the list of stuff that shouldn't go on the server, as per this wiki page: https://wiki.wesnoth.org/IGNFileFormat (apparently if you manually specify stuff here, you also have to re-list the defaults)

…rder-1 into fall-terrain

cooljeanius · 2022-05-30T04:38:05Z

@nemaara did you want me to try to fix the map diff thing so it runs on PRs in this repo properly, or should I just run the tool manually and then hand-upload the diff images, or should I just merge without doing either of those?

macabeus · 2022-05-30T08:27:41Z

@cooljeanius I think the easiest way to fix it is editing the GitHub Action to clone wesnoth repository (it won't need to clone the whole history, but only the latest commit) and run it from there.

The issue is because it depends on the images and .cfg files that aren't present here.

This approach isn't pretty, but I don't have a better idea now. I didn't make map-diff planning to run on the repositories.

nemaara · 2022-05-31T16:56:28Z

@nemaara did you want me to try to fix the map diff thing so it runs on PRs in this repo properly, or should I just run the tool manually and then hand-upload the diff images, or should I just merge without doing either of those?

Doesn't matter to me, as long as nothing breaks in the release version.

cooljeanius · 2022-05-31T19:34:22Z

@cooljeanius I think the easiest way to fix it is editing the GitHub Action to clone wesnoth repository (it won't need to clone the whole history, but only the latest commit) and run it from there.

Hm I'm kinda bad at git; can you remind me how to do that? Also, besides just restricting it to the latest commit, can we also restrict it to just the directories we need, instead of getting the whole repository?

macabeus · 2022-06-01T08:32:06Z

@cooljeanius Command to clone only the latest commit:

git clone --depth 1 git@github.com:wesnoth/wesnoth.git

About cloning just a directory, it can be done: https://stackoverflow.com/a/52269934/3440266
I never did it, but it seems to work.
You would need to clone the folders ./data/core, ./images, and ./utils/wesnoth-map-diff (I hope not missing to mention a folder).

cooljeanius · 2022-06-02T01:03:20Z

@cooljeanius Command to clone only the latest commit:
git clone --depth 1 git@github.com:wesnoth/wesnoth.git
About cloning just a directory, it can be done: https://stackoverflow.com/a/52269934/3440266 I never did it, but it seems to work. You would need to clone the folders ./data/core, ./images, and ./utils/wesnoth-map-diff (I hope not missing to mention a folder).

hm ok I'm trying this, and while the commands don't seem to error out on me or anything, they also don't result in anything getting actually checked out for me either...

let's see if this fixes the action

trying to debug action

need more images

…rder-1 into fall-terrain

cooljeanius · 2022-06-05T23:52:13Z

OK I think the latest results exposed a bug in the wesnoth-map-diff tool:

/home/runner/work/A_New_Order/A_New_Order/utils/wesnoth-map-diff/build/tilemap.js:59
        if (left[y][x].baseCode !== right[y][x].baseCode
                                                ^
TypeError: Cannot read properties of undefined (reading 'baseCode')
    at /home/runner/work/A_New_Order/A_New_Order/utils/wesnoth-map-diff/build/tilemap.js:59:49
    at walkthrough (/home/runner/work/A_New_Order/A_New_Order/utils/wesnoth-map-diff/build/tilemap.js:41:9)
    at Object.diff (/home/runner/work/A_New_Order/A_New_Order/utils/wesnoth-map-diff/build/tilemap.js:58:5)
    at paintTilemap (/home/runner/work/A_New_Order/A_New_Order/utils/wesnoth-map-diff/build/paint.js:79:21)
    at Jimp.<anonymous> (/home/runner/work/A_New_Order/A_New_Order/utils/wesnoth-map-diff/build/paint.js:84:9)
    at Timeout._onTimeout (/home/runner/work/A_New_Order/A_New_Order/utils/wesnoth-map-diff/node_modules/@jimp/core/dist/index.js:264:25)
    at listOnTimeout (node:internal/timers:559:17)
    at processTimers (node:internal/timers:502:7)
Error: Process completed with exit code 1.

(discussed on Discord, but I forget how far back that was, so I'm putting it here, too)

macabeus · 2022-06-06T08:33:34Z

@cooljeanius It's happening because there are maps with different dimensions.
wesnoth-map-diff won't work in this case.

We can add an if to skip the diff in this case (or update the code to support it)

cooljeanius · 2022-06-06T14:38:51Z

@cooljeanius It's happening because there are maps with different dimensions. wesnoth-map-diff won't work in this case.

We can add an if to skip the diff in this case (or update the code to support it)

I'm pretty sure I kept the dimensions the same in all of them; I thought it was just due to the

border_size=1
usage=map

lines... actually, maybe if I go and remove all of those manually first?

macabeus · 2022-06-06T14:58:18Z

Well... then I'm not sure what is happening. Maybe it failed to read the correct file?

We would need to debug to spot the issue. Firstly, I would simplify, opening a PR with just one map, then add some console.log to make a sanity check (print the filename, the file content, etc).

merging this first in the hopes that it will get the diffs in PR nemaara#66 to display correctly; it's ok if the diff action fails for this one, because there shouldn't be any functional changes, just formatting [ci skip]

github-actions · 2022-06-07T03:56:29Z

maps/Barnon.map

maps/Breaking_The_Circle.map

maps/BurnedCastle.map

maps/Crossroads.map

maps/GaeltinHyer.map

maps/OutlawBase.map

cooljeanius · 2022-06-07T03:58:55Z

eyyy it worked! @nemaara check it out!

cooljeanius · 2022-06-07T04:01:26Z

oops looking at the diff output made me realize I missed a few tiles; let me fix that...

cooljeanius · 2022-06-07T04:13:57Z

oh cool so it looks like it edits the existing comment with the new diffs instead of posting a new comment; that's convenient

a few more fall changes

macabeus · 2022-06-07T10:14:15Z

Amazing!! It's working!!! 🎉
Great job!

cooljeanius · 2022-06-14T01:24:27Z

Amazing!! It's working!!! 🎉 Great job!

One thing I do find kinda confusing, though, is how in normal diff views, the old content is on the left and the new content is on the right, but here it's switched so the new content is on the left and the old content is on the right...

macabeus · 2022-06-14T08:49:54Z

@cooljeanius On map-diff.yml, try replacing

node ./build/index.js "./$map_filename" "../../$map_path" "./$diff_image"

with

node ./build/index.js "../../$map_path" "./$map_filename" "./$diff_image"

same as 117ab0f

cooljeanius · 2022-06-14T16:31:48Z

@cooljeanius On map-diff.yml, try replacing

node ./build/index.js "./$map_filename" "../../$map_path" "./$diff_image"

with

node ./build/index.js "../../$map_path" "./$map_filename" "./$diff_image"

ok that seems to have worked; thanks! @nemaara check it out!

this should get all the ones that I didn't touch in the fall terrain PR (nemaara#66) ought to be just whitespace changes with no functional differences [ci skip]

* Update _server.ign Add to the list of stuff that shouldn't go on the server, as per this wiki page: https://wiki.wesnoth.org/IGNFileFormat * open and re-save all remaining maps w/editor this should get all the ones that I didn't touch in the fall terrain PR (#66) ought to be just whitespace changes with no functional differences

copy over fall terrain changes from my other repo

d5780b7

should be a dup of cooljeanius/A_New_Order@7f2eb6d

cooljeanius added 3 commits May 29, 2022 20:08

Merge branch 'nemaara:master' into fall-terrain

70909b4

Update _server.ign

e157522

Add to the list of stuff that shouldn't go on the server, as per this wiki page: https://wiki.wesnoth.org/IGNFileFormat (apparently if you manually specify stuff here, you also have to re-list the defaults)

Merge branch 'fall-terrain' of https://github.com/cooljeanius/A_New_O…

6935ec2

…rder-1 into fall-terrain

cooljeanius added 6 commits June 1, 2022 21:27

Update map-diff.yml

d3b4b76

let's see if this fixes the action

Update map-diff.yml

7b9a7b8

trying to debug action

Merge branch 'master' into fall-terrain

9a6cd83

Merge branch 'master' into fall-terrain

78d2fa5

Update map-diff.yml

3b81463

need more images

Merge branch 'fall-terrain' of https://github.com/cooljeanius/A_New_O…

ab067d7

…rder-1 into fall-terrain

cooljeanius mentioned this pull request Jun 7, 2022

open and re-save certain maps with the map editor #71

Merged

Merge branch 'master' into fall-terrain

2f703bb

cooljeanius requested a review from nemaara June 7, 2022 03:59

I missed a few tiles in 2 of the maps

6ad6054

Update Barnon.map

81b8bf7

a few more fall changes

Update map-diff.yml

2205733

same as 117ab0f

nemaara approved these changes Jul 29, 2022

View reviewed changes

nemaara merged commit eda386e into nemaara:master Jul 29, 2022

cooljeanius deleted the fall-terrain branch July 29, 2022 19:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make terrain in fall maps look more fall-like #66

Make terrain in fall maps look more fall-like #66

cooljeanius commented May 29, 2022

cooljeanius commented May 29, 2022

cooljeanius commented May 30, 2022

macabeus commented May 30, 2022

nemaara commented May 31, 2022

cooljeanius commented May 31, 2022

macabeus commented Jun 1, 2022

cooljeanius commented Jun 2, 2022 •

edited

cooljeanius commented Jun 5, 2022

macabeus commented Jun 6, 2022 •

edited

cooljeanius commented Jun 6, 2022

macabeus commented Jun 6, 2022

github-actions bot commented Jun 7, 2022 •

edited

cooljeanius commented Jun 7, 2022

cooljeanius commented Jun 7, 2022

cooljeanius commented Jun 7, 2022

macabeus commented Jun 7, 2022

cooljeanius commented Jun 14, 2022

macabeus commented Jun 14, 2022 •

edited

cooljeanius commented Jun 14, 2022

Make terrain in fall maps look more fall-like #66

Make terrain in fall maps look more fall-like #66

Conversation

cooljeanius commented May 29, 2022

cooljeanius commented May 29, 2022

cooljeanius commented May 30, 2022

macabeus commented May 30, 2022

nemaara commented May 31, 2022

cooljeanius commented May 31, 2022

macabeus commented Jun 1, 2022

cooljeanius commented Jun 2, 2022 • edited

cooljeanius commented Jun 5, 2022

macabeus commented Jun 6, 2022 • edited

cooljeanius commented Jun 6, 2022

macabeus commented Jun 6, 2022

github-actions bot commented Jun 7, 2022 • edited

maps/Barnon.map

maps/Breaking_The_Circle.map

maps/BurnedCastle.map

maps/Crossroads.map

maps/GaeltinHyer.map

maps/OutlawBase.map

cooljeanius commented Jun 7, 2022

cooljeanius commented Jun 7, 2022

cooljeanius commented Jun 7, 2022

macabeus commented Jun 7, 2022

cooljeanius commented Jun 14, 2022

macabeus commented Jun 14, 2022 • edited

cooljeanius commented Jun 14, 2022

cooljeanius commented Jun 2, 2022 •

edited

macabeus commented Jun 6, 2022 •

edited

github-actions bot commented Jun 7, 2022 •

edited

macabeus commented Jun 14, 2022 •

edited