[RDY]Added ability for mutations to spawn items via JSON. #21555

Maddremor · 2017-08-04T17:11:01Z

I've added the ability specify "spawn_item" when defining a mutation in JSON. It's not used currently used by any mutations, but WEB_ROPE and VINES3 could be migrated to this system. I would appreciate feedback if I missed something.

FalconMillennium · 2017-08-04T17:13:12Z

Seems nice. Maybe in the future, web-producers will be able to harvest their own silk and make clothing out of it? :P.

DangerNoodle · 2017-08-04T17:35:44Z

Interesting property, and I can see this having utility for modding.

DangerNoodle · 2017-08-04T19:46:52Z

If it was possible to generate weapons to toggle like bionic claws or blade, that what also be useful. But unlike this pull request, I can think of no existing mutation that would warrant such a change. Retractable claws for example would likely not hinder the use of hands enough to warrant it.

BevapDin · 2017-08-04T20:39:55Z

In its current state it's essentially dead (unused) code. You should make use of it, e.g. port WEB_ROPE and VINES3 to use it. This shows that it's actually working.

BevapDin · 2017-08-04T20:36:02Z

src/mutation_data.cpp

@@ -164,6 +164,7 @@ void mutation_branch::load( JsonObject &jsobj )
    new_mut.fatigue = jsobj.get_bool("fatigue",false);
    new_mut.valid = jsobj.get_bool("valid", true);
    new_mut.purifiable = jsobj.get_bool("purifiable", true);
+    new_mut.spawn_item = _(jsobj.get_string("spawn_item", "").c_str());


Why do you translate the id of the item? (Remove the _(.c_str()).)

Trial, error, and pasted code. Will change.

BevapDin · 2017-08-04T20:36:25Z

src/mutation.h

@@ -114,6 +114,9 @@ struct mutation_branch {
    // Modifier for the rate at which fatigue drops when resting.
    float fatigue_regen_modifier = 0.0f;

+    /** The item, if any, spawned by the mutation */
+    std::string spawn_item;


Should be itype_id instead of std::string.

Admittedly, I know nothing, but that being said: are you sure? I swiped the implementation from fake_item in bionics.cpp/bionics.h and it looks like it passes a string. Or is the bionic solution suboptimal/inadvicable?

it looks like it passes a string.

yes, it does, because itype_id is a dumb typedef for std::string, but hopefully not for long. itype_id will become an alias for string_id<itype_t>. For now we just try to use itype_id where it's meant to be.

BevapDin · 2017-08-04T20:37:21Z

src/mutation.cpp

@@ -518,6 +518,12 @@ void player::activate_mutation( const trait_id &mut )
        print_health();
        tdata.powered = false;
        return;
+    } else if ( !mdata.spawn_item.empty() ) {
+        item tmpitem( mdata.spawn_item.c_str() );


What's with the pointless call to .c_str() here?

If WEB_ROPE and VINES3 were to be migrated, would it be acceptable to lose the unique descriptions and replace with the generic You create a %s.?

Maddremor · 2017-08-04T22:18:18Z

If WEB_ROPE and VINES3 were to be migrated, would it be acceptable to lose their unique activation messages to be replaced with a generic You create a %s.?

DangerNoodle · 2017-08-04T22:23:50Z

If it must be done, assuming you are unable to add a message for it. Maybe if active mutations could have a JSON activation message in general, but that might be fit for a later pull request.

Maddremor · 2017-08-04T22:32:01Z

I could add the messages, but it it would be hardcoded, inelegant, and be a step backwards in my attemt to move more things to JSON. I did consider a general activation message, but reached the same conclusion in regards to not overload this PR.

DangerNoodle · 2017-08-04T22:33:45Z

Hardcoded messages would be inelegant, but for now use whatever method suffices for now.

…at I'm doing wrong.

Maddremor · 2017-08-04T23:10:59Z

Now this might sound like a stupid question (it is), but how should I replace std::string with itype_id syntax-wise, because I can't get it to compile?

BevapDin · 2017-08-05T14:19:15Z

Now this might sound like a stupid question (it is), but how should I replace std::string with itype_id syntax-wise, because I can't get it to compile?

Replace std::string in your additional code in mutaton.h with itype_id. Add a typedef for it at the top of the file (e.g. after class item;): using itype_id = std::string; (on a single line).

Night-Pryanik

Styling issues.

Night-Pryanik · 2017-08-05T14:45:59Z

data/json/mutations.json

@@ -3002,7 +3002,8 @@
        "active"     :    true,
        "cost"       :    30,
        "hunger"     :    true,
-        "thirst"     :    true
+        "thirst"     :    true,
+        "spawn_item" : "rope_30"


Why don't you align "rope_30" to the values above it? Also, "vine_30" below.

Night-Pryanik · 2017-08-05T14:47:38Z

src/mutation.cpp

-        i_add_or_drop( rope );
-        tdata.powered = false;
-    } else if (mut == "BURROW"){
+    }  else if (mut == "BURROW"){


Excess space before else. Also, should be astyled as if( mut == "BURROW" ) {.

Night-Pryanik · 2017-08-05T14:48:11Z

src/mutation.cpp

-            newit = i_add(newit);
-            add_msg_if_player(m_info, "%c - %s", newit.invlet == 0 ? ' ' : newit.invlet, newit.tname().c_str());
-        }
+    }  else if( mut == trait_SELFAWARE ) {


Excess space before else.

Night-Pryanik · 2017-08-05T14:49:09Z

src/mutation.cpp

        tdata.powered = false;
        return;
-    } else if( mut == trait_SELFAWARE ) {
-        print_health();
+    } else if ( !mdata.spawn_item.empty() ) {


Should be } else if( !mdata.spawn_item.empty() ).

