blitzmann
47a683c44c
Merge branch 'feature/strictSkills' into dev
...
Conflicts:
service/character.py
Implements strict skill requirement handling
2017-05-06 13:13:50 -04:00
blitzmann
b2ae6913d7
Merge branch 'qol/self-projection' into dev
2017-05-06 13:10:48 -04:00
blitzmann
703d6dbc85
Merge branch 'feature/grant-needed-skills' into dev
2017-05-06 13:09:30 -04:00
blitzmann
2e6066e848
Merge branch 'feature/tabbed-fits' into dev
2017-05-06 13:08:52 -04:00
blitzmann
1222567a4f
Merge branch 'feature/allow-restrictions' into dev.
...
Allows user to turn off most fitting restrictions (#1117 )
2017-05-06 12:11:00 -04:00
blitzmann
50965244c0
Merge branch 'bug/1139' into bug/resist-effects
2017-05-02 20:41:54 -04:00
blitzmann
c9a04e886a
Add eos setting for strict skills, and update info in skill tree without doing a repopulation
2017-04-22 14:02:40 -04:00
blitzmann
d0a4fa1c9d
Get strict skills working. Todo: add engine setting
2017-04-22 02:43:06 -04:00
blitzmann
cd30d74393
Rename fueled to modifier
2017-04-20 23:54:52 -04:00
Ebag333
25a945f9e6
Catch bug where remote reppers have the fueled multiplier applied when they have no charges.
2017-04-20 23:54:36 -04:00
blitzmann
3d8a80aeaa
Include drones in RR stats
2017-04-19 21:36:49 -04:00
blitzmann
988861af1f
Add option to ignore fitting restrictions on a per-fit basis
2017-04-18 23:57:34 -04:00
blitzmann
f0fc5643e9
Return and save sec status for character when updating skills
2017-04-18 00:01:25 -04:00
blitzmann
1ee679903c
Bring dev up to date with master
...
Conflicts:
service/fit.py
2017-04-16 11:42:41 -04:00
blitzmann
9646cee324
De-jankify self projections. We now check to see if the fit we're about to project is self and, if so, simply run the projections on ourselves. At this point, all bonuses should be applied to our fit.
2017-04-13 23:41:02 -04:00
blitzmann
283aba4f85
Add grant missing skills feature
2017-04-13 23:26:08 -04:00
blitzmann
a7ec10525e
Apparently this happens on command fits as well... temp fix until I can look into why this happens
2017-04-13 23:23:47 -04:00
Ryan Holmes
5aeb3a38c8
Fit Calculation Code Cleanup ( #1103 )
...
* Remove dirtyStorage, legacy of old fleet boosting system
* Remove withBooster flag from the recalc() function.
This was a legacy parameter dealing with the old fleet boost code, the purpose of which has changed with the addition of command boosts. We no longer have to call recalc with this particular parameter (indeed, it was forced to False in `recalc`). These were never cleaned up. We still have the withBoosters parameter for the `calculateModifiedAttributes` function, however that will be renamed and has a different meaning than it used to (used in the recursion of command fits)
* Add some comments
* Consolidate the tangled mess of conditional flags meant to determine if a fit is local/projected/command. This should make the logic flow a bit clearer.
Also rewrite a blurb about returning on a calculated fit - need to look into this a little bit more.
* fix up test to no longer pass `withBooster`
2017-04-12 19:50:16 -04:00
blitzmann
87a600349c
Temporarily fix issue with removing a self projected fit
2017-04-11 23:58:05 -04:00
Ryan Holmes
114246bf1e
Do not recalc fits on tab switch ( #1105 )
...
* Do not recalc fits if they are already calculated. Fits that are projected onto other fits recursively set their victims to `calculated=False` so that the victim will re calculate when it loads again.
* Reset boosted fits when calculating a fit that is boosting others. Also, remove semicolon due to habit :x
* Develop a `__resetDependantCalc()` which will reset any fits that are immediately affected by the current fits calculation.
2017-04-11 23:40:40 -04:00
blitzmann
894c86ebc3
Merge branch 'development' of https://github.com/pyfa-org/Pyfa into development
2017-04-10 21:09:40 -04:00
Ryan Holmes
47ea12f4ba
Merge pull request #1048 from Ebag333/ErrorDialog_and_miscfixes
...
Error Dialog improvements and Pyfa.py refactoring
2017-04-10 21:09:11 -04:00
blitzmann
1260900668
Merge branch 'pricing_v2' into development
2017-04-10 20:46:57 -04:00
Ryan Holmes
82f6d26a88
Merge pull request #1109 from Ebag333/eos_fit_cleanup
...
Some quick cleanup of logging and shtuff
2017-04-09 23:25:11 -04:00
blitzmann
fadc514592
Add back the booster side effect stuff
2017-04-09 22:38:31 -04:00
Ryan Holmes
5f35553438
Restrict cap modules to only cap ships ( #1097 )
...
* Restrict capital modules to capital hulls
* tweak comment
* Make a isCapitalSize property for modules
2017-04-05 18:54:16 -04:00
Ebag333
802e2afcc0
General cleanup of Eos. Reformats a bunch of files and cleans up unused code or code that's been commented out
2017-04-05 15:47:19 -07:00
Ebag333
994bd72409
Rework pricing.
2017-04-05 14:40:27 -07:00
Ebag333
c1b74f481a
Tox
2017-04-05 00:44:02 -07:00
Ebag333
df510c40f4
Some quick cleanup of logging and shtuff
2017-04-05 00:17:13 -07:00
Ryan Holmes
9d029b46b1
Respect command fit state ( #1100 )
...
* Respect command fit state in calculations
* Utilize `getCommandInfo` instead (we do it this way for projections. Consistency, fuck yeah!)
2017-04-02 23:20:31 -05:00
Ryan Holmes
f9ec79c8eb
Merge pull request #1093 from pyfa-org/master
...
Bring dev up to date with master
2017-04-01 23:14:26 -05:00
Ryan Holmes
e03b3227d4
Fix for #1081 ( #1085 )
...
* Break project application code out of main item iteration, and apply it after command boosts have been applied to the fit. Fix for #1081
* Make tox happy
2017-04-01 22:23:50 -05:00
blitzman
e7aceb6a8b
Bringing branch up to date with dev
...
Merge branch 'development' into ErrorDialog_and_miscfixes
Conflicts:
eos/saveddata/fit.py
pyfa.py
2017-03-25 22:30:18 -04:00
Ebag333
403b39659c
Fix tox things.
...
(cherry picked from commit 60298c8)
2017-03-24 11:14:34 -07:00
blitzman
b4ad4becd3
Fix for #1060
2017-03-19 16:27:41 -04:00
Ebag333
6ce52a1da9
PEP8 cleanup
...
(cherry picked from commit 63f2f85
2017-03-16 08:40:14 -07:00
Ebag333
63f2f85c25
PEP8 cleanup
2017-03-16 02:12:26 -07:00
blitzman
4633a1c136
some clean up
2017-03-14 19:22:18 -04:00
Ryan Holmes
53937d1723
Merge pull request #1023 from Ebag333/EosLoggingCleanup
...
Quick Eos cleanup and logging fix
2017-03-11 19:33:58 -05:00
blitzman
1c4128b9a1
Change probe size cap to 1.08 (previous testing done apparently showed 1.1 - 1.12, however most people refer to 1.08 as the cap.
2017-03-05 17:01:00 -05:00
Ebag333
d28312f13b
Slightly correction to the effective reload time for cycle time.
2017-02-28 18:57:12 -08:00
Ebag333
e4d0f2dc6f
Fix case where property gets reran multiple times.
2017-02-26 08:46:23 -08:00
blitzmann
c430a2d798
Merge branch 'development' into Remote_Repair_Pane_v2
...
Conflicts:
eos/mathUtils.py
service/crest.py
2017-02-26 01:40:53 -05:00
blitzman
7115cd178c
Merge branch 'development' into LogBook_v2
...
Conflicts:
config.py
eos/saveddata/fit.py
gui/bitmapLoader.py
gui/graphFrame.py
gui/utils/exportHtml.py
pyfa.py
service/crest.py
service/price.py
service/server.py
2017-02-25 18:21:07 -05:00
Ebag333
c24798ad2f
Clean up last reference and finish nuking floatfloor. One less method! (ouch my test!)
2017-02-24 17:07:05 -08:00
Ebag333
3411eca1e7
Fix a couple pep8 issues, and clean up other folks pep8 misses. :)
2017-02-24 16:34:32 -08:00
Ebag333
43073069c7
Fix merge conflict.
2017-02-24 16:25:31 -08:00
Ebag333
db330ad035
Merge remote-tracking branch 'origin/Remote_Repair_Pane_v2' into Remote_Repair_Pane_v2
...
# Conflicts:
# eos/saveddata/fit.py
2017-02-24 16:15:39 -08:00
Ebag333
b3c7273681
implement a suggestion or six from @blitzmann. Fix a bunch of low level bugs (unlikely to have been noticed since we don't really expose those stats). Add some properties instead of referencing the attribute directly.
2017-02-24 16:10:54 -08:00
