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

AEA_DIM and AEA_LIGHT #34140

Merged
merged 1 commit into from Sep 23, 2019
Merged

AEA_DIM and AEA_LIGHT #34140

merged 1 commit into from Sep 23, 2019

Conversation

KorGgenT
Copy link
Member

@KorGgenT KorGgenT commented Sep 21, 2019

Summary

SUMMARY: Features "Add timed_event spell effect and associated AEA spells"

Purpose of change

Part of the artifact project, timed events are used in two of the active artifact effects. AEA_DIM and AEA_LIGHT (see #34142)

Describe the solution

adds a new spell_effect function that adds a timed event based on effect_str at calendar::turn + duration

@KorGgenT KorGgenT added [JSON] Changes (can be) made in JSON [C++] Changes (can be) made in C++. Previously named `Code` Artifacts Otherworldly items with special effects labels Sep 21, 2019
@KorGgenT KorGgenT added this to In Progress in Rewrite Artifacts via automation Sep 21, 2019
@KorGgenT KorGgenT marked this pull request as ready for review September 21, 2019 22:52
@KorGgenT KorGgenT force-pushed the AEA_DIM branch 2 times, most recently from 0b97f1a to 156bfe7 Compare September 22, 2019 15:42
@kevingranade
Copy link
Member

You've got a bad merge in here.

@ZhilkinSerg ZhilkinSerg merged commit e8cb375 into CleverRaven:master Sep 23, 2019
Rewrite Artifacts automation moved this from In Progress to Done Sep 23, 2019
@KorGgenT KorGgenT deleted the AEA_DIM branch September 28, 2019 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Artifacts Otherworldly items with special effects [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON
Projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants