diff --git a/Game/Assets/Characters/Player.gd b/Game/Assets/Characters/Player.gd index 0d46240..501d7b4 100644 --- a/Game/Assets/Characters/Player.gd +++ b/Game/Assets/Characters/Player.gd @@ -23,8 +23,19 @@ extends CharacterBody3D @onready var climb_check_y = climb_check.position.y @onready var ground_check_y = ground_check.position.y +class player_info: + var name: String + var team: int + var color: Color + + func _init(name: String, team: int, color: Color): + self.name = name + self.team = team + self.color = color + var input_active = false +@remotesync var info = player_info.new("unfa", 0, Color("#CE0000")) var base_fov = 90 var view_zoom := 1.0 : set(zoom): @@ -71,7 +82,7 @@ var gravity_vec := Vector3.ZERO func _ready() -> void: #Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) view_zoom = 1.0 - + func aim(event) -> void: var mouse_motion = event as InputEventMouseMotion diff --git a/Game/Assets/MapComponents/SpawnPoint.tscn b/Game/Assets/MapComponents/SpawnPoint.tscn new file mode 100644 index 0000000..1d554fc --- /dev/null +++ b/Game/Assets/MapComponents/SpawnPoint.tscn @@ -0,0 +1,4 @@ +[gd_scene format=2] + +[node name="SpawnPoint" type="Position3D"] +script = null diff --git a/Game/Level.tscn b/Game/Level.tscn index d89dfbe..2f96a88 100644 --- a/Game/Level.tscn +++ b/Game/Level.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=9 format=2] +[ext_resource path="res://Assets/MapComponents/SpawnPoint.tscn" type="PackedScene" id=1] [ext_resource path="res://Assets/Maps/DM1/DM1.glb" type="PackedScene" id=6] -[ext_resource path="res://Assets/Characters/Player.tscn" type="PackedScene" id=7] [ext_resource path="res://Assets/Props/BeerCan.tscn" type="PackedScene" id=8] [sub_resource type="PhysicalSkyMaterial" id=1] @@ -12,12 +12,11 @@ sky_material = SubResource( 1 ) [sub_resource type="Environment" id=3] background_mode = 2 sky = SubResource( 2 ) +ambient_light_sky_contribution = 0.1 tonemap_mode = 2 tonemap_white = 2.0 -ssao_enabled = true ssao_radius = 8.0 ssao_intensity = 1.0 -sdfgi_enabled = true sdfgi_read_sky_light = true sdfgi_cascades = 2 sdfgi_max_distance = 3276.8 @@ -39,11 +38,11 @@ volumetric_fog_gi_inject = 0.1 [sub_resource type="ConcavePolygonShape3D" id=5] data = PackedVector3Array( -6, 4, -10, -13, 4, -6, -9, 4, -13, -6, 4, -10, -10, 4, -6, -13, 4, -6, 6, 0, 3, 10, 0, 6, 6, 0, 10, 6, 0, 3, 10, 0, 3, 10, 0, 6, 10, 4, -6, 9, 4, -13, 13, 4, -6, 10, 4, -6, 6, 4, -10, 9, 4, -13, -10, 4, 6, -9, 4, 13, -13, 4, 6, -10, 4, 6, -6, 4, 10, -9, 4, 13, 6, 4, 10, 13, 4, 6, 9, 4, 13, 6, 4, 10, 10, 4, 6, 13, 4, 6, -10, 2, 3, -13, 4, 6, -13, 2, 3, -10, 2, 3, -10, 4, 6, -13, 4, 6, -2, 8, -10, -9, 4, -13, -2, 8, -13, -2, 8, -10, -6, 5.7, -10, -9, 4, -13, 2, 8, 10, 9, 8, 13, 2, 8, 13, 2, 8, 10, 6, 8, 10, 9, 8, 13, 2, 0, -3, 6, 0, -10, 6, 0, -3, 2, 0, -3, 2, 0, -10, 6, 0, -10, -10, 0, -3, -6, 0, -10, -6, 0, -3, -10, 0, -3, -10, 0, -6, -6, 0, -10, -6, 0, -3, -2, 0, -10, -2, 0, -3, -6, 0, -3, -6, 0, -10, -2, 0, -10, -2, 0, -3, 2, 0, -10, 2, 0, -3, -2, 0, -3, -2, 0, -10, 2, 0, -10, -6, 5.714, 10, -2, 8, 13, -9, 4, 13, -6, 5.714, 10, -2, 8, 10, -2, 8, 13, 0, 8, 10, 2, 8, 13, 0, 8, 13, 0, 8, 10, 2, 8, 10, 2, 8, 13, -2, 7, 9, 2, 6, 10, 2, 7, 9, -2, 7, 9, -2, 6, 10, 2, 6, 10, -2, 0, 10, 2, 0, 3, 2, 0, 10, -2, 0, 10, -2, 0, 3, 2, 0, 3, -2, 0, 3, 2, 0, -3, 2, 0, 3, -2, 0, 3, -2, 0, -3, 2, 0, -3, -6, 0, 10, -2, 0, 3, -2, 0, 10, -6, 0, 10, -6, 0, 3, -2, 0, 3, -6, 0, 3, -2, 0, -3, -2, 0, 3, -6, 0, 3, -6, 0, -3, -2, 0, -3, -10, 0, 6, -6, 0, 3, -6, 0, 10, -10, 0, 6, -10, 0, 3, -6, 0, 3, 2, 0, 10, 6, 0, 3, 6, 0, 10, 2, 0, 10, 2, 0, 3, 6, 0, 3, 2, 0, 3, 6, 0, -3, 6, 0, 3, 2, 0, 3, 2, 0, -3, 6, 0, -3, -10, 4, -6, -13, 2, -3, -13, 4, -6, -10, 4, -6, -10, 2, -3, -13, 2, -3, -10, 2, -3, -13, 2, 3, -13, 2, -3, -10, 2, -3, -10, 2, 3, -13, 2, 3, 10, 3, 2, 18, 3, -2, 10, 3, -2, 10, 3, 2, 18, 3, 2, 18, 3, -2, 6, 0, -10, 10, 0, -3, 6, 0, -3, 6, 0, -10, 10, 0, -6, 10, 0, -3, 6, 0, -3, 10, 0, 3, 6, 0, 3, 6, 0, -3, 10, 0, -3, 10, 0, 3, 10, 0, -3, 18, 0, 3, 10, 0, 3, 10, 0, -3, 18, 0, -3, 18, 0, 3, -10, 2, 3, -6, 0, -3, -6, 0, 3, -10, 2, 3, -10, 2, -3, -6, 0, -3, 18, 0, -3, 22, 0, 3, 18, 0, 3, 18, 0, -3, 22, 0, -3, 22, 0, 3, 22, 0, -3, 28, 2, 3, 22, 0, 3, 22, 0, -3, 28, 2, -3, 28, 2, 3, 28, 2, 3, 22, 0, 6, 22, 0, 3, 28, 2, 3, 28, 2, 6, 22, 0, 6, 22, 0, 3, 18, 0, 6, 18, 0, 3, 22, 0, 3, 22, 0, 6, 18, 0, 6, 22, 0, -3, 28, 2, -6, 28, 2, -3, 22, 0, -3, 22, 0, -6, 28, 2, -6, 18, 0, -3, 22, 0, -6, 22, 0, -3, 18, 0, -3, 18, 0, -6, 22, 0, -6, 18, 4, 6, 9, 4, 13, 13, 4, 6, 18, 4, 6, 18, 4, 13, 9, 4, 13, 13, 4, -6, 18, 4, -13, 18, 4, -6, 13, 4, -6, 9, 4, -13, 18, 4, -13, 28, 2, -6, 33, 2, -3, 28, 2, -3, 28, 2, -6, 33, 2, -6, 33, 2, -3, 28, 2, 3, 33, 2, 6, 28, 2, 6, 28, 2, 3, 33, 2, 3, 33, 2, 6, 28, 2, -3, 33, 2, 3, 28, 2, 3, 28, 2, -3, 33, 2, -3, 33, 2, 3, 22, 4, 6, 18, 4, 13, 18, 4, 6, 22, 4, 6, 22, 4, 13, 18, 4, 13, 28, 2, 6, 22, 4, 13, 22, 4, 6, 28, 2, 6, 28, 2, 13, 22, 4, 13, 18, 4, -6, 22, 4, -13, 22, 4, -6, 18, 4, -6, 18, 4, -13, 22, 4, -13, 22, 4, -6, 28, 2, -13, 28, 2, -6, 22, 4, -6, 22, 4, -13, 28, 2, -13, 28, 2, 6, 33, 2, 13, 28, 2, 13, 28, 2, 6, 33, 2, 6, 33, 2, 13, 28, 2, -13, 33, 2, -6, 28, 2, -6, 28, 2, -13, 33, 2, -13, 33, 2, -6, -2, 8, 18, -9, 4, 13, -2, 8, 13, -2, 8, 18, -9, 4, 18, -9, 4, 13, -2, 8, -15.5, -9, 4, -18, -2, 8, -18, -2, 8, -15.5, -9, 4, -15.5, -9, 4, -18, 6, 8, 18, 2, 8, 13, 9, 8, 13, 6, 8, 18, 2, 8, 18, 2, 8, 13, 0, 8, 18, -2, 8, 13, 0, 8, 13, 0, 8, 18, -2, 8, 18, -2, 8, 13, -9, 4, 13, -19, 4, 6, -13, 4, 6, -9, 4, 13, -15, 4, 13, -19, 4, 6, -13, 2, 3, -19, 2, -3, -13, 2, -3, -13, 2, 3, -19, 2, 3, -19, 2, -3, -13, 4, 6, -19, 2, 3, -13, 2, 3, -13, 4, 6, -19, 4, 6, -19, 2, 3, -13, 4, -6, -15, 4, -13, -9, 4, -13, -13, 4, -6, -19, 4, -6, -15, 4, -13, -13, 2, -3, -19, 4, -6, -13, 4, -6, -13, 2, -3, -19, 2, -3, -19, 4, -6, -12, 4, 18, -9, 4, 13, -9, 4, 18, -9, 4, 13, -12.45, 4, 17.25, -15, 4, 13, -9, 4, 13, -12, 4, 18, -12.45, 4, 17.25, 0, 13.5, 18, 2, 11.5, 21, 2, 13.5, 18, 0, 13.5, 18, 0, 11.5, 21, 2, 11.5, 21, -2, 13.5, 18, 0, 11.5, 21, 0, 13.5, 18, -13.5, 4, -15.5, -9, 4, -18, -9, 4, -15.5, -9, 4, -18, -12.45, 4, -17.25, -12, 4, -18, -9, 4, -18, -13.5, 4, -15.5, -12.45, 4, -17.25, 2, 8, -22, 6, 11.5, -22, 6, 8, -22, 2, 8, -22, 2, 11.5, -22, 6, 11.5, -22, 2, 8, 18, 0, 8, 21, 0, 8, 18, 2, 8, 18, 2, 8, 21, 0, 8, 21, 6, 11.5, -18, 2, 11.5, -22, 2, 11.5, -18, 6, 11.5, -18, 6, 11.5, -22, 2, 11.5, -22, 18, 7.5, -22, 15, 11.5, -18, 18, 7.5, -18, 18, 7.5, -22, 15, 11.5, -22, 15, 11.5, -18, 6, 8, 18, 2, 8, 21, 2, 8, 18, 6, 8, 18, 4, 8, 21, 2, 8, 21, 2, 13.5, 18, 4, 11.5, 21, 6, 13.5, 18, 2, 13.5, 18, 2, 11.5, 21, 4, 11.5, 21, 0, 8, 18, 0, 8, 21, -2, 8, 18, 18, 7.5, -18, 22, 7.5, -22, 18, 7.5, -22, 18, 7.5, -18, 22, 7.5, -18, 22, 7.5, -22, 8, 8, -22, 6, 8, -22, 6, 11.5, -22, 18, 7.5, -22, 8, 8, -22, 6, 11.5, -22, 18, 7.5, -22, 16, 4, -22, 8, 8, -22, 22, 4, -18, 22, 7.5, -22, 22, 7.5, -18, 22, 4, -18, 22, 4, -22, 22, 7.5, -22, 18, 7.5, -22, 22, 4, -22, 18, 4, -22, 18, 7.5, -22, 22, 7.5, -22, 22, 4, -22, 22, 7.5, -18, 22, 4, -13, 22, 4, -18, 22, 7.5, -18, 22, 7.5, -13, 22, 4, -13, 18, 4, -18, 18, 7.5, -13, 18, 7.5, -18, 18, 4, -18, 18, 4, -13, 18, 7.5, -13, 18, 7.5, -18, 22, 7.5, -13, 22, 7.5, -18, 18, 7.5, -18, 18, 7.5, -13, 22, 7.5, -13, 6, 11.5, -18, 15, 11.5, -22, 6, 11.5, -22, 6, 11.5, -18, 15, 11.5, -18, 15, 11.5, -22, 15, 11.5, -22, 18, 7.5, -22, 6, 11.5, -22, 15, 11.5, -18, 6, 11.5, -18, 18, 7.5, -18, 16, 4, -22, 18, 7.5, -22, 18, 4, -22, 18, 7.5, -18, 8, 8, -18, 16, 4, -18, 18, 7.5, -18, 6, 11.5, -18, 8, 8, -18, 18, 7.5, -18, 16, 4, -18, 18, 4, -18, 8, 8, -18, 6, 11.5, -18, 6, 8, -18, -9, 4, -13, -13.5, 4, -15.5, -9, 4, -15.5, -9, 4, -13, -15, 4, -13, -13.5, 4, -15.5, -2, 8, -13, -9, 4, -15.5, -2, 8, -15.5, -2, 8, -13, -9, 4, -13, -9, 4, -15.5, 2, 8, 18, 0, 8, 13, 2, 8, 13, 2, 8, 18, 0, 8, 18, 0, 8, 13, -2, 8, 10, 0, 8, 13, -2, 8, 13, -2, 8, 10, 0, 8, 10, 0, 8, 13, 2, 11.5, -22, 0, 11.5, -18, 2, 11.5, -18, 0, 8, -18, 2, 11.5, -22, 2, 8, -22, 0, 8, -18, 0, 11.5, -18, 2, 11.5, -22, 7, 7, 11, 11, 7, 13, 11, 7, 11, 7, 7, 11, 9, 7, 13, 11, 7, 13, 11, 8, 11, 9, 8, 13, 7, 8, 11, 11, 8, 11, 11, 8, 13, 9, 8, 13, 11, 7, 13, 18, 4.424, 11, 11, 7, 11, 11, 7, 13, 18, 4.424, 13, 18, 4.424, 11, 11, 8, 11, 22, 4, 13, 11, 8, 13, 11, 8, 11, 22, 4, 11, 22, 4, 13, 10, 2, -3, 18, 3, -2, 18, 2, -3, 10, 2, -3, 10, 3, -2, 18, 3, -2, 10, 3, 2, 18, 2, 3, 18, 3, 2, 10, 3, 2, 10, 2, 3, 18, 2, 3, -2, 6, -10, 2, 7, -9, 2, 6, -10, -2, 6, -10, -2, 7, -9, 2, 7, -9, -2, 7, -9, 2, 7, 9, 2, 7, -9, -2, 7, -9, -2, 7, 9, 2, 7, 9, -19, 21, 6, -14.1675, 25, 3, -19, 21, 3, -19, 21, 6, -14.1675, 25, 4.7167, -14.1675, 25, 3, 28, 21, 13, 22, 25, 8, 22, 21, 13, 28, 21, 13, 28, 25, 8, 22, 25, 8, -19, 21, -3, -14.1675, 25, -4.7167, -19, 21, -6, -19, 21, -3, -14.1675, 25, -3, -14.1675, 25, -4.7167, 22, 21, 13, 18, 25, 8, 18, 21, 13, 22, 21, 13, 22, 25, 8, 18, 25, 8, 18, 21, 13, 6.5365, 25, 8, 9, 21, 13, 18, 21, 13, 18, 25, 8, 6.5365, 25, 8, -19, 21, 3, -14.1675, 25, -3, -19, 21, -3, -19, 21, 3, -14.1675, 25, 3, -14.1675, 25, -3, -19, 21, -6, -10.6854, 25, -10.4733, -15, 21, -13, -19, 21, -6, -14.1675, 25, -4.7167, -10.6854, 25, -10.4733, 33, 21, -6.48, 28, 25, 6, 33, 21, 6.48, 33, 21, -6.48, 28, 25, -6, 28, 25, 6, -2, 21, -18, 0, 25, -13, 0, 21, -18, -2, 21, -18, -2, 25, -13, 0, 25, -13, -15, 21, 13, -14.1675, 25, 4.7167, -19, 21, 6, -15, 21, 13, -10.6854, 25, 10.4733, -14.1675, 25, 4.7167, 22, 21, -13, 28, 25, -8, 28, 21, -13, 22, 21, -13, 22, 25, -8, 28, 25, -8, 6, 21, 18, 2, 25, 13, 2, 21, 18, -12, 21, -18, -9.2125, 25, -12.9275, -9, 21, -18, 18, 21, -13, 22, 25, -8, 22, 21, -13, 18, 21, -13, 18, 25, -8, 22, 25, -8, -9, 21, 18, -9, 25, 13, -12, 21, 18, 9, 21, -13, 18, 25, -8, 18, 21, -13, 9, 21, -13, 7.2979, 25, -8, 18, 25, -8, 0, 21, -18, 2, 25, -13, 2, 21, -18, 0, 21, -18, 0, 25, -13, 2, 25, -13, -9, 21, -18, -2, 25, -13, -2, 21, -18, -9, 21, -18, -9.2125, 25, -12.9275, -2, 25, -13, -15, 21, -13, -9.2125, 25, -12.9275, -13.5, 21, -15.5, -15, 21, -13, -10.6854, 25, -10.4733, -9.2125, 25, -12.9275, 33, 21, 6.48, 28, 25, 8, 33, 21, 13, 33, 21, 6.48, 28, 25, 6, 28, 25, 8, -9, 25, 13, -12.45, 21, 17.25, -12, 21, 18, -12.45, 21, 17.25, -10.6854, 25, 10.4733, -15, 21, 13, -12.45, 21, 17.25, -9, 25, 13, -10.6854, 25, 10.4733, 33, 21, -13, 28, 25, -6, 33, 21, -6.48, 33, 21, -13, 28, 25, -8, 28, 25, -6, -2, 21, 18, -9, 25, 13, -9, 21, 18, -2, 21, 18, -2, 25, 13, -9, 25, 13, 0, 21, 18, -2, 25, 13, -2, 21, 18, 0, 21, 18, 0, 25, 13, -2, 25, 13, -13.5, 21, -15.5, -9.2125, 25, -12.9275, -12.45, 21, -17.25, -12.45, 21, -17.25, -9.2125, 25, -12.9275, -12, 21, -18, 6, 21, -15.5, 7.2979, 25, -8, 9, 21, -13, 6, 21, -15.5, 2, 25, -13, 7.2979, 25, -8, 28, 21, -13, 28, 25, -8, 33, 21, -13, 2, 21, 18, 0, 25, 13, 0, 21, 18, 2, 21, 18, 2, 25, 13, 0, 25, 13, 9, 21, 13, 2, 25, 13, 6, 21, 18, 9, 21, 13, 6.5365, 25, 8, 2, 25, 13, 33, 21, 13, 28, 25, 8, 28, 21, 13, 2, 21, -18, 2, 25, -13, 6, 21, -18, 6, 21, -18, 2, 25, -13, 6, 21, -15.5, -19, 14, -1, -16, 15, -2, -19, 15, -2, -19, 14, -1, -17, 14, -1, -16, 15, -2, -17, 14, -1, -16, 15, 2, -16, 15, -2, -17, 14, -1, -17, 14, 1, -16, 15, 2, -17, 14, 1, -19, 15, 2, -16, 15, 2, -17, 14, 1, -19, 14, 1, -19, 15, 2, -19, 14, -1, -17, 14, 1, -17, 14, -1, -19, 14, -1, -19, 14, 1, -17, 14, 1, 9, 13.5, -16, 18, 21, -16, 18, 13.5, -16, 9, 13.5, -16, 9, 21, -16, 18, 21, -16, 33, 13.5, 16, 28, 21, 16, 28, 13.5, 16, 33, 13.5, 16, 33, 21, 16, 28, 21, 16, 22, 13.5, 16, 18, 21, 16, 18, 13.5, 16, 22, 13.5, 16, 22, 21, 16, 18, 21, 16, 28, 13.5, -16, 33, 21, -16, 33, 13.5, -16, 28, 13.5, -16, 28, 21, -16, 33, 21, -16, 22, 13.5, -16, 28, 21, -16, 28, 13.5, -16, 22, 13.5, -16, 22, 21, -16, 28, 21, -16, 18, 13.5, -16, 22, 21, -16, 22, 13.5, -16, 18, 13.5, -16, 18, 21, -16, 22, 21, -16, 18, 13.5, 16, 9, 21, 16, 9, 13.5, 16, 18, 13.5, 16, 18, 21, 16, 9, 21, 16, 28, 13.5, 16, 22, 21, 16, 22, 13.5, 16, 28, 13.5, 16, 28, 21, 16, 22, 21, 16, 28, 21, 13, 33, 21, 16, 33, 21, 13, 28, 21, 13, 28, 21, 16, 33, 21, 16, 28, 13.5, -13, 33, 13.5, -16, 33, 13.5, -13, 28, 13.5, -13, 28, 13.5, -16, 33, 13.5, -16, 22, 21, 13, 28, 21, 16, 28, 21, 13, 22, 21, 13, 22, 21, 16, 28, 21, 16, 22, 13.5, 13, 18, 13.5, 16, 18, 13.5, 13, 22, 13.5, 13, 22, 13.5, 16, 18, 13.5, 16, 18, 21, 13, 22, 21, 16, 22, 21, 13, 18, 21, 13, 18, 21, 16, 22, 21, 16, 33, 13.5, 13, 28, 13.5, 16, 28, 13.5, 13, 33, 13.5, 13, 33, 13.5, 16, 28, 13.5, 16, 9, 21, 13, 18, 21, 16, 18, 21, 13, 9, 21, 13, 9, 21, 16, 18, 21, 16, 9, 21, -13, 9, 13.5, -16, 9, 13.5, -13, 9, 21, -13, 9, 21, -16, 9, 13.5, -16, 9, 13.5, -13, 18, 13.5, -16, 18, 13.5, -13, 9, 13.5, -13, 9, 13.5, -16, 18, 13.5, -16, 28, 21, -13, 22, 21, -16, 22, 21, -13, 28, 21, -13, 28, 21, -16, 22, 21, -16, 28, 13.5, 13, 22, 13.5, 16, 22, 13.5, 13, 28, 13.5, 13, 28, 13.5, 16, 22, 13.5, 16, 9, 13.5, 13, 9, 21, 16, 9, 21, 13, 9, 13.5, 13, 9, 13.5, 16, 9, 21, 16, 22, 21, -13, 18, 21, -16, 18, 21, -13, 22, 21, -13, 22, 21, -16, 18, 21, -16, 18, 13.5, 13, 9, 13.5, 16, 9, 13.5, 13, 18, 13.5, 13, 18, 13.5, 16, 9, 13.5, 16, 33, 13.5, -13, 33, 21, -16, 33, 21, -13, 33, 13.5, -13, 33, 13.5, -16, 33, 21, -16, 18, 21, -13, 9, 21, -16, 9, 21, -13, 18, 21, -13, 18, 21, -16, 9, 21, -16, 18, 13.5, -13, 22, 13.5, -16, 22, 13.5, -13, 18, 13.5, -13, 18, 13.5, -16, 22, 13.5, -16, 33, 21, 13, 33, 13.5, 16, 33, 13.5, 13, 33, 21, 13, 33, 21, 16, 33, 13.5, 16, 33, 21, -13, 28, 21, -16, 28, 21, -13, 33, 21, -13, 33, 21, -16, 28, 21, -16, 22, 13.5, -13, 28, 13.5, -16, 28, 13.5, -13, 22, 13.5, -13, 22, 13.5, -16, 28, 13.5, -16, -28.9827, -7.4685, 31.0822, -28.9827, 25, -31.0822, -28.9827, 25, 31.0822, -28.9827, -7.4685, 31.0822, -28.9827, -7.4685, -31.0822, -28.9827, 25, -31.0822, -28.9827, -7.4685, -31.0822, 44.9827, 25, -31.0822, -28.9827, 25, -31.0822, -28.9827, -7.4685, -31.0822, 44.9827, -7.4685, -31.0822, 44.9827, 25, -31.0822, 44.9827, -7.4685, -31.0822, 44.9827, 25, 31.0822, 44.9827, 25, -31.0822, 44.9827, -7.4685, -31.0822, 44.9827, -7.4685, 31.0822, 44.9827, 25, 31.0822, 44.9827, -7.4685, 31.0822, -28.9827, 25, 31.0822, 44.9827, 25, 31.0822, 44.9827, -7.4685, 31.0822, -28.9827, -7.4685, 31.0822, -28.9827, 25, 31.0822, -28.9827, -7.4685, -31.0822, 44.9827, -7.4685, 31.0822, 44.9827, -7.4685, -31.0822, -28.9827, -7.4685, -31.0822, -28.9827, -7.4685, 31.0822, 44.9827, -7.4685, 31.0822, 44.9827, 25, 31.0822, 28, 25, 8, 28, 25, 6, 44.9827, 25, 31.0822, 28, 25, -8, 44.9827, 25, -31.0822, 28, 25, -6, 28, 25, -8, 44.9827, 25, 31.0822, 44.9827, 25, -31.0822, 28, 25, -8, 22, 25, -8, 44.9827, 25, -31.0822, 22, 25, -8, 18, 25, -8, 44.9827, 25, -31.0822, 18, 25, -8, 7.2979, 25, -8, 44.9827, 25, -31.0822, 7.2979, 25, -8, 2, 25, -13, -28.9827, 25, -31.0822, 44.9827, 25, -31.0822, 2, 25, -13, -28.9827, 25, -31.0822, 0, 25, -13, -2, 25, -13, -28.9827, 25, -31.0822, -2, 25, -13, -9.2125, 25, -12.9275, -28.9827, 25, -31.0822, -9.2125, 25, -12.9275, -10.6854, 25, -10.4733, -28.9827, 25, -31.0822, -10.6854, 25, -10.4733, -14.1675, 25, -4.7167, -28.9827, 25, -31.0822, -14.1675, 25, -4.7167, -14.1675, 25, -3, -28.9827, 25, -31.0822, -14.1675, 25, -3, -14.1675, 25, 3, -28.9827, 25, 31.0822, -14.1675, 25, 3, -14.1675, 25, 4.7167, -28.9827, 25, 31.0822, -14.1675, 25, 4.7167, -10.6854, 25, 10.4733, -28.9827, 25, 31.0822, -10.6854, 25, 10.4733, -9, 25, 13, -28.9827, 25, 31.0822, -9, 25, 13, -2, 25, 13, -28.9827, 25, 31.0822, -2, 25, 13, 0, 25, 13, -28.9827, 25, 31.0822, 0, 25, 13, 2, 25, 13, 44.9827, 25, 31.0822, 2, 25, 13, 6.5365, 25, 8, 44.9827, 25, 31.0822, 6.5365, 25, 8, 18, 25, 8, 44.9827, 25, 31.0822, 18, 25, 8, 22, 25, 8, 44.9827, 25, 31.0822, 22, 25, 8, 28, 25, 8, 28, 25, 6, 28, 25, -6, 44.9827, 25, 31.0822, -28.9827, 25, -31.0822, 2, 25, -13, 0, 25, -13, -28.9827, 25, -31.0822, -14.1675, 25, 3, -28.9827, 25, 31.0822, -28.9827, 25, 31.0822, 2, 25, 13, 44.9827, 25, 31.0822, -2, 5, -10, -6, 4, -10, -2, 6, -10, -2, 5, -10, -6, 3, -10, -6, 4, -10, 10, 0, -6, 10, 2, -3, 10, 0, -3, 10, 2, -3, 10, 3, -6, 10, 3, -4, 10, 2, -3, 10, 0, -6, 10, 3, -6, 2, 5, 10, 6, 4, 10, 2, 6, 10, 2, 5, 10, 6, 3, 10, 6, 4, 10, -10, 2, 3, -10, 3, 6, -10, 4, 6, -6, 3, -10, -10, 4, -6, -6, 4, -10, -6, 3, -10, -10, 3, -6, -10, 4, -6, 10, 3, -6, 6, 4, -10, 10, 4, -6, 10, 3, -6, 6, 3, -10, 6, 4, -10, 6, 3, 10, 10, 4, 6, 6, 4, 10, 6, 3, 10, 10, 3, 6, 10, 4, 6, -10, 3, 6, -6, 4, 10, -10, 4, 6, -10, 3, 6, -6, 3, 10, -6, 4, 10, 6, 4, -10, 9, 8, -13, 9, 4, -13, 6, 4, -10, 6, 8, -10, 9, 8, -13, -6, 4, 10, -6, 5.714, 10, -9, 4, 13, 9, 4, 13, 6, 8, 10, 6, 4, 10, 9, 4, 13, 9, 8, 13, 6, 8, 10, 2, 6, -10, 6, 8, -10, 6, 4, -10, 2, 6, -10, 2, 8, -10, 6, 8, -10, -2, 6, 10, -6, 5.714, 10, -6, 4, 10, -2, 6, 10, -2, 8, 10, -6, 5.714, 10, -9, 4, -13, -6, 5.7, -10, -6, 4, -10, 9, 8, -13, 18, 4, -13, 9, 4, -13, 9, 8, -13, 18, 7.5, -13, 18, 4, -13, 28, 2, 13, 33, 8, 13, 28, 8, 13, 28, 2, 13, 33, 2, 13, 33, 8, 13, 22, 4, 13, 28, 8, 13, 22, 8, 13, 22, 4, 13, 28, 2, 13, 28, 8, 13, 6, 4, 10, 2, 8, 10, 2, 6, 10, 6, 4, 10, 6, 8, 10, 2, 8, 10, 18, 4, 13, 22, 8, 13, 18, 8, 13, 18, 4, 13, 22, 4, 13, 22, 8, 13, 9, 4, 13, 18, 8, 13, 9, 8, 13, 9, 4, 13, 18, 4, 13, 18, 8, 13, -6, 4, -10, -2, 8, -10, -2, 6, -10, -6, 4, -10, -6, 5.7, -10, -2, 8, -10, 2, 7, 9, 2, 8, 10, 2, 8, 9, 2, 7, 9, 2, 6, 10, 2, 8, 10, -6, 3, 10, -2, 6, 10, -6, 4, 10, -6, 3, 10, -2, 5, 10, -2, 6, 10, -2, 5, 10, 2, 6, 10, -2, 6, 10, -2, 5, 10, 2, 5, 10, 2, 6, 10, 6, 3, -10, 2, 6, -10, 6, 4, -10, 6, 3, -10, 2, 5, -10, 2, 6, -10, 2, 5, -10, -2, 6, -10, 2, 6, -10, 2, 5, -10, -2, 5, -10, -2, 6, -10, -2, 8, 9, -2, 6, 10, -2, 7, 9, -2, 8, 9, -2, 8, 10, -2, 6, 10, -10, 2, -3, -10, 0, -3, -6, 0, -3, -10, 3, -6, -10, 2, -3, -10, 4, -6, 10, 2, -3, 18, 0, -3, 10, 0, -3, 10, 2, -3, 18, 2, -3, 18, 0, -3, 10, 3, 2, 10, 4, -3, 10, 4, 3, 10, 3, 2, 10, 3, -2, 10, 4, -3, -10, 0, -6, -10, 2, -3, -10, 3, -6, -10, 0, -6, -10, 0, -3, -10, 2, -3, 2, 0, -10, -2, 5, -10, 2, 5, -10, 2, 0, -10, -2, 0, -10, -2, 5, -10, 6, 0, -10, 2, 5, -10, 6, 3, -10, 6, 0, -10, 2, 0, -10, 2, 5, -10, -2, 0, 10, 2, 5, 10, -2, 5, 10, -2, 0, 10, 2, 0, 10, 2, 5, 10, -6, 0, 10, -2, 5, 10, -6, 3, 10, -6, 0, 10, -2, 0, 10, -2, 5, 10, -10, 0, 6, -6, 3, 10, -10, 3, 6, -10, 0, 6, -6, 0, 10, -6, 3, 10, 6, 0, 10, 10, 3, 6, 6, 3, 10, 6, 0, 10, 10, 0, 6, 10, 3, 6, 10, 0, -6, 6, 3, -10, 10, 3, -6, 10, 0, -6, 6, 0, -10, 6, 3, -10, -6, 0, -10, -10, 3, -6, -6, 3, -10, -6, 0, -10, -10, 0, -6, -10, 3, -6, -10, 0, 3, -10, 3, 6, -10, 2, 3, -10, 0, 3, -10, 0, 6, -10, 3, 6, 2, 0, 10, 6, 3, 10, 2, 5, 10, 2, 0, 10, 6, 0, 10, 6, 3, 10, 18, 4, -6, 18, 3, -4, 18, 4, -3, 18, 4, -6, 18, 3, -6, 18, 3, -4, -2, 0, -10, -6, 3, -10, -2, 5, -10, -2, 0, -10, -6, 0, -10, -6, 3, -10, 18, 0, -6, 18, 3, -4, 18, 3, -6, 18, 3, -4, 18, 0, -3, 18, 2, -3, 18, 3, -4, 18, 0, -6, 18, 0, -3, 10, 0, 3, 10, 3, 6, 10, 0, 6, 10, 3, 6, 10, 2, 3, 10, 3, 4, 10, 3, 6, 10, 0, 3, 10, 2, 3, 10, 3, 6, 10, 4, 3, 10, 4, 6, 10, 3, 6, 10, 3, 4, 10, 4, 3, 10, 3, -4, 10, 4, -6, 10, 4, -3, 10, 3, -4, 10, 3, -6, 10, 4, -6, 18, 3, -2, 18, 4, 3, 18, 4, -3, 18, 3, -2, 18, 3, 2, 18, 4, 3, 18, 4, 3, 18, 3, 6, 18, 4, 6, 18, 4, 3, 18, 3, 4, 18, 3, 6, 18, 0, 3, 18, 3, 4, 18, 2, 3, 18, 3, 4, 18, 0, 6, 18, 3, 6, 18, 3, 4, 18, 0, 3, 18, 0, 6, 18, 3, 6, 22, 4, 6, 18, 4, 6, 18, 3, 6, 22, 3, 6, 22, 4, 6, 18, 4, -6, 22, 3, -6, 18, 3, -6, 18, 4, -6, 22, 4, -6, 22, 3, -6, 22, 3, 6, 28, 2, 6, 22, 4, 6, 22, 3, 6, 22, 0, 6, 28, 2, 6, 22, 4, -6, 22, 0, -6, 22, 3, -6, 22, 4, -6, 28, 2, -6, 22, 0, -6, 18, 0, 6, 22, 3, 6, 18, 3, 6, 18, 0, 6, 22, 0, 6, 22, 3, 6, 22, 0, -6, 18, 3, -6, 22, 3, -6, 22, 0, -6, 18, 0, -6, 18, 3, -6, 22, 7.5, -13, 28, 2, -13, 22, 4, -13, 22, 7.5, -13, 28, 8, -13, 28, 2, -13, 28, 8, -13, 33, 2, -13, 28, 2, -13, 28, 8, -13, 33, 8, -13, 33, 2, -13, 33, 2, -6, 33, 8, -6.48, 33, 2, -3, 33, 2, 6, 33, 8, 13, 33, 2, 13, 33, 2, 6, 33, 8, 6.48, 33, 8, 13, 33, 2, -3, 33, 8, 6.48, 33, 2, 3, 33, 2, -3, 33, 8, -6.48, 33, 8, 6.48, 33, 2, -13, 33, 8, -6.48, 33, 2, -6, 33, 2, -13, 33, 8, -13, 33, 8, -6.48, 33, 2, 3, 33, 8, 6.48, 33, 2, 6, 33, 13.5, -13, 33, 21, -6.48, 33, 8, -6.48, 33, 13.5, -13, 33, 21, -13, 33, 21, -6.48, 33, 13.5, 13, 31.5, 21, 13, 31.5, 13.5, 13, 33, 13.5, 13, 33, 21, 13, 31.5, 21, 13, 33, 8, 6.48, 33, 21, 13, 33, 13.5, 13, 33, 8, 6.48, 33, 21, 6.48, 33, 21, 13, 9, 13.5, 13, 6, 8, 18, 9, 8, 13, 9, 13.5, 13, 6, 13.5, 18, 6, 8, 18, 6, 12.5, -15.5, 6, 21, -18, 6, 21, -15.5, 6, 12.5, -15.5, 6, 11.5, -18, 6, 21, -18, 0, 11.5, -18, 2, 21, -18, 2, 11.5, -18, 0, 11.5, -18, 0, 21, -18, 2, 21, -18, -9, 11.5, 18, -12, 21, 18, -12, 11.5, 18, -9, 11.5, 18, -9, 21, 18, -12, 21, 18, 0, 13.5, 18, -2, 21, 18, -2, 13.5, 18, 0, 13.5, 18, 0, 21, 18, -2, 21, 18, -12.45, 11.5, -17.25, -12, 21, -18, -12, 11.5, -18, -12.45, 11.5, -17.25, -12.45, 21, -17.25, -12, 21, -18, -2, 13.5, 18, -9, 21, 18, -9, 11.5, 18, -2, 13.5, 18, -2, 21, 18, -9, 21, 18, -9, 11.5, -18, -2, 21, -18, -2, 11.5, -18, -9, 11.5, -18, -9, 21, -18, -2, 21, -18, 6, 13.5, 18, 2, 21, 18, 2, 13.5, 18, 6, 13.5, 18, 6, 21, 18, 2, 21, 18, 2, 11.5, -18, 6, 21, -18, 6, 11.5, -18, 2, 11.5, -18, 2, 21, -18, 6, 21, -18, -12, 11.5, -18, -9, 21, -18, -9, 11.5, -18, -12, 11.5, -18, -12, 21, -18, -9, 21, -18, -12, 4, -18, -9, 11.5, -18, -9, 4, -18, -12, 4, -18, -12, 11.5, -18, -9, 11.5, -18, 6, 13.5, 18, 4, 8, 21, 6, 8, 18, 6, 13.5, 18, 4, 11.5, 21, 4, 8, 21, -9, 4, -18, -2, 11.5, -18, -2, 8, -18, -9, 4, -18, -9, 11.5, -18, -2, 11.5, -18, -2, 8, 18, -9, 11.5, 18, -9, 4, 18, -2, 8, 18, -2, 13.5, 18, -9, 11.5, 18, -12.45, 4, -17.25, -12, 11.5, -18, -12, 4, -18, -12.45, 4, -17.25, -12.45, 11.5, -17.25, -12, 11.5, -18, -9, 4, 18, -12, 11.5, 18, -12, 4, 18, -9, 4, 18, -9, 11.5, 18, -12, 11.5, 18, -19, 4, 6, -19, 4, 3, -19, 2, 3, 9, 21, 13, 6, 13.5, 18, 9, 13.5, 13, 9, 21, 13, 6, 21, 18, 6, 13.5, 18, 28, 8, 13, 22, 13.5, 13, 22, 8, 13, 28, 8, 13, 28, 13.5, 13, 22, 13.5, 13, 33, 8, 6.48, 33, 13.5, 13, 33, 8, 13, 18, 8, 13, 9, 13.5, 13, 9, 8, 13, 18, 8, 13, 18, 13.5, 13, 9, 13.5, 13, 18, 7.5, -13, 22, 13.5, -13, 22, 7.5, -13, 18, 7.5, -13, 18, 13.5, -13, 22, 13.5, -13, 22, 7.5, -13, 28, 13.5, -13, 28, 8, -13, 22, 7.5, -13, 22, 13.5, -13, 28, 13.5, -13, 28, 8, -13, 33, 13.5, -13, 33, 8, -13, 28, 8, -13, 28, 13.5, -13, 33, 13.5, -13, 22, 8, 13, 18, 13.5, 13, 18, 8, 13, 22, 8, 13, 22, 13.5, 13, 18, 13.5, 13, 33, 8, 13, 28, 13.5, 13, 28, 8, 13, 33, 8, 13, 33, 13.5, 13, 28, 13.5, 13, 9, 8, -13, 18, 13.5, -13, 18, 7.5, -13, 9, 8, -13, 9, 13.5, -13, 18, 13.5, -13, 33, 8, -13, 33, 13.5, -13, 33, 8, -6.48, 2, 8, 21, 0, 11.5, 21, 0, 8, 21, 2, 8, 21, 2, 11.5, 21, 0, 11.5, 21, 4, 8, 21, 2, 11.5, 21, 2, 8, 21, 4, 8, 21, 4, 11.5, 21, 2, 11.5, 21, -2, 8, 18, 0, 11.5, 21, -2, 13.5, 18, -2, 8, 18, 0, 8, 21, 0, 11.5, 21, -10, 0, 3, -10, 2, 3, -6, 0, 3, 9, 8, -13, 6, 12.5, -15.5, 9, 13.5, -13, 9, 8, -13, 6, 8, -15.5, 6, 12.5, -15.5, 9, 13.5, -13, 6, 21, -15.5, 9, 21, -13, 9, 13.5, -13, 6, 12.5, -15.5, 6, 21, -15.5, 2, 13.5, 18, 0, 21, 18, 0, 13.5, 18, 2, 13.5, 18, 2, 21, 18, 0, 21, 18, 6, 8, -15.5, 6, 11.5, -18, 6, 12.5, -15.5, 6, 8, -15.5, 6, 8, -18, 6, 11.5, -18, -2, 11.5, -18, 0, 21, -18, 0, 11.5, -18, -2, 11.5, -18, -2, 21, -18, 0, 21, -18, 0, 11.5, -18, -2, 8, -18, -2, 11.5, -18, 0, 11.5, -18, 0, 8, -18, -2, 8, -18, 7, 7, 11, 11, 8, 11, 7, 8, 11, 7, 7, 11, 11, 7, 11, 11, 8, 11, 18, 4.424, 13, 18, 3.9697, 11, 18, 4.424, 11, 18, 4.424, 13, 18, 3.9697, 13, 18, 3.9697, 11, 11, 7, 11, 22, 4, 11, 11, 8, 11, 11, 7, 11, 18, 4.424, 11, 22, 4, 11, 18, 4.424, 11, 18, 3.9697, 11, 22, 4, 11, 10, 3, 2, 10, 3, 4, 10, 2, 3, 10, 3, 2, 10, 4, 3, 10, 3, 4, 10, 2, -3, 10, 4, -3, 10, 3, -2, 10, 2, -3, 10, 3, -4, 10, 4, -3, 18, 3, -2, 18, 3, -4, 18, 2, -3, 18, 3, -2, 18, 4, -3, 18, 3, -4, 18, 2, 3, 18, 4, 3, 18, 3, 2, 18, 2, 3, 18, 3, 4, 18, 4, 3, 10, 0, 3, 18, 2, 3, 10, 2, 3, 10, 0, 3, 18, 0, 3, 18, 2, 3, -2, 8, -10, -2, 7, -9, -2, 6, -10, -2, 8, -10, -2, 8, -9, -2, 7, -9, -2, 8, -9, -2, 7, 9, -2, 7, -9, -2, 8, -9, -2, 8, 9, -2, 7, 9, 2, 6, -10, 2, 8, -9, 2, 8, -10, 2, 6, -10, 2, 7, -9, 2, 8, -9, 2, 7, -9, 2, 8, 9, 2, 8, -9, 2, 7, -9, 2, 7, 9, 2, 8, 9, -19, 2, 3, -19, 4, -3, -19, 2, -3, -19, 2, 3, -19, 4, 3, -19, 4, -3, -19, 2, -3, -19, 4, -3, -19, 4, -6, -12, 4, 18, -12.45, 11.5, 17.25, -12.45, 4, 17.25, -12, 4, 18, -12, 11.5, 18, -12.45, 11.5, 17.25, -12, 11.5, 18, -12.45, 21, 17.25, -12.45, 11.5, 17.25, -12, 11.5, 18, -12, 21, 18, -12.45, 21, 17.25, 31.5, 13.5, -13, 33, 21, -13, 33, 13.5, -13, 31.5, 13.5, -13, 31.5, 21, -13, 33, 21, -13, 33, 8, 6.48, 33, 21, -6.48, 33, 21, 6.48, 33, 8, 6.48, 33, 8, -6.48, 33, 21, -6.48, -19, 11.5, 6, -19, 21, 3, -19, 11.5, 3, -19, 11.5, 6, -19, 21, 6, -19, 21, 3, -19, 11.5, -3, -19, 21, -6, -19, 11.5, -6, -19, 11.5, -3, -19, 21, -3, -19, 21, -6, -19, 11.5, 3, -19, 21, -3, -19, 11.5, -3, -19, 11.5, 3, -19, 21, 3, -19, 21, -3, -19, 11.5, -6, -15, 21, -13, -15, 11.5, -13, -19, 11.5, -6, -19, 21, -6, -15, 21, -13, -12.45, 11.5, 17.25, -15, 21, 13, -15, 11.5, 13, -12.45, 11.5, 17.25, -12.45, 21, 17.25, -15, 21, 13, -15, 11.5, 13, -19, 21, 6, -19, 11.5, 6, -15, 11.5, 13, -15, 21, 13, -19, 21, 6, -15, 4, 13, -19, 11.5, 6, -19, 4, 6, -15, 4, 13, -15, 11.5, 13, -19, 11.5, 6, -12.45, 4, 17.25, -15, 11.5, 13, -15, 4, 13, -12.45, 4, 17.25, -12.45, 11.5, 17.25, -15, 11.5, 13, -19, 4, -6, -15, 11.5, -13, -15, 4, -13, -19, 4, -6, -19, 11.5, -6, -15, 11.5, -13, -19, 4, 3, -19, 11.5, -3, -19, 4, -3, -19, 4, 3, -19, 11.5, 3, -19, 11.5, -3, -19, 4, -6, -19, 11.5, -3, -19, 11.5, -6, -19, 4, -6, -19, 4, -3, -19, 11.5, -3, -15, 4, -13, -13.5, 11.5, -15.5, -13.5, 4, -15.5, -15, 4, -13, -15, 11.5, -13, -13.5, 11.5, -15.5, -15, 11.5, -13, -13.5, 21, -15.5, -13.5, 11.5, -15.5, -15, 11.5, -13, -15, 21, -13, -13.5, 21, -15.5, -19, 11.5, 6, -19, 4, 3, -19, 4, 6, -19, 11.5, 6, -19, 11.5, 3, -19, 4, 3, -13.5, 4, -15.5, -12.45, 11.5, -17.25, -12.45, 4, -17.25, -13.5, 4, -15.5, -13.5, 11.5, -15.5, -12.45, 11.5, -17.25, -13.5, 11.5, -15.5, -12.45, 21, -17.25, -12.45, 11.5, -17.25, -13.5, 11.5, -15.5, -13.5, 21, -15.5, -12.45, 21, -17.25, 28, 13.5, -13, 31.5, 21, -13, 31.5, 13.5, -13, 28, 13.5, -13, 28, 21, -13, 31.5, 21, -13, 9, 13.5, -13, 18, 21, -13, 18, 13.5, -13, 9, 13.5, -13, 9, 21, -13, 18, 21, -13, 31.5, 13.5, 13, 28, 21, 13, 28, 13.5, 13, 31.5, 13.5, 13, 31.5, 21, 13, 28, 21, 13, 22, 13.5, 13, 18, 21, 13, 18, 13.5, 13, 22, 13.5, 13, 22, 21, 13, 18, 21, 13, 22, 13.5, -13, 28, 21, -13, 28, 13.5, -13, 22, 13.5, -13, 22, 21, -13, 28, 21, -13, 18, 13.5, -13, 22, 21, -13, 22, 13.5, -13, 18, 13.5, -13, 18, 21, -13, 22, 21, -13, 18, 13.5, 13, 9, 21, 13, 9, 13.5, 13, 18, 13.5, 13, 18, 21, 13, 9, 21, 13, 28, 13.5, 13, 22, 21, 13, 22, 13.5, 13, 28, 13.5, 13, 28, 21, 13, 22, 21, 13, 10, 4, -3, 13, 4, -6, 13, 4, -3, 10, 4, -3, 10, 4, -6, 13, 4, -6, 0, 8, 9, -2, 8, 10, -2, 8, 9, 0, 8, 9, 0, 8, 10, -2, 8, 10, 6, 8, -10, 2, 8, -13, 9, 8, -13, 6, 8, -10, 2, 8, -10, 2, 8, -13, 0, 8, -10, -2, 8, -13, 0, 8, -13, 0, 8, -10, -2, 8, -10, -2, 8, -13, 10, 4, 6, 13, 4, 3, 13, 4, 6, 10, 4, 6, 10, 4, 3, 13, 4, 3, 10, 4, 3, 13, 4, -3, 13, 4, 3, 10, 4, 3, 10, 4, -3, 13, 4, -3, 13, 4, -3, 18, 4, 3, 13, 4, 3, 13, 4, -3, 18, 4, -3, 18, 4, 3, 13, 4, 3, 18, 4, 6, 13, 4, 6, 13, 4, 3, 18, 4, 3, 18, 4, 6, 13, 4, -6, 18, 4, -3, 13, 4, -3, 13, 4, -6, 18, 4, -6, 18, 4, -3, 6, 8, -15.5, 2, 8, -18, 6, 8, -18, 6, 8, -15.5, 2, 8, -15.5, 2, 8, -18, 0, 8, -15.5, -2, 8, -18, 0, 8, -18, 0, 8, -15.5, -2, 8, -15.5, -2, 8, -18, 2, 8, -13, 0, 8, -15.5, 2, 8, -15.5, 2, 8, -13, 0, 8, -13, 0, 8, -15.5, 2, 8, -18, 6, 8, -22, 6, 8, -18, 2, 8, -18, 2, 8, -22, 6, 8, -22, 6, 8, -22, 8, 8, -18, 6, 8, -18, 6, 8, -22, 8, 8, -22, 8, 8, -18, 18, 4, -22, 22, 4, -18, 18, 4, -18, 18, 4, -22, 22, 4, -22, 22, 4, -18, 22, 4, -18, 18, 4, -13, 18, 4, -18, 22, 4, -18, 22, 4, -13, 18, 4, -13, 18, 4, -18, 16, 4, -22, 18, 4, -22, 18, 4, -18, 16, 4, -18, 16, 4, -22, 8, 8, -18, 16, 4, -22, 16, 4, -18, 8, 8, -18, 8, 8, -22, 16, 4, -22, 0, 8, -13, -2, 8, -15.5, 0, 8, -15.5, 0, 8, -13, -2, 8, -13, -2, 8, -15.5, 9, 8, -13, 2, 8, -15.5, 6, 8, -15.5, 9, 8, -13, 2, 8, -13, 2, 8, -15.5, 2, 8, -10, 0, 8, -13, 2, 8, -13, 2, 8, -10, 0, 8, -10, 0, 8, -13, 2, 8, 9, 0, 8, 10, 0, 8, 9, 2, 8, 9, 2, 8, 10, 0, 8, 10, 2, 8, -18, 0, 8, -18, 2, 8, -22, 2, 8, -10, 0, 8, -9, 0, 8, -10, 2, 8, -10, 2, 8, -9, 0, 8, -9, 2, 8, -9, 0, 8, 9, 0, 8, -9, 2, 8, -9, 2, 8, 9, 0, 8, 9, 0, 8, -10, -2, 8, -9, -2, 8, -10, 0, 8, -10, 0, 8, -9, -2, 8, -9, 0, 8, -9, -2, 8, 9, -2, 8, -9, 0, 8, -9, 0, 8, 9, -2, 8, 9, -16, 15, -2, -19, 15, 2, -19, 15, -2, -16, 15, -2, -16, 15, 2, -19, 15, 2, 2, 8, -15.5, 0, 8, -18, 2, 8, -18, 2, 8, -15.5, 0, 8, -15.5, 0, 8, -18 ) -[node name="Level" type="Node3D"] +[node name="Map" type="Node3D"] script = null [node name="OmniLight3D" type="OmniLight3D" parent="."] -transform = Transform( -0.462097, -0.0829879, -0.882938, -0.612372, 0.75, 0.25, 0.641457, 0.656211, -0.397392, 0.124393, 4.30152, -8.12432 ) +transform = Transform3D( -0.462097, -0.0829879, -0.882938, -0.612372, 0.75, 0.25, 0.641457, 0.656211, -0.397392, 0.124393, 4.30152, -8.12432 ) light_color = Color( 1, 0.509804, 0.290196, 1 ) light_energy = 10.0 shadow_enabled = true @@ -52,7 +51,7 @@ omni_attenuation = 0.90125 script = null [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] -transform = Transform( -0.462097, -0.0829877, -0.882938, -0.886591, 0.0663194, 0.457775, 0.0205662, 0.994341, -0.104222, 0, 38, -1 ) +transform = Transform3D( -0.462097, -0.0829877, -0.882938, -0.886591, 0.0663194, 0.457775, 0.0205662, 0.994341, -0.104222, 0, 38, -1 ) shadow_enabled = true shadow_bias = 0.035 shadow_blur = 8.0 @@ -74,16 +73,27 @@ script = null shape = SubResource( 5 ) script = null -[node name="Player" parent="." instance=ExtResource( 7 )] - [node name="ReflectionProbe" type="ReflectionProbe" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 13, 0 ) +transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 13, 0 ) +visible = false extents = Vector3( 33, 13, 29 ) box_projection = true enable_shadows = true script = null [node name="BeerCan" parent="." instance=ExtResource( 8 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 22, 11, -3 ) +transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 22, 11, -3 ) + +[node name="SpawnPoints" type="Node3D" parent="."] +script = null +__meta__ = { +"_edit_lock_": true +} + +[node name="SpawnPoint" parent="SpawnPoints" instance=ExtResource( 1 )] +transform = Transform3D( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 10, 17 ) + +[node name="SpawnPoint2" parent="SpawnPoints" instance=ExtResource( 1 )] +transform = Transform3D( -1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 2, 17, -14 ) [editable path="DM1"] diff --git a/Game/Main.gd b/Game/Main.gd index a8a0c55..d0b4d04 100644 --- a/Game/Main.gd +++ b/Game/Main.gd @@ -3,9 +3,12 @@ extends Node enum GameFocus {MENU, GAME, CHAT, AWAY} const NET_PORT = 12597 +const NET_SERVER = "liblast.unfa.xyz" var peer = NetworkedMultiplayerENet.new() +var player_scene = preload("res://Assets/Characters/Player.tscn") + @onready var gui = $GUI @onready var hud = $HUD @onready var player = $Level/Player @@ -41,11 +44,17 @@ func _on_Host_pressed(): get_tree().network_peer = peer func _on_Connect_pressed(): - peer.create_client('localhost', NET_PORT) + peer.create_client(NET_SERVER, NET_PORT) get_tree().network_peer = peer func _player_connected(id) -> void: print("player connected, id: ", id) + var new_player = player_scene.instance() + new_player.set_network_master(id) + var spawnpoint = $Map/SpawnPoints.get_children()[randi() % size($Map/SpawnPoints.get_children())] + new_player.name = id + new_player.global_transform = spawnpoint.global_transform + $Players.add_child(new_player) func _player_disconnected(id) -> void: print("player disconnected, id: ", id) diff --git a/Game/Main.tscn b/Game/Main.tscn index 22e99fe..8aa0946 100644 --- a/Game/Main.tscn +++ b/Game/Main.tscn @@ -12,7 +12,10 @@ script = ExtResource( 3 ) [node name="GUI" parent="." instance=ExtResource( 2 )] -[node name="Level" parent="." instance=ExtResource( 1 )] +[node name="Players" type="Node3D" parent="."] +script = null + +[node name="Map" parent="." instance=ExtResource( 1 )] [node name="NetworkTesting" type="VBoxContainer" parent="."] anchor_bottom = 1.0