Zaros flips fields

Various development-related discussions
Post Reply
User avatar
gregf36665
Noob
Posts: 14
Joined: Sun Feb 04, 2024 1:58 pm
Has thanked: 2 times
Been thanked: 6 times

Zaros flips fields

Post 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.
gregf36665
User avatar
Ceikry
Site Admin
Posts: 587
Joined: Wed Aug 10, 2022 11:48 pm
Location: Draynor Village
Has thanked: 82 times
Been thanked: 105 times

Re: Zaros flips fields

Post 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.
Nerds
User avatar
Ceikry
Site Admin
Posts: 587
Joined: Wed Aug 10, 2022 11:48 pm
Location: Draynor Village
Has thanked: 82 times
Been thanked: 105 times

Re: Zaros flips fields

Post by Ceikry »

(Case in point: you are doing so literally right now)
Nerds
User avatar
gregf36665
Noob
Posts: 14
Joined: Sun Feb 04, 2024 1:58 pm
Has thanked: 2 times
Been thanked: 6 times

Re: Zaros flips fields

Post 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.
gregf36665
User avatar
Ceikry
Site Admin
Posts: 587
Joined: Wed Aug 10, 2022 11:48 pm
Location: Draynor Village
Has thanked: 82 times
Been thanked: 105 times

Re: Zaros flips fields

Post 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.)
Nerds
User avatar
gregf36665
Noob
Posts: 14
Joined: Sun Feb 04, 2024 1:58 pm
Has thanked: 2 times
Been thanked: 6 times

Re: Zaros flips fields

Post 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.
gregf36665
User avatar
Ceikry
Site Admin
Posts: 587
Joined: Wed Aug 10, 2022 11:48 pm
Location: Draynor Village
Has thanked: 82 times
Been thanked: 105 times

Re: Zaros flips fields

Post 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.
Nerds
User avatar
gregf36665
Noob
Posts: 14
Joined: Sun Feb 04, 2024 1:58 pm
Has thanked: 2 times
Been thanked: 6 times

Re: Zaros flips fields

Post by gregf36665 »

Thanks to Player Name (https://gitlab.com/2009scape/2009scape/ ... uests/1771) this is no longer an issue.
gregf36665
Post Reply