feat: new background on game page, equipment fix and restyling, fixed…

… stat table, added favicon and map generater upscale to 80x80
pollubnet · Nov 21, 2024 · 1b53a96 · 1b53a96
1 parent 016845e
commit 1b53a96
Show file tree

Hide file tree

Showing 14 changed files with 219 additions and 98 deletions.
diff --git a/Server/Components/Pages/Error.razor b/Server/Components/Pages/Error.razor
@@ -1,6 +1,6 @@
 @page "/Error"
 @using System.Diagnostics
-
+<link rel="icon" type="image/png" href="assets/favicon.png"/>
 <PageTitle>Error</PageTitle>
 
 <h1 class="text-danger">Error.</h1>

diff --git a/Server/Components/Pages/GamePage.razor b/Server/Components/Pages/GamePage.razor
@@ -29,6 +29,8 @@
 @inject VersionInfoProvider VersionInfoProvider
 @inject IMapGeneratorService MapGeneratorService
 
+<link rel="icon" type="image/png" href="assets/favicon.png"/>
+
 <div id="container">
 	<div class="leftPanel borderPanel">
 		<div class="stats">

diff --git a/Server/Components/Pages/Home.razor b/Server/Components/Pages/Home.razor
@@ -19,6 +19,8 @@
 @using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage
 @inject ProtectedSessionStorage ProtectedSessionStore
 
+<link rel="icon" type="image/png" href="assets/favicon.png"/>
+
 <div id="container">
 
     <div class="title">

diff --git a/Server/Components/Popups/EquipmentPopup.razor b/Server/Components/Popups/EquipmentPopup.razor
@@ -9,25 +9,29 @@
 @inject IItemsRepository ItemsRepository
 @inject ILogger<EquipmentPopup> Logger
 
+
+
 <div class="row">
     <div class="buttonEquipBg">
         <button class = "buttonEquip" @onclick="GenerateNewItem">Generate new item </button>
     </div>
-    <div class=equipmentContent style="height: 65vh">
-        <div class="eqColumn">
-            Inventory
-            @foreach (var item in Inventory.Where(x => !IsEquipped(x)))
-            {
-                <ItemCard Item="@item" OnEquipClicked="() => Equip(item)" IsEquipped="IsEquipped(item)" OnUnequipClicked="() => Unequip(item)"></ItemCard>
-            }
-        </div>
-        <div class="eqColumn">
-            Equipped
-            @foreach (var item in Equipment)
-            {
-                <ItemCard Item="@item" OnEquipClicked="() => Equip(item)" IsEquipped="IsEquipped(item)" OnUnequipClicked="() => Unequip(item)"></ItemCard>
-            }
-        </div>
+    <div class=equipmentContent>
+	    <div>Inventory</div>
+	    <div class="eqColumn">
+
+		    @foreach (var item in Inventory.Where(x => !IsEquipped(x)))
+		    {
+			    <ItemCard Item="@item" OnEquipClicked="() => Equip(item)" IsEquipped="IsEquipped(item)" OnUnequipClicked="() => Unequip(item)"></ItemCard>
+		    }
+	    </div>
+	    <div>Equipped</div>
+	    <div class="eqColumn">
+
+		    @foreach (var item in Equipment)
+		    {
+			    <ItemCard Item="@item" OnEquipClicked="() => Equip(item)" IsEquipped="IsEquipped(item)" OnUnequipClicked="() => Unequip(item)"></ItemCard>
+		    }
+	    </div>
 
     </div>
 </div>

diff --git a/Server/Components/UI/ItemCard.razor b/Server/Components/UI/ItemCard.razor
@@ -2,27 +2,42 @@
 @using Fracture.Server.EnumExtensions
 
 <div class="col">
-    <div class="card" style="min-width: 13rem;">
-        <div class="card-header" style="background-color: var(@Item.Rarity.ToCssClassName())">
-            @Item.Name
-        </div>
-        <div class="card-body">
-            <button class="buttonEquip" @onmouseover="ShowItemHistoryAsync" @onmouseleave="HideItemHistoryAsync" data-bs-toggle="collapse" data-bs-target="#collapse-@guid">Item History </button>
-            <div class="collapse" id="collapse-@guid">
-                <p class="card-text">@Item.History</p>
-            </div>
-            <ItemStats Item="@Item"></ItemStats>
-            <div>@Item.Type.ToString()</div>
-
+    <div class="card" >
+        <div class="card-header">
+            <div class="item-name">@Item.Type.ToString()</div>
             @if (IsEquipped)
             {
-                <button class="buttonEquip" @onclick="OnUnequipClicked">Unequip this</button>
+                <div class="item-card" style="background-color: var(@Item.Rarity.ToCssClassName()); opacity: 1;">
+                    @Item.Name
+                </div>
             }
             else
             {
-                <button class="buttonEquip" @onclick="OnEquipClicked">Equip this</button>
+                <div class="item-card" style="background-color: var(@Item.Rarity.ToCssClassName())">
+                    @Item.Name
+                </div>
             }
         </div>
