Allow multiple bounties on same target. #82
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Console command to validate a bounty now includes `existing_target_memkey` in its calculation. - This is only a change to the console command; the bounty generation itself included this already. **Misc** - Fixed a few Kotlin extension methods requiring non-null params despite underlying method not needing them (thanks @niko).
And updates for LazyLib.
…tFaction` keys. - Fixed Bounty Board not taking into account `trigger_playerRelationship` keys.
…g xml serialization.
…aintjob name and description
Supports new {paintjobId}.paintjob file, this file handles visual changes to a Ships Deco's, Engines, and Shield.
… `permaMods`/`sMods` correctly (reported by arbiter787).
…ts not completing.
[BREAKS SAVES!] This requires a new save. Allows multiple bounty keys to be put on MagicBountyBattleListener This was added to fix Seeker bounties. As they have several bounties that target the same fleet.
This reverts commit 47d60f8.
[BREAKS SAVES!] This requires a new save. Allows multiple bounty keys to be put on MagicBountyBattleListener This was added to fix Seeker bounties. As they have several bounties that target the same fleet.
# Conflicts: # .run/Run Starsector.run.xml # CHANGELOGS.md # MagicLib-Kotlin/MagicLib-Kotlin.iml # MagicLib.iml # jars/MagicLib-Kotlin.jar # jars/MagicLib.jar # magiclib.version # mod_info.json # src/org/magiclib/achievements/MagicAchievement.java # src/org/magiclib/achievements/MagicAchievementManager.java
Co-authored-by: Wisp <1343347+wispborne@users.noreply.github.com>
Co-authored-by: Wisp <1343347+wispborne@users.noreply.github.com> Co-authored-by: Ruddygreat <ruddygreat1@gmail.com>
…which joins strings in a list using different separators based on the number of elements
…e dynamic descriptions and tooltips using `magicJoinToString`.
Also variable naming changes.
… in two different battles. Also added support for completing a bounty that you didn't accept (if another bounty spawned the fleet).
…lity for bounty handling.
Member
|
Talked about it via DMs, but TLDR for others: I merged dev into the PR, which apparently is something I can do. Also, this PR no longer breaks saves! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Allows multiple bounty keys to be put on MagicBountyBattleListener
This was added to fix Seeker bounties, as they have several bounties that target the same fleet.
When completing a bounty, it would only complete a single bounty and might leave the one you accepted forever stuck in "accepted", never to be completed.