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
1f7858f853
Merge branch 'bug/resist-effects' (also includes current work on sisi branch).
...
This fixes the ewar resists (and possibly implements remote repair impedance, not tested)
2017-05-06 12:04:10 -04:00
blitzmann
622efb624d
Refactor how remote resistance works. We now check the resistance ID directly from the effect, and fall back to the remoteResistanceID attribute. See #1139
2017-05-02 22:19:58 -04:00
blitzmann
50965244c0
Merge branch 'bug/1139' into bug/resist-effects
2017-05-02 20:41:54 -04:00
blitzmann
9e6aca2496
Merge branch 'qol/effect-class' into bug/resist-effects
2017-05-02 20:38:20 -04:00
blitzmann
1cf844d415
item.attributes would not contain attributes that were added during runtime. Instead, get the attribute info and search the modified attributes for the resist attribtue.
2017-04-30 01:39:03 -04:00
Ryan Holmes
bedd6efff2
Fix for #1137 - industrial command skill was applying to incorrect attribute ( #1138 )
2017-04-26 20:25:35 -04:00
blitzmann
77b5e8afdc
Merge branch 'development' into feature/strictSkills
...
Conflicts:
eos/gamedata.py
2017-04-26 19:42:29 -04:00
blitzmann
5657438e3c
Change up effect classes for better efficiency
2017-04-24 19:04:07 -04:00
blitzmann
f7349316b4
Revert "Change to using inspect() instead of the current shitty way"
...
This reverts commit 711537dcf4
2017-04-24 00:34:04 -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
b21c850598
move skill mapping to item class
2017-04-22 03:12:33 -04:00
blitzmann
d0a4fa1c9d
Get strict skills working. Todo: add engine setting
2017-04-22 02:43:06 -04:00
blitzmann
711537dcf4
Change to using inspect() instead of the current shitty way
2017-04-21 00:45:36 -04:00
blitzmann
e971b7927e
Fix issue in which prices are removed all the time (forgot to add the check for deleted to the condition >.<)
2017-04-21 00:40:45 -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
66a8669c64
Implement CONCORD ship sec status bonus.
2017-04-18 01:21:08 -04:00
blitzmann
99b0322289
Merge branch 'singularity' into sisi-dev
2017-04-18 00:03:58 -04:00
blitzmann
b0e7c02a6a
Add migration script for character sec status
2017-04-18 00:01:25 -04:00
blitzmann
f0fc5643e9
Return and save sec status for character when updating skills
2017-04-18 00:01:25 -04:00
blitzmann
53cab4b1ab
Merge branch 'master' into development
...
Conflicts:
requirements.txt
2017-04-17 21:41:44 -04:00
blitzmann
6d176c0010
Merge branch 'master' into singularity
2017-04-17 21:41:02 -04:00
blitzmann
9d1c77f5b7
Damn you effects...
2017-04-17 21:19:51 -04:00
blitzmann
9c406a0a44
Fix for #1128 - these modifiers are in their own pen-group
2017-04-16 23:53:19 -04:00
blitzmann
81160e9e72
Fix effects (don't need level for ship bonuses x_x)
2017-04-16 22:50:19 -04:00
blitzmann
7bfd19dca4
Update effect headers
2017-04-16 22:24:32 -04:00
blitzmann
8ff244d509
Add new effects to support new hulls
2017-04-16 22:11:28 -04:00
blitzmann
e2061a25c2
Update effects for logi
2017-04-16 21:06:28 -04:00
blitzmann
272201c0fc
Update for renamed attribute
2017-04-16 20:34:58 -04:00
blitzmann
54930d7d50
Rename effects.
2017-04-16 20:20:57 -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
efaede0929
Use queries to bulk-delete target resists and damage profiles
2017-04-10 21:49:35 -04:00
blitzmann
50e604f412
convert print to debug statement >.<
2017-04-10 21:32:26 -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
ce01c66b3e
Better manage price object juggling in Item.price property. The previous way was creating new price objects when an object already existed in the database which could lead to Integrity issues.
2017-04-10 20:48:58 -04:00
blitzmann
1260900668
Merge branch 'pricing_v2' into development
2017-04-10 20:46:57 -04:00
