Merge pull request #483 from nReCon/pvp-option-2

Added PVP option to GameServerDefinition and AdminPanel

src/Dapr/GameServer.Host/Pages/Index.razor

@@ -21,6 +21,9 @@
         <span class="badge badge-primary">
             Experience Rate: <span class="badge badge-light">@_gameServerContext.ExperienceRate</span>
         </span>
+        <span class="badge badge-primary">
+            PVP Enabled: <span class="badge badge-light">@_gameServerContext.PvpEnabled</span>
+        </span>
     </h3>
 </p>
 

src/DataModel/Configuration/GameServerDefinition.cs

@@ -30,6 +30,11 @@ public partial class GameServerDefinition
     /// </summary>
     public float ExperienceRate { get; set; }
 
+    /// <summary>
+    /// Gets or sets a value indicating whether PVP is enabled on this server.
+    /// </summary>
+    public bool PvpEnabled { get; set; } = true;
+
     /// <summary>
     /// Gets or sets the server configuration.
     /// </summary>

src/GameLogic/GameContext.cs

@@ -110,6 +110,9 @@ public GameContext(GameConfiguration configuration, IPersistenceContextProvider
     /// <inheritdoc />
     public virtual float ExperienceRate => this.Configuration.ExperienceRate;
 
+    /// <inheritdoc />
+    public virtual bool PvpEnabled { get; }
+
     /// <inheritdoc/>
     public GameConfiguration Configuration { get; }
 

src/GameLogic/IGameContext.cs

@@ -31,6 +31,11 @@ public interface IGameContext
     /// Gets the global experience rate.
     /// </summary>
     float ExperienceRate { get; }
+
+    /// <summary>
+    /// Gets a value indicating whether PVP is enabled.
+    /// </summary>
+    bool PvpEnabled { get; }
 
     /// <summary>
     /// Gets the repository provider. Used to retrieve data, e.g. from a database.

src/GameLogic/Player.cs

@@ -595,6 +595,12 @@ public bool IsAnySelfDefenseActive()
             throw new InvalidOperationException("AttributeSystem not set.");
         }
 
+        if (!this.GameContext.PvpEnabled && this.CurrentMap?.Definition.BattleZone == null &&
+            this.CurrentMiniGame?.AllowPlayerKilling is false)
+        {
+            return null;
+        }
+
         var hitInfo = await attacker.CalculateDamageAsync(this, skill, isCombo, damageFactor).ConfigureAwait(false);
 
         if (hitInfo.HealthDamage == 0)

src/GameServer/GameServerContext.cs

@@ -91,6 +91,9 @@ public GameServerContext(
     /// <inheritdoc />
     public override float ExperienceRate => base.ExperienceRate * this._gameServerDefinition.ExperienceRate;
 
+    /// <inheritdoc />
+    public override bool PvpEnabled => this._gameServerDefinition.PvpEnabled;
+
     /// <inheritdoc />
     public override string ToString()
     {

src/Persistence/EntityFramework/EntityDataContext.cs

@@ -44,7 +44,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         modelBuilder.Entity<ConnectServerDefinition>();
         modelBuilder.Entity<ChatServerDefinition>();
         modelBuilder.Entity<MiniGameRankingEntry>();
-        modelBuilder.Entity<GameServerDefinition>();
+        modelBuilder.Entity<GameServerDefinition>(entity =>
+        {
+            entity.Property(e => e.PvpEnabled).HasDefaultValue(true);
+        });
         modelBuilder.Entity<ConfigurationUpdate>();
         modelBuilder.Entity<ConfigurationUpdateState>();
         modelBuilder.Entity<SystemConfiguration>();