+
+        <div class="card-body">
+            <div class="body-buttons">
+                <div class="actionButton itemButton" @onmouseover="ShowItemHistoryAsync" @onmouseleave="HideItemHistoryAsync" data-bs-toggle="collapse" data-bs-target="#collapse-@guid"><div class="actionButton-content">Item History </div></div>
+                @if (IsEquipped)
+                {
+                    <div class="actionButton itemButton" @onclick="OnUnequipClicked"><div class="actionButton-content">Unequip this</div></div>
+                }
+                else
+                {
+                    <div class="actionButton itemButton" @onclick="OnEquipClicked"><div class="actionButton-content">Equip this</div></div>
+                }
+            </div>
+            <div class="collapse" id="collapse-@guid">
+                <p class="card-text">@Item.History</p>
+            </div>
+            <div class="item-stats">
+                <ItemStats Item="@Item"></ItemStats>
+            </div>
+        </div>
     </div>
 </div>
 <div class="collapse">

diff --git a/Server/Components/UI/ItemStats.razor b/Server/Components/UI/ItemStats.razor
@@ -1,9 +1,9 @@
 @using Fracture.Server.Modules.Items.Models
 
-<table class="table table-striped">
+<table>
     @foreach (var itemStat in Enum.GetValues<ItemStat>())
     {
-        <tr><td>@itemStat</td><td class="text-end">@Item.Statistics.GetStatFromItemStat(itemStat)</td></tr>
+        <tr><td class="stat-value-right-align">@itemStat</td><td class="stat-value">@Item.Statistics.GetStatFromItemStat(itemStat)</td></tr>
     }
 </table>
 

diff --git a/Server/Components/UI/UserStats.razor b/Server/Components/UI/UserStats.razor
@@ -1,11 +1,15 @@
 @using Fracture.Server.Modules.Items.Models
 @using System.Collections.ObjectModel
 
-<table>
+<table class="stat-table">
     @foreach (var itemStat in Enum.GetValues<ItemStat>())
     {
         var stat = Equipment.Sum(x => x.Statistics.GetStatFromItemStat(itemStat));
-        <tr><td><img src=@("assets/" + images[itemStat])></td><td>@itemStat</td><td>@stat</td></tr>
+        <tr>
+            <td><img src=@("assets/" + images[itemStat])></td>
+            <td>@itemStat</td>
+            <td class="stat-value-right-align">@stat</td>
+        </tr>
     }
 </table>
 

diff --git a/Server/Modules/MapGenerator/Services/MapGeneratorService.cs b/Server/Modules/MapGenerator/Services/MapGeneratorService.cs
@@ -12,7 +12,7 @@ public class MapGeneratorService : IMapGeneratorService
     private readonly float _persistence = 0.5f; // How much consecutive octaves contribute to the noise
     private readonly float _lacunarity = 2f; // How fast the frequency increases for each octave
     private readonly int _octaves = 3; // Number of octaves
-    private readonly float _scale = 3f; // Scale of the noise, bigger scale = more zoomed in
+    private readonly float _scale = 1f; // Scale of the noise, bigger scale = more zoomed in
     private readonly float _falloff = 0.3f; // How much the falloff map affects the heightmap
     private readonly float _sharpness = 1f; // How "sharp" heightmap is. Just a power function
     private readonly float _boost = 0.2f; // Flat boost to heightmap. Adds, then clamps
@@ -35,8 +35,8 @@ public Task<MapData> GetMap(NoiseParameters noiseParameters)
 
     private MapData GenerateMap(NoiseParameters noiseParameters)
     {
-        int width = 64;
-        int height = 64;
+        int width = 80;
+        int height = 80;
         bool useFalloff = true;
         _seed = noiseParameters.UseRandomSeed ? _rnd.Next(int.MaxValue) : noiseParameters.Seed;
 

diff --git a/...er/wwwroot/assets/background/cemetery.jpg → ...r/wwwroot/assets/background/cementery.jpg b/...er/wwwroot/assets/background/cemetery.jpg → ...r/wwwroot/assets/background/cementery.jpg
diff --git a/Server/wwwroot/assets/favicon.png b/Server/wwwroot/assets/favicon.png
diff --git a/Server/wwwroot/assets/panelbg1.jpg b/Server/wwwroot/assets/panelbg1.jpg