Frog and Snail Mutation Trees #51630

Maleclypse · 2021-09-15T03:17:41Z

Summary

Content "Adds Frog and Snail Mutation Trees"

Purpose of change

Adds a few new mutation trees. Fixes #51569 .

Describe the solution

Adds mutations, thresholds, mutagen, recipes, spawns, and unique mutagen ingredients.

Describe alternatives you've considered

None

Testing

Ongoing

Additional context

Update my fork

Post 0.E merge fest

Update fork

Update repo

update

Update to pockets

Update my Fork

Catchup

catchup to mainline

August 1 2020 Catchup to Master

Catchup for Artifact conversions

include updated relics

Let's talk relics

Catchup

catch a mouse

catchup

make it up to date

interesting

catchup

catchup branch

This reverts commit 9da0eae.

…47244)

fixes Apply suggestions from code review Update data/json/mutations/mutation_spells.json Apply suggestions from code review Apply suggestions from code review Lint Update mutations.json Apply suggestions from code review Update mutations.json Need to add rabbit dreams Fixes Additional Insect and Cattle traits Merge fixes, rabbit dreams, eoc Update mutations.json Update mutations.json Co-Authored-By: actual-nh <74678550+actual-nh@users.noreply.github.com>

Maleclypse · 2021-09-19T04:03:55Z

maleclypse — Today at 10:00 PM

            //Collect valid time of day ranges
            if( elem == "DAY" || elem == "NIGHT" || elem == "DUSK" || elem == "DAWN" ) {
                if( elem == "DAY" ) {
                    valid_times_of_day.emplace_back( sunrise, sunset );
                } else if( elem == "NIGHT" ) {
                    valid_times_of_day.emplace_back( sunset, sunrise );
                } else if( elem == "DUSK" ) {
                    valid_times_of_day.emplace_back( sunset - 1_hours, sunset + 1_hours );
                } else if( elem == "DAWN" ) {
                    valid_times_of_day.emplace_back( sunrise - 1_hours, sunrise + 1_hours );
                }
            }

I want to add Night and Day as active conditions in enchantments
if( active_conditions.second == condition::NIGHT ) { return guy.pos().z < 0; }
I get that I need to change the return guy.pos().z < 0; but I'm not sure how to pull into the day ranges that I think are elem

maleclypse — Today at 11:01 PM

