Commit Graph

73 Commits

Author SHA1 Message Date
DarkPhoenix
e796b748b6 Make sure dromis can be resisted 2019-07-08 16:37:43 +03:00
DarkPhoenix
a74984d37b Get resistance info of temporarily applied mods and use it during attr calculation 2019-07-08 11:42:04 +03:00
DarkPhoenix
e342f96fbe Move resistance attribute ID getter to separate function 2019-07-08 10:58:01 +03:00
DarkPhoenix
e262aa7daa Move resistance calculation to multiplication method 2019-07-08 10:27:06 +03:00
DarkPhoenix
04a74e278b Plug webs/TPs into calculation process 2019-07-08 00:29:23 +03:00
DarkPhoenix
6786cc7eff Expose boost/multiplier data to calculation method 2019-07-07 21:39:36 +03:00
DarkPhoenix
6ce72e4fb3 Add methods which will be used to access temporarily modified values 2019-07-07 19:48:50 +03:00
DarkPhoenix
5b74c6c5e1 Update graph info when fit name changes 2019-07-07 02:33:54 +03:00
DarkPhoenix
b121085271 Unfuck EFT import 2019-05-02 04:34:49 +03:00
DarkPhoenix
7b8d9f8dbe Round fitting resource attributes properly 2019-04-30 18:51:01 +03:00
DarkPhoenix
7aa73e4b2f Fix issue with putting ID instead of name into capping key 2019-04-30 18:48:53 +03:00
DarkPhoenix
400bb10ed3 Ensure that owner fit is always visible from all fit items and their modified attribute map
Fixes some issues with some afflictions not shown/registered when fit has just been loaded
2019-04-17 15:35:15 +03:00
DarkPhoenix
6a2bdade80 Fix attr tab original value column fetching module attributes for charges 2019-03-29 01:09:52 +03:00
DarkPhoenix
cbd1a34c68 Round cpu/pg like EVE does
To work around some fits where pyfa shows that items do not fit when they actually do
2019-02-13 13:14:18 +03:00
blitzmann
31c3101d6d Remove redundant parenthesis 2018-09-16 01:11:16 -04:00
blitzmann
5850026aa9 docstring fixes 2018-09-16 01:09:55 -04:00
blitzmann
b57bede510 tox fixes 2018-07-15 02:51:53 -04:00
blitzmann
994521f654 Move some functionality tot he mutator object, and clean some stuff up 2018-06-11 23:09:21 -04:00
blitzmann
e8b56b076b Instantiate mutators when a mutated module is created / loaded from DB. Some bug fixes for a few things. 2018-06-10 01:10:53 -04:00
blitzmann
fabf759aa7 Start implementing support for mutaplasmids.
* There's a new table `mutators` that has an FK back to a module, and links to an attribute ID with it's new value
* Fixes an issue in the item state where the "base" value showed the literal base value for the attribute, regardless of override / mutators
* If there is an override and a mutated attribute, mutated value takes effect
2018-05-24 01:26:49 -04: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
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
de35692666 Fix a few things with affected by tab (indentation issue, overwriting modifier incorrectly) 2017-07-09 13:18:28 -04:00
Ryan Holmes
828b18d0fd py2to3 automatic conversion. Woot! 2017-06-12 16:12:45 -04:00
blitzmann
0507a55731 Get resists working with more things, and fix bug in which we were still looking at an effect info (which doesn't exist anymore) 2017-05-07 19:59:25 -04:00
blitzmann
622efb624d Refactor how remote resistance works. We now check the resistance ID directly from the effect, and fall back to the remoteResistanceID attribute. See #1139 2017-05-02 22:19:58 -04:00
blitzmann
50965244c0 Merge branch 'bug/1139' into bug/resist-effects 2017-05-02 20:41:54 -04:00
blitzmann
1cf844d415 item.attributes would not contain attributes that were added during runtime. Instead, get the attribute info and search the modified attributes for the resist attribtue. 2017-04-30 01:39:03 -04:00
Ebag333
9d34c2a2e6 Add TODO 2017-03-13 11:52:18 -07:00
Ebag333
4f12caa05f Remove test variable 2017-03-13 11:30:07 -07:00
Ebag333
649ba71c0f Make sure overrides are enabled before we return override values 2017-03-13 11:15:14 -07:00
Ebag333
af5a9b31bc Fix another hidden import (move to top) 2017-03-13 11:09:12 -07:00
Ebag333
b72304203c Add default option to getOriginal. This eliminates some double lookups and simplifies the code. 2017-03-13 10:56:33 -07:00
Ebag333
f70d250995 Cleanup code. Use slightly faster comparison (is instead of isinstance). Rename OVERRIDES variable to eliminate confusion. 2017-03-13 10:11:15 -07:00
Ebag333
46626e9a63 Kill another double lookup 2017-03-09 15:31:19 -08:00
Ebag333
b5626c13b1 Refactor __calculateValue 2017-03-09 15:16:52 -08:00
Ebag333
84de420002 Remove comment 2017-03-09 12:27:45 -08:00
Ebag333
99f939026f Refactor some logic in modifiedAttributeDict 2017-03-09 12:14:23 -08:00
Ebag333
8322307ae0 Add tooltip for neut resist. Add handling missing attributes in getting modified value (return default, not exception). Tox fixes to clean up a little. 2017-03-07 09:45:34 -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
9a137bb158 Convert old style classes to new 2017-02-08 23:06:39 -08:00
blitzman
8a9d2a032e Revert the try... except, see #960 2017-02-08 00:00:16 -05:00
Ebag333
1ebd54b282 Wrap getting attribute data in a try/except
Useful for when we try to get an sub-attribute on an object where the
attribute doesn't exist. Now returns the default value.
2017-01-29 00:27:45 -08:00
Ebag333
1a0ac7bb35 Allow default values to be passed in for modified attributes 2017-01-29 00:16:15 -08:00
Ebag333
28404cd8bb bajillion pep8 fixes to pass tox 2016-12-13 23:31:39 -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
44c76f0b98 Even more PEP8 cleanup 2016-10-19 12:29:33 -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