AM2R-Mod-Sources
/
AM2R-Multitroid-Fair-Team-PVP
mirror of https://github.com/DodoBirby/AM2R-Multitroid-Fair-Team-PVP
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Variety of team parity changes

Browse Source
main
DodoBirb 3 years ago
parent 8b13000411
commit 5f476fff6d
6 changed files with 10 additions and 186 deletions
Show Stats Download Patch File Download Diff File

4
Export_Code/gml_Object_oClient_Draw_0.gml
Unescape View File

@ -293,11 +293,11 @@ if instance_exists(oMapCursor)
arrY = arrMapIcon[2]
sax = arrMapIcon[3]
spectator = arrMapIcon[5]
if ((global.spectator && (!global.sax)) || (global.sax && global.juggActive))
if (global.spectator && (!global.sax))
{
if (!sax)
{
if (spectator && (!global.sax))
if spectator
{
if (arrX != 3 && arrY != 3)
draw_sprite_ext(sSpectatorIcon, 0, (arrX * 8), ((arrY * 8) + 32), 1, 1, direction, c_white, oMapCursor.image_alpha)

2
Export_Code/gml_Object_oMultiHitbox_Step_0.gml
Unescape View File

@ -38,8 +38,6 @@ if instance_exists(oClient)
mask_index = sMask4
if (arrSJBall == 1 && (arrState == SUPERJUMP || arrState == SJSTART || arrState == SJEND || arrState == BRAKING))
mask_index = sMask4
if (instance_exists(oCharacter) && distance_to_object(oCharacter) <= 500 && arrState == RUNNING && ((abs(arrImage) >= 4 && abs(arrImage) < 4.9) || (abs(arrImage) >= 9 && abs(arrImage) < 9.9)) && arrSAX)
PlayFootstepSAX(get_floor_material())
if (arrSprite == 1915)
{
if (place_meeting(x, y, oCharacter) && arrInvincible == 0 && (!global.spectator))

166
Export_Code/gml_Object_oMusicV2_Step_0.gml
Unescape View File

@ -4,94 +4,10 @@ if audio_is_playing(musFanfare)
exit
if global.spectator
exit
if instance_exists(oClient)
{
if (ds_list_size(oClient.roomListData) > 0)
{
for (i = 0; i < ds_list_size(oClient.roomListData); i++)
{
arrDraw = ds_list_find_value(oClient.roomListData, i)
arrRoom = arrDraw[14]
arrRoomPrev = arrDraw[18]
arrSAX = arrDraw[20]
if (arrSAX && (!global.sax) && room != rm_transition && (arrRoom == room || (arrRoom == global.lastroom && (room == rm_options || room == itemroom || room == subscreenroom || room == maproom || room == rm_subscreen)) || ((arrRoomPrev == room || (arrRoomPrev == global.lastroom && (room == rm_options || room == itemroom || room == subscreenroom || room == maproom || room == rm_subscreen))) && (arrRoom == 6 || arrRoom == 10 || arrRoom == 9 || arrRoom == 11 || arrRoom == 16))))
sameRoomSAX = 1
}
}
}
if (global.showHealthIndicators && global.saxmode)
if global.showHealthIndicators
chasedBySAX = 1
else
chasedBySAX = 0
if ((!global.spectator) && global.saxmode && (!global.sax) && (global.showHealthIndicators || global.enemyNearby || global.escapeTimer > 0 || global.inMusSAXRange || sameRoomSAX || chasedBySAX))
playingSAX = 1
else
playingSAX = 0
if (prevPlayingSAX != playingSAX)
{
if ((!prevPlayingSAX) && playingSAX && runningFromSAX && (!chasedBySAX))
{
if audio_is_playing(oMusicV2.previousbgm)
audio_sound_gain(oMusicV2.previousbgm, 0, fadeoutTimer)
if audio_is_playing(oMusicV2.currentbgm)
audio_sound_gain(oMusicV2.currentbgm, 0, fadeoutTimer)
if (!audio_is_playing(musSAXEnvironmentalAmbience))
audio_play_sound(musSAXEnvironmentalAmbience, 1, true)
audio_sound_gain(musSAXEnvironmentalAmbience, 0, 0)
audio_sound_gain(musSAXEnvironmentalAmbience, (global.opmusicvolume / 100), fadeoutTimer)
}
if (prevPlayingSAX && (!playingSAX) && (!chasedBySAX))
{
if audio_is_playing(musSAXEnvironmentalAmbience)
audio_sound_gain(musSAXEnvironmentalAmbience, 0, fadeoutTimer)
if (!audio_is_playing(oMusicV2.currentbgm))
audio_play_sound(oMusicV2.currentbgm, 1, true)
if (audio_sound_get_gain(oMusicV2.currentbgm) == 0 || audio_sound_get_gain(oMusicV2.currentbgm) == 0)
{
audio_sound_gain(oMusicV2.currentbgm, 0, 0)
audio_sound_gain(oMusicV2.currentbgm, (global.opmusicvolume / 100), fadeoutTimer)
}
}
prevPlayingSAX = playingSAX
}
if (prevSameRoomSAX != sameRoomSAX)
{
if playingSAX
{
if ((!prevSameRoomSAX) && sameRoomSAX && (!chasedBySAX))
{
if audio_is_playing(oMusicV2.previousbgm)
audio_sound_gain(oMusicV2.previousbgm, 0, 0)
if audio_is_playing(oMusicV2.currentbgm)
audio_sound_gain(oMusicV2.currentbgm, 0, 0)
if audio_is_playing(musSAXEnvironmentalAmbience)
audio_sound_gain(musSAXEnvironmentalAmbience, 0, fadeoutTimer)
if (!audio_is_playing(musSAXAppear))
audio_play_sound(musSAXAppear, 1, true)
audio_sound_gain(musSAXAppear, 0, 0)
audio_sound_gain(musSAXAppear, (global.opmusicvolume / 100), 0)
mus_stop_all()
}
if (prevSameRoomSAX && (!sameRoomSAX) && (!chasedBySAX))
{
if audio_is_playing(musSAXAppear)
audio_sound_gain(musSAXAppear, 0, fadeoutTimer)
if (!audio_is_playing(musSAXEnvironmentalAmbience))
audio_play_sound(musSAXEnvironmentalAmbience, 1, true)
audio_sound_gain(musSAXEnvironmentalAmbience, 0, 0)
audio_sound_gain(musSAXEnvironmentalAmbience, (global.opmusicvolume / 100), fadeoutTimer)
runningFromSAX = 1
}
}
prevSameRoomSAX = sameRoomSAX
}
if sameRoomSAX
{
if audio_is_playing(oMusicV2.previousbgm)
audio_sound_gain(oMusicV2.previousbgm, 0, 0)
if audio_is_playing(oMusicV2.currentbgm)
audio_sound_gain(oMusicV2.currentbgm, 0, 0)
}
if (prevChasedBySAX != chasedBySAX)
{
if ((!prevChasedBySAX) && chasedBySAX)
@ -112,83 +28,11 @@ if (prevChasedBySAX != chasedBySAX)
if (prevChasedBySAX && (!chasedBySAX))
{
audio_sound_gain(musSAXChase, 0, fadeoutTimer)
if playingSAX
{
if sameRoomSAX
{
if audio_is_playing(oMusicV2.previousbgm)
audio_sound_gain(oMusicV2.previousbgm, 0, 0)
if audio_is_playing(oMusicV2.currentbgm)
audio_sound_gain(oMusicV2.currentbgm, 0, 0)
if audio_is_playing(musSAXEnvironmentalAmbience)
audio_sound_gain(musSAXEnvironmentalAmbience, 0, fadeoutTimer)
if (!audio_is_playing(musSAXAppear))
audio_play_sound(musSAXAppear, 1, true)
audio_sound_gain(musSAXAppear, 0, 0)
audio_sound_gain(musSAXAppear, (global.opmusicvolume / 100), 0)
}
else
{
if audio_is_playing(oMusicV2.previousbgm)
audio_sound_gain(oMusicV2.previousbgm, 0, 0)
if audio_is_playing(oMusicV2.currentbgm)
audio_sound_gain(oMusicV2.currentbgm, 0, 0)
if audio_is_playing(musSAXAppear)
audio_sound_gain(musSAXAppear, 0, fadeoutTimer)
if (!audio_is_playing(musSAXEnvironmentalAmbience))
audio_play_sound(musSAXEnvironmentalAmbience, 1, true)
audio_sound_gain(musSAXEnvironmentalAmbience, 0, 0)
audio_sound_gain(musSAXEnvironmentalAmbience, (global.opmusicvolume / 100), fadeoutTimer)
}
}
else
{
audio_stop_sound(musSAXEnvironmentalAmbience)
audio_stop_sound(musSAXAppear)
audio_stop_sound(musSAXChase)
if audio_is_playing(oMusicV2.currentbgm)
audio_sound_gain(oMusicV2.currentbgm, (global.opmusicvolume / 100), fadeoutTimer)
}
}
prevChasedBySAX = chasedBySAX
}
if (global.inMusSAXRangePrev != global.inMusSAXRange)
{
if (global.inMusSAXRangePrev && (!global.inMusSAXRange))
{
if audio_is_playing(musSAXEnvironmentalAmbience)
audio_sound_gain(musSAXEnvironmentalAmbience, 0, fadeoutTimer)
if audio_is_playing(musSAXAppear)
audio_sound_gain(musSAXAppear, 0, fadeoutTimer)
stopSAXMusTimer = 120
if runningFromSAX
runningFromSAX = 0
}
global.inMusSAXRangePrev = global.inMusSAXRange
}
if (((audio_is_playing(musSAXEnvironmentalAmbience) && audio_sound_get_gain(musSAXEnvironmentalAmbience) > 0) || (audio_is_playing(musSAXAppear) && audio_sound_get_gain(musSAXAppear) > 0) || audio_is_playing(musSAXChase)) && playingSAX)
{
if audio_is_playing(oMusicV2.previousbgm)
audio_sound_gain(oMusicV2.previousbgm, 0, fadeoutTimer)
if audio_is_playing(oMusicV2.currentbgm)
audio_sound_gain(oMusicV2.currentbgm, 0, fadeoutTimer)
}
if (stopSAXMusTimer > 0)
{
if (stopSAXMusTimer == 1)
{
if audio_is_playing(musSAXEnvironmentalAmbience)
audio_stop_sound(musSAXEnvironmentalAmbience)
if audio_is_playing(musSAXAppear)
audio_stop_sound(musSAXAppear)
audio_stop_sound(musSAXEnvironmentalAmbience)
audio_stop_sound(musSAXAppear)
audio_stop_sound(musSAXChase)
if audio_is_playing(oMusicV2.currentbgm)
audio_sound_gain(oMusicV2.currentbgm, (global.opmusicvolume / 100), fadeoutTimer)
}
stopSAXMusTimer--
}
if (audio_is_playing(musSAXChase) && audio_sound_get_gain(musSAXChase) == 0)
{
audio_stop_sound(musSAXChase)
if audio_is_playing(oMusicV2.currentbgm)
audio_sound_gain(oMusicV2.currentbgm, (global.opmusicvolume / 100), fadeoutTimer)
prevChasedBySAX = chasedBySAX
}

5
Export_Code/gml_Script_characterStepEvent.gml
Unescape View File

@ -3604,10 +3604,7 @@ if (footstep == 0)
{
if ((abs(image_index) >= 4 && abs(image_index) < 4.9) || (abs(image_index) >= 9 && abs(image_index) < 9.9))
{
if (!global.sax)
PlayFootstep(get_floor_material())
else
PlayFootstepSAX(get_floor_material())
PlayFootstep(get_floor_material())
if (inwater == 0 && waterfall == 0 && monster_drain == 0)
footstep = 5
else

4
Export_Code/gml_Script_draw_gui.gml
Unescape View File

@ -546,11 +546,11 @@ if (global.classicmode == 0 && global.opshowhud)
spectator = arrData[5]
playerState = arrData[6]
combatState = arrData[7]
if ((global.spectator && (!global.sax)) || (global.sax && global.juggActive))
if (global.spectator && (!global.sax))
{
if (!sax)
{
if (spectator && (!global.sax))
if spectator
{
if (abs(xDiff) <= 2 && abs(yDiff) <= 1)
draw_sprite_ext(sSpectatorIcon, 0, (((276 + widescreen_space) + 16) - (xDiff * 8)), (12 - (yDiff * 8)), 1, 1, direction, c_white, oControl.malpha)

15
Export_CodeServer/gml_Object_oLockLobby_Mouse_4.gml
Unescape View File

@ -1,16 +1 @@
global.lobbyLocked = (!global.lobbyLocked)
if global.lobbyLocked
{
if (global.doomtime >= 0)
{
if (!global.doomstarted)
global.gametime = ((global.doomtime * 60) * 60)
global.doomenabled = 1
global.doomstarted = 1
}
else
{
global.doomenabled = 0
global.gametime = 0
}
}

Write Preview
Loading…
Cancel
Save