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
f7b509f9a9
code styling
2017-11-25 04:04:13 -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
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
d45d7204d2
Merge branch 'release/v1.33.2' into development
...
Conflicts:
config.py
2017-11-22 21:51:19 -05:00
blitzmann
c4f41fb5fa
Update to 1209099 and rename old komodo skill
2017-11-12 16:52:56 -05:00
oaao
cacf286176
[fix] eos - remove Komodo thermalDamage double-dipping
2017-11-02 04:41:57 -04:00
burnsypet
a02bbe3964
Removed traces
2017-11-01 23:31:17 +00:00
burnsypet
866d410695
Added logic for WDFG MWD scrambling
2017-11-01 23:27:34 +00:00
burnsypet
ea6f31c021
Added disruption effect for WDFG
2017-11-01 22:55:05 +00:00
burnsypet
d522fff511
Add projected warp strength to scrams
...
Changes to effects:
Added warp strength projected effects to all kinds of warp disruption
modules except for WDFG (this will need some more thinking). Fixed
a bug where warp disruptors appeared to reduce the warp strength of
the ship they were fitted to
Changes to targetingMiscView*.py:
Replaced abs() with multiplication by -1 where appropriate
2017-10-30 21:05:46 +00:00
burnsypet
20a1618e41
Display warp core strength as warp speed tooltip
...
Changes to antiwarpscramblingpassive.py:
Fixed a typo of "warmScrambleStatus" to "warpScrambleStatus"
Changes to targetingMiscViewMinimal.py:
Extended existing tooltip to include warp core strength. Warp core
strength is none for ships that do not have a hull bonus (venture etc.)
or do not have any warp core stabs fitted so logic is added to
default value to 0.
Changes to targetingMiscViewFull.py:
As above.
2017-10-29 20:40:39 +00:00
blitzmann
4355f35eef
Revert "Stop applying neut resistance twice" and instead remove the resistance application from addDrain()
...
This reverts commit 7b32fe08ac
2017-10-29 15:07:05 -04:00
Ryan Holmes
029e61edaf
Merge branch 'master' into issue-1315
2017-10-29 12:36:29 -04:00
blitzmann
82d50cfa0d
Fix effect that used to only be for skill, but is now for a booster ( #1324 )
2017-10-28 21:04:51 -04:00
blitzmann
d9800dcf19
Fix some effects for #1320
2017-10-28 19:45:09 -04:00
blitzmann
3b61a07c55
Fix for #1321 - make sure we have attribute on ship
2017-10-28 19:25:15 -04:00
burnsypet
7b32fe08ac
Stop applying neut resistance twice
...
Energy neut/nos resistance was being applied twice when a nos or
neut is projected onto a fit. I have removed the redundant resistance
application in energyneutralizerfalloff.py and also in
energynosferatufalloff.py as they are already being applied once in
eos.saveddata.fit.addDrain.
2017-10-26 17:53:16 +01:00
Ryan Holmes
fd6e318ae3
Release/v1.33.0 ( #1319 )
...
* update database file to SISI 1202899
* Effect and group renaming
* Add civilian modules (#1308 )
* Add new effects
* update effect headers
* update database to tq - lifeblood (1203953)
* Update renders
* Update icons
* bump version
* fix tox errors
* change up tox config to ignore E722
* more tox ignores
* Try disabling tests for now. Rifter stats changed, causing breakage. This is why we need properly mocked data, not crap straight from the database.
* Try this
* more testing
* Fuck it, disable branch protection until I can evaluate the test failures and what needs to be done to get them back on the path
2017-10-25 23:33:05 -04:00
Ryan Holmes
3fb7411b9d
Issue/1305 ( #1311 )
...
* Bump dev version
* fix issue in itemDiff
* Do not apply Prop Jamming to Grapplers (#1305 )
2017-10-08 21:13:38 -04:00
Ryan Holmes
72062e6213
Release/1.32.0 ( #1300 )
...
* update database
* update effect headers
* Bump version
2017-09-24 16:43:51 -04:00
Ryan Holmes
f37f4573bf
Add missing effect ( #1290 )
2017-09-20 00:11:32 -04:00
burnsypet
a01284ff1c
Convert booster attribute to value before applying
...
Changes to boostermissilevelocitypenalty.py:
Get booster attribute value using booster.getModifiedItemAttr()
before attempting to apply it to avoid type error
2017-09-14 21:53:53 +01:00
blitzmann
eda6d738a4
fix some whitespace stuff, update database, effect headers, and release version
2017-08-16 20:39:26 -04:00
blitzmann
47cbc71e8a
Implement simple skill import/export functionality, and some cleanup top pass tox
2017-08-14 23:28:50 -04:00
blitzmann
ead595e666
Allow burst projector to be projected
2017-08-13 21:19:55 -04:00
blitzmann
66752b2cbf
Fix cargo bonus for Covert subsytems ( #1246 )
2017-07-15 21:51:32 -04:00
blitzmann
22dc6512c0
Final updates and bump version :D
2017-07-11 19:39:13 -04:00
blitzmann
d19486ce15
cleanup
2017-07-11 02:30:26 -04:00
blitzmann
3da0b8bc29
Effect header update
2017-07-11 01:31:02 -04:00
blitzmann
f2e8506ea7
Merge remote-tracking branch 'origin/singularity' into development
2017-07-10 01:39:32 -04:00
blitzmann
496b28226d
Merge branch 'feature/booster-side-effects' into development
2017-07-09 18:26:38 -04:00
blitzmann
78b273455d
Fix up some effects
2017-07-09 14:44:57 -04:00
blitzmann
de35692666
Fix a few things with affected by tab (indentation issue, overwriting modifier incorrectly)
2017-07-09 13:18:28 -04:00
Wenda Zhou
afee4469f0
fix loki effects to apply correctly
2017-07-07 00:26:38 -04:00
blitzmann
e9c691575f
Fix RR effect
2017-07-05 23:48:44 -04:00
blitzmann
27236feec3
Add new effects
2017-07-03 22:24:27 -04:00
blitzmann
58a242f753
update effect headers
2017-06-27 21:03:16 -04:00
blitzmann
5c2cf6dd15
Add last bit of t3 effects from sisi data
2017-06-27 21:02:27 -04:00
blitzmann
287f3bc510
Fix some broken effects (due to effect renames)
2017-06-25 02:54:14 -04:00
blitzmann
ad0d55faed
update effect headers
2017-06-25 01:21:37 -04:00
blitzmann
910ae6315d
More work on subsystems
2017-06-25 01:19:48 -04:00
blitzmann
25b4d3a45b
More work on strat cruiser updates
2017-06-25 00:33:36 -04:00
blitzmann
f355cb3a72
Update effect headers
2017-06-25 00:18:06 -04:00
blitzmann
ff58648f94
start picking at strat cruiser update
2017-06-21 22:19:37 -04:00
Ryan Holmes
828b18d0fd
py2to3 automatic conversion. Woot!
2017-06-12 16:12:45 -04:00
