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
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
828b18d0fd
py2to3 automatic conversion. Woot!
2017-06-12 16:12:45 -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
blitzmann
11eea37aa7
Remove duplication of Character.ro property
2017-05-14 22:50:18 -04:00
blitzmann
bff44c46f8
Fix character list sorting ( https://forums.eveonline.com/default.aspx?g=posts&m=6940327#post6940327 )
2017-05-14 22:44:02 -04:00
blitzmann
7a0ea759ef
Fix issue with character copy, as well as instantiating character with duplicate skills (since Skill has a backref to charactrer, it's automatically added to the characters skill list. No more need for the append())
2017-05-14 22:24:05 -04:00
blitzmann
f9419977c0
Instantiate skills with a character (may help to solve https://forums.eveonline.com/default.aspx?g=posts&m=6939299#post6939299 )
2017-05-14 20:55:48 -04:00
blitzmann
0db141d0a6
Fix exception when reverting character skills
2017-05-14 02:26:32 -04:00
blitzmann
3de63c5ca5
flake8 fixes
2017-05-08 21:32:13 -04:00
blitzmann
42e64a6223
Fix jsonToSql script and issue with character sec status setter
2017-05-08 21:24:29 -04:00
blitzmann
53f589284b
Implement hard constraints for All 5/0 characters with respect to skills and sec status
2017-05-08 19:47:55 -04:00
blitzmann
c9a04e886a
Add eos setting for strict skills, and update info in skill tree without doing a repopulation
2017-04-22 14:02:40 -04:00
blitzmann
d0a4fa1c9d
Get strict skills working. Todo: add engine setting
2017-04-22 02:43:06 -04:00
blitzmann
f0fc5643e9
Return and save sec status for character when updating skills
2017-04-18 00:01:25 -04:00
Ebag333
802e2afcc0
General cleanup of Eos. Reformats a bunch of files and cleans up unused code or code that's been commented out
2017-04-05 15:47:19 -07:00
blitzman
7115cd178c
Merge branch 'development' into LogBook_v2
...
Conflicts:
config.py
eos/saveddata/fit.py
gui/bitmapLoader.py
gui/graphFrame.py
gui/utils/exportHtml.py
pyfa.py
service/crest.py
service/price.py
service/server.py
2017-02-25 18:21:07 -05:00
blitzman
4ba11d832a
Tox fixes, because it's a thing we do now
2017-02-16 23:12:25 -05:00
blitzman
66d78fed2c
Add indication in character name of alpha status
2017-02-16 23:09:27 -05:00
Ebag333
3b185e1bcb
Roll up all changes from #962 as the base has been massively changed by code cleanups. Rename our logging to a universal pyfalog to avoid shadowing either Logging or Logbook loggers
2017-02-11 11:51:53 -08:00
Ebag333
3562577521
Tox fix, and catch an extra shadowing
2017-02-10 12:06:23 -08:00
Ebag333
2b45a16872
Refactor most of the shadowing from outer scopes. This is a super simple change, just changing the variable used inside (mostly) lambdas.
2017-02-10 11:50:04 -08:00
Ebag333
64070a0798
Revert commit 7865219164 This causes too much grief as we are getting a lot of default values from the database. These *SHOULD* be defined, but will have to be done later.
2017-02-09 09:36:16 -08:00
Ebag333
7865219164
Add a ton of default values
2017-02-09 00:56:33 -08:00
blitzman
f7d7b3fe5e
Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development
...
Conflicts:
eos/db/gamedata/metaData.py
eos/db/gamedata/queries.py
eos/db/saveddata/queries.py
eos/saveddata/fleet.py
eos/types.py
eve.db
gui/builtinContextMenus/amount.py
gui/builtinViewColumns/ammo.py
gui/builtinViewColumns/ammoIcon.py
gui/builtinViewColumns/capacitorUse.py
service/port.py
2017-02-07 19:22:26 -05:00
Ebag333
3c31391ec9
Burn types with fire
2017-01-09 22:36:19 -08:00
blitzman
a954759012
GUI implementation of alpha clone switching
2016-12-11 22:51:48 -05:00
blitzman
90c1033437
add clone grades to the client extraction list
2016-12-11 20:27:27 -05:00
blitzman
191a065de1
Get skill limits working
2016-12-11 20:26:30 -05:00
Ebag333
870e333605
Rebase from pyfa.org/master
...
# Conflicts:
# eos/effects/boosterarmorhppenalty.py
# eos/effects/boosterarmorrepairamountpenalty.py
# eos/effects/boostercapacitorcapacitypenalty.py
# eos/effects/boostermaxvelocitypenalty.py
# eos/effects/boostermissileexplosioncloudpenaltyfixed.py
# eos/effects/boostermissileexplosionvelocitypenalty.py
# eos/effects/boostermissilevelocitypenalty.py
# eos/effects/boostershieldcapacitypenalty.py
# eos/effects/boosterturretfalloffpenalty.py
# eos/effects/boosterturretoptimalrangepenalty.py
# eos/effects/boosterturrettrackingpenalty.py
# eos/saveddata/character.py
# eos/saveddata/drone.py
# eos/saveddata/fighter.py
# eos/saveddata/mode.py
# eos/saveddata/module.py
2016-11-21 22:21:25 -08:00
Ebag333
3aa60ac669
Make Effects Togglable
2016-11-21 22:02:16 -08:00
Ebag333
a3dfa3b5ba
Make Effects Togglable
2016-11-09 00:46:19 -08:00
Ebag333
ad76104033
Revert "Create variables before they are referenced. "
...
1dc15936ed
This is a problem for us. See #794 for more details.
2016-11-04 14:18:18 -07:00
Ebag333
0c0eb327f7
lots of PEP8 cleanup
2016-10-19 12:25:31 -07:00
Ebag333
1dc15936ed
Create variables before they are referenced.
...
Resolves attribute reference validation errors in pyCharm
2016-10-19 12:08:35 -07:00
Ebag333
f9f53a13c0
Reformatting eos.saveddata
2016-10-19 11:42:45 -07:00
Ebag333
c1dfd676e1
Simplified boolean check
2016-10-19 08:08:50 -07:00
blitzmann
10c79ac812
More work on restrictions
2016-07-04 11:01:08 -04:00
blitzmann
fe8c3a4957
Disable fit add on pages based on context (ship vs citadel)
2016-07-04 10:30:04 -04:00
blitzmann
fb2e6e5c17
Restrict skills being applied to citadels. The effect must be of type "structure" for it to apply. Fix issue with agility
2016-07-03 14:52:00 -04:00
blitzmann
4607dd788c
Implement ewar resists ( #597 )
2016-05-22 15:15:21 -04:00
blitzmann
fe9139ae93
Fix issue with adding multiples of the same skill to character via character import ( #563 )
2016-04-29 23:32:22 -04:00
blitzmann
a3d9d5cca8
Migrate character editor to use new entity editor.
2016-03-29 21:19:20 -04:00
blitzmann
65483309ab
Clear character implants during recalculation
2016-03-22 23:17:05 -04:00
blitzmann
938e2a871d
Merge branch 'master' into charImplants
...
Conflicts:
gui/characterEditor.py
2015-11-08 21:19:04 -05:00
blitzmann
f17fb82ce7
Fix issue with ship bonuses not applying when fit is projected ( #374 )
2015-10-05 18:10:39 -04:00
blitzmann
d0ec17feba
Some syntax
2015-09-25 14:13:33 -04:00
blitzmann
05b9d1e607
Fixed some bugs, added character action buttons on editor
2015-09-25 12:13:17 -04:00
blitzmann
2a88e3114b
Skill color goes back to normal when saving/reverting skill.
2015-09-25 11:15:08 -04:00