v2.6.3.4 Alpha #696
Merged
v2.6.3.4 Alpha #696
Conversation
This file contains 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
* add goal to tell paul you won't send distress signal * use M04PlayerLikesUNATCO_Played flag for "You're not a terrorist" goal * add "Not big into books" goal * add "The mark of the educated man" bingo goal * add "Talk to Jaime" bingo goal * add "PaulToTong"/"SavedPaul" mutual exclusion * add "Kill El Rey" bingo goal * add "JoshuaInterrupted_Played" bingo goal
… some more goals (#693) * add bingo failure functions * add "LebedevLived" bingo goal * don't mark bingo goals as succeeeded if they're already marked as failed * require killing anna for "LebedevLived" bingo goal * separate MarkBingo and MarkBingoAsFailed functions * don't mark bingo goals if they've already been marked as failed * clarify that "LebedevLived" require killing Anna * don't repeat mutually_exclusive indices * add "AimeeLeMerchantLived" bingo goal * add "OverhearLebedev_Played" bingo goal * remove unused variable from IsBingoFailed * add *_AllianceEliminated markings to _AddPawnDeath and "ThugGang_AllianceEliminated" bingo goal * move logic from various Died functions to _AddPawnDeath * monitered -> monitored Co-authored-by: Die4Ever <30947252+Die4Ever@users.noreply.github.com> * separate *_AllianceEliminated into *_AllianceUnconscious and *_AllianceDead * set progress to 0 in MarkBingoAsFailed * use correct bindname for Le Merchant * display a message when a goal gets marked as failed * add "GiveZyme" bingo goal * add *._BindNameDead and *._BindNameUnconscious _MarkBingo calls * add "MarketKid_BindNameUnconscious" bingo goal, disabled * add "MaggieLived" bingo goal * add return statement to the end of PlayerDataItem.MarkBingoAsFailed * remove index from commented out "MarketKid_BindNameUnconscious" bingo goal Co-authored-by: Die4Ever <30947252+Die4Ever@users.noreply.github.com> * Update DXRModules/DeusEx/Classes/DXREvents.uc Co-authored-by: Die4Ever <30947252+Die4Ever@users.noreply.github.com> --------- Co-authored-by: Die4Ever <30947252+Die4Ever@users.noreply.github.com>
since the upgrades after that aren't OP
Die4Ever
commented
Apr 13, 2024
| @@ -112,10 +115,11 @@ simulated function bool CanHeal() | |||
| #endif | |||
|
|
|||
| #ifdef injections | |||
| if (_CanHeal()) { | |||
| if (_CanHeal()) | |||
There was a problem hiding this comment.
we could have a preprocessor definition for
Suggested change
| if (_CanHeal()) | |
| if (#var(mergedsuper)CanHeal()) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
previously on v2.6.3.3 Alpha: #691
previously on v2.6.3.1 Alpha: #684