From 02b063c0fdb1f9a588202c5a866930bed8f73b53 Mon Sep 17 00:00:00 2001
From: Pyrdacor <trobt@web.de>
Date: Sun, 25 Apr 2021 14:59:09 +0200
Subject: [PATCH] This is v0.7.0beta

---
 Ambermoon.Common/Ambermoon.Common.csproj              |  2 +-
 Ambermoon.Core/Ambermoon.Core.csproj                  |  6 +++---
 Ambermoon.Core/Game.cs                                | 11 +++++++----
 Ambermoon.Data.Common/Ambermoon.Data.Common.csproj    |  4 ++--
 Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj    |  4 ++--
 .../Ambermoon.Renderer.OpenGL.csproj                  |  6 +++---
 Ambermoon.net/Ambermoon.net.csproj                    | 10 +++++-----
 7 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/Ambermoon.Common/Ambermoon.Common.csproj b/Ambermoon.Common/Ambermoon.Common.csproj
index eb6a64da..2fc5e842 100644
--- a/Ambermoon.Common/Ambermoon.Common.csproj
+++ b/Ambermoon.Common/Ambermoon.Common.csproj
@@ -8,7 +8,7 @@
     <RepositoryType>Github</RepositoryType>
     <Description>Library that contains basic stuff for other Ambermoon libraries.</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>6.2.0</Version>
+    <Version>7.0.0</Version>
   </PropertyGroup>
 
 </Project>
diff --git a/Ambermoon.Core/Ambermoon.Core.csproj b/Ambermoon.Core/Ambermoon.Core.csproj
index 04f3c534..9130bc3b 100644
--- a/Ambermoon.Core/Ambermoon.Core.csproj
+++ b/Ambermoon.Core/Ambermoon.Core.csproj
@@ -4,7 +4,7 @@
     <LangVersion>8</LangVersion>
     <RootNamespace>Ambermoon</RootNamespace>
     <UserSecretsId>5ff861f6-0255-427a-978a-7a8030ee8731</UserSecretsId>
-    <Version>6.2.0</Version>
+    <Version>7.0.0</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebugType>full</DebugType>
@@ -16,8 +16,8 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Ambermoon.Data.Common" Version="6.2.0" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+    <PackageReference Include="Ambermoon.Data.Common" Version="7.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Ambermoon.Core/Game.cs b/Ambermoon.Core/Game.cs
index 6add4205..af488ddb 100644
--- a/Ambermoon.Core/Game.cs
+++ b/Ambermoon.Core/Game.cs
@@ -8172,12 +8172,15 @@ void ChangeLightRadius()
                     {
                         if (mapChange && !CurrentSavegame.IsSpellActive(ActiveSpellType.Light))
                             lightIntensity = 0;
-                        else if (!playerSwitched)
+                        else
                         {
                             var lightLevel = CurrentSavegame.GetActiveSpellLevel(ActiveSpellType.Light);
-                            lightIntensity = Math.Min(255, 176 + CurrentSavegame.GetActiveSpellLevel(ActiveSpellType.Light) * 32);
-                            if (lightLevel == 1)
-                                lightIntensity = Math.Min(255, lightIntensity + 16);
+                            if (lightLevel > 0 || !playerSwitched)
+                            {
+                                lightIntensity = Math.Min(255, 176 + CurrentSavegame.GetActiveSpellLevel(ActiveSpellType.Light) * 32);
+                                if (lightLevel == 1)
+                                    lightIntensity = Math.Min(255, lightIntensity + 16);
+                            }
                         }
                     }
                     else
diff --git a/Ambermoon.Data.Common/Ambermoon.Data.Common.csproj b/Ambermoon.Data.Common/Ambermoon.Data.Common.csproj
index 396919dd..c23e2e0b 100644
--- a/Ambermoon.Data.Common/Ambermoon.Data.Common.csproj
+++ b/Ambermoon.Data.Common/Ambermoon.Data.Common.csproj
@@ -10,12 +10,12 @@
     <RepositoryType>Github</RepositoryType>
     <PackageTags>Ambermoon Amiga</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>6.2.0</Version>
+    <Version>7.0.0</Version>
     <UserSecretsId>485e4790-32fd-45f1-b729-c5ca93ba0fad</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ambermoon.Common" Version="6.2.0" />
+    <PackageReference Include="Ambermoon.Common" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj b/Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj
index 7518287b..ea281aec 100644
--- a/Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj
+++ b/Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj
@@ -9,7 +9,7 @@
     <RepositoryType>Github</RepositoryType>
     <PackageTags>Ambermoon Legacy Amiga Game Data</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>6.2.0</Version>
+    <Version>7.0.0</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ambermoon.Data.Common" Version="6.2.0" />
+    <PackageReference Include="Ambermoon.Data.Common" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj b/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj
index ba3912a7..9a01001f 100644
--- a/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj
+++ b/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj
@@ -10,12 +10,12 @@
 
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Version>6.2.0</Version>
+    <Version>7.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ambermoon.Data.Common" Version="6.2.0" />
-    <PackageReference Include="Silk.NET.OpenGL" Version="1.8.0" />
+    <PackageReference Include="Ambermoon.Data.Common" Version="7.0.0" />
+    <PackageReference Include="Silk.NET.OpenGL" Version="1.9.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Ambermoon.net/Ambermoon.net.csproj b/Ambermoon.net/Ambermoon.net.csproj
index 9ba99d73..ef5f5014 100644
--- a/Ambermoon.net/Ambermoon.net.csproj
+++ b/Ambermoon.net/Ambermoon.net.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <RootNamespace>Ambermoon</RootNamespace>
     <RuntimeIdentifiers>win-x86;win-x64;linux-x64;linux-arm64</RuntimeIdentifiers>
-    <Version>0.6.2</Version>
+    <Version>0.7.0</Version>
     <Copyright>Copyright (C) 2020-2021 by Robert Schneckenhaus</Copyright>
     <Company>Robert Schneckenhaus</Company>
     <Authors>Robert Schneckenhaus</Authors>
@@ -31,10 +31,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ambermoon.Data.Legacy" Version="6.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="Silk.NET.Input" Version="1.8.0" />
-    <PackageReference Include="Silk.NET.Windowing" Version="1.8.0" />
+    <PackageReference Include="Ambermoon.Data.Legacy" Version="7.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Silk.NET.Input" Version="1.9.0" />
+    <PackageReference Include="Silk.NET.Windowing" Version="1.9.0" />
   </ItemGroup>
 
   <ItemGroup>