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

Yrax protocols part1 #76291

Merged
merged 45 commits into from
Sep 17, 2024
Merged

Conversation

Vgoloshivskiy
Copy link
Contributor

Summary

Content "Slightly Expands Hub-01 and Yrax factions"

Purpose of change

Yrax don't have a whole lot of content associated with them. I added a bit, plan on adding more content

Describe the solution

It adds to Yrax something more than just optional fight

Describe alternatives you've considered

image

image
I have no motivation to rewrite entire conversation "("

Testing

Worked without crashes but Hub reacted to robots only if i was holding them in inventory idk is it fixable or not

Additional context

Next part i will try myself at map editing and creating Gold Pyramid that reacts to electricity (being shot by laser / chain lightning from zed or emp grenade) or maybe being connected to generator

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Monsters Monsters both friendly and unfriendly. EOC: Effects On Condition Anything concerning Effects On Condition astyled astyled PR, label is assigned by github actions labels Sep 8, 2024
Vgoloshivskiy and others added 9 commits September 8, 2024 22:47
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…s.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…s.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…s.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…s.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…s.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…s.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…s.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Vgoloshivskiy and others added 2 commits September 8, 2024 22:50
…s.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…s.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…s.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Sep 8, 2024
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 and removed astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Sep 10, 2024
Copy link
Member

@John-Candlebury John-Candlebury left a comment

Choose a reason for hiding this comment

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

Adding more deactivation manuals feels like a copout. I think you should just make it impossible for the player to disable the Yrax bots other than the Trifacet.

You can keep the option to deliver inactive drones to the Hub, but the player has to find them in inactive forms. You can add more dormant Yrax that work similar to the Sphenocoronae in future PRs.

gfx/GiantDays/tile_config.json Outdated Show resolved Hide resolved
src/activity_actor.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot removed the astyled astyled PR, label is assigned by github actions label Sep 13, 2024
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Sep 13, 2024
@Vgoloshivskiy
Copy link
Contributor Author

Vgoloshivskiy commented Sep 13, 2024

Adding more deactivation manuals feels like a copout. I think you should just make it impossible for the player to disable the Yrax bots other than the Trifacet.

You can keep the option to deliver inactive drones to the Hub, but the player has to find them in inactive forms. You can add more dormant Yrax that work similar to the Sphenocoronae in future PRs.

I did't want for it to feel like copout, I wanted something like this to begin with.
It is not hard to remove this functionality, you can accomplish this by just removing revert to item from yrax bots json.
I might add spawn locations with inactive Yrax but i wanted there to be possibility to disable some extremly dangerous Yrax.
Monolith is a dormant Sphenocoronae but I can't really deliver it as it is still a monster and not an item that i can put in car.
Edit:-> I also don't see lore issue goverment captured and studied at least one model and probably already had some data on others, robofac is robot focused researchers thus the name, you deliver them broken to finish research, they have mediocre AI that can help them in studying it.

@github-actions github-actions bot removed the json-styled JSON lint passed, label assigned by github actions label Sep 15, 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
  • A broken quadraphract leg, secured to the roof for transportation. Not functional, and hopefully never be.
  • A broken quadraphract, secured to the roof for transportation. Not functional, and hopefully never be.
  • The hostile triakis violently unfolds just clear of your hand!
  • [Deliver a broken triakis drone.]
  • [Deliver a deactivated triakis.]
  • [Drag in broken quadraphract leg.]
  • [Drag in broken quadraphract.]
  • inactive triakis
  • tied-down broken quadraphract
  • tied-down broken quadraphract leg

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 removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 15, 2024
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Sep 15, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 15, 2024
@Maleclypse Maleclypse merged commit 69fc6e7 into CleverRaven:master Sep 17, 2024
27 checks passed
@MikasaTanikawa
Copy link
Contributor

@Vgoloshivskiy please add migration for new manual id and at https://github.com/Vgoloshivskiy/Cataclysm-DDA/blob/bf05b72514cbee078b6a37c86791c585c5795549/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json#L291 should be "TALK_ROBOFAC_INTERCOM_SELL_BROKEN_YRAX_DELTA"

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` Code: Tests Measurement, self-control, statistics, balancing. 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 Missions Quests and missions Monsters Monsters both friendly and unfriendly. SDL: Tiles / Sound Tiles visual interface and sounds.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants