Commit Graph

418 Commits

Author SHA1 Message Date
blitzmann
47fcbefe8b Finish off user-selectable booster side effects - effects are applied correctly now and each has their own display name. Implements #642 2017-06-05 00:18:36 -04:00
blitzmann
c2cb5d763f Implement selectable booster side effects and persist them to the database, very much based on the fighter ability code. Still need to name them and enable the effects.
This also removes the old boosterActiveSideEffect table definition (migration script to drop table still needs to be written)
2017-06-04 23:33:11 -04:00
Ryan Holmes
3371086d54 Fix for #1193 - compounded bonuses during recursive command / projected fittings (#1197)
* Teak calculated logic

* test

* clear() on every calculation if it's not already calculated

* tox fix
2017-05-31 00:01:59 -04:00
Ryan Holmes
4286f2ea5a Add stacking penalties to armor and shield resist command links (#1198) 2017-05-30 22:44:01 -04:00
Ryan Holmes
d1fc2dd6ec Fix issue with calculateSustainableTank not considering remote ancil modules (from https://forums.eveonline.com/default.aspx?g=posts&m=6948134#post6948134) (#1189) 2017-05-22 00:55:35 -04:00
Ebag333
5a60cff9a1 Fixes EVEMon import. Security status was added, but wasn't handled in the EVEMon import. Also, default secstatus to 0 if it's somehow missing. 2017-05-22 00:29:29 -04:00
Ryan Holmes
0d721b55a7 Fix for when factor reload when module doesn't have a cycle time (#1171) (#1173) 2017-05-16 00:09:51 -04:00
Ryan Holmes
6344f7a975 Merge branch 'master' into bug/char_fixes 2017-05-14 22:56:34 -04:00
blitzmann
11eea37aa7 Remove duplication of Character.ro property 2017-05-14 22:50:18 -04:00
blitzmann
bff44c46f8 Fix character list sorting (https://forums.eveonline.com/default.aspx?g=posts&m=6940327#post6940327) 2017-05-14 22:44:02 -04:00
blitzmann
7a0ea759ef Fix issue with character copy, as well as instantiating character with duplicate skills (since Skill has a backref to charactrer, it's automatically added to the characters skill list. No more need for the append()) 2017-05-14 22:24:05 -04:00
blitzmann
f9419977c0 Instantiate skills with a character (may help to solve https://forums.eveonline.com/default.aspx?g=posts&m=6939299#post6939299) 2017-05-14 20:55:48 -04:00
Ryan Holmes
da33a372cb Set all strings to be unicode when referencing fit.name. This won't catch all conversion errors, but it should catch most. (#1168) 2017-05-14 20:52:06 -04:00
blitzmann
0db141d0a6 Fix exception when reverting character skills 2017-05-14 02:26:32 -04:00
Ryan Holmes
fee82d294b Bump dev and include fix for #1162 (#1163)
* Add some logging to try to figure out what happens with #1149

* Add some logging to try to figure out what happens with #1149, along with some other fixes

* bump dev

* Add remote hull repairers in the calculateSustainableTank() mappings
2017-05-13 22:36:03 -04:00
Ryan Holmes
9f5e14fe2d Bugfixes and bump point release (#1159)
* Add some logging to try to figure out what happens with #1149, along with some other fixes

* Bump point release
2017-05-11 20:53:37 -04:00
blitzmann
a6a153b703 Update database, add missing renders, fix bug with not being able to add citadel modules, and fix bug associated with engineering complex properties (debug info, don't care about it) 2017-05-09 18:52:32 -04:00
blitzmann
4d8c9e0522 Fix floats in skill tree, and fix typo - apparently I can't spell dependents x_x 2017-05-08 22:49:37 -04:00
blitzmann
3de63c5ca5 flake8 fixes 2017-05-08 21:32:13 -04:00
blitzmann
42e64a6223 Fix jsonToSql script and issue with character sec status setter 2017-05-08 21:24:29 -04:00
blitzmann
53f589284b Implement hard constraints for All 5/0 characters with respect to skills and sec status 2017-05-08 19:47:55 -04:00
blitzmann
aecbf8f86e Fix issue with drones causing exception during remote RR calcs 2017-05-08 19:41:34 -04:00
blitzmann
6b22bd189a Merge remote-tracking branch 'jeffy/fix_unread_description' into dev, see #1099
Conflicts:
	eos/config.py
	gui/notesView.py
	service/settings.py
2017-05-08 00:44:29 -04:00
blitzmann
83a7a854bb Merge branch 'feature/recent' into dev
Conflicts:
	eos/db/saveddata/character.py
	eos/db/saveddata/fit.py

Implements #983 but utilizing sqlalchemy events to update the fit modified date whenever something is added/changed.
2017-05-07 20:48:41 -04:00
blitzmann
1604ea1f2c Fix many bugs related to GUI not receiving a correct timestamp, as well as extending feature out to all other fit entities. 2017-05-07 02:02:54 -04:00
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
jeffy-g
c07bcf6a29 Determine the necessary changes to use db with test code,
I made necessary edits

.travis.yml
  necessary to depend on wx mod indirectly when running test code

eos\config.py
  copy from development branch, This change was necessary when using data base in test code.

service\settings.py
  copy from development branch.
  and modified SettingsProvider.getSettings and Settings.save.
  After that, we made the same as master branch except for necessary code.
  This change was necessary when using data base in test code.

and other improvement.
2017-04-10 14:23:50 +09: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