Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 9.x
- name: Restore dependencies
run: dotnet restore
- name: Build
Expand Down
4 changes: 2 additions & 2 deletions GoRogue.Debugger/GoRogue.Debugger.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<!-- Enable C# 8.0 and nullable reference features -->
<LangVersion>8.0</LangVersion>
<Nullable>enable</Nullable>
Expand Down Expand Up @@ -62,7 +62,7 @@
<ItemGroup>
<!-- ReSharper disable once VulnerablePackage -->
<PackageReference Include="dotnet-curses" Version="1.0.2" />
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0">
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions GoRogue.PerformanceTests/GoRogue.PerformanceTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>default</LangVersion>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
<PackageReference Include="BenchmarkDotNet" Version="0.15.0" />
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion GoRogue.Profiler/GoRogue.Profiler.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion GoRogue.Snippets/GoRogue.Snippets.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions GoRogue.UnitTests/Effects/AdvancedEffectTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ public void EffectToString()
public void EffectTriggerAdd()
{
var effectTrigger = new AdvancedEffectTrigger<int>();
Assert.Equal(0, effectTrigger.Effects.Count);
Assert.Empty(effectTrigger.Effects);

effectTrigger.Add(new AdvancedIntEffect("Test Effect 1", 1, Args));
Assert.Equal(1, effectTrigger.Effects.Count);
Assert.Single(effectTrigger.Effects);

effectTrigger.Add(new AdvancedIntEffect("Test Effect 2", 2, Args));
Assert.Equal(2, effectTrigger.Effects.Count);
Expand All @@ -80,7 +80,7 @@ public void EffectTriggerEffects()

effectTrigger.Add(effect2);
effectTrigger.TriggerEffects(5);
Assert.Equal(1, effectTrigger.Effects.Count);
Assert.Single(effectTrigger.Effects);
Assert.Equal(multiDuration - 1, effectTrigger.Effects[0].Duration);
Assert.Equal(1, effect1.Duration);

Expand All @@ -101,7 +101,7 @@ public void EffectTriggerEffects()
Assert.Equal(2, secEffectTrigger.Effects.Count);

secEffectTrigger.TriggerEffects(5);
Assert.Equal(1, secEffectTrigger.Effects.Count);
Assert.Single(secEffectTrigger.Effects);
Assert.Equal(1, secEffectTrigger.Effects[0].Duration); // Must have cancelled
}
}
Expand Down
8 changes: 4 additions & 4 deletions GoRogue.UnitTests/Effects/EffectTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ public void EffectToString()
public void EffectTriggerAdd()
{
var effectTrigger = new EffectTrigger();
Assert.Equal(0, effectTrigger.Effects.Count);
Assert.Empty(effectTrigger.Effects);

effectTrigger.Add(new IntEffect("Test Effect 1", 1));
Assert.Equal(1, effectTrigger.Effects.Count);
Assert.Single(effectTrigger.Effects);

effectTrigger.Add(new IntEffect("Test Effect 2", 2));
Assert.Equal(2, effectTrigger.Effects.Count);
Expand All @@ -78,7 +78,7 @@ public void EffectTriggerEffects()

effectTrigger.Add(effect2);
effectTrigger.TriggerEffects();
Assert.Equal(1, effectTrigger.Effects.Count);
Assert.Single(effectTrigger.Effects);
Assert.Equal(multiDuration - 1, effectTrigger.Effects[0].Duration);
Assert.Equal(1, effect1.Duration);

Expand All @@ -99,7 +99,7 @@ public void EffectTriggerEffects()
Assert.Equal(2, secEffectTrigger.Effects.Count);

secEffectTrigger.TriggerEffects();
Assert.Equal(1, secEffectTrigger.Effects.Count);
Assert.Single(secEffectTrigger.Effects);
Assert.Equal(1, secEffectTrigger.Effects[0].Duration); // Must have cancelled
}
}
Expand Down
22 changes: 22 additions & 0 deletions GoRogue.UnitTests/GameFramework/GameFrameworkTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,28 @@ public void TransparencyViewUpdatesOnRemove()
Assert.True(map.TransparencyView[1, 1]);
}

