From fed72c344adc02a828924fb379be2e62dcd21bac Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Thu, 30 Aug 2018 10:50:03 -0400
Subject: [PATCH] Dummy out NiGHTS item faster attract

---
 src/p_inter.c | 4 +++-
 src/p_user.c  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/p_inter.c b/src/p_inter.c
index 500018fd96..9a05bae28e 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -946,7 +946,9 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 					// Yay! The thing's in reach! Pull it in!
 					mo2->flags |= MF_NOCLIP|MF_NOCLIPHEIGHT;
 					mo2->flags2 |= MF2_NIGHTSPULL;
-					mo2->movefactor = 32*FRACUNIT; // initialize the NightsItemChase timer
+					// New NiGHTS attract speed dummied out because the older behavior
+					// is exploited as a mechanic. Uncomment to enable.
+					mo2->movefactor = 0; // 32*FRACUNIT; // initialize the NightsItemChase timer
 					P_SetTarget(&mo2->tracer, toucher);
 				}
 			}
diff --git a/src/p_user.c b/src/p_user.c
index 12383c4234..ffb48f27c4 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -9807,7 +9807,9 @@ void P_PlayerThink(player_t *player)
 			// Yay! The thing's in reach! Pull it in!
 			mo2->flags |= MF_NOCLIP|MF_NOCLIPHEIGHT;
 			mo2->flags2 |= MF2_NIGHTSPULL;
-			mo2->movefactor = 40*FRACUNIT; // initialize the NightsItemChase timer
+			// New NiGHTS attract speed dummied out because the older behavior
+			// is exploited as a mechanic. Uncomment to enable.
+			mo2->movefactor = 0; // 40*FRACUNIT; // initialize the NightsItemChase timer
 			P_SetTarget(&mo2->tracer, player->mo);
 		}
 	}
-- 
GitLab