Changeset 56

Timestamp:

Aug 19, 2014, 12:39:54 AM (10 years ago)

Author:

chronos

Message:

• Modified: Attack changed to risk game dice rolling system.

Location:

trunk

Files:

• UCore.pas (modified) (1 diff)
• UGame.pas (modified) (2 diffs)

trunk/UCore.pas

@@ -97 +97 @@
 procedure TCore.DoOnWin(Player: TPlayer);
 begin
+  FormMain.Redraw;
   ShowMessage(Format(SPlayerWins, [Player.Name]));
 end;

trunk/UGame.pas

@@ -1088 +1088 @@
 procedure TGame.Attack(var AttackPower, DefendPower: Integer);
 var
-  AttackerRoll: Integer;
-  DefenderRoll: Integer;
+  AttackerDiceCount: Integer;
+  DefenderDiceCount: Integer;
+  AttackerHighestRoll: Integer;
+  DefenderHighestRoll: Integer;
+  RollResult: Integer;
+  LoseCount: Integer;
+  I: Integer;
 begin
   if AttackPower < 1 then
@@ -1096 +1101 @@
     raise Exception.Create('Defender power have to be higher then or equal to 0.');
   while (AttackPower > 0) and (DefendPower > 0) do begin
-    // Earch side do dice roll and compare result. Defender wins tie
-    AttackerRoll := Random(6);
-    DefenderRoll := Random(6);
-    if AttackerRoll > DefenderRoll then Dec(DefendPower)
-      else Dec(AttackPower);
+    // Risk game rules:
+    // Each side do their dice roll and compare result. Defender wins tie.
+    // Attacer can use three dices and defender two
+    if AttackPower < 3 then AttackerDiceCount := AttackPower
+      else AttackerDiceCount := 3;
+    if DefendPower < 2 then DefenderDiceCount := DefendPower
+      else DefenderDiceCount := 2;
+    // Roll and calculate each side highest number
+    AttackerHighestRoll := 1;
+    for I := 0 to AttackerDiceCount - 1 do begin
+      RollResult := Random(7);
+      if RollResult > AttackerHighestRoll then
+        AttackerHighestRoll := RollResult;
+    end;
+    DefenderHighestRoll := 1;
+    for I := 0 to DefenderDiceCount - 1 do begin
+      RollResult := Random(7);
+      if RollResult > DefenderHighestRoll then
+        DefenderHighestRoll := RollResult;
+    end;
+    // Resolution
+    LoseCount := Min(AttackerDiceCount, DefenderDiceCount);
+    if AttackerHighestRoll > DefenderHighestRoll then Dec(DefendPower, LoseCount)
+      else Dec(AttackPower, LoseCount);
   end;
 end;