Fixed inputMultiplexer bug; fixed logic to create working AI

plaza-in-a-heatwave · Dec 11, 2020 · 3f9f6e7 · 3f9f6e7
1 parent 4bcd3bd
commit 3f9f6e7
Show file tree

Hide file tree

Showing 12 changed files with 203 additions and 45 deletions.
diff --git a/client-core/src/com/benberi/cadesim/GameContext.java b/client-core/src/com/benberi/cadesim/GameContext.java
@@ -652,9 +652,11 @@ public void exitMapEditor() {
      */
     public void handleServersideDisconnect() {
     	if(getServerResponse()) {
+    		inputMultiplexer.clear();
     		getServerChannel().disconnect();
     		System.out.println("Login error; handling response.");
     	}else {
+    		inputMultiplexer.clear();
 	        setConnected(false);
 	        setIsInLobby(true);
 	        getServerChannel().disconnect();

diff --git a/client-core/src/com/benberi/cadesim/game/scene/impl/battle/SeaBattleScene.java b/client-core/src/com/benberi/cadesim/game/scene/impl/battle/SeaBattleScene.java
@@ -169,13 +169,6 @@ public void createMap(int[][] tiles) {
         selectedIsland = islandList.get(context.getIslandId());
     }
 
-    /**
-     * set up the input processor for the chat and game
-     */
-    public void setup() {
-
-    }
-
     private void recountVessels() {
         vesselsCountWithCurrentPhase = context.getEntities().countVesselsByPhase(currentPhase);
         vesselsCountNonSinking = context.getEntities().countNonSinking();

diff --git a/client-core/src/com/benberi/cadesim/game/scene/impl/connect/ConnectScene.java b/client-core/src/com/benberi/cadesim/game/scene/impl/connect/ConnectScene.java
@@ -522,6 +522,7 @@ public void splitRoomInfo() {
 					port_numbers.add(temp_room_info[j].replace("\\", ""));
 				}
 				else {
+
 					String[] print = temp_room_info[j].split(";");
 					server_codes.add(print[0]);
 					room_names.add(print[1]);
@@ -915,8 +916,6 @@ public void readURLServerConfig() {
 				if(line.isEmpty() || line.startsWith("#")) {	
 					continue;	
 				}	
-				//remove spaces	
-				line = line.replaceAll("\\s", "");	
 				//check getdown.txt for url	
 				if(line.startsWith("server.room_locations=")) {	
 					room_info = line.split("=")[1];

diff --git a/server/src/com/benberi/cadesim/server/codec/ServerChannelHandler.java b/server/src/com/benberi/cadesim/server/codec/ServerChannelHandler.java
@@ -26,7 +26,8 @@ public ServerChannelHandler(ServerContext ctx) {
     @Override
     public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
         try {
-            context.getPlayerManager().registerPlayer(ctx.channel());
+        	Player p = new Player(context, ctx.channel());
+            context.getPlayerManager().registerPlayer(ctx.channel(), p);
         } catch (Exception e) {
             ServerContext.log("Channel register error: " + e.getMessage());
             e.printStackTrace();

diff --git a/server/src/com/benberi/cadesim/server/codec/packet/ServerPacketManager.java b/server/src/com/benberi/cadesim/server/codec/packet/ServerPacketManager.java
@@ -44,7 +44,7 @@ public ServerPacketManager(ServerContext context) {
      */
     public void queuePackets() {
         for (Player p : context.getPlayerManager().getPlayers()) {
-            p.getPackets().queueIncomingPackets();
+        	p.getPackets().queueIncomingPackets();
         }
     }
 

diff --git a/server/src/com/benberi/cadesim/server/model/player/NPC_Type.java b/server/src/com/benberi/cadesim/server/model/player/NPC_Type.java
@@ -0,0 +1,8 @@
+package com.benberi.cadesim.server.model.player;
+
+public enum NPC_Type {
+	TYPE1(),
+	TYPE2(),
+	TYPE3(),
+	TYPE4();
+}
diff --git a/server/src/com/benberi/cadesim/server/model/player/NPC_Type1.java b/server/src/com/benberi/cadesim/server/model/player/NPC_Type1.java
@@ -1,6 +1,9 @@
 package com.benberi.cadesim.server.model.player;
 
 import com.benberi.cadesim.server.ServerContext;
+import com.benberi.cadesim.server.model.player.move.MoveType;
+
+import io.netty.channel.Channel;
 
 /*
  * AI Logic - moving type only (like green ships in flotilla with no cbs)
@@ -10,10 +13,12 @@ public class NPC_Type1 extends Player {
     @SuppressWarnings("unused")
 	private ServerContext context;
 
-    public NPC_Type1(ServerContext ctx) {
-        this.context = ctx;
-        setBot(true);
-        set(-1, -1); // not spawned
+    public NPC_Type1(ServerContext ctx, Channel c) {
+    	super(ctx,c);
+    	context = ctx;
+        super.setBot(true);
+        super.set(-1, -1); // not spawned
+        super.setType(NPC_Type.TYPE1);
     }
 
     @Override
@@ -23,6 +28,11 @@ public void calculateRoute() {
 
     @Override
     public void performLogic() {
-
+    	getMoves().setMove(0, MoveType.FORWARD);
+    }
+
+	@Override
+    public NPC_Type getType() {
+		return type;
     }
 }
diff --git a/server/src/com/benberi/cadesim/server/model/player/NPC_Type2.java b/server/src/com/benberi/cadesim/server/model/player/NPC_Type2.java
@@ -1,6 +1,9 @@
 package com.benberi.cadesim.server.model.player;
 
 import com.benberi.cadesim.server.ServerContext;
+import com.benberi.cadesim.server.model.player.move.MoveType;
+
+import io.netty.channel.Channel;
 
 /*
  * AI Logic - flag grabbing type (collect available flag points)
@@ -10,19 +13,21 @@ public class NPC_Type2 extends Player {
     @SuppressWarnings("unused")
 	private ServerContext context;
 
-    public NPC_Type2(ServerContext ctx) {
-        this.context = ctx;
-        setBot(true);
-        set(-1, -1); // not spawned
+    public NPC_Type2(ServerContext ctx, Channel c) {
+    	super(ctx,c);
+    	context = ctx;
+        super.setBot(true);
+        super.set(-1, -1); // not spawned
+        super.setType(NPC_Type.TYPE2);
     }
 
     @Override
-    public void calculateRoute() {
-
+    public void performLogic() {
+    	this.getMoves().setMove(0, MoveType.FORWARD);
     }
 
-    @Override
-    public void performLogic() {
-    	
+	@Override
+    public NPC_Type getType() {
+		return type;
     }
 }
diff --git a/server/src/com/benberi/cadesim/server/model/player/NPC_Type3.java b/server/src/com/benberi/cadesim/server/model/player/NPC_Type3.java
@@ -1,6 +1,9 @@
 package com.benberi.cadesim.server.model.player;
 
 import com.benberi.cadesim.server.ServerContext;
+import com.benberi.cadesim.server.model.player.move.MoveType;
+
+import io.netty.channel.Channel;
 
 /*
  * AI Logic - moving type but engage with player in range
@@ -10,10 +13,12 @@ public class NPC_Type3 extends Player {
     @SuppressWarnings("unused")
 	private ServerContext context;
 
-    public NPC_Type3(ServerContext ctx) {
-        this.context = ctx;
-        setBot(true);
-        set(-1, -1); // not spawned
+    public NPC_Type3(ServerContext ctx, Channel c) {
+    	super(ctx,c);
+    	context = ctx;
+        super.setBot(true);
+        super.set(-1, -1); // not spawned
+        super.setType(NPC_Type.TYPE3);
     }
 
     @Override
@@ -23,6 +28,11 @@ public void calculateRoute() {
 
     @Override
     public void performLogic() {
-
+    	getMoves().setMove(0, MoveType.FORWARD);
+    }
+
+	@Override
+    public NPC_Type getType() {
+		return type;
     }
 }
diff --git a/server/src/com/benberi/cadesim/server/model/player/NPC_Type4.java b/server/src/com/benberi/cadesim/server/model/player/NPC_Type4.java
@@ -1,6 +1,9 @@
 package com.benberi.cadesim.server.model.player;
 
 import com.benberi.cadesim.server.ServerContext;
+import com.benberi.cadesim.server.model.player.move.MoveType;
+
+import io.netty.channel.Channel;
 
 /*
  * AI Logic - chaser type (goes after player)
@@ -10,19 +13,26 @@ public class NPC_Type4 extends Player {
     @SuppressWarnings("unused")
 	private ServerContext context;
 
-    public NPC_Type4(ServerContext ctx) {
-        this.context = ctx;
-        setBot(true);
-        set(-1, -1); // not spawned
+    public NPC_Type4(ServerContext ctx, Channel c) {
+    	super(ctx,c);
+    	context = ctx;
+        super.setBot(true);
+        super.set(-1, -1); // not spawned
+        super.setType(NPC_Type.TYPE4);
     }
 
     @Override
     public void calculateRoute() {
-    	
+
     }
 
     @Override
     public void performLogic() {
-
+    	getMoves().setMove(0, MoveType.FORWARD);
+    }
+
+	@Override
+    public NPC_Type getType() {
+		return type;
     }
 }
diff --git a/server/src/com/benberi/cadesim/server/model/player/Player.java b/server/src/com/benberi/cadesim/server/model/player/Player.java
@@ -83,7 +83,7 @@ public class Player extends Position {
      * The server context
      */
     private ServerContext context;
-
+    protected NPC_Type type;
     /**
      * If the player is registered
      */
@@ -422,7 +422,7 @@ public void register(String name, int ship, int team, int[] customPosition, Vess
         respawn(customPosition, customFace, customDamage, shouldSpawnFullCannons);
     }
 
-    /**
+     /**
      * wrapper for register
      */
     public void register(String name, int ship, int team) {
@@ -945,4 +945,16 @@ public String getChatChannel() {
 	public void setTeam(Team team) {
 		this.team = team;
 	}
+
+	public void printType() {
+		System.out.println(name + " ,"+ type);
+	}
+
+	public NPC_Type getType() {
+		return type;
+	}
+
+	public void setType(NPC_Type typeValue) {
+		type = typeValue;
+	}
 }