Release V1.9.0 (#711)

Resolves #710.

CHANGELOG.md

@@ -1,13 +1,15 @@
-## [Unreleased](https://github.com/LostArtefacts/TR-Rando/compare/V1.8.4...master) - xxxx-xx-xx
+## [Unreleased](https://github.com/LostArtefacts/TR-Rando/compare/V1.9.0...master) - xxxx-xx-xx
+
+## [V1.9.0](https://github.com/LostArtefacts/TR-Rando/compare/V1.8.4...V1.9.0) - 2024-06-22
 - added support for TR1X V4 (#626)
 - added support for TR I-III Remastered (#614)
-- added Lara's assault course outfit in TR2 for outfit randomization (#672)
-- added gun holsters to Lara's robe outfit in TR2 (#672)
-- added an option to stack rewards with secrets in TR1 and TR3, rather than using reward rooms (#687)
-- added separate secret audio for TR1 and TR3 when not using reward rooms (#687)
 - added an option to shuffle items rather than randomize their types and locations in each level (#625)
 - added an option to control weapon allocation in item randomization (#690)
 - added an option to move enemies such as eels, whose placement can lead to forced damage or difficulty in passing (#311)
+- added an option to stack rewards with secrets in TR1 and TR3, rather than using reward rooms (#687)
+- added Lara's assault course outfit in TR2 for outfit randomization (#672)
+- added gun holsters to Lara's robe outfit in TR2 (#672)
+- added separate secret audio for TR1 and TR3 when not using reward rooms (#687)
 - added Finnish, Portuguese, and Swedish translations to TR1 and added all supported language translations to TRUB (#701)
 - fixed several potential key item softlocks in TR2 (#691)
 - fixed a key item softlock in Crash Site (#662)

README.md

@@ -2,14 +2,9 @@
    <img alt="TR Rando" src="Resources/randomizerlogo.png"/>
 </p>
 
-TR Rando is a randomizer tool for the classic Tomb Raider series (TR 1-3 and Unfinished Business). It allows you to change many aspects of the
+TR Rando is a randomizer tool for the classic Tomb Raider series (TR 1-3 and Unfinished Business) and Tomb Raider I-III Remastered. It allows you to change many aspects of the
 original levels, such as item pickups, secrets, enemies, Lara's appearance, level order, text...[and so much more](#features).
 
-> ## Tomb Raider I-III Remastered
-> The current release of the randomizer *does not work* with the remasters. Testing is currently underway on supporting these games; for the time being, support remains only for the _original_ games as detailed in [USING.md](USING.md).
->
-> <p align="right"><em>Rando Team</em><br/><em>2024-06-01</em></p>
-
 ## Installation
 
 1. Download the [latest version](https://github.com/LostArtefacts/TR-Rando/releases/latest), making sure to select the `TRRando` zip and not the source code.

TRImageControl/TRImage.cs

@@ -435,7 +435,7 @@ public void Overlay(TRImage image)
     {
         if (image.Size.Width > Size.Width || image.Size.Height > Size.Height)
         {
-            throw new InvalidOperationException();
+            image = image.Export(new(0, 0, Math.Min(image.Size.Width, Size.Width), Math.Min(image.Size.Height, Size.Height)));
         }
         Import(image, new(0, 0), true);
     }

TRRandomizerCore/Randomizers/TR1/Remastered/TR1REnemyRandomizer.cs

@@ -1,6 +1,5 @@
 using TRDataControl;
 using TRGE.Core;
-using TRLevelControl;
 using TRLevelControl.Helpers;
 using TRLevelControl.Model;
 using TRRandomizerCore.Helpers;

TRRandomizerCore/Randomizers/TR2/Classic/TR2OutfitRandomizer.cs

@@ -278,7 +278,7 @@ private bool Import(TR2CombinedLevel level, TR2Type lara)
                 if (lara == TR2TypeUtilities.GetAliasForLevel(level.Name, TR2Type.Lara))
                 {
                     // In case a previous attempt failed, we need to restore default texture mapping
-                    _outer.TextureMonitor.GetMonitor(level.Name)?.RemovedTextures?.Remove(TR2Type.Lara);
+                    _outer.TextureMonitor.GetMonitor(level.Name)?.RemovedTextures?.RemoveAll(t => t == TR2Type.Lara);
                 }
 
                 if (level.IsCutScene)

TRRandomizerCore/Resources/TR1/Environment/LEVEL5.PHD-Environment.json

@@ -65,77 +65,6 @@
           "Room": 2
         },
         "IfLandCreature": true
-      },
-      {
-        "Comments": "Make a ramp.",
-        "EMType": 7,
-        "Location": {
-          "X": 67072,
-          "Y": -2304,
-          "Z": 55808,
-          "Room": 2
-        },
-        "FloorClicks": -1,
-        "SlantType": 2,
-        "XSlant": -1
-      },
-      {
-        "Comments": "Move some faces to fit the ramp.",
-        "EMType": 23,
-        "Modifications": [
-          {
-            "RoomNumber": 2,
-            "FaceIndex": 81,
-            "VertexChanges": {
-              "2": {
-                "Y": -256
-              }
-            }
-          },
-          {
-            "RoomNumber": 2,
-            "FaceIndex": 79,
-            "VertexChanges": {
-              "0": {
-                "Y": -256
-              },
-              "3": {
-                "Y": -256
-              }
-            }
-          }
-        ]
-      },
-      {
-        "Comments": "Patch gaps.",
-        "EMType": 26,
-        "Quads": {
-          "2": [
-            {
-              "Type": 4,
-              "Vertices": [
-                177,
-                178,
-                92,
-                93
-              ],
-              "Texture": 13
-            }
-          ]
-        },
-        "Triangles": {
-          "2": [
-            {
-              "Type": 3,
-              "Vertices": [
-                93,
-                107,
-                177
-              ],
-              "Texture": 15
-            }
-          ]
-        }
       }
     ],
     [

TRRandomizerCore/Resources/TR2/Environment/FLOATING.TR2-Environment.json

@@ -88,23 +88,9 @@
           "Z": 55891,
           "Room": 152
         },
-        "Clicks": -4,
-        "FloorTexture": 65535,
-        "SideTexture": 1688,
-        "Flags": 7
-      },
-      {
-        "Comments": "Put another on top.",
-        "EMType": 1,
-        "Location": {
-          "X": 83440,
-          "Y": -9216,
-          "Z": 55891,
-          "Room": 152
-        },
-        "Clicks": -2,
+        "Clicks": -6,
         "FloorTexture": 1709,
-        "SideTexture": 1863,
+        "SideTexture": 1688,
         "Flags": 7
       }
     ],

TRRandomizerCore/Resources/TR2/Textures/Mapping/HOUSE.TR2-Textures.json

@@ -69,7 +69,7 @@
         "Segment": 8,
         "Tile": 9,
         "X": 96,
-        "Y": 96
+        "Y": 56
       },
       {
         "Segment": 9,

TRRandomizerView/App.xaml.cs

@@ -21,7 +21,6 @@ static App()
     }
 
     public string Title { get; private set; }
-    public string Description { get; private set; }
     public string Version { get; private set; }
     public string TaggedVersion { get; private set; }
     public string Copyright { get; private set; }
@@ -32,20 +31,14 @@ public App()
 
         Assembly assembly = Assembly.GetExecutingAssembly();
 
-        object[] attributes = assembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false);
+        object[] attributes = assembly.GetCustomAttributes(typeof(AssemblyProductAttribute), false);
         if (attributes.Length > 0)
         {
-            Title = ((AssemblyTitleAttribute)attributes[0]).Title;
+            Title = ((AssemblyProductAttribute)attributes[0]).Product;
         }
         else
         {
-            Title = "TRRandomizer";
-        }
-
-        attributes = assembly.GetCustomAttributes(typeof(AssemblyProductAttribute), false);
-        if (attributes.Length > 0)
-        {
-            Description = ((AssemblyProductAttribute)attributes[0]).Product;
+            Title = "Tomb Raider Randomizer";
         }
 
         attributes = assembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false);

TRRandomizerView/Controls/FolderLoadControl.xaml

@@ -47,15 +47,20 @@
         <StackPanel HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Orientation="Horizontal">
-            <Image Width="40"
-                   Source="..\Resources\rando.png"/>
-
+            <Image Source="..\Resources\rando_sm.png"/>
             <TextBlock Text="{Binding AppTitle}"
-                       Foreground="{StaticResource ThemeColour7}"
                        VerticalAlignment="Center"
                        FontSize="40"
-                       Margin="10,0,0,2"
-                       FontWeight="Bold"/>
+                       Margin="10,0,0,2">
+                <TextBlock.Foreground>
+                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,1" >
+                        <GradientStopCollection>
+                            <GradientStop Color="#0B518A" Offset="0.2"/>
+                            <GradientStop Color="#2276A8" Offset="0.5"/>
+                        </GradientStopCollection>
+                    </LinearGradientBrush>
+                </TextBlock.Foreground>
+            </TextBlock>
         </StackPanel>
 
         <StackPanel 
@@ -66,12 +71,14 @@
             Orientation="Horizontal">
             <TextBlock 
                 Text="Open a Tomb Raider Data folder to get started. The folder must contain *.PHD (TRI) or *.TR2 (TRII/TRIII) level files." 
+                FontSize="14"
                 VerticalAlignment="Center"/>
             <Button 
                 Padding="15,4" 
                 Margin="20,0,0,0" 
                 Content="Browse" 
                 VerticalAlignment="Center"
+                Style="{StaticResource AltCallToAction}"
                 Command="cmds:WindowCommands.Open"/>
         </StackPanel>
 

TRRandomizerView/TRRandomizerView.csproj

@@ -20,9 +20,9 @@
     <SelfContained>false</SelfContained>
     <ApplicationIcon>Resources\rando.ico</ApplicationIcon>
 
-    <Version>1.8.4</Version>
+    <Version>1.9.0</Version>
     <Product>Tomb Raider Randomizer</Product>
-    <Copyright>Copyright © Tomb Raider Community 2023</Copyright>
+    <Copyright>Copyright © Tomb Raider Community 2024</Copyright>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Resources\arrows.png" />
@@ -52,6 +52,7 @@
     <None Remove="Resources\loading.png" />
     <None Remove="Resources\rando.ico" />
     <None Remove="Resources\rando.png" />
+    <None Remove="Resources\rando_sm.png" />
     <None Remove="Resources\up.png" />
   </ItemGroup>
   <ItemGroup>
@@ -90,6 +91,7 @@
     <Resource Include="Resources\loading.png" />
     <Resource Include="Resources\rando.ico" />
     <Resource Include="Resources\rando.png" />
+    <Resource Include="Resources\rando_sm.png" />
     <Resource Include="Resources\up.png" />
   </ItemGroup>
 </Project>

TRRandomizerView/Windows/AboutWindow.xaml

@@ -12,7 +12,7 @@
         ShowInTaskbar="False"
         Loaded="Window_Loaded"
         SizeToContent="Height"
-        Title="{Binding AboutTitle}" Width="550">
+        Title="{Binding Title}" Width="550">
     <Grid Margin="10">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="150"/>
@@ -27,7 +27,8 @@
         <Image Grid.RowSpan="2"
                VerticalAlignment="Top"
                Width="120"
-               HorizontalAlignment="Left"
+               Margin="0,5,10,0"
+               HorizontalAlignment="Center"
                Source="..\Resources\rando.png"/>
 
         <StackPanel Grid.Column="1">
@@ -36,8 +37,8 @@
                        Foreground="{StaticResource ThemeColour7}">
                 <TextBlock.Text>
                     <MultiBinding StringFormat="{}{0} {1}">
-                        <Binding Path="AppTitle"/>
-                        <Binding Path="Version"/>
+                        <Binding Path="Title"/>
+                        <Binding Path="TaggedVersion"/>
                     </MultiBinding>
                 </TextBlock.Text>
             </TextBlock>
@@ -101,7 +102,7 @@
             </TextBlock>
 
             <TextBlock Margin="0,20,0,0">
-                Icon made by 
+                Icon adapted from original by 
                 <Hyperlink ToolTip="https://www.flaticon.com/authors/kiranshastry" 
                            NavigateUri="https://www.flaticon.com/authors/kiranshastry"
                            RequestNavigate="Hyperlink_RequestNavigate">

TRRandomizerView/Windows/AboutWindow.xaml.cs

@@ -6,63 +6,11 @@ namespace TRRandomizerView.Windows;
 
 public partial class AboutWindow : Window
 {
-    #region Dependency Properties
-    public static readonly DependencyProperty AboutTitleProperty = DependencyProperty.Register
-    (
-        "AboutTitle", typeof(string), typeof(AboutWindow)
-    );
-
-    public static readonly DependencyProperty AppTitleProperty = DependencyProperty.Register
-    (
-        "AppTitle", typeof(string), typeof(AboutWindow)
-    );
-
-    public static readonly DependencyProperty VersionProperty = DependencyProperty.Register
-    (
-        "Version", typeof(string), typeof(AboutWindow)
-    );
-
-    public static readonly DependencyProperty CopyrightProperty = DependencyProperty.Register
-    (
-        "Copyright", typeof(string), typeof(AboutWindow)
-    );
-
-    public string AboutTitle
-    {
-        get => (string)GetValue(AboutTitleProperty);
-        private set => SetValue(AboutTitleProperty, value);
-    }
-
-    public string AppTitle
-    {
-        get => (string)GetValue(AppTitleProperty);
-        private set => SetValue(AppTitleProperty, value);
-    }
-
-    public string Version
-    {
-        get => (string)GetValue(VersionProperty);
-        private set => SetValue(VersionProperty, value);
-    }
-
-    public string Copyright
-    {
-        get => (string)GetValue(CopyrightProperty);
-        private set => SetValue(CopyrightProperty, value);
-    }
-    #endregion
-
     public AboutWindow()
     {
         InitializeComponent();
         Owner = WindowUtils.GetActiveWindow(this);
-        DataContext = this;
-
-        App app = (App)Application.Current;
-        AboutTitle = "About " + app.Title;
-        AppTitle = app.Description;
-        Version = app.TaggedVersion;
-        Copyright = app.Copyright;
+        DataContext = Application.Current;
     }
 
     private void Window_Loaded(object sender, RoutedEventArgs e)

TRRandomizerView/Windows/MessageWindow.xaml

@@ -10,7 +10,7 @@
         ShowInTaskbar="False"
         Loaded="Window_Loaded"
         SizeToContent="Height"
-        Title="TR Rando" Height="200" Width="420">
+        Height="200" Width="420">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>

TRRandomizerView/Windows/MessageWindow.xaml.cs

@@ -108,6 +108,7 @@ private MessageWindow(string message, Icon icon, MessageBoxButton buttons, strin
         InitializeComponent();
         Owner = WindowUtils.GetActiveWindow(this);
         DataContext = this;
+        Title = ((App)Application.Current).Title;
 
         Message = message;
         Details = details;