Changeset 579

Timestamp:

08/18/16 12:15:55 (8 years ago)

Author:

oriona

Message:

Vertical position of foraminifera lowered. Color of body and reticulopodia unified.

Location:

experiments/frams/foraminifera/data/scripts

Files:

• foraminifera.expdef (modified) (7 diffs)
• foraminifera.inc (modified) (1 diff)

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

@@ -24 +24 @@
 
 global colors;
-global retColors;
 global curColor;
 global max_chamber_volume;
@@ -99 +98 @@
         ExpProperties.chamber_proculus_diplo = micronsToFrams(10);
         colors = ["1.0,1.0,0.0","1.0,0.5,0.0"];
-        retColors = ["1.0,1.0,1.0", "1.0,1.0,0.0"];
-        curColor = retColors[0];
+        curColor = colors[0];
         curRadius = ExpProperties.zone1_range;
 
@@ -328 +326 @@
         var radius = getPloidRadius(ploid);
         var geno = create_genotype(radius, chambernum, colors[ploid], 1);
-        curColor = retColors[ploid];
+        curColor = colors[ploid];
         var cr = Populations[0].add(geno);
         cr.name = "Initial creature" + species + "_" + iter;
@@ -442 +440 @@
         if ((chamber_num+1) <= max_chamber_volume[cr.data->lifeparams->gen].size)
         {
-                curColor = retColors[cr.data->lifeparams->gen];
+                curColor = colors[cr.data->lifeparams->gen];
                 var ploid = cr.data->lifeparams->gen;
                 var geno = create_genotype(getPloidRadius(ploid), chamber_num+1, colors[ploid], lastchambergrowth);
@@ -546 +544 @@
         }
 
-        cr.moveAbs(new_x, new_y, 0);
+        cr.moveAbs(new_x, new_y, -cr.getPart(cr.numparts-1).sx);
 
         //are there any nutrients in zone 1 or 2?
@@ -654 +652 @@
                                         new_rad = getZoneRange(cr,1)-new_rad;
 
+                                curColor = colors[cr.data->lifeparams->gen];
                                 addReticulopodia(cr,new_rad);
                         }
@@ -1079 +1078 @@
 group:Energy
 
-
 property:
 id:crossprob

experiments/frams/foraminifera/data/scripts/foraminifera.inc

@@ -274 +274 @@
 function createOffspring(geno, energy, parent_genes, parent_lifeparams, parentsuids)
 {
-        curColor = retColors[1-parent_lifeparams->gen];
+        curColor = colors[1-parent_lifeparams->gen];
         var cr = Populations[0].add(geno);
         cr.energy0 = energy;