blitzmann
da0f89ef91
Merge commit 'refs/tags/v1.35.0^{}' into test-3
2018-02-14 22:25:45 -05:00
blitzmann
89b6e8f8c3
fix tox stuff
2018-02-14 22:15:48 -05:00
blitzmann
c6e715aa5c
Merge branch 'master' into test-3
2018-02-14 22:07:33 -05:00
blitzmann
89c84aac96
update effect headers, add some icons, update DB to final 1248987
2018-02-14 22:05:55 -05:00
blitzmann
649ba9f3e4
Merge branch 'master' into singularity
2018-02-14 21:31:54 -05:00
blitzmann
23f0f48c80
Use a special dev database for py3 branch
2018-02-14 01:16:49 -05:00
blitzmann
8686c02b1f
Add stacking penalties to dromi fighters
2018-02-12 23:33:16 -05:00
blitzmann
5f0ce58c29
Merge branch 'master' into test-3
...
# Conflicts:
# gui/builtinShipBrowser/fitItem.py
# service/port.py
2018-02-11 21:29:17 -05:00
blitzmann
0f30ea554d
Fix for #1377 - group up support fighters and modify the bonus based on amount active
2018-02-10 14:14:31 -05:00
blitzmann
96828a5611
Add assualt damage control effect
2018-02-05 23:12:58 -05:00
blitzmann
9f3c2ca7a8
Add stacking penalty to Fighter's MWD ability
2018-02-05 22:34:25 -05:00
blitzmann
a29b3da8a6
Update DB and effects
2018-01-30 00:05:11 -05:00
burnsypet
3072dbb3ff
Remove energy warfare resistance on capNeed calc
...
When calculating the capactitor need of an energy nosferatu the
amount was being modified incorrectly by the energy warfare
resistance of the ship. Change to only apply energy warfare
resitance modifier if this is a projected effect.
2018-01-26 14:48:35 +00:00
Ryan Holmes
0c971a127c
Fix loggerhead drone bonus ( #1348 ) ( #1358 )
2018-01-02 01:43:55 -05:00
blitzmann
40ce7b7c0b
Merge branch 'master' into test-3
...
# Conflicts:
# .gitignore
# eos/saveddata/character.py
# service/network.py
# service/price.py
2017-12-10 22:36:15 -05:00
blitzmann
cc063d1934
Bump release
2017-12-10 18:07:45 -05:00
blitzmann
531721ef5e
Merge branch 'master' into development
2017-12-10 16:25:20 -05:00
blitzmann
2936b88c3d
code cleanup
2017-11-27 21:05:06 -05:00
blitzmann
dd3bc66896
Remove old py<2.6 OrderedDict compat module
2017-11-25 22:40:23 -05:00
blitzmann
f7b509f9a9
code styling
2017-11-25 04:04:13 -05:00
blitzmann
5697da7ec2
fix upgrade
2017-11-24 01:23:04 -05:00
blitzmann
a7086b78cb
Fix an issue with with Cap Power Relay using an effect without an expecting source attribute. Used to work, but with changes to getModifiedItemAttr need to default these to None
2017-11-24 00:55:23 -05:00
blitzmann
46b0aded03
fixes
2017-11-23 22:43:41 -05:00
blitzmann
d23398ce29
fix for boosters
2017-11-23 20:51:03 -05:00
blitzmann
6e112b9ed5
Fix issues with merge
2017-11-23 11:38:08 -05:00
blitzmann
b30b3fcbf1
Merge branch 'master' into test-3
...
Conflicts:
eos/gamedata.py
eos/saveddata/booster.py
eos/saveddata/character.py
gui/builtinAdditionPanes/commandView.py
gui/builtinContextMenus/commandFits.py
gui/builtinMarketBrowser/itemView.py
gui/builtinMarketBrowser/marketTree.py
gui/builtinPreferenceViews/pyfaGeneralPreferences.py
gui/builtinShipBrowser/categoryItem.py
gui/builtinShipBrowser/fitItem.py
gui/builtinShipBrowser/navigationPanel.py
gui/builtinShipBrowser/raceSelector.py
gui/builtinShipBrowser/shipItem.py
gui/builtinStatsViews/priceViewFull.py
gui/builtinViews/fittingView.py
gui/characterEditor.py
gui/characterSelection.py
gui/chromeTabs.py
gui/crestFittings.py
gui/itemStats.py
gui/mainFrame.py
scripts/itemDiff.py
service/price.py
2017-11-23 11:19:05 -05:00
blitzmann
967128cb69
Added missing effect for shield booster penalty on crash
2017-11-22 23:16:28 -05:00
blitzmann
f0baba10df
Update effects
2017-11-22 23:04:32 -05:00
blitzmann
7058018aed
Fix alpha clones
2017-11-22 21:51:40 -05:00
blitzmann
d45d7204d2
Merge branch 'release/v1.33.2' into development
...
Conflicts:
config.py
2017-11-22 21:51:19 -05:00
blitzmann
405a965046
Fix issue with loading fighters
2017-11-22 01:44:48 -05:00
blitzmann
de44e6f932
Get rid of some annoying messages
2017-11-21 23:46:33 -05:00
blitzmann
0d8904d59f
Fix None comparison operation
2017-11-16 01:35:26 -05:00
blitzmann
e848cec815
Fix dirty skill indicator (* instead of blue text). Need to get a different icon working for those. Remove debugging prints()
2017-11-16 01:20:38 -05:00
blitzmann
c4f41fb5fa
Update to 1209099 and rename old komodo skill
2017-11-12 16:52:56 -05:00
blitzmann
266398b1de
Get some things working for pyinstaller
2017-11-12 00:14:45 -05:00
blitzmann
6a382c4445
More tweaks to getModifiedItemAttr and fix deprecation warning
2017-11-05 01:51:19 -04:00
blitzmann
ce3b94696a
Make sure getModifiedItemAttr always returns an int, unless otherwise wanting None
...
In py2, you could compare None to an int and it would always be less than. Unfortunately in py3, this is no longer the case. Returning getModifiedItemAttr as 0 allows us to not do a huge refactor.
2017-11-04 18:20:00 -04:00
oaao
cacf286176
[fix] eos - remove Komodo thermalDamage double-dipping
2017-11-02 04:41:57 -04:00
burnsypet
a02bbe3964
Removed traces
2017-11-01 23:31:17 +00:00
burnsypet
866d410695
Added logic for WDFG MWD scrambling
2017-11-01 23:27:34 +00:00
burnsypet
ea6f31c021
Added disruption effect for WDFG
2017-11-01 22:55:05 +00:00
burnsypet
d522fff511
Add projected warp strength to scrams
...
Changes to effects:
Added warp strength projected effects to all kinds of warp disruption
modules except for WDFG (this will need some more thinking). Fixed
a bug where warp disruptors appeared to reduce the warp strength of
the ship they were fitted to
Changes to targetingMiscView*.py:
Replaced abs() with multiplication by -1 where appropriate
2017-10-30 21:05:46 +00:00
burnsypet
20a1618e41
Display warp core strength as warp speed tooltip
...
Changes to antiwarpscramblingpassive.py:
Fixed a typo of "warmScrambleStatus" to "warpScrambleStatus"
Changes to targetingMiscViewMinimal.py:
Extended existing tooltip to include warp core strength. Warp core
strength is none for ships that do not have a hull bonus (venture etc.)
or do not have any warp core stabs fitted so logic is added to
default value to 0.
Changes to targetingMiscViewFull.py:
As above.
2017-10-29 20:40:39 +00:00
blitzmann
4355f35eef
Revert "Stop applying neut resistance twice" and instead remove the resistance application from addDrain()
...
This reverts commit 7b32fe08ac
2017-10-29 15:07:05 -04:00
Ryan Holmes
029e61edaf
Merge branch 'master' into issue-1315
2017-10-29 12:36:29 -04:00
blitzmann
82d50cfa0d
Fix effect that used to only be for skill, but is now for a booster ( #1324 )
2017-10-28 21:04:51 -04:00
blitzmann
d9800dcf19
Fix some effects for #1320
2017-10-28 19:45:09 -04:00
blitzmann
3b61a07c55
Fix for #1321 - make sure we have attribute on ship
2017-10-28 19:25:15 -04:00
burnsypet
7b32fe08ac
Stop applying neut resistance twice
...
Energy neut/nos resistance was being applied twice when a nos or
neut is projected onto a fit. I have removed the redundant resistance
application in energyneutralizerfalloff.py and also in
energynosferatufalloff.py as they are already being applied once in
eos.saveddata.fit.addDrain.
2017-10-26 17:53:16 +01:00
