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
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
Ebag333
96505e4421
Industrial core for Rorq
2016-11-20 18:37:12 -08: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
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
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
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
Ebag333
3e842f30f1
Reformatting all effect files for readability and better PEP8 compliance
2016-10-19 11:16:32 -07:00
Ebag333
a8061c9276
Remove unnecessary backslash
...
and a bit of reformatting
2016-10-19 08:58:19 -07:00
Ebag333
68f769aac2
Remove redundent parentheses
2016-10-19 08:37:07 -07:00
Ebag333
02c8b46b74
Fixed formatting issues
...
Mixed spaces/tabs. Also converted to using container instead of module.
Reformatted file.
2016-10-19 08:26:18 -07:00
Ebag333
d3cb968c19
Why the hacks, CCP?
2016-10-16 21:44:11 -07:00
blitzman
9c685263bb
Merge branch 'master' of https://github.com/pyfa-org/Pyfa
2016-10-17 00:14:37 -04:00
blitzman
d43db40469
Fix running mining effect for every active drone in the stack
2016-10-17 00:14:06 -04:00
blitzman
a50471c0a6
Merge branch 'MiningDroneBonus' of https://github.com/Ebag333/Pyfa into Ebag333-MiningDroneBonus
2016-10-17 00:01:49 -04:00
Ryan Holmes
8d215f7d7f
Merge pull request #764 from Ebag333/MiningDroneRigStackingPenalty
...
Removed stacking penalty from Mining Drone Rigs
2016-10-17 00:00:23 -04:00
Ebag333
eb9b034d65
Fixed maths with more than 1 drone
...
Also tightened up code a bit. Does nothing now if there isn't a
miningDroneAmountPercent
2016-10-16 20:52:09 -07:00
Ebag333
9be9a21b22
Applied Mining Crystal Bonus to modules
...
Previously the mining crystal bonus was not applied to modules, so
adding a crystal didn't change the amount mined at all. This now
applies. Left the old application in place, so it still applies to a
nonsense `specialtyMiningAmount` stat if you want to see that seperated
out for some weird reason.
2016-10-16 15:09:17 -07:00
