Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix parry and block missing from v5.19.0-v5.20.0 edits #269

Merged
merged 1 commit into from
Jan 4, 2024

Conversation

fishface60
Copy link
Contributor

This mechanically fixes the missing Block and Parry scores for Basic Set and Goblins equipment.

for f in Basic\ Set/Basic\ Set\ Equipment.eqp Fantasy\ Folk/Goblins\ and\ Hobgoblins/Equipment/Goblin\ Equipment.eqp; do jq --tab 'walk(if (type=="object" and .type=="melee_weapon" and (.parry == null or .block==null)) then {block: "0", parry: "0"} + . else . end)' "$f" >"$f.new" && mv "$f.new" "$f" && gcs --convert "$f"; done

This is sufficient on its own, though gcs --convert currently also adds parry and block scores to ranged attacks, so I've filtered those changes out of the patch.

@richardwilkes
Copy link
Owner

Argh! I thought I checked that after making that last change. It won't hurt anything, but it is annoying.

@richardwilkes
Copy link
Owner

... and it looks like the fix I made doesn't cover all the cases I thought it did for the old data. :-(

@fishface60
Copy link
Contributor Author

I've updated to the v5.20.2 format. Apart from now omitting the "parry": "No" this also removes the "level" and "block" fields from the "calc" part of cloaks, which appears to be fine.

Copy link
Contributor

@ethorad ethorad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Been through the basic set equipment tagged as Melee Weapon or as Shield. Don't think there will be other stuff which has Parry and Block stats. Happy with the Parry and Block entries on all of them.
Also happy with the Goblin equipment changes (although this may have been fixed in a different PR)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Been through everything with tag "Melee Weapon" and confirmed it has the right Parry and Block stats. Similarly for everything with tag "Shield".

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All weapons have right Parry and Block stats

@ethorad ethorad merged commit 9705a48 into richardwilkes:master Jan 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants