Commit Graph

1966 Commits

Author SHA1 Message Date
Ebag333
3aa60ac669 Make Effects Togglable 2016-11-21 22:02:16 -08:00
blitzman
8605bab4d4 Fix effects running when they shouldn't 2016-11-21 21:59:44 -05:00
Ebag333
1540c9463a Added unused attributes 2016-11-21 13:10:59 -08:00
Ebag333
130105ca9f Fixed attribute, removed duplicate 2016-11-21 12:53:57 -08:00
blitzman
cb225eabb3 Get a working migration for command fits. 2016-11-20 22:06:26 -05:00
blitzman
72245d8ebe Fix bad merge 2016-11-20 21:53:49 -05:00
Ebag333
96505e4421 Industrial core for Rorq 2016-11-20 18:37:12 -08:00
blitzman
fbb1750528 Merge branch 'master' into singularity
Conflicts:
	eos/db/saveddata/fit.py
	gui/additionsPane.py
2016-11-20 20:52:23 -05:00
blitzman
883917d5d6 Add missing effects 2016-11-20 19:17:40 -05:00
blitzman
deeccc85a3 Fix command boosts (attributes renamed) 2016-11-20 19:08:23 -05:00
blitzman
e6dfb1e90a Update some effects and headers 2016-11-20 16:04:32 -05:00
blitzman
e03d3278a0 Update effect headers 2016-11-20 15:37:55 -05:00
blitzman
eae4bb75e5 more fixes 2016-11-20 15:37:12 -05:00
blitzman
59b854b00d Fix some effects 2016-11-20 15:25:27 -05:00
blitzman
7751a2e072 Merge branch 'AscendencyPatch' of https://github.com/Ebag333/Pyfa into Ebag333-AscendencyPatch 2016-11-20 14:44:53 -05:00
blitzman
b4bbc82ba1 Merge branch 'master' into singularity
Conflicts:
	eos/db/saveddata/fit.py
	eos/effects/armoredwarfaremindlink.py
	eos/effects/elitebonuscommanddestroyerarmored1.py
	eos/effects/elitebonuscommanddestroyerinfo1.py
	eos/effects/elitebonuscommanddestroyerinfohidden1.py
	eos/effects/elitebonuscommanddestroyersiege1.py
	eos/effects/elitebonuscommanddestroyerskirmish1.py
	eos/effects/elitebonuscommandshiparmoredcs3.py
	eos/effects/elitebonuscommandshipinformationcs3.py
	eos/effects/elitebonuscommandshipinformationhiddencs3.py
	eos/effects/elitebonuscommandshipsiegecs3.py
	eos/effects/elitebonuscommandshipskirmishcs3.py
	eos/effects/miningforemanmindlink.py
	eos/effects/shipbonuscarriera4warfarelinksbonus.py
	eos/effects/shipbonuscarrierc4warfarelinksbonus.py
	eos/effects/shipbonuscarrierg4warfarelinksbonus.py
	eos/effects/shipbonuscarrierm4warfarelinksbonus.py
	eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
	eos/effects/shipbonusforceauxiliaryc4warfarelinksbonus.py
	eos/effects/shipbonusforceauxiliaryg4warfarelinksbonus.py
	eos/effects/shipbonusforceauxiliarym4warfarelinksbonus.py
	eos/effects/shipbonussupercarriera5warfarelinksbonus.py
	eos/effects/shipbonussupercarrierc5warfarelinksbonus.py
	eos/effects/shipbonussupercarrierg5warfarelinksbonus.py
	eos/effects/shipbonussupercarrierm5warfarelinksbonus.py
	eos/effects/subsystembonusamarrdefensivearmoredwarfare.py
	eos/effects/subsystembonusamarrdefensiveinformationwarfare.py
	eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
	eos/effects/subsystembonusamarrdefensiveskirmishwarfare.py
	eos/effects/subsystembonuscaldaridefensiveinformationwarfare.py
	eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
	eos/effects/subsystembonuscaldaridefensivesiegewarfare.py
	eos/effects/subsystembonuscaldaridefensiveskirmishwarfare.py
	eos/effects/subsystembonusgallentedefensivearmoredwarfare.py
	eos/effects/subsystembonusgallentedefensiveinformationwarfare.py
	eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
	eos/effects/subsystembonusgallentedefensiveskirmishwarfare.py
	eos/effects/subsystembonusminmatardefensivearmoredwarfare.py
	eos/effects/subsystembonusminmatardefensivesiegewarfare.py
	eos/effects/subsystembonusminmatardefensiveskirmishwarfare.py
	eos/saveddata/fit.py
	eos/saveddata/module.py
	gui/shipBrowser.py
	scripts/prep_data.py
	service/fit.py
