Добавлен учет параметра active_tick для бонусов

voidmain02 · Aug 18, 2019 · d4a14da · d4a14da
1 parent dc6f452
commit d4a14da
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/MiniAiCup.Paperio.Client/GameStateParser.cs b/MiniAiCup.Paperio.Client/GameStateParser.cs
@@ -26,7 +26,8 @@ private static BonusInfo ParseBonus(JObject jBonus)
 		{
 			return new BonusInfo {
 				Type = ParseBonusType((string)jBonus["type"]),
-				Position = ParsePoint((JArray)jBonus["position"])
+				Position = ParsePoint((JArray)jBonus["position"]),
+				Steps = (int)jBonus["active_ticks"]
 			};
 		}
 

diff --git a/MiniAiCup.Paperio.Core/BonusInfo.cs b/MiniAiCup.Paperio.Core/BonusInfo.cs
@@ -17,5 +17,10 @@ public class BonusInfo
 		/// Позиция
 		/// </summary>
 		public Point Position { get; set; }
+
+		/// <summary>
+		/// Продолжительность бонуса в шагах
+		/// </summary>
+		public int Steps { get; set; }
 	}
 }
diff --git a/MiniAiCup.Paperio.Core/GameParams.cs b/MiniAiCup.Paperio.Core/GameParams.cs
@@ -11,9 +11,5 @@ public static class GameParams
 		public const int NitroSpeed = 6;
 
 		public const int SlowDownSpeed = 3;
-
-		public const int MinBonusDuration = 10;
-
-		public const int MaxBonusDuration = 50;
 	}
 }
diff --git a/MiniAiCup.Paperio.Core/SimpleGameSimulator.cs b/MiniAiCup.Paperio.Core/SimpleGameSimulator.cs
@@ -53,10 +53,10 @@ public GameStateInternal Simulate(GameStateInternal state, int simulationTicks,
 					switch (bonus.Type)
 					{
 						case BonusType.Nitro:
-							me.NitroStepsLeft += GameParams.MinBonusDuration;
+							me.NitroStepsLeft += bonus.Steps;
 							break;
 						case BonusType.Slowdown:
-							me.SlowdownStepsLeft += GameParams.MaxBonusDuration;
+							me.SlowdownStepsLeft += bonus.Steps;
 							break;
 						case BonusType.Saw:
 							break;
@@ -112,10 +112,10 @@ public GameStateInternal Simulate(GameStateInternal state, int simulationTicks,
 							switch (bonus.Type)
 							{
 								case BonusType.Nitro:
-									me.NitroStepsLeft += GameParams.MinBonusDuration;
+									me.NitroStepsLeft += bonus.Steps;
 									break;
 								case BonusType.Slowdown:
-									me.SlowdownStepsLeft += GameParams.MaxBonusDuration;
+									me.SlowdownStepsLeft += bonus.Steps;
 									break;
 								case BonusType.Saw:
 									break;