From 3eed5bfc6430bd77b6d7505e03462bda4e9f1f00 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sat, 15 Dec 2018 00:21:25 +0300 Subject: [PATCH 1/7] Add more racial definitions --- service/jargon/defaults.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/service/jargon/defaults.yaml b/service/jargon/defaults.yaml index 636d19a11..75f34774c 100644 --- a/service/jargon/defaults.yaml +++ b/service/jargon/defaults.yaml @@ -31,6 +31,10 @@ cn: Caldari Navy rf: Republic Fleet in: Imperial Navy fn: Federation Navy +ts: True Sansha +db: Dark Blood +dg: Dread Guristas +ss: Shadow Serpentis #weapons From 857a625ae2466b785a98d143a06056455aaad4ef Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sat, 15 Dec 2018 11:02:17 +0300 Subject: [PATCH 2/7] Remove some "replacements" --- service/jargon/defaults.yaml | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/service/jargon/defaults.yaml b/service/jargon/defaults.yaml index 75f34774c..1ed671488 100644 --- a/service/jargon/defaults.yaml +++ b/service/jargon/defaults.yaml @@ -1,9 +1,8 @@ -#Default jargon - comment out as necessary. +# Default jargon - comment out as necessary. -#Note that some of these are experimental abbreviations which don't have any real purpose and are simply there to play with - -#shortcuts +# Note that some of these are experimental abbreviations which don't have any real purpose and are simply there to play with +# shortcuts 1: I 2: II lrg: Large @@ -13,20 +12,14 @@ sml: Small # mic: Micro # (ineffective) xl: X-Large -# Derp. -large: heavy -heavy: large - -#language fixes (american/british differences) - +# language fixes (american/british differences) armour: armor neutraliser: neutralizer stabiliser: stabilizer energised: energized economiser: economizer -#definitions - +# races cn: Caldari Navy rf: Republic Fleet in: Imperial Navy @@ -36,8 +29,7 @@ db: Dark Blood dg: Dread Guristas ss: Shadow Serpentis -#weapons - +# weapons ac: AutoCannon rt: Artillery arty: Artillery @@ -129,8 +121,7 @@ rp: Reaper disco: Smartbomb sbomb: Smartbomb -#Propulsion Modules - +# Propulsion Modules ab: Afterburner mwd: Microwarpdrive smwd: 5mn @@ -151,8 +142,7 @@ nano: Nanofiber Internal Structure boosh: Micro Jump Field Generator mjfg: Micro Jump Field Generator -#Tank Modules - +# Tank Modules 100pl: 100mm Plates 200pl: 200mm Plates 400pl: 400mm Plates @@ -199,8 +189,7 @@ knra: Kinetic Deflection Amplifier emra: EM Ward Amplifier exra: Explosive Deflection Amplifier -#Weapon Upgrades - +# Weapon Upgrades bcs: Ballistic Control System bcu: Ballistic Control System bc: Ballistic Control System @@ -222,7 +211,6 @@ gs: Gyrostabilizer hs: Heat Sink # Fleet Assistance - rsebo: Remote Sensor Booster rct: Remote Capacitor Transmitter et: Remote Capacitor Transmitter @@ -236,7 +224,6 @@ cdb: Command Burst cp: Command Processor # EWAR - wd: Warp Disruptor ws: Warp Scrambler sw: Stasis Webifier @@ -255,7 +242,6 @@ md: Guidance Disruptor point: Warp Disruptor # Engineering - cpr: Capacitor Power Relay cpu: Co-Processor coproc: Co-Processor @@ -273,7 +259,6 @@ sigamp: Signal Amplifier mapc: Micro Auxiliary Power Core # Ammo/Charges - am: Antimatter cnam: Caldari Navy Antimatter fnam: Federation Navy Antimatter @@ -296,7 +281,6 @@ bubble: Warp Disrupt Probe ars: Armor Resistance Script # Rigs - acr: Ancillary Current Router ccc: Capacitor Control Circuit smc: Semiconductor Memory Cell From dd8169adb4abf8ab17052f3547546f883200bc53 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sat, 15 Dec 2018 11:12:29 +0300 Subject: [PATCH 3/7] Add couple additional definitions --- service/jargon/defaults.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/service/jargon/defaults.yaml b/service/jargon/defaults.yaml index 1ed671488..12fb76c14 100644 --- a/service/jargon/defaults.yaml +++ b/service/jargon/defaults.yaml @@ -212,6 +212,7 @@ hs: Heat Sink # Fleet Assistance rsebo: Remote Sensor Booster +reccm: Remote Sensor Booster rct: Remote Capacitor Transmitter et: Remote Capacitor Transmitter rar: Remote Armor Repairer @@ -255,6 +256,7 @@ spr: Shield Power Relay cb: Capacitor Booster cbat: Cap Battery cbst: Capacitor Booster +sa: Signal Amplifier sigamp: Signal Amplifier mapc: Micro Auxiliary Power Core From acba971e707e3c86318880b210560a0a0544d4f2 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sat, 15 Dec 2018 12:56:27 +0300 Subject: [PATCH 4/7] Aggregate and sort items during multibuy export --- service/port/multibuy.py | 67 +++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 36 deletions(-) diff --git a/service/port/multibuy.py b/service/port/multibuy.py index 2bf2d7a8a..f50750e76 100644 --- a/service/port/multibuy.py +++ b/service/port/multibuy.py @@ -19,50 +19,45 @@ from service.fit import Fit as svcFit -from service.port.eft import SLOT_ORDER as EFT_SLOT_ORDER def exportMultiBuy(fit): - export = "%s\n" % fit.ship.item.name - stuff = {} - sFit = svcFit.getInstance() + itemCounts = {} + + def addItem(item, quantity=1): + if item not in itemCounts: + itemCounts[item] = 0 + itemCounts[item] += quantity + + exportCharges = svcFit.getInstance().serviceFittingOptions["exportCharges"] for module in fit.modules: - slot = module.slot - if slot not in stuff: - stuff[slot] = [] - curr = "%s\n" % module.item.name if module.item else "" - if module.charge and sFit.serviceFittingOptions["exportCharges"]: - curr += "%s x%s\n" % (module.charge.name, module.numCharges) - stuff[slot].append(curr) + if module.item: + addItem(module.item) + if exportCharges and module.charge: + addItem(module.charge, module.numCharges) - for slotType in EFT_SLOT_ORDER: - data = stuff.get(slotType) - if data is not None: - # export += "\n" - for curr in data: - export += curr + for drone in fit.drones: + addItem(drone.item, drone.amount) - if len(fit.drones) > 0: - for drone in fit.drones: - export += "%s x%s\n" % (drone.item.name, drone.amount) + for fighter in fit.fighters: + addItem(fighter.item, fighter.amountActive) - if len(fit.cargo) > 0: - for cargo in fit.cargo: - export += "%s x%s\n" % (cargo.item.name, cargo.amount) + for cargo in fit.cargo: + addItem(cargo.item, cargo.amount) - if len(fit.implants) > 0: - for implant in fit.implants: - export += "%s\n" % implant.item.name + for implant in fit.implants: + addItem(implant.item) - if len(fit.boosters) > 0: - for booster in fit.boosters: - export += "%s\n" % booster.item.name + for booster in fit.boosters: + addItem(booster.item) - if len(fit.fighters) > 0: - for fighter in fit.fighters: - export += "%s x%s\n" % (fighter.item.name, fighter.amountActive) + exportLines = [] + exportLines.append(fit.ship.item.name) + for item in sorted(itemCounts, key=lambda i: (i.group.category.name, i.group.name, i.name)): + count = itemCounts[item] + if count == 1: + exportLines.append(item.name) + else: + exportLines.append('{} x{}'.format(item.name, count)) - if export[-1] == "\n": - export = export[:-1] - - return export + return "\n".join(exportLines) From 3297ef89750ad4938395622878291c3bbbc19c8d Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sat, 15 Dec 2018 22:03:13 +0300 Subject: [PATCH 5/7] Return size conversion I'm dumb and thought it's heavy->heavy and large->large --- service/jargon/defaults.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/service/jargon/defaults.yaml b/service/jargon/defaults.yaml index 12fb76c14..761fc8473 100644 --- a/service/jargon/defaults.yaml +++ b/service/jargon/defaults.yaml @@ -12,6 +12,10 @@ sml: Small # mic: Micro # (ineffective) xl: X-Large +# sizes +large: heavy +heavy: large + # language fixes (american/british differences) armour: armor neutraliser: neutralizer From 7ffced2151be3504ce0901117a21bee9facf870d Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Mon, 17 Dec 2018 00:10:06 +0300 Subject: [PATCH 6/7] Change layout of bosonic damage misc description --- gui/builtinViewColumns/misc.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index c4c124e44..85a0d545b 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -93,7 +93,9 @@ class Miscellanea(ViewColumn): text = "" tooltip = "" elif max(doomsday_duration / doomsday_dottime, 1) > 1: - text = "{0} dmg over {1} s".format(formatAmount(volley * (doomsday_duration / doomsday_dottime), 3, 0, 3), doomsday_duration / 1000) + text = "{} over {}s".format( + formatAmount(volley * (doomsday_duration / doomsday_dottime), 3, 0, 6), + formatAmount((doomsday_duration / 1000), 0, 0, 0)) tooltip = "Raw damage done over time" else: text = "{0} dmg".format(formatAmount(volley * (doomsday_duration / doomsday_dottime), 3, 0, 3)) From 0480673460fce2d824fa6182dbc73cfef2170cd4 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Mon, 17 Dec 2018 12:55:57 +0300 Subject: [PATCH 7/7] Fix neurotoxin implant not affecting armor amount affected by x-instinct --- eos/effects/boostermodifyboosterarmorpenalties.py | 1 + 1 file changed, 1 insertion(+) diff --git a/eos/effects/boostermodifyboosterarmorpenalties.py b/eos/effects/boostermodifyboosterarmorpenalties.py index a8b30251b..0714422d4 100644 --- a/eos/effects/boostermodifyboosterarmorpenalties.py +++ b/eos/effects/boostermodifyboosterarmorpenalties.py @@ -4,6 +4,7 @@ # Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2) # Implants named like: grade Edge (10 of 12) # Skill: Neurotoxin Control +runTime = 'early' type = "passive"