From 47ddadc865af429e44945e7bb53ce1e4c8b8d72b Mon Sep 17 00:00:00 2001 From: Tony Grosinger Date: Fri, 16 Sep 2011 14:14:59 -0700 Subject: [PATCH] -Finished upgrades Signed-off-by: Tony Grosinger --- .../nomads/DroneListItem$Direction.class | Bin 1272 -> 1272 bytes .../nomads/DroneListItem$EnumMove.class | Bin 1480 -> 1480 bytes bin/net/grosinger/nomads/DroneListItem.class | Bin 10572 -> 11687 bytes bin/net/grosinger/nomads/Upgrade.class | Bin 3998 -> 3998 bytes bin/net/grosinger/nomads/UpgradeShop.class | Bin 1406 -> 1713 bytes src/net/grosinger/nomads/DroneListItem.java | 57 ++++++++++++++++-- src/net/grosinger/nomads/Upgrade.java | 1 - src/net/grosinger/nomads/UpgradeShop.java | 3 +- 8 files changed, 55 insertions(+), 6 deletions(-) diff --git a/bin/net/grosinger/nomads/DroneListItem$Direction.class b/bin/net/grosinger/nomads/DroneListItem$Direction.class index 4011d6e23523d7af31b508bc7d44d2935bcf4207..6bcd1f011adf3df2db9326b40f7a3986adc2985e 100644 GIT binary patch delta 23 ecmeyt`Ga!<9}BA@g9(GeWMLK)Muo{9EE@n#I|a=E delta 23 ecmeyt`Ga!<9}BAjg9(HDWMLK)M)}DeEE@n#90ke% diff --git a/bin/net/grosinger/nomads/DroneListItem$EnumMove.class b/bin/net/grosinger/nomads/DroneListItem$EnumMove.class index 050b8696e8dfcce6fe4aece407fa7974b1794446..960eca4a1c6ef09373f2c6f6a1291acff5c72a2f 100644 GIT binary patch delta 23 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 literal 10572 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 delta 179 zcmV~$J4k{77>3d3{lHCU5d^^@a1vY_+{85kGto@Q8(KoCpcSSCUVg+OaMU4aYABon zR|mKD2pU}+1-Ck97MKOzKK|9D6S0A}=om1t}^_ zNf9cFQq>WcN^_+$HC4G*iyJxAHKm~!ntG+B1#PXk)fadA;a*kW5k**3=B+HdTkpeokYJo-v>^J2Ud{*f4FfR` z6@5TI(Kqw~Nn7f{2VeGWvDVsq_qZ1dfA(HK0IZ@OfWnZF-z*}dO!rov)Hp{LI|g=< zXBcaW?p3?#nhjBZXbXlV=_!+I|D)6Zw8fD`!9WouqTM)_D_X+o*2KNA8M5hG-y=7S zxNyxekBWhP9575YMB~otR@~cG!L&`sB2z70mGA0fgu$pfj&O^%+3AQ*02d7DzHV}e zE`vU>p4`x$gKtow(cNYFr7h27UJzgOvF&58U;0SIe3U)HRd9-P2+FCEX)}c!W>KOY zb(&`W6ks4k9ciJ8Ly#FZafERw2xA>Js#F{kJ__XrF~-7#oKUae6lat;!I+YX++q4((j^fmKd4xtBr90cL;sc=A;VVk7WzY`l$Xv currentObjectives; - // TODO - Implement max number of objectives - /* * Default constructor, includes all references */ @@ -244,8 +243,8 @@ public class DroneListItem { public ArrayList getCurrentObjectives() { return currentObjectives; } - - public boolean getCurrentObjectivesFull(){ + + public boolean getCurrentObjectivesFull() { return currentObjectives.size() >= Nomads.MAXREQUESTEDOBJECTIVES; } @@ -366,6 +365,56 @@ public class DroneListItem { visibleDistance += amount; } + /** + * Increments the level specified by the type. + * + * @param type + * Level to be increased + */ + public void incrementLevel(UpgradeType type) { + switch (type) { + case visibleDistance: { + visibleDistance++; + break; + } + case lumaLocatorDistance: { + lumaLocatorDistance++; + break; + } + case objectLocatorDistance: { + objectLocatorDistance++; + break; + } + case reliability: { + reliability++; + break; + } + case attack: { + attack++; + break; + } + case defenses: { + defenses++; + break; + } + case speed: { + speed++; + break; + } + case cargoSpace: { + cargoSpace++; + break; + } + case theft: { + theft++; + break; + } + default: { + // Must specify an Upgrade Type + } + } + } + /** * Increases the age of the drone by 1 turn */ diff --git a/src/net/grosinger/nomads/Upgrade.java b/src/net/grosinger/nomads/Upgrade.java index 2e5f487..d02f60c 100644 --- a/src/net/grosinger/nomads/Upgrade.java +++ b/src/net/grosinger/nomads/Upgrade.java @@ -82,7 +82,6 @@ public class Upgrade { break; } case lumaLocatorDistance: { - allInfo.put("multiplier", (double) 2.5); allInfo.put("currentLevel", (double) oldBrokenDrone.getLumaLocatorDistance()); allInfo.put("originalLevel", (double) Nomads.BASE_LUMALOCATORDISTANCE); diff --git a/src/net/grosinger/nomads/UpgradeShop.java b/src/net/grosinger/nomads/UpgradeShop.java index e72fc71..a5e9497 100644 --- a/src/net/grosinger/nomads/UpgradeShop.java +++ b/src/net/grosinger/nomads/UpgradeShop.java @@ -33,7 +33,8 @@ public class UpgradeShop extends NeighborBuilding { } else if (toPerform.isMaxLevel()) { throw new InvalidUpgradeException("Maximum level already achieved"); } else { - // TODO - Implement Perform Upgrade + drone.incrementLevel(toPerform.getUpgradeType()); + drone.getTeam().deductFromBalance(upgradeCost); } }