diff --git a/.gradle/7.4/executionHistory/executionHistory.lock b/.gradle/7.4/executionHistory/executionHistory.lock index 0ae5263..eda81e1 100644 Binary files a/.gradle/7.4/executionHistory/executionHistory.lock and b/.gradle/7.4/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock index dd99fbc..3b64297 100644 Binary files a/.gradle/7.4/fileHashes/fileHashes.lock and b/.gradle/7.4/fileHashes/fileHashes.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 1953274..0fa80a8 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/airSeaRescue.mas2j b/airSeaRescue.mas2j index 0f8980c..35fcd3b 100644 --- a/airSeaRescue.mas2j +++ b/airSeaRescue.mas2j @@ -14,5 +14,5 @@ MAS airSeaRescue { environment: operator.WorldEnvironment(1,500,yes) - agents: sample_agent#4; + agents: victim#4; } diff --git a/src/java/operator/WorldEnvironment.java b/src/java/operator/WorldEnvironment.java index 034543e..628e770 100644 --- a/src/java/operator/WorldEnvironment.java +++ b/src/java/operator/WorldEnvironment.java @@ -1,6 +1,7 @@ package operator; import jason.asSyntax.Literal; +import jason.asSyntax.NumberTerm; import jason.asSyntax.Structure; import jason.asSyntax.Term; import jason.environment.Environment; @@ -55,10 +56,10 @@ public class WorldEnvironment extends Environment { } private void updateAgetPos(int i) { - clearPercepts("sample_agent"+(i+1)); + clearPercepts("victom" + (i + 1)); Location l = model.getAgPos(i); - addPercept("sample_agent"+(i+1), Literal.parseLiteral("pos(" + l.x + "," + l.y + ")")); + addPercept("victim" + (i + 1), Literal.parseLiteral("pos(" + l.x + "," + l.y + ")")); } @@ -88,6 +89,12 @@ public class WorldEnvironment extends Environment { result = model.move(Move.LEFT, agId); } else if (action.equals(skip)) { result = true; + } else if (action.getFunctor().equals("decLife")) { + int life = (int)((NumberTerm)action.getTerm(0)).solve(); + System.out.println(life); + result = true; + //removePercept(ag,Literal.parseLiteral("life("+life+")")); + // addPercept(ag,Literal.parseLiteral("life("+(life-1)+")")); } else { logger.info("executing: " + action + ", but not implemented!"); } @@ -102,7 +109,7 @@ public class WorldEnvironment extends Environment { } private int getAgIdBasedOnName(String agName) { - return (Integer.parseInt(agName.substring(agName.length() - 1)) -1); + return (Integer.parseInt(agName.substring(agName.length() - 1)) - 1); } public void setSleep(int value) { diff --git a/src/java/operator/WorldView.java b/src/java/operator/WorldView.java index 5122658..22240a1 100644 --- a/src/java/operator/WorldView.java +++ b/src/java/operator/WorldView.java @@ -143,7 +143,7 @@ public class WorldView extends GridWorldView { /*if (((WorldModel)model).isCarryingGold(id)) { super.drawAgent(g, x, y, Color.yellow, -1); } else {*/ - super.drawAgent(g, x, y, c, -1); + super.drawAgent(g, x, y, Color.GREEN, -1); idColor = Color.white; //} g.setColor(idColor); diff --git a/sample_agent.asl b/victim.asl similarity index 99% rename from sample_agent.asl rename to victim.asl index 986071b..d01563d 100644 --- a/sample_agent.asl +++ b/victim.asl @@ -17,4 +17,3 @@ life(500). victim.get_direction(AgX, AgY, D); do(D); -+free. -