diff --git a/Controllers/PetController.cs b/Controllers/PetController.cs index 568b590..1c2aec9 100644 --- a/Controllers/PetController.cs +++ b/Controllers/PetController.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Mvc; -using Pet.Companion.Models; -using Pet.Companion.Services; +using PetCompanion.Models; +using PetCompanion.Services; -namespace Pet.Companion.Controllers +namespace PetCompanion.Controllers { [ApiController] [Route("api/v1/[controller]")] diff --git a/Data/ApplicationDbContext.cs b/Data/ApplicationDbContext.cs index 62c1766..0e9a2c0 100644 --- a/Data/ApplicationDbContext.cs +++ b/Data/ApplicationDbContext.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore; -using Pet.Companion.Models; +using PetCompanion.Models; -namespace Pet.Companion.Data +namespace PetCompanion.Data { public class ApplicationDbContext : DbContext { diff --git a/Migrations/20250201173643_Initial.Designer.cs b/Migrations/20250201173643_Initial.Designer.cs index b51dadc..ff3a894 100644 --- a/Migrations/20250201173643_Initial.Designer.cs +++ b/Migrations/20250201173643_Initial.Designer.cs @@ -4,11 +4,11 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Pet.Companion.Data; +using PetCompanion.Data; #nullable disable -namespace Pet.Companion.Migrations +namespace PetCompanion.Migrations { [DbContext(typeof(ApplicationDbContext))] [Migration("20250201173643_Initial")] @@ -20,7 +20,7 @@ namespace Pet.Companion.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "9.0.1"); - modelBuilder.Entity("Pet.Companion.Models.Pet", b => + modelBuilder.Entity("PetCompanion.Models.Pet", b => { b.Property("Id") .HasColumnType("TEXT"); @@ -59,7 +59,7 @@ namespace Pet.Companion.Migrations b.ToTable("Pets"); }); - modelBuilder.Entity("Pet.Companion.Models.PetStats", b => + modelBuilder.Entity("PetCompanion.Models.PetStats", b => { b.Property("PetId") .HasColumnType("TEXT"); @@ -87,7 +87,7 @@ namespace Pet.Companion.Migrations b.ToTable("PetStats"); }); - modelBuilder.Entity("Pet.Companion.Models.Resources", b => + modelBuilder.Entity("PetCompanion.Models.Resources", b => { b.Property("PetId") .HasColumnType("TEXT"); @@ -109,25 +109,25 @@ namespace Pet.Companion.Migrations b.ToTable("Resources"); }); - modelBuilder.Entity("Pet.Companion.Models.PetStats", b => + modelBuilder.Entity("PetCompanion.Models.PetStats", b => { - b.HasOne("Pet.Companion.Models.Pet", null) + b.HasOne("PetCompanion.Models.Pet", null) .WithOne("Stats") - .HasForeignKey("Pet.Companion.Models.PetStats", "PetId") + .HasForeignKey("PetCompanion.Models.PetStats", "PetId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Pet.Companion.Models.Resources", b => + modelBuilder.Entity("PetCompanion.Models.Resources", b => { - b.HasOne("Pet.Companion.Models.Pet", null) + b.HasOne("PetCompanion.Models.Pet", null) .WithOne("Resources") - .HasForeignKey("Pet.Companion.Models.Resources", "PetId") + .HasForeignKey("PetCompanion.Models.Resources", "PetId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Pet.Companion.Models.Pet", b => + modelBuilder.Entity("PetCompanion.Models.Pet", b => { b.Navigation("Resources") .IsRequired(); diff --git a/Migrations/20250201173643_Initial.cs b/Migrations/20250201173643_Initial.cs index 8077852..be951d9 100644 --- a/Migrations/20250201173643_Initial.cs +++ b/Migrations/20250201173643_Initial.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations; #nullable disable -namespace Pet.Companion.Migrations +namespace PetCompanion.Migrations { /// public partial class Initial : Migration diff --git a/Migrations/ApplicationDbContextModelSnapshot.cs b/Migrations/ApplicationDbContextModelSnapshot.cs index d49ffcf..3f11ec8 100644 --- a/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/Migrations/ApplicationDbContextModelSnapshot.cs @@ -3,11 +3,11 @@ using System; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Pet.Companion.Data; +using PetCompanion.Data; #nullable disable -namespace Pet.Companion.Migrations +namespace PetCompanion.Migrations { [DbContext(typeof(ApplicationDbContext))] partial class ApplicationDbContextModelSnapshot : ModelSnapshot @@ -17,7 +17,7 @@ namespace Pet.Companion.Migrations #pragma warning disable 612, 618 modelBuilder.HasAnnotation("ProductVersion", "9.0.1"); - modelBuilder.Entity("Pet.Companion.Models.Pet", b => + modelBuilder.Entity("PetCompanion.Models.Pet", b => { b.Property("Id") .HasColumnType("TEXT"); @@ -56,7 +56,7 @@ namespace Pet.Companion.Migrations b.ToTable("Pets"); }); - modelBuilder.Entity("Pet.Companion.Models.PetStats", b => + modelBuilder.Entity("PetCompanion.Models.PetStats", b => { b.Property("PetId") .HasColumnType("TEXT"); @@ -84,7 +84,7 @@ namespace Pet.Companion.Migrations b.ToTable("PetStats"); }); - modelBuilder.Entity("Pet.Companion.Models.Resources", b => + modelBuilder.Entity("PetCompanion.Models.Resources", b => { b.Property("PetId") .HasColumnType("TEXT"); @@ -106,25 +106,25 @@ namespace Pet.Companion.Migrations b.ToTable("Resources"); }); - modelBuilder.Entity("Pet.Companion.Models.PetStats", b => + modelBuilder.Entity("PetCompanion.Models.PetStats", b => { - b.HasOne("Pet.Companion.Models.Pet", null) + b.HasOne("PetCompanion.Models.Pet", null) .WithOne("Stats") - .HasForeignKey("Pet.Companion.Models.PetStats", "PetId") + .HasForeignKey("PetCompanion.Models.PetStats", "PetId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Pet.Companion.Models.Resources", b => + modelBuilder.Entity("PetCompanion.Models.Resources", b => { - b.HasOne("Pet.Companion.Models.Pet", null) + b.HasOne("PetCompanion.Models.Pet", null) .WithOne("Resources") - .HasForeignKey("Pet.Companion.Models.Resources", "PetId") + .HasForeignKey("PetCompanion.Models.Resources", "PetId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); }); - modelBuilder.Entity("Pet.Companion.Models.Pet", b => + modelBuilder.Entity("PetCompanion.Models.Pet", b => { b.Navigation("Resources") .IsRequired(); diff --git a/Models/Enums/ItemEnums.cs b/Models/Enums/ItemEnums.cs index dc8d5fc..d09e729 100644 --- a/Models/Enums/ItemEnums.cs +++ b/Models/Enums/ItemEnums.cs @@ -1,4 +1,4 @@ -namespace Pet.Companion.Models.Enums +namespace PetCompanion.Models.Enums { public enum ItemType { diff --git a/Models/GameItems.cs b/Models/GameItems.cs index 765c9fc..552baac 100644 --- a/Models/GameItems.cs +++ b/Models/GameItems.cs @@ -1,6 +1,6 @@ -using Pet.Companion.Models.Enums; +using PetCompanion.Models.Enums; -namespace Pet.Companion.Models +namespace PetCompanion.Models { public class MaterialItem : Item { diff --git a/Models/Inventory.cs b/Models/Inventory.cs index b022ea3..dac9680 100644 --- a/Models/Inventory.cs +++ b/Models/Inventory.cs @@ -1,4 +1,4 @@ -namespace Pet.Companion.Models +namespace PetCompanion.Models { public class Inventory { diff --git a/Models/Item.cs b/Models/Item.cs index e47649b..e481db4 100644 --- a/Models/Item.cs +++ b/Models/Item.cs @@ -1,6 +1,6 @@ -using Pet.Companion.Models.Enums; +using PetCompanion.Models.Enums; -namespace Pet.Companion.Models +namespace PetCompanion.Models { public abstract class Item { diff --git a/Models/Pet.cs b/Models/Pet.cs index 0778a37..d36b353 100644 --- a/Models/Pet.cs +++ b/Models/Pet.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; -using Pet.Companion.Models.Enums; +using PetCompanion.Models.Enums; -namespace Pet.Companion.Models +namespace PetCompanion.Models { public class Pet { diff --git a/Models/PetActionGather.cs b/Models/PetActionGather.cs index 1903ad4..4391639 100644 --- a/Models/PetActionGather.cs +++ b/Models/PetActionGather.cs @@ -1,4 +1,4 @@ -namespace Pet.Companion.Models +namespace PetCompanion.Models { public enum PetBasicAction { diff --git a/Models/PetClass.cs b/Models/PetClass.cs index 175c96e..09ea3e4 100644 --- a/Models/PetClass.cs +++ b/Models/PetClass.cs @@ -1,4 +1,4 @@ -namespace Pet.Companion.Models +namespace PetCompanion.Models { public enum PetClass { diff --git a/Models/PetClassInfo.cs b/Models/PetClassInfo.cs index ea1ca25..4cde5cf 100644 --- a/Models/PetClassInfo.cs +++ b/Models/PetClassInfo.cs @@ -1,5 +1,5 @@ -namespace Pet.Companion.Models +namespace PetCompanion.Models { public class PetClassInfo { diff --git a/Models/PetCreationRequest.cs b/Models/PetCreationRequest.cs index e08408f..8ab1dbd 100644 --- a/Models/PetCreationRequest.cs +++ b/Models/PetCreationRequest.cs @@ -1,4 +1,4 @@ -namespace Pet.Companion.Models +namespace PetCompanion.Models { public class PetCreationRequest { diff --git a/Models/PetStats.cs b/Models/PetStats.cs index fc68953..1ef94f2 100644 --- a/Models/PetStats.cs +++ b/Models/PetStats.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace Pet.Companion.Models +namespace PetCompanion.Models { public class PetStats { diff --git a/Models/PetUpdateActionRequest.cs b/Models/PetUpdateActionRequest.cs index ba0f374..c3181b9 100644 --- a/Models/PetUpdateActionRequest.cs +++ b/Models/PetUpdateActionRequest.cs @@ -1,4 +1,4 @@ -namespace Pet.Companion.Models +namespace PetCompanion.Models { public class PetUpdateActionRequest { diff --git a/Models/Resources.cs b/Models/Resources.cs index 6853b39..7e93c59 100644 --- a/Models/Resources.cs +++ b/Models/Resources.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace Pet.Companion.Models +namespace PetCompanion.Models { public class Resources { diff --git a/Program.cs b/Program.cs index 9456e64..b328482 100644 --- a/Program.cs +++ b/Program.cs @@ -1,10 +1,10 @@ using Microsoft.EntityFrameworkCore; -using Pet.Companion.Data; -using Pet.Companion.Repositories; -using Pet.Companion.Services; +using PetCompanion.Data; +using PetCompanion.Repositories; +using PetCompanion.Services; using System.Text.Json.Serialization; -namespace Pet.Companion +namespace PetCompanion { public class Program { diff --git a/Repositories/ItemRepository.cs b/Repositories/ItemRepository.cs index dac49f6..8c7056a 100644 --- a/Repositories/ItemRepository.cs +++ b/Repositories/ItemRepository.cs @@ -1,8 +1,8 @@ using System.Text.RegularExpressions; -using Pet.Companion.Models; -using Pet.Companion.Models.Enums; +using PetCompanion.Models; +using PetCompanion.Models.Enums; -namespace Pet.Companion.Repositories +namespace PetCompanion.Repositories { public class ItemRepository { diff --git a/Repositories/PetClassRepository.cs b/Repositories/PetClassRepository.cs index f7364ad..bf06289 100644 --- a/Repositories/PetClassRepository.cs +++ b/Repositories/PetClassRepository.cs @@ -1,8 +1,8 @@ using Microsoft.EntityFrameworkCore; -using Pet.Companion.Data; -using Pet.Companion.Models; +using PetCompanion.Data; +using PetCompanion.Models; -namespace Pet.Companion.Repositories +namespace PetCompanion.Repositories { public class PetClassRepository { diff --git a/Repositories/PetRepository.cs b/Repositories/PetRepository.cs index 04997a2..bbdc9c8 100644 --- a/Repositories/PetRepository.cs +++ b/Repositories/PetRepository.cs @@ -1,8 +1,8 @@ using Microsoft.EntityFrameworkCore; -using Pet.Companion.Data; -using Pet.Companion.Models; +using PetCompanion.Data; +using PetCompanion.Models; -namespace Pet.Companion.Repositories +namespace PetCompanion.Repositories { public class PetRepository { diff --git a/Services/PetClassService.cs b/Services/PetClassService.cs index 3b9962f..f7c4bfd 100644 --- a/Services/PetClassService.cs +++ b/Services/PetClassService.cs @@ -1,7 +1,7 @@ -using Pet.Companion.Models; -using Pet.Companion.Repositories; +using PetCompanion.Models; +using PetCompanion.Repositories; -namespace Pet.Companion.Services +namespace PetCompanion.Services { public class PetClassService { diff --git a/Services/PetService.cs b/Services/PetService.cs index ac03185..1af9bd1 100644 --- a/Services/PetService.cs +++ b/Services/PetService.cs @@ -1,7 +1,7 @@ -using Pet.Companion.Models; -using Pet.Companion.Repositories; +using PetCompanion.Models; +using PetCompanion.Repositories; -namespace Pet.Companion.Services +namespace PetCompanion.Services { public class PetService { @@ -28,7 +28,10 @@ namespace Pet.Companion.Services UserId = userId.ToString(), Name = petRequest.Name, Class = petRequest.Class, + Health = 100, + MaxHealth = 100, Level = 1, + Experience = 0, Stats = PetStats.BuildFromClass(petRequest.Class), Resources = new Resources(), GatherActionSince = DateTime.UtcNow, @@ -64,12 +67,12 @@ namespace Pet.Companion.Services case PetBasicAction.FEED: pet.Resources.Food -= 1; pet.IncrementStrength(1); - pet.Health = Math.Min(pet.Health + 5, 100); + pet.Health = Math.Min(pet.Health + 5, pet.MaxHealth); break; case PetBasicAction.SLEEP: pet.IncrementIntelligence(1); pet.IncrementStrength(1); - pet.Health = Math.Min(pet.Health + 15, Pet.MaxHealth); + pet.Health = Math.Min(pet.Health + 15, pet.MaxHealth); break; case PetBasicAction.PLAY: pet.Resources.Junk -= 1; diff --git a/pet-companion-api.csproj b/pet-companion-api.csproj index 7bb00fb..dee5e3c 100644 --- a/pet-companion-api.csproj +++ b/pet-companion-api.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - Pet.Companion + PetCompanion fb7dfb2a-4bb7-4cd0-bc10-293410089f4b Linux .