提交: f7ff312b9d09cc026badcecf8d51136d59792847 - HotshotIOS (hg)

Commit MetaInfo

• 修訂: f7ff312b9d09cc026badcecf8d51136d59792847 (tree)
• 時間: 2021-08-05 07:04:15
• 作者: sebastian_bugiu
• Commiter: sebastian_bugiu

Log Message

Added AI now prioritize the enemy cargo ships. Added some performance indicators.

Change Summary

• modified: core/src/headwayent/blackholedarksun/APP_Game.java
• modified: core/src/headwayent/blackholedarksun/APP_SinglePlayerGame.java
• modified: core/src/headwayent/blackholedarksun/gamestatedebugger/FrameInterval.java
• modified: core/src/headwayent/blackholedarksun/systems/AISystem.java
• modified: core/src/headwayent/blackholedarksun/world/WorldManagerBase.java

差異

diff -r 6ebc2563a247 -r f7ff312b9d09 core/src/headwayent/blackholedarksun/APP_Game.java
--- a/core/src/headwayent/blackholedarksun/APP_Game.java	Mon Aug 02 23:06:57 2021 +0300
+++ b/core/src/headwayent/blackholedarksun/APP_Game.java	Thu Aug 05 01:04:15 2021 +0300
@@ -978,7 +978,7 @@
     }
 
     protected void initializeGson() {
-        final GsonBuilder gsonBuilder = new GsonBuilder();
+        final GsonBuilder gsonBuilder = new GsonBuilder().setPrettyPrinting();
         gson = gsonBuilder.create();
     }
 

diff -r 6ebc2563a247 -r f7ff312b9d09 core/src/headwayent/blackholedarksun/APP_SinglePlayerGame.java
--- a/core/src/headwayent/blackholedarksun/APP_SinglePlayerGame.java	Mon Aug 02 23:06:57 2021 +0300
+++ b/core/src/headwayent/blackholedarksun/APP_SinglePlayerGame.java	Thu Aug 05 01:04:15 2021 +0300
@@ -33,6 +33,8 @@
 import headwayent.blackholedarksun.net.NetManager;
 import headwayent.blackholedarksun.net.clientapi.ClientAPI;
 import headwayent.blackholedarksun.physics.PhysicsUtility;
+import headwayent.blackholedarksun.statistics.InGameStatistics;
+import headwayent.blackholedarksun.statistics.InGameStatisticsManager;
 import headwayent.blackholedarksun.systems.*;
 import headwayent.blackholedarksun.world.WorldManager;
 import headwayent.blackholedarksun.world.WorldManagerBase;
@@ -544,6 +546,14 @@
             hudManager.updateRadarFinalState();
             hudManager.unlockRadarData();
 
