blitzman
|
85131e6166
|
oh god this isn't gonna work
Merge branch 'ebag_importchanges' into test_import
Conflicts:
config.py
eos/db/saveddata/queries.py
eos/effects/chargebonuswarfarecharge.py
eos/effects/elitebonuscommandshipinformationhiddencs3.py
eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py
eos/effects/energydestabilizationnew.py
eos/effects/iceharvestingdroneoperationdurationbonus.py
eos/effects/miningforemanstrengthbonus.py
eos/effects/modulebonuswarfarelinkarmor.py
eos/effects/modulebonuswarfarelinkinfo.py
eos/effects/modulebonuswarfarelinkmining.py
eos/effects/modulebonuswarfarelinkshield.py
eos/effects/modulebonuswarfarelinkskirmish.py
eos/effects/moduletitaneffectgenerator.py
eos/effects/remotehullrepair.py
eos/effects/rolebonusremotearmorrepairoptimalfalloff.py
eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
eos/effects/shipmodesmallmissiledamagepostdiv.py
eos/effects/structureenergyneutralizerfalloff.py
eos/effects/structuremoduleeffectstasiswebifier.py
eos/effects/structurerigmaxtargets.py
eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
eos/effects/techtwocommandburstbonus.py
eos/saveddata/fighter.py
eos/saveddata/fit.py
eos/saveddata/module.py
eve.db
gui/bitmapLoader.py
gui/builtinContextMenus/itemStats.py
gui/builtinStatsViews/miningyieldViewFull.py
gui/builtinViewColumns/misc.py
gui/builtinViews/__init__.py
gui/builtinViews/fittingView.py
gui/contextMenu.py
gui/graphFrame.py
gui/itemStats.py
gui/mainFrame.py
gui/marketBrowser.py
service/__init__.py
service/character.py
service/fit.py
service/port.py
service/prefetch.py
service/pycrest/eve.py
service/settings.py
|
2017-01-23 21:06:12 -05:00 |
|
blitzman
|
ebc7173c50
|
Fix issues with unexpected module positions (see #932)
|
2017-01-04 23:48:37 -05:00 |
|
Ebag333
|
658a87cbc0
|
Single line change to fix most (all??) of the problems
|
2016-12-15 12:10:03 -08:00 |
|
Ebag333
|
956fa7a8b7
|
Fixing some issues due to import cleanup
|
2016-12-14 13:06:13 -08:00 |
|
blitzman
|
200ff5a1a4
|
Fix titan command effects
(cherry picked from commit 7875c2a)
|
2016-12-14 12:26:08 -08:00 |
|
Ebag333
|
28404cd8bb
|
bajillion pep8 fixes to pass tox
|
2016-12-13 23:31:39 -08:00 |
|
Ebag333
|
1e5e9122ae
|
Change gate to handle missiles with 0 values
|
2016-12-13 14:09:56 -08:00 |
|
blitzman
|
7875c2acaa
|
Fix titan command effects
|
2016-12-12 00:24:50 -05:00 |
|
Ebag333
|
510492e5e9
|
More refactoring, elimited another recursive import
|
2016-12-03 17:12:16 -08: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
|
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
|
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 |
|
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
|
08be50caf2
|
More work on command boosts
|
2016-11-19 23:53:49 -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
|
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
|
a8061c9276
|
Remove unnecessary backslash
and a bit of reformatting
|
2016-10-19 08:58:19 -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
|
32068e8d8e
|
Create set directly
|
2016-10-19 08:22:45 -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
|
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 |
|
blitzmann
|
6e2878194c
|
Merge branch 'master' into citadel
Conflicts:
config.py
service/market.py
|
2016-07-03 01:10:26 -04:00 |
|
blitzmann
|
3e1c561752
|
Implement reload time in fighter dps logic (#627)
|
2016-06-12 14:15:25 -04:00 |
|
blitzmann
|
62fd545d24
|
Restrict citadels to only use citadel modules. Rename Ships tab to Fittings as it no longer just carries ships :(. Fix crash on item stats.
|
2016-05-15 23:18:39 -04:00 |
|
blitzmann
|
4041ecddc4
|
Create Citadel class that inherits from Ship. Add Service slots
|
2016-05-15 22:23:23 -04:00 |
|
blitzmann
|
7cf0a35a7a
|
Add citadel fittings to market browser, and get rid of some initial errors
|
2016-05-15 18:58:47 -04:00 |
|
blitzmann
|
ffebd3f311
|
Fix charges for small ancillary shield boosters (#581)
|
2016-05-01 14:15:44 -04:00 |
|
blitzmann
|
4704c5a1b0
|
Limit fighters to fit's available slots. We hijack the module slot bit to do the dirty work >_>
|
2016-04-25 23:45:01 -04:00 |
|
blitzmann
|
0cfa7cb28f
|
Ensure we get all ship group and ship type restrictions
|
2016-04-03 16:51:01 -04:00 |
|
blitzmann
|
6c8efcda12
|
Fix traceback when ship is missing launcher / turret attribute (#539)
|
2016-03-18 23:31:19 -04:00 |
|
blitzmann
|
38cc13ff2c
|
Update to 1015913
|
2016-03-05 21:37:12 -05:00 |
|
blitzmann
|
bdf793072c
|
Fix for t2 cloaks on prospect
|
2016-01-12 17:38:00 -05:00 |
|
blitzmann
|
9029c04ce6
|
Merge branch 'master' into singularity
|
2015-11-27 22:45:28 -05:00 |
|
blitzmann
|
c7c0c49218
|
Fix #434
|
2015-11-27 20:12:02 -05:00 |
|
blitzmann
|
350f4c9f89
|
Add new effects. This commit uses a new helper script that automatically writes the effect file for the more straightforward effects.
|
2015-11-27 01:14:59 -05:00 |
|
blitzmann
|
9c9a6b69fe
|
Revert "Add new nos/neut effect files, and change module/drone files to account for new attributes. This does not add the database"
This reverts commit 7dbe6dbe2d.
|
2015-11-27 00:07:24 -05:00 |
|
blitzmann
|
7dbe6dbe2d
|
Add new nos/neut effect files, and change module/drone files to account for new attributes. This does not add the database
|
2015-11-22 23:03:46 -05:00 |
|
blitzmann
|
4eb61051c6
|
Add overrides to the modifiedAttributeDict. Still need to figure out how to switch between the original and the override
|
2015-11-01 12:04:02 -05:00 |
|
blitzmann
|
a67b46bb9a
|
Fix some mining effects
|
2015-10-05 20:37:41 -04:00 |
|
blitzmann
|
a08bb2494b
|
Fix system effect states
|
2015-09-22 21:45:32 -04:00 |
|
blitzmann
|
d6199a58c2
|
Separate projected fits from list of affectors. Also, show when affected module is projected. Still need to clean up affector tree stuff
|
2015-07-16 23:59:37 -04:00 |
|
blitzmann
|
7959593c6c
|
Improve object initialization and add support for logging the errors.
|
2015-07-05 00:31:52 -04:00 |
|
blitzmann
|
5991d19b3e
|
Allow Subsystems as modules.
|
2015-07-04 00:32:28 -04:00 |
|
blitzmann
|
bcc77f11cd
|
Handle invalid projected drones
|
2015-07-01 14:50:08 -04:00 |
|
blitzmann
|
1c18a5207c
|
System Effects are wrapped in Module class, even though they are not modules. Account for this.
|
2015-07-01 13:32:31 -04:00 |
|