Fix some achievements #47
Merged
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
DmitryShaburov
commented
Apr 22, 2023
src/dlls/triggers.cpp
Outdated
Comment on lines
2072
to
2090
| if (pPlayer) | ||
| { | ||
| // residue processing map with all those conveyor belts | ||
| if (FStrEq(STRING(INDEXENT(0)->v.model), "maps/c2a4c.bsp")) | ||
| { | ||
| // trigger_push that player has to pass when taking the wrong turn and coming back to start | ||
| if (FStrEq(STRING(pev->model), "*78")) | ||
| { | ||
| ALERT(at_console, "RP_MOEBIUS TRIGGERED!!!\n"); | ||
| UTIL_VRGiveAchievement(pPlayer, VRAchievement::RP_MOEBIUS); | ||
| } | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
I suppose it'd be better to merge all 3 conditions into one with &&
PS: accidentally commited print debug, will remove, sorry :D
DmitryShaburov
commented
Apr 22, 2023
Comment on lines
+181
to
+183
| if (m_vrDragger | ||
| && m_vrDragger->IsNetClient() | ||
| && (FStrEq(STRING(pev->model), "models/agibs.mdl") || FStrEq(STRING(pev->model), "models/SD/agibs.mdl"))) |
There was a problem hiding this comment.
Also reformatted to multiline condition, otherwise line was quite long
maxvollmer
approved these changes
May 7, 2023
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.
This PR fixes following achievements:
Kill all the aliens with all the experiments
Issue: typo in
ifcondition, was checking twice form_exp1HeadcrabsKilled, ignoringm_exp2HeadcrabsKilledTested locally, achivements is working, amount of killed headcraps tracked correctly (5 in first and 7 in second)
Fry the Gargantua
Issue: Frying Gargantua with electricity had no effect on achievement.
Added logging on
pKiller->classnameandpKiller->targetnameand found that values in code doesn't match to what's happenning in game.Updated
classnametoenv_laserandtargetnametogargbeamsand got achievementPick up an alien gib
Issue: achievement was working only with HD models (
models/agibs.mdl).Added OR condition for SD models (
models/SD/agibs.mdl) and got achievement locallyRepeat the conveyor loop
Issue: interacting with push trigger had no effect on achievement, because it doesn't have
SF_TRIG_PUSH_ONCEflag set.For solution, I've moved entire achievement-related block with all
ifconditions insideelseblock of testing onSF_TRIG_PUSH_ONCEflag.Again, tested locally and got achievement.
Update, fixed more achievements:
Get teleported to all of Nihilanth's spaces
On your advice on Discord, moved achivement logic from Nihilanth to ActivateMultiTrigger.
Achievement unlocks when player is teleported to last space with Gargantua
Join the G-Man
Don't join the G-Man
These achievements didn't had any code related to them.
Decompiled map and added logic to TeleportTouch:
If player in last map and gets teleported to end credits / last battle these achivements unlock.
Tested locally.
Update part two:
Don't kill anything in the entire game (except Nihilanth and the Blast Pit tentacles ofc)
In Questionable Ethics upon entering the level with lobby, runaway saw machine was "killing"
monster_scientist_dead. Added it as exception.