blitzmann
46098f2127
Merge branch 'master' into release/1.36
2018-03-25 03:00:28 -04:00
Ryan Holmes
2005d0b0b9
Merge pull request #1494 from Neugeniko/Issue#1439-2
...
Respect 'Factor in Reload' preference for sustainable tank (tidied up).
2018-03-25 02:59:48 -04:00
blitzmann
3293380515
styling fix
2018-03-24 18:18:16 -04:00
Neugeniko
68e5b22fe2
Implement effect for Standup Warp Disruption Burst Projector.
...
Make active so we can see its effect on capacitor.
(cherry picked from commit 03c2088e6b
2018-03-24 17:59:49 -04:00
Neugeniko
0f7dd7cc0c
Correct the structure guidance enhancers to apply bonuses to relevant charges.
...
(cherry picked from commit 5c20ee7ade
2018-03-24 17:59:34 -04:00
Neugeniko
0713251685
Redefine scrambler operation.
...
If we are projecting effects, modify warpScrambleStatus all the time, and turn off modules requiring 'High Speed Maneuvering' (MWDs) or "Micro Jump Drive Operation" (MJD etc) if a scrambling script is loaded.
(cherry picked from commit 04c62aabea
2018-03-24 17:59:23 -04:00
Neugeniko
3fda62e320
Redefne structure mounted disruptor operation
...
If we are projecting effects, modify warpScrambleStatus all the time, and turn off modules requiring 'High Speed Maneuvering' (MWDs) or "Micro Jump Drive Operation" (MJD etc) if a scrambling script is loaded.
(cherry picked from commit 0994158abd
2018-03-24 17:59:08 -04:00
Neugeniko
5f1c2d6676
Redefine Warp Disruption Field Generators operation
...
If we are applying effects onto our self, disallowAssistance all the time, and go into low mass/high sig etc mode when no script is loaded.
If we are projecting effects, modify warpScrambleStatus all the time, and turn off modules requiring 'High Speed Maneuvering' (MWDs) or "Micro Jump Drive Operation" (MJD etc) if a scrambling script is loaded.
(cherry picked from commit 77a66a66ea
2018-03-24 17:58:52 -04:00
blitzmann
c0ba559ca6
Merge branch 'master' into release/1.36
2018-03-24 17:52:22 -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
bd90ec4bf0
Don't fail an api update when a skill has been removed ( #1473 )
2018-03-21 22:12:21 -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
Ryan Holmes
bd6793bc19
Merge pull request #1498 from Neugeniko/Issue#1484
...
Create basic effects files for various modules.
2018-03-21 21:18:08 -04:00
Ryan Holmes
6dd6452c11
Merge pull request #1491 from Neugeniko/Capsimreload
...
CapSim changes to make reloadtime a variable.
2018-03-21 21:03:40 -04:00
blitzmann
24d14d5e19
Fix attribute that was changed on some items
2018-03-21 20:48:05 -04:00
blitzmann
a2f48e8944
update effects and a few tox fixes
2018-03-21 20:18:00 -04:00
blitzmann
122d8ef367
Add Monitor effects
2018-03-20 23:01:05 -04:00
blitzmann
281d2ed1f4
Add Praxis effect
2018-03-20 22:55:12 -04:00
blitzmann
48924774f9
Add drake navy issue effects
2018-03-20 22:53:34 -04:00
blitzmann
ee00914a2b
Renamed attribute
2018-03-20 22:49:40 -04:00
Neugeniko
96b701687b
pep 8
2018-03-17 13:53:03 +11:00
Neugeniko
e1e90cc23e
pep 8
2018-03-17 13:43:19 +11:00
Neugeniko
f41ecae8c8
Add a minimal effects files for mjfg, lance dd's,
...
reaper dd's, bosonic dd's and gtfo dd's.
2018-03-17 13:23:58 +11: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
4fc93f7089
Respect 'Factor in Reload' preference for sustainable tank (tidied up).
2018-03-17 09:39:50 +11:00
Neugeniko
234f36c8c0
Zero reload times when reloads are off so we can group modules
...
with normally different reload times.
2018-03-16 15:57:14 +11:00
Neugeniko
61086989dc
Need to wait speed + reactivation delay between void bomb.
2018-03-14 16:04:15 +11:00
Neugeniko
023ea43611
Divide by numShots not need as we do that below.
2018-03-14 15:39:20 +11:00
Neugeniko
044e032ab3
Allow variable reload time in CapSim.
2018-03-14 13:40:49 +11:00
Neugeniko
da7b95041d
Allow variable reload time in CapSim.
2018-03-14 13:40:31 +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
blitzmann
373e0a390b
Don't multiple HP of structure, instead assign it. Fixes #1460
2018-03-04 19:42:28 -05:00
blitzmann
f773e0a935
fix misplaced parentheses
...
(cherry picked from commit 2a60216a92d39bb200c26bce8573484f54a80dc5)
2018-03-01 00:26:52 -05:00
blitzmann
7ab3ad9e08
Don't delete and recreate skills when updating char sheet. Instead, get each individual skill and change level.
...
(cherry picked from commit 55c79c1bafaa9a1b159b73a72c6480f7e8d6cb6b)
2018-03-01 00:26:47 -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
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
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
89b6e8f8c3
fix tox stuff
2018-02-14 22:15:48 -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
