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] Inventor: (Re)Add Dimensional Research #75916

Merged
merged 24 commits into from
Aug 28, 2024

Conversation

b3brodie
Copy link
Contributor

Summary

Mods "[Xedra] Inventor: (Re)Add Dimensional Research"

Purpose of change

I like the inventor class. Add some new goodies and other related recipes. Also have some more dimensional research ideas later on.

Describe the solution

Adds an NRE recorder crafting recipe to tier 3 energy research.
Adds the dimensional research path from tier 3 energy. Research requires nre readings

  • Adds teleporter crafting recipe
  • Re-ads vancian bill with some changes. Use to consume item and heavily damage a random enemy nearby. Luckily u_consume_item seems to prioritize held items.
  • Adds a netherium warp grenade. This item will kill and destroy everything within its radius at the cost of a 50% chance of creating a tear in reality at its center. Potential future change with a new damage type to just delete everything entirely within the radius.
  • Adds the Netherium-Reality Smoothing Device. This enormous device closes tears in reality and portals at the expense of causing portal storms, a lot of power, and the process of carrying it to the portal. Unfortunately the portal storm EOC seems a little bugged (Tripoint error when starting Splintered Reality  #74774) so it doesn't currently cause the portal storms

Code Changes:
Allows dropped items to cast spells. These spells are targeted on the dropped item itself. Used in order to allow the netherium grenade to cast a spell as its 'detonation' action. Otherwise the game would just instantly crash.

Describe alternatives you've considered

Add even more things

Testing

Tested that the new items and recipes are acquirable with research
Tested that the vanacian bill kills things
Tested that the netherium warp grenade REALLY kills things
Tested that the Netherium-Reality Smoothing Device closes portals.

  • While its supposed to cause portal storms, that is done via the base game EOC_CAUSE_PORTAL_STORM which as of Tripoint error when starting Splintered Reality  #74774
    has an error. Using it just causes several tripoint errors for a while. Presumably whenever that is fixes this will also be fixed

Code:
Used the netherium warp grenade as a testing base, since it calls several sub spells that perform different actions. Largely confirmed that item spells work, they are targeted correctly on the dropped item, etc.

Additional context

This gives me ideas for an inventor fast travel tool

@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` Mechanics: Enchantments / Spells Enchantments and spells EOC: Effects On Condition Anything concerning Effects On Condition Mods: Xedra Evolved Anything to do with Xedra Evolved <Bugfix> This is a fix for a bug (or closes open issue) labels Aug 24, 2024
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Aug 24, 2024
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Aug 24, 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
  • vancian bill
  • vancian bills

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 the BasicBuildPassed This PR builds correctly, label assigned by github actions label Aug 24, 2024
@Maleclypse
Copy link
Member

Ok it's too late for me to review this tonight and there is a conflict that I can't resolve in the browser. I'll try and review this tomorrow. :) Thanks for working on this!

@Maleclypse
Copy link
Member

OK I've reviewed this and I absolutely love it! Let me know if you need me to rebase this for you to resolve the conflict.

@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Aug 27, 2024
@b3brodie
Copy link
Contributor Author

OK I've reviewed this and I absolutely love it! Let me know if you need me to rebase this for you to resolve the conflict.

I believe I've resolved the merge conflict. Pull request should be ready to go

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Aug 28, 2024
@Maleclypse Maleclypse merged commit 72a0ea0 into CleverRaven:master Aug 28, 2024
26 of 27 checks passed
@b3brodie b3brodie deleted the xedra_dim branch August 28, 2024 23:17
Knut-Aage-Hofseth pushed a commit to Knut-Aage-Hofseth/Cataclysm-DDA that referenced this pull request Aug 29, 2024
* Return of the Vancian Bill

* Add back dimension research

* Add ERN Recorder as a non-Hub method for getting an NRE recorder

* Add netherium warp grenade and code to allow dropped items to cast spells

* Add dimensional smoothing device.  Unfortunately portal storms don't really work: CleverRaven#74774

* add teleporter crafting recipe

* Remove ERN Recorder and just let inventors make NRE recorder.  No need to copy dozens of EOCs now

* Why's a lint?

* Remove left over debug print

* Clean up code

* Fix field chance

* Nerf vancian bill a bit

* Add teleporter to warp grenade recipe

* another random thing I missed

* spelling

* Obey rules on how to write null

* Learn more about c++ references

* Make double space

* rerun tests pt.1

* rerun tests pt.2
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` EOC: Effects On Condition Anything concerning Effects On Condition [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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants