From f54e1e159bb0ee342c593ba792d66ed88c05f1a8 Mon Sep 17 00:00:00 2001 From: Untrustedlife Date: Mon, 13 May 2019 20:06:11 -0500 Subject: [PATCH] mutateCode now takes in isBacteria commented out setMass code for now. It was hacky anyway. ai no longer has speed boost (the x10 was what was causing the issue previously) just got rid of redundant if statement completely --- scripts/microbe_stage/configs.as | 2 +- scripts/microbe_stage/microbe_operations.as | 5 ----- scripts/microbe_stage/species_system.as | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/microbe_stage/configs.as b/scripts/microbe_stage/configs.as index 3930895c47a..6ec8c24bf70 100644 --- a/scripts/microbe_stage/configs.as +++ b/scripts/microbe_stage/configs.as @@ -112,7 +112,7 @@ const auto FLAGELLA_BASE_FORCE = 0.7f; const auto CELL_BASE_THRUST = 1.6f; // is set by this and modified by applyCellMovement like the player later -const auto AI_BASE_MOVEMENT = 1.6f; +const auto AI_BASE_MOVEMENT = 1.0f; const auto AI_FOCUSED_MOVEMENT = 1.0f; //! The drag force is calculated by taking the current velocity and multiplying it by this. diff --git a/scripts/microbe_stage/microbe_operations.as b/scripts/microbe_stage/microbe_operations.as index 2d90f864679..eb69cdac8b1 100644 --- a/scripts/microbe_stage/microbe_operations.as +++ b/scripts/microbe_stage/microbe_operations.as @@ -919,11 +919,6 @@ ObjectID spawnMicrobe(CellStageWorld@ world, Float3 pos, const string &in specie auto speciesEntity = findSpeciesEntityByName(world, speciesName); auto species = world.GetComponent_SpeciesComponent(speciesEntity); - if (species.isBacteria) - { - physics.Body.SetMass(physics.Body.Mass * 10); - } - physics.JumpTo(microbePos); // Try setting the position immediately as well (as otherwise it diff --git a/scripts/microbe_stage/species_system.as b/scripts/microbe_stage/species_system.as index b99c85d0a22..6eb50d18349 100644 --- a/scripts/microbe_stage/species_system.as +++ b/scripts/microbe_stage/species_system.as @@ -393,7 +393,7 @@ class Species{ parent.colour.W + randomMutationColourChannel()); } - this.stringCode = mutateMicrobe(parent.stringCode,false); + this.stringCode = mutateMicrobe(parent.stringCode,isBacteria); generateMembranes(parent);