Merge pull request #251 from johnpooch/develop

0.5.0

adjudicator/order.py

@@ -117,7 +117,12 @@ def __init__(self, state, nation, source, **kwargs):
         self.nation = nation
         self.source = source
         self.state = state
-        self.outcome = Outcomes.SUCCEEDS
+
+    @property
+    def outcome(self):
+        if self.piece.retreating:
+            return Outcomes.FAILS
+        return Outcomes.SUCCEEDS
 
 
 class Hold(Order):

adjudicator/processor.py

@@ -102,6 +102,14 @@ def process(state):
         else:
             build.outcome = Outcomes.FAILS
 
+    if state.phase == Phase.RETREAT:
+        for piece in state.pieces:
+            if piece.retreating and (piece.order.outcome == Outcomes.FAILS):
+                piece.destroyed = True
+                piece.destroyed_message = (
+                    'Destroyed because piece must retreat but retreat order failed.'
+                )
+
     # TODO test
     # TODO split into sub function
     # Set captured_by for territories if fall orders

core/migrations/0009_piece_turn_destroyed.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.1.7 on 2021-04-29 15:19
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0008_auto_20210426_1518'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='piece',
+            name='turn_destroyed',
+            field=models.ForeignKey(blank=True, help_text='The turn during which this piece was destroyed.', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='core.turn'),
+        ),
+    ]

core/models/nation.py

@@ -2,6 +2,7 @@
 
 from django.contrib.auth.models import User
 from django.db import models
+from django.utils.functional import cached_property
 
 from core.models.base import PerTurnModel, Phase, SurrenderStatus
 
@@ -160,6 +161,14 @@ def supply_centers(self):
             territory__supply_center=True
         )
 
+    @cached_property
+    def num_supply_centers(self):
+        return self.supply_centers.count()
+
+    @cached_property
+    def num_pieces(self):
+        return self.pieces.count()
+
     @property
     def unoccupied_controlled_home_supply_centers(self):
         """
@@ -187,7 +196,7 @@ def supply_delta(self):
         Returns:
             * `int`
         """
-        return self.supply_centers.count() - self.pieces.count()
+        return self.num_supply_centers - self.num_pieces
 
     @property
     def num_builds(self):
@@ -233,18 +242,22 @@ def pieces_to_order(self):
             raise Exception('Should not be called during build phase')
         return self.turn.piecestates.filter(piece__nation=self.nation)
 
+    @cached_property
+    def num_pieces_to_order(self):
+        return self.pieces_to_order.count()
+
     @property
     def num_orders(self):
         if self.turn.phase == Phase.BUILD:
             return max(self.num_builds, self.num_disbands)
-        return self.pieces_to_order.count()
+        return self.num_pieces_to_order
 
     @property
     def num_orders_remaining(self):
         if self.turn.phase == Phase.BUILD:
             num_orders = max(self.num_builds, self.num_disbands)
             return max(0, num_orders - self.orders.count())
-        return self.pieces_to_order.count() - self.orders.count()
+        return self.num_pieces_to_order - self.orders.count()
 
     def copy_to_new_turn(self, turn):
         """

core/models/piece.py

@@ -51,6 +51,16 @@ class Piece(HygienicModel):
             'be a retreat/disband phase or a build/disband phase.'
         )
     )
+    turn_destroyed = models.ForeignKey(
+        'Turn',
+        null=True,
+        blank=True,
+        on_delete=models.CASCADE,
+        related_name='+',
+        help_text=_(
+            'The turn during which this piece was destroyed.'
+        )
+    )
 
     def __str__(self):
         return f'{self.type} ({self.nation}) {self.id}'