TR2/3 Fixes and minor enhancements #315
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
Shifts a secret in Tibet in room 1 if that room has been flooded.
- Fixes an issue in Ice Palace with multiple dragons potentially appearing at the end (JSON typo meant exclusions were being ignored). - Makes it possible for the dragon to appear in Offshore Rig (starting and wheel door animations sacrificed for dragon cutscene).
Moves 2 locations in room 68 of Wreck so that items can still be picked up after the barrels have settled.
Allow Marco in Rig.
Improvement to handling of Marco in Offshore Rig. If environment rando is not enabled, the plane area will never be drained, so this case is now handled (i.e. Marco's appearance will be undone). This adjusts environment rando by applying ConditionalAll after any other mods so that conditions can be based on aspects that may have changed here.
Adds all weapon and weapon animation models to Lara's home. The weapon at the end of the assault course will always remain as a weapon, and additional ammo for it will be added to the inventory.
Adds the small and large medi models, plus the harpoon projectile as a dependency of the gun itself.
Adds a very primitive start to mixing up enemy meshes. This is currently only applied if both sets of monks are in a level and docile chickens are switched off.
Ensures that any clones of Lara remain visible if Lara herself is invisible. This is done by duplicating the meshes before we clear them.
Converts wheel doors to regular doors in Rig if Marco is present because Lara's animation is overwritten in this case.
Closed
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.
The bulk of the new files in this PR are related to all the various model definitions for #312.
#302 TR2 - Wreck Locations
Fixes a couple of locations in Wreck room 68 so items can still be collected after the barrels have settled.
Closes #302.
#310 TR2 - Multiple Dragons
Resolves a problem in Ice Palace where multiple dragons could spawn together. This doesn't appear to cause the crashes seen initially with cross-level enemies, but it's disabled for now until a more controlled approach at multiple dragons per level can be put in place.
Marco can also now appear in Offshore Rig. This comes at the expense of sacrificing Lara's wheel door and starting animations. So if she's just standing when the level starts,
here be dragonshere be one dragon...#312 TR3 - Training Level Models
All models for standard pickups and Lara's weapon animations are now in place in Lara's home. A check is also done to ensure the gun at the end of the assault course remains as a gun, plus extra ammo will be given for it in the inventory.
Closes #312.
#313 TR2 - Tibet Secret Fix
If room 1's water level has been raised, a check is done for a particular secret to ensure it can still be picked up.
Closes #313.
#314 Enemy Mesh Swaps
Adds a chance of certain enemies looking like Lara as a very basic start to mesh editing. This currently only applies to TR2.