blitzmann
78f632a4f6
Merge remote-tracking branch 'origin/master' into test-3
2018-02-24 02:03:29 -05:00
blitzmann
a9db667c9c
Do the same treatment to Target Resists as Damage Patterns
2018-02-24 02:01:23 -05:00
blitzmann
f442632fbc
Fix importing damage profiles which included overwriting existing ones and then performing a delete on one of them. #1416
2018-02-24 01:49:09 -05:00
blitzmann
4bbbd33917
Return 0 instead of -1 when there is no charge on a weapon. It was changed from None to -1 during the py3 conversion (as None can no longer be compared against non-None types). -1 was throwing the capSim off by quite a bit. See #1405
2018-02-18 22:55:31 -05:00
blitzmann
8b2cfe44f2
Merge remote-tracking branch 'origin/master' into test-3
...
# Conflicts:
# config.py
# eos/saveddata/fighter.py
2018-02-17 12:31:58 -05:00
blitzmann
12a526fa9e
Fix for some standup fighter errors
2018-02-17 11:59:51 -05:00
blitzmann
e779bb84e2
Fix for #1383 . Due to the changed mechanics of None in py3, getModifiedItemAttr was defaulted to 0 instead of None. This adds an explicit default of None when trying to find the allowed drone group attribute
2018-02-17 10:53:29 -05:00
blitzmann
0456cb2f96
Merge remote-tracking branch 'origin/master' into test-3
2018-02-16 22:26:10 -05:00
blitzmann
fa3cf90421
add / update effects for citadels
2018-02-16 00:44:26 -05:00
blitzmann
636ee1de23
Get new Standup fighters working
2018-02-15 22:26:42 -05:00
blitzmann
b36bf8fb21
Fix issue restricting structure modules from fitting onto a structure
2018-02-15 21:03:25 -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
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
2936b88c3d
code cleanup
2017-11-27 21:05:06 -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
7058018aed
Fix alpha clones
2017-11-22 21:51:40 -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
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
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
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
blitzmann
47cbc71e8a
Implement simple skill import/export functionality, and some cleanup top pass tox
2017-08-14 23:28:50 -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
f70d671f1d
Fix implant set copy ( #1236 )
2017-07-10 00:21:52 -04:00
Ryan Holmes
0527a506ac
fix broken events preventing additions panels to not work
2017-07-03 01:46:46 -04:00
Ryan Holmes
7ae41b71b2
Fix some deprecated things and a bug or two
2017-07-02 23:26:44 -04:00
Ryan Holmes
57783fe80f
More work on character editor
2017-07-02 15:28:42 -04:00
Ryan Holmes
2857eff884
Fix a few None comparison operations... python 3 has changed this. I'm sure there's going to be a lot of these issues popping up.
...
Oh, and now we get a hard crash when opening a fit. Yey!
2017-06-13 23:57:27 -04:00
Ryan Holmes
050f1b4add
Fixed some missing chrome tab stuff, as well as more conversion issues
2017-06-13 15:18:40 -04:00
Ryan Holmes
828b18d0fd
py2to3 automatic conversion. Woot!
2017-06-12 16:12:45 -04:00
blitzmann
47fcbefe8b
Finish off user-selectable booster side effects - effects are applied correctly now and each has their own display name. Implements #642
2017-06-05 00:18:36 -04:00
blitzmann
c2cb5d763f
Implement selectable booster side effects and persist them to the database, very much based on the fighter ability code. Still need to name them and enable the effects.
...
This also removes the old boosterActiveSideEffect table definition (migration script to drop table still needs to be written)
2017-06-04 23:33:11 -04:00
Ryan Holmes
3371086d54
Fix for #1193 - compounded bonuses during recursive command / projected fittings ( #1197 )
...
* Teak calculated logic
* test
* clear() on every calculation if it's not already calculated
* tox fix
2017-05-31 00:01:59 -04:00
Ryan Holmes
4286f2ea5a
Add stacking penalties to armor and shield resist command links ( #1198 )
2017-05-30 22:44:01 -04:00
Ryan Holmes
d1fc2dd6ec
Fix issue with calculateSustainableTank not considering remote ancil modules (from https://forums.eveonline.com/default.aspx?g=posts&m=6948134#post6948134 ) ( #1189 )
2017-05-22 00:55:35 -04:00
Ebag333
5a60cff9a1
Fixes EVEMon import. Security status was added, but wasn't handled in the EVEMon import. Also, default secstatus to 0 if it's somehow missing.
2017-05-22 00:29:29 -04:00
Ryan Holmes
0d721b55a7
Fix for when factor reload when module doesn't have a cycle time ( #1171 ) ( #1173 )
2017-05-16 00:09:51 -04:00
Ryan Holmes
6344f7a975
Merge branch 'master' into bug/char_fixes
2017-05-14 22:56:34 -04:00