Night-Pryanik · 2017-08-05T14:49:43Z

src/mutation.cpp

+    } else if ( !mdata.spawn_item.empty() ) {
+        item tmpitem( mdata.spawn_item );
+        i_add_or_drop( tmpitem );
+        if (mut == "WEB_ROPE") {


Should be if( mut == "WEB_ROPE") {.

Night-Pryanik · 2017-08-05T14:51:32Z

src/mutation.cpp

+        } else if (mut == "VINES3") {
+            add_msg_if_player(_("You detach a vine from your body."));
+        } else {
+            add_msg_if_player(_("You create a %s."), tmpitem.display_name().c_str());


All add_msg_if_player here and above should have brackets with spaces. Like ( some text here ).

Night-Pryanik · 2017-08-05T14:51:53Z

src/mutation_data.cpp

@@ -164,6 +164,7 @@ void mutation_branch::load( JsonObject &jsobj )
    new_mut.fatigue = jsobj.get_bool("fatigue",false);
    new_mut.valid = jsobj.get_bool("valid", true);
    new_mut.purifiable = jsobj.get_bool("purifiable", true);
+    new_mut.spawn_item = jsobj.get_string("spawn_item", "");


Spaces next to brackets.

Night-Pryanik · 2017-08-05T16:03:09Z

src/mutation.cpp

+    {
+        item tmpitem( mdata.spawn_item );
+        i_add_or_drop( tmpitem );
+        if( mut == "WEB_ROPE") {


One last space, and it's ready to go.

kevingranade · 2017-08-13T15:47:49Z

src/mutation.cpp

+    {
+        item tmpitem( mdata.spawn_item );
+        i_add_or_drop( tmpitem );
+        if( mut == "WEB_ROPE" ) {


Why didn't you jsonize this block as well? With it like this, you still have to edit this file to add a creation message.

I planned on jsonizing mutation activation messages at some point, but given my inexperience in coding, I tried to limit this PR in scope. Keeping the messages hardcoded felt workable for the time being.

Added ability for mutations to spawn items via JSON.

dcaa6fa

Maddremor changed the title ~~[WIP]Added ability for mutations to spawn items via JSON.~~ [CR]Added ability for mutations to spawn items via JSON. Aug 4, 2017

BevapDin suggested changes Aug 4, 2017

View reviewed changes

Maddremor changed the title ~~[CR]Added ability for mutations to spawn items via JSON.~~ [CR][WIP]Added ability for mutations to spawn items via JSON. Aug 4, 2017

Removed some uneccecary stuff.

e52f348

Changed std::string to itype_id.

d860cac

Maddremor added 2 commits August 5, 2017 00:47

Revert to std::string so I can keep working until someone tells me wh…

6eb4ed2

…at I'm doing wrong.

Migrated VINES3 and WEB_ROPE to new system.

7a25470

Maddremor added 3 commits August 5, 2017 15:20

Fixed minor conflict.

a838cf7

Replaced accidental tabs with spaces.

ddd0f2f

Let's try out this Astyle thing.

520bbd1

Night-Pryanik reviewed Aug 5, 2017

View reviewed changes

std::string to itype_id for real this time.

52f574f

Maddremor changed the title ~~[CR][WIP]Added ability for mutations to spawn items via JSON.~~ [CR]Added ability for mutations to spawn items via JSON. Aug 5, 2017

Maddremor added 2 commits August 5, 2017 17:29

Astyle

2f617ca

Formating

086a65b

BevapDin approved these changes Aug 5, 2017

View reviewed changes

Night-Pryanik reviewed Aug 5, 2017

View reviewed changes

Added a space.

21edb88

Maddremor changed the title ~~[CR]Added ability for mutations to spawn items via JSON.~~ Added ability for mutations to spawn items via JSON. Aug 5, 2017

Merge remote-tracking branch 'origin/master' into mutation-item-spawn

ddfcaf4

Maddremor changed the title ~~Added ability for mutations to spawn items via JSON.~~ [RDY]Added ability for mutations to spawn items via JSON. Aug 7, 2017

kevingranade reviewed Aug 13, 2017

View reviewed changes

kevingranade merged commit ddfcaf4 into CleverRaven:master Aug 22, 2017

Maddremor deleted the mutation-item-spawn branch September 15, 2017 07:57

ghost mentioned this pull request Jan 20, 2019

Ranged attacks mutations (using fake guns customized via JSON) #27725

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[RDY]Added ability for mutations to spawn items via JSON. #21555

[RDY]Added ability for mutations to spawn items via JSON. #21555

Maddremor commented Aug 4, 2017

FalconMillennium commented Aug 4, 2017

DangerNoodle commented Aug 4, 2017

DangerNoodle commented Aug 4, 2017

BevapDin commented Aug 4, 2017

BevapDin Aug 4, 2017

Maddremor Aug 4, 2017

BevapDin Aug 4, 2017

Maddremor Aug 4, 2017

codemime Aug 4, 2017 •

edited

BevapDin Aug 4, 2017

Maddremor Aug 4, 2017

Maddremor commented Aug 4, 2017

DangerNoodle commented Aug 4, 2017

Maddremor commented Aug 4, 2017

DangerNoodle commented Aug 4, 2017

Maddremor commented Aug 4, 2017

BevapDin commented Aug 5, 2017

Night-Pryanik left a comment

Night-Pryanik Aug 5, 2017

Night-Pryanik Aug 5, 2017

Night-Pryanik Aug 5, 2017

Night-Pryanik Aug 5, 2017

Night-Pryanik Aug 5, 2017

Night-Pryanik Aug 5, 2017

Night-Pryanik Aug 5, 2017

Night-Pryanik Aug 5, 2017 •

edited

kevingranade Aug 13, 2017

Maddremor Aug 13, 2017

[RDY]Added ability for mutations to spawn items via JSON. #21555

[RDY]Added ability for mutations to spawn items via JSON. #21555

Conversation

Maddremor commented Aug 4, 2017

FalconMillennium commented Aug 4, 2017

DangerNoodle commented Aug 4, 2017

DangerNoodle commented Aug 4, 2017

BevapDin commented Aug 4, 2017

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

codemime Aug 4, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Maddremor commented Aug 4, 2017

DangerNoodle commented Aug 4, 2017

Maddremor commented Aug 4, 2017

DangerNoodle commented Aug 4, 2017

Maddremor commented Aug 4, 2017

BevapDin commented Aug 5, 2017

Night-Pryanik left a 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

Night-Pryanik Aug 5, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codemime Aug 4, 2017 •

edited

Night-Pryanik Aug 5, 2017 •

edited