From ec147dede873480bdadeef64c7a04e5b67e4e927 Mon Sep 17 00:00:00 2001 From: Tony Grosinger Date: Thu, 19 May 2011 17:25:12 -0700 Subject: [PATCH] Started checking to see that the moving drone is the owner of the objective it lands on Signed-off-by: Tony Grosinger --- bin/net/grosinger/nomads/DroneListItem.class | Bin 6619 -> 6624 bytes src/net/grosinger/nomads/DroneListItem.java | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/net/grosinger/nomads/DroneListItem.class b/bin/net/grosinger/nomads/DroneListItem.class index 6e1b8dd638329a68dc175a37d8fbdce53c55e490..f1c22c28e1d379c9d458762cbdf5b51b87c6c328 100644 GIT binary patch delta 195 zcmca@{J?m_VJN&CCA3jaEXyYZt_MZ(aHC?xHk)OTXS=^Ft7q4 z1H<;op<;Q`a*`|u8BWh+5YXDfU@6J6jp1zgat2P2;Kj*z#mt%07$hf)i@OGwGd41` zFg7uCF?KV|V(ep>$Jo!Xf^h=F8peqX+ZZP?gaS=8ftbq>#=r*T0c~Ko&9H=lkwJuE oF~c1Oeg-B6F@}WENhI5nOaVc|{Fwpq&HUW9+?@3ctU$=Xux)avSe}%u zB+EgD)3X@3LG;;~47^%f7%U}OwlSQad{4}rIf+4HvV^#+e?4O(LnmVg!%W6*hPjMA z49gjN8CEm)F>Gb*X9xuvW&$yiA&h|y$O9VAaGPNX10#b7!y<+|4EzjC3}Orm814dD Z%nXSPp_4a=OR*ZVGd$qjd|q6T2>{K;ErS36 diff --git a/src/net/grosinger/nomads/DroneListItem.java b/src/net/grosinger/nomads/DroneListItem.java index bb09600..8d5f758 100644 --- a/src/net/grosinger/nomads/DroneListItem.java +++ b/src/net/grosinger/nomads/DroneListItem.java @@ -381,8 +381,11 @@ public class DroneListItem { GameObject objectHere = Nomads.awesomeWorld.getObjectAt(getX() + amountE, getY() + amountN); if (inventory.size() < cargoSpace) { - if (objectHere instanceof MoneyPile || objectHere instanceof Objective) { + if (objectHere instanceof MoneyPile) { inventory.add(objectHere); + } else if (objectHere instanceof Objective) { + // TODO - Check to see that this drone is the owner of that + // Objective } } else { // TODO - Inventory is full, do not allow move