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

Added Kill Messages

Browse Source
pull/6/head
DodoBirb 3 years ago
parent 0acf4ec486
commit 07a95b1487
17 changed files with 194 additions and 4 deletions
Show Stats Download Patch File Download Diff File

2
Export_Code/gml_Object_oBeam_Collision_904.gml
Unescape View File

@ -4,6 +4,7 @@ if (sax != other.sax && (!other.spectator))
if pbeam
{
event_user(0)
global.attackID = global.clientID
global.checkID = other.myid
global.checkX = other.x
global.checkY = other.y
@ -23,6 +24,7 @@ if (sax != other.sax && (!other.spectator))
else
{
event_user(0)
global.attackID = global.clientID
global.checkID = other.myid
global.checkX = other.x
global.checkY = other.y

1
Export_Code/gml_Object_oClient_Other_12.gml
Unescape View File

@ -1,6 +1,7 @@
var size, type, alignment, bufferSize, result;
if global.spectator
exit
global.killedBy = global.otherID
size = 1024
type = buffer_grow
alignment = 1

2
Export_Code/gml_Object_oClient_Other_13.gml
Unescape View File

@ -6,6 +6,7 @@ alignment = 1
buffer5 = buffer_create(size, type, alignment)
buffer_seek(buffer5, buffer_seek_start, 0)
buffer_write(buffer5, buffer_u8, 106)
buffer_write(buffer5, buffer_u8, global.attackID)
buffer_write(buffer5, buffer_u8, global.checkID)
buffer_write(buffer5, buffer_s16, global.checkX)
buffer_write(buffer5, buffer_s16, global.checkY)
@ -18,6 +19,7 @@ bufferSize = buffer_tell(buffer5)
buffer_seek(buffer5, buffer_seek_start, 0)
buffer_write(buffer5, buffer_s32, bufferSize)
buffer_write(buffer5, buffer_u8, 106)
buffer_write(buffer5, buffer_u8, global.attackID)
buffer_write(buffer5, buffer_u8, global.checkID)
buffer_write(buffer5, buffer_s16, global.checkX)
buffer_write(buffer5, buffer_s16, global.checkY)

4
Export_Code/gml_Object_oClient_Other_19.gml
Unescape View File

@ -10,6 +10,8 @@ buffer_write(buffer11, buffer_s16, room)
buffer_write(buffer11, buffer_s16, global.currX)
buffer_write(buffer11, buffer_s16, global.currY)
buffer_write(buffer11, buffer_s8, global.sax)
buffer_write(buffer11, buffer_u8, global.killedBy)
buffer_write(buffer11, buffer_u8, global.clientID)
bufferSize = buffer_tell(buffer11)
buffer_seek(buffer11, buffer_seek_start, 0)
buffer_write(buffer11, buffer_s32, bufferSize)
@ -19,5 +21,7 @@ buffer_write(buffer11, buffer_s16, room)
buffer_write(buffer11, buffer_s16, global.currX)
buffer_write(buffer11, buffer_s16, global.currY)
buffer_write(buffer11, buffer_s8, global.sax)
buffer_write(buffer11, buffer_u8, global.killedBy)
buffer_write(buffer11, buffer_u8, global.clientID)
result = network_send_packet(socket, buffer11, buffer_tell(buffer11))
buffer_delete(buffer11)

15
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, canFreeze, cantFreeze;
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, checkID, attackID, killedBy, deadPlayer, deadName, killerName;
disconnectTimer = 900
if (!global.acceptPacket)
exit
@ -369,11 +369,13 @@ switch type_event
break
case 110:
global.showHealthIndicatorsTimer = 900
attackID = buffer_read(_buffer, buffer_u8)
checkBeam = buffer_read(_buffer, buffer_u8)
checkMissile = buffer_read(_buffer, buffer_u8)
checkDamage = buffer_read(_buffer, buffer_u8)
checkFreeze = buffer_read(_buffer, buffer_u8)
checkDir = buffer_read(_buffer, buffer_u8)
global.killedBy = attackID
if (checkMissile && global.playerFreeze > 151)
break
else
@ -476,6 +478,7 @@ switch type_event
experimental = buffer_read(_buffer, buffer_u8)
global.MetCount = buffer_read(_buffer, buffer_u8)
global.freeForAll = buffer_read(_buffer, buffer_u8)
global.killMessages = buffer_read(_buffer, buffer_u8)
global.damageMult = damageMult
global.saxmode = saxmode
global.experimental = experimental
@ -1591,6 +1594,16 @@ switch type_event
playerX = buffer_read(_buffer, buffer_s16)
playerY = buffer_read(_buffer, buffer_s16)
sax = buffer_read(_buffer, buffer_s8)
killedBy = buffer_read(_buffer, buffer_u8)
deadName = buffer_read(_buffer, buffer_string)
killerName = buffer_read(_buffer, buffer_string)
if global.killMessages
{
if (killedBy != 0)
popup_text(((killerName + " killed ") + deadName))
else
popup_text((deadName + " died"))
}
if (room == sentRoom)
{
seq = instance_create(playerX, playerY, oDeathSequenceMulti)

4
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 = "FT1.6.2"
global.multitroid_version = "FT1.6.3"
global.gamestarted = 0
global.wave_height = 1
global.sand_map = ds_map_create()
@ -480,5 +480,7 @@ global.saveStationCooldown = 0
global.hitBySuper = 0
global.MetCount = 41
global.freeForAll = 0
global.killedBy = 0
global.killMessages = 0
reset_map()
load_character_vars()

1
Export_Code/gml_Object_oMissile_Collision_904.gml
Unescape View File

@ -1,6 +1,7 @@
if (myid != other.myid && sax != other.sax && (!other.spectator))
{
global.showHealthIndicatorsTimer = 900
global.attackID = global.clientID
global.checkID = other.myid
global.checkX = other.x
global.checkY = other.y

1
Export_Code/gml_Script_load_character_vars.gml
Unescape View File

@ -1,4 +1,5 @@
var i, f;
global.killedBy = 0
global.morphball = 1
global.jumpball = 0
global.powergrip = 1

1
Export_Code/gml_Script_sv6_load.gml
Unescape View File

@ -89,6 +89,7 @@ else
global.roomsSinceLastSpawn = 0
global.ingame = 1
global.newgame = 0
global.killedBy = 0
room_change(global.start_room, 1)
}
if instance_exists(oClient)

2
Export_CodeServer/gml_Object_oKillMessages_Create_0.gml
Unescape View File

@ -0,0 +1,2 @@
global.killMessages = 0
image_speed = 0

4
Export_CodeServer/gml_Object_oKillMessages_Draw_0.gml
Unescape View File

@ -0,0 +1,4 @@
draw_self()
draw_set_halign(fa_right)
draw_text((x - sprite_width), (y - 12), "Toggle Kill Messages")
draw_set_halign(fa_left)

1
Export_CodeServer/gml_Object_oKillMessages_Mouse_4.gml
Unescape View File

@ -0,0 +1 @@
global.killMessages = (!global.killMessages)

4
Export_CodeServer/gml_Object_oKillMessages_Step_0.gml
Unescape View File

@ -0,0 +1,4 @@
if global.killMessages
image_index = 0
else
image_index = 1

1
Export_CodeServer/gml_Object_oServer_Alarm_11.gml
Unescape View File

@ -30,6 +30,7 @@ buffer_write(buffer, buffer_string, string(global.damageMult))
buffer_write(buffer, buffer_u8, global.experimental)
buffer_write(buffer, buffer_u8, global.MetCount)
buffer_write(buffer, buffer_u8, global.freeForAll)
buffer_write(buffer, buffer_u8, global.killMessages)
for (i = 0; i < sockets; i++)
network_send_packet(ds_list_find_value(playerList, i), buffer, buffer_tell(buffer))
alarm[11] = 30

3
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 = "FT1.6.2"
global.clientVersion = "FT1.6.3"
global.experimental = 0
global.prevMonstersLeft = 0
global.gametime = 0
@ -86,3 +86,4 @@ global.doomenabled = 0
global.doomstarted = 0
global.juggActive = 0
global.totalItemCount = 0
global.killMessages = 0

29
Export_CodeServer/gml_Object_oServer_Other_68.gml
Unescape View File

@ -1,4 +1,4 @@
var type_event, ip, findIP, findKickIP, ban, size, type, alignment, bufferSize, findsocket, i, arrList, socket, socketID, ID, arr, seed, findID, _buffer, bufferSizePacket, clientID, sax, sockets, preferredID, f, arrID, arrSocket, 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, list, clientMapX, clientMapY, spectator, findSamus, event, findDead, playerHealth, missiles, smissiles, pbombs, ping, realPing, spacejump, screwattack, spiderball, speedbooster, bomb, ibeam, wbeam, pbeam, sbeam, cbeam, tempSocket, checkID, checkX, checkY, checkBeam, checkMissile, checkDamage, checkFreeze, lag, lagPositions, timeToCheck, g, lagPosArr, lagPosTime, lagPosID, lagPosX, lagPosY, packetID, name, lobbyLocked, _queenHealth, phase, state, monstersLeft, monstersArea, item, itemArr, v, metdead, metdeadArr, eventArr, tileCount, tileX, tileY, tileData, itemstaken, maxmissiles, maxsmissiles, maxpbombs, maxhealth, etanks, mtanks, stanks, ptanks, gametime, findTime, findReset, dir, sprX, sprY, charge, bombX, bombY, currentWeapon, missileX, missileY, velX, velY, icemissiles, pbombX, pbombY, playerhealth, syncDiff, syncELM, otherAbsorbRelativeX, otherAbsorbRelativeY, otherAbsorbSpriteHeight, saxmode, findIDSamus, findIDSAX, mapposx, mapposy, mirror, sentRoom, playerX, playerY, receivedItem, receivedEvent, receivedMetdead, j, receiveddmap, msg, splitBy, slot, splits, str2, currStr, wrongVersion, playerState, combatState, checkDir, clientSBall, itempercent;
var type_event, ip, findIP, findKickIP, ban, size, type, alignment, bufferSize, findsocket, i, arrList, socket, socketID, ID, arr, seed, findID, _buffer, bufferSizePacket, clientID, sax, sockets, preferredID, f, arrID, arrSocket, 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, list, clientMapX, clientMapY, spectator, findSamus, event, findDead, playerHealth, missiles, smissiles, pbombs, ping, realPing, spacejump, screwattack, spiderball, speedbooster, bomb, ibeam, wbeam, pbeam, sbeam, cbeam, tempSocket, checkID, checkX, checkY, checkBeam, checkMissile, checkDamage, checkFreeze, lag, lagPositions, timeToCheck, g, lagPosArr, lagPosTime, lagPosID, lagPosX, lagPosY, packetID, name, lobbyLocked, _queenHealth, phase, state, monstersLeft, monstersArea, item, itemArr, v, metdead, metdeadArr, eventArr, tileCount, tileX, tileY, tileData, itemstaken, maxmissiles, maxsmissiles, maxpbombs, maxhealth, etanks, mtanks, stanks, ptanks, gametime, findTime, findReset, dir, sprX, sprY, charge, bombX, bombY, currentWeapon, missileX, missileY, velX, velY, icemissiles, pbombX, pbombY, playerhealth, syncDiff, syncELM, otherAbsorbRelativeX, otherAbsorbRelativeY, otherAbsorbSpriteHeight, saxmode, findIDSamus, findIDSAX, mapposx, mapposy, mirror, sentRoom, playerX, playerY, receivedItem, receivedEvent, receivedMetdead, j, receiveddmap, msg, splitBy, slot, splits, str2, currStr, wrongVersion, playerState, combatState, checkDir, clientSBall, itempercent, attackID, killedBy, deadPlayer, killerName, deadName;
type_event = ds_map_find_value(async_load, "type")
ip = ds_map_find_value(async_load, "ip")
findIP = ds_list_find_index(banList, ip)
@ -800,6 +800,7 @@ switch type_event
network_send_packet(tempSocket, buffer, buffer_tell(buffer))
break
case 106:
attackID = buffer_read(_buffer, buffer_u8)
checkID = buffer_read(_buffer, buffer_u8)
checkX = buffer_read(_buffer, buffer_s16)
checkY = buffer_read(_buffer, buffer_s16)
@ -827,6 +828,7 @@ switch type_event
buffer = buffer_create(size, type, alignment)
buffer_seek(buffer, buffer_seek_start, 0)
buffer_write(buffer, buffer_u8, 110)
buffer_write(buffer, buffer_u8, attackID)
buffer_write(buffer, buffer_u8, checkBeam)
buffer_write(buffer, buffer_u8, checkMissile)
buffer_write(buffer, buffer_u8, checkDamage)
@ -836,6 +838,7 @@ switch type_event
buffer_seek(buffer, buffer_seek_start, 0)
buffer_write(buffer, buffer_s32, bufferSize)
buffer_write(buffer, buffer_u8, 110)
buffer_write(buffer, buffer_u8, attackID)
buffer_write(buffer, buffer_u8, checkBeam)
buffer_write(buffer, buffer_u8, checkMissile)
buffer_write(buffer, buffer_u8, checkDamage)
@ -2445,6 +2448,24 @@ switch type_event
playerX = buffer_read(_buffer, buffer_s16)
playerY = buffer_read(_buffer, buffer_s16)
sax = buffer_read(_buffer, buffer_s8)
killedBy = buffer_read(_buffer, buffer_u8)
deadPlayer = buffer_read(_buffer, buffer_u8)
killerName = ""
deadName = ""
if global.killMessages
{
for (i = 0; i < ds_list_size(idList); i++)
{
arrList = ds_list_find_value(idList, i)
if (array_length_2d(arrList, 0) <= 2)
{
}
else if (arrList[0, 0] == killedBy)
killerName = arrList[0, 2]
else if (arrList[0, 0] == deadPlayer)
deadName = arrList[0, 2]
}
}
buffer_delete(buffer)
size = 1024
type = buffer_grow
@ -2457,6 +2478,9 @@ switch type_event
buffer_write(buffer, buffer_s16, playerX)
buffer_write(buffer, buffer_s16, playerY)
buffer_write(buffer, buffer_s8, sax)
buffer_write(buffer, buffer_u8, killedBy)
buffer_write(buffer, buffer_string, deadName)
buffer_write(buffer, buffer_string, killerName)
bufferSize = buffer_tell(buffer)
buffer_seek(buffer, buffer_seek_start, 0)
buffer_write(buffer, buffer_s32, bufferSize)
@ -2466,6 +2490,9 @@ switch type_event
buffer_write(buffer, buffer_s16, playerX)
buffer_write(buffer, buffer_s16, playerY)
buffer_write(buffer, buffer_s8, sax)
buffer_write(buffer, buffer_u8, killedBy)
buffer_write(buffer, buffer_string, deadName)
buffer_write(buffer, buffer_string, killerName)
sockets = ds_list_size(playerList)
for (i = 0; i < sockets; i++)
{

123
Export_ObjectServer/oKillMessages.json
Unescape View File

@ -0,0 +1,123 @@
{
"name": "oKillMessages",
"sprite": "sOption",
"visible": true,
"solid": false,
"depth": 0,
"persistent": false,
"parent_id": null,
"texture_mask_id": null,
"uses_physics": false,
"is_sensor": false,
"collision_shape": 0,
"density": 0.5,
"restitution": 0.1,
"group": 0,
"linear_damping": 0.1,
"angular_damping": 0.1,
"friction": 0.2,
"awake": false,
"kinematic": false,
"physics_vertices": [],
"events": [
[
{
"event_subtype": 0,
"actions": [
{
"lib_id": 0,
"id": 0,
"kind": 0,
"use_relative": false,
"is_question": false,
"use_apply_to": false,
"exe_type": 0,
"action_name": null,
"code_id": "gml_Object_oKillMessages_Create_0",
"argument_count": 0,
"who": 0,
"relative": false,
"is_not": false
}
]
}
],
[],
[],
[
{
"event_subtype": 0,
"actions": [
{
"lib_id": 0,
"id": 0,
"kind": 0,
"use_relative": false,
"is_question": false,
"use_apply_to": false,
"exe_type": 0,
"action_name": null,
"code_id": "gml_Object_oKillMessages_Step_0",
"argument_count": 0,
"who": 0,
"relative": false,
"is_not": false
}
]
}
],
[],
[],
[
{
"event_subtype": 4,
"actions": [
{
"lib_id": 0,
"id": 0,
"kind": 0,
"use_relative": false,
"is_question": false,
"use_apply_to": false,
"exe_type": 0,
"action_name": null,
"code_id": "gml_Object_oKillMessages_Mouse_4",
"argument_count": 0,
"who": 0,
"relative": false,
"is_not": false
}
]
}
],
[],
[
{
"event_subtype": 0,
"actions": [
{
"lib_id": 0,
"id": 0,
"kind": 0,
"use_relative": false,
"is_question": false,
"use_apply_to": false,
"exe_type": 0,
"action_name": null,
"code_id": "gml_Object_oKillMessages_Draw_0",
"argument_count": 0,
"who": 0,
"relative": false,
"is_not": false
}
]
}
],
[],
[],
[],
[],
[],
[]
]
}
Write Preview
Loading…
Cancel
Save