mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-08 20:24:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Address PR feedback for Move Link tool

Browse Source
This commit is contained in:
Pheenoh
2026-04-12 15:59:51 -06:00
parent ad10ddf7a9
commit 1ec8a2309a
1 changed files with 25 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_alink.cpp
+25 -48
View File
@@ -18052,6 +18052,19 @@ int daAlink_c::execute() {
#if TARGET_PC
if (dusk::getTransientSettings().moveLinkActive && daPy_getPlayerActorClass() == this) {
isTrigDebugMoveInput = TRUE;
#elif DEBUG
if (daPy_getPlayerActorClass() == this && checkDebugMoveInput()) {
isTrigDebugMoveInput = TRUE;
if (l_debugMode) {
l_debugMode = FALSE;
} else {
l_debugMode = TRUE;
}
}
if (l_debugMode) {
#endif
#if TARGET_PC || DEBUG
if (checkModeFlg(0x400) && !checkBoardRide() && !checkSpinnerRide()) {
if (checkCanoeRide()) {
setSyncCanoePos();
@@ -18060,16 +18073,28 @@ int daAlink_c::execute() {
}
} else {
f32 moveSpeed;
#if TARGET_PC
if (mDoCPd_c::getHoldZ(PAD_1)) {
#else
if (mDoCPd_c::getHoldLockR(PAD_1)) {
#endif
moveSpeed = 100.0f;
} else {
moveSpeed = 50.0f;
}
#if TARGET_PC
f32 cStickY = mDoCPd_c::getSubStickY(PAD_1);
if (cStickY > 0.3f || cStickY < -0.3f) {
current.pos.y += moveSpeed * cStickY;
}
#else
if (mDoCPd_c::getHoldY(PAD_1)) {
current.pos.y += moveSpeed;
} else if (mDoCPd_c::getHoldX(PAD_1)) {
current.pos.y -= moveSpeed;
}
#endif
current.pos.x += moveSpeed * mStickValue * cM_ssin(mMoveAngle);
current.pos.z += moveSpeed * mStickValue * cM_scos(mMoveAngle);
@@ -18088,54 +18113,6 @@ int daAlink_c::execute() {
setAttentionPos();
} else
#endif
#if DEBUG
if (daPy_getPlayerActorClass() == this && checkDebugMoveInput()) {
isTrigDebugMoveInput = TRUE;
if (l_debugMode) {
l_debugMode = FALSE;
} else {
l_debugMode = TRUE;
}
}
if (l_debugMode) {
if (checkModeFlg(0x400) && !checkBoardRide() && !checkSpinnerRide()) {
if (checkCanoeRide()) {
setSyncCanoePos();
} else {
setSyncRide(0);
}
} else {
f32 moveSpeed;
if (mDoCPd_c::getHoldLockR(PAD_1)) {
moveSpeed = 100.0f;
} else {
moveSpeed = 50.0f;
}
if (mDoCPd_c::getHoldY(PAD_1)) {
current.pos.y += moveSpeed;
} else if (mDoCPd_c::getHoldX(PAD_1)) {
current.pos.y -= moveSpeed;
}
current.pos.x += moveSpeed * mStickValue * cM_ssin(mMoveAngle);
current.pos.z += moveSpeed * mStickValue * cM_scos(mMoveAngle);
}
setMatrix();
mpLinkModel->calc();
if (!checkWolf()) {
setItemMatrix(0);
} else {
setWolfItemMatrix();
}
setBodyPartPos();
setAttentionPos();
} else
#endif
{
if (isTrigDebugMoveInput) {
mItemButton = 0;