Migration of dev to master

abl/src/abl/actions/Gossip.java

@@ -0,0 +1,38 @@
+package abl.actions;
+
+import org.json.simple.JSONObject;
+import org.json.simple.JSONArray;
+
+import server.Message;
+import server.TCPServer;
+import abl.util.*;
+import java.lang.reflect.*;
+
+// An acting character speaks a string of context-specific dialogue.
+// Args [0] -- int actingCharacter (id field in wme)
+//		[1] -- bool inCombat
+public class Gossip extends BaseAction {
+
+	@Override
+	public void execute(Object[] args) {
+		System.out.println("Gossip initiator: " + args[0]);
+		// Codes: 1 -- combat action
+		//		  2 -- noncombat action
+		//        3 -- dialogue
+		int code = 3;
+		// Msg field must match name of java class in String format
+		String msg = "Gossip";
+		JSONObject data = new JSONObject();
+		ArrayHolder ah = (ArrayHolder)args[1];
+		JSONArray jsonArray = new JSONArray();
+		for (int value : ah.getArray()) {
+            jsonArray.add(value);
+        }
+		data.put("initiatingCharacter", args[0]);
+		data.put("receivingCharacter", jsonArray);
+
+		Message toSend = new Message(code, msg, data);
+		JSONObject jo = toSend.toJSON();
+		TCPServer.getInstance().sendOutgoingMessage(jo);
+	}
+}

abl/src/abl/agents/GameAgent.abl

@@ -11,6 +11,7 @@ behaving_entity GameAgent {
 	register act protect(int, int) with Protect;
 	register act quip(int, boolean) with Quip;
 	register act requestAssistance(int) with RequestAssistance;
+	register act gossip(int, ArrayHolder) with Gossip;
 
 	// Declare utility class that holds most up-to-date copies of WME for given char by ID
 	WMEDictionary dict = new WMEDictionary();
@@ -38,7 +39,7 @@ behaving_entity GameAgent {
 	    }
 
 	    mental_act {
-	    	System.out.println("Updating ally wme in dictionary.");
+	    	System.out.println("Updating ally wme in dictionary."+newAllyWME.getID());
             dict.addCharacter(newAllyWME.getID(), newAllyWME);
         }
     }
@@ -54,6 +55,7 @@ behaving_entity GameAgent {
     	}
 
     	with (persistent, priority 1) subgoal lookForQuip(id);
+    	with (persistent) subgoal lookToGossip(id);
         with (persistent) subgoal manageCombat(id);
         // with (persistent) subgoal manageNoncombat(allyAgent); 
     }
@@ -151,6 +153,32 @@ behaving_entity GameAgent {
 
     	act quip(id, inCombat);
     }
