Commit Graph

2430 Commits

Author SHA1 Message Date
blitzman
7fbd89392a Revert "Remove effect files that are not used by any item"
This reverts commit b29fa2467a.

(cherry picked from commit 4a95156)
2016-12-14 12:14:39 -08:00
Ebag333
7532bcda08 Clean up some stuff left over from cherry picks 2016-12-14 10:42:04 -08:00
Indiction
38bf143704 Fighters for export and import functions
(cherry picked from commit 04c30e7)
2016-12-14 10:24:45 -08:00
Ebag333
a440ed3b37 Drop unicode
(cherry picked from commit 7fe7056)
2016-12-14 10:20:57 -08:00
Ebag333
39b7d9fdeb Change to shorthand unicode
(cherry picked from commit ab32a3a)
2016-12-14 10:20:53 -08:00
Ebag333
dfa728a486 Handle Lockbreaker, Void, and Focused Void Bombs
(cherry picked from commit ea3e5e2)
2016-12-14 10:20:48 -08:00
Ebag333
7bd8ca5a55 Removed actual fleet files. Cleaned up __init__.py that had references.
(cherry picked from commit b6c5183)
2016-12-14 10:20:20 -08:00
Ebag333
627977ab51 Purging fleet bonuses from code base
(cherry picked from commit 68f4570)
2016-12-14 10:18:19 -08:00
Ebag333
28404cd8bb bajillion pep8 fixes to pass tox 2016-12-13 23:31:39 -08: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
Ebag333
57f930c83e Cherry pick commits from @a-tal 2016-12-13 20:35:03 -08:00
Ebag333
cd7d25e4e1 Add skill bonus 2016-12-13 14:28:43 -08:00
Ebag333
1e5e9122ae Change gate to handle missiles with 0 values 2016-12-13 14:09:56 -08:00
Ebag333
506c7d31ca Update DB. Add defender missile effect. 2016-12-13 13:48:58 -08:00
blitzman
f198ff1773 more clean up 2016-12-12 00:49:47 -05:00
blitzman
55c13d1ad0 Merge branch 'master' into Ebag333-Remove-Command-Boosts 2016-12-12 00:43:52 -05:00
blitzman
16505b30bf working commit 2016-12-12 00:43:42 -05:00
blitzman
95b3f0a21c Merge branch 'Remove-Command-Boosts' of https://github.com/Ebag333/Pyfa into Ebag333-Remove-Command-Boosts
Conflicts:
	eos/db/saveddata/fleet.py
	eos/db/saveddata/queries.py
	gui/additionsPane.py
2016-12-12 00:41:47 -05:00
blitzman
0a28fb60df oops 2016-12-12 00:27:36 -05:00
blitzman
7875c2acaa Fix titan command effects 2016-12-12 00:24:50 -05:00
blitzman
07148f1e7f Merge branch 'VoidBombs' of https://github.com/Ebag333/Pyfa into Ebag333-VoidBombs
Conflicts:
	eos/effects/usemissiles.py
2016-12-11 23:27:30 -05:00
blitzman
a954759012 GUI implementation of alpha clone switching 2016-12-11 22:51:48 -05:00
blitzman
90c1033437 add clone grades to the client extraction list 2016-12-11 20:27:27 -05:00
blitzman
191a065de1 Get skill limits working 2016-12-11 20:26:30 -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
blitzman
b6420b9a4b Get alpha clones in the database 2016-12-11 15:44:14 -05:00
Stefan Dresselhaus
4f77dff6dd fixed parameters in call when adding neuts to structures. 2016-12-11 20:25:55 +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
70af2b0df7 fix for #871 2016-12-10 01:27:17 -05:00
blitzman
753b5c5339 Fix for #883 2016-12-10 01:11:38 -05:00
blitzman
9bb86b4ee4 fix a couple command effects 2016-12-10 01:00:14 -05:00
blitzman
907196018b Fixed a few issues with command bursts 2016-12-09 00:07:35 -05:00
blitzman
4a95156e35 Revert "Remove effect files that are not used by any item"
This reverts commit b29fa2467a.
2016-12-04 23:10:09 -05:00
Ebag333
510492e5e9 More refactoring, elimited another recursive import 2016-12-03 17:12:16 -08:00
blitzman
b375d3cb6c Bump dev, fix for #874 2016-12-03 18:28:48 -05:00
Ebag333
d963327ed4 Make it run again 2016-12-02 03:13:54 -08:00
blitzman
5a846c36ab Merge branch 'T3CSubRemoteRepEffect' of https://github.com/Ebag333/Pyfa into Ebag333-T3CSubRemoteRepEffect
Conflicts:
	eos/effects/subsystembonusamarrdefensive2remotearmorrepairamount.py
	eos/effects/subsystembonuscaldaridefensive2remoteshieldtransporteramount.py
	eos/effects/subsystembonusgallentedefensive2remotearmorrepairamount.py
	eos/effects/subsystembonusminmatardefensive2remoteshieldtransporteramount.py
2016-12-02 01:02:17 -05:00
Ryan Holmes
b76e8df1bf Merge pull request #689 from MrNukealizer/RAH-v3
RAH v3
2016-12-01 01:06:24 -05:00
blitzman
4d9c2898bf Fix orca effects (#866) 2016-12-01 00:07:24 -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
blitzman
b2cf4b8aa5 Delete broken references to in commandFits (#844) 2016-11-28 21:07:09 -05:00
Ryan Holmes
0d874f9ad1 Merge pull request #858 from Ebag333/RemoveIncorrectEffects
Remove Effects
2016-11-27 21:51:55 -05:00
blitzman
019b8e93b4 Remove effect files for effects that no longer exist 2016-11-27 21:33:47 -05:00
blitzman
b29fa2467a Remove effect files that are not used by any item 2016-11-27 21:32:44 -05:00
blitzman
8b17cbfbc8 Fix effects that utilize old commandBonus attribute, and update headers 2016-11-27 21:22:28 -05:00
blitzman
a445509d75 Revert removal of skill check in effect 2016-11-27 20:48:38 -05:00
Ebag333
45480a0216 These 4 effects break processing, because the bonus gets set to 0 2016-11-27 13:35:56 -08:00
Ebag333
466b2ac706 Fix multiple issues with effect 2016-11-26 23:15:19 -08:00
blitzman
459d55c31a fix burst jammers 2016-11-23 21:18:20 -05:00