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.

Sign up for GitHub

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

Jump to bottom

enchantify special vision [1/2] #77770

Merged
merged 6 commits into from
Nov 21, 2024
Merged

enchantify special vision [1/2] #77770

merged 6 commits into from
Nov 21, 2024

Conversation

GuardianDll
Copy link
Member

@GuardianDll GuardianDll commented Nov 11, 2024 •
edited
Loading

Summary

None

Purpose of change

Resolve #71593

Describe the solution

Made it json

Testing

Works pretty well, but actual replacement of enchantment values gonna happen after this one, it would be pretty massive json movements, and i want to solve few todos and maybe polish a code a bit - i do not like that i need to rerun entire function every here and there
image
image

@github-actions github-actions bot added <Bugfix> This is a fix for a bug (or closes open issue) <Documentation> Design documents, internal info, guides and help. NPC / Factions NPCs, AI, Speech, Factions, Ownership [JSON] Changes (can be) made in JSON Bionics CBM (Compact Bionic Modules) Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies [C++] Changes (can be) made in C++. Previously named `Code` Monsters Monsters both friendly and unfriendly. [Markdown] Markdown issues and PRs Mods: Magiclysm Anything to do with the Magiclysm mod Mechanics: Enchantments / Spells Enchantments and spells Items: Armor / Clothing Armor and clothing EOC: Effects On Condition Anything concerning Effects On Condition Mods: Xedra Evolved Anything to do with Xedra Evolved labels Nov 11, 2024
@GuardianDll @github-actions
Update src/condition.cpp
9f14681 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Nov 11, 2024
Night-Pryanik
Night-Pryanik reviewed Nov 12, 2024
View reviewed changes
doc/MAGIC.md Outdated Show resolved Hide resolved
@GuardianDll @Night-Pryanik
Apply suggestions from code review
d39ba67 
Co-authored-by: Anton Burmistrov <[email protected]>
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Nov 12, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Nov 12, 2024
@github-actions github-actions bot added BasicBuildPassed This PR builds correctly, label assigned by github actions and removed BasicBuildPassed This PR builds correctly, label assigned by github actions labels Nov 12, 2024
@andrei8l
Copy link
Contributor

There's a lot of duplicated code here. AFAICT, the only difference between enchantment and enchant_cache is that one uses a plain float for range and the other a dbl_or_var. But a dbl_or_var can serve as a plain float even if you intentionally don't want to evaluate variables in that context.

@GuardianDll
Copy link
Member Author

There is a lot of duplicate code in enchantments overall, and i am not familiar with the ways to simiplify it, except templates (which i do not think is fitting here)

@Night-Pryanik Night-Pryanik merged commit 4dc15d0 into CleverRaven:master Nov 21, 2024
21 of 27 checks passed
@GuardianDll GuardianDll deleted the vision_stuff branch November 21, 2024 09:06
@GuardianDll GuardianDll mentioned this pull request Nov 22, 2024
Merged
@IdleSol IdleSol mentioned this pull request Dec 15, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Night-Pryanik Night-Pryanik Night-Pryanik left review comments

@KorGgenT KorGgenT Awaiting requested review from KorGgenT

@Maleclypse Maleclypse Awaiting requested review from Maleclypse

Assignees
No one assigned
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Bionics CBM (Compact Bionic Modules) <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` <Documentation> Design documents, internal info, guides and help. EOC: Effects On Condition Anything concerning Effects On Condition Items: Armor / Clothing Armor and clothing [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions [Markdown] Markdown issues and PRs Mechanics: Enchantments / Spells Enchantments and spells Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Xedra Evolved Anything to do with Xedra Evolved Monsters Monsters both friendly and unfriendly. Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies NPC / Factions NPCs, AI, Speech, Factions, Ownership
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

JSONify enchantment-based detection
3 participants
@GuardianDll @andrei8l @Night-Pryanik