Page 1 of 1

Zaros flips fields

Posted: Sun Feb 04, 2024 2:05 pm
by gregf36665
So I am working on implementing scorpion catcher and one of the scorpions spawn slightly out of position. I tried to use Zaros to move the scorpion and it worked. The problem was Zaros moves the numbers around on each line and the diff becomes enormous. I'm using Zaros 2.0.1 (hash: c7334798). Am I missing something? I'm running on Windows 10.

Code: Select all

$ git diff --compact-summary
warning: LF will be replaced by CRLF in Server/data/configs/npc_spawns.json.
The file will have its original line endings in your working directory
 Server/data/configs/npc_spawns.json                | 23473 +++++++++----------
Ideally I would only see one diff with a new location for the scorpion. I could manually modify the json but that feels wrong.

Re: Zaros flips fields

Posted: Sun Feb 04, 2024 6:14 pm
by Ceikry
A zaros-edited npc spawns file has never been committed to the repo. You're seeing a massive diff because zaros is basically completely reformatting a previously entirely hand-written file. The relevant channels on Discord have prominent disclaimers not to use Zaros for this until we've had a chance to commit a clean reformat, which is rare because somebody's always trying to edit these files.

Re: Zaros flips fields

Posted: Sun Feb 04, 2024 6:14 pm
by Ceikry
(Case in point: you are doing so literally right now)

Re: Zaros flips fields

Posted: Sun Feb 04, 2024 7:39 pm
by gregf36665
Ah gotcha! I'll manually edit the json file for now then.

As a side note, which discord channel talks about Zaros and not using the JSON output? All I can see is the dev-resources channel and a search for Zaros shows some old chat in lobby.

Re: Zaros flips fields

Posted: Sun Feb 04, 2024 8:58 pm
by Ceikry
It becomes available once you've either contributed or shown genuine intent to contribute. It's not available to the general public in order to avoid spam. (Anything less than substantial discussion in regards to development is considered spam.)

Re: Zaros flips fields

Posted: Mon Feb 05, 2024 3:12 pm
by gregf36665
Sounds like a good idea to me.

Not sure if Zaros accepts merge requests but it looks like the majority of the diff is due to the last - being added to the string of spawn locations. I made a small MR to change this and it makes the diff significantly smaller.

Re: Zaros flips fields

Posted: Mon Feb 05, 2024 3:39 pm
by Ceikry
yeah, the diff is still substantial enough that the main issue is just needing the opportunity to MR a clean reformat of that file and the item spawns file.

Re: Zaros flips fields

Posted: Sat Apr 06, 2024 9:44 am
by gregf36665
Thanks to Player Name (https://gitlab.com/2009scape/2009scape/ ... uests/1771) this is no longer an issue.