2016-11-20 14:42:19 -05:00
Resin Neublem
78cbed516a Adds a new notes pane for each fit
This allows users to save text notes for each fit. They may do this for history, or usage, etc.
2016-11-20 14:11:42 -05:00
blitzman
2281fae615 Merge branch 'EosCodeCleanup-V2' of https://github.com/Ebag333/Pyfa into Ebag333-EosCodeCleanup-V2
Conflicts:
	eos/effects/mininginfomultiplier.py
2016-11-20 13:59:14 -05:00
blitzman
62a696cc4b Only apply command boosts when command module is active, and add t2 command burst effect 2016-11-20 13:21:59 -05:00
blitzman
11716f7f94 Add command processor effect 2016-11-20 03:22:28 -05:00
blitzman
180166156a Revert mining change (#771) 2016-11-20 02:51:15 -05:00
blitzman
3c8bab92b5 Add some missing effects 2016-11-20 02:17:57 -05:00
Ryan Holmes
cf361593a4 Merge pull request #771 from Ebag333/MiningCrystalBonus
Applied Mining Crystal Bonus to modules
2016-11-20 02:00:02 -05:00
blitzman
8ad639a122 Add titan command effects 2016-11-20 01:54:45 -05:00
blitzman
a7cd445cef Add Mining Burst effects 2016-11-20 01:33:22 -05:00
blitzman
380d74b333 Fix issue with gangboost not recalculating. We really should ensure that a command fit that has been calcuated does not need ot recalculate unless it's changed / is needed. But that's for a different time. 2016-11-20 01:14:40 -05:00
blitzman
eade4f0ebd Add the four main combat boost module effects 2016-11-20 00:59:07 -05:00
blitzman
08be50caf2 More work on command boosts 2016-11-19 23:53:49 -05:00
Ebag333
6a5c86b84f Should be all the Rorq and Orca effects. 2016-11-19 18:51:59 -08:00
Ebag333
1fb5bbc36e Effects used by Orca
first pass
2016-11-18 20:53:57 -08:00
Ryan Holmes
29b5a7433d Trying to flesh out how command boosts are gonna work. 2016-11-16 09:54:02 -05:00
Indiction
04c30e70af Fighters for export and import functions 2016-11-10 23:28:21 +01:00
Ebag333
fe9917e620 Updated docstring with more information 2016-11-09 07:21:27 -08:00
Ebag333
a3dfa3b5ba Make Effects Togglable 2016-11-09 00:46:19 -08:00
blitzmann
34243b7b71 Get a working UI skeleton going for assigning boost fits 2016-11-08 19:36:57 -05:00
Ebag333
7fe7056c12 Drop unicode 2016-11-07 12:18:36 -08:00
Ebag333
ab32a3afb0 Change to shorthand unicode 2016-11-07 12:09:20 -08:00
Ebag333
ea3e5e273f Handle Lockbreaker, Void, and Focused Void Bombs 2016-11-07 10:27:51 -08:00
Ebag333
b6c5183d40 Removed actual fleet files. Cleaned up __init__.py that had references. 2016-11-06 16:38:21 -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
832e7e6637 Revert moving projectionInfo out
Need to handle this better. :/
2016-11-03 22:15:40 -07:00
Ebag333
e7c79e58b4 Use in instead of or, because that makes sense 2016-10-26 10:09:43 -07:00
Ebag333
0dbdbf7cfe Add Burst Jammer to effects modified by Scorpion hull bonus 2016-10-26 08:42:49 -07:00
blitzman
cfee6fdcd0 Add effects for command mindlinks 2016-10-23 03:02:47 -04:00
blitzman
34c95bea5d Apply command burst skills to the bursts and charges. Handle renamed items. 2016-10-23 02:34:29 -04:00
blitzman
50911c7fc8 test 2016-10-22 00:02:12 -04:00
blitzman
6637feb3a6 Update to sisi 1086428 2016-10-20 00:43:45 -04:00
Ebag333
928246a8ca Even more PEP8 fixes!
Also, create a variable so we can't reference it and have it not exist.
Because that would be bad.
2016-10-19 14:26:46 -07:00
Ebag333
fd3e0bbebf Formatting and spacing 2016-10-19 14:14:34 -07:00
Ebag333
2a0a572b76 PEP8 formatting! \o/ 2016-10-19 14:03:31 -07:00