From 4a2efe3bb3b9ae9a77b1906de5be1d72f5f66299 Mon Sep 17 00:00:00 2001
From: Bazsalanszky <balazs@toldi.eu>
Date: Thu, 19 May 2022 14:11:02 +0200
Subject: [PATCH] Renamed sample_agent to victim

---
 .../7.4/executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .gradle/7.4/fileHashes/fileHashes.lock            | Bin 17 -> 17 bytes
 .../buildOutputCleanup/buildOutputCleanup.lock    | Bin 17 -> 17 bytes
 airSeaRescue.mas2j                                |   2 +-
 src/java/operator/WorldEnvironment.java           |  13 ++++++++++---
 src/java/operator/WorldView.java                  |   2 +-
 sample_agent.asl => victim.asl                    |   1 -
 7 files changed, 12 insertions(+), 6 deletions(-)
 rename sample_agent.asl => victim.asl (99%)

diff --git a/.gradle/7.4/executionHistory/executionHistory.lock b/.gradle/7.4/executionHistory/executionHistory.lock
index 0ae5263dba41c33daef4dadb4af7f9c71ddc23a5..eda81e1a6a3fb95002ebb7c7661cd8ce92c287ef 100644
GIT binary patch
literal 17
UcmZP$b6n1St7Sqb0|XQR04?bRGynhq

literal 17
UcmZP$b6n1St7Sqb0|W#D04>S{6#xJL

diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock
index dd99fbc7d0c65bd137135cdd16529e24c69fc9ab..3b642979b408a0cd1e16ff90e0a36572c97548c2 100644
GIT binary patch
literal 17
VcmZSH^Jdus|6C?j1~6bu0su8M1ULWy

literal 17
UcmZSH^Jdus|6C?j1_*co05!M-y#N3J

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 19532741d113f619c7c088a646581197b162f3ed..0fa80a809f8f8be8f2c3ac6cf89e5f6912b652f9 100644
GIT binary patch
literal 17
TcmZQBDm<LXCRL@w00DaeCJh6Q

literal 17
TcmZQBDm<LXCRL@w00F%KCEWvF

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.
-