+
+    sequential behavior lookToGossip(int id) {
+    	AllyWME agent;
+    	long startTime = System.currentTimeMillis();
+    	CalDistanceWME calDisWME = new CalDistanceWME();
+    	ArrayHolder aroundChars = new ArrayHolder(15);
+
+    	with ( success_test { ( System.currentTimeMillis() > startTime + 5000 ) } ) wait;
+
+    	mental_act {
+    		agent = dict.getCharacter(id);
+    	}
+
+    	if { (agent == null) } {
+    		fail_step;
+    	}
+
+    	mental_act {
+			System.out.println("Look to gossip.");
+    	}
+
+    	if{ (calDisWME.isNPCAround(aroundChars, agent, dict)) } {
+    		act gossip(id, aroundChars);
+    	}
+
+    }
 
     // This is a collection behavior s.t. all children act in parallel and never result in failure
     initial_tree {

abl/src/abl/generated/GameAgent.java

@@ -309,17 +309,20 @@ private static void registerBehaviors_0(BehaviorLibrary behaviorLibrary) {
       behaviorLibrary.registerBehavior(new __BehaviorDesc(2, __$behaviorFactory0_rfield, null, null, "allyAgentRoot()", new String[] {"allyAgentRoot()"}, null, (short)0), __$analysis0_rfield);
       behaviorLibrary.registerBehavior(new __BehaviorDesc(3, __$behaviorFactory0_rfield, null, null, "manageAllyAgent(AllyWME)", new String[] {"manageAllyAgent(AllyWME)"}, null, (short)0), __$analysis0_rfield);
       behaviorLibrary.registerBehavior(new __BehaviorDesc(4, __$behaviorFactory0_rfield, null, null, "manageCombat(int)", new String[] {"manageCombat(int)"}, null, (short)0), __$analysis0_rfield);
-      behaviorLibrary.registerBehavior(new __BehaviorDesc(5, __$behaviorFactory0_rfield, null, null, "manageCombat-4->ConditionalStep11_IF_FailStep()", new String[] {"manageCombat-4->ConditionalStep11_IF_FailStep()"}, null, (short)0), __$analysis0_rfield);
+      behaviorLibrary.registerBehavior(new __BehaviorDesc(5, __$behaviorFactory0_rfield, null, null, "manageCombat-4->ConditionalStep12_IF_FailStep()", new String[] {"manageCombat-4->ConditionalStep12_IF_FailStep()"}, null, (short)0), __$analysis0_rfield);
       behaviorLibrary.registerBehavior(new __BehaviorDesc(6, __$behaviorFactory0_rfield, null, null, "lookForAssistance(int)", new String[] {"lookForAssistance(int)"}, null, (short)0), __$analysis0_rfield);
       behaviorLibrary.registerBehavior(new __BehaviorDesc(7, __$behaviorFactory0_rfield, null, null, "waitForTurn(int)", new String[] {"waitForTurn(int)"}, null, (short)0), __$analysis0_rfield);
       behaviorLibrary.registerBehavior(new __BehaviorDesc(8, __$behaviorFactory0_rfield, null, null, "lookToAssist(int)", new String[] {"lookToAssist(int)"}, null, (short)0), __$analysis0_rfield);
       behaviorLibrary.registerBehavior(new __BehaviorDesc(9, __$behaviorFactory0_rfield, null, null, "takeTurn(int)", new String[] {"takeTurn(int)"}, null, (short)0), __$analysis0_rfield);
       behaviorLibrary.registerBehavior(new __BehaviorDesc(10, __$behaviorFactory0_rfield, null, null, "assistAlly(AllyWME, AllyWME)", new String[] {"assistAlly(AllyWME, AllyWME)"}, null, (short)0), __$analysis0_rfield);
       behaviorLibrary.registerBehavior(new __BehaviorDesc(11, __$behaviorFactory0_rfield, null, null, "manageNoncombat(AllyWME)", new String[] {"manageNoncombat(AllyWME)"}, null, (short)0), __$analysis0_rfield);
       behaviorLibrary.registerBehavior(new __BehaviorDesc(12, __$behaviorFactory0_rfield, null, null, "lookForQuip(int)", new String[] {"lookForQuip(int)"}, null, (short)0), __$analysis0_rfield);
-      behaviorLibrary.registerBehavior(new __BehaviorDesc(13, __$behaviorFactory0_rfield, null, null, "lookForQuip-12->ConditionalStep32_IF_FailStep()", new String[] {"lookForQuip-12->ConditionalStep32_IF_FailStep()"}, null, (short)0), __$analysis0_rfield);
-      behaviorLibrary.registerBehavior(new __BehaviorDesc(14, __$behaviorFactory0_rfield, null, null, "GameAgent_RootCollectionBehavior()", new String[] {"GameAgent_RootCollectionBehavior()"}, null, (short)0), __$analysis0_rfield);
-      behaviorLibrary.registerBehavior(new __BehaviorDesc(15, __$behaviorFactory0_rfield, null, null, "__$defaultMemoryExecuteBehavior()", new String[] {"__$defaultMemoryExecuteBehavior()"}, null, (short)0), __$analysis0_rfield);
+      behaviorLibrary.registerBehavior(new __BehaviorDesc(13, __$behaviorFactory0_rfield, null, null, "lookForQuip-12->ConditionalStep33_IF_FailStep()", new String[] {"lookForQuip-12->ConditionalStep33_IF_FailStep()"}, null, (short)0), __$analysis0_rfield);
+      behaviorLibrary.registerBehavior(new __BehaviorDesc(14, __$behaviorFactory0_rfield, null, null, "lookToGossip(int)", new String[] {"lookToGossip(int)"}, null, (short)0), __$analysis0_rfield);
+      behaviorLibrary.registerBehavior(new __BehaviorDesc(15, __$behaviorFactory0_rfield, null, null, "lookToGossip-14->ConditionalStep38_IF_FailStep()", new String[] {"lookToGossip-14->ConditionalStep38_IF_FailStep()"}, null, (short)0), __$analysis0_rfield);
+      behaviorLibrary.registerBehavior(new __BehaviorDesc(16, __$behaviorFactory0_rfield, null, null, "lookToGossip-14->ConditionalStep40_IF_PrimitiveStep()", new String[] {"lookToGossip-14->ConditionalStep40_IF_PrimitiveStep()"}, null, (short)0), __$analysis0_rfield);
+      behaviorLibrary.registerBehavior(new __BehaviorDesc(17, __$behaviorFactory0_rfield, null, null, "GameAgent_RootCollectionBehavior()", new String[] {"GameAgent_RootCollectionBehavior()"}, null, (short)0), __$analysis0_rfield);
+      behaviorLibrary.registerBehavior(new __BehaviorDesc(18, __$behaviorFactory0_rfield, null, null, "__$defaultMemoryExecuteBehavior()", new String[] {"__$defaultMemoryExecuteBehavior()"}, null, (short)0), __$analysis0_rfield);
    }
 
    private static void registerBehaviors_1(BehaviorLibrary behaviorLibrary) {
@@ -331,13 +334,13 @@ public static void main(String[] args) {
    }
 
    public GameAgent() {
-      individualBehaviorLibrary = new BehaviorLibrary(32);
+      individualBehaviorLibrary = new BehaviorLibrary(38);
       jointBehaviorLibrary = new BehaviorLibrary(0);
       debugLevel = 2;
       debuggerGUI = new Debugger(this);
       registerBehaviors_0(individualBehaviorLibrary);
       registerBehaviors_1(jointBehaviorLibrary);
-      ABT = (CollectionBehavior)GameAgent_BehaviorFactories.behaviorFactory0(14, null, null, null, "GameAgent_RootCollectionBehavior()", this, (__BehaviorDesc)((List)individualBehaviorLibrary.lookupBehavior("GameAgent_RootCollectionBehavior()")).get(0));
+      ABT = (CollectionBehavior)GameAgent_BehaviorFactories.behaviorFactory0(17, null, null, null, "GameAgent_RootCollectionBehavior()", this, (__BehaviorDesc)((List)individualBehaviorLibrary.lookupBehavior("GameAgent_RootCollectionBehavior()")).get(0));
       startWMEReflection(ABT);
       registerEntity("GameAgent", this);
    }

abl/src/abl/generated/GameAgent_Analysis.java

@@ -36,20 +36,21 @@ static public List<String> analysis0(int __$behaviorID) {
             // manageAllyAgent_1
             List<String> _$analysisStepIDs = new ArrayList<String>();
             _$analysisStepIDs.add("lookForQuip(int)"); // stepID 9
-            _$analysisStepIDs.add("manageCombat(int)"); // stepID 10
+            _$analysisStepIDs.add("lookToGossip(int)"); // stepID 10
+            _$analysisStepIDs.add("manageCombat(int)"); // stepID 11
             return _$analysisStepIDs;
          }
          case 5: {
-            // manageCombat-4->ConditionalStep11_IF_FailStep_1
+            // manageCombat-4->ConditionalStep12_IF_FailStep_1
             List<String> _$analysisStepIDs = new ArrayList<String>();
             return _$analysisStepIDs;
          }
          case 4: {
             // manageCombat_1
             List<String> _$analysisStepIDs = new ArrayList<String>();
-            _$analysisStepIDs.add("lookToAssist(int)"); // stepID 14
-            _$analysisStepIDs.add("waitForTurn(int)"); // stepID 15
-            _$analysisStepIDs.add("lookForAssistance(int)"); // stepID 16
+            _$analysisStepIDs.add("lookToAssist(int)"); // stepID 15
+            _$analysisStepIDs.add("waitForTurn(int)"); // stepID 16
+            _$analysisStepIDs.add("lookForAssistance(int)"); // stepID 17
             return _$analysisStepIDs;
          }
          case 6: {
@@ -65,7 +66,7 @@ static public List<String> analysis0(int __$behaviorID) {
          case 8: {
             // lookToAssist_1
             List<String> _$analysisStepIDs = new ArrayList<String>();
-            _$analysisStepIDs.add("assistAlly(AllyWME, AllyWME)"); // stepID 24
+            _$analysisStepIDs.add("assistAlly(AllyWME, AllyWME)"); // stepID 25
             return _$analysisStepIDs;
          }
          case 9: {
@@ -84,7 +85,7 @@ static public List<String> analysis0(int __$behaviorID) {
             return _$analysisStepIDs;
          }
          case 13: {
-            // lookForQuip-12->ConditionalStep32_IF_FailStep_1
+            // lookForQuip-12->ConditionalStep33_IF_FailStep_1
             List<String> _$analysisStepIDs = new ArrayList<String>();
             return _$analysisStepIDs;
          }
@@ -93,14 +94,29 @@ static public List<String> analysis0(int __$behaviorID) {
             List<String> _$analysisStepIDs = new ArrayList<String>();
             return _$analysisStepIDs;
          }
+         case 15: {
+            // lookToGossip-14->ConditionalStep38_IF_FailStep_1
+            List<String> _$analysisStepIDs = new ArrayList<String>();
+            return _$analysisStepIDs;
+         }
+         case 16: {
+            // lookToGossip-14->ConditionalStep40_IF_PrimitiveStep_1
+            List<String> _$analysisStepIDs = new ArrayList<String>();
+            return _$analysisStepIDs;
+         }
          case 14: {
+            // lookToGossip_1
+            List<String> _$analysisStepIDs = new ArrayList<String>();
+            return _$analysisStepIDs;
+         }
+         case 17: {
             // GameAgent_RootCollectionBehavior
             List<String> _$analysisStepIDs = new ArrayList<String>();
-            _$analysisStepIDs.add("allyAgentRoot()"); // stepID 36
-            _$analysisStepIDs.add("lookForAllyAgent()"); // stepID 37
+            _$analysisStepIDs.add("allyAgentRoot()"); // stepID 43
+            _$analysisStepIDs.add("lookForAllyAgent()"); // stepID 44
             return _$analysisStepIDs;
          }
-         case 15: {
+         case 18: {
             // __$defaultMemoryExecuteBehavior_1
             List<String> _$analysisStepIDs = new ArrayList<String>();
             return _$analysisStepIDs;

abl/src/abl/generated/GameAgent_ArgumentStepExecute.java

@@ -35,51 +35,64 @@ static public Object[] argumentExecute0(int __$stepID, final Object[] __$behavio
             args[0] = new Integer(((__ValueTypes.IntVar)__$behaviorFrame[1]).i);
             return args;
          }
-         case 14: {
+         case 11: {
+            // manageAllyAgent_1Step4
+            final Object[] args = new Object[1];
+            args[0] = new Integer(((__ValueTypes.IntVar)__$behaviorFrame[1]).i);
+            return args;
+         }
+         case 15: {
             // manageCombat_1Step4
             final Object[] args = new Object[1];
             args[0] = new Integer(((__ValueTypes.IntVar)__$behaviorFrame[0]).i);
             return args;
          }
-         case 15: {
+         case 16: {
             // manageCombat_1Step5
             final Object[] args = new Object[1];
             args[0] = new Integer(((__ValueTypes.IntVar)__$behaviorFrame[0]).i);
             return args;
          }
-         case 16: {
+         case 17: {
             // manageCombat_1Step6
             final Object[] args = new Object[1];
             args[0] = new Integer(((__ValueTypes.IntVar)__$behaviorFrame[0]).i);
             return args;
          }
-         case 19: {
+         case 20: {
             // lookForAssistance_1Step3
             final Object[] args = new Object[1];
             args[0] = new Integer(((__ValueTypes.IntVar)__$behaviorFrame[0]).i);
             return args;
          }
-         case 24: {
+         case 25: {
             // lookToAssist_1Step3
             final Object[] args = new Object[2];
             args[0] = ((AllyWME)__$behaviorFrame[2]);
             args[1] = ((AllyWME)__$behaviorFrame[1]);
             return args;
          }
-         case 27: {
+         case 28: {
             // assistAlly_1Step2
             final Object[] args = new Object[2];
             args[0] = new Integer(((__ValueTypes.IntVar)__$behaviorFrame[2]).i);
             args[1] = new Integer(((__ValueTypes.IntVar)__$behaviorFrame[3]).i);
             return args;
          }
-         case 34: {
+         case 35: {
             // lookForQuip_1Step5
             final Object[] args = new Object[2];
             args[0] = new Integer(((__ValueTypes.IntVar)__$behaviorFrame[0]).i);
             args[1] = new Boolean(((__ValueTypes.BooleanVar)__$behaviorFrame[2]).b);
             return args;
          }
+         case 41: {
+            // lookToGossip-14->ConditionalStep40_IF_PrimitiveStep_1Step1
+            final Object[] args = new Object[2];
+            args[0] = new Integer(((__ValueTypes.IntVar)__$behaviorFrame[0]).i);
+            args[1] = ((ArrayHolder)__$behaviorFrame[4]);
+            return args;
+         }
       default:
          throw new AblRuntimeError("Unexpected stepID " + __$stepID);
       }