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

Misc fixes for martial arts techniques #69111

Merged
merged 6 commits into from
Nov 5, 2023

Conversation

Termineitor244
Copy link
Contributor

@Termineitor244 Termineitor244 commented Nov 4, 2023

Summary

Bugfixes "Corrects duplicates /the/ in martial arts techs messages"

Purpose of change

It came to my attention that "%s" already includes "the" when referring to a specific monster, and some martial arts techs had "the %s" in their messages, so it was displayed as "the the" in the message log of the game... So I went and fixed all instances of duplicates "the" that I could find in the martial arts techniques!

The messages where "%s" was at the beginning of a sentence were rewritten so their capitalization remains correct.

Ninjutsu was devoid of its unarmed downing technique for mistake in another PR of mine, so i added the same technique in 2 versions, melee and unarmed, to maintain functionality.

Edit: Added missing documentation regarding #69052

Describe the solution

Simple JSON change of displayed text.

Describe alternatives you've considered

Nothing at all!

Testing

It works! No more duplicates.

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Melee Melee weapons, tactics, techniques, reach attack Martial Arts Arts, Techniques, weapons and anything touching martial arts. Mods: MMA Mythical Martial Arts mod labels Nov 4, 2023
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Auto-requesting reviews from non-collaborators: @Hymore246

@github-actions github-actions bot added the <Bugfix> This is a fix for a bug (or closes open issue) label Nov 4, 2023
data/json/techniques.json Outdated Show resolved Hide resolved
data/json/techniques.json Outdated Show resolved Hide resolved
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Nov 4, 2023
@prharvey
Copy link
Contributor

prharvey commented Nov 4, 2023

Would it make more sense to remove the extra "the" from the monster name instead?

@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Nov 4, 2023
@Termineitor244
Copy link
Contributor Author

Would it make more sense to remove the extra "the" from the monster name instead?

Then I would have to add the deleted "the" to the rest of the martial art techniques that do not use it, and I'm not sure where else this is called that would have to be revisited too, at least for now this is more simple.

@prharvey
Copy link
Contributor

prharvey commented Nov 4, 2023

Would it make more sense to remove the extra "the" from the monster name instead?

Then I would have to add the deleted "the" to the rest of the martial art techniques that do not use it, and I'm not sure where else this is called that would have to be revisited too, at least for now this is more simple.

Doesn't this result in incorrect capitalization as is? i.e. if %s is "the monster" then it has incorrect capitalization for the start of a sentence, but if it is "The monster" it has incorrect capitalization for the middle of the sentence.

@Termineitor244
Copy link
Contributor Author

Doesn't this result in incorrect capitalization as is? i.e. if %s is "the monster" then it has incorrect capitalization for the start of a sentence, but if it is "The monster" it has incorrect capitalization for the middle of the sentence.

I think it would, yeah, but it would be wrong capitalization or double "the", with martial art techs I can at least modify their messages so "%s" is always after the start of the sentence, I think its always minus "the" but I will load this branch again and make sure.

@Termineitor244
Copy link
Contributor Author

Doesn't this result in incorrect capitalization as is? i.e. if %s is "the monster" then it has incorrect capitalization for the start of a sentence, but if it is "The monster" it has incorrect capitalization for the middle of the sentence.

imagen

It does appear with incorrect capitalization when at the start of a sentence.

@Termineitor244 Termineitor244 marked this pull request as draft November 4, 2023 20:37
@Termineitor244 Termineitor244 changed the title Correct the double "the" in martial arts techniques Misc fixes for martial arts techniques Nov 4, 2023
@Termineitor244 Termineitor244 marked this pull request as ready for review November 4, 2023 21:06
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Nov 4, 2023
@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. [Markdown] Markdown issues and PRs labels Nov 5, 2023
@Maleclypse Maleclypse merged commit e21fcd9 into CleverRaven:master Nov 5, 2023
24 checks passed
@Termineitor244 Termineitor244 deleted the Grammar-technique-fix branch November 5, 2023 18:58
Maleclypse pushed a commit to Maleclypse/Cataclysm-DDA that referenced this pull request Nov 16, 2023
* Correct double "the" in martial arts techniques

* Linting

* Takedown working for Ninjutsu

* Messages rewrite

* Linting

* Missing documentation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) <Documentation> Design documents, internal info, guides and help. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions [Markdown] Markdown issues and PRs Martial Arts Arts, Techniques, weapons and anything touching martial arts. Melee Melee weapons, tactics, techniques, reach attack Mods: MMA Mythical Martial Arts mod Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants