Changeset 504 for experiments/frams

Timestamp:

05/05/16 00:08:02 (9 years ago)

Author:

Maciej Komosinski

Message:

Getting rid of "energy balance" fields

File:

• experiments/frams/foraminifera/data/scripts/foraminifera.expdef (modified) (3 diffs)

experiments/frams/foraminifera/data/scripts/foraminifera.expdef

@@ -482 +482 @@
         {
                 //percent of maximal energy
-                cr.energy_m += (ExpProperties.energy_move * cr.data->lifeparams->max_energy_level)*ExpProperties.secPerStep;
+                cr.energy -= (ExpProperties.energy_move * cr.data->lifeparams->max_energy_level)*ExpProperties.secPerStep;
         }
 }
@@ -552 +552 @@
         //Simulator.print("transferring "+e +"("+e*ExpProperties.ingestion+")"+" to "+cr1.name +" ("+ cr1.energy+") " +" from "+cr2.uid+" ("+cr2.energy+") "+ e/ExpProperties.secPerStep+ " per sec");
         cr2.energy -= (e + 0.0000001);
-        cr1.energy_p += e*ExpProperties.ingestion;
+        cr1.energy += e*ExpProperties.ingestion;
         if (cr1.data->lifeparams->hibernated == 1)
         {
@@ -606 +606 @@
                 cr.data->lifeparams->chamber_growth = Math.max(cr.data->lifeparams->chamber_growth-1,0);
                 //Simulator.print("chamber growing, time left = " + cr.data->lifeparams->chamber_growth*ExpProperties.secPerStep);
-                cr.energy_m += ExpProperties.chamberCostPerSec * cr.energy * ExpProperties.secPerStep;
+                cr.energy -= ExpProperties.chamberCostPerSec * cr.energy * ExpProperties.secPerStep;
 
                 //Simulator.print("energy " + cr2.energy + " subtracting " + growth_cost);