Merge branch 'nightly' into dev

2026-03-11 23:18:22 +08:00 · 2020-08-06 03:02:13 -03:00
parent 46d4463649 361a70c9f0
commit 2a4d4edce7
9 changed files with 10 additions and 5 deletions
--- a/module/map_detection/grid_info.py
+++ b/module/map_detection/grid_info.py
@@ -179,6 +179,7 @@ class GridInfo:
                if info.enemy_scale:
                    self.enemy_scale = info.enemy_scale
                if info.enemy_genre:
+
                    self.enemy_genre = info.enemy_genre
                return True
            elif mode == 'carrier' and not self.is_land and self.may_carrier: