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

Removing SAX specific mechanics

Browse Source
main
DodoBirb 3 years ago
parent df0bf872d3
commit 35bc953e00
6 changed files with 7 additions and 45 deletions
Show Stats Download Patch File Download Diff File

7
Export_Code/gml_Object_oClient_Other_68.gml
Unescape View File

@ -1,4 +1,4 @@
var type_event, _buffer, bufferSize, bufferSizePacket, clientID, findsocket, i, arrList, f, v, ban, clientX, clientY, clientSprite, clientImage, clientA1, clientA1X, clientA1Y, clientA2, clientA2X, clientA2Y, clientA2A, clientMirror, clientArmmsl, clientRoom, clientName, clientBlend, clientFXTimer, clientRoomPrev, clientState, clientSAX, clientSpeedboost, clientSJBall, clientSJDir, clientSpeedCharge, clientPlayerHealth, clientSpectator, clientInvincible, clientMosaic, clientReform, clientVisible, arr, indexValue, clientMapX, clientMapY, sax, spectator, arrPosData, find, event, playerHealth, missiles, smissiles, pbombs, playerhealth, ping, item, metdead, team, spacejump, screwattack, spiderball, speedbooster, bomb, ibeam, wbeam, pbeam, sbeam, cbeam, otherItemArr, IDCheck, tempArr, ID, checkBeam, checkMissile, checkDamage, checkFreeze, newTeam, saxmode, lobbyLocked, samCount, getGravity, receivedPasswordHash, size, type, alignment, result, _seed, monstersLeft, monstersArea, itemArr, metdeadArr, eventArr, tileCount, tileX, tileY, tileData, itemstaken, maxmissiles, maxsmissiles, maxpbombs, maxhealth, etanks, mtanks, stanks, ptanks, time, dir, sprX, sprY, charge, arrDraw, arrID, bombX, bombY, currentWeapon, missileX, missileY, velX, velY, icemissiles, pbombX, pbombY, syncDiff, str, syncELM, otherAbsorbRelativeX, otherAbsorbRelativeY, otherAbsorbSpriteHeight, mapposx, mapposy, mirror, sentRoom, playerX, playerY, resend, receivedItem, etankCount, stankCount, ptankCount, mtankCount, receivedEvent, receivedMetdead, countArea, countLeft, part, j, receiveddmap, damageMultStr, damageMult, experimental, playerState, combatState, freezeOff, checkDir, clientSBall;
var type_event, _buffer, bufferSize, bufferSizePacket, clientID, findsocket, i, arrList, f, v, ban, clientX, clientY, clientSprite, clientImage, clientA1, clientA1X, clientA1Y, clientA2, clientA2X, clientA2Y, clientA2A, clientMirror, clientArmmsl, clientRoom, clientName, clientBlend, clientFXTimer, clientRoomPrev, clientState, clientSAX, clientSpeedboost, clientSJBall, clientSJDir, clientSpeedCharge, clientPlayerHealth, clientSpectator, clientInvincible, clientMosaic, clientReform, clientVisible, arr, indexValue, clientMapX, clientMapY, sax, spectator, arrPosData, find, event, playerHealth, missiles, smissiles, pbombs, playerhealth, ping, item, metdead, team, spacejump, screwattack, spiderball, speedbooster, bomb, ibeam, wbeam, pbeam, sbeam, cbeam, otherItemArr, IDCheck, tempArr, ID, checkBeam, checkMissile, checkDamage, checkFreeze, newTeam, saxmode, lobbyLocked, samCount, getGravity, receivedPasswordHash, size, type, alignment, result, _seed, monstersLeft, monstersArea, itemArr, metdeadArr, eventArr, tileCount, tileX, tileY, tileData, itemstaken, maxmissiles, maxsmissiles, maxpbombs, maxhealth, etanks, mtanks, stanks, ptanks, time, dir, sprX, sprY, charge, arrDraw, arrID, bombX, bombY, currentWeapon, missileX, missileY, velX, velY, icemissiles, pbombX, pbombY, syncDiff, str, syncELM, otherAbsorbRelativeX, otherAbsorbRelativeY, otherAbsorbSpriteHeight, mapposx, mapposy, mirror, sentRoom, playerX, playerY, resend, receivedItem, etankCount, stankCount, ptankCount, mtankCount, receivedEvent, receivedMetdead, countArea, countLeft, part, j, receiveddmap, damageMultStr, damageMult, experimental, playerState, combatState, freezeOff, checkDir, clientSBall, canFreeze, cantFreeze;
disconnectTimer = 900
if (!global.acceptPacket)
exit
@ -403,9 +403,10 @@ switch type_event
}
if global.frozenNormally
show_debug_message("normal freeze")
cantFreeze = ((global.currentsuit == 2 && global.item[5] == 1) || global.currentsuit == 1)
if (checkFreeze && global.playerFreeze == 0 && (!global.frozenNormally))
{
if (checkBeam && (!global.freezeDisabled) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
if (checkBeam && (!cantFreeze) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
{
global.playerFreeze = 120
damageDir = 0
@ -419,7 +420,7 @@ switch type_event
kDown = 0
}
}
if (checkMissile && (checkDamage == 10 || checkDamage == 20) && (!global.freezeDisabled) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
if (checkMissile && (checkDamage == 10 || checkDamage == 20) && (!cantFreeze) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
{
global.playerFreeze = 120
damageDir = 0

2
Export_Code/gml_Object_oControl_Create_0.gml
Unescape View File

@ -269,7 +269,7 @@ if file_exists("lang/fonts/Glasstown_NBP.ttf")
ini_close()
global.fontVersion = font_add_sprite_ext(sVersionFont, "V.0123456789", 1, 1)
global.am2r_version = "V1.5.2"
global.multitroid_version = "UV1.6.2"
global.multitroid_version = "FT1.6.2"
global.gamestarted = 0
global.wave_height = 1
global.sand_map = ds_map_create()

17
Export_Code/gml_Script_damage_player.gml
Unescape View File

@ -2,23 +2,6 @@ var damage_taken, currState, experimentalExtraSAXDamageMultiplier, metcount, i,
if global.spectator
exit
serverdamageMult = global.damageMult
if global.multiDamageCollision
{
metcount = 0
for (i = 0; i <= 40; i++)
{
if (global.metdead[i] == 1)
metcount += 1
}
if global.sax
{
global.damageMult = (1 + (1.5 * (metcount / global.MetCount)))
if (global.damageMult > 2.5)
global.damageMult = 2.5
if (global.currentsuit == 2 && global.juggActive)
global.ignoreKnockback = 1
}
}
experimentalExtraSAXDamageMultiplier = 1
damage_taken = 0
if (global.currentsuit == 0 || argument3 == 1)

2
Export_CodeServer/gml_Object_oServer_Create_0.gml
Unescape View File

@ -77,7 +77,7 @@ syncedELM = 0
posMapModified = 0
global.lobbyLocked = 0
global.damageMult = 0
global.clientVersion = "UV1.6.2"
global.clientVersion = "FT1.6.2"
global.experimental = 0
global.prevMonstersLeft = 0
global.gametime = 0

3
Export_CodeServer/gml_Object_oServer_Draw_0.gml
Unescape View File

@ -32,10 +32,7 @@ switch syncedELM
draw_set_font(font0)
draw_text(5, 5, ("AM2R Server: " + string(str)))
draw_text(5, 35, ((("Connected Clients: " + string(ds_list_size(playerList))) + "/") + string(maxClients)))
draw_text(5, 75, ("Doomsday Time: " + string(global.doomtime)))
draw_text(5, 105, ("Seconds till Doomsday: " + string((global.gametime / 60))))
draw_text(5, 135, ("Metroids Required for A6: " + string(global.MetCount)))
draw_text(5, 165, (("Power Bomb Tanks: " + string(global.ptanks)) + "/10"))
draw_text(5, 195, ("Total Remaining Metroids: " + string(global.monstersleft)))
draw_text(5, 225, ("Seed: " + string(global.seed)))
draw_text(5, 255, ("Difficulty: " + string(diffStr)))

21
Export_CodeServer/gml_Object_oServer_Step_0.gml
Unescape View File

@ -101,23 +101,4 @@ if (ds_list_size(playerList) > 0 && ds_list_size(resetList) > 0)
}
if (!global.lobbyLocked)
ds_list_clear(deadList)
if (global.lobbyLocked && global.doomenabled)
{
doomframes = (global.doomtime * 3600)
if (global.gametime > 0)
global.gametime--
incrementedtime = (doomframes - global.gametime)
maxtime = ((doomframes * 2) / 3)
global.juggActive = 0
if (incrementedtime <= maxtime)
global.damageMult = ((4 * incrementedtime) / maxtime)
else if (global.gametime <= 0)
{
global.damageMult = 8
global.juggActive = 1
}
else
global.damageMult = 4
}
if (!global.doomenabled)
global.damageMult = 2
global.damageMult = 2.5

Write Preview
Loading…
Cancel
Save