Fresh start: replace with naxIO/netfox-cs-sample foundation
Complete replacement of the tactical-shooter project with the netfox-cs-sample (MIT) — a CS 1.6 inspired multiplayer FPS built with Godot 4 and netfox. ## What's new - Full CS-style gameplay: teams (T/CT), rounds, economy, buy menu - 6 weapons: Knife, Glock, USP, AK-47, M4A1, AWP - Bomb plant/defuse with 2 bombsites - Flashbang & smoke grenades - Proper netfox rollback netcode at 64 tick - Network popup UI for host/join - HUD, crosshair, round timer, scoreboard - All netfox singletons registered as autoloads (works in exported builds) ## Architecture - Listen-server (host from client, no dedicated server binary) - Multiplayer-fps game lives at examples/multiplayer-fps/ - Netfox addons registered as autoloads for exported build compat - Godot 4.7 with Forward+ renderer ## Removed - Old headless-server architecture (client_main, server_main, player.gd, etc.) - Custom netfox bootstrap with ENet fallback - Old ChaffGames FPS template (2,420 lines, 844 KB) - SimulationServer GDExtension stub - Godot-jolt physics (netfox sample uses default Godot physics) - Duplicate weapon_data.gd, anti_cheat.gd, round_manager.gd, etc. - Server browser API Python venv (87 MB) - test_range map and modular assets ## Preserved - Git history - Server config at config/default_server_config.cfg - Windows export preset - Build directory (gitignored) Co-authored-by: naxIO <naxIO@users.noreply.github.com>
This commit is contained in:
@@ -0,0 +1,102 @@
|
||||
extends SnapshotSerializerTest
|
||||
|
||||
func get_suite_name() -> String:
|
||||
return "DenseSnapshotSerializer"
|
||||
|
||||
func suite() -> void:
|
||||
test("should deserialize to same", func():
|
||||
var schema := _NetworkSchema.new()
|
||||
var serializer := _DenseSnapshotSerializer.new(schema)
|
||||
|
||||
var subject := await get_subject()
|
||||
NetworkIdentityServer.register_node(subject)
|
||||
|
||||
var snapshot := _Snapshot.of(0, [
|
||||
[subject, "position", Vector3.ZERO],
|
||||
[subject, "quaternion", Quaternion.from_euler(Vector3.ONE)],
|
||||
[subject, "scale", Vector3.ONE]
|
||||
], [subject])
|
||||
|
||||
var props := _PropertyPool.of([
|
||||
[subject, "position"],
|
||||
[subject, "quaternion"],
|
||||
[subject, "scale"]
|
||||
])
|
||||
|
||||
var serialized := serializer.write_for(1, snapshot, props)
|
||||
var deserialized := serializer.read_from(1, props, to_buffer(serialized))
|
||||
|
||||
expect_equal(deserialized, snapshot)
|
||||
|
||||
Vest.message("Serialized %d props to %d bytes" % [snapshot.size(), serialized.size()])
|
||||
)
|
||||
|
||||
test("should ignore unknown identifiers", func():
|
||||
var schema := _NetworkSchema.new()
|
||||
var writer_identity_server := _NetworkIdentityServer.new(TestingCommandServer.new())
|
||||
var reader_identity_server := _NetworkIdentityServer.new(TestingCommandServer.new())
|
||||
|
||||
Vest.get_tree().root.add_child.call_deferred(writer_identity_server)
|
||||
Vest.get_tree().root.add_child.call_deferred(reader_identity_server)
|
||||
await writer_identity_server.ready; await reader_identity_server.ready
|
||||
|
||||
var writer_serializer := _DenseSnapshotSerializer.new(schema, writer_identity_server)
|
||||
var reader_serializer := _DenseSnapshotSerializer.new(schema, reader_identity_server)
|
||||
|
||||
var known_subject := await get_subject()
|
||||
var unknown_subject := await get_subject()
|
||||
|
||||
var writer_props := _PropertyPool.of([[known_subject, "position"], [unknown_subject, "position"]])
|
||||
var reader_props := _PropertyPool.of([[known_subject, "position"]])
|
||||
|
||||
writer_identity_server.register_node(known_subject)
|
||||
writer_identity_server.register_node(unknown_subject)
|
||||
|
||||
reader_identity_server.register_node(known_subject)
|
||||
|
||||
var snapshot := _Snapshot.of(0, [
|
||||
[unknown_subject, "position", Vector3.ZERO],
|
||||
[known_subject, "position", Vector3.ZERO]
|
||||
], [known_subject, unknown_subject])
|
||||
|
||||
var expected := _Snapshot.of(0, [
|
||||
[known_subject, "position", Vector3.ZERO]
|
||||
], [known_subject])
|
||||
|
||||
var serialized := writer_serializer.write_for(1, snapshot, writer_props)
|
||||
var deserialized := reader_serializer.read_from(1, reader_props, to_buffer(serialized))
|
||||
|
||||
expect_equal(deserialized, expected)
|
||||
)
|
||||
|
||||
test("should handle missing data", func():
|
||||
var schema := _NetworkSchema.new()
|
||||
var serializer := _DenseSnapshotSerializer.new(schema)
|
||||
|
||||
var subject := await get_subject()
|
||||
NetworkIdentityServer.register_node(subject)
|
||||
|
||||
var snapshot := _Snapshot.of(0, [
|
||||
[subject, "position", Vector3.ZERO],
|
||||
[subject, "quaternion", Quaternion.from_euler(Vector3.ONE)],
|
||||
[subject, "scale", Vector3.ONE]
|
||||
], [subject])
|
||||
|
||||
var props := _PropertyPool.of([
|
||||
[subject, "position"],
|
||||
[subject, "quaternion"],
|
||||
[subject, "scale"]
|
||||
])
|
||||
|
||||
var expected := _Snapshot.of(0, [
|
||||
[subject, "position", Vector3.ZERO],
|
||||
[subject, "quaternion", Quaternion.from_euler(Vector3.ONE)],
|
||||
[subject, "scale", null]
|
||||
], [subject])
|
||||
|
||||
var serialized := serializer.write_for(1, snapshot, props)
|
||||
serialized = serialized.slice(0, serialized.size() - 4)
|
||||
var deserialized := serializer.read_from(1, props, to_buffer(serialized))
|
||||
|
||||
expect_equal(deserialized, expected)
|
||||
)
|
||||
@@ -0,0 +1 @@
|
||||
uid://cluy2t885ych6
|
||||
@@ -0,0 +1,43 @@
|
||||
extends SnapshotSerializerTest
|
||||
|
||||
func get_suite_name() -> String:
|
||||
return "RedundantSnapshotSerializer"
|
||||
|
||||
func suite() -> void:
|
||||
test("should deserialize to same", func():
|
||||
var schema := _NetworkSchema.new()
|
||||
var serializer := _RedundantSnapshotSerializer.new(schema)
|
||||
|
||||
var subject := Node3D.new()
|
||||
Vest.get_tree().root.add_child.call_deferred(subject)
|
||||
await subject.ready
|
||||
NetworkIdentityServer.register_node(subject)
|
||||
|
||||
var snapshots := [
|
||||
_Snapshot.of(0, [
|
||||
[subject, "position", Vector3(0., 0., 0.)],
|
||||
[subject, "quaternion", Quaternion.from_euler(Vector3.ONE)],
|
||||
[subject, "scale", Vector3(1., 1., 1.)]
|
||||
], [subject]),
|
||||
_Snapshot.of(1, [
|
||||
[subject, "position", Vector3(1., 0., 0.)],
|
||||
[subject, "quaternion", Quaternion.from_euler(Vector3.ZERO)],
|
||||
[subject, "scale", Vector3(1., .5, 1.)]
|
||||
], [subject])
|
||||
] as Array[_Snapshot]
|
||||
|
||||
var props := _PropertyPool.of([
|
||||
[subject, "position"],
|
||||
[subject, "quaternion"],
|
||||
[subject, "scale"]
|
||||
])
|
||||
|
||||
var serialized := serializer.write_for(1, snapshots, props)
|
||||
var deserialized := serializer.read_from(1, props, to_buffer(serialized))
|
||||
|
||||
expect_equal(deserialized.size(), snapshots.size(), "Not all snapshots were deserialized!")
|
||||
for i in snapshots.size():
|
||||
expect_equal(deserialized[i], snapshots[i])
|
||||
|
||||
Vest.message("Serialized %d snapshots to %d bytes" % [snapshots.size(), serialized.size()])
|
||||
)
|
||||
@@ -0,0 +1 @@
|
||||
uid://b8k4gyko3nrqj
|
||||
@@ -0,0 +1,19 @@
|
||||
extends VestTest
|
||||
class_name SnapshotSerializerTest
|
||||
|
||||
func before_case(__):
|
||||
# Makes sure local peer is 1, otherwise identifiers get random local IDs
|
||||
Vest.get_tree().root.multiplayer.multiplayer_peer = OfflineMultiplayerPeer.new()
|
||||
|
||||
func to_buffer(data: PackedByteArray) -> StreamPeerBuffer:
|
||||
var buffer := StreamPeerBuffer.new()
|
||||
buffer.data_array = data
|
||||
return buffer
|
||||
|
||||
func get_subject() -> Node3D:
|
||||
var subject := Node3D.new()
|
||||
|
||||
Vest.get_tree().root.add_child.call_deferred(subject)
|
||||
await subject.ready
|
||||
|
||||
return subject
|
||||
@@ -0,0 +1 @@
|
||||
uid://drf3txqsw1vlv
|
||||
@@ -0,0 +1,72 @@
|
||||
extends SnapshotSerializerTest
|
||||
|
||||
func get_suite_name() -> String:
|
||||
return "SparseSnapshotSerializer"
|
||||
|
||||
func suite() -> void:
|
||||
test("should deserialize to same", func():
|
||||
var schema := _NetworkSchema.new()
|
||||
var serializer := _SparseSnapshotSerializer.new(schema)
|
||||
|
||||
var subject := Node3D.new()
|
||||
Vest.get_tree().root.add_child.call_deferred(subject)
|
||||
await subject.ready
|
||||
NetworkIdentityServer.register_node(subject)
|
||||
|
||||
var snapshot := _Snapshot.of(0, [
|
||||
[subject, "position", Vector3.ZERO],
|
||||
[subject, "quaternion", Quaternion.from_euler(Vector3.ONE)],
|
||||
[subject, "scale", Vector3.ONE]
|
||||
], [subject])
|
||||
|
||||
var props := _PropertyPool.of([
|
||||
[subject, "position"],
|
||||
[subject, "quaternion"],
|
||||
[subject, "scale"]
|
||||
])
|
||||
|
||||
var serialized := serializer.write_for(1, snapshot, props)
|
||||
var deserialized := serializer.read_from(1, props, to_buffer(serialized))
|
||||
|
||||
expect_equal(deserialized, snapshot)
|
||||
|
||||
Vest.message("Serialized %d props to %d bytes" % [snapshot.size(), serialized.size()])
|
||||
)
|
||||
|
||||
test("should ignore unknown identifiers", func():
|
||||
var schema := _NetworkSchema.new()
|
||||
var writer_identity_server := _NetworkIdentityServer.new(TestingCommandServer.new())
|
||||
var reader_identity_server := _NetworkIdentityServer.new(TestingCommandServer.new())
|
||||
|
||||
Vest.get_tree().root.add_child.call_deferred(writer_identity_server)
|
||||
Vest.get_tree().root.add_child.call_deferred(reader_identity_server)
|
||||
await writer_identity_server.ready; await reader_identity_server.ready
|
||||
|
||||
var writer_serializer := _SparseSnapshotSerializer.new(schema, writer_identity_server)
|
||||
var reader_serializer := _SparseSnapshotSerializer.new(schema, reader_identity_server)
|
||||
|
||||
var known_subject := await get_subject()
|
||||
var unknown_subject := await get_subject()
|
||||
|
||||
var writer_props := _PropertyPool.of([[known_subject, "position"], [unknown_subject, "position"]])
|
||||
var reader_props := _PropertyPool.of([[known_subject, "position"]])
|
||||
|
||||
writer_identity_server.register_node(known_subject)
|
||||
writer_identity_server.register_node(unknown_subject)
|
||||
|
||||
reader_identity_server.register_node(known_subject)
|
||||
|
||||
var snapshot := _Snapshot.of(0, [
|
||||
[unknown_subject, "position", Vector3.ZERO],
|
||||
[known_subject, "position", Vector3.ZERO]
|
||||
], [known_subject, unknown_subject])
|
||||
|
||||
var expected := _Snapshot.of(0, [
|
||||
[known_subject, "position", Vector3.ZERO]
|
||||
], [known_subject])
|
||||
|
||||
var serialized := writer_serializer.write_for(1, snapshot, writer_props)
|
||||
var deserialized := reader_serializer.read_from(1, reader_props, to_buffer(serialized))
|
||||
|
||||
expect_equal(deserialized, expected)
|
||||
)
|
||||
@@ -0,0 +1 @@
|
||||
uid://2l21sx6aw4ek
|
||||
@@ -0,0 +1,72 @@
|
||||
extends VestTest
|
||||
|
||||
func get_suite_name() -> String:
|
||||
return "TicksetSerializer"
|
||||
|
||||
func test_should_serialize_empty():
|
||||
# Given
|
||||
var earliest_tick = 15
|
||||
var latest_tick = 35
|
||||
var active_ticks = _Set.new()
|
||||
|
||||
# When
|
||||
var bytes = _TicksetSerializer.serialize(earliest_tick, latest_tick, active_ticks)
|
||||
var deserialized = _TicksetSerializer.deserialize(bytes)
|
||||
|
||||
# Then
|
||||
expect_equal(deserialized[0], earliest_tick)
|
||||
expect_equal(deserialized[1], latest_tick)
|
||||
expect_equal(deserialized[2], active_ticks)
|
||||
|
||||
func test_should_serialize_ticks():
|
||||
# Given
|
||||
var earliest_tick = 15
|
||||
var latest_tick = 35
|
||||
var active_ticks = _Set.of([15, 16, 20, 24])
|
||||
|
||||
# When
|
||||
var bytes = _TicksetSerializer.serialize(earliest_tick, latest_tick, active_ticks)
|
||||
var deserialized = _TicksetSerializer.deserialize(bytes)
|
||||
|
||||
# Then
|
||||
expect_equal(deserialized[0], earliest_tick)
|
||||
expect_equal(deserialized[1], latest_tick)
|
||||
expect_equal(deserialized[2], active_ticks)
|
||||
|
||||
func test_should_serialize_only_range():
|
||||
# Given
|
||||
var earliest_tick = 16
|
||||
var latest_tick = 20
|
||||
var active_ticks = _Set.of([15, 16, 20, 24])
|
||||
|
||||
# When
|
||||
var bytes = _TicksetSerializer.serialize(earliest_tick, latest_tick, active_ticks)
|
||||
var deserialized = _TicksetSerializer.deserialize(bytes)
|
||||
|
||||
# Then
|
||||
expect_equal(deserialized[0], earliest_tick)
|
||||
expect_equal(deserialized[1], latest_tick)
|
||||
expect_equal(deserialized[2], _Set.of([16, 20]))
|
||||
|
||||
func test_should_fail_on_earliest_after_latest():
|
||||
# Given
|
||||
var earliest_tick = 42
|
||||
var latest_tick = 12
|
||||
var active_ticks = _Set.new()
|
||||
|
||||
# When
|
||||
var bytes = _TicksetSerializer.serialize(earliest_tick, latest_tick, active_ticks)
|
||||
|
||||
expect(bytes.is_empty())
|
||||
|
||||
func test_bandwidth():
|
||||
var earliest_tick = 15
|
||||
var latest_tick = 35
|
||||
var active_ticks = _Set.of([15, 16, 20, 24])
|
||||
|
||||
var empty_buffer := _TicksetSerializer.serialize(earliest_tick, latest_tick, _Set.of([]))
|
||||
var buffer := _TicksetSerializer.serialize(earliest_tick, latest_tick, active_ticks)
|
||||
|
||||
Vest.message("Data usage with empty tickset: %d bytes" % [empty_buffer.size()])
|
||||
Vest.message("Data usage with %d active ticks: %d bytes" % [active_ticks.size(), buffer.size()])
|
||||
ok()
|
||||
@@ -0,0 +1 @@
|
||||
uid://bd0su60kc3cyu
|
||||
Reference in New Issue
Block a user