Merge pull request #1511 from VirtualTowel/master

Add: Suffix of Comission Supported

module/commission/commission.py

@@ -114,6 +114,9 @@ class RewardCommission(UI, InfoHandler):
         """
         # Count Commission
         total = daily.add_by_eq(urgent)
+        # Commissions with higher suffix are always below those with smaller suffix
+        # Reverse the commission list to choose commissions with higher suffix first
+        total = total[::-1]
         self.max_commission = 4
         for comm in total:
             if comm.genre == 'event_daily':

module/commission/project.py

@@ -326,6 +326,8 @@ class Commission:
                 return False
         if self.repeat_count != other.repeat_count:
             return False
+        if self.genre in ['extra_oil', 'night_oil'] and self.suffix != other.suffix:
+            return False
 
         return True