+            renderWindow.updateStats();
+
+            InGameStatisticsManager statisticsManager = InGameStatisticsManager.getInstance();
+            InGameStatistics statistics = statisticsManager.getInGameStatistics();
+            statistics.performanceStatistics.averageFps = renderWindow.getAverageFPS();
+            statistics.performanceStatistics.maxFps = renderWindow.getBestFPS();
+            statistics.performanceStatistics.minFps = renderWindow.getWorstFPS();
+
             if (HudManager.SHOW_DEBUGGING_INDICATORS) {
                 hudManager.setFps(renderWindow.getLastFPS());
 //                System.out.println("LastFPS: " + renderWindow.getLastFPS());

diff -r 6ebc2563a247 -r f7ff312b9d09 core/src/headwayent/blackholedarksun/gamestatedebugger/FrameInterval.java
--- a/core/src/headwayent/blackholedarksun/gamestatedebugger/FrameInterval.java	Mon Aug 02 23:06:57 2021 +0300
+++ b/core/src/headwayent/blackholedarksun/gamestatedebugger/FrameInterval.java	Thu Aug 05 01:04:15 2021 +0300
@@ -115,6 +115,7 @@
     public static final String SPHERE_AROUND_POINT_SIGNUM_X = "sphere_around_point_signum_x";
     public static final String SPHERE_AROUND_POINT_SIGNUM_Y = "sphere_around_point_signum_y";
     public static final String SPHERE_AROUND_POINT_SIGNUM_Z = "sphere_around_point_signum_z";
+    public static final String CARGO_SHIP_SELECT_CLOSEST = "cargo_ship_select_closest ";
 
 //    private HashMap<String, AIEntity> aiEntityMap = new HashMap<>();
 //    private HashMap<String, TrackerEntity> trackerEntityMap = new HashMap<>();

diff -r 6ebc2563a247 -r f7ff312b9d09 core/src/headwayent/blackholedarksun/systems/AISystem.java
--- a/core/src/headwayent/blackholedarksun/systems/AISystem.java	Mon Aug 02 23:06:57 2021 +0300
+++ b/core/src/headwayent/blackholedarksun/systems/AISystem.java	Thu Aug 05 01:04:15 2021 +0300
@@ -1,5 +1,6 @@
 package headwayent.blackholedarksun.systems;
 
+import headwayent.blackholedarksun.entitydata.ShipData;
 import headwayent.blackholedarksun.entitydata.ShipData.ShipTeam;
 import headwayent.blackholedarksun.entitydata.WeaponData;
 import headwayent.blackholedarksun.entitydata.WeaponData.WeaponType;
@@ -714,20 +715,43 @@
             // Find smallest distance
             long closestEnemy = -1;
             int enemyTeamSize = entities.size();
+            currentMinLen = Float.MAX_VALUE;
             for (int i = 0; i < enemyTeamSize; ++i) {
                 Entity entity = entities.get(i);
                 EntityProperties otherShipEntityProperties = entityPropertiesMapper.get(entity);
-                ShipProperties otherShipShipProperties = shipPropertiesMapper.get(entity);
-
-                otherShipEntityProperties.getNode().getPosition(otherPos);
-                otherPos.sub(currentPos, distVec);
-                if (i == 0) {
-                    currentMinLen = distVec.squaredLength();
-                    closestEnemy = otherShipEntityProperties.getItemId();
-                } else {
-                    if (distVec.squaredLength() < currentMinLen) {
+                ShipProperties otherShipShipProperties = shipPropertiesMapper.getSafe(entity);
+                if (otherShipShipProperties != null && otherShipShipProperties.getShipData().shipType == ShipData.ShipType.CARGO) {
+                    // Try to prioritize the enemy cargo ship.
+                    if (i == 0) {
                         currentMinLen = distVec.squaredLength();
                         closestEnemy = otherShipEntityProperties.getItemId();
+                    } else {
+                        if (distVec.squaredLength() < currentMinLen) {
+                            currentMinLen = distVec.squaredLength();
+                            closestEnemy = otherShipEntityProperties.getItemId();
+                        }
+                    }
+                }
+            }
+            if ((closestEnemy == -1) ||
+                    (closestEnemy != -1 &&
+                            ENG_Utility.getRandom().nextInt(FrameInterval.CARGO_SHIP_SELECT_CLOSEST + entityProperties.getNode().getName(), 3) == 0)) {
+                for (int i = 0; i < enemyTeamSize; ++i) {
+                    Entity entity = entities.get(i);
+                    EntityProperties otherShipEntityProperties = entityPropertiesMapper.get(entity);
+//                    ShipProperties otherShipShipProperties = shipPropertiesMapper.get(entity);
+
+                    otherShipEntityProperties.getNode().getPosition(otherPos);
+                    otherPos.sub(currentPos, distVec);
+
+                    if (i == 0) {
+                        currentMinLen = distVec.squaredLength();
+                        closestEnemy = otherShipEntityProperties.getItemId();
+                    } else {
+                        if (distVec.squaredLength() < currentMinLen) {
+                            currentMinLen = distVec.squaredLength();
+                            closestEnemy = otherShipEntityProperties.getItemId();
+                        }
                     }
                 }
             }

diff -r 6ebc2563a247 -r f7ff312b9d09 core/src/headwayent/blackholedarksun/world/WorldManagerBase.java
--- a/core/src/headwayent/blackholedarksun/world/WorldManagerBase.java	Mon Aug 02 23:06:57 2021 +0300
+++ b/core/src/headwayent/blackholedarksun/world/WorldManagerBase.java	Thu Aug 05 01:04:15 2021 +0300
@@ -1102,23 +1102,25 @@
                     levelEvent.state = LevelEvent.EventState.LOST;
                 }
 
-                InGameStatistics statistics = InGameStatisticsManager.getInstance().getInGameStatistics();
-                SessionStatistics latestSessionStatistics = statistics.getLatestSessionStatistics();
-                if (latestSessionStatistics != null) {
-                    LevelStatistics latestLevelStatistics = latestSessionStatistics.getLatestLevelStatistics();
-                    if (latestLevelStatistics != null) {
-                        LevelEventStatistics latestLevelEventStatistics = latestLevelStatistics.getLatestLevelEventStatistics();
-                        if (latestLevelEventStatistics != null) {
-                            latestLevelEventStatistics.state = levelEvent.state.toString();
-                            latestLevelEventStatistics.levelEventEndDate = ENG_DateUtils.getCurrentDateTimestamp();
-                            latestLevelEventStatistics.levelEventDuration = ENG_Utility.currentTimeMillis() - latestLevelEventStatistics.levelEventBeginTime;
+                if (eventWon || eventLost) {
+                    InGameStatistics statistics = InGameStatisticsManager.getInstance().getInGameStatistics();
+                    SessionStatistics latestSessionStatistics = statistics.getLatestSessionStatistics();
+                    if (latestSessionStatistics != null) {
+                        LevelStatistics latestLevelStatistics = latestSessionStatistics.getLatestLevelStatistics();
+                        if (latestLevelStatistics != null) {
+                            LevelEventStatistics latestLevelEventStatistics = latestLevelStatistics.getLatestLevelEventStatistics();
+                            if (latestLevelEventStatistics != null) {
+                                latestLevelEventStatistics.state = levelEvent.state.toString();
+                                latestLevelEventStatistics.levelEventEndDate = ENG_DateUtils.getCurrentDateTimestamp();
+                                latestLevelEventStatistics.levelEventDuration = ENG_Utility.currentTimeMillis() - latestLevelEventStatistics.levelEventBeginTime;
 
-                            updateWeaponData(latestLevelEventStatistics, latestLevelEventStatistics.weaponTypeStatisticsEventEndList);
+                                updateWeaponData(latestLevelEventStatistics, latestLevelEventStatistics.weaponTypeStatisticsEventEndList);
 
-                            Entity entity = getEntity(playerShipEntityId);
-                            if (entity != null) {
-                                EntityProperties entityProperties = entityPropertiesComponentMapper.get(entity);
-                                latestLevelEventStatistics.healthEventEnd = entityProperties.getHealth();
+                                Entity entity = getEntity(playerShipEntityId);
+                                if (entity != null) {
+                                    EntityProperties entityProperties = entityPropertiesComponentMapper.get(entity);
+                                    latestLevelEventStatistics.healthEventEnd = entityProperties.getHealth();
+                                }
                             }
                         }
                     }