Merge pull request #32333 from ZhilkinSerg/refactor-fields-step-5

Refactor fields (step 5)
CleverRaven · Jul 12, 2019 · d0a24c3 · d0a24c3
2 parents f253d84 + fd89150
commit d0a24c3
Show file tree

Hide file tree

Showing 5 changed files with 182 additions and 161 deletions.
diff --git a/data/json/field_type.json b/data/json/field_type.json
@@ -10,6 +10,7 @@
     "type": "field_type",
     "legacy_enum_id": 1,
     "intensity_levels": [ { "name": "blood splatter", "color": "red" }, { "name": "blood stain" }, { "name": "puddle of blood" } ],
+    "underwater_age_speedup": "25 minutes",
     "half_life": "2 days",
     "phase": "liquid",
     "accelerated_decay": true,
@@ -20,6 +21,7 @@
     "type": "field_type",
     "legacy_enum_id": 2,
     "intensity_levels": [ { "name": "bile splatter", "color": "pink" }, { "name": "bile stain" }, { "name": "puddle of bile" } ],
+    "underwater_age_speedup": "25 minutes",
     "half_life": "1 days",
     "phase": "liquid",
     "accelerated_decay": true,
@@ -34,6 +36,7 @@
       { "name": "bloody meat chunks", "color": "light_red" },
       { "name": "heap of gore", "color": "red" }
     ],
+    "underwater_age_speedup": "25 minutes",
     "half_life": "2 days",
     "phase": "solid",
     "accelerated_decay": true,
@@ -48,6 +51,7 @@
       { "name": "shattered branches and leaves" },
       { "name": "broken vegetation tangle", "color": "green" }
     ],
+    "underwater_age_speedup": "25 minutes",
     "half_life": "2 days",
     "phase": "solid",
     "accelerated_decay": true,
@@ -86,6 +90,7 @@
       { "name": "acid streak" },
       { "name": "pool of acid", "color": "green" }
     ],
+    "underwater_age_speedup": "2 minutes",
     "priority": 2,
     "half_life": "2 minutes",
     "phase": "liquid",
@@ -349,6 +354,7 @@
       { "name": "plant sap stain" },
       { "name": "puddle of resin" }
     ],
+    "underwater_age_speedup": "25 minutes",
     "half_life": "2 days",
     "phase": "liquid",
     "accelerated_decay": true,
@@ -359,6 +365,7 @@
     "type": "field_type",
     "legacy_enum_id": 29,
     "intensity_levels": [ { "name": "bug blood splatter", "color": "green" }, { "name": "bug blood stain" }, { "name": "puddle of bug blood" } ],
+    "underwater_age_speedup": "25 minutes",
     "half_life": "2 days",
     "phase": "liquid",
     "accelerated_decay": true,
@@ -373,6 +380,7 @@
       { "name": "hemolymph stain" },
       { "name": "puddle of hemolymph" }
     ],
+    "underwater_age_speedup": "25 minutes",
     "half_life": "2 days",
     "phase": "liquid",
     "accelerated_decay": true,
@@ -387,6 +395,7 @@
       { "name": "shattered bug leg", "color": "green" },
       { "name": "torn insect organs", "color": "yellow" }
     ],
+    "underwater_age_speedup": "25 minutes",
     "half_life": "2 days",
     "phase": "solid",
     "accelerated_decay": true,
@@ -401,6 +410,7 @@
       { "name": "icky mess" },
       { "name": "heap of squishy gore", "color": "dark_gray" }
     ],
+    "underwater_age_speedup": "25 minutes",
     "half_life": "2 days",
     "phase": "solid",
     "accelerated_decay": true,

diff --git a/src/field.h b/src/field.h
@@ -69,6 +69,10 @@ class field_entry
             return is_alive;
         }
 
+        time_duration get_underwater_age_speedup() const {
+            return type.obj().underwater_age_speedup;
+        }
+
         bool decays_on_actualize() const {
             return type.obj().accelerated_decay;
         }

diff --git a/src/field_type.cpp b/src/field_type.cpp
@@ -84,6 +84,7 @@ void field_type::load( JsonObject &jo, const std::string & )
                   fallback_intensity_level.move_cost );
         intensity_levels.emplace_back( intensity_level );
     }
+    optional( jo, was_loaded, "underwater_age_speedup", underwater_age_speedup, 0_turns );
     optional( jo, was_loaded, "priority", priority, 0 );
     optional( jo, was_loaded, "half_life", half_life, 0_turns );
     if( jo.has_member( "phase" ) ) {

diff --git a/src/field_type.h b/src/field_type.h
@@ -44,8 +44,10 @@ struct field_type {
 
         std::vector<field_intensity_level> intensity_levels;
 
+        time_duration underwater_age_speedup = 0_turns;
+
         int priority = 0;
-        time_duration half_life = 0_days;
+        time_duration half_life = 0_turns;
         phase_id phase = PNULL;
         bool accelerated_decay = false;
         bool display_items = true;