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

Mutagen and mutation cleanup #24183

Merged
merged 9 commits into from Aug 1, 2018

Conversation

Projects
None yet
2 participants
@Kelenius
Copy link
Contributor

commented Jul 3, 2018

#23519

Removed defaults from threshold_mut, mutagen_message, iv_message. Mutation categories MUST set them.

Proper spacing around ellipses in mutagen messages and dreams.

Changed IV yelling messages to make more sense.

Changed how mutagen category is retrieved from the mutagen - now it uses properties. Because of that, the abstracts were changed - the game currently can't using copy-from on something that has properties/qualities set, then setting it in the child too. There's no property for ANY, because that's the default state now.

Cleaned up categories. Previously:
id: "mutation_plant"
category: "PLANT"
category_full: "MUTCAT_PLANT"
mutagen_flag: "MUTAGEN_PLANT"

Now:
id: "PLANT"

That's it. The rest is redundant.

Cleaned up mutagen iuse.

Removed MUTAGEN_STRONG flag from mutagen serum. It has no effect; the amount of mutations gained from serums is adjustable in the category JSON.

Kelenius added some commits Apr 17, 2018

Merge branch 'master' into MutationCleanup
 Conflicts:
	data/json/items/comestibles.json
	data/json/mutations.json
	src/iuse.cpp
@Kelenius

This comment has been minimized.

Copy link
Contributor Author

commented Jul 6, 2018

Should be ready.

@Kelenius

This comment has been minimized.

Copy link
Contributor Author

commented Jul 21, 2018

Any problems here?

@ZhilkinSerg

This comment has been minimized.

Copy link
Contributor

commented Jul 23, 2018

Any problems here?

Nope, just need more spare time to merge test this.

@ZhilkinSerg

This comment has been minimized.

Copy link
Contributor

commented Jul 30, 2018

I guess it is safe to remove following lines now:

- ```MUTAGEN_ANY``` Causes mutation in any branch.
- ```MUTAGEN_ALPHA``` Causes mutation in the alpha branch.
- ```MUTAGEN_BEAST``` Causes mutation in the beast branch.
- ```MUTAGEN_BIRD``` Causes mutation in the bird branch.
- ```MUTAGEN_CATTLE``` Causes mutation in the cattle branch.
- ```MUTAGEN_CEPHALOPOD``` Causes mutation in the cephalopod branch.
- ```MUTAGEN_CHIMERA``` Causes mutation in the chimera branch.
- ```MUTAGEN_ELFA``` Causes mutation in the elfa branch.
- ```MUTAGEN_FELINE``` Causes mutation in the feline (cat) branch.
- ```MUTAGEN_FISH``` Causes mutation in the fish branch.
- ```MUTAGEN_INSECT``` Causes mutation in the insect branch.
- ```MUTAGEN_LIZARD``` Causes mutation in the lizard branch.
- ```MUTAGEN_LUPINE``` Causes mutation in the lupine (wolf) branch.
- ```MUTAGEN_MEDICAL``` Causes mutation in the medical branch.
- ```MUTAGEN_PLANT``` Causes mutation in the plant branch.
- ```MUTAGEN_RAPTOR``` Causes mutation in the raptor branch.
- ```MUTAGEN_RAT``` Causes mutation in the rat branch.
- ```MUTAGEN_SLIME``` Causes mutation in the slime branch.
- ```MUTAGEN_SPIDER``` Causes mutation in the spider branch.
- ```MUTAGEN_TROGLOBITE``` Causes mutation in the troglobite branch.
- ```MUTAGEN_URSINE``` Causes mutation in the ursine (bear) branch.
- ```MUTAGEN_STRONG``` Chance of mutating several times.
- ```MUTAGEN_WEAK``` Causes generic mutation (with less chance to mutate than `MUTAGEN_STRONG`). Still needs one of the mutation flags from the above list.

@ZhilkinSerg

This comment has been minimized.

Copy link
Contributor

commented Jul 30, 2018

Looks good in fresh world with new character.

@ZhilkinSerg ZhilkinSerg merged commit 9da0b35 into CleverRaven:master Aug 1, 2018

4 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage decreased (-0.1%) to 22.708%
Details
gorgon-ghprb Build finished.
Details

@Kelenius Kelenius deleted the Kelenius:MutationCleanup branch Aug 1, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.