+ infinite supply fixed

+ tooltips extended + release notes and version info updated
chrxh · Nov 25, 2023 · a0b52af · a0b52af
1 parent 44b2140
commit a0b52af
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,5 +1,12 @@
 # Release notes
 
+## [4.4.2] - 2023-11-25
+### Added
+- external energy sources, which are controllable by two new parameters
+
+### Removed
+- parameter `unlimited energy for constructors` removed
+
 ## [4.4.1] - 2023-11-15
 ### Added
 - allow deletion of selection via DEL key

diff --git a/source/EngineGpuKernels/ConstructorProcessor.cuh b/source/EngineGpuKernels/ConstructorProcessor.cuh
@@ -725,7 +725,7 @@ __inline__ __device__ bool ConstructorProcessor::checkAndReduceHostEnergy(Simula
         auto externalEnergyPtr = &((*data.externalEnergy)[hostCell->color]);
         auto origExternalEnergy = alienAtomicRead(externalEnergyPtr);
         if (origExternalEnergy == Infinity<float>::value) {
-            hostCell->energy += constructionData.energy;
+            hostCell->energy += externalEnergyPortion;
         } else {
             externalEnergyPortion = max(0.0f, min(origExternalEnergy, externalEnergyPortion));
             auto origExternalEnergy_tickLater = atomicAdd(externalEnergyPtr, -externalEnergyPortion);

diff --git a/source/Gui/SimulationParametersWindow.cpp b/source/Gui/SimulationParametersWindow.cpp
@@ -1191,7 +1191,8 @@ void _SimulationParametersWindow::processBase(
                     .defaultValue(origSimParameters.cellFunctionConstructorExternalEnergy)
                     .tooltip("This parameter can be used to set the amount of energy (per color) of an external energy source. This type of energy is "
                              "transferred to all constructor cells at a certain rate.\n\nTip: You can explicitly enter a numerical value by selecting the "
-                             "slider and pressing TAB."),
+                             "slider and then pressing TAB.\n\nWarning: Too much external energy can result in a massive production of cells and slow down or "
+                             "even crash the simulation."),
                 simParameters.cellFunctionConstructorExternalEnergy);
             AlienImGui::SliderFloat(
                 AlienImGui::SliderFloatParameters()

diff --git a/vcpkg.json b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "alien",
-  "version": "4.0.0",
+  "version": "4.4.2",
   "dependencies": [
     {
       "name": "glew",