diff --git a/Export_CodeServer/gml_Object_oServer_Create_0.gml b/Export_CodeServer/gml_Object_oServer_Create_0.gml index e26b08f..329c50a 100644 --- a/Export_CodeServer/gml_Object_oServer_Create_0.gml +++ b/Export_CodeServer/gml_Object_oServer_Create_0.gml @@ -77,5 +77,5 @@ syncedELM = 0 posMapModified = 0 global.lobbyLocked = 0 global.damageMult = 0 -global.clientVersion = "V1.4.2" +global.clientVersion = "V1.9.2" global.experimental = 0 diff --git a/Export_CodeServer/gml_Script_check_items.gml b/Export_CodeServer/gml_Script_check_items.gml index a9650db..8cfeb86 100644 --- a/Export_CodeServer/gml_Script_check_items.gml +++ b/Export_CodeServer/gml_Script_check_items.gml @@ -1,4 +1,4 @@ -var etankCount, i, stankCount, ptankCount, mtankCount, itemCount, h, val; +var etankCount, i, stankCount, ptankCount, mtankCount, itemCount, h, val, sval; etankCount = 0 for (i = 0; i < array_length_1d(global.itemSamus); i++) { @@ -47,9 +47,13 @@ itemCount = 0 for (h = 0; h < array_length_1d(global.itemSamus); h++) { val = global.itemSamus[h] + sval = global.itemSAX[h] if (val == 1 && h != 1) itemCount++ + if (sval == 1 && h != 1) + itemCount++ } +itemCount = (itemCount / 2) global.damageMult = ((itemCount / 88) * 3) if global.experimental global.damageMult = ((itemCount / 88) * 5) diff --git a/Export_RoomServer/room0.json b/Export_RoomServer/room0.json index b6600da..f07c357 100644 --- a/Export_RoomServer/room0.json +++ b/Export_RoomServer/room0.json @@ -402,20 +402,6 @@ "image_speed": 0, "image_index": 0 }, - { - "x": 896, - "y": 696, - "object_definition": "oLockLobby", - "instance_id": 100010, - "creation_code": null, - "scale_x": 1, - "scale_y": 1, - "color": 4294967295, - "rotation": 0, - "pre_create_code": null, - "image_speed": 0, - "image_index": 0 - }, { "x": 0, "y": 0, @@ -640,20 +626,6 @@ "image_speed": 0, "image_index": 0 }, - { - "x": 1120, - "y": 696, - "object_definition": "oSAXModeToggle", - "instance_id": 100027, - "creation_code": null, - "scale_x": 1, - "scale_y": 1, - "color": 4294967295, - "rotation": 0, - "pre_create_code": null, - "image_speed": 0, - "image_index": 0 - }, { "x": 1120, "y": 120,