Ratings onder 8 met een geheel getal met 0.5 verhogen

pbhofstede · Apr 25, 2012 · e43d981 · e43d981
1 parent 6a695e7
commit e43d981
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/uHTPredictor.pas b/uHTPredictor.pas
@@ -114,6 +114,30 @@ function SavePlayersToMemDataSet(aExcelSheet: TExcelFunctions; aPlayerDataSet: T
                     end;
                   end;
 
+                  if (aPlayerDataSet.Fields[j].FieldName = 'VORM') or
+                     (aPlayerDataSet.Fields[j].FieldName = 'CONDITIE') or
+                     (aPlayerDataSet.Fields[j].FieldName = 'KEEPEN') or
+                     (aPlayerDataSet.Fields[j].FieldName = 'VERDEDIGEN') or
+                     (aPlayerDataSet.Fields[j].FieldName = 'POSITIESPEL') or
+                     (aPlayerDataSet.Fields[j].FieldName = 'VLEUGELSPEL') or
+                     (aPlayerDataSet.Fields[j].FieldName = 'PASSEN') or
+                     (aPlayerDataSet.Fields[j].FieldName = 'SCOREN') or
+                     (aPlayerDataSet.Fields[j].FieldName = 'SPELHERVATTEN') or
+                     (aPlayerDataSet.Fields[j].FieldName = 'ERVARING') or
+                     (aPlayerDataSet.Fields[j].FieldName = 'LOYALITEIT') then
+                  begin
+                    if uBibConv.AnyStrToInt(vValue) > 0 then
+                    begin
+                      if (Floor(vValue) = vValue) and
+                         ((vValue < 8) or
+                          (((aPlayerDataSet.Fields[j].FieldName = 'ERVARING') or
+                            (aPlayerDataSet.Fields[j].FieldName = 'LOYALITEIT')) and
+                           (vValue < 20))) then
+                      begin
+                        vValue := vValue + 0.5;
+                      end;
+                    end;
+                  end;
                   aPlayerDataSet.Fields[j].Value := vValue;
                 end;
               end;

diff --git a/uOpstelling.pas b/uOpstelling.pas
@@ -660,7 +660,8 @@ function TOpstelling.VerrekenTypeCoach(aRating: double; aVerdediging: boolean):
 function TOpstelling.VerwerkTS(aRating: double): double;
 begin
   //Result := aRating * Power((FTS - 0.5) * 0.2, 0.417779);     //MMM
-  Result := aRating * Power((FTS - 0.5) * 0.147832, 0.417779);  //HO
+  //Result := aRating * Power((FTS - 0.5) * 0.147832, 0.417779);  //HO
+  Result := aRating * Power((FTS - 1) * 0.147832, 0.417779);  
 end;
 
 procedure TOpstelling.ZetPlayerIDOpPositie(aPlayerID: integer; aPositie: TPlayerPosition; aPlayerOrder: TPlayerOrder);

diff --git a/uPlayer.pas b/uPlayer.pas
@@ -99,9 +99,9 @@ function TPlayer.GetConditieFactor: double;
 -----------------------------------------------------------------------------}
 function TPlayer.GetXPFactor: double;
 begin
-//formule MMM / HAG / HO Result := (0.0716 * Power(FXP - 0.5, 0.5)) + 1;
+//formule MMM / HAG / HO Result := (0.0716 * Power(FXP - 1, 0.5)) + 1;
 //formule Schumi     Result := (Max(Power(FXP - 0.5, 0.43), 0) + 14) / 14;
-    Result := (0.0716 * Power(FXP - 0.5, 0.5)) + 1;
+    Result := (0.0716 * Power(FXP - 1, 0.5)) + 1;
 end;
 
 {-----------------------------------------------------------------------------