blitzmann
dd3bc66896
Remove old py<2.6 OrderedDict compat module
2017-11-25 22:40:23 -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
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
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
Ryan Holmes
fd6e318ae3
Release/v1.33.0 ( #1319 )
...
* update database file to SISI 1202899
* Effect and group renaming
* Add civilian modules (#1308 )
* Add new effects
* update effect headers
* update database to tq - lifeblood (1203953)
* Update renders
* Update icons
* bump version
* fix tox errors
* change up tox config to ignore E722
* more tox ignores
* Try disabling tests for now. Rifter stats changed, causing breakage. This is why we need properly mocked data, not crap straight from the database.
* Try this
* more testing
* Fuck it, disable branch protection until I can evaluate the test failures and what needs to be done to get them back on the path
2017-10-25 23:33:05 -04:00
Ryan Holmes
3fb7411b9d
Issue/1305 ( #1311 )
...
* Bump dev version
* fix issue in itemDiff
* Do not apply Prop Jamming to Grapplers (#1305 )
2017-10-08 21:13:38 -04:00
Ryan Holmes
72062e6213
Release/1.32.0 ( #1300 )
...
* update database
* update effect headers
* Bump version
2017-09-24 16:43:51 -04:00
Ryan Holmes
10836acab2
Bug/1275 ( #1299 )
...
* Add stacking penalties to the max targeting range bonus of the Info Command Burst : Sensor Optimization
* Move Information Burst: Sensor Optimization: Targeting Range effect to proper position
* Fix tox issue
2017-09-24 13:38:52 -04:00
blitzmann
2f28afc7ae
Merge branch 'bug/1278' of https://github.com/pyfa-org/Pyfa into bug/1278
2017-09-23 12:49:05 -04:00
blitzmann
0134c3b9a1
Fix formatting
2017-09-23 12:33:51 -04:00
Ryan Holmes
9f433fd072
Merge branch 'master' into bug/1278
2017-09-23 03:11:04 -04:00
blitzmann
7729bd9210
Opps commented wrong thing
2017-09-22 02:35:01 -04:00
blitzmann
ce5803dd9c
Disable an odd bit of code from a long time ago that fitting max group fitting restrictions to be bypassed ( #1278 )
2017-09-22 02:33:46 -04:00
Ryan Holmes
73d9dd60e6
Don't return None as a price, always return a float ( #1291 ) ( #1292 )
2017-09-21 21:13:05 -04:00
Ryan Holmes
f37f4573bf
Add missing effect ( #1290 )
2017-09-20 00:11:32 -04:00
Ryan Holmes
59b09a255a
Fix override importing (and possibly some other bugs revolving around this?) ( #1285 )
2017-09-18 23:28:39 -04:00
burnsypet
a01284ff1c
Convert booster attribute to value before applying
...
Changes to boostermissilevelocitypenalty.py:
Get booster attribute value using booster.getModifiedItemAttr()
before attempting to apply it to avoid type error
2017-09-14 21:53:53 +01:00
blitzmann
eda6d738a4
fix some whitespace stuff, update database, effect headers, and release version
2017-08-16 20:39:26 -04:00
blitzmann
47cbc71e8a
Implement simple skill import/export functionality, and some cleanup top pass tox
2017-08-14 23:28:50 -04:00
blitzmann
ead595e666
Allow burst projector to be projected
2017-08-13 21:19:55 -04:00
blitzmann
66752b2cbf
Fix cargo bonus for Covert subsytems ( #1246 )
2017-07-15 21:51:32 -04:00
blitzmann
22dc6512c0
Final updates and bump version :D
2017-07-11 19:39:13 -04:00
blitzmann
277bd14453
See #1234 - temporarily add conditional to ensure we run the skill level checking code only when a character exists to prevent error. This may cause some issues with the alpha characters since that may not get checked anymore.
2017-07-11 19:23:08 -04:00
blitzmann
d19486ce15
cleanup
2017-07-11 02:30:26 -04:00
blitzmann
b55fcfaf04
cleanup
2017-07-11 02:06:09 -04:00
blitzmann
60e5085724
ohgodwhathaveidone.jpg
2017-07-11 01:50:54 -04:00
blitzmann
3da0b8bc29
Effect header update
2017-07-11 01:31:02 -04:00
blitzmann
78e065feff
Apparently, my IDE settings changed from spaces to tabs. Changing this back :3
2017-07-11 01:13:25 -04:00
blitzmann
453054f6c7
Remove command fitting from the command fits context menu upon deletion ( #1244 )
2017-07-11 01:10:39 -04:00
blitzmann
231f9a91c2
Do not assume number of columns for damagePatterns, see #1238
2017-07-10 22:46:30 -04:00
blitzmann
c553790eaf
move the "generating effect" spam - doesn't need to happen every time the handler is called
2017-07-10 01:48:10 -04:00
