Commit Graph

139 Commits

Author SHA1 Message Date
blitzman
0e4e7525e1 Add runtimes to command effects (defaulting to normal) 2016-11-29 23:18:35 -05:00
blitzman
5259df2828 Quick hack to run command boosts inside the runtime. See #839 2016-11-29 22:58:33 -05:00
Ryan Holmes
8d4e0a259e Fix for #833 2016-11-22 15:35:04 -05:00
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
blitzman
fbb1750528 Merge branch 'master' into singularity
Conflicts:
	eos/db/saveddata/fit.py
	gui/additionsPane.py
2016-11-20 20:52:23 -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
Resin Neublem
78cbed516a Adds a new notes pane for each fit
This allows users to save text notes for each fit. They may do this for history, or usage, etc.
2016-11-20 14:11:42 -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
08be50caf2 More work on command boosts 2016-11-19 23:53:49 -05:00
Ryan Holmes
29b5a7433d Trying to flesh out how command boosts are gonna work. 2016-11-16 09:54:02 -05:00
blitzmann
34243b7b71 Get a working UI skeleton going for assigning boost fits 2016-11-08 19:36:57 -05:00
Ebag333
ad76104033 Revert "Create variables before they are referenced. "
1dc15936ed

This is a problem for us.  See #794 for more details.
2016-11-04 14:18:18 -07:00
Ebag333
832e7e6637 Revert moving projectionInfo out
Need to handle this better. :/
2016-11-03 22:15:40 -07:00
Ebag333
0c0eb327f7 lots of PEP8 cleanup 2016-10-19 12:25:31 -07:00
Ebag333
74ce79ba8f Add inspection exception to ignore reassignment of self 2016-10-19 12:11:30 -07:00
Ebag333
1dc15936ed Create variables before they are referenced.
Resolves attribute reference validation errors in pyCharm
2016-10-19 12:08:35 -07:00
Ebag333
f9f53a13c0 Reformatting eos.saveddata 2016-10-19 11:42:45 -07:00
Ebag333
e818ce62c8 Removed line from legacy implementation 2016-10-19 10:54:47 -07:00
Ebag333
4036ac8cd2 Move projectionInfo so it can't be referenced without being assigned 2016-10-19 08:53:11 -07:00
Ebag333
ccd8ee87f3 Create dictionary directly 2016-10-19 08:18:47 -07:00
Ebag333
699276ca58 Add __init__ to classes missing it
Mostly just to shut pyCharm up, but it's good practice.
2016-10-19 08:15:36 -07:00
Ebag333
c1dfd676e1 Simplified boolean check 2016-10-19 08:08:50 -07:00
blitzman
3ac733a30c Merge branch 'master' into citadel 2016-07-24 01:25:57 -04:00
Ebag333
071dfaf656 Removed ship size, as this applies only to NPCs 2016-07-18 06:41:50 -07:00
Ebag333
a2c0049488 Moved neut reduction logic into fit.py 2016-07-17 13:43:52 -07:00
blitzmann
10c79ac812 More work on restrictions 2016-07-04 11:01:08 -04:00
blitzmann
fe8c3a4957 Disable fit add on pages based on context (ship vs citadel) 2016-07-04 10:30:04 -04:00
blitzmann
fb2e6e5c17 Restrict skills being applied to citadels. The effect must be of type "structure" for it to apply. Fix issue with agility 2016-07-03 14:52:00 -04:00
blitzmann
655d658a52 Remove prints 2016-05-16 23:56:46 -04:00
blitzmann
4041ecddc4 Create Citadel class that inherits from Ship. Add Service slots 2016-05-15 22:23:23 -04:00
blitzmann
7cf0a35a7a Add citadel fittings to market browser, and get rid of some initial errors 2016-05-15 18:58:47 -04:00
blitzmann
d416124081 Implemented projected fighters, and various fighter bugfixes / improvements 2016-04-30 19:52:13 -04:00
blitzmann
c9810cd019 Fix bug when importing fit 2016-04-30 18:03:03 -04:00
blitzmann
cfd82a6ad4 Add titan gang bonuses, along with other things 2016-04-29 18:47:53 -04:00
blitzmann
b15f9766c1 * Show fighter bay resources in fighter pane
* Give fighters a state
* Include some toggled stats on the resources pane
* Add some decent icons for fighter stuff
2016-04-28 00:10:01 -04:00
blitzmann
0ad4f07591 Add drone DPS/Volley to stats pane 2016-04-26 22:18:00 -04:00
blitzmann
4704c5a1b0 Limit fighters to fit's available slots. We hijack the module slot bit to do the dirty work >_> 2016-04-25 23:45:01 -04:00
blitzmann
e7118f637c Merge branch 'charImplants' into singularity
# Conflicts:
#	eos/db/saveddata/fit.py
#	gui/builtinContextMenus/itemStats.py
2016-04-12 20:16:53 -04:00
blitzmann
8ed485df0e Group renames 2016-04-06 00:22:19 -04:00
blitzmann
3177713447 Add preliminary (database/gui) fighter support. No effects / calculations. 2016-04-04 23:32:03 -04:00
blitzmann
dc8aff6b6c Merge branch 'master' into charImplants 2016-03-19 15:33:35 -04:00
blitzmann
c42748a5dd Fix #537 - cap battery causing remote cap transfers to apply incorrect values.
Bump to stable 1.20.1
2016-03-15 22:46:51 -04:00
blitzmann
b5cf835959 Add a toggle between fit-specific implants and character implants. This avoids a lot of the problems of how to mix these two sources of implants. Character implants cannot change stage. 2016-03-13 14:48:43 -04:00
blitzmann
627dac692c Modify applied cap drain based on ship's cap resistance 2016-03-08 18:23:35 -05:00
blitzmann
e3742c0420 Fix double calculations on projected fits that double as boosters (#496) 2016-02-10 00:04:19 -05:00
Cameron Grout
702d249bad Updated turret detection as advised 2015-10-31 16:15:35 +13:00
Cameron Grout
cc2835a341 Turrets of the same type now do not stagger
Playing with the cap simulator, I noticed that turrets of the same type
stack and have staggering applied when running through the cap
simulator. This is not realistic behaviour as most (all?) pilots will
have grouped their turrets in-game, meaning they will all activate
simultaneously rather than activating individually, offset from
each other.

This change introduces a 'disable stagger' field to the drain tuple that
is passed through to the cap simulator, allowing us to disable
staggering on certain modules. This will enable us to add GUI options in the
future to allow users to choose whether to stagger certain modules (eg,
cap boosters, neuts) or have them all fire simultaneously. Currently
this defaults to False (existing behavior) for all modules except for
turrets, which will now behave more like in-game turrets for cap
simulation purposes.
2015-10-31 15:30:20 +13:00
blitzmann
f17fb82ce7 Fix issue with ship bonuses not applying when fit is projected (#374) 2015-10-05 18:10:39 -04:00
blitzmann
a5f1370eec Fit system effects not applying to projected fits. 2015-10-04 13:17:13 -04:00