cs-os
/
cs-os
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

New models & Update Training map

This commit is contained in:
dise 2024-02-28 22:36:39 +03:00
parent 7b568eb8a9
commit 788e486d6c
8 changed files with 445 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
icon.svg.import
View File

@ -3,25 +3,26 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://bxmfgknljdw65"
path="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"
path.s3tc="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.s3tc.ctex"
metadata={
"vram_texture": false
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://icon.svg"
dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"]
dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.s3tc.ctex"]
[params]
compress/mode=0
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
@ -31,7 +32,7 @@ process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
detect_3d/compress_to=0
svg/scale=1.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false

279
models/ladder.obj Normal file
View File

@ -0,0 +1,279 @@
# Made in Blockbench 4.9.4
mtllib ladder.mtl
o cube
v 0.4375 1.375 0.0625
v 0.4375 1.375 -0.0625
v 0.4375 0 0.0625
v 0.4375 0 -0.0625
v 0.3125 1.375 -0.0625
v 0.3125 1.375 0.0625
v 0.3125 0 -0.0625
v 0.3125 0 0.0625
vt 0 1
vt 0.125 1
vt 0.125 0
vt 0 0
vt 0 1
vt 0.125 1
vt 0.125 0
vt 0 0
vt 0 1
vt 0.125 1
vt 0.125 0
vt 0 0
vt 0 1
vt 0.125 1
vt 0.125 0
vt 0 0
vt 0 1
vt 0.125 1
vt 0.125 0.875
vt 0 0.875
vt 0 1
vt 0.125 1
vt 0.125 0.875
vt 0 0.875
vn 0 0 -1
vn 1 0 0
vn 0 0 1
vn -1 0 0
vn 0 1 0
vn 0 -1 0
usemtl none
f 4/4/1 7/3/1 5/2/1 2/1/1
f 3/8/2 4/7/2 2/6/2 1/5/2
f 8/12/3 3/11/3 1/10/3 6/9/3
f 7/16/4 8/15/4 6/14/4 5/13/4
f 6/20/5 1/19/5 2/18/5 5/17/5
f 7/24/6 4/23/6 3/22/6 8/21/6
o cube
v -0.3125 1.375 0.0625
v -0.3125 1.375 -0.0625
v -0.3125 0 0.0625
v -0.3125 0 -0.0625
v -0.4375 1.375 -0.0625
v -0.4375 1.375 0.0625
v -0.4375 0 -0.0625
v -0.4375 0 0.0625
vt 0 1
vt 0.125 1
vt 0.125 0
vt 0 0
vt 0 1
vt 0.125 1
vt 0.125 0
vt 0 0
vt 0 1
vt 0.125 1
vt 0.125 0
vt 0 0
vt 0 1
vt 0.125 1
vt 0.125 0
vt 0 0
vt 0 1
vt 0.125 1
vt 0.125 0.875
vt 0 0.875
vt 0 1
vt 0.125 1
vt 0.125 0.875
vt 0 0.875
vn 0 0 -1
vn 1 0 0
vn 0 0 1
vn -1 0 0
vn 0 1 0
vn 0 -1 0
usemtl none
f 12/28/7 15/27/7 13/26/7 10/25/7
f 11/32/8 12/31/8 10/30/8 9/29/8
f 16/36/9 11/35/9 9/34/9 14/33/9
f 15/40/10 16/39/10 14/38/10 13/37/10
f 14/44/11 9/43/11 10/42/11 13/41/11
f 15/48/12 12/47/12 11/46/12 16/45/12
o cube
v 0.3125 0.3125 0.0625
v 0.3125 0.3125 -0.0625
v 0.3125 0.1875 0.0625
v 0.3125 0.1875 -0.0625
v -0.3125 0.3125 -0.0625
v -0.3125 0.3125 0.0625
v -0.3125 0.1875 -0.0625
v -0.3125 0.1875 0.0625
vt 0 1
vt 0.625 1
vt 0.625 0.875
vt 0 0.875
vt 0 1
vt 0.125 1
vt 0.125 0.875
vt 0 0.875
vt 0 1
vt 0.625 1
vt 0.625 0.875
vt 0 0.875
vt 0 1
vt 0.125 1
vt 0.125 0.875
vt 0 0.875
vt 0 1
vt 0.625 1
vt 0.625 0.875
vt 0 0.875
vt 0 1
vt 0.625 1
vt 0.625 0.875
vt 0 0.875
vn 0 0 -1
vn 1 0 0
vn 0 0 1
vn -1 0 0
vn 0 1 0
vn 0 -1 0
usemtl none
f 20/52/13 23/51/13 21/50/13 18/49/13
f 19/56/14 20/55/14 18/54/14 17/53/14
f 24/60/15 19/59/15 17/58/15 22/57/15
f 23/64/16 24/63/16 22/62/16 21/61/16
f 22/68/17 17/67/17 18/66/17 21/65/17
f 23/72/18 20/71/18 19/70/18 24/69/18
o cube
v 0.3125 0.8125 0.0625
v 0.3125 0.8125 -0.0625
v 0.3125 0.6875 0.0625
v 0.3125 0.6875 -0.0625
v -0.3125 0.8125 -0.0625
v -0.3125 0.8125 0.0625
v -0.3125 0.6875 -0.0625
v -0.3125 0.6875 0.0625
vt 0 1
vt 0.625 1
vt 0.625 0.875
vt 0 0.875
vt 0 1
vt 0.125 1
vt 0.125 0.875
vt 0 0.875
vt 0 1
vt 0.625 1
vt 0.625 0.875
vt 0 0.875
vt 0 1
vt 0.125 1
vt 0.125 0.875
vt 0 0.875
vt 0 1
vt 0.625 1
vt 0.625 0.875
vt 0 0.875
vt 0 1
vt 0.625 1
vt 0.625 0.875
vt 0 0.875
vn 0 0 -1
vn 1 0 0
vn 0 0 1
vn -1 0 0
vn 0 1 0
vn 0 -1 0
usemtl none
f 28/76/19 31/75/19 29/74/19 26/73/19
f 27/80/20 28/79/20 26/78/20 25/77/20
f 32/84/21 27/83/21 25/82/21 30/81/21
f 31/88/22 32/87/22 30/86/22 29/85/22
f 30/92/23 25/91/23 26/90/23 29/89/23
f 31/96/24 28/95/24 27/94/24 32/93/24
o cube
v 0.3125 1.25 0.0625
v 0.3125 1.25 -0.0625
v 0.3125 1.125 0.0625
v 0.3125 1.125 -0.0625
v -0.3125 1.25 -0.0625
v -0.3125 1.25 0.0625
v -0.3125 1.125 -0.0625
v -0.3125 1.125 0.0625
vt 0 1
vt 0.625 1
vt 0.625 0.875
vt 0 0.875
vt 0 1
vt 0.125 1
vt 0.125 0.875
vt 0 0.875
vt 0 1
vt 0.625 1
vt 0.625 0.875
vt 0 0.875
vt 0 1
vt 0.125 1
vt 0.125 0.875
vt 0 0.875
vt 0 1
vt 0.625 1
vt 0.625 0.875
vt 0 0.875
vt 0 1
vt 0.625 1
vt 0.625 0.875
vt 0 0.875
vn 0 0 -1
vn 1 0 0
vn 0 0 1
vn -1 0 0
vn 0 1 0
vn 0 -1 0
usemtl none
f 36/100/25 39/99/25 37/98/25 34/97/25
f 35/104/26 36/103/26 34/102/26 33/101/26
f 40/108/27 35/107/27 33/106/27 38/105/27
f 39/112/28 40/111/28 38/110/28 37/109/28
f 38/116/29 33/115/29 34/114/29 37/113/29
f 39/120/30 36/119/30 35/118/30 40/117/30
o cube
v 0.3125 1.25 0.0625
v 0.3125 1.25 -0.0625
v 0.3125 1.125 0.0625
v 0.3125 1.125 -0.0625
v -0.3125 1.25 -0.0625
v -0.3125 1.25 0.0625
v -0.3125 1.125 -0.0625
v -0.3125 1.125 0.0625
vt 0 1
vt 0.625 1
vt 0.625 0.875
vt 0 0.875
vt 0 1
vt 0.125 1
vt 0.125 0.875
vt 0 0.875
vt 0 1
vt 0.625 1
vt 0.625 0.875
vt 0 0.875
vt 0 1
vt 0.125 1
vt 0.125 0.875
vt 0 0.875
vt 0 1
vt 0.625 1
vt 0.625 0.875
vt 0 0.875
vt 0 1
vt 0.625 1
vt 0.625 0.875
vt 0 0.875
vn 0 0 -1
vn 1 0 0
vn 0 0 1
vn -1 0 0
vn 0 1 0
vn 0 -1 0
usemtl none
f 44/124/31 47/123/31 45/122/31 42/121/31
f 43/128/32 44/127/32 42/126/32 41/125/32
f 48/132/33 43/131/33 41/130/33 46/129/33
f 47/136/34 48/135/34 46/134/34 45/133/34
f 46/140/35 41/139/35 42/138/35 45/137/35
f 47/144/36 44/143/36 43/142/36 48/141/36

22
models/ladder.obj.import Normal file
View File

@ -0,0 +1,22 @@
[remap]
importer="wavefront_obj"
importer_version=1
type="Mesh"
uid="uid://bal0u14qxmjfb"
path="res://.godot/imported/ladder.obj-d67956790d02128eb4831fd36b21fcc7.mesh"
[deps]
files=["res://.godot/imported/ladder.obj-d67956790d02128eb4831fd36b21fcc7.mesh"]
source_file="res://models/ladder.obj"
dest_files=["res://.godot/imported/ladder.obj-d67956790d02128eb4831fd36b21fcc7.mesh", "res://.godot/imported/ladder.obj-d67956790d02128eb4831fd36b21fcc7.mesh"]
[params]
generate_tangents=true
scale_mesh=Vector3(1, 1, 1)
offset_mesh=Vector3(0, 0, 0)
optimize_mesh=true
force_disable_mesh_compression=false

3
scenes/HUD/choose_team.tscn
View File

@ -13,7 +13,6 @@ grow_horizontal = 2
grow_vertical = 2
[node name="Choose_team" type="Control" parent="."]
visible = false
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
@ -111,7 +110,6 @@ text = "Select
script = ExtResource("1_nua8c")
[node name="Choose_class_OS" type="Control" parent="."]
visible = false
layout_mode = 1
anchors_preset = 0
offset_left = -41.0
@ -220,7 +218,6 @@ text = "Select"
script = ExtResource("1_nua8c")
[node name="Choose_class_CS" type="Control" parent="."]
visible = false
layout_mode = 1
anchors_preset = 14
anchor_top = 0.5

146
scenes/maps/training.tscn
View File

@ -1,10 +1,14 @@
[gd_scene load_steps=11 format=3 uid="uid://dx2v4x2jey55t"]
[gd_scene load_steps=15 format=3 uid="uid://dx2v4x2jey55t"]
[ext_resource type="Texture2D" uid="uid://c88oa7ckhmvoh" path="res://textures/prototype-textures/Prototype_grey_32x32px.png" id="1_87a53"]
[ext_resource type="Material" uid="uid://bm7dpv2ymo0s" path="res://textures/materials/black.material" id="2_acmnt"]
[ext_resource type="Material" uid="uid://c6sa1jlgmjnln" path="res://textures/materials/orange.tres" id="3_1ncrc"]
[ext_resource type="Texture2D" uid="uid://bxmfgknljdw65" path="res://icon.svg" id="4_6thf3"]
[ext_resource type="PackedScene" uid="uid://833q6upr0s1k" path="res://scenes/special/spawnpoint.tscn" id="5_4t8n8"]
[ext_resource type="Material" uid="uid://lh788k850e21" path="res://textures/materials/red.material" id="5_mri33"]
[ext_resource type="Material" uid="uid://btj7xxav4d6l0" path="res://textures/materials/orange.res" id="6_n8h4m"]
[ext_resource type="Material" uid="uid://bswen72o66of2" path="res://textures/materials/blue.material" id="7_gt32y"]
[ext_resource type="ArrayMesh" uid="uid://bal0u14qxmjfb" path="res://models/ladder.obj" id="8_b1h5c"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_rbwrc"]
albedo_texture = ExtResource("1_87a53")
@ -43,7 +47,7 @@ size = Vector3(1.98291, 0.503906, 2.3484)
material = SubResource("StandardMaterial3D_rbwrc")
[node name="shooting_sub" type="CSGBox3D" parent="CSGCombiner3D/street"]
transform = Transform3D(-1.29289e-08, 0, -0.211434, 0, 0.0150877, 0, 0.295778, 0, -9.24206e-09, -0.671881, -0.189736, -1.16362)
transform = Transform3D(-1.29289e-08, 0, -0.211434, 0, 0.0150877, 0, 0.295778, 0, -9.24206e-09, 0.00463009, -0.189736, -1.16362)
operation = 2
size = Vector3(0.0764232, 7.78497, 1.91521)
material = ExtResource("3_1ncrc")
@ -54,6 +58,11 @@ operation = 2
size = Vector3(2.11789, 0.501953, 2.45102)
material = ExtResource("2_acmnt")
[node name="spawn" type="CSGBox3D" parent="CSGCombiner3D/street"]
transform = Transform3D(0.387675, 0, 0, 0, 0.0226455, 0, 0, 0, 0.275283, 0.00389695, -0.25037, -1.0268)
size = Vector3(1.04541, 0.31958, 0.937866)
material = ExtResource("3_1ncrc")
[node name="parkour" type="CSGBox3D" parent="CSGCombiner3D/street"]
transform = Transform3D(0.10194, 0, 0, 0, 0.0226455, 0, 0, 0, 0.0377425, 0.93736, -0.23922, -0.935865)
size = Vector3(1, 0.89447, 0.90625)
@ -121,13 +130,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.561937, -0.663228, -4.1961
size = Vector3(0.401611, 3.72974, 4.05717)
material = SubResource("StandardMaterial3D_lkg5o")
[node name="spawn" type="CSGBox3D" parent="CSGCombiner3D/street"]
transform = Transform3D(0.273923, 0, 0, 0, 0.0226455, 0, 0, 0, 0.275283, 0.0126988, -0.249108, -1.0268)
size = Vector3(1, 0.31958, 0.937866)
material = ExtResource("3_1ncrc")
[node name="shooting_range" type="CSGBox3D" parent="CSGCombiner3D/street"]
transform = Transform3D(-1.27646e-08, 0, -0.223462, 0, 0.0142314, 0, 0.292019, 0, -9.76781e-09, -0.671244, -0.188671, -1.58776)
transform = Transform3D(-1.27646e-08, 0, -0.223462, 0, 0.0142314, 0, 0.292019, 0, -9.76781e-09, 0.00526714, -0.188671, -1.58776)
size = Vector3(2.96117, 8.45836, 1.82671)
material = ExtResource("3_1ncrc")
@ -142,6 +146,130 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 7.10543e-15, 0, 1.00244, 1.26456, -3.2
size = Vector3(0.0600586, 1.92407, 1.78809)
material = ExtResource("2_acmnt")
[node name="king_of_the_hill" type="CSGMesh3D" parent="CSGCombiner3D/street"]
transform = Transform3D(0.5, 0, 0, 0, 0.9, 0, 0, 0, 0.5, 0.290829, -0.0257916, -0.154597)
[node name="CSGCylinder3D" type="CSGCylinder3D" parent="CSGCombiner3D/street/king_of_the_hill"]
transform = Transform3D(1, 0, 0, 0, 0.999999, 0, 0, 0, 1, 0, -0.224284, 0.936103)
radius = 0.1
height = 0.05
sides = 12
smooth_faces = false
material = ExtResource("5_mri33")
[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="CSGCombiner3D/street/king_of_the_hill"]
transform = Transform3D(1, 0, 0, 0, 0.999999, 0, 0, 0, 1, 0, -0.224284, 0.0361031)
radius = 0.1
height = 0.05
sides = 12
smooth_faces = false
material = ExtResource("5_mri33")
[node name="CSGCylinder3D3" type="CSGCylinder3D" parent="CSGCombiner3D/street/king_of_the_hill"]
transform = Transform3D(1, 0, 0, 0, 0.999999, 0, 0, 0, 1, -0.9, -0.224284, 0.0361031)
radius = 0.1
height = 0.05
sides = 12
smooth_faces = false
material = ExtResource("5_mri33")
[node name="CSGCylinder3D4" type="CSGCylinder3D" parent="CSGCombiner3D/street/king_of_the_hill"]
transform = Transform3D(1, 0, 0, 0, 0.999999, 0, 0, 0, 1, -0.9, -0.224284, 0.936103)
radius = 0.1
height = 0.05
sides = 12
smooth_faces = false
material = ExtResource("5_mri33")
[node name="CSGCylinder3D5" type="CSGCylinder3D" parent="CSGCombiner3D/street/king_of_the_hill"]
transform = Transform3D(1, 0, 0, 0, 0.999998, 0, 0, 0, 1, -0.65, -0.200705, 0.736102)
radius = 0.1
height = 0.1
sides = 12
smooth_faces = false
material = ExtResource("5_mri33")
[node name="CSGCylinder3D6" type="CSGCylinder3D" parent="CSGCombiner3D/street/king_of_the_hill"]
transform = Transform3D(1, 0, 0, 0, 0.999997, 0, 0, 0, 1, -0.65, -0.200705, 0.236102)
radius = 0.1
height = 0.1
sides = 12
smooth_faces = false
material = ExtResource("5_mri33")
[node name="CSGCylinder3D7" type="CSGCylinder3D" parent="CSGCombiner3D/street/king_of_the_hill"]
transform = Transform3D(1, 0, 0, 0, 0.999997, 0, 0, 0, 1, -0.2, -0.200705, 0.236102)
radius = 0.1
height = 0.1
sides = 12
smooth_faces = false
material = ExtResource("5_mri33")
[node name="CSGCylinder3D8" type="CSGCylinder3D" parent="CSGCombiner3D/street/king_of_the_hill"]
transform = Transform3D(1, 0, 0, 0, 0.999997, 0, 0, 0, 1, -0.2, -0.200705, 0.736102)
radius = 0.1
height = 0.1
sides = 12
smooth_faces = false
material = ExtResource("5_mri33")
[node name="CSGCylinder3D9" type="CSGCylinder3D" parent="CSGCombiner3D/street/king_of_the_hill"]
transform = Transform3D(1, 0, 0, 0, 0.999996, 0, 0, 0, 1, -0.415994, -0.174006, 0.486101)
radius = 0.15
height = 0.15
sides = 12
smooth_faces = false
material = ExtResource("5_mri33")
[node name="CSGCylinder3D10" type="CSGCylinder3D" parent="CSGCombiner3D/street/king_of_the_hill"]
transform = Transform3D(1, 0, 0, 0, 0.999996, 0, 0, 0, 1, -0.415994, -0.0773044, 0.486101)
radius = 0.1
height = 0.05
sides = 12
smooth_faces = false
material = ExtResource("6_n8h4m")
[node name="tower" type="CSGMesh3D" parent="CSGCombiner3D/street"]
transform = Transform3D(0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0, 0)
[node name="tower_box" type="CSGBox3D" parent="CSGCombiner3D/street/tower"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.09447, -0.0654277, -1.31192)
size = Vector3(0.25, 0.5, 0.25)
material = ExtResource("3_1ncrc")
[node name="tower_sub" type="CSGBox3D" parent="CSGCombiner3D/street/tower"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.09447, -0.0654277, -1.31192)
operation = 2
size = Vector3(0.15, 0.49, 0.15)
material = ExtResource("3_1ncrc")
[node name="tower_door" type="CSGBox3D" parent="CSGCombiner3D/street/tower"]
transform = Transform3D(1, 0, 0, 0, 0.804594, 0, 0, 0, 0.815685, -1.06183, -0.243172, -1.31417)
operation = 2
size = Vector3(0.187427, 0.167599, 0.17074)
material = ExtResource("3_1ncrc")
[node name="tower_floor_sub" type="CSGBox3D" parent="CSGCombiner3D/street/tower"]
transform = Transform3D(1, 0, 0, 0, 0.999999, 0, 0, 0, 1, -1.09408, 0.117174, -1.31182)
operation = 2
size = Vector3(0.26, 0.15, 0.253418)
material = ExtResource("3_1ncrc")
[node name="ladder" type="MeshInstance3D" parent="CSGCombiner3D/street/tower"]
transform = Transform3D(-3.93403e-09, 0, -0.09, 0, 0.09, 0, 0.09, 0, -3.93403e-09, -1.16555, -0.312215, -1.31007)
material_override = ExtResource("7_gt32y")
mesh = ExtResource("8_b1h5c")
[node name="ladder2" type="MeshInstance3D" parent="CSGCombiner3D/street/tower"]
transform = Transform3D(-3.93403e-09, 0, -0.09, 0, 0.09, 0, 0.09, 0, -3.93403e-09, -1.16543, -0.190152, -1.31007)
material_override = ExtResource("7_gt32y")
mesh = ExtResource("8_b1h5c")
[node name="ladder3" type="MeshInstance3D" parent="CSGCombiner3D/street/tower"]
transform = Transform3D(-3.93403e-09, 0, -0.09, 0, 0.09, 0, 0.09, 0, -3.93403e-09, -1.16543, -0.0816341, -1.31007)
material_override = ExtResource("7_gt32y")
mesh = ExtResource("8_b1h5c")
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(0.00940726, 0.999898, -0.0107741, 0.0036501, 0.0107402, 0.999936, 0.999949, -0.00944598, -0.00354869, -44.6165, 55.8676, -6.56245e-06)
light_angular_distance = 11.76
@ -156,4 +284,4 @@ transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -48.5215, 20.4632, -22.9326)
team = 1
[node name="spawnpoint2" parent="." instance=ExtResource("5_4t8n8")]
transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -48.5284, 20.257, -22.8886)
transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -48.5284, 20.414, -22.8886)

BIN
textures/materials/black90%.res
View File

Binary file not shown.

BIN
textures/materials/blue.material
View File

Binary file not shown.

BIN
textures/materials/orange.res
View File

Binary file not shown.