Miscellaneous TRR fixes #704
Conversation
lahm86
force-pushed
the
trr-fixes
branch
10 times, most recently
from
39ca469 to
6852961
Compare
Thanks to Zenuriko for the tip here on playing outwith Steam. Also added some general FAQs and updated showcases.
TRR uses bigger font. This is more succinct anyway.
TRGE will just swap the OGG files around, so it's not as random as classic, but it's something.
Slight change in patch 3, although we don't use these files yet we still back them up.
This only affected TRR because of the way we merge the PDP files, but ultimately this performs a better check on alias priorities before import i.e. if the level already has an alias of a type and it's the "chosen one", remove the other's blob before proceeding. TR3 aliases for Lara misc are ignored because none contain critical commands like ending the level.
One of those "only happens in production" issues.
The added item in HSC could not be picked up, assume it's related to item limit. OG pistols moved instead. In Rig, pistols guaranteed in OG position too.
This animation was restored in TR3R, so don't move Lara in this case - similarly handled already in Rig and HSH in TR2.
If an outfit import attempt fails, and the subsequent allocation is the level's default outfit, texture mapping will have been wiped out on the first attempt. This restores it. Only applicable to TR2.
Looking at them again, I agree. I've restored the originals but kept a second one for each game, just to showcase texture rando mainly. The originals are brighter and do stand out better. |
Consider enemies 71/72 in Wreck - if they are allocated either of the first two keys, it's a softlock. While the room is valid en-route, the enemies' trigger is beyond the keyhole. For shuffled mode, it's too complicated to re-allocate, so we just disable key drops in that scenario. For normal mode, the triggers are taken into consideration.
T-rex and bird monster relocations defined.
| @@ -118,6 +118,17 @@ private void CleanRemovalList() | |||
| cleanedEntities.Add(type); | |||
| } | |||
| } | |||
|
|
|||
| for (int i = cleanedEntities.Count - 1; i >= 0; i--) | |||
There was a problem hiding this comment.
This seems safer and easier to understand than the reverse iteration through a list that is being modified.
var dependencies = TypesToImport.SelectMany(t => Data.GetDependencies(t)).Select(t => Data.TranslateAlias(t));
TypesToRemove = cleanedEntities.Where(e => !dependencies.Contains(e)).ToList();
Alternatively could the check be added above? Aanother entityClean step - then it just wouldn't be added in the first place.
There was a problem hiding this comment.
Thanks, I've gone with the approach suggested. I think it's safest to do this at the end so that the full list is iterated first in case there are two types with the same dependency, like MaskedGoon2 and MaskedGoon3, who both depend on MaskedGoon1. Then we're not doing the same dependency check twice.
| } | ||
| } | ||
|
|
||
| return triggerRooms; |
There was a problem hiding this comment.
This could be a fairly simple looking Linq one-liner if Room knew what number room it was - but perhaps something for the future.
There was a problem hiding this comment.
Yes, that would be good to implement. I don't think we shuffle rooms around anywhere so it's probably not something that would need management, but can have a think about it for the future. I've tidied it up for now anyway with some Linq so it's less loopy, and there is a test to cover it as well.
Checklist
Description
Fixes some loose ends for TRR, plus a couple of fixes for classic too.
TRR
Modified by TRRandostamp is now justTRRandoas TRR font size is comparatively largeClassic
Anyenvironment mods so they match the order they're written in. These are normally independent mods, but there was a group in Atlantis where the order did matter, so safest just to assume the written order is fact.Both