0.9.4b

Author: SiekamCebule

source/UI/FormGenerator/JumpersFormGeneratorConfigWindow.ui

@@ -182,7 +182,7 @@ color: rgb(26, 95, 180);
               </font>
              </property>
              <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:11pt; font-weight:700;&quot;&gt;Minimalna tendencja&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Tendencja nie będzie wyższa niż ta wartość. Od 0 do 10.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:11pt; font-weight:700;&quot;&gt;Maksymalna tendencja&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Tendencja nie będzie wyższa niż ta wartość. Od 0 do 10.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="styleSheet">
               <string notr="true">color: rgb(140, 73, 5);</string>

source/UI/mainwindow.cpp

@@ -29,7 +29,7 @@
 #include <random>
 
 extern IDGenerator globalIDGenerator;
-const QString appVersion = "0.9.3beta1";
+const QString appVersion = "0.9.4b";
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)

source/form-generator/JumperFormGenerator.cpp

@@ -21,20 +21,16 @@ void JumperFormGenerator::generateJumperFormTendence()
     else
         random = 0;
 
-    double divider = 1 + (abs(oldTendence + random - 0) / 5.05);
-    if(oldTendence + random > 0)
-    {
-        if(random > 0)
-            random /= divider;
-        else
-            random *= divider;
-    }
-    else if(oldTendence + random < 0){
-        if(random > 0)
-            random *= divider;
-        else
-            random /= divider;
-    }
+    double divider = 1 + (abs(oldTendence + random - 0) / 6);
+    qDebug()<<"divider: "<<divider;
+    if(oldTendence + (random / divider) > 0 && (random > 0))
+        random /= divider;
+    else if(oldTendence + (random / divider) < 0 && (random < 0))
+        random /= divider;
+    /*else if(oldTendence + (random * divider) > 0 && (random < 0))
+        random *= (divider / 1);
+    else if(oldTendence + (random * divider) < 0 && (random > 0))
+        random *= (divider / 1);*/
 
     newTendence = oldTendence + random;
 
@@ -65,15 +61,15 @@ void JumperFormGenerator::generateJumperForm()
     double oldForm = jumper->getJumperSkillsPointer()->getForm();
     double formChange = 0;
 
-    formChange += tendence->getTendence() * 2.3;
+    formChange += tendence->getTendence() * 2;
     formChange *= 1 + ((settings.getFormVariability() - 5) / 5);
 
     double distanceFromAverage = abs(oldForm - 50);
-    double divider = 1 + (distanceFromAverage / 17);
-    if(((oldForm + formChange - 50) > 0 && formChange > 0) || ((oldForm + formChange - 50) < 0 && formChange < 0))
+    double divider = 1 + (distanceFromAverage / 15);
+    if(((oldForm + (formChange / divider)) > 50 && (formChange / divider) > 0) || ((oldForm + (formChange / divider)) < 50 && (formChange / divider) < 0))
         formChange /= divider;
-    else
-        formChange *= divider;
+    /*else
+        formChange *= (divider / 1);*/
 
     double newForm = oldForm + formChange;
     newForm += settings.getFormBonus();

source/simulator/JumpSimulator.cpp

@@ -115,12 +115,12 @@ void JumpSimulator::generateTakeoffRating()
 {
     double multiplier = GlobalSimulationSettings::get()->getMaxSkills() / 100;
 
-    double ratingMultiplier = 0.863 + 0.1 * hill->getLevelOfCharacteristic("takeoff-technique-effect");
+    double ratingMultiplier = 0.870 + 0.1 * hill->getLevelOfCharacteristic("takeoff-technique-effect");
     simulationData->takeoffRating = jumperSkills->getTakeoffTechnique() * ratingMultiplier;
 
     simulationData->takeoffRating += ((jumperSkills->getLevelOfCharacteristic("takeoff-power") * 2 * multiplier) * (1 + 0.1 * hill->getLevelOfCharacteristic("takeoff-power-effect")));
 
-    ratingMultiplier = 0.137 + 0.1 * hill->getLevelOfCharacteristic("takeoff-form-effect");
+    ratingMultiplier = 0.13 + 0.1 * hill->getLevelOfCharacteristic("takeoff-form-effect");
     simulationData->takeoffRating += jumperSkills->getForm() * ratingMultiplier;
 
     simulationData->takeoffRating -= std::abs(Hill::calculateBestTakeoffHeightLevel(hill) - jumper->getJumperSkills().getLevelOfCharacteristic("takeoff-height")) * 2 * multiplier;
@@ -140,10 +140,10 @@ void JumpSimulator::generateFlightRating()
 {
     double multiplier = GlobalSimulationSettings::get()->getMaxSkills() / 100;
 
-    double ratingMultiplier = 0.853 + 0.11 * hill->getLevelOfCharacteristic("flight-technique-effect");
+    double ratingMultiplier = 0.860 + 0.11 * hill->getLevelOfCharacteristic("flight-technique-effect");
     simulationData->flightRating = jumperSkills->getFlightTechnique() * ratingMultiplier;
 
-    ratingMultiplier = 0.147 + 0.1 * hill->getLevelOfCharacteristic("flight-form-effect");
+    ratingMultiplier = 0.140 + 0.1 * hill->getLevelOfCharacteristic("flight-form-effect");
     simulationData->flightRating += jumperSkills->getForm() * ratingMultiplier;
 
     simulationData->flightRating -= std::abs(Hill::calculateBestFlightHeightLevel(hill) - jumper->getJumperSkills().getLevelOfCharacteristic("flight-height") * 2.7 * multiplier);
@@ -677,7 +677,7 @@ double JumpSimulator::getRandomForJumpSimulation(short parameter, Jumper *jumper
         double base = 0;
         double dev = 0;
         double random = 0;
-        dev = 3.95 - (skills->getLevelOfCharacteristic("takeoff-height") / 7);
+        dev = 4.0025 - (skills->getLevelOfCharacteristic("takeoff-height") / 7);
         if(MyRandom::randomInt(0, 1) == 0)
         {
             random = MyRandom::normalDistributionRandomHalf(base, dev, MyRandom::Positive);
@@ -702,7 +702,7 @@ double JumpSimulator::getRandomForJumpSimulation(short parameter, Jumper *jumper
         double base = 0;
         double dev = 5.02;
         double random = 0;
-        dev = 4.05 - (skills->getLevelOfCharacteristic("flight-height") / 7);
+        dev = 4.0525 - (skills->getLevelOfCharacteristic("flight-height") / 7);
         switch(skills->getFlightStyle())
         {
         case JumperSkills::VStyle: