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

[ Xedra Evolved ] Species based snares [Robot, Cyborg, Nether, Changeling] #73867

Merged
merged 21 commits into from
Jul 4, 2024

Conversation

Maleclypse
Copy link
Member

@Maleclypse Maleclypse commented May 17, 2024

Summary

Content "Species Based Snare traps"

Purpose of change

I wanted to add snare traps that capture robots and cyborgs. Renech made that possible. This PR is the result.

Describe the solution

Uses Renech's code to add species based snares for Robot and cyborg snares.

Describe alternatives you've considered

Might add hedge magic and alchemy snares.

Testing

All complete

Additional context

Co-Authored-By: RenechCDDA <84619419+RenechCDDA@users.noreply.github.com>
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding [C++] Changes (can be) made in C++. Previously named `Code` Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Mods: Xedra Evolved Anything to do with Xedra Evolved labels May 17, 2024
data/mods/Xedra_Evolved/items/inventor/traps.json Outdated Show resolved Hide resolved
src/trap.h Outdated Show resolved Hide resolved
Maleclypse and others added 3 commits May 16, 2024 22:41
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels May 17, 2024
Co-authored-by: Jianxiang Wang (王健翔) <qrox@sina.com>
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label May 18, 2024
@Maleclypse Maleclypse marked this pull request as draft May 18, 2024 03:53
@github-actions github-actions bot added the Mechanics: Enchantments / Spells Enchantments and spells label May 18, 2024
@Maleclypse Maleclypse marked this pull request as ready for review May 19, 2024 02:27
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label May 19, 2024
src/monmove.cpp Outdated Show resolved Hide resolved
src/trapfunc.cpp Outdated Show resolved Hide resolved
@Maleclypse Maleclypse changed the title [ Xedra Evolved ] Robot and Cyborg Immobilizing traps [Adds species based snares] [ Xedra Evolved ] Species based snares [Robot, Cyborg, Nether, Changeling] May 27, 2024
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label May 27, 2024
@Maleclypse Maleclypse marked this pull request as draft May 27, 2024 05:35
…hedge.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
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
  • Monas Hieroglyphica
  • This is a thin reproduction of John Dee's Monas Hieroglyphica. A complicated work whose meaning has long been lost without access to the occult oral tradition of it's time. It's possible that some remnants of that oral tradition still exist today, but it is unknown if they would be able to fully interpret this spellbook.
  • You place the betweener's maze.
  • betweener's maze
  • betweener's mazes
  • copies of Monas Hieroglyphica
  • phwoom!

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 and removed json-styled JSON lint passed, label assigned by github actions labels May 27, 2024
@Maleclypse Maleclypse marked this pull request as ready for review June 2, 2024 05:18
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jun 2, 2024
Copy link
Contributor

github-actions bot commented Jul 2, 2024

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not bump or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered.

@github-actions github-actions bot added the stale Closed for lack of activity, but still valid. label Jul 2, 2024
data/json/effects.json Outdated Show resolved Hide resolved
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions and removed json-styled JSON lint passed, label assigned by github actions labels Jul 3, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jul 4, 2024
@dseguin dseguin merged commit 36d0635 into CleverRaven:master Jul 4, 2024
23 of 27 checks passed
@RenechCDDA RenechCDDA mentioned this pull request Jul 7, 2024
@Maleclypse Maleclypse deleted the QR-Code-traps-for-XE branch September 7, 2024 01:40
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 [C++] Changes (can be) made in C++. Previously named `Code` Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mechanics: Enchantments / Spells Enchantments and spells Mods: Xedra Evolved Anything to do with Xedra Evolved Mods Issues related to mods or modding stale Closed for lack of activity, but still valid.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants