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

JSONize yugg gene sting #74352

Merged
merged 25 commits into from
Jun 17, 2024
Merged

Conversation

Maleclypse
Copy link
Member

@Maleclypse Maleclypse commented Jun 6, 2024

Summary

None

Purpose of change

Jsonize the yugg Gene sting so it stops providing mutations that it shouldn't.

Describe the solution

Eliminate hardcode monster attack in favor of EOC. Much EOC. Fixes #70035

Describe alternatives you've considered

Making a secret flag in mutation categories but the code to do so would have required a large refactor beyond my ability.

Testing

It works thanks to Procynae!

Additional context

Genesting works

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON [C++] Changes (can be) made in C++. Previously named `Code` Monsters Monsters both friendly and unfriendly. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Mechanics: Enchantments / Spells Enchantments and spells <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions labels Jun 6, 2024
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Jun 6, 2024
@github-actions github-actions bot added [Python] Code made in Python Code: Tooling Tooling that is not part of the main game but is part of the repo. labels Jun 6, 2024
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: @jbytheway

data/json/monsters/nether.json Outdated Show resolved Hide resolved
data/json/monster_special_attacks/monster_gun.json Outdated Show resolved Hide resolved
data/json/items/ammo_types.json Outdated Show resolved Hide resolved
data/json/items/ammo/barb.json Outdated Show resolved Hide resolved
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jun 7, 2024
@Maleclypse Maleclypse marked this pull request as draft June 7, 2024 17:45
@github-actions github-actions bot removed json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jun 8, 2024
Copy link
Contributor

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • ELFA
  • ssszziiipp

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

Hints for adding a new word to the dictionary
  • If the word is normally in all lowercase, such as the noun word or the verb does, add it in its lower-case form; if the word is a proper noun, such as the surname George, add it in its initial-caps form; if the word is an acronym or has special letter case, such as the acronym CDDA or the unit mW, add it by preserving the case of all the letters. A word in the dictionary will also match its initial-caps form (if the word is in all lowercase) and all-uppercase form, so a word should be added to the dictionary in its normal letter case even if used in a different letter case in a sentence.
  • For a word to be added to the dictionary, it should either be a real, properly-spelled modern American English word, a foreign loan word (including romanized foreign names), or a foreign or made-up word that is used consistently and commonly enough in the game. Intentional misspelling (including eye dialect) of a word should not be added unless it has become a common terminology in the game, because while someone may have a legitimate use for it, another person may spell it that way accidentally.

@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jun 13, 2024
@github-actions github-actions bot added the Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies label Jun 15, 2024
@Maleclypse Maleclypse marked this pull request as ready for review June 15, 2024 18:16
@Maleclypse Maleclypse mentioned this pull request Jun 16, 2024
@dseguin dseguin merged commit 88bfd69 into CleverRaven:master Jun 17, 2024
38 of 46 checks passed
@Maleclypse Maleclypse deleted the JSONIZE-Yugg-attack branch July 3, 2024 02:36
@Maleclypse Maleclypse restored the JSONIZE-Yugg-attack branch July 17, 2024 23:57
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) [C++] Changes (can be) made in C++. Previously named `Code` Code: Tooling Tooling that is not part of the main game but is part of the repo. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mechanics: Enchantments / Spells Enchantments and spells Monsters Monsters both friendly and unfriendly. Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[XEDRA Evolved] Paraclesian mutations available outside of scenario with random mutation effects
3 participants