blitzmann
ebf07db6c6
Partial fix for #1430
2018-02-24 19:01:54 -05:00
blitzmann
78f632a4f6
Merge remote-tracking branch 'origin/master' into test-3
2018-02-24 02:03:29 -05:00
blitzmann
a9db667c9c
Do the same treatment to Target Resists as Damage Patterns
2018-02-24 02:01:23 -05:00
blitzmann
f442632fbc
Fix importing damage profiles which included overwriting existing ones and then performing a delete on one of them. #1416
2018-02-24 01:49:09 -05:00
blitzmann
362086cc83
Fix type in database default for damage types
2018-02-24 01:47:05 -05: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
8b2cfe44f2
Merge remote-tracking branch 'origin/master' into test-3
...
# Conflicts:
# config.py
# eos/saveddata/fighter.py
2018-02-17 12:31:58 -05:00
blitzmann
6ab84240a2
Add missing effect for scram script for standup warp disruptor. Update database to make sure everything is updated.
2018-02-17 12:22:35 -05:00
blitzmann
12a526fa9e
Fix for some standup fighter errors
2018-02-17 11:59:51 -05:00
blitzmann
e779bb84e2
Fix for #1383 . Due to the changed mechanics of None in py3, getModifiedItemAttr was defaulted to 0 instead of None. This adds an explicit default of None when trying to find the allowed drone group attribute
2018-02-17 10:53:29 -05:00
blitzmann
0456cb2f96
Merge remote-tracking branch 'origin/master' into test-3
2018-02-16 22:26:10 -05:00
Ryan Holmes
2153c05183
Merge branch 'master' into bug/citadels
2018-02-16 17:42:03 -05:00
DarkPhoenix
8771de9c1f
Fix retribution rof effect
2018-02-16 23:03:51 +03: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
55ad52919e
Add missing Ishkur effect (drone tracking)
2018-02-15 20:09:50 -05:00
blitzmann
0648feaa7b
Handle a couple of group renamings
2018-02-15 20:07:57 -05:00
blitzmann
da0f89ef91
Merge commit 'refs/tags/v1.35.0^{}' into test-3
2018-02-14 22:25:45 -05:00
blitzmann
89b6e8f8c3
fix tox stuff
2018-02-14 22:15:48 -05:00
blitzmann
c6e715aa5c
Merge branch 'master' into test-3
2018-02-14 22:07:33 -05:00
blitzmann
89c84aac96
update effect headers, add some icons, update DB to final 1248987
2018-02-14 22:05:55 -05:00
blitzmann
649ba9f3e4
Merge branch 'master' into singularity
2018-02-14 21:31:54 -05:00
blitzmann
23f0f48c80
Use a special dev database for py3 branch
2018-02-14 01:16:49 -05:00
blitzmann
8686c02b1f
Add stacking penalties to dromi fighters
2018-02-12 23:33:16 -05:00
blitzmann
5f0ce58c29
Merge branch 'master' into test-3
...
# Conflicts:
# gui/builtinShipBrowser/fitItem.py
# service/port.py
2018-02-11 21:29:17 -05:00
blitzmann
0f30ea554d
Fix for #1377 - group up support fighters and modify the bonus based on amount active
2018-02-10 14:14:31 -05:00
blitzmann
96828a5611
Add assualt damage control effect
2018-02-05 23:12:58 -05:00
blitzmann
9f3c2ca7a8
Add stacking penalty to Fighter's MWD ability
2018-02-05 22:34:25 -05:00
blitzmann
a29b3da8a6
Update DB and effects
2018-01-30 00:05:11 -05:00
burnsypet
3072dbb3ff
Remove energy warfare resistance on capNeed calc
...
When calculating the capactitor need of an energy nosferatu the
amount was being modified incorrectly by the energy warfare
resistance of the ship. Change to only apply energy warfare
resitance modifier if this is a projected effect.
2018-01-26 14:48:35 +00:00
Ryan Holmes
0c971a127c
Fix loggerhead drone bonus ( #1348 ) ( #1358 )
2018-01-02 01:43:55 -05:00
blitzmann
40ce7b7c0b
Merge branch 'master' into test-3
...
# Conflicts:
# .gitignore
# eos/saveddata/character.py
# service/network.py
# service/price.py
2017-12-10 22:36:15 -05:00
blitzmann
cc063d1934
Bump release
2017-12-10 18:07:45 -05:00
blitzmann
531721ef5e
Merge branch 'master' into development
2017-12-10 16:25:20 -05:00
blitzmann
2936b88c3d
code cleanup
2017-11-27 21:05:06 -05:00
blitzmann
dd3bc66896
Remove old py<2.6 OrderedDict compat module
2017-11-25 22:40:23 -05:00
blitzmann
f7b509f9a9
code styling
2017-11-25 04:04:13 -05:00
blitzmann
5697da7ec2
fix upgrade
2017-11-24 01:23:04 -05:00
blitzmann
a7086b78cb
Fix an issue with with Cap Power Relay using an effect without an expecting source attribute. Used to work, but with changes to getModifiedItemAttr need to default these to None
2017-11-24 00:55:23 -05:00
blitzmann
46b0aded03
fixes
2017-11-23 22:43:41 -05:00
blitzmann
d23398ce29
fix for boosters
2017-11-23 20:51:03 -05:00
blitzmann
6e112b9ed5
Fix issues with merge
2017-11-23 11:38:08 -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
967128cb69
Added missing effect for shield booster penalty on crash
2017-11-22 23:16:28 -05:00
blitzmann
f0baba10df
Update effects
2017-11-22 23:04:32 -05:00
blitzmann
7058018aed
Fix alpha clones
2017-11-22 21:51:40 -05:00
blitzmann
d45d7204d2
Merge branch 'release/v1.33.2' into development
...
Conflicts:
config.py
2017-11-22 21:51:19 -05:00
blitzmann
405a965046
Fix issue with loading fighters
2017-11-22 01:44:48 -05:00
blitzmann
de44e6f932
Get rid of some annoying messages
2017-11-21 23:46:33 -05:00