Is it     if( active_conditions.second == condition::NIGHT ) {
        return is_night;
    }```  
?
and to get that to work do I need to include the calendar.h?

missed commas

Maleclypse · 2021-09-20T04:02:04Z

These tests are failing but when I look at the tests folder I can't see why they would be failing now.

Maleclypse · 2021-09-20T04:58:46Z

Well now I have to figure out how the points are awarded to a given mutation. Ugly somehow awards 24 Batrachian points by itself.

Termineitor244 · 2021-09-24T16:54:54Z

data/json/dreams.json

+      "You have a strange dream about being the Easter Bunny.",
+      "You have a comforting and warm dream of living as a rabbit."
+    ],
+    "category": "LIZARD",


Shouldn't this be "RABBIT"?

Thanks! This was already merged so someone will have to create a new PR with the fixes. Let me know if you want to that and if not I'll put them on my todo list.

Oh, then I will do the PR, serves me as an excuse to update my master, just a question, NIGHT_RAIDER is supposed to have the same description as TUNNEL_FIGHTER? To know if I should change it too.

no it should have different text . I just forgot to update it.

Done #51859.

Termineitor244 · 2021-09-24T16:56:17Z

data/json/items/comestibles/mutagen.json

+    "copy-from": "iv_mutagen_flavor",
+    "type": "COMESTIBLE",
+    "name": { "str": "batrachian serum" },
+    "description": "A super-concentrated mutagen with that looks like pond water… are the shadows in it moving?  You need a syringe to inject it… if you really want to?",


"A super-concentrated mutagen with that looks"
I think the "with" should be removed... Or maybe I'm just bad at English?

Seconding, the with should be removed.

Termineitor244 · 2021-09-24T16:56:31Z

data/json/items/comestibles/mutagen.json

+    "copy-from": "mutagen_flavor",
+    "type": "COMESTIBLE",
+    "name": { "str": "batrachian mutagen" },
+    "description": "A shadowy mutagen that looks like might be full of tiny swimming tadpoles.",


"A shadowy mutagen that looks like might"
Like "it" might?

Termineitor244 · 2021-09-24T16:58:04Z

data/json/mutations/mutations.json

+    "id": "NIGHT_RAIDER",
+    "name": { "str": "Night Raider" },
+    "points": 3,
+    "description": "You know how to fight in cramped tunnels at risk of collapse.  You gain bonuses when fighting underground.",


Is this supposed to have the same description as "TUNNEL_FIGHTER"?

Termineitor244 · 2021-09-24T16:58:41Z

data/json/mutations/mutations.json

@@ -568,7 +670,7 @@
    "id": "TERRIFYING",
    "name": { "str": "Terrifying" },
    "points": 1,
-    "description": "There's something about you that creatures find frightening, and they are more likely to try to flee.",
+    "description": "There's something about you that humans and post-humans find frightening, and they are more likely to try to flee.",


This affects the moral of all creatures:

if( u->has_trait( trait_TERRIFYING ) ) { effective_morale -= 10; }

(From src/monster.cpp)
So "creatures" is more appropriate.

Minor fixes to #51630

Maleclypse and others added 30 commits March 26, 2020 22:57

Merge pull request #14 from CleverRaven/master

6abee0d

Update my fork

Merge pull request #15 from CleverRaven/master

ea82db7

Post 0.E merge fest

Merge pull request #16 from CleverRaven/master

2c85d39

Update fork

Merge pull request #17 from CleverRaven/master

8d986f1

Update repo

Merge pull request #19 from CleverRaven/master

ce276d2

update

Merge pull request #20 from CleverRaven/master

27a08a9

Update to pockets

Merge pull request #21 from CleverRaven/master

3558e43

Update my Fork

Merge pull request #22 from CleverRaven/master

d492872

Catchup

Merge pull request #23 from CleverRaven/master

538a189

catchup to mainline

Merge pull request #24 from CleverRaven/master

8a6a4ed

August 1 2020 Catchup to Master

Merge pull request #25 from CleverRaven/master

c2430e3

Catchup for Artifact conversions

Merge pull request #26 from CleverRaven/master

30237d0

include updated relics

Merge pull request #27 from CleverRaven/master

61a24eb

Let's talk relics

Merge pull request #29 from CleverRaven/master

bce4938

Catchup

Merge pull request #30 from CleverRaven/master

1dd84e1

catch a mouse

Merge pull request #31 from CleverRaven/master

37dc32f

catchup

Merge pull request #32 from CleverRaven/master

362fa04

make it up to date

Merge pull request #33 from CleverRaven/master

1909a86

interesting

Merge pull request #34 from CleverRaven/master

36535d9

catchup

Merge pull request #35 from CleverRaven/master

7bc4088

catchup branch

Extend/Delete in requirements

9da0eae

Revert "Extend/Delete in requirements"

7078595

This reverts commit 9da0eae.

Valentine Cards (CleverRaven#47438)

35d7d63

Add a proficiency for handloading, and a new profession (CleverRaven#…

3a4f2d6

…47244)

Drug Dealer Profession (CleverRaven#47255)

874b44b

Adds hallula, a type of bread popular in Bolivia and Chile

c4d62c3

Arm mounted pouch (CleverRaven#46946)

12ec06c

Tazer drone iii (CleverRaven#47353)

bb2c3e2

Added Gelatin and Several Gelatin Based Recipes (CleverRaven#47080)

ae16ce2

Content: bread in a can (CleverRaven#45680)

8703266

Maleclypse added 2 commits September 18, 2021 09:41

Snail Mutation tree

a2847a1

Batrachian Mutation Tree

06e1b22

Maleclypse force-pushed the More-Mutation-Trees branch 3 times, most recently from e16b2a6 to f610a15 Compare September 19, 2021 03:36

Maleclypse and others added 2 commits September 18, 2021 22:36

Night Raider and Tunnel Fighter traits

cd9f16a

Maleclypse force-pushed the More-Mutation-Trees branch from f610a15 to cd9f16a Compare September 19, 2021 03:36

Maleclypse added 2 commits September 18, 2021 23:06

Make Spiked Tail insect

90e83b0

Enchantment Condition Day and Night

d46e166

missed commas

Maleclypse force-pushed the More-Mutation-Trees branch from a0fd90a to d46e166 Compare September 19, 2021 04:34

Update mutations.json

5a04641

Ramza13 mentioned this pull request Sep 19, 2021

Use dialog conditions for mutation and enchantment triggers #51726

Merged

Maleclypse added 4 commits September 20, 2021 18:30

remove batrachian from smelly maybe fix tests

099cf72

Fix Magiclysm Thresh tests

88243c0

Update mutation.json

f4d2eb0

Update mutation.json

0a60998

Maleclypse marked this pull request as ready for review September 24, 2021 13:12

Maleclypse requested a review from KorGgenT as a code owner September 24, 2021 13:12

Maleclypse mentioned this pull request Sep 24, 2021

Flag [NONTHRESH] causes mutations to not count for you but against you #51844

Closed

kevingranade merged commit 75de031 into CleverRaven:master Sep 24, 2021

Termineitor244 reviewed Sep 24, 2021

View reviewed changes

Maleclypse deleted the More-Mutation-Trees branch September 24, 2021 20:26

Termineitor244 mentioned this pull request Sep 24, 2021

Minor fixes to #51630 #51859

Merged

Rivet-the-Zombie added a commit that referenced this pull request Sep 25, 2021

Merge pull request #51859 from Termineitor244/Suggestions

abdf768

Minor fixes to #51630

dseguin mentioned this pull request Oct 7, 2021

Pull enemies Scorpion-style #52155

Merged

Maleclypse mentioned this pull request Jul 22, 2022

Finetuning batrachian mutation (with intended sideeffects) #59458

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Frog and Snail Mutation Trees #51630

Frog and Snail Mutation Trees #51630

Maleclypse commented Sep 15, 2021 •

edited

Loading

Maleclypse commented Sep 19, 2021

Maleclypse commented Sep 20, 2021

Maleclypse commented Sep 20, 2021

Termineitor244 Sep 24, 2021

Maleclypse Sep 24, 2021

Termineitor244 Sep 24, 2021

Maleclypse Sep 24, 2021

Termineitor244 Sep 25, 2021

Termineitor244 Sep 24, 2021

Zireael07 Sep 24, 2021

Termineitor244 Sep 24, 2021

Termineitor244 Sep 24, 2021

Termineitor244 Sep 24, 2021

Frog and Snail Mutation Trees #51630

Frog and Snail Mutation Trees #51630

Conversation

Maleclypse commented Sep 15, 2021 • edited Loading

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

Maleclypse commented Sep 19, 2021

Maleclypse commented Sep 20, 2021

Maleclypse commented Sep 20, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Maleclypse commented Sep 15, 2021 •

edited

Loading