[Ready] More mutations #5411

KA101 · Jan 5, 2014

Time to start expanding things.

This pass:
A needed upgrade to the debug-mutation code (it currently can't handle threshold-granting or post-threshold traits; this lets you grant/revoke thresholds manually)
The long-promised Ectothermic (like Cold-blooded, but now should grant bonus speed above 65F, needs Lizard)
Alpha gets a few more mundane traits to improve odds of getting Prime
Threshold safety-lock (no, it's not supposed to be a valid downgrade target)
Mutagen addiction, with Extra Bonus trait to make it nastier!
Post-threshold upgrade for Cattle: Ruminant->Grazer, letting you eat grass for minor (2 or 5) hunger boost
Restricts the Insanely stat-buffs to post-Threshold
Upgraded Masochist for the Medical category post-threshold
Pain-blocker for the Medical category post-threshold
Nastier venom for Arachnids (Yeah, I'll put in extra legs for 'em and for Insects once I work out what good they'd do)
Substance Tolerance, for those of us who don't mind less mileage per hit
Alcohol Metabolism, Subterranean boost (less Drunk, less Depressant, more Nutrition!)
Non-purifiable traits ought to resist not-in-category cancellation (75% chance to not be marked for deletion)
Enhanced statboosters for Prime folks
Cenobite lengthened out to a two-mutation run (total of three, counting Masochist); they now get noticeably lighter Pain debuffs (but they look horrid in the bargain, not that it matters much ATM)

Went through and apparently no actual merge conflicts with this. Whenever you're ready, I guess.

illi-kun · Jan 6, 2014

illi-kun reviewed Jan 6, 2014

View changes

illi-kun · Jan 6, 2014

data/json/mutations.json

+        "points" : 0,
+        "visibility" : 0,
+        "ugliness" : 0,
+        "description" : "Just thinking of mutagen (such a lovely word! 'mutagen'. Perfect!) makes you thirsty. And you so love your new parts...you simply must have more mutagen.",


I think you should put a space here: "new parts...you", isn't?

illi-kun · Jan 6, 2014

illi-kun reviewed Jan 6, 2014

View changes

illi-kun · Jan 6, 2014

src/player.cpp

+  if ((has_trait("COLDBLOOD") || has_trait("COLDBLOOD2") ||
+      has_trait("COLDBLOOD3") || has_trait("COLDBLOOD4")) &&
+      g->get_temperature() < 65) {
+  if (has_trait("COLDBLOOD3") || has_trait("COLDBLOOD4"))


can you but brackets after each if here, since you're working with this file?

illi-kun · Jan 7, 2014

illi-kun reviewed Jan 7, 2014

View changes

illi-kun · Jan 7, 2014

src/addiction.cpp

+            if (one_in(600 - 50 * in)) {
+                g->add_msg(rng(0, 6) < in ? _("You so miss the exquisite rainbow of post-humanity.") :
+                       _("Your body is SOO booorrrring. Just a little sip to liven things up?"));
+            g->u.add_morale(MORALE_CRAVING_MUTAGEN, -20, -200);


wrong indent

illi-kun · Jan 7, 2014

illi-kun reviewed Jan 7, 2014

View changes

illi-kun · Jan 7, 2014

src/addiction.cpp

+            g->add_msg(rng(0, 6) < in ? _("You haven't had any mutagen lately.") :
+                       _("You could use some new parts..."));
+            g->u.add_morale(MORALE_CRAVING_MUTAGEN, -5, -50);
+            }


wrong indent

illi-kun · Jan 7, 2014

illi-kun reviewed Jan 7, 2014

View changes

illi-kun · Jan 7, 2014

src/addiction.cpp

        return string_format(_(
                                 "Strength - %d;   Perception - 1;   Dexterity - 1;\n"
+                                 "Depression.  Frequent cravings.  Vomiting."), strpen);
+    }
+        else return string_format(_(


no brackets

illi-kun · Jan 7, 2014

illi-kun reviewed Jan 7, 2014

View changes

illi-kun · Jan 7, 2014

src/game.cpp

@@ -10308,6 +10311,19 @@ void game::eat(int pos)
  add_msg(_("You eat the underbrush."));
  return;
 }
+  if (u.has_trait("GRAZER") && m.ter(u.posx, u.posy) == t_grass &&
+     query_yn(_("Graze?"))) {
+  u.moves -= 400;


wrong indent

illi-kun · Jan 7, 2014

illi-kun reviewed Jan 7, 2014

View changes

illi-kun · Jan 7, 2014

src/game.cpp

+    if ((u.hunger < 10) || one_in(20 - u.int_cur)) {
+        add_msg(_("You eat some of the taller grass, careful to leave some growing."));
+        u.hunger -= 2;
+      }


wrong indent

illi-kun · Jan 7, 2014

illi-kun reviewed Jan 7, 2014

View changes

illi-kun · Jan 7, 2014

src/game.cpp

+    else { add_msg(_("You eat the grass."));
+      u.hunger -= 5;
+      m.ter_set(u.posx, u.posy, t_dirt);
+      }


wrong indent

illi-kun · Jan 7, 2014

illi-kun reviewed Jan 7, 2014

View changes

illi-kun · Jan 7, 2014

src/iuse.cpp

@@ -1175,7 +1216,12 @@ int iuse::mut_iv(player *p, item *it, bool) {
            g->add_msg_if_player(p, _("Mmm...the *special* venom."));
            mutation_category = "MUTCAT_SPIDER";
        } else if( it->has_flag("MUTAGEN_SLIME") ) {
+            if(p->has_trait("MUT_JUNKIE")) {
+            g->add_msg_if_player(p, _("Maybe if you drank enough, you'd become mutagen..."));


wrong indent

illi-kun · Jan 7, 2014

illi-kun reviewed Jan 7, 2014

View changes

illi-kun · Jan 7, 2014

src/iuse.cpp

+            if(p->has_trait("MUT_JUNKIE")) {
+            g->add_msg_if_player(p, _("Maybe if you drank enough, you'd become mutagen..."));
+            }
+            else if(!(p->has_trait("MUT_JUNKIE"))) {
            g->add_msg_if_player(p, _("This stuff takes you back. Downright primordial!"));


wrong indent

illi-kun · Jan 7, 2014

illi-kun reviewed Jan 7, 2014

View changes

illi-kun · Jan 7, 2014

src/iuse.cpp

-                    g->add_msg_if_player(p,_("Images of your past life flash before you."));
-                    p->add_disease("stunned", rng(2, 3));
+                    if (g->u.has_trait("NOPAIN")) {
+                              g->add_msg_if_player(p,_("You feel Bugged."));


wrong indent

illi-kun · Jan 7, 2014

illi-kun reviewed Jan 7, 2014

View changes

illi-kun · Jan 7, 2014

src/iuse.cpp

-                    p->add_disease("stunned", rng(2, 3));
+                    if (g->u.has_trait("NOPAIN")) {
+                              g->add_msg_if_player(p,_("You feel Bugged."));
+                        }


wrong indent

illi-kun · Jan 7, 2014

illi-kun reviewed Jan 7, 2014

View changes

illi-kun · Jan 7, 2014

src/player.cpp

@@ -5262,7 +5300,9 @@ void player::suffer()
 // Negative bionics effects
 if (has_bionic("bio_dis_shock") && one_in(1200)) {
  g->add_msg(_("You suffer a painful electrical discharge!"));
+  if (!(has_trait("NOPAIN"))) {
  pain++;


wrong indent. Astyle usually helps with issues like that.

illi-kun · Jan 7, 2014

Thanks, looks fine now!

KA101 · Jan 7, 2014

Feel free to comment on the merits, too. ;-)

illi-kun · Jan 7, 2014

Haha, I'll if I find something to say, but for the moment I have only bunch of noisy comments about indents.

Cenobite000 · Jan 8, 2014

Oh! Just noticed the Cenobite mutation line. This is great. Snicker

KA101 · Jan 8, 2014

-Well, it doesn't actually stop the negative effects, though... snickers back-

Actually, now it does. Just takes another mutation.

Rivet-the-Zombie · Jan 12, 2014

Something seems to be amiss here. Having the cenobite trait seems to make it so pain bleedoff takes hours. I think that somehow it's not calculating the faster pain recovery perks once you have it, but I may be mistaken. Also, the description says you adore pain, yet it seems that it's possible to have the cenobite mutation and not have the masochist mutation, in which case it still doesn't allow you to solder your own flesh for kicks.

Everything else seems to be okay though.

KA101 · Jan 12, 2014

I'll fix that as soon as I can get a working connection at the room. Thanks.

(Streak was gonna end on Friday anyway when I fly to Florida.)

kevingranade · Jan 12, 2014

kevingranade reviewed Jan 12, 2014

View changes

kevingranade · Jan 12, 2014

src/iuse.cpp

+        // Metabolizing it cancels out the depressant
+        // except for Irish coffee, which already
+        // has a postive stim value
+        if (!(it->type->id == "irish_coffee")) {


How about making this test based on food->stim < 0 instead of calling out the specific item?

Sure, just as soon as I can actually push code again I'll get on that. Leaving the library shortly.

:-(

kevingranade · Jan 12, 2014

Pulled without seeing the tail of the discussion, sorry about that.
I'll take a look at the issues since you're short on time.

As requested

08e43ef

Venom-upgrade
Much nastier venom for Arachnids. If the new effect-handing code was working properly, that is.

0db67b6

kevingranade merged commit cee67a6 into CleverRaven:master Jan 12, 2014

KA101 deleted the KA101:moar-mutations branch Jan 13, 2014

CleverRaven/Cataclysm-DDA

Join GitHub today

[Ready] More mutations #5411

Conversation

KA101 commented Jan 5, 2014

KA101 added some commits Jan 5, 2014

illi-kun reviewed Jan 6, 2014 View changes

This comment has been minimized.

illi-kun reviewed Jan 6, 2014 View changes

This comment has been minimized.

KA101 added some commits Jan 6, 2014

illi-kun reviewed Jan 7, 2014 View changes

This comment has been minimized.

illi-kun reviewed Jan 7, 2014 View changes

This comment has been minimized.

illi-kun reviewed Jan 7, 2014 View changes

This comment has been minimized.

illi-kun reviewed Jan 7, 2014 View changes

This comment has been minimized.

illi-kun reviewed Jan 7, 2014 View changes

This comment has been minimized.

illi-kun reviewed Jan 7, 2014 View changes

This comment has been minimized.

illi-kun reviewed Jan 7, 2014 View changes

This comment has been minimized.

illi-kun reviewed Jan 7, 2014 View changes

This comment has been minimized.

illi-kun reviewed Jan 7, 2014 View changes

This comment has been minimized.

illi-kun reviewed Jan 7, 2014 View changes

This comment has been minimized.

illi-kun reviewed Jan 7, 2014 View changes

This comment has been minimized.

This comment has been minimized.

illi-kun commented Jan 7, 2014

This comment has been minimized.

KA101 commented Jan 7, 2014

This comment has been minimized.

illi-kun commented Jan 7, 2014

This comment has been minimized.

Cenobite000 commented Jan 8, 2014

This comment has been minimized.

KA101 commented Jan 8, 2014

KA101 added some commits Jan 9, 2014

This comment has been minimized.

Rivet-the-Zombie commented Jan 12, 2014

This comment has been minimized.

KA101 commented Jan 12, 2014

kevingranade reviewed Jan 12, 2014 View changes

This comment has been minimized.

This comment has been minimized.

kevingranade merged commit cee67a6 into CleverRaven:master Jan 12, 2014

This comment has been minimized.

kevingranade commented Jan 12, 2014

KA101 deleted the KA101:moar-mutations branch Jan 13, 2014

illi-kun reviewed Jan 6, 2014

View changes

illi-kun reviewed Jan 6, 2014

View changes

illi-kun reviewed Jan 7, 2014

View changes

illi-kun reviewed Jan 7, 2014

View changes

illi-kun reviewed Jan 7, 2014

View changes

illi-kun reviewed Jan 7, 2014

View changes

illi-kun reviewed Jan 7, 2014

View changes

illi-kun reviewed Jan 7, 2014

View changes

illi-kun reviewed Jan 7, 2014

View changes

illi-kun reviewed Jan 7, 2014

View changes

illi-kun reviewed Jan 7, 2014

View changes

illi-kun reviewed Jan 7, 2014

View changes

illi-kun reviewed Jan 7, 2014

View changes

kevingranade reviewed Jan 12, 2014

View changes

kevingranade merged commit `cee67a6` into CleverRaven:master Jan 12, 2014