Commit Graph

535 Commits

Author SHA1 Message Date
blitzmann
b57bede510 tox fixes 2018-07-15 02:51:53 -04:00
MaruMaruOO
d5aee34aa8 Added missing data to fit copying 2018-07-12 07:35:14 -04:00
Ryan Holmes
8383a645da Merge pull request #1652 from WatchMeCalculate/Issue-1621
Address Issue where evemon xml was not being imported
2018-07-09 22:16:07 -04:00
blitzmann
39f7ecdf5c Merge branch 'mutaplasmids'
# Conflicts:
#	eve.db
2018-06-21 00:22:57 -04:00
WatchMeCalculate
99f14746e4 Removed return and re-added apiUpdateCharSheet function 2018-06-19 00:16:32 -07:00
blitzmann
8f16fc5c1e Merge branch 'master' into mutaplasmids
# Conflicts:
#	eve.db
2018-06-17 12:52:49 -04:00
blitzmann
8bf9a9881f Add some invalidation logic to module for Abyysal modules without base or mutaplasmid 2018-06-17 12:23:05 -04:00
blitzmann
8f5060cc3e Fix some issues capping at a certain range (#1651) 2018-06-17 12:10:33 -04:00
blitzmann
b7458396ac Fix some rounding issues (#1651) 2018-06-17 01:48:51 -04:00
blitzmann
710739696a Incorporate mutaplasmids within module copy 2018-06-16 23:25:27 -04:00
blitzmann
3462252ecc Automatically check on character load that the character at least has all skills in the database for it (#1645) 2018-06-14 22:53:16 -04:00
blitzmann
5a085b6e27 Automatically check on character load that the character at least has all skills in the database for it (#1645) 2018-06-14 22:52:33 -04:00
blitzmann
6fdcce12a3 Merge branch 'icons-1621' into v2.2.0b1
# Conflicts:
#	eos/db/__init__.py
#	eos/db/gamedata/__init__.py
#	eos/db/gamedata/item.py
#	eos/gamedata.py
#	eve.db
2018-06-12 21:43:28 -04:00
blitzmann
e19d231eba Merge branch 'master' into v2.2.0b1
# Conflicts:
#	eve.db
2018-06-12 21:41:04 -04:00
blitzmann
3ebfe045c5 Catch a rare error with mutators that are kinda orphaned (not via module, but the mod doesn't have base or mutaplasmid) 2018-06-12 21:15:31 -04:00
blitzmann
75230a78a6 Do not explicitly add the mutator to the module. Setting the Mutator.module property is sufficient, and prevents from a duplicate one from being added with a None key. 2018-06-12 20:57:06 -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
f8b5adb31d Determine validity via mod, not value (prevents weirdness with negatives) 2018-06-10 01:30:05 -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
Ryan Holmes
0b45438981 Merge pull request #1626 from WatchMeCalculate/Issue-#1519
Issue #1519, on fitting restriction toggle, accurately keep valid modules
2018-06-05 20:26:16 -04:00
DarkPhoenix
d48f9354ec Update database (vedmak fitting changes) and do relevant string updates
Also change jsontosql script to ignore fsdtypeoverrides which is no longer dumpable by phobos
2018-06-05 20:02:00 +03:00
blitzmann
b3acc8fd21 Get a slider interface going for the items stats. Starting to come together! 2018-06-04 02:21:52 -04:00
blitzmann
3670f3289c Convert a module to an abyssal with a mutaplasmid - saving to and loading from database confirmed. 2018-06-03 19:50:50 -04:00
blitzmann
20f57146c4 Merge branch 'master' into mutaplasmids
# Conflicts:
#	eve.db
2018-06-03 16:31:20 -04:00
WatchMeCalculate
a5b5cec919 Fixed flake8 issues 2018-06-01 13:08:25 -07:00
WatchMeCalculate
cc586f6532 For modules with maxfitting, ensure on validity count, don't count itself 2018-06-01 02:18:03 -07:00
WatchMeCalculate
02103b6d2e Refactor checking if Hardpoints has free spots into a function fit can use 2018-06-01 02:16:29 -07:00
blitzmann
8bb3cbb25e More icon fixes 2018-05-31 21:20:47 -04:00
blitzmann
e8efa22a95 Merge branch 'singularity' 2018-05-30 19:49:40 -04:00
WatchMeCalculate
da85c66089 Make sure to clear dirty skills when clearing all skills 2018-05-28 13:33:19 -07:00
blitzmann
3944545721 Support for Abyssal module loading base item attributes 2018-05-27 14:58:14 -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
1c359fb6ed tox 2018-05-20 15:58:25 -04:00
blitzmann
7ac4b52d20 Do all localization effects 2018-05-20 15:05:41 -04:00
blitzmann
d110dd4c76 Implement xeon gas and electric store weather effects 2018-05-20 14:33:37 -04:00
blitzmann
a5b959fbf8 Implement caustic and darkness weather 2018-05-20 14:22:58 -04:00
blitzmann
afd16e1afd Add new warfareBuffID, and fix issue with going to effect file in debug 2018-05-20 14:10:37 -04:00
blitzmann
bc23417eae Start working on Abysmal space environment effects. The values produced for the infernal weather (calm firestorm) thermic resist penalties are spot on according to my testing. :D 2018-05-20 12:53:33 -04:00
blitzmann
891c20eea7 Merge branch 'master' into singularity 2018-05-20 00:22:24 -04:00
blitzmann
cb509a832e Add number of slots in the rack heading (#1535) 2018-05-19 17:55:17 -04:00
blitzmann
eeb700c75d Get back into tox's good graces 2018-05-15 01:41:32 -04:00
blitzmann
deecfb31dc Merge tag 'v2.0.1' into singularity (bring sisi code up to date with pyfa 2 / py3 / wx4)
# Conflicts:
#	eos/effects/techtwocommandburstbonus.py
2018-05-15 01:17:51 -04:00
blitzmann
5cc6b6c69c Move over all esi stuff to it's own class, which the esi service extends from. Also fix an issue in the EVE fittings browser where deleting a fit didn't actually remove it from the list of fits (due to that list being populated by the return data of ESI, which can be cached). More clean up. 2018-05-12 13:57:14 -04:00
blitzmann
0365f71c00 Move over ESI functionality to be completely separate from esipy 2018-05-12 12:25:34 -04:00
blitzmann
0e0bc9dfd2 Remove some references to old api stuff (#1547) 2018-05-08 21:06:32 -04:00
blitzmann
c99afa79e1 Merge branch 'test-3' 2018-05-07 21:54:51 -04:00
DarkPhoenix
a8b1f38e84 Update database and implement ship effects, also make pyfa to show final damage value for disintegrators after ramp-up time is complete
(if you don't want me to commit here just write phoenix@mail.ru, i have no way to communicate with you otherwise)
2018-04-24 19:13:30 +03:00
Neugeniko
363904411d Projected Logistic Drones don't have a cap use or rawCycleTime.
Only call the logic for the appropriate module groups.
2018-04-04 16:55:05 +10:00
blitzmann
a3e411f225 Merge tag 'v2.0.0b5' into esi
# Conflicts:
#	eos/saveddata/character.py
2018-03-25 19:21:32 -04:00
blitzmann
03212be54a Merge branch 'master' into test-3
# Conflicts:
#	eos/capSim.py
#	eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
#	eos/effects/warpdisruptsphere.py
2018-03-25 03:03:59 -04:00