DamageTypeChanges
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
using DataServer.Data.Entities;
|
||||
using DataServer.Data.Enums;
|
||||
|
||||
namespace Server.Game.Dungeon;
|
||||
|
||||
@@ -14,54 +13,41 @@ public static class CombatCalculator
|
||||
public static DamageResult CalculatePlayerToMobDamage(
|
||||
PlayerInstance player,
|
||||
MobInstance mob,
|
||||
DamageType damageType,
|
||||
int baseDamage,
|
||||
Dictionary<string, float>? playerGearResistances = null)
|
||||
string damageTypeKey,
|
||||
int baseDamage)
|
||||
{
|
||||
// 1. Base damage modified by player stats
|
||||
float damage = baseDamage;
|
||||
|
||||
// Physical damage scales with STR
|
||||
if (damageType == DamageType.Physical)
|
||||
// Physical damage scales with STR, all other types scale with INT
|
||||
if (damageTypeKey == "physical")
|
||||
{
|
||||
damage *= 1 + (player.Strength * 0.05f); // 5% per STR
|
||||
}
|
||||
// Magical damage scales with INT
|
||||
else
|
||||
{
|
||||
damage *= 1 + (player.Intelligence * 0.05f); // 5% per INT
|
||||
}
|
||||
|
||||
// 2. Apply mob's armor/magic resist reduction
|
||||
float mitigation = 0f;
|
||||
if (damageType == DamageType.Physical)
|
||||
{
|
||||
// Armor formula: damage reduction = armor / (armor + 100)
|
||||
mitigation = mob.Stats.Armor / (float)(mob.Stats.Armor + 100);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Magic resist formula
|
||||
mitigation = mob.Stats.MagicResist / (float)(mob.Stats.MagicResist + 100);
|
||||
}
|
||||
|
||||
damage *= (1 - mitigation);
|
||||
// 2. Apply mob's armor reduction (flat mitigation for all damage types)
|
||||
float armorMitigation = mob.Stats.Armor / (float)(mob.Stats.Armor + 100);
|
||||
damage *= (1 - armorMitigation);
|
||||
|
||||
// 3. Apply mob's elemental resistances
|
||||
string resistKey = damageType.ToString().ToLower();
|
||||
if (mob.Stats.Resistances.TryGetValue(resistKey, out float mobResist))
|
||||
float mobResist = 0f;
|
||||
if (mob.Stats.Resistances.TryGetValue(damageTypeKey, out float resist))
|
||||
{
|
||||
mobResist = resist;
|
||||
// Positive = resistance (reduces damage), Negative = weakness (increases damage)
|
||||
// 0.5 = 50% resistance, -0.25 = 25% weakness, 1.0 = immune
|
||||
if (mobResist >= 1.0f)
|
||||
{
|
||||
// Immune
|
||||
return new DamageResult
|
||||
{
|
||||
FinalDamage = 0,
|
||||
WasResisted = true,
|
||||
WasImmune = true,
|
||||
DamageType = damageType
|
||||
DamageTypeKey = damageTypeKey
|
||||
};
|
||||
}
|
||||
damage *= (1 - mobResist);
|
||||
@@ -75,7 +61,7 @@ public static class CombatCalculator
|
||||
FinalDamage = finalDamage,
|
||||
WasResisted = mobResist > 0,
|
||||
WasWeakness = mobResist < 0,
|
||||
DamageType = damageType
|
||||
DamageTypeKey = damageTypeKey
|
||||
};
|
||||
}
|
||||
|
||||
@@ -85,32 +71,19 @@ public static class CombatCalculator
|
||||
public static DamageResult CalculateMobToPlayerDamage(
|
||||
MobInstance mob,
|
||||
PlayerInstance player,
|
||||
DamageType damageType,
|
||||
string damageTypeKey,
|
||||
int baseDamage,
|
||||
Dictionary<string, float> playerTotalResistances)
|
||||
{
|
||||
float damage = baseDamage;
|
||||
|
||||
// 1. Apply player's armor/magic resist reduction
|
||||
float mitigation = 0f;
|
||||
if (damageType == DamageType.Physical)
|
||||
{
|
||||
// Player armor from gear + endurance bonus
|
||||
int playerArmor = player.Armor;
|
||||
mitigation = playerArmor / (float)(playerArmor + 100);
|
||||
}
|
||||
else
|
||||
{
|
||||
int playerMagicResist = player.MagicResist;
|
||||
mitigation = playerMagicResist / (float)(playerMagicResist + 100);
|
||||
}
|
||||
|
||||
damage *= (1 - mitigation);
|
||||
// 1. Apply player's armor reduction (flat mitigation for all damage types)
|
||||
float armorMitigation = player.Armor / (float)(player.Armor + 100);
|
||||
damage *= (1 - armorMitigation);
|
||||
|
||||
// 2. Apply player's elemental resistances (from gear + innate)
|
||||
string resistKey = damageType.ToString().ToLower();
|
||||
float playerResist = 0f;
|
||||
if (playerTotalResistances.TryGetValue(resistKey, out float resist))
|
||||
if (playerTotalResistances.TryGetValue(damageTypeKey, out float resist))
|
||||
{
|
||||
playerResist = resist;
|
||||
}
|
||||
@@ -134,7 +107,7 @@ public static class CombatCalculator
|
||||
FinalDamage = finalDamage,
|
||||
WasResisted = playerResist > 0,
|
||||
WasWeakness = playerResist < 0,
|
||||
DamageType = damageType
|
||||
DamageTypeKey = damageTypeKey
|
||||
};
|
||||
}
|
||||
|
||||
@@ -161,10 +134,18 @@ public static class CombatCalculator
|
||||
return total;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Calculate total armor for a player from gear
|
||||
/// </summary>
|
||||
public static int CalculatePlayerTotalArmor(List<DungeonItemDefinition> equippedItems)
|
||||
{
|
||||
return equippedItems.Sum(item => item.Armor);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Calculate player weapon damage range
|
||||
/// </summary>
|
||||
public static (int min, int max, DamageType type) GetPlayerWeaponDamage(
|
||||
public static (int min, int max, string damageTypeKey) GetPlayerWeaponDamage(
|
||||
PlayerInstance player,
|
||||
DungeonItemDefinition? weapon)
|
||||
{
|
||||
@@ -173,10 +154,31 @@ public static class CombatCalculator
|
||||
// Unarmed: base damage + STR
|
||||
int unarmedMin = 1 + (int)(player.Strength * 0.5f);
|
||||
int unarmedMax = 3 + (int)(player.Strength * 0.5f);
|
||||
return (unarmedMin, unarmedMax, DamageType.Physical);
|
||||
return (unarmedMin, unarmedMax, "physical");
|
||||
}
|
||||
|
||||
return (weapon.MinDamage, weapon.MaxDamage, weapon.DamageType);
|
||||
return (weapon.MinDamage, weapon.MaxDamage, weapon.DamageTypeKey);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Check if player meets equipment requirements
|
||||
/// </summary>
|
||||
public static (bool canEquip, string? reason) CanEquipItem(
|
||||
DungeonCharacter character,
|
||||
DungeonItemDefinition item)
|
||||
{
|
||||
if (character.Level < item.RequiredLevel)
|
||||
return (false, $"Requires level {item.RequiredLevel}");
|
||||
if (character.Strength < item.RequiredStrength)
|
||||
return (false, $"Requires {item.RequiredStrength} STR");
|
||||
if (character.Intelligence < item.RequiredIntelligence)
|
||||
return (false, $"Requires {item.RequiredIntelligence} INT");
|
||||
if (character.Wisdom < item.RequiredWisdom)
|
||||
return (false, $"Requires {item.RequiredWisdom} WIS");
|
||||
if (character.Dexterity < item.RequiredDexterity)
|
||||
return (false, $"Requires {item.RequiredDexterity} DEX");
|
||||
|
||||
return (true, null);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -187,5 +189,5 @@ public class DamageResult
|
||||
public bool WasWeakness { get; set; }
|
||||
public bool WasImmune { get; set; }
|
||||
public bool WasCritical { get; set; }
|
||||
public DamageType DamageType { get; set; }
|
||||
public string DamageTypeKey { get; set; } = "physical";
|
||||
}
|
||||
|
||||
@@ -273,16 +273,13 @@ public class DungeonSimulation
|
||||
|
||||
private void MobAttackPlayer(MobInstance mob, PlayerInstance player)
|
||||
{
|
||||
// Determine damage type (physical if mob has no magic damage)
|
||||
var damageType = mob.Stats.MagicDamage > mob.Stats.PhysicalDamage
|
||||
? DataServer.Data.Enums.DamageType.Fire // Use fire for magic mobs (could be configured per mob)
|
||||
: DataServer.Data.Enums.DamageType.Physical;
|
||||
|
||||
// Use mob's configured damage type key
|
||||
string damageTypeKey = mob.Stats.DamageTypeKey ?? "physical";
|
||||
int baseDamage = mob.Stats.PhysicalDamage + mob.Stats.MagicDamage;
|
||||
|
||||
// Calculate damage with resistances
|
||||
var result = CombatCalculator.CalculateMobToPlayerDamage(
|
||||
mob, player, damageType, baseDamage, player.Resistances);
|
||||
mob, player, damageTypeKey, baseDamage, player.Resistances);
|
||||
|
||||
player.Health -= result.FinalDamage;
|
||||
player.IsInCombat = true;
|
||||
@@ -295,6 +292,7 @@ public class DungeonSimulation
|
||||
TargetType = EntityType.Player,
|
||||
TargetId = (int)player.CharacterId,
|
||||
Damage = result.FinalDamage,
|
||||
DamageTypeKey = damageTypeKey,
|
||||
WasResisted = result.WasResisted,
|
||||
WasWeakness = result.WasWeakness
|
||||
});
|
||||
@@ -359,13 +357,13 @@ public class DungeonSimulation
|
||||
float dist = Distance(player.X, player.Y, mob.X, mob.Y);
|
||||
if (dist > 60) return; // Out of range
|
||||
|
||||
// Base damage from stats (would be enhanced by equipped weapon in full implementation)
|
||||
// Use player's weapon damage type (set when loading equipped weapon)
|
||||
string damageTypeKey = player.WeaponDamageTypeKey ?? "physical";
|
||||
int baseDamage = 10 + (int)(player.Strength * 0.5f);
|
||||
var damageType = DataServer.Data.Enums.DamageType.Physical;
|
||||
|
||||
// Calculate damage with mob resistances
|
||||
var result = CombatCalculator.CalculatePlayerToMobDamage(
|
||||
player, mob, damageType, baseDamage);
|
||||
player, mob, damageTypeKey, baseDamage);
|
||||
|
||||
if (result.WasImmune)
|
||||
{
|
||||
@@ -377,6 +375,7 @@ public class DungeonSimulation
|
||||
TargetType = EntityType.Mob,
|
||||
TargetId = mob.Id,
|
||||
Damage = 0,
|
||||
DamageTypeKey = damageTypeKey,
|
||||
WasImmune = true
|
||||
});
|
||||
return;
|
||||
@@ -393,6 +392,7 @@ public class DungeonSimulation
|
||||
TargetType = EntityType.Mob,
|
||||
TargetId = mob.Id,
|
||||
Damage = result.FinalDamage,
|
||||
DamageTypeKey = damageTypeKey,
|
||||
WasResisted = result.WasResisted,
|
||||
WasWeakness = result.WasWeakness
|
||||
});
|
||||
|
||||
@@ -28,7 +28,11 @@ public class PlayerInstance
|
||||
|
||||
// Defensive stats (from gear)
|
||||
public int Armor { get; set; }
|
||||
public int MagicResist { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Weapon damage type key (from equipped weapon, defaults to physical for unarmed)
|
||||
/// </summary>
|
||||
public string WeaponDamageTypeKey { get; set; } = "physical";
|
||||
|
||||
/// <summary>
|
||||
/// Combined resistances from innate + gear
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
using DataServer.Data.Enums;
|
||||
|
||||
namespace Server.Game.Dungeon;
|
||||
|
||||
public class TickResult
|
||||
@@ -16,7 +14,11 @@ public class DamageEvent
|
||||
public EntityType TargetType { get; set; }
|
||||
public int TargetId { get; set; }
|
||||
public int Damage { get; set; }
|
||||
public DamageType DamageType { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Damage type key (e.g., "physical", "fire", "poison")
|
||||
/// </summary>
|
||||
public string DamageTypeKey { get; set; } = "physical";
|
||||
|
||||
/// <summary>
|
||||
/// True if damage was reduced by resistance
|
||||
|
||||
+1728
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,214 @@
|
||||
using System;
|
||||
using Microsoft.EntityFrameworkCore.Metadata;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace SystemRevivalServer.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class Cleanupunusedcode : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropTable(
|
||||
name: "equipment");
|
||||
|
||||
migrationBuilder.DropTable(
|
||||
name: "inventories");
|
||||
|
||||
migrationBuilder.DropTable(
|
||||
name: "characters");
|
||||
|
||||
migrationBuilder.DropTable(
|
||||
name: "item_templates");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.CreateTable(
|
||||
name: "characters",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<ulong>(type: "bigint unsigned", nullable: false)
|
||||
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
|
||||
AccountId = table.Column<ulong>(type: "bigint unsigned", nullable: false),
|
||||
ZoneId = table.Column<ulong>(type: "bigint unsigned", nullable: false),
|
||||
AppearanceJson = table.Column<string>(type: "json", nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false, defaultValueSql: "CURRENT_TIMESTAMP(6)"),
|
||||
FacingDeg = table.Column<float>(type: "float", nullable: false),
|
||||
HpCurrent = table.Column<uint>(type: "int unsigned", nullable: false),
|
||||
HpMax = table.Column<uint>(type: "int unsigned", nullable: false),
|
||||
Level = table.Column<uint>(type: "int unsigned", nullable: false),
|
||||
MpCurrent = table.Column<uint>(type: "int unsigned", nullable: false),
|
||||
MpMax = table.Column<uint>(type: "int unsigned", nullable: false),
|
||||
Name = table.Column<string>(type: "varchar(32)", maxLength: 32, nullable: false)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
PosX = table.Column<double>(type: "double", nullable: false),
|
||||
PosY = table.Column<double>(type: "double", nullable: false),
|
||||
PosZ = table.Column<double>(type: "double", nullable: false),
|
||||
StaminaCurrent = table.Column<uint>(type: "int unsigned", nullable: false),
|
||||
StaminaMax = table.Column<uint>(type: "int unsigned", nullable: false),
|
||||
StatDexterity = table.Column<uint>(type: "int unsigned", nullable: false),
|
||||
StatEndurance = table.Column<uint>(type: "int unsigned", nullable: false),
|
||||
StatIntelligence = table.Column<uint>(type: "int unsigned", nullable: false),
|
||||
StatStrength = table.Column<uint>(type: "int unsigned", nullable: false),
|
||||
StatWisdom = table.Column<uint>(type: "int unsigned", nullable: false),
|
||||
UpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false, defaultValueSql: "CURRENT_TIMESTAMP(6)")
|
||||
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.ComputedColumn),
|
||||
Xp = table.Column<ulong>(type: "bigint unsigned", nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_characters", x => x.Id);
|
||||
table.ForeignKey(
|
||||
name: "FK_characters_accounts_AccountId",
|
||||
column: x => x.AccountId,
|
||||
principalTable: "accounts",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
table.ForeignKey(
|
||||
name: "FK_characters_zones_ZoneId",
|
||||
column: x => x.ZoneId,
|
||||
principalTable: "zones",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
})
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "item_templates",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<ulong>(type: "bigint unsigned", nullable: false)
|
||||
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
|
||||
CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false, defaultValueSql: "CURRENT_TIMESTAMP(6)"),
|
||||
ItemType = table.Column<byte>(type: "tinyint unsigned", nullable: false),
|
||||
MaxStack = table.Column<uint>(type: "int unsigned", nullable: false),
|
||||
Name = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: false)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
Rarity = table.Column<byte>(type: "tinyint unsigned", nullable: false),
|
||||
StatsJson = table.Column<string>(type: "json", nullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4"),
|
||||
UpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false, defaultValueSql: "CURRENT_TIMESTAMP(6)")
|
||||
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.ComputedColumn),
|
||||
Weight = table.Column<uint>(type: "int unsigned", nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_item_templates", x => x.Id);
|
||||
})
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "equipment",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<ulong>(type: "bigint unsigned", nullable: false)
|
||||
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
|
||||
CharacterId = table.Column<ulong>(type: "bigint unsigned", nullable: false),
|
||||
ItemTemplateId = table.Column<ulong>(type: "bigint unsigned", nullable: false),
|
||||
CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false, defaultValueSql: "CURRENT_TIMESTAMP(6)"),
|
||||
SlotCode = table.Column<byte>(type: "tinyint unsigned", nullable: false),
|
||||
UpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false, defaultValueSql: "CURRENT_TIMESTAMP(6)")
|
||||
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.ComputedColumn)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_equipment", x => x.Id);
|
||||
table.ForeignKey(
|
||||
name: "FK_equipment_characters_CharacterId",
|
||||
column: x => x.CharacterId,
|
||||
principalTable: "characters",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
table.ForeignKey(
|
||||
name: "FK_equipment_item_templates_ItemTemplateId",
|
||||
column: x => x.ItemTemplateId,
|
||||
principalTable: "item_templates",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
})
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "inventories",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<ulong>(type: "bigint unsigned", nullable: false)
|
||||
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
|
||||
CharacterId = table.Column<ulong>(type: "bigint unsigned", nullable: false),
|
||||
ItemTemplateId = table.Column<ulong>(type: "bigint unsigned", nullable: false),
|
||||
CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false, defaultValueSql: "CURRENT_TIMESTAMP(6)"),
|
||||
Quantity = table.Column<uint>(type: "int unsigned", nullable: false),
|
||||
SlotIndex = table.Column<uint>(type: "int unsigned", nullable: false),
|
||||
UpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false, defaultValueSql: "CURRENT_TIMESTAMP(6)")
|
||||
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.ComputedColumn)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_inventories", x => x.Id);
|
||||
table.ForeignKey(
|
||||
name: "FK_inventories_characters_CharacterId",
|
||||
column: x => x.CharacterId,
|
||||
principalTable: "characters",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Cascade);
|
||||
table.ForeignKey(
|
||||
name: "FK_inventories_item_templates_ItemTemplateId",
|
||||
column: x => x.ItemTemplateId,
|
||||
principalTable: "item_templates",
|
||||
principalColumn: "Id",
|
||||
onDelete: ReferentialAction.Restrict);
|
||||
})
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_characters_AccountId",
|
||||
table: "characters",
|
||||
column: "AccountId",
|
||||
unique: true);
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_characters_ZoneId",
|
||||
table: "characters",
|
||||
column: "ZoneId");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_equipment_CharacterId_SlotCode",
|
||||
table: "equipment",
|
||||
columns: new[] { "CharacterId", "SlotCode" },
|
||||
unique: true);
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_equipment_ItemTemplateId",
|
||||
table: "equipment",
|
||||
column: "ItemTemplateId");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_inventories_CharacterId",
|
||||
table: "inventories",
|
||||
column: "CharacterId");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_inventories_CharacterId_SlotIndex",
|
||||
table: "inventories",
|
||||
columns: new[] { "CharacterId", "SlotIndex" },
|
||||
unique: true);
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_inventories_ItemTemplateId",
|
||||
table: "inventories",
|
||||
column: "ItemTemplateId");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_item_templates_Name",
|
||||
table: "item_templates",
|
||||
column: "Name",
|
||||
unique: true);
|
||||
}
|
||||
}
|
||||
}
|
||||
+1727
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,53 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace SystemRevivalServer.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class DamageTypeChanges : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "DamageType",
|
||||
table: "dungeon_item_definitions");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "MagicResist",
|
||||
table: "dungeon_item_definitions");
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "DamageTypeKey",
|
||||
table: "dungeon_item_definitions",
|
||||
type: "varchar(32)",
|
||||
maxLength: 32,
|
||||
nullable: false,
|
||||
defaultValue: "")
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "DamageTypeKey",
|
||||
table: "dungeon_item_definitions");
|
||||
|
||||
migrationBuilder.AddColumn<int>(
|
||||
name: "DamageType",
|
||||
table: "dungeon_item_definitions",
|
||||
type: "int",
|
||||
nullable: false,
|
||||
defaultValue: 0);
|
||||
|
||||
migrationBuilder.AddColumn<int>(
|
||||
name: "MagicResist",
|
||||
table: "dungeon_item_definitions",
|
||||
type: "int",
|
||||
nullable: false,
|
||||
defaultValue: 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -745,8 +745,10 @@ namespace SystemRevivalServer.Migrations
|
||||
.HasMaxLength(1024)
|
||||
.HasColumnType("varchar(1024)");
|
||||
|
||||
b.Property<int>("DamageType")
|
||||
.HasColumnType("int");
|
||||
b.Property<string>("DamageTypeKey")
|
||||
.IsRequired()
|
||||
.HasMaxLength(32)
|
||||
.HasColumnType("varchar(32)");
|
||||
|
||||
b.Property<string>("Description")
|
||||
.IsRequired()
|
||||
@@ -765,9 +767,6 @@ namespace SystemRevivalServer.Migrations
|
||||
b.Property<bool>("IsTeleportScroll")
|
||||
.HasColumnType("tinyint(1)");
|
||||
|
||||
b.Property<int>("MagicResist")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<int>("ManaRestore")
|
||||
.HasColumnType("int");
|
||||
|
||||
@@ -1299,232 +1298,6 @@ namespace SystemRevivalServer.Migrations
|
||||
b.ToTable("dungeon_stash_items");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("DataServer.Data.EquipmentSlot", b =>
|
||||
{
|
||||
b.Property<ulong>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("bigint unsigned");
|
||||
|
||||
MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<ulong>("Id"));
|
||||
|
||||
b.Property<ulong>("CharacterId")
|
||||
.HasColumnType("bigint unsigned");
|
||||
|
||||
b.Property<DateTime>("CreatedAt")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("datetime(6)")
|
||||
.HasDefaultValueSql("CURRENT_TIMESTAMP(6)");
|
||||
|
||||
b.Property<ulong>("ItemTemplateId")
|
||||
.HasColumnType("bigint unsigned");
|
||||
|
||||
b.Property<byte>("SlotCode")
|
||||
.HasColumnType("tinyint unsigned");
|
||||
|
||||
b.Property<DateTime>("UpdatedAt")
|
||||
.ValueGeneratedOnAddOrUpdate()
|
||||
.HasColumnType("datetime(6)")
|
||||
.HasDefaultValueSql("CURRENT_TIMESTAMP(6)");
|
||||
|
||||
MySqlPropertyBuilderExtensions.UseMySqlComputedColumn(b.Property<DateTime>("UpdatedAt"));
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("ItemTemplateId");
|
||||
|
||||
b.HasIndex("CharacterId", "SlotCode")
|
||||
.IsUnique();
|
||||
|
||||
b.ToTable("equipment", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("DataServer.Data.InventoryItem", b =>
|
||||
{
|
||||
b.Property<ulong>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("bigint unsigned");
|
||||
|
||||
MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<ulong>("Id"));
|
||||
|
||||
b.Property<ulong>("CharacterId")
|
||||
.HasColumnType("bigint unsigned");
|
||||
|
||||
b.Property<DateTime>("CreatedAt")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("datetime(6)")
|
||||
.HasDefaultValueSql("CURRENT_TIMESTAMP(6)");
|
||||
|
||||
b.Property<ulong>("ItemTemplateId")
|
||||
.HasColumnType("bigint unsigned");
|
||||
|
||||
b.Property<uint>("Quantity")
|
||||
.HasColumnType("int unsigned");
|
||||
|
||||
b.Property<uint>("SlotIndex")
|
||||
.HasColumnType("int unsigned");
|
||||
|
||||
b.Property<DateTime>("UpdatedAt")
|
||||
.ValueGeneratedOnAddOrUpdate()
|
||||
.HasColumnType("datetime(6)")
|
||||
.HasDefaultValueSql("CURRENT_TIMESTAMP(6)");
|
||||
|
||||
MySqlPropertyBuilderExtensions.UseMySqlComputedColumn(b.Property<DateTime>("UpdatedAt"));
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("CharacterId");
|
||||
|
||||
b.HasIndex("ItemTemplateId");
|
||||
|
||||
b.HasIndex("CharacterId", "SlotIndex")
|
||||
.IsUnique();
|
||||
|
||||
b.ToTable("inventories", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("DataServer.Data.ItemTemplate", b =>
|
||||
{
|
||||
b.Property<ulong>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("bigint unsigned");
|
||||
|
||||
MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<ulong>("Id"));
|
||||
|
||||
b.Property<DateTime>("CreatedAt")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("datetime(6)")
|
||||
.HasDefaultValueSql("CURRENT_TIMESTAMP(6)");
|
||||
|
||||
b.Property<byte>("ItemType")
|
||||
.HasColumnType("tinyint unsigned");
|
||||
|
||||
b.Property<uint>("MaxStack")
|
||||
.HasColumnType("int unsigned");
|
||||
|
||||
b.Property<string>("Name")
|
||||
.IsRequired()
|
||||
.HasMaxLength(64)
|
||||
.HasColumnType("varchar(64)");
|
||||
|
||||
b.Property<byte>("Rarity")
|
||||
.HasColumnType("tinyint unsigned");
|
||||
|
||||
b.Property<string>("StatsJson")
|
||||
.HasColumnType("json");
|
||||
|
||||
b.Property<DateTime>("UpdatedAt")
|
||||
.ValueGeneratedOnAddOrUpdate()
|
||||
.HasColumnType("datetime(6)")
|
||||
.HasDefaultValueSql("CURRENT_TIMESTAMP(6)");
|
||||
|
||||
MySqlPropertyBuilderExtensions.UseMySqlComputedColumn(b.Property<DateTime>("UpdatedAt"));
|
||||
|
||||
b.Property<uint>("Weight")
|
||||
.HasColumnType("int unsigned");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("Name")
|
||||
.IsUnique();
|
||||
|
||||
b.ToTable("item_templates", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("DataServer.Data.Old_Character", b =>
|
||||
{
|
||||
b.Property<ulong>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("bigint unsigned");
|
||||
|
||||
MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<ulong>("Id"));
|
||||
|
||||
b.Property<ulong>("AccountId")
|
||||
.HasColumnType("bigint unsigned");
|
||||
|
||||
b.Property<string>("AppearanceJson")
|
||||
.HasColumnType("json");
|
||||
|
||||
b.Property<DateTime>("CreatedAt")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("datetime(6)")
|
||||
.HasDefaultValueSql("CURRENT_TIMESTAMP(6)");
|
||||
|
||||
b.Property<float>("FacingDeg")
|
||||
.HasColumnType("float");
|
||||
|
||||
b.Property<uint>("HpCurrent")
|
||||
.HasColumnType("int unsigned");
|
||||
|
||||
b.Property<uint>("HpMax")
|
||||
.HasColumnType("int unsigned");
|
||||
|
||||
b.Property<uint>("Level")
|
||||
.HasColumnType("int unsigned");
|
||||
|
||||
b.Property<uint>("MpCurrent")
|
||||
.HasColumnType("int unsigned");
|
||||
|
||||
b.Property<uint>("MpMax")
|
||||
.HasColumnType("int unsigned");
|
||||
|
||||
b.Property<string>("Name")
|
||||
.IsRequired()
|
||||
.HasMaxLength(32)
|
||||
.HasColumnType("varchar(32)");
|
||||
|
||||
b.Property<double>("PosX")
|
||||
.HasColumnType("double");
|
||||
|
||||
b.Property<double>("PosY")
|
||||
.HasColumnType("double");
|
||||
|
||||
b.Property<double>("PosZ")
|
||||
.HasColumnType("double");
|
||||
|
||||
b.Property<uint>("StaminaCurrent")
|
||||
.HasColumnType("int unsigned");
|
||||
|
||||
b.Property<uint>("StaminaMax")
|
||||
.HasColumnType("int unsigned");
|
||||
|
||||
b.Property<uint>("StatDexterity")
|
||||
.HasColumnType("int unsigned");
|
||||
|
||||
b.Property<uint>("StatEndurance")
|
||||
.HasColumnType("int unsigned");
|
||||
|
||||
b.Property<uint>("StatIntelligence")
|
||||
.HasColumnType("int unsigned");
|
||||
|
||||
b.Property<uint>("StatStrength")
|
||||
.HasColumnType("int unsigned");
|
||||
|
||||
b.Property<uint>("StatWisdom")
|
||||
.HasColumnType("int unsigned");
|
||||
|
||||
b.Property<DateTime>("UpdatedAt")
|
||||
.ValueGeneratedOnAddOrUpdate()
|
||||
.HasColumnType("datetime(6)")
|
||||
.HasDefaultValueSql("CURRENT_TIMESTAMP(6)");
|
||||
|
||||
MySqlPropertyBuilderExtensions.UseMySqlComputedColumn(b.Property<DateTime>("UpdatedAt"));
|
||||
|
||||
b.Property<ulong>("Xp")
|
||||
.HasColumnType("bigint unsigned");
|
||||
|
||||
b.Property<ulong>("ZoneId")
|
||||
.HasColumnType("bigint unsigned");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("AccountId")
|
||||
.IsUnique();
|
||||
|
||||
b.HasIndex("ZoneId");
|
||||
|
||||
b.ToTable("characters", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("DataServer.Data.Session", b =>
|
||||
{
|
||||
b.Property<ulong>("Id")
|
||||
@@ -1671,7 +1444,7 @@ namespace SystemRevivalServer.Migrations
|
||||
modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b =>
|
||||
{
|
||||
b.HasOne("DataServer.Data.Account", "Account")
|
||||
.WithMany()
|
||||
.WithMany("Characters")
|
||||
.HasForeignKey("AccountId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
@@ -1900,63 +1673,6 @@ namespace SystemRevivalServer.Migrations
|
||||
b.Navigation("Definition");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("DataServer.Data.EquipmentSlot", b =>
|
||||
{
|
||||
b.HasOne("DataServer.Data.Old_Character", "Old_Character")
|
||||
.WithMany()
|
||||
.HasForeignKey("CharacterId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate")
|
||||
.WithMany()
|
||||
.HasForeignKey("ItemTemplateId")
|
||||
.OnDelete(DeleteBehavior.Restrict)
|
||||
.IsRequired();
|
||||
|
||||
b.Navigation("ItemTemplate");
|
||||
|
||||
b.Navigation("Old_Character");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("DataServer.Data.InventoryItem", b =>
|
||||
{
|
||||
b.HasOne("DataServer.Data.Old_Character", "Old_Character")
|
||||
.WithMany()
|
||||
.HasForeignKey("CharacterId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate")
|
||||
.WithMany()
|
||||
.HasForeignKey("ItemTemplateId")
|
||||
.OnDelete(DeleteBehavior.Restrict)
|
||||
.IsRequired();
|
||||
|
||||
b.Navigation("ItemTemplate");
|
||||
|
||||
b.Navigation("Old_Character");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("DataServer.Data.Old_Character", b =>
|
||||
{
|
||||
b.HasOne("DataServer.Data.Account", "Account")
|
||||
.WithMany("Characters")
|
||||
.HasForeignKey("AccountId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.HasOne("DataServer.Data.Zone", "Zone")
|
||||
.WithMany()
|
||||
.HasForeignKey("ZoneId")
|
||||
.OnDelete(DeleteBehavior.Restrict)
|
||||
.IsRequired();
|
||||
|
||||
b.Navigation("Account");
|
||||
|
||||
b.Navigation("Zone");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("DataServer.Data.Session", b =>
|
||||
{
|
||||
b.HasOne("DataServer.Data.Account", "Account")
|
||||
|
||||
@@ -3,10 +3,12 @@
|
||||
@using DataServer.Data.Enums
|
||||
@{
|
||||
ViewData["Title"] = Model.IsNew ? "Create Item" : $"Edit: {Model.Item.Name}";
|
||||
var isEquipment = Model.Item.Type == ItemType.Weapon || Model.Item.Type == ItemType.Armor || Model.Item.Type == ItemType.Accessory;
|
||||
var isWeapon = Model.Item.Type == ItemType.Weapon;
|
||||
var isConsumable = Model.Item.Type == ItemType.Consumable;
|
||||
}
|
||||
|
||||
<div class="space-y-6 max-w-5xl">
|
||||
<!-- Header -->
|
||||
<div class="flex items-center gap-4">
|
||||
<a href="/admin/items" class="p-2 hover:bg-gray-800 rounded-lg">
|
||||
<svg class="w-6 h-6 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
@@ -21,226 +23,94 @@
|
||||
|
||||
@if (!string.IsNullOrEmpty(Model.Message))
|
||||
{
|
||||
<div class="p-4 rounded-lg @(Model.IsError ? "bg-red-900/50 border border-red-700 text-red-200" : "bg-green-900/50 border border-green-700 text-green-200")">
|
||||
@Model.Message
|
||||
</div>
|
||||
<div class="p-4 rounded-lg @(Model.IsError ? "bg-red-900/50 border border-red-700 text-red-200" : "bg-green-900/50 border border-green-700 text-green-200")">@Model.Message</div>
|
||||
}
|
||||
|
||||
<form method="post" class="space-y-6">
|
||||
<form method="post" class="space-y-6" id="itemForm">
|
||||
@Html.AntiForgeryToken()
|
||||
<input type="hidden" name="Item.Id" value="@Model.Item.Id" />
|
||||
|
||||
<!-- Basic Info -->
|
||||
<div class="card">
|
||||
<div class="p-4 border-b border-gray-700">
|
||||
<h2 class="text-lg font-semibold text-white">Basic Information</h2>
|
||||
</div>
|
||||
<div class="p-4 border-b border-gray-700"><h2 class="text-lg font-semibold text-white">Basic Information</h2></div>
|
||||
<div class="p-6 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
|
||||
<div class="lg:col-span-2">
|
||||
<label class="label">Name *</label>
|
||||
<input type="text" name="Item.Name" value="@Model.Item.Name" class="input" required maxlength="64" />
|
||||
</div>
|
||||
|
||||
<div class="lg:col-span-2"><label class="label">Name *</label><input type="text" name="Item.Name" value="@Model.Item.Name" class="input" required maxlength="64" /></div>
|
||||
<div>
|
||||
<label class="label">Type *</label>
|
||||
<select name="Item.Type" class="input" required>
|
||||
@foreach (var t in Enum.GetValues<ItemType>())
|
||||
{
|
||||
<option value="@t" selected="@(Model.Item.Type == t)">@t</option>
|
||||
}
|
||||
<select name="Item.Type" id="itemType" class="input" required onchange="updateSections()">
|
||||
@foreach (var t in Enum.GetValues<ItemType>()) { <option value="@t" selected="@(Model.Item.Type == t)">@t</option> }
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="lg:col-span-3">
|
||||
<label class="label">Description</label>
|
||||
<textarea name="Item.Description" class="input" rows="2" maxlength="256">@Model.Item.Description</textarea>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label class="label">Rarity</label>
|
||||
<select name="Item.Rarity" class="input">
|
||||
@foreach (var r in Enum.GetValues<ItemRarity>())
|
||||
{
|
||||
<option value="@r" selected="@(Model.Item.Rarity == r)">@r</option>
|
||||
}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="lg:col-span-3"><label class="label">Description</label><textarea name="Item.Description" class="input" rows="2" maxlength="256">@Model.Item.Description</textarea></div>
|
||||
<div><label class="label">Rarity</label><select name="Item.Rarity" class="input">@foreach (var r in Enum.GetValues<ItemRarity>()) { <option value="@r" selected="@(Model.Item.Rarity == r)">@r</option> }</select></div>
|
||||
<div id="equipSlotSection">
|
||||
<label class="label">Equipment Slot</label>
|
||||
<select name="Item.EquipSlot" class="input">
|
||||
<option value="">Not Equippable</option>
|
||||
@foreach (var s in Enum.GetValues<DungeonEquipmentSlot>())
|
||||
{
|
||||
<option value="@s" selected="@(Model.Item.EquipSlot == s)">@s</option>
|
||||
}
|
||||
<option value="" selected="@(Model.Item.EquipSlot == null)">Not Equippable</option>
|
||||
@foreach (var s in Enum.GetValues<DungeonEquipmentSlot>()) { <option value="@s" selected="@(Model.Item.EquipSlot == s)">@s</option> }
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="flex items-center gap-6 pt-6">
|
||||
<label class="flex items-center gap-2 cursor-pointer">
|
||||
<input type="checkbox" name="Item.IsEnabled" value="true" checked="@Model.Item.IsEnabled" class="w-4 h-4 rounded border-gray-600 bg-gray-800 text-indigo-600" />
|
||||
<span class="text-gray-300">Enabled</span>
|
||||
</label>
|
||||
<label class="flex items-center gap-2 cursor-pointer">
|
||||
<input type="checkbox" name="Item.Stackable" value="true" checked="@Model.Item.Stackable" class="w-4 h-4 rounded border-gray-600 bg-gray-800 text-indigo-600" id="stackableCheck" onchange="toggleMaxStack()" />
|
||||
<span class="text-gray-300">Stackable</span>
|
||||
</label>
|
||||
</div>
|
||||
<div><label class="label">Required Level</label><input type="number" name="Item.RequiredLevel" value="@Model.Item.RequiredLevel" class="input" min="1" /></div>
|
||||
<div class="flex items-center gap-4"><label class="flex items-center gap-2 cursor-pointer"><input type="checkbox" name="Item.IsEnabled" value="true" checked="@Model.Item.IsEnabled" class="w-4 h-4 rounded border-gray-600 bg-gray-800 text-indigo-600" /><span class="text-gray-300">Enabled</span></label></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Stacking & Visual -->
|
||||
<div class="grid grid-cols-1 lg:grid-cols-2 gap-6">
|
||||
<div class="card">
|
||||
<div class="p-4 border-b border-gray-700">
|
||||
<h2 class="text-lg font-semibold text-white">Stacking</h2>
|
||||
</div>
|
||||
<div class="p-6 space-y-4">
|
||||
<div>
|
||||
<label class="label">Max Stack</label>
|
||||
<input type="number" id="maxStackInput" name="Item.MaxStack" value="@Model.Item.MaxStack" class="input" min="1" max="9999" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<div class="p-4 border-b border-gray-700">
|
||||
<h2 class="text-lg font-semibold text-white">Visual</h2>
|
||||
</div>
|
||||
<div class="p-6 space-y-4">
|
||||
<div>
|
||||
<label class="label">Sprite Path (CDN)</label>
|
||||
<input type="text" name="Item.SpritePath" value="@Model.Item.SpritePath" class="input" placeholder="textures/items/sword.png" id="spritePath" oninput="updatePreview()" />
|
||||
</div>
|
||||
<div class="flex items-center gap-4">
|
||||
<div>
|
||||
<label class="label">Preview</label>
|
||||
<div class="w-16 h-16 bg-gray-900 rounded-lg border border-gray-700 flex items-center justify-center overflow-hidden">
|
||||
<img id="spritePreview" src="" class="max-w-full max-h-full object-contain hidden" onerror="this.classList.add('hidden')" onload="this.classList.remove('hidden')" />
|
||||
<svg id="spritePlaceholder" class="w-8 h-8 text-gray-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 16l4.586-4.586a2 2 0 012.828 0L16 16m-2-2l1.586-1.586a2 2 0 012.828 0L20 14m-6-6h.01M6 20h12a2 2 0 002-2V6a2 2 0 00-2-2H6a2 2 0 00-2 2v12a2 2 0 002 2z"/>
|
||||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex-1">
|
||||
<label class="label">Tint Color</label>
|
||||
<div class="flex gap-2">
|
||||
<input type="color" id="tintPicker" value="@(Model.Item.TintColor ?? "#ffffff")" class="w-10 h-10 rounded border border-gray-700 bg-gray-800 cursor-pointer" oninput="document.getElementById('tintColor').value=this.value" />
|
||||
<input type="text" id="tintColor" name="Item.TintColor" value="@Model.Item.TintColor" class="input flex-1" placeholder="#ffffff" oninput="document.getElementById('tintPicker').value=this.value||'#ffffff'" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Requirements -->
|
||||
<!-- Visuals & Stacking -->
|
||||
<div class="card">
|
||||
<div class="p-4 border-b border-gray-700">
|
||||
<h2 class="text-lg font-semibold text-white">Requirements</h2>
|
||||
</div>
|
||||
<div class="p-6 grid grid-cols-2 md:grid-cols-5 gap-4">
|
||||
<div>
|
||||
<label class="label">Level</label>
|
||||
<input type="number" name="Item.RequiredLevel" value="@Model.Item.RequiredLevel" class="input" min="1" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="label">Strength</label>
|
||||
<input type="number" name="Item.RequiredStrength" value="@Model.Item.RequiredStrength" class="input" min="0" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="label">Intelligence</label>
|
||||
<input type="number" name="Item.RequiredIntelligence" value="@Model.Item.RequiredIntelligence" class="input" min="0" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="label">Wisdom</label>
|
||||
<input type="number" name="Item.RequiredWisdom" value="@Model.Item.RequiredWisdom" class="input" min="0" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="label">Dexterity</label>
|
||||
<input type="number" name="Item.RequiredDexterity" value="@Model.Item.RequiredDexterity" class="input" min="0" />
|
||||
</div>
|
||||
<div class="p-4 border-b border-gray-700"><h2 class="text-lg font-semibold text-white">Visual & Stacking</h2></div>
|
||||
<div class="p-6 grid grid-cols-1 md:grid-cols-4 gap-6">
|
||||
<div class="md:col-span-2"><label class="label">Sprite Path (CDN)</label><input type="text" id="spritePath" name="Item.SpritePath" value="@Model.Item.SpritePath" class="input" placeholder="textures/items/sword.png" oninput="updatePreview()" /></div>
|
||||
<div><label class="label">Tint Color</label><div class="flex gap-2"><input type="color" value="@(Model.Item.TintColor ?? "#ffffff")" class="w-10 h-10 rounded border border-gray-700 bg-gray-800 cursor-pointer" oninput="document.getElementById('tintColor').value=this.value" /><input type="text" id="tintColor" name="Item.TintColor" value="@(Model.Item.TintColor ?? "#ffffff")" class="input flex-1" /></div></div>
|
||||
<div><label class="label">Preview</label><div class="w-16 h-16 bg-gray-900 rounded-lg border border-gray-700 flex items-center justify-center"><img id="spritePreview" src="" class="max-w-full max-h-full object-contain hidden" /><span id="spritePlaceholder" class="text-gray-600 text-xs">No image</span></div></div>
|
||||
<div class="flex items-center"><label class="flex items-center gap-2 cursor-pointer"><input type="checkbox" id="stackableCheck" name="Item.Stackable" value="true" checked="@Model.Item.Stackable" class="w-4 h-4 rounded border-gray-600 bg-gray-800 text-indigo-600" onchange="toggleMaxStack()" /><span class="text-gray-300">Stackable</span></label></div>
|
||||
<div><label class="label">Max Stack</label><input type="number" id="maxStackInput" name="Item.MaxStack" value="@Model.Item.MaxStack" class="input" min="1" disabled="@(!Model.Item.Stackable)" /></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Stat Bonuses -->
|
||||
<div class="card">
|
||||
<div class="p-4 border-b border-gray-700">
|
||||
<h2 class="text-lg font-semibold text-white">Stat Bonuses (When Equipped)</h2>
|
||||
</div>
|
||||
<div class="p-6 grid grid-cols-2 md:grid-cols-4 lg:grid-cols-7 gap-4">
|
||||
<div>
|
||||
<label class="label">+ STR</label>
|
||||
<input type="number" name="Item.BonusStrength" value="@Model.Item.BonusStrength" class="input" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="label">+ INT</label>
|
||||
<input type="number" name="Item.BonusIntelligence" value="@Model.Item.BonusIntelligence" class="input" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="label">+ WIS</label>
|
||||
<input type="number" name="Item.BonusWisdom" value="@Model.Item.BonusWisdom" class="input" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="label">+ END</label>
|
||||
<input type="number" name="Item.BonusEndurance" value="@Model.Item.BonusEndurance" class="input" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="label">+ DEX</label>
|
||||
<input type="number" name="Item.BonusDexterity" value="@Model.Item.BonusDexterity" class="input" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="label">+ Health</label>
|
||||
<input type="number" name="Item.BonusHealth" value="@Model.Item.BonusHealth" class="input" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="label">+ Mana</label>
|
||||
<input type="number" name="Item.BonusMana" value="@Model.Item.BonusMana" class="input" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Combat Stats -->
|
||||
<div class="card">
|
||||
<div class="p-4 border-b border-gray-700">
|
||||
<h2 class="text-lg font-semibold text-white">Combat Stats</h2>
|
||||
</div>
|
||||
<!-- Requirements (Equipment) -->
|
||||
<div id="requirementsSection" class="card" style="display: @(isEquipment ? "block" : "none")">
|
||||
<div class="p-4 border-b border-gray-700"><h2 class="text-lg font-semibold text-white">Stat Requirements</h2></div>
|
||||
<div class="p-6 grid grid-cols-2 md:grid-cols-4 gap-4">
|
||||
<div>
|
||||
<label class="label">Min Damage</label>
|
||||
<input type="number" name="Item.MinDamage" value="@Model.Item.MinDamage" class="input" min="0" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="label">Max Damage</label>
|
||||
<input type="number" name="Item.MaxDamage" value="@Model.Item.MaxDamage" class="input" min="0" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="label">Attack Range</label>
|
||||
<input type="number" name="Item.AttackRange" value="@Model.Item.AttackRange" class="input" min="0" step="0.1" />
|
||||
</div>
|
||||
<div>
|
||||
<div><label class="label">Strength</label><input type="number" name="Item.RequiredStrength" value="@Model.Item.RequiredStrength" class="input" min="0" /></div>
|
||||
<div><label class="label">Intelligence</label><input type="number" name="Item.RequiredIntelligence" value="@Model.Item.RequiredIntelligence" class="input" min="0" /></div>
|
||||
<div><label class="label">Wisdom</label><input type="number" name="Item.RequiredWisdom" value="@Model.Item.RequiredWisdom" class="input" min="0" /></div>
|
||||
<div><label class="label">Dexterity</label><input type="number" name="Item.RequiredDexterity" value="@Model.Item.RequiredDexterity" class="input" min="0" /></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Stat Bonuses (Equipment) -->
|
||||
<div id="statBonusesSection" class="card" style="display: @(isEquipment ? "block" : "none")">
|
||||
<div class="p-4 border-b border-gray-700"><h2 class="text-lg font-semibold text-white">Stat Bonuses (When Equipped)</h2></div>
|
||||
<div class="p-6 grid grid-cols-2 md:grid-cols-4 lg:grid-cols-7 gap-4">
|
||||
<div><label class="label">+ STR</label><input type="number" name="Item.BonusStrength" value="@Model.Item.BonusStrength" class="input" /></div>
|
||||
<div><label class="label">+ INT</label><input type="number" name="Item.BonusIntelligence" value="@Model.Item.BonusIntelligence" class="input" /></div>
|
||||
<div><label class="label">+ WIS</label><input type="number" name="Item.BonusWisdom" value="@Model.Item.BonusWisdom" class="input" /></div>
|
||||
<div><label class="label">+ END</label><input type="number" name="Item.BonusEndurance" value="@Model.Item.BonusEndurance" class="input" /></div>
|
||||
<div><label class="label">+ DEX</label><input type="number" name="Item.BonusDexterity" value="@Model.Item.BonusDexterity" class="input" /></div>
|
||||
<div><label class="label">+ Health</label><input type="number" name="Item.BonusHealth" value="@Model.Item.BonusHealth" class="input" /></div>
|
||||
<div><label class="label">+ Mana</label><input type="number" name="Item.BonusMana" value="@Model.Item.BonusMana" class="input" /></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Combat Stats (Equipment) -->
|
||||
<div id="combatStatsSection" class="card" style="display: @(isEquipment ? "block" : "none")">
|
||||
<div class="p-4 border-b border-gray-700"><h2 class="text-lg font-semibold text-white">Combat Stats</h2></div>
|
||||
<div class="p-6 grid grid-cols-2 md:grid-cols-5 gap-4">
|
||||
<div id="minDamageSection" style="display: @(isWeapon ? "block" : "none")"><label class="label">Min Damage</label><input type="number" name="Item.MinDamage" value="@Model.Item.MinDamage" class="input" min="0" /></div>
|
||||
<div id="maxDamageSection" style="display: @(isWeapon ? "block" : "none")"><label class="label">Max Damage</label><input type="number" name="Item.MaxDamage" value="@Model.Item.MaxDamage" class="input" min="0" /></div>
|
||||
<div id="attackRangeSection" style="display: @(isWeapon ? "block" : "none")"><label class="label">Attack Range</label><input type="number" name="Item.AttackRange" value="@Model.Item.AttackRange" class="input" min="0" step="0.1" /></div>
|
||||
<div id="damageTypeSection" style="display: @(isWeapon ? "block" : "none")">
|
||||
<label class="label">Damage Type</label>
|
||||
<select name="Item.DamageType" class="input">
|
||||
@foreach (var d in Enum.GetValues<DamageType>())
|
||||
{
|
||||
<option value="@d" selected="@(Model.Item.DamageType == d)">@d</option>
|
||||
}
|
||||
<select name="Item.DamageTypeKey" class="input">
|
||||
@foreach (var rt in Model.ResistanceTypes) { <option value="@rt.Key" selected="@(Model.Item.DamageTypeKey == rt.Key)" style="color: @rt.Color">@rt.DisplayName</option> }
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<label class="label">Armor</label>
|
||||
<input type="number" name="Item.Armor" value="@Model.Item.Armor" class="input" min="0" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="label">Magic Resist</label>
|
||||
<input type="number" name="Item.MagicResist" value="@Model.Item.MagicResist" class="input" min="0" />
|
||||
</div>
|
||||
<div><label class="label">Armor</label><input type="number" name="Item.Armor" value="@Model.Item.Armor" class="input" min="0" /></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Resistances (Equipment) -->
|
||||
<div class="card">
|
||||
<div id="resistancesSection" class="card" style="display: @(isEquipment ? "block" : "none")">
|
||||
<div class="p-4 border-b border-gray-700">
|
||||
<h2 class="text-lg font-semibold text-white">Resistance Bonuses (When Equipped)</h2>
|
||||
<p class="text-sm text-gray-400 mt-1">Permanent resistances granted while this item is equipped</p>
|
||||
@@ -249,45 +119,20 @@
|
||||
<div id="resistancesList" class="space-y-2 mb-4">
|
||||
@foreach (var resist in Model.ItemResistances)
|
||||
{
|
||||
var bgColor = resist.Value < 0 ? "bg-red-900/30 border-red-700" :
|
||||
resist.Value > 0 ? "bg-green-900/30 border-green-700" :
|
||||
"bg-gray-800 border-gray-700";
|
||||
var bgColor = resist.Value < 0 ? "bg-red-900/30 border-red-700" : resist.Value > 0 ? "bg-green-900/30 border-green-700" : "bg-gray-800 border-gray-700";
|
||||
<div class="@bgColor border rounded-lg p-3 flex items-center gap-4 resistance-row">
|
||||
<select name="resist_name[]" class="input w-40">
|
||||
@foreach (var rt in Model.ResistanceTypes)
|
||||
{
|
||||
<option value="@rt.Key" selected="@(resist.Key == rt.Key)" style="color: @rt.Color">@rt.DisplayName</option>
|
||||
}
|
||||
</select>
|
||||
<select name="resist_name[]" class="input w-40">@foreach (var rt in Model.ResistanceTypes) { <option value="@rt.Key" selected="@(resist.Key == rt.Key)">@rt.DisplayName</option> }</select>
|
||||
<div class="flex items-center gap-2 flex-1">
|
||||
<input type="range" name="resist_value[]" value="@resist.Value" min="-1" max="1" step="0.05" class="flex-1"
|
||||
oninput="this.nextElementSibling.value = Math.round(this.value * 100)" />
|
||||
<div class="flex items-center gap-1">
|
||||
<input type="number" value="@((resist.Value * 100).ToString("0"))" min="-100" max="100" step="5"
|
||||
class="input w-20 text-center text-sm"
|
||||
oninput="this.parentElement.previousElementSibling.value = this.value / 100" />
|
||||
<span class="text-gray-400">%</span>
|
||||
</div>
|
||||
<input type="range" name="resist_value[]" value="@resist.Value" min="-1" max="1" step="0.05" class="flex-1" oninput="this.nextElementSibling.value = Math.round(this.value * 100)" />
|
||||
<div class="flex items-center gap-1"><input type="number" value="@((resist.Value * 100).ToString("0"))" min="-100" max="100" step="5" class="input w-20 text-center text-sm" oninput="this.parentElement.previousElementSibling.value = this.value / 100" /><span class="text-gray-400">%</span></div>
|
||||
</div>
|
||||
<button type="button" onclick="this.closest('.resistance-row').remove()" class="p-2 text-red-400 hover:text-red-300">
|
||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/>
|
||||
</svg>
|
||||
</button>
|
||||
<button type="button" onclick="this.closest('.resistance-row').remove()" class="p-2 text-red-400 hover:text-red-300"><svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/></svg></button>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
|
||||
<div class="flex items-center gap-4 pt-4 border-t border-gray-700">
|
||||
<select id="newResistType" class="input w-40">
|
||||
<option value="">Select type...</option>
|
||||
@foreach (var rt in Model.ResistanceTypes)
|
||||
{
|
||||
<option value="@rt.Key" data-color="@rt.Color">@rt.DisplayName</option>
|
||||
}
|
||||
</select>
|
||||
<input type="number" id="newResistValue" class="input w-24" value="10" min="-100" max="100" step="5" />
|
||||
<span class="text-gray-400">%</span>
|
||||
<select id="newResistType" class="input w-40"><option value="">Select type...</option>@foreach (var rt in Model.ResistanceTypes) { <option value="@rt.Key">@rt.DisplayName</option> }</select>
|
||||
<input type="number" id="newResistValue" class="input w-24" value="10" min="-100" max="100" step="5" /><span class="text-gray-400">%</span>
|
||||
<button type="button" onclick="addResistance()" class="btn btn-secondary">Add</button>
|
||||
<a href="/admin/resistances" class="text-sm text-indigo-400 hover:underline ml-auto">Manage Types →</a>
|
||||
</div>
|
||||
@@ -295,84 +140,36 @@
|
||||
</div>
|
||||
|
||||
<!-- Consumable Effects -->
|
||||
<div class="card">
|
||||
<div class="p-4 border-b border-gray-700">
|
||||
<h2 class="text-lg font-semibold text-white">Consumable Effects</h2>
|
||||
</div>
|
||||
<div id="consumableSection" class="card" style="display: @(isConsumable ? "block" : "none")">
|
||||
<div class="p-4 border-b border-gray-700"><h2 class="text-lg font-semibold text-white">Consumable Effects</h2></div>
|
||||
<div class="p-6">
|
||||
<div class="grid grid-cols-2 md:grid-cols-5 gap-4 mb-6">
|
||||
<div>
|
||||
<label class="label">Heal Amount</label>
|
||||
<input type="number" name="Item.HealAmount" value="@Model.Item.HealAmount" class="input" min="0" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="label">Mana Restore</label>
|
||||
<input type="number" name="Item.ManaRestore" value="@Model.Item.ManaRestore" class="input" min="0" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="label">Stamina Restore</label>
|
||||
<input type="number" name="Item.StaminaRestore" value="@Model.Item.StaminaRestore" class="input" min="0" />
|
||||
</div>
|
||||
<div>
|
||||
<label class="label">Buff Duration (sec)</label>
|
||||
<input type="number" name="Item.BuffDuration" value="@Model.Item.BuffDuration" class="input" min="0" />
|
||||
<p class="text-xs text-gray-500 mt-1">0 = instant only</p>
|
||||
</div>
|
||||
<div class="flex items-center pt-6">
|
||||
<label class="flex items-center gap-2 cursor-pointer">
|
||||
<input type="checkbox" name="Item.IsTeleportScroll" value="true" checked="@Model.Item.IsTeleportScroll" class="w-4 h-4 rounded border-gray-600 bg-gray-800 text-indigo-600" />
|
||||
<span class="text-gray-300">Teleport Scroll</span>
|
||||
</label>
|
||||
</div>
|
||||
<div><label class="label">Heal Amount</label><input type="number" name="Item.HealAmount" value="@Model.Item.HealAmount" class="input" min="0" /></div>
|
||||
<div><label class="label">Mana Restore</label><input type="number" name="Item.ManaRestore" value="@Model.Item.ManaRestore" class="input" min="0" /></div>
|
||||
<div><label class="label">Stamina Restore</label><input type="number" name="Item.StaminaRestore" value="@Model.Item.StaminaRestore" class="input" min="0" /></div>
|
||||
<div><label class="label">Buff Duration (sec)</label><input type="number" name="Item.BuffDuration" value="@Model.Item.BuffDuration" class="input" min="0" /><p class="text-xs text-gray-500 mt-1">0 = instant only</p></div>
|
||||
<div class="flex items-center pt-6"><label class="flex items-center gap-2 cursor-pointer"><input type="checkbox" name="Item.IsTeleportScroll" value="true" checked="@Model.Item.IsTeleportScroll" class="w-4 h-4 rounded border-gray-600 bg-gray-800 text-indigo-600" /><span class="text-gray-300">Teleport Scroll</span></label></div>
|
||||
</div>
|
||||
|
||||
<!-- Buff Resistances -->
|
||||
<div class="pt-4 border-t border-gray-700">
|
||||
<h3 class="text-md font-medium text-white mb-3">Temporary Buff Resistances</h3>
|
||||
<p class="text-sm text-gray-400 mb-4">Resistances applied for BuffDuration seconds when consumed</p>
|
||||
|
||||
<div id="buffResistancesList" class="space-y-2 mb-4">
|
||||
@foreach (var resist in Model.BuffResistances)
|
||||
{
|
||||
var bgColor = resist.Value < 0 ? "bg-red-900/30 border-red-700" :
|
||||
resist.Value > 0 ? "bg-green-900/30 border-green-700" :
|
||||
"bg-gray-800 border-gray-700";
|
||||
var bgColor = resist.Value < 0 ? "bg-red-900/30 border-red-700" : resist.Value > 0 ? "bg-green-900/30 border-green-700" : "bg-gray-800 border-gray-700";
|
||||
<div class="@bgColor border rounded-lg p-3 flex items-center gap-4 buff-resistance-row">
|
||||
<select name="buff_resist_name[]" class="input w-40">
|
||||
@foreach (var rt in Model.ResistanceTypes)
|
||||
{
|
||||
<option value="@rt.Key" selected="@(resist.Key == rt.Key)">@rt.DisplayName</option>
|
||||
}
|
||||
</select>
|
||||
<select name="buff_resist_name[]" class="input w-40">@foreach (var rt in Model.ResistanceTypes) { <option value="@rt.Key" selected="@(resist.Key == rt.Key)">@rt.DisplayName</option> }</select>
|
||||
<div class="flex items-center gap-2 flex-1">
|
||||
<input type="range" name="buff_resist_value[]" value="@resist.Value" min="-1" max="1" step="0.05" class="flex-1"
|
||||
oninput="this.nextElementSibling.value = Math.round(this.value * 100)" />
|
||||
<div class="flex items-center gap-1">
|
||||
<input type="number" value="@((resist.Value * 100).ToString("0"))" min="-100" max="100" step="5"
|
||||
class="input w-20 text-center text-sm"
|
||||
oninput="this.parentElement.previousElementSibling.value = this.value / 100" />
|
||||
<span class="text-gray-400">%</span>
|
||||
</div>
|
||||
<input type="range" name="buff_resist_value[]" value="@resist.Value" min="-1" max="1" step="0.05" class="flex-1" oninput="this.nextElementSibling.value = Math.round(this.value * 100)" />
|
||||
<div class="flex items-center gap-1"><input type="number" value="@((resist.Value * 100).ToString("0"))" min="-100" max="100" step="5" class="input w-20 text-center text-sm" oninput="this.parentElement.previousElementSibling.value = this.value / 100" /><span class="text-gray-400">%</span></div>
|
||||
</div>
|
||||
<button type="button" onclick="this.closest('.buff-resistance-row').remove()" class="p-2 text-red-400 hover:text-red-300">
|
||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/>
|
||||
</svg>
|
||||
</button>
|
||||
<button type="button" onclick="this.closest('.buff-resistance-row').remove()" class="p-2 text-red-400 hover:text-red-300"><svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/></svg></button>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
|
||||
<div class="flex items-center gap-4">
|
||||
<select id="newBuffResistType" class="input w-40">
|
||||
<option value="">Select type...</option>
|
||||
@foreach (var rt in Model.ResistanceTypes)
|
||||
{
|
||||
<option value="@rt.Key">@rt.DisplayName</option>
|
||||
}
|
||||
</select>
|
||||
<input type="number" id="newBuffResistValue" class="input w-24" value="25" min="-100" max="100" step="5" />
|
||||
<span class="text-gray-400">%</span>
|
||||
<select id="newBuffResistType" class="input w-40"><option value="">Select type...</option>@foreach (var rt in Model.ResistanceTypes) { <option value="@rt.Key">@rt.DisplayName</option> }</select>
|
||||
<input type="number" id="newBuffResistValue" class="input w-24" value="25" min="-100" max="100" step="5" /><span class="text-gray-400">%</span>
|
||||
<button type="button" onclick="addBuffResistance()" class="btn btn-secondary">Add Buff</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -383,11 +180,7 @@
|
||||
<div class="flex items-center gap-4">
|
||||
<button type="submit" class="btn btn-primary">@(Model.IsNew ? "Create Item" : "Save Changes")</button>
|
||||
<a href="/admin/items" class="btn btn-secondary">Cancel</a>
|
||||
@if (!Model.IsNew)
|
||||
{
|
||||
<div class="flex-1"></div>
|
||||
<button type="submit" name="action" value="duplicate" class="btn btn-secondary">Duplicate</button>
|
||||
}
|
||||
@if (!Model.IsNew) { <div class="flex-1"></div><button type="submit" name="action" value="duplicate" class="btn btn-secondary">Duplicate</button> }
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
@@ -395,104 +188,47 @@
|
||||
@section Scripts {
|
||||
<script>
|
||||
const cdnBase = '@Html.Raw(Model.CdnBaseUrl)/downloads';
|
||||
const resistanceOptions = `@Html.Raw(string.Join("", Model.ResistanceTypes.Select(rt => $"<option value=\"{rt.Key}\">{rt.DisplayName}</option>")))`;
|
||||
|
||||
function updatePreview() {
|
||||
const path = document.getElementById('spritePath').value;
|
||||
const img = document.getElementById('spritePreview');
|
||||
const placeholder = document.getElementById('spritePlaceholder');
|
||||
if (path && path.trim()) {
|
||||
const fullUrl = cdnBase + '/' + path.trim();
|
||||
console.log('Loading preview:', fullUrl);
|
||||
img.onload = function() {
|
||||
img.classList.remove('hidden');
|
||||
placeholder.classList.add('hidden');
|
||||
};
|
||||
img.onerror = function() {
|
||||
console.log('Failed to load:', fullUrl);
|
||||
img.classList.add('hidden');
|
||||
placeholder.classList.remove('hidden');
|
||||
};
|
||||
img.src = fullUrl;
|
||||
} else {
|
||||
img.classList.add('hidden');
|
||||
placeholder.classList.remove('hidden');
|
||||
}
|
||||
if (path && path.trim()) { img.onload = () => { img.classList.remove('hidden'); placeholder.classList.add('hidden'); }; img.onerror = () => { img.classList.add('hidden'); placeholder.classList.remove('hidden'); }; img.src = cdnBase + '/' + path.trim(); }
|
||||
else { img.classList.add('hidden'); placeholder.classList.remove('hidden'); }
|
||||
}
|
||||
|
||||
function toggleMaxStack() {
|
||||
const cb = document.getElementById('stackableCheck');
|
||||
const input = document.getElementById('maxStackInput');
|
||||
input.disabled = !cb.checked;
|
||||
if (!cb.checked) input.value = 1;
|
||||
function toggleMaxStack() { const cb = document.getElementById('stackableCheck'); const input = document.getElementById('maxStackInput'); input.disabled = !cb.checked; if (!cb.checked) input.value = 1; }
|
||||
function updateSections() {
|
||||
const type = document.getElementById('itemType').value;
|
||||
const isEquipment = ['Weapon', 'Armor', 'Accessory'].includes(type);
|
||||
const isWeapon = type === 'Weapon';
|
||||
const isConsumable = type === 'Consumable';
|
||||
document.getElementById('requirementsSection').style.display = isEquipment ? 'block' : 'none';
|
||||
document.getElementById('statBonusesSection').style.display = isEquipment ? 'block' : 'none';
|
||||
document.getElementById('combatStatsSection').style.display = isEquipment ? 'block' : 'none';
|
||||
document.getElementById('resistancesSection').style.display = isEquipment ? 'block' : 'none';
|
||||
document.getElementById('minDamageSection').style.display = isWeapon ? 'block' : 'none';
|
||||
document.getElementById('maxDamageSection').style.display = isWeapon ? 'block' : 'none';
|
||||
document.getElementById('attackRangeSection').style.display = isWeapon ? 'block' : 'none';
|
||||
document.getElementById('damageTypeSection').style.display = isWeapon ? 'block' : 'none';
|
||||
document.getElementById('consumableSection').style.display = isConsumable ? 'block' : 'none';
|
||||
}
|
||||
|
||||
// Init
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
updatePreview();
|
||||
toggleMaxStack();
|
||||
});
|
||||
|
||||
// Resistance type options for dynamic rows
|
||||
const resistanceOptions = `@Html.Raw(string.Join("", Model.ResistanceTypes.Select(rt => $"<option value=\"{rt.Key}\">{rt.DisplayName}</option>")))`;
|
||||
|
||||
function addResistance() {
|
||||
const typeSelect = document.getElementById('newResistType');
|
||||
const valueInput = document.getElementById('newResistValue');
|
||||
|
||||
const key = typeSelect.value;
|
||||
if (!key) { alert('Select a resistance type'); return; }
|
||||
|
||||
const percent = parseInt(valueInput.value) || 0;
|
||||
const value = percent / 100;
|
||||
const typeSelect = document.getElementById('newResistType'); const valueInput = document.getElementById('newResistValue');
|
||||
const key = typeSelect.value; if (!key) { alert('Select a resistance type'); return; }
|
||||
const percent = parseInt(valueInput.value) || 0; const value = percent / 100;
|
||||
const bgColor = value < 0 ? 'bg-red-900/30 border-red-700' : value > 0 ? 'bg-green-900/30 border-green-700' : 'bg-gray-800 border-gray-700';
|
||||
|
||||
const html = `
|
||||
<div class="${bgColor} border rounded-lg p-3 flex items-center gap-4 resistance-row">
|
||||
<select name="resist_name[]" class="input w-40">${resistanceOptions.replace('value="'+key+'"', 'value="'+key+'" selected')}</select>
|
||||
<div class="flex items-center gap-2 flex-1">
|
||||
<input type="range" name="resist_value[]" value="${value}" min="-1" max="1" step="0.05" class="flex-1" oninput="this.nextElementSibling.value = Math.round(this.value * 100)" />
|
||||
<div class="flex items-center gap-1">
|
||||
<input type="number" value="${percent}" min="-100" max="100" step="5" class="input w-20 text-center text-sm" oninput="this.parentElement.previousElementSibling.value = this.value / 100" />
|
||||
<span class="text-gray-400">%</span>
|
||||
</div>
|
||||
</div>
|
||||
<button type="button" onclick="this.closest('.resistance-row').remove()" class="p-2 text-red-400 hover:text-red-300">
|
||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/></svg>
|
||||
</button>
|
||||
</div>`;
|
||||
document.getElementById('resistancesList').insertAdjacentHTML('beforeend', html);
|
||||
typeSelect.value = '';
|
||||
valueInput.value = '10';
|
||||
const html = `<div class="${bgColor} border rounded-lg p-3 flex items-center gap-4 resistance-row"><select name="resist_name[]" class="input w-40">${resistanceOptions.replace('value="'+key+'"', 'value="'+key+'" selected')}</select><div class="flex items-center gap-2 flex-1"><input type="range" name="resist_value[]" value="${value}" min="-1" max="1" step="0.05" class="flex-1" oninput="this.nextElementSibling.value = Math.round(this.value * 100)" /><div class="flex items-center gap-1"><input type="number" value="${percent}" min="-100" max="100" step="5" class="input w-20 text-center text-sm" oninput="this.parentElement.previousElementSibling.value = this.value / 100" /><span class="text-gray-400">%</span></div></div><button type="button" onclick="this.closest('.resistance-row').remove()" class="p-2 text-red-400 hover:text-red-300"><svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/></svg></button></div>`;
|
||||
document.getElementById('resistancesList').insertAdjacentHTML('beforeend', html); typeSelect.value = ''; valueInput.value = '10';
|
||||
}
|
||||
|
||||
function addBuffResistance() {
|
||||
const typeSelect = document.getElementById('newBuffResistType');
|
||||
const valueInput = document.getElementById('newBuffResistValue');
|
||||
|
||||
const key = typeSelect.value;
|
||||
if (!key) { alert('Select a resistance type'); return; }
|
||||
|
||||
const percent = parseInt(valueInput.value) || 0;
|
||||
const value = percent / 100;
|
||||
const typeSelect = document.getElementById('newBuffResistType'); const valueInput = document.getElementById('newBuffResistValue');
|
||||
const key = typeSelect.value; if (!key) { alert('Select a resistance type'); return; }
|
||||
const percent = parseInt(valueInput.value) || 0; const value = percent / 100;
|
||||
const bgColor = value < 0 ? 'bg-red-900/30 border-red-700' : value > 0 ? 'bg-green-900/30 border-green-700' : 'bg-gray-800 border-gray-700';
|
||||
|
||||
const html = `
|
||||
<div class="${bgColor} border rounded-lg p-3 flex items-center gap-4 buff-resistance-row">
|
||||
<select name="buff_resist_name[]" class="input w-40">${resistanceOptions.replace('value="'+key+'"', 'value="'+key+'" selected')}</select>
|
||||
<div class="flex items-center gap-2 flex-1">
|
||||
<input type="range" name="buff_resist_value[]" value="${value}" min="-1" max="1" step="0.05" class="flex-1" oninput="this.nextElementSibling.value = Math.round(this.value * 100)" />
|
||||
<div class="flex items-center gap-1">
|
||||
<input type="number" value="${percent}" min="-100" max="100" step="5" class="input w-20 text-center text-sm" oninput="this.parentElement.previousElementSibling.value = this.value / 100" />
|
||||
<span class="text-gray-400">%</span>
|
||||
</div>
|
||||
</div>
|
||||
<button type="button" onclick="this.closest('.buff-resistance-row').remove()" class="p-2 text-red-400 hover:text-red-300">
|
||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/></svg>
|
||||
</button>
|
||||
</div>`;
|
||||
document.getElementById('buffResistancesList').insertAdjacentHTML('beforeend', html);
|
||||
typeSelect.value = '';
|
||||
valueInput.value = '25';
|
||||
const html = `<div class="${bgColor} border rounded-lg p-3 flex items-center gap-4 buff-resistance-row"><select name="buff_resist_name[]" class="input w-40">${resistanceOptions.replace('value="'+key+'"', 'value="'+key+'" selected')}</select><div class="flex items-center gap-2 flex-1"><input type="range" name="buff_resist_value[]" value="${value}" min="-1" max="1" step="0.05" class="flex-1" oninput="this.nextElementSibling.value = Math.round(this.value * 100)" /><div class="flex items-center gap-1"><input type="number" value="${percent}" min="-100" max="100" step="5" class="input w-20 text-center text-sm" oninput="this.parentElement.previousElementSibling.value = this.value / 100" /><span class="text-gray-400">%</span></div></div><button type="button" onclick="this.closest('.buff-resistance-row').remove()" class="p-2 text-red-400 hover:text-red-300"><svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/></svg></button></div>`;
|
||||
document.getElementById('buffResistancesList').insertAdjacentHTML('beforeend', html); typeSelect.value = ''; valueInput.value = '25';
|
||||
}
|
||||
document.addEventListener('DOMContentLoaded', function() { updatePreview(); toggleMaxStack(); updateSections(); });
|
||||
</script>
|
||||
}
|
||||
|
||||
@@ -133,9 +133,8 @@ public class EditModel : AdminPageModel
|
||||
MinDamage = Item.MinDamage,
|
||||
MaxDamage = Item.MaxDamage,
|
||||
AttackRange = Item.AttackRange,
|
||||
DamageType = Item.DamageType,
|
||||
DamageTypeKey = Item.DamageTypeKey,
|
||||
Armor = Item.Armor,
|
||||
MagicResist = Item.MagicResist,
|
||||
HealAmount = Item.HealAmount,
|
||||
ManaRestore = Item.ManaRestore,
|
||||
StaminaRestore = Item.StaminaRestore,
|
||||
@@ -193,9 +192,8 @@ public class EditModel : AdminPageModel
|
||||
existing.MinDamage = Item.MinDamage;
|
||||
existing.MaxDamage = Item.MaxDamage;
|
||||
existing.AttackRange = Item.AttackRange;
|
||||
existing.DamageType = Item.DamageType;
|
||||
existing.DamageTypeKey = Item.DamageTypeKey;
|
||||
existing.Armor = Item.Armor;
|
||||
existing.MagicResist = Item.MagicResist;
|
||||
existing.HealAmount = Item.HealAmount;
|
||||
existing.ManaRestore = Item.ManaRestore;
|
||||
existing.StaminaRestore = Item.StaminaRestore;
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
{
|
||||
<div class="text-sm mb-2">
|
||||
<span class="text-white">@Model.MinDamage - @Model.MaxDamage</span>
|
||||
<span class="text-gray-500">@Model.DamageType Damage</span>
|
||||
<span class="text-gray-500">@Model.DamageTypeKey Damage</span>
|
||||
@if (Model.AttackRange > 0)
|
||||
{
|
||||
<span class="text-gray-500 block text-xs">Range: @Model.AttackRange</span>
|
||||
@@ -47,17 +47,10 @@
|
||||
}
|
||||
|
||||
<!-- Armor Stats -->
|
||||
@if (Model.Armor > 0 || Model.MagicResist > 0)
|
||||
@if (Model.Armor > 0)
|
||||
{
|
||||
<div class="text-sm mb-2 space-y-1">
|
||||
@if (Model.Armor > 0)
|
||||
{
|
||||
<p><span class="text-gray-500">Armor:</span> <span class="text-white">@Model.Armor</span></p>
|
||||
}
|
||||
@if (Model.MagicResist > 0)
|
||||
{
|
||||
<p><span class="text-gray-500">Magic Resist:</span> <span class="text-white">@Model.MagicResist</span></p>
|
||||
}
|
||||
<p><span class="text-gray-500">Armor:</span> <span class="text-white">@Model.Armor</span></p>
|
||||
</div>
|
||||
}
|
||||
|
||||
|
||||
@@ -13,7 +13,6 @@ public class DungeonCharacterCombatStats
|
||||
public int BonusHealth { get; set; }
|
||||
public int BonusMana { get; set; }
|
||||
public int Armor { get; set; }
|
||||
public int MagicResist { get; set; }
|
||||
public float MoveSpeed { get; set; }
|
||||
public float AttackSpeed { get; set; }
|
||||
public float RegenRate { get; set; }
|
||||
|
||||
@@ -39,7 +39,6 @@ public static class DungeonCharacterStats
|
||||
stats.BonusHealth += item.BonusHealth;
|
||||
stats.BonusMana += item.BonusMana;
|
||||
stats.Armor += item.Armor;
|
||||
stats.MagicResist += item.MagicResist;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -45,11 +45,16 @@ public class DungeonItemDefinition
|
||||
public int MinDamage { get; set; } = 0;
|
||||
public int MaxDamage { get; set; } = 0;
|
||||
public float AttackRange { get; set; } = 0; // 0 = melee
|
||||
public DamageType DamageType { get; set; } = DamageType.Physical;
|
||||
|
||||
// Armor stats
|
||||
/// <summary>
|
||||
/// Damage type key (references DamageResistanceType.Key)
|
||||
/// e.g., "physical", "fire", "poison"
|
||||
/// </summary>
|
||||
[MaxLength(32)]
|
||||
public string DamageTypeKey { get; set; } = "physical";
|
||||
|
||||
// Armor stats (flat damage reduction for all damage types)
|
||||
public int Armor { get; set; } = 0;
|
||||
public int MagicResist { get; set; } = 0;
|
||||
|
||||
// Consumable effects
|
||||
public int HealAmount { get; set; } = 0;
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
using DataServer.Data.Enums;
|
||||
|
||||
namespace DataServer.Data.Entities;
|
||||
|
||||
/// <summary>
|
||||
@@ -11,7 +9,6 @@ public class DungeonMobCombatStats
|
||||
public int PhysicalDamage { get; set; }
|
||||
public int MagicDamage { get; set; }
|
||||
public int Armor { get; set; }
|
||||
public int MagicResist { get; set; }
|
||||
public float MoveSpeed { get; set; }
|
||||
public float AttackRange { get; set; }
|
||||
public float AttackSpeed { get; set; }
|
||||
@@ -21,33 +18,31 @@ public class DungeonMobCombatStats
|
||||
public Dictionary<string, float> Resistances { get; set; } = new();
|
||||
|
||||
/// <summary>
|
||||
/// Calculate damage after resistances
|
||||
/// Primary damage type key (e.g., "physical", "fire", "poison")
|
||||
/// </summary>
|
||||
public int CalculateDamage(int rawDamage, DamageType damageType)
|
||||
public string DamageTypeKey { get; set; } = "physical";
|
||||
|
||||
/// <summary>
|
||||
/// Calculate damage after armor and resistances
|
||||
/// </summary>
|
||||
public int CalculateDamage(int rawDamage, string damageTypeKey)
|
||||
{
|
||||
string typeKey = damageType.ToString().ToLower();
|
||||
float damage = rawDamage;
|
||||
|
||||
// Apply armor reduction (flat mitigation for all damage types)
|
||||
if (Armor > 0)
|
||||
{
|
||||
float armorReduction = Armor / (float)(Armor + 100);
|
||||
damage *= (1.0f - armorReduction);
|
||||
}
|
||||
|
||||
// Check for resistance/weakness
|
||||
if (Resistances.TryGetValue(typeKey, out float resistance))
|
||||
if (Resistances.TryGetValue(damageTypeKey, out float resistance))
|
||||
{
|
||||
if (resistance >= 1.0f) return 0; // Immune
|
||||
return (int)(rawDamage * (1.0f - resistance));
|
||||
damage *= (1.0f - resistance);
|
||||
}
|
||||
|
||||
// Physical/Magic armor reduction
|
||||
if (damageType == DamageType.Physical && Armor > 0)
|
||||
{
|
||||
// Armor formula: damage reduction = armor / (armor + 100)
|
||||
float reduction = Armor / (float)(Armor + 100);
|
||||
return (int)(rawDamage * (1.0f - reduction));
|
||||
}
|
||||
|
||||
if (damageType != DamageType.Physical && MagicResist > 0)
|
||||
{
|
||||
float reduction = MagicResist / (float)(MagicResist + 100);
|
||||
return (int)(rawDamage * (1.0f - reduction));
|
||||
}
|
||||
|
||||
return rawDamage;
|
||||
return Math.Max(1, (int)damage);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -167,14 +167,14 @@ public class DungeonMobDefinition
|
||||
PhysicalDamage = (int)(BasePhysicalDamage * DamagePerTier * bracketMultiplier),
|
||||
MagicDamage = (int)(BaseMagicDamage * DamagePerTier * bracketMultiplier),
|
||||
Armor = (int)(BaseArmor * ArmorPerTier * bracketMultiplier),
|
||||
MagicResist = (int)(BaseMagicResist * ArmorPerTier * bracketMultiplier),
|
||||
MoveSpeed = MoveSpeed,
|
||||
AttackRange = AttackRange,
|
||||
AttackSpeed = AttackSpeed,
|
||||
AggroRange = AggroRange,
|
||||
LeashRange = LeashRange,
|
||||
XpReward = (int)(BaseXp * XpPerTier * bracketMultiplier),
|
||||
Resistances = Resistances
|
||||
Resistances = Resistances,
|
||||
DamageTypeKey = DamageTypeKey
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user