Changeset 3664

Timestamp:

03/05/10 20:57:59 (6 months ago)

Author:

zaman

Message:

added immunity_reaction and fixed immunity_task

Location:

development/source/main

Files:

• cAvidaConfig.h (modified) (1 diff)
• cOrganism.cc (modified) (2 diffs)

development/source/main/cAvidaConfig.h

@@ -378 +378 @@
   CONFIG_ADD_VAR(IMMUNITY_TASK, int, -1, "Task providing immunity from the required task.");
   CONFIG_ADD_VAR(REQUIRED_REACTION, int, -1, "Reaction ID required for successful divide.");
+  CONFIG_ADD_VAR(IMMUNITY_REACTION, int, -1, "Reaction ID that provides immunity for successful divide.");
   CONFIG_ADD_VAR(REQUIRED_BONUS, double, 0.0, "Required bonus to divide.");
   CONFIG_ADD_VAR(REQUIRE_EXACT_COPY, int, 0, "Require offspring to be an exact copy (only divide mutations allowed).");

development/source/main/cOrganism.cc

@@ -740 +740 @@
 
   if (required_task != -1 && m_phenotype.GetCurTaskCount()[required_task] == 0) { 
-    if (immunity_task==-1 || m_phenotype.GetCurTaskCount()[immunity_task] == 0) {
+    if (immunity_task==-1 && m_phenotype.GetCurTaskCount()[immunity_task] == 0) {
       Fault(FAULT_LOC_DIVIDE, FAULT_TYPE_ERROR,
             cStringUtil::Stringf("Lacks required task (%d)", required_task));
@@ -750 +750 @@
   
   const int required_reaction = m_world->GetConfig().REQUIRED_REACTION.Get();
-  if (required_reaction != -1 && m_phenotype.GetCurReactionCount()[required_reaction] == 0) {
-    Fault(FAULT_LOC_DIVIDE, FAULT_TYPE_ERROR,
+  const int immunity_reaction = m_world->GetConfig().IMMUNITY_REACTION.Get();
+  if (required_reaction != -1 && m_phenotype.GetCurReactionCount()[required_reaction] == 0)   {
+    if (immunity_reaction != -1 && m_phenotype.GetCurReactionCount()[immunity_reaction] == 0) {  
+      Fault(FAULT_LOC_DIVIDE, FAULT_TYPE_ERROR,
           cStringUtil::Stringf("Lacks required reaction (%d)", required_reaction));
-    return false; //  (divide fails)
+      return false; //  (divide fails)
+    }
   }