[Theory]
[InlineData(true)]
[InlineData(false)]
public void TransparencyViewUpdatesOnChange(bool useCachedGridViews)
{
var map = new Map(10, 10, 1, Distance.Chebyshev, useCachedGridViews: useCachedGridViews);

var obj = new GameObject((1, 1), 0, false, isTransparent: true);
map.SetTerrain(obj);

var obj2 = new GameObject((1, 1), 1, true, false);
map.AddEntity(obj2);

Assert.False(map.TransparencyView[obj2.Position]);

obj2.IsTransparent = true;
Assert.True(map.TransparencyView[obj2.Position]);

obj2.IsTransparent = false;
Assert.False(map.TransparencyView[obj2.Position]);
}

[Fact]
public void GetObjectsAt()
{
Expand Down
19 changes: 11 additions & 8 deletions GoRogue.UnitTests/GoRogue.UnitTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>

<!-- Enable C# 8.0 nullable reference feature -->
Expand All @@ -18,22 +18,25 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0">
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="RoyT.AStar" Version="3.0.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="1.2.1" />
<PackageReference Include="XUnit.ValueTuples" Version="1.0.1" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions GoRogue.UnitTests/MapGeneration/GeneratorTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void ConstructionValidSizes(int width, int height)
Assert.Equal(height, generator.Context.Height);

Assert.NotNull(generator.GenerationSteps);
Assert.Equal(0, generator.GenerationSteps.Count);
Assert.Empty(generator.GenerationSteps);
}

[Theory]
Expand Down Expand Up @@ -125,7 +125,7 @@ public void AddStepAddsToList()
var step = new MockGenerationStep(null);

_generator.AddStep(step);
Assert.Equal(1, _generator.GenerationSteps.Count);
Assert.Single(_generator.GenerationSteps);
Assert.Same(step, _generator.GenerationSteps[0]);

var step2 = new MockGenerationStep(null);
Expand Down
2 changes: 1 addition & 1 deletion GoRogue/GameFramework/Map.cs
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ private void Map_ObjectRemovedSyncViews(object? sender, ItemEventArgs<IGameObjec
: FullIsTransparent(e.Position);

e.Item.WalkabilityChanged -= Item_WalkabilityChangedSyncView;
e.Item.TransparencyChanged += Item_TransparencyChangedSyncView;
e.Item.TransparencyChanged -= Item_TransparencyChangedSyncView;
}

private void Item_WalkabilityChangedSyncView(object? sender, ValueChangedEventArgs<bool> e) => _cachedWalkabilityView![((IGameObject)sender!).Position] = e.NewValue;
Expand Down
8 changes: 4 additions & 4 deletions GoRogue/GoRogue.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Basic package info -->
<TargetFrameworks>netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net5.0;net6.0;net7.0;net8.0;netcoreapp3.1;netstandard2.1;net9.0</TargetFrameworks>
<RootNamespace>GoRogue</RootNamespace>
<Authors>Chris3606</Authors>
<Copyright>Copyright © 2023 Christopher Ridley (Chris3606)</Copyright>
Expand Down Expand Up @@ -79,14 +79,14 @@

<!-- Dependencies -->
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0">
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="OptimizedPriorityQueue" Version="4.2.0" />
<PackageReference Include="ShaiRandom" Version="0.0.2" />
<PackageReference Include="TheSadRogue.Primitives" Version="1.6.0-rc3" />
Expand Down
7 changes: 6 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]

- None
### Added
- Added .NET 8 and 9 explicit multi-targets

### Fixed
- `GameFramework.Map` now handles transparency changes properly (thanks Sofistico!)
- `DiceNotation.Parser` now handles negative numbers correctly

## [3.0.0-beta09] - 2023-12-05
### Removed
Expand Down