Commit Graph

1393 Commits

Author SHA1 Message Date
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
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
38e6e7d5ed Add missing Dagon effect 2017-05-08 22:58:25 -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
dd09b3d951 Add fitting notes to the ship browser tooltips 2017-05-08 19:20:30 -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
0507a55731 Get resists working with more things, and fix bug in which we were still looking at an effect info (which doesn't exist anymore) 2017-05-07 19:59:25 -04:00
blitzmann
f1eb3f68d1 Change func.now() to datetime.datetime.now().
Apparently these are calculated differently (sqlite function is in utc, datetime is in local), and I couldn't figure out how to retrieve the tiome back into local. Since this is a single user application without a concern for time drift on the server, this should work just as well.
2017-05-07 11:35:26 -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
4a9662c0f7 Merge branch 'feature/skill-filter' into dev
Conflicts:
	gui/characterEditor.py

This implements a long-requested feature to be able to search skills in the character editor
2017-05-06 13:25:20 -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
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
f9b7376cc7 Move sql alchemy events into their own file for now so that mac-deprecated doesn't get pissy. 2017-04-26 19:34:47 -04:00
blitzmann
34723d7bb1 Merge branch 'development' into feature/recent 2017-04-26 18:51:46 -04:00
blitzmann
32f417ce5a Created first iteration of "Recent Fits" view, in which a nav button is interacted with to show a list of the 100 most recently modified fits. Ship Broswer is littered with ToggleRecentShips() to reset the icon when not in "recent" mode. This should probably be fixed at some point.
Removed the FIT_CHANGED binding from FitItem - this was causing very odd issues when the object was destroyed (navigating to another "stage") such as the Fit Changed event for that fit no longer firing (or at least seemingly so)

To fix this, simply look at the active fit during FitItem.Refresh()

Also creates a new query to get a list of items from the DB, although it's not used (was gonna use it, decided against it, but didn't want to delete the code - could prove handy later)
2017-04-26 18:51:39 -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.

Turns out inspect() was introduced in 0.8, and mac-deprecated has 0.6.4 (without an easy way to jack it up). Stuck with this ugly, but functional code for now.
2017-04-24 00:34:04 -04:00
blitzmann
b4930d15b7 Update Fit.modified whenever modules change, allowing proper "recent" timestamps 2017-04-22 18:58:30 -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