dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity
4,421 Commits 3 Branches 6 Tags
3d9dae0d529aea50d44eac51150b96889abfbce9
Commit Graph

280 Commits

Author SHA1 Message Date
blitzman
ee0c852ddb Fix titan effects and issue in which all warefarebuffs may not get run (range too short). This should also shore up (#897) 2016-12-16 20:17:20 -05:00
blitzman
d63627a37b More cleanup 2016-12-16 19:26:54 -05:00
blitzman
3ac2fd870f clean up 2016-12-16 19:20:30 -05:00
blitzman
8ab6e26def Start refactoring the command burst effects in a way that's not complete and total shit (only slightly shit) 2016-12-13 23:55:56 -05:00
blitzman
7875c2acaa Fix titan command effects 2016-12-12 00:24:50 -05:00
Stefan Dresselhaus
0ba88d081a wrong index in tuple. 
Array looks normally so:

(RunTime, Value, etc., etc.)
("normal", -10, ..., ...)

I guess "RunTime" got added and this is an artifact as it is rarely
called.

Fixes Orca-Mining-Boost onto itself and other ships.
 2016-12-11 21:56:17 +01:00
Ryan Holmes
828d722be8 Merge pull request #807 from IndictionEve/ImportExportFighters 
Fighters for export and import functions
 2016-12-10 02:09:45 -05:00
blitzman
907196018b Fixed a few issues with command bursts 2016-12-09 00:07:35 -05:00
blitzman
0e4e7525e1 Add runtimes to command effects (defaulting to normal) 2016-11-29 23:18:35 -05:00
blitzman
5259df2828 Quick hack to run command boosts inside the runtime. See #839 2016-11-29 22:58:33 -05:00
Ryan Holmes
8d4e0a259e Fix for #833 2016-11-22 15:35:04 -05:00
Ryan Holmes
91f87b02cc Merge branch 'EffectTest' of https://github.com/Ebag333/Pyfa into Ebag333-EffectTest 
Conflicts:
	eos/saveddata/fit.py
	eos/saveddata/module.py
 2016-11-22 12:34:10 -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
blitzman
8605bab4d4 Fix effects running when they shouldn't 2016-11-21 21:59:44 -05: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
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
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
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
08be50caf2 More work on command boosts 2016-11-19 23:53:49 -05: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
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
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
44c76f0b98 Even more PEP8 cleanup 2016-10-19 12:29:33 -07:00
Ebag333
69a122a271 more PEP8 cleanup 2016-10-19 12:26:03 -07:00
Ebag333
0c0eb327f7 lots of PEP8 cleanup 2016-10-19 12:25:31 -07:00
Ebag333
74ce79ba8f Add inspection exception to ignore reassignment of self 2016-10-19 12:11:30 -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
2ac66d87af commented out reload as not used 2016-10-19 10:54:59 -07:00
Ebag333
e818ce62c8 Removed line from legacy implementation 2016-10-19 10:54:47 -07:00
Ebag333
a8061c9276 Remove unnecessary backslash 
and a bit of reformatting
 2016-10-19 08:58:19 -07:00
Ebag333
4036ac8cd2 Move projectionInfo so it can't be referenced without being assigned 2016-10-19 08:53:11 -07:00
Ebag333
57bbbfcc3b Convert triple single quote docstring to triple double quote docstring 
For better consistency
 2016-10-19 08:39:12 -07:00
Ebag333
68f769aac2 Remove redundent parentheses 2016-10-19 08:37:07 -07:00
Ebag333
32068e8d8e Create set directly 2016-10-19 08:22:45 -07:00
Ebag333
ccd8ee87f3 Create dictionary directly 2016-10-19 08:18:47 -07:00
Ebag333
c73b446482 Comparison with None performed iwth equality operators 2016-10-19 08:17:34 -07:00
Ebag333
699276ca58 Add __init__ to classes missing it 
Mostly just to shut pyCharm up, but it's good practice.
 2016-10-19 08:15:36 -07:00
Ebag333
3187bab90a Simplified Chained Comparison 2016-10-19 08:11:20 -07:00
Ebag333
c1dfd676e1 Simplified boolean check 2016-10-19 08:08:50 -07:00
Ebag333
c7554ec400 Removed reassigned var 
i was already declared by the parent loop, removed reassignment
 2016-10-19 08:06:39 -07:00
blitzman
d43db40469 Fix running mining effect for every active drone in the stack 2016-10-17 00:14:06 -04:00
Ryan Holmes
7331c158b6 Merge pull request #756 from MrNukealizer/FighterFixes 
Fixed a few fighter/carrier bugs:
 2016-10-08 23:07:01 -04:00
Mr. Nukealizer
30755fbb73 Made fighter DPS calculations more accurate when factoring in reload time. 2016-09-30 23:44:12 -07:00
Mr. Nukealizer
c1b3491933 Fixed superiority fighter attack and added Evasive Maneuvers ability. 2016-09-30 21:40:10 -07:00