Ryan Holmes
0b45438981
Merge pull request #1626 from WatchMeCalculate/Issue-#1519
...
Issue #1519 , on fitting restriction toggle, accurately keep valid modules
2018-06-05 20:26:16 -04:00
DarkPhoenix
d48f9354ec
Update database (vedmak fitting changes) and do relevant string updates
...
Also change jsontosql script to ignore fsdtypeoverrides which is no longer dumpable by phobos
2018-06-05 20:02:00 +03:00
WatchMeCalculate
a5b5cec919
Fixed flake8 issues
2018-06-01 13:08:25 -07:00
WatchMeCalculate
cc586f6532
For modules with maxfitting, ensure on validity count, don't count itself
2018-06-01 02:18:03 -07:00
WatchMeCalculate
02103b6d2e
Refactor checking if Hardpoints has free spots into a function fit can use
2018-06-01 02:16:29 -07:00
blitzmann
bc23417eae
Start working on Abysmal space environment effects. The values produced for the infernal weather (calm firestorm) thermic resist penalties are spot on according to my testing. :D
2018-05-20 12:53:33 -04:00
blitzmann
891c20eea7
Merge branch 'master' into singularity
2018-05-20 00:22:24 -04:00
blitzmann
cb509a832e
Add number of slots in the rack heading ( #1535 )
2018-05-19 17:55:17 -04:00
blitzmann
deecfb31dc
Merge tag 'v2.0.1' into singularity (bring sisi code up to date with pyfa 2 / py3 / wx4)
...
# Conflicts:
# eos/effects/techtwocommandburstbonus.py
2018-05-15 01:17:51 -04:00
DarkPhoenix
a8b1f38e84
Update database and implement ship effects, also make pyfa to show final damage value for disintegrators after ramp-up time is complete
...
(if you don't want me to commit here just write phoenix@mail.ru , i have no way to communicate with you otherwise)
2018-04-24 19:13:30 +03:00
blitzmann
03212be54a
Merge branch 'master' into test-3
...
# Conflicts:
# eos/capSim.py
# eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
# eos/effects/warpdisruptsphere.py
2018-03-25 03:03:59 -04:00
Ryan Holmes
164720db3d
Merge pull request #1495 from Neugeniko/Issue#1482-2
...
Fix cap use for non repeatable modules.
2018-03-22 00:58:16 -04:00
blitzmann
d7e24dfa8f
Merge branch 'Issue#1486'
2018-03-21 21:51:13 -04:00
Ebag333
2f1ad21392
Calculate DPS for beam type doomsdays.
2018-03-21 21:49:04 -04:00
Neugeniko
65ec8cf4ee
Take into consideration reactivation time for non repeatable modules
...
like the assault DC and MJD when calculating their 'actual'
cycle time.
2018-03-17 11:44:29 +11:00
Neugeniko
023ea43611
Divide by numShots not need as we do that below.
2018-03-14 15:39:20 +11:00
Neugeniko
97742b08c8
Attribute disallowRepeatingAction has been renamed to
...
disallowRepeatingActivation in the database. Make appropriate
modification to instances of this attribute name in code.
(cherry picked from commit ff607e4b03
2018-03-11 12:19:43 -04:00
Neugeniko
ff607e4b03
Attribute disallowRepeatingAction has been renamed to
...
disallowRepeatingActivation in the database. Make appropriate
modification to instances of this attribute name in code.
2018-03-11 21:38:46 +11:00
blitzmann
4bbbd33917
Return 0 instead of -1 when there is no charge on a weapon. It was changed from None to -1 during the py3 conversion (as None can no longer be compared against non-None types). -1 was throwing the capSim off by quite a bit. See #1405
2018-02-18 22:55:31 -05:00
blitzmann
0456cb2f96
Merge remote-tracking branch 'origin/master' into test-3
2018-02-16 22:26:10 -05:00
blitzmann
fa3cf90421
add / update effects for citadels
2018-02-16 00:44:26 -05:00
blitzmann
636ee1de23
Get new Standup fighters working
2018-02-15 22:26:42 -05:00
blitzmann
b36bf8fb21
Fix issue restricting structure modules from fitting onto a structure
2018-02-15 21:03:25 -05:00
blitzmann
b30b3fcbf1
Merge branch 'master' into test-3
...
Conflicts:
eos/gamedata.py
eos/saveddata/booster.py
eos/saveddata/character.py
gui/builtinAdditionPanes/commandView.py
gui/builtinContextMenus/commandFits.py
gui/builtinMarketBrowser/itemView.py
gui/builtinMarketBrowser/marketTree.py
gui/builtinPreferenceViews/pyfaGeneralPreferences.py
gui/builtinShipBrowser/categoryItem.py
gui/builtinShipBrowser/fitItem.py
gui/builtinShipBrowser/navigationPanel.py
gui/builtinShipBrowser/raceSelector.py
gui/builtinShipBrowser/shipItem.py
gui/builtinStatsViews/priceViewFull.py
gui/builtinViews/fittingView.py
gui/characterEditor.py
gui/characterSelection.py
gui/chromeTabs.py
gui/crestFittings.py
gui/itemStats.py
gui/mainFrame.py
scripts/itemDiff.py
service/price.py
2017-11-23 11:19:05 -05:00
blitzmann
6a382c4445
More tweaks to getModifiedItemAttr and fix deprecation warning
2017-11-05 01:51:19 -04:00
blitzmann
ce3b94696a
Make sure getModifiedItemAttr always returns an int, unless otherwise wanting None
...
In py2, you could compare None to an int and it would always be less than. Unfortunately in py3, this is no longer the case. Returning getModifiedItemAttr as 0 allows us to not do a huge refactor.
2017-11-04 18:20:00 -04:00
blitzmann
0134c3b9a1
Fix formatting
2017-09-23 12:33:51 -04:00
blitzmann
7729bd9210
Opps commented wrong thing
2017-09-22 02:35:01 -04:00
blitzmann
ce5803dd9c
Disable an odd bit of code from a long time ago that fitting max group fitting restrictions to be bypassed ( #1278 )
2017-09-22 02:33:46 -04:00
Ryan Holmes
2857eff884
Fix a few None comparison operations... python 3 has changed this. I'm sure there's going to be a lot of these issues popping up.
...
Oh, and now we get a hard crash when opening a fit. Yey!
2017-06-13 23:57:27 -04:00
Ryan Holmes
828b18d0fd
py2to3 automatic conversion. Woot!
2017-06-12 16:12:45 -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
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
703d6dbc85
Merge branch 'feature/grant-needed-skills' into dev
2017-05-06 13:09:30 -04:00
blitzmann
988861af1f
Add option to ignore fitting restrictions on a per-fit basis
2017-04-18 23:57:34 -04:00
blitzmann
1ee679903c
Bring dev up to date with master
...
Conflicts:
service/fit.py
2017-04-16 11:42:41 -04:00
blitzmann
283aba4f85
Add grant missing skills feature
2017-04-13 23:26:08 -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
blitzman
b4ad4becd3
Fix for #1060
2017-03-19 16:27:41 -04:00
Ebag333
d28312f13b
Slightly correction to the effective reload time for cycle time.
2017-02-28 18:57:12 -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
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
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
Ebag333
25b17a221c
Update to current version
2017-02-15 18:23:14 -08:00
Ebag333
93e7b4f5cf
Cherry pick d033e4a8d919664d3ae210098291e38df71d3256
2017-02-15 17:23:53 -08:00
Ebag333
159472f82c
Tox fixes, and convert all logging string replacement to a standard style.
2017-02-13 13:38:21 -08:00
