Turret by beemerwt · Pull Request #121 · Grantapher/ValheimPlus

beemerwt · 2025-03-14T15:20:36Z

Updated the config, added and removed some settings, generally made it more user-friendly.

Grantapher

Can you switch your formatter to 4x spaces instead of tabs for this project?

I haven't fully reviewed the Turret patch code yet.

Grantapher · 2025-03-16T22:33:29Z

ValheimPlus/GameClasses/Projectile.cs

+namespace ValheimPlus.GameClasses
+{
+	[HarmonyPatch(typeof(Projectile), nameof(Projectile.IsValidTarget))]
+	public static class Projectile_IsValidTarget_Patch


Is this a bug fix? If so, is there a ticket submitted already?

It's a bug fix for something that I noticed while I was playing around with turrets, but the bug that was listed in the Discord was about the different configuration values. I suspect it wasn't working because he said he set it to "shoot 100% faster," which is actually addressed in the configuration changes.

I mean for the game itself, not the mod.

ValheimPlus/GameClasses/Projectile.cs

Grantapher · 2025-03-16T22:43:42Z

ValheimPlus/Configurations/Sections/TurretConfiguration.cs

-    }
+	public class TurretConfiguration : ServerSyncConfig<TurretConfiguration>
+	{
+		public bool enablePvP { get; internal set; } = false;


Can we keep all the old settings and then add the new ones at the bottom? I don't want to get rid of settings people may currently be using, nor change the order of them in any of the files. For the config specifically, the mod tries to add new config items as they are added in newer mod versions, so having that order would match how it would be added to people's config files.

Prior to this change "ignorePlayers" would have to be enabled all the time in order for turrets to function normally. This is simultaneously a bug fix and way to give more meaning to this setting.

Grantapher · 2025-03-16T22:53:59Z

ValheimPlus/GameClasses/Turret.cs

+		{
+			var config = Configuration.Current.Turret;
+			if (!config.IsEnabled) return;
+			__instance.m_targetPlayers = config.enablePvP && TurretHelpers.IsCreatorPvP(__instance);


Does this injure non-pvp players? It could be used to pvp grief people who are not pvp-enabled if so.

To add to what I said before in the comment about "ignorePlayers" being changed to "enablePvP," it's exactly this reason that ignorePlayers always had to be set to true. I think it can injure players without PvP so I'm probably going to add a hit detection and only apply damage if the target also has PvP enabled.

Okay I have confirmed it will not damage the player if they don't also have PvP enabled because of the way setting a projectile's "m_owner" works. The RPC_Damage call on Character class will only allow the projectile damage through if the character being damaged is a player with PvP enabled. However, turrets might still target non-PvP players, so I'm going to check that out.

beemerwt · 2025-03-18T21:14:55Z

Vanilla turrets' AI targets ANYTHING. This mod sought to solve the major bug by adding the "ignorePlayers" setting. I believe we should set the default behavior of the turrets to only allow them to target players when the creator has PvP Enabled, unless otherwise specified in the config by changing "disablePvP." This solves the bug of always targeting players, and still allows the functionality when "disablePvP" is set to false.

However, when the creator enables PvP the targeting bug still persists as it will target ANY other player. To fix this I will patch the turrets so that it will only find targets whose PvP is also enabled. The compromise in this case is changing "ignorePlayers" to "disablePvP." I previously had it set to "enablePvP" but since majority of players using Turrets would have turned on "ignorePlayers" this seems like the opposite of what would be intended. By changing it to "disablePvP" functionality will continue as expected, and if players desire to allow turrets in PvP they can update the setting. Additionally, people who fresh install the mod will also have turrets fixed. They will be functional in PvP until "disablePvP" is set to true, but I think that should be the expected behavior of vanilla turrets.

Grantapher

I think I'm missing something here when it comes to turn rate vs projectile accuracy and projectile velocity...

Grantapher · 2025-03-22T05:39:17Z

valheim_plus.cfg

+verticalAngle = 50
+
+; Set this to true to prevent the turret from accidentally hitting itself.
+fixProjectiles = false


Let's make the name precise, turretCanNotHitItself.

Grantapher · 2025-03-22T05:47:25Z

ValheimPlus/GameClasses/Projectile.cs

+            var turretConfig = Configuration.Current.Turret;
+            if (!turretConfig.IsEnabled || !turretConfig.fixProjectiles) return;
+
+            if (__result && destr is Turret turret)


My IDE flags this saying that Turret isn't an IDestructible, are you sure this works? Is it supposed to be like a .GetComponent<IDestructible>() on some GameObject? If your log is going off then I guess this is working but I would not know how.

Grantapher · 2025-03-22T05:55:19Z

ValheimPlus/Configurations/Sections/TurretConfiguration.cs

+        public float turnRate { get; internal set; } = 22.5f;
+        public float attackCooldown { get; internal set; } = 2f;
+        public float viewDistance { get; internal set; } = 45f;


We can't change how these are calculated, all currently existing values would be invalid and do wild things. Stick to the modifiers.

We also don't want to use the game's values in case the devs tweak them, because then we would have to keep our values up to date with theirs.

Grantapher · 2025-03-22T06:17:09Z

ValheimPlus/GameClasses/BaseAI.cs

+                    OpCodes.Brtrue,
+                    new(inst => inst.IsLdarg(11)),
+                    OpCodes.Brfalse
+                ).ThrowIfNotMatch("Could not find `onlyTargets` in BaseAI.FindClosestCreature transpiler")


Make sure these throws are wrapped so they don't propagate and break the entire mod. See other places where CodeMatcher is used for an example.

Grantapher · 2025-03-22T06:18:43Z

ValheimPlus/GameClasses/Projectile.cs

+namespace ValheimPlus.GameClasses
+{
+	[HarmonyPatch(typeof(Projectile), nameof(Projectile.IsValidTarget))]
+	public static class Projectile_IsValidTarget_Patch


I mean for the game itself, not the mod.

Grantapher · 2025-03-22T06:32:52Z

ValheimPlus/GameClasses/Projectile.cs

+                var turretOwner = TurretHelpers.GetPlayerCreator(turret);
+                if (turretOwner == __instance.m_owner)
+                {
+                    ValheimPlusPlugin.Logger.LogInfo("Turret projectile hit itself");


Let's remove log statements like this if you are confident it is working.

Grantapher · 2025-03-22T06:42:33Z

ValheimPlus/Configurations/Sections/TurretConfiguration.cs

-        public float projectileVelocity { get; internal set; } = 0f;
-        public float projectileAccuracy { get; internal set; } = 0f;


Why remove these?

Grantapher · 2025-03-22T06:44:28Z

vplusconfig.json

-			}
-		}
-	}
+  "ValheimPlus": {


Looks like white space changes hit this file. Can you undo the white space changes here?

Grantapher · 2025-03-22T06:49:57Z

ValheimPlus/Configurations/Sections/TurretConfiguration.cs

+        public float turnRate { get; internal set; } = 22.5f;
+        public float attackCooldown { get; internal set; } = 2f;
+        public float viewDistance { get; internal set; } = 45f;
+        public bool targetTamed { get; internal set; } = false;


I believe this should be true in the vanilla game

Grantapher · 2025-03-22T06:51:08Z

ValheimPlus/Configurations/Sections/TurretConfiguration.cs

    public class TurretConfiguration : ServerSyncConfig<TurretConfiguration>
    {
-        public bool ignorePlayers { get; internal set; } = false;
+        public bool disablePvP { get; internal set; } = false;


unfortunately I don't think we can get rid of an old config like this. Can we keep ignorePlayers and also add the new disablePvP config?

beemerwt added 5 commits March 14, 2025 10:01

Fixed descriptions and added new config values

ce5d5f3

Implemented new config values

d2c6eb3

Gave projectile an owner

8424bcd

AddeQOL change so turrets can't hit themselves

e4eae6d

Added limits for angles

b608949

beemerwt marked this pull request as ready for review March 14, 2025 15:20

beemerwt added 2 commits March 14, 2025 10:28

linter and config correction

a860d30

Updated json config

9502ff9

Grantapher requested changes Mar 16, 2025

View reviewed changes

beemerwt added 4 commits March 18, 2025 10:17

reverted order and added projectile fix option

e5c8932

Implemented new fixProjectiles setting

989eb94

switch to spaces instead of tabs

c2a32db

reordered config to reflect reverted turret config

0b42938

beemerwt added 3 commits March 18, 2025 21:03

Changed "enablePvP" to "disablePvP"

e3219c5

Added non-pvp targeting filter

33a931d

changed config to disablePvP

fd2622b

Grantapher requested changes Mar 22, 2025

View reviewed changes

		public float projectileVelocity { get; internal set; } = 0f;
		public float projectileAccuracy { get; internal set; } = 0f;

Conversation

beemerwt commented Mar 14, 2025

Uh oh!

Grantapher left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

beemerwt commented Mar 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Grantapher left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

beemerwt commented Mar 18, 2025 •

edited

Loading