diff --git a/scripts/buffs/buildabuff_inspiration.py b/scripts/buffs/buildabuff_inspiration.py index 5aa473b7..bfcff248 100644 --- a/scripts/buffs/buildabuff_inspiration.py +++ b/scripts/buffs/buildabuff_inspiration.py @@ -8,6 +8,8 @@ def setup(core, actor, buff): if buffWorkshop is None: return + buff.setDuration(3600) #1 hour + for BuffBuilder in buffWorkshop: core.skillModService.addSkillMod(actor, BuffBuilder.getStatAffects(), BuffBuilder.getTotalAffected()) print (' gave the skill mod ' + BuffBuilder.getStatAffects() + ' with affect of ' + str(BuffBuilder.getTotalAffected())) diff --git a/scripts/skillMods/face.py b/scripts/skillMods/face.py new file mode 100644 index 00000000..49050a23 --- /dev/null +++ b/scripts/skillMods/face.py @@ -0,0 +1,10 @@ +import sys + +# Only for entertainers? +def add(core, actor, name, base): + actor.addSkillMod(name, base) + return + +def deduct(core, actor, name, base): + actor.deductSkillMod(name, base) + return \ No newline at end of file diff --git a/scripts/skillMods/hair.py b/scripts/skillMods/hair.py new file mode 100644 index 00000000..49050a23 --- /dev/null +++ b/scripts/skillMods/hair.py @@ -0,0 +1,10 @@ +import sys + +# Only for entertainers? +def add(core, actor, name, base): + actor.addSkillMod(name, base) + return + +def deduct(core, actor, name, base): + actor.deductSkillMod(name, base) + return \ No newline at end of file diff --git a/scripts/skillMods/markings.py b/scripts/skillMods/markings.py new file mode 100644 index 00000000..49050a23 --- /dev/null +++ b/scripts/skillMods/markings.py @@ -0,0 +1,10 @@ +import sys + +# Only for entertainers? +def add(core, actor, name, base): + actor.addSkillMod(name, base) + return + +def deduct(core, actor, name, base): + actor.deductSkillMod(name, base) + return \ No newline at end of file diff --git a/scripts/static_map_locations.py b/scripts/static_map_locations.py index 2222447d..46efc478 100644 --- a/scripts/static_map_locations.py +++ b/scripts/static_map_locations.py @@ -30,7 +30,13 @@ def addLocations(core, planet): dathomirLocations(core, planet) if planet.getName() == 'lok': - lokLocations(core, planet) + lokLocations(core, planet) + + #if planet.getName() == 'kaas': + #kaasLocations(core, planet) + + #if planet.getName() == 'taanab': + #taanabLocations(core, planet) def tatooineLocations(core, planet): @@ -44,6 +50,7 @@ def tatooineLocations(core, planet): mapService.addLocation(planet, 'Wayfar', -5124, -6530, 17, 0, 0) mapService.addLocation(planet, 'Mos Eisley', 3528, -4804, 17, 0, 0) mapService.addLocation(planet, 'Anchorhead', 40, -5348, 17, 0, 0) + mapService.addLocation(planet, 'Mos Taike', 3813, 2354, 17, 0, 0) def corelliaLocations(core, planet): @@ -78,7 +85,7 @@ def roriLocations(core, planet): mapService.addLocation(planet, 'Narmle', -5140, -2368, 17, 0, 0) mapService.addLocation(planet, 'Restuss', 5318, 5680, 17, 0, 0) - mapService.addLocation(planet, 'Rebel outpost', 3677, -6447, 17, 0, 0) + mapService.addLocation(planet, 'Rebel Outpost', 3677, -6447, 17, 0, 0) def endorLocations(core, planet): @@ -86,7 +93,7 @@ def endorLocations(core, planet): # Cities - mapService.addLocation(planet, 'an outpost', -905, 1584, 17, 0, 0) + mapService.addLocation(planet, 'an Outpost', -905, 1584, 17, 0, 0) def talusLocations(core, planet): @@ -96,7 +103,7 @@ def talusLocations(core, planet): mapService.addLocation(planet, 'Dearic', 422, -3004, 17, 0, 0) mapService.addLocation(planet, 'Nashal', 4163, 5220, 17, 0, 0) - mapService.addLocation(planet, 'Imperial outpost', -2178, 2300, 17, 0, 0) + mapService.addLocation(planet, 'Imperial Outpost', -2178, 2300, 17, 0, 0) def yavin4Locations(core, planet): @@ -113,9 +120,9 @@ def dantooineLocations(core, planet): # Cities - mapService.addLocation(planet, 'Mining outpost', -640, 2486, 17, 0, 0) - mapService.addLocation(planet, 'Pirate outpost', 1588, -6399, 17, 0, 0) - mapService.addLocation(planet, 'Imperial outpost', -4224, -2400, 17, 0, 0) + mapService.addLocation(planet, 'Mining Outpost', -640, 2486, 17, 0, 0) + mapService.addLocation(planet, 'Pirate Outpost', 1588, -6399, 17, 0, 0) + mapService.addLocation(planet, 'Imperial Outpost', -4224, -2400, 17, 0, 0) def dathomirLocations(core, planet): @@ -136,4 +143,19 @@ def lokLocations(core, planet): mapService.addLocation(planet, 'Nym\'s Stronghold', 440, 5029, 17, 0, 0) mapService.addLocation(planet, 'Imperial outpost', -1920, -3084, 17, 0, 0) +#def kaasLocations(core, planet): + #mapService = core.mapService + + # Cities + + #mapService.addLocation(planet, 'Imperial Outpost', -5118, -2386, 17, 0, 0) + +#def taanabLocations(core, planet): + + #mapService = core.mapService + + # Cities + + #mapService.addLocation(planet, 'Pandath Spaceport', 0, 0, 17, 0, 0) + \ No newline at end of file diff --git a/scripts/static_travel_points.py b/scripts/static_travel_points.py index 50461dcb..70b156c3 100644 --- a/scripts/static_travel_points.py +++ b/scripts/static_travel_points.py @@ -21,7 +21,15 @@ def addPoints(core, planet): if planet.getName() == 'tatooine': tatooinePoints(core, planet) if planet.getName() == 'yavin4': - yavin4Points(core, planet) + yavin4Points(core, planet) + if planet.getName() == 'kashyyyk_main': + kashyyyk_mainPoints(core, planet) + if planet.getName() == 'mustafar': + mustafarPoints(core, planet) + if planet.getName() == 'kaas': + kaasPoints(core, planet) + if planet.getName() == 'taanab': + taanabPoints(core, planet) return def corelliaPoints(core, planet): @@ -33,7 +41,7 @@ def corelliaPoints(core, planet): trvSvc.addTravelPoint(planet, "Tyrena Shuttle A", -5005, 21, -2386) trvSvc.addTravelPoint(planet, "Tyrena Shuttle B", -5600, 21, -2790) trvSvc.addTravelPoint(planet, "Doaba Guerfel Shuttleport", 3085, 280, 4993) - trvSvc.addTravelPoint(planet, "Kor Vella Shuttleport", -3775, 31, 3234) + trvSvc.addTravelPoint(planet, "Kor Vella Shuttleport", -3775, 86, 3234) trvSvc.addTravelPoint(planet, "Bela Vistal Shuttleport A", 6644, 330, -5922) trvSvc.addTravelPoint(planet, "Bela Vistal Shuttleport B", 6930, 330, -5534) @@ -46,8 +54,8 @@ def corelliaPoints(core, planet): def dantooinePoints(core, planet): trvSvc = core.travelService - trvSvc.addTravelPoint(planet, "Mining Outpost", -635, 3, 2507) - trvSvc.addTravelPoint(planet, "Imperial Outpost", -4208, 3, -2350) + trvSvc.addTravelPoint(planet, "Imperial Outpost", -635, 3, 2507) + trvSvc.addTravelPoint(planet, "Mining Outpost", -4208, 3, -2350) trvSvc.addTravelPoint(planet, "Agro Outpost", 1569, 4, -6415) return @@ -56,6 +64,7 @@ def dathomirPoints(core, planet): trvSvc.addTravelPoint(planet, "Science Outpost", -49, 18, -1584) trvSvc.addTravelPoint(planet, "Trade Outpost", 618, 6, 3092) + trvSvc.addTravelPoint(planet, "Quarantine Zone", -5691, 511, -6467) return def endorPoints(core, planet): @@ -78,7 +87,7 @@ def nabooPoints(core, planet): trvSvc.addTravelPoint(planet, "Kaadara Shuttleport", 5123, -192, 6616) trvSvc.addTravelPoint(planet, "Dee'ja Peak Shuttleport", 5331, 327, -1576) trvSvc.addTravelPoint(planet, "Moenia Shuttleport", 4961, 3, -4892) - trvSvc.addTravelPoint(planet, "The Lake Retreat", -5494, -150, -21) + trvSvc.addTravelPoint(planet, "Lake Retreat Shuttleport", -5494, -150, -21) trvSvc.addTravelPoint(planet, "Keren Shuttleport", 2021, 19, 2525) trvSvc.addTravelPoint(planet, "Keren Shuttleport South", 1567, 25, 2837) trvSvc.addTravelPoint(planet, "Keren Starport", 1352, 13, 2768) @@ -87,15 +96,16 @@ def nabooPoints(core, planet): trvSvc.addTravelPoint(planet, "Theed Shuttle B", -5005, 19, 4072) trvSvc.addTravelPoint(planet, "Theed Shuttle C", -5411, 19, 4332) trvSvc.addTravelPoint(planet, "Theed Spaceport", -4858, 5, 4164) - return def roriPoints(core, planet): trvSvc = core.travelService trvSvc.addTravelPoint(planet, "Narmle Starport", -5374, 80, -2188) - trvSvc.addTravelPoint(planet, "Shuttleport", -5255, 80, -2161) + trvSvc.addTravelPoint(planet, "Narmle Shuttleport", -5255, 80, -2161) trvSvc.addTravelPoint(planet, "Rebel Outpost", 3672, 96, -6421) + trvSvc.addTravelPoint(planet, "Restuss Starport", 5281, 80, 6171) + trvSvc.addTravelPoint(planet, "Restuss Shuttleport", 5398, 80, 6195) return def talusPoints(core, planet): @@ -115,12 +125,12 @@ def tatooinePoints(core, planet): trvSvc.addTravelPoint(planet, "Mos Eisley Starport", 3619, 5, -4801) trvSvc.addTravelPoint(planet, "Mos Espa Starport", -2829, 5, 2080) trvSvc.addTravelPoint(planet, "Mos Entha Starport", 1238, 7, 3062) - trvSvc.addTravelPoint(planet, "Anchorhead Shuttleport", 48, 52, -5319) + trvSvc.addTravelPoint(planet, "Anchorhead Shuttle", 48, 52, -5319) trvSvc.addTravelPoint(planet, "Mos Entha Shuttleport A", 1731, 7, 3205) trvSvc.addTravelPoint(planet, "Mos Entha Shuttleport B", 1396, 7, 3487) - trvSvc.addTravelPoint(planet, "Mos Espa Shuttleport A", -3132, 5, 2172) - trvSvc.addTravelPoint(planet, "Mos Espa Shuttleport B", -2799, 5, 2163) - trvSvc.addTravelPoint(planet, "Mos Espa Shuttleport C", -2892, 5, 1914) + trvSvc.addTravelPoint(planet, "Mos Espa Shuttle West", -3132, 5, 2172) + trvSvc.addTravelPoint(planet, "Mos Espa Shuttle East", -2799, 5, 2163) + trvSvc.addTravelPoint(planet, "Mos Espa Shuttle South", -2892, 5, 1914) trvSvc.addTravelPoint(planet, "Mos Eisley Shuttleport", 3434, 5, -4659) trvSvc.addTravelPoint(planet, "Bestine Shuttleport", -1071, 12, -3566) trvSvc.addTravelPoint(planet, "Wayfar Shuttleport", -5089, 75, -6594) @@ -132,4 +142,24 @@ def yavin4Points(core, planet): trvSvc.addTravelPoint(planet, "Imperial Base", 4054, 37, -6216) trvSvc.addTravelPoint(planet, "Labor Outpost", -6921, 73, -5726) trvSvc.addTravelPoint(planet, "Mining Outpost", -267, 35, 4896) - return \ No newline at end of file + return + +def kashyyyk_mainPoints(core, planet): + trvSvc = core.travelService + + trvSvc.addTravelPoint(planet, "Kachirho Starport", -688, 19, -165) + return + +def mustafarPoints(core, planet): + trvSvc = core.travelService + + trvSvc.addTravelPoint(planet, "Mensix Mining Facility", 405, 230, -1352) + return + +#def kaasPoints(core, planet): + #trvSvc = core.travelService + #Return + +#def taanabPoints(core, planet): + #trvSvc = core.travelService + #return diff --git a/src/main/NGECore.java b/src/main/NGECore.java index 50667a51..b714468f 100644 --- a/src/main/NGECore.java +++ b/src/main/NGECore.java @@ -253,6 +253,9 @@ public class NGECore { terrainService.addPlanet(10, "dathomir", "terrain/dathomir.trn", true); terrainService.addPlanet(11, "mustafar", "terrain/mustafar.trn", true); terrainService.addPlanet(12, "kashyyyk_main", "terrain/kashyyyk_main.trn", true); + //terrainService.addPlanet(13, "kaas", "terrain/kaas.trn", true); + //terrainService.addPlanet(14, "taanab", "terrain/taanab.trn", true); + // Travel Points travelService.loadTravelPoints(); simulationService = new SimulationService(this); diff --git a/src/protocol/swg/objectControllerObjects/BuffBuilderChangeMessage.java b/src/protocol/swg/objectControllerObjects/BuffBuilderChangeMessage.java index cbe6ce87..a877944a 100644 --- a/src/protocol/swg/objectControllerObjects/BuffBuilderChangeMessage.java +++ b/src/protocol/swg/objectControllerObjects/BuffBuilderChangeMessage.java @@ -64,9 +64,10 @@ public class BuffBuilderChangeMessage extends ObjControllerObject { item.setInvested(investedPoints); int maxAmount = buffer.getInt(); - item.setAmount(maxAmount); + item.setBonusAmount(maxAmount); statBuffs.add(item); + System.out.println("Added buff item with " + investedPoints + " invested points " + " which has a bonus amount of " + maxAmount); } } @@ -95,7 +96,7 @@ public class BuffBuilderChangeMessage extends ObjControllerObject { for (BuffItem item : statBuffs) { result.put(getAsciiString(item.getSkillName())); result.putInt(item.getInvested()); - result.putInt(item.getAmount()); + result.putInt(item.getBonusAmount()); } } diff --git a/src/resources/common/BuffBuilder.java b/src/resources/common/BuffBuilder.java index e372c58c..c376ae5a 100644 --- a/src/resources/common/BuffBuilder.java +++ b/src/resources/common/BuffBuilder.java @@ -54,7 +54,9 @@ public class BuffBuilder { } public int getTotalAffected() { - int totalAffected = getMaxTimesApplied() + getAffectAmount(); + // 10 * 10 = 100 + int totalAffected = getMaxTimesApplied() * getAffectAmount(); + Console.println("Total Affected: " + totalAffected + getEntBonus()); return totalAffected + getEntBonus(); } diff --git a/src/resources/objects/BuffItem.java b/src/resources/objects/BuffItem.java index 79e28b8a..8d647d4a 100644 --- a/src/resources/objects/BuffItem.java +++ b/src/resources/objects/BuffItem.java @@ -52,11 +52,11 @@ public class BuffItem { this.invested = invested; } - public int getAmount() { + public int getBonusAmount() { return bonusAmount; } - public void setAmount(int amount) { + public void setBonusAmount(int amount) { this.bonusAmount = amount; } } diff --git a/src/services/BuffService.java b/src/services/BuffService.java index 8e28b62c..50de0f71 100644 --- a/src/services/BuffService.java +++ b/src/services/BuffService.java @@ -23,7 +23,6 @@ package services; import java.nio.ByteOrder; import java.util.Map; -import java.util.Vector; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; diff --git a/src/services/EntertainmentService.java b/src/services/EntertainmentService.java index e5789cb0..896f2525 100644 --- a/src/services/EntertainmentService.java +++ b/src/services/EntertainmentService.java @@ -86,6 +86,16 @@ public class EntertainmentService implements INetworkDispatch { if (sentPacket.getAccepted() == true && sentPacket.getBuffRecipientAccepted() == 1) { System.out.println("both accepted!"); + + if (sentPacket.getBuffCost() > 0) { + CreatureObject recipientCreature = (CreatureObject) buffRecipient; + if (recipientCreature.getCashCredits() >= sentPacket.getBuffCost()) { + recipientCreature.setCashCredits(recipientCreature.getCashCredits() - sentPacket.getBuffCost()); + } else { + return; + } + } + OkMessage closeMsg = new OkMessage(); buffer.getClient().getSession().write(closeMsg.serialize()); @@ -153,11 +163,9 @@ public class EntertainmentService implements INetworkDispatch { for (BuffItem item : buffVector) { for (BuffBuilder builder : availableSkills) { if (builder.getStatName().equals(item.getSkillName())) { - builder.setEntBonus(item.getAmount()); + builder.setEntBonus(item.getBonusAmount()); buffsToAdd.add(builder); - Console.println("Added buff item: " + builder.getStatName()); - break; - } else { + Console.println("Added buff item: " + builder.getStatAffects() + " with total affect of " + builder.getTotalAffected() + " and ent bonus of " + builder.getEntBonus()); continue; } }