Merge branch 'needRescue' into 'develop'

needRescue modify

See merge request !6

src/main/java/autumn_2023/module/complex/CentralizedControlATHumanDetector.java

@@ -68,7 +68,7 @@ public class CentralizedControlATHumanDetector extends HumanDetector {
       if(!(entity instanceof Civilian)) continue;
       Civilian civ = (Civilian) entity;
 
-      if(!this.isNeedRescueHuman(civ)){
+      if(!this.needRescue(civ)){
         continue;
       }
       StandardMessagePriority level = StandardMessagePriority.NORMAL;
@@ -218,7 +218,7 @@ public class CentralizedControlATHumanDetector extends HumanDetector {
     return true;
   }
 
-  private boolean isNeedRescueHuman(StandardEntity entity){
+  private boolean needRescue(StandardEntity entity){
     if (entity == null)
       return false;
     if (!(entity instanceof Human))

src/main/java/autumn_2023/module/complex/CentralizedControlFBAllocator.java

@@ -187,7 +187,7 @@ public class CentralizedControlFBAllocator extends FireTargetAllocator {
       return(mesciv);
     })
     .map(MessageCivilian::getAgentID)
-    .filter(e -> this.isNeedRescueHuman(this.worldInfo.getEntity(e)))
+    .filter(e -> this.needRescue(this.worldInfo.getEntity(e)))
     .filter(e -> !(finishEntityIDs.contains(e)))
     .collect(Collectors.toSet());
     
@@ -228,7 +228,7 @@ public class CentralizedControlFBAllocator extends FireTargetAllocator {
    * @param entity エンティティ
    * @return true : 救助必要 false : 救助不必要
    */
-  private boolean isNeedRescueHuman(StandardEntity entity){
+  private boolean needRescue(StandardEntity entity){
     if (entity == null)
       return false;
     if (!(entity instanceof Human))

src/main/java/autumn_2023/module/complex/CentralizedControlFBHumanDetector.java

@@ -74,7 +74,7 @@ public class CentralizedControlFBHumanDetector extends HumanDetector {
       if(!(entity instanceof Civilian)) continue;
       Civilian civ = (Civilian) entity;
 
-      if(!this.isNeedRescueHuman(civ)){
+      if(!this.needRescue(civ)){
         continue;
       }
       StandardMessagePriority level = StandardMessagePriority.NORMAL;
@@ -214,7 +214,7 @@ public class CentralizedControlFBHumanDetector extends HumanDetector {
     return true;
   }
 
-  private boolean isNeedRescueHuman(StandardEntity entity){
+  private boolean needRescue(StandardEntity entity){
     if (entity == null)
       return false;
     if (!(entity instanceof Human))