Changeset 504


Ignore:
Timestamp:
05/05/16 00:08:02 (4 years ago)
Author:
Maciej Komosinski
Message:

Getting rid of "energy balance" fields

File:
1 edited

Legend:

Unmodified
Added
Removed
  • experiments/frams/foraminifera/data/scripts/foraminifera.expdef

    r502 r504  
    482482        {
    483483                //percent of maximal energy
    484                 cr.energy_m += (ExpProperties.energy_move * cr.data->lifeparams->max_energy_level)*ExpProperties.secPerStep;
     484                cr.energy -= (ExpProperties.energy_move * cr.data->lifeparams->max_energy_level)*ExpProperties.secPerStep;
    485485        }
    486486}
     
    552552        //Simulator.print("transferring "+e +"("+e*ExpProperties.ingestion+")"+" to "+cr1.name +" ("+ cr1.energy+") " +" from "+cr2.uid+" ("+cr2.energy+") "+ e/ExpProperties.secPerStep+ " per sec");
    553553        cr2.energy -= (e + 0.0000001);
    554         cr1.energy_p += e*ExpProperties.ingestion;
     554        cr1.energy += e*ExpProperties.ingestion;
    555555        if (cr1.data->lifeparams->hibernated == 1)
    556556        {
     
    606606                cr.data->lifeparams->chamber_growth = Math.max(cr.data->lifeparams->chamber_growth-1,0);
    607607                //Simulator.print("chamber growing, time left = " + cr.data->lifeparams->chamber_growth*ExpProperties.secPerStep);
    608                 cr.energy_m += ExpProperties.chamberCostPerSec * cr.energy * ExpProperties.secPerStep;
     608                cr.energy -= ExpProperties.chamberCostPerSec * cr.energy * ExpProperties.secPerStep;
    609609
    610610                //Simulator.print("energy " + cr2.energy + " subtracting " + growth_cost);
Note: See TracChangeset for help on using the changeset viewer.