Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix merlin middle shot #5423

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix merlin middle shot #5423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1dea87e
fix-merlin-middle-shot
XNTEABDSC Dec 29, 2024
a5a9546
fix-grizzly-middle-shot
XNTEABDSC Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions scripts/amphassault.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,7 @@ end

function script.QueryWeapon(num)
if num == 1 then
if beamCount <= 2 or beamCount >= 48 then
return mflare
else
return gunPieces[gun_1].flare
end
return gunPieces[gun_1].flare
elseif num == 2 then
return turret
end
Expand Down
7 changes: 5 additions & 2 deletions scripts/striderarty.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ end
--Init variables
local bAiming = false
local gun_1 = 1
local gun_1_side = 0
local gun_1_side = false

-- Signal definitions
local SIG_WALK = 1
Expand Down Expand Up @@ -184,13 +184,16 @@ end

function script.FireWeapon(num)
gun_1 = 0
gun_1_side = 1
gun_1_side = true
end

function script.Shot(num)
if gun_1_side then
gun_1 = gun_1 + 1
end
if gun_1==21 then
gun_1=1
end
gun_1_side = not gun_1_side
end

Expand Down