Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make it run again #1

Merged
merged 10 commits into from
Dec 4, 2016
Merged

Make it run again #1

merged 10 commits into from
Dec 4, 2016

Conversation

Ebag333
Copy link
Collaborator

@Ebag333 Ebag333 commented Dec 2, 2016

I think if you merge this into yours, the PR will get updated.

At least, that's what I hope.

Ebag333 and others added 8 commits October 16, 2016 12:47
Moved the 4 remote rep subsystem effect bonuses to calculate early in
the engine.  This correctly calculates these bonuses for effects,
previously these effect bonuses wouldn't be calculated until after
projection calcs ran.
Drones can and often are in different stacks due to bandwidth and skills. The DNA would mess up in these cases because they would include duplicate ids with different numbers.

This commit groups the drones by the itemID before generating the DNA.

closes: pyfa-org#367
… into Ebag333-T3CSubRemoteRepEffect

Conflicts:
	eos/effects/subsystembonusamarrdefensive2remotearmorrepairamount.py
	eos/effects/subsystembonuscaldaridefensive2remoteshieldtransporteramount.py
	eos/effects/subsystembonusgallentedefensive2remotearmorrepairamount.py
	eos/effects/subsystembonusminmatardefensive2remoteshieldtransporteramount.py
…a-export

Groups drones before generating DNA
Except for 1 (clipboardXML), same number of lines of code in mainFrame,
lots of code gone from fit, and no more complicated.  Also spotted an
import reference that got missed.
@a-tal a-tal merged commit 6ef57e7 into a-tal:master Dec 4, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants