diff --git a/Export_Code/gml_Object_oBeam_Collision_904.gml b/Export_Code/gml_Object_oBeam_Collision_904.gml index 599617e..26fb13c 100644 --- a/Export_Code/gml_Object_oBeam_Collision_904.gml +++ b/Export_Code/gml_Object_oBeam_Collision_904.gml @@ -1,5 +1,6 @@ if (sax != other.sax && (!other.spectator)) { + global.showHealthIndicatorsTimer = 900 if pbeam { event_user(0) @@ -10,6 +11,7 @@ if (sax != other.sax && (!other.spectator)) global.checkMissile = 0 global.checkDamage = damage global.checkFreeze = 0 + global.checkDir = direction if ibeam global.checkFreeze = 1 if (myid == 0) @@ -28,6 +30,7 @@ if (sax != other.sax && (!other.spectator)) global.checkMissile = 0 global.checkDamage = damage global.checkFreeze = 0 + global.checkDir = direction if ibeam global.checkFreeze = 1 if (myid == 0) diff --git a/Export_Code/gml_Object_oCharacter_Other_12.gml b/Export_Code/gml_Object_oCharacter_Other_12.gml index f15cf7c..75a393f 100644 --- a/Export_Code/gml_Object_oCharacter_Other_12.gml +++ b/Export_Code/gml_Object_oCharacter_Other_12.gml @@ -17,6 +17,13 @@ if (invincible == 0) global.multiDamageCollision = 1 if (other.direction > 90 && other.direction < 270) damageDir = 1 + if (otherOBJ == 438) + { + if (other.x < x) + damageDir = -1 + else + damageDir = 1 + } if (otherOBJ == 440 && global.playerFreeze > 151) { with (other.id) diff --git a/Export_Code/gml_Object_oClient_Other_68.gml b/Export_Code/gml_Object_oClient_Other_68.gml index 3029bf6..ceea91d 100644 --- a/Export_Code/gml_Object_oClient_Other_68.gml +++ b/Export_Code/gml_Object_oClient_Other_68.gml @@ -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; +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; disconnectTimer = 900 if (!global.acceptPacket) exit @@ -370,6 +370,7 @@ switch type_event checkMissile = buffer_read(_buffer, buffer_u8) checkDamage = buffer_read(_buffer, buffer_u8) checkFreeze = buffer_read(_buffer, buffer_u8) + checkDir = buffer_read(_buffer, buffer_u8) if (checkMissile && global.playerFreeze > 151) break else @@ -380,6 +381,8 @@ switch type_event { damageDir = -1 knockbackY = -3 + if (checkDir > 90 && checkDir < 270) + damageDir = 1 global.multiDamageCollision = 1 if checkBeam { diff --git a/Export_Code/gml_Object_oMissile_Collision_904.gml b/Export_Code/gml_Object_oMissile_Collision_904.gml index 3fb4b6f..f456325 100644 --- a/Export_Code/gml_Object_oMissile_Collision_904.gml +++ b/Export_Code/gml_Object_oMissile_Collision_904.gml @@ -1,5 +1,6 @@ if (myid != other.myid && sax != other.sax && (!other.spectator)) { + global.showHealthIndicatorsTimer = 900 global.checkID = other.myid global.checkX = other.x global.checkY = other.y @@ -7,6 +8,7 @@ if (myid != other.myid && sax != other.sax && (!other.spectator)) global.checkMissile = 1 global.checkDamage = damage global.checkFreeze = 0 + global.checkDir = direction if icemissiles global.checkFreeze = 1 if (myid == 0)