Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter

3D Input/Grundkörpertexture.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Grundkörpertexture.png-34564a9754380205a564bdf1811e4b08.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://3D Input/Grundkörpertexture.png"
+dest_files=[ "res://.import/Grundkörpertexture.png-34564a9754380205a564bdf1811e4b08.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

3D Input/oberkörperimg.jpg.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/oberkörperimg.jpg-35b6b5c30b21ae12dd335141563a1970.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://3D Input/oberkörperimg.jpg"
+dest_files=[ "res://.import/oberkörperimg.jpg-35b6b5c30b21ae12dd335141563a1970.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

BodyConfig/bodyBuilderMenu.tscn

@@ -47,7 +47,7 @@ handle_input_locally = false
 render_target_update_mode = 3
 
 [node name="Camera" type="Camera" parent="GUI/HBoxC/ViewportContainer/Viewport"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 4.16872 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 7.8064 )
 
 [node name="MouseLook" type="RayCast" parent="GUI/HBoxC/ViewportContainer/Viewport"]
 enabled = true

BodyConfig/bodyBuildingScript.gd

@@ -67,8 +67,11 @@ func _physics_process(delta):
 		
 		if _rayCast.is_colliding():
 			# collider will be the node hit
-			_attachment_point = _rayCast.get_collider().get_parent()
+			make_it_shine(false)
-			print(_rayCast.get_collider())
+			var temp = _rayCast.get_collider().get_parent()
+			if temp.has_node("OmniLight"):
+				_attachment_point = temp
+			make_it_shine(true)
 
 
 func _input(event):
@@ -85,3 +88,8 @@ func _input(event):
 
 func body_part_chosen(params):
 	_attachment_point.add_child(BodyPartLoader.bodyparts[params].instance())
+
+
+func make_it_shine(highlight : bool):
+	if _attachment_point != null:
+		_attachment_point.get_node("OmniLight").visible = highlight

BodyParts/Arm.tscn

@@ -4,7 +4,7 @@
 [ext_resource path="res://3D Input/untitled.glb" type="PackedScene" id=2]
 [ext_resource path="res://BodyParts/Arm.gd" type="Script" id=3]
 
-[sub_resource type="CapsuleShape" id=3]
+[sub_resource type="CapsuleShape" id=1]
 radius = 0.724339
 height = 5.27855
 
@@ -13,28 +13,33 @@ radius = 0.591769
 
 [node name="Arm" instance=ExtResource( 1 )]
 script = ExtResource( 3 )
+key = 0
+damage = 10.0
 
 [node name="PartCollider" parent="." index="0"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -5.34203 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.83 )
-shape = SubResource( 3 )
+shape = SubResource( 1 )
 
 [node name="Mesh" parent="." index="1" instance=ExtResource( 2 )]
 
 [node name="Sphere" parent="Mesh" index="0"]
 visible = false
 
+[node name="Armature" parent="Mesh" index="1"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
+
 [node name="BoneAttachment" type="BoneAttachment" parent="Mesh/Armature/Skeleton" index="1"]
-transform = Transform( 1, -1.98247e-23, -2.98292e-24, 6.50669e-24, -9.49949e-08, 1, -2.07684e-23, -1, -9.49949e-08, -2.23781e-16, -0.0078205, -5.05441 )
+transform = Transform( 1, -1.98292e-23, -3.18966e-24, 6.71348e-24, -9.49949e-08, 1, -2.07636e-23, -1, -9.49949e-08, -2.23781e-16, -0.0078205, -5.05441 )
 bone_name = "bone_2"
 
 [node name="RemoteTransform" type="RemoteTransform" parent="Mesh/Armature/Skeleton/BoneAttachment" index="0"]
 remote_path = NodePath("../../../../../TouchArea")
 
 [node name="TouchArea" parent="." index="2"]
-transform = Transform( 1, -1.98247e-23, -2.98292e-24, 6.50669e-24, -9.49949e-08, 1, -2.07684e-23, -1, -9.49949e-08, -2.23781e-16, -0.0078205, -7.60024 )
+transform = Transform( 1, -1.98292e-23, -3.18966e-24, 6.71348e-24, -9.49949e-08, 1, -2.07636e-23, -1, -9.49949e-08, -2.23781e-16, -0.0078205, -5.05441 )
 
 [node name="CollisionShape" type="CollisionShape" parent="TouchArea" index="0"]
-transform = Transform( 1, 2.98291e-24, -1.98247e-23, -2.07684e-23, -9.49949e-08, -1, -6.50669e-24, 1, -9.49949e-08, 2.23781e-16, 0.399765, 0.00782054 )
+transform = Transform( 1, 2.98291e-24, -1.98247e-23, -2.07684e-23, -9.49949e-08, -1, -6.50669e-24, 1, -9.49949e-08, 0, 0, 0 )
 shape = SubResource( 2 )
 
 [editable path="Mesh"]

BodyParts/BodyBase/AttachmentPoint.tscn

@@ -0,0 +1,26 @@
+[gd_scene load_steps=3 format=2]
+
+[sub_resource type="SphereMesh" id=1]
+
+[sub_resource type="SphereShape" id=2]
+
+[node name="AttachmentPoint" type="Spatial"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
+
+[node name="Mesh" type="MeshInstance" parent="."]
+transform = Transform( 0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0 )
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="OmniLight" type="OmniLight" parent="."]
+transform = Transform( 1, 3.12639e-13, -1.77715e-26, -3.12639e-13, 1, -5.68434e-14, 0, 5.68434e-14, 1, -0.680858, 0, -1.38872 )
+visible = false
+light_color = Color( 0.956863, 0.121569, 0.121569, 1 )
+light_energy = 3.86
+omni_range = 1.8
+
+[node name="Area" type="Area" parent="."]
+
+[node name="CollisionShape" type="CollisionShape" parent="Area"]
+transform = Transform( 0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0 )
+shape = SubResource( 2 )

BodyParts/BodyBase/BodyBase.tscn

@@ -1,55 +1,23 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://BodyParts/BodyBase/BodyBase.gd" type="Script" id=1]
-
+[ext_resource path="res://BodyParts/BodyBase/AttachmentPoint.tscn" type="PackedScene" id=2]
-[sub_resource type="CapsuleMesh" id=1]
+[ext_resource path="res://3D Input/Fertige GLBs/Torso.glb" type="PackedScene" id=3]
 
 [sub_resource type="CapsuleShape" id=2]
 
-[sub_resource type="SphereMesh" id=3]
-
-[sub_resource type="GDScript" id=4]
-
-[sub_resource type="SphereShape" id=5]
-
-[sub_resource type="SphereShape" id=6]
-
 [node name="Torso" type="RigidBody"]
 script = ExtResource( 1 )
 
-[node name="TorsoMesh" type="MeshInstance" parent="."]
-mesh = SubResource( 1 )
-material/0 = null
-
 [node name="TorsoCollider" type="CollisionShape" parent="."]
 transform = Transform( 0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0, 0 )
 shape = SubResource( 2 )
 
-[node name="FrontLeft" type="Spatial" parent="."]
+[node name="FrontLeft" parent="." instance=ExtResource( 2 )]
 transform = Transform( 0.5, -1.62921e-07, -0.866025, -3.25841e-07, -1, 0, -0.866025, 2.82187e-07, -0.5, 0.6, 0, 1 )
 
-[node name="FrontLeftAttachMent" type="MeshInstance" parent="FrontLeft"]
+[node name="FrontRight" parent="." instance=ExtResource( 2 )]
-transform = Transform( 0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0 )
+transform = Transform( -0.5, 0, 0.866025, 0, 1, 0, -0.866025, 0, -0.5, -0.6, 0, 1 )
-mesh = SubResource( 3 )
-material/0 = null
 
-[node name="Area" type="Area" parent="FrontLeft"]
+[node name="Mesh" parent="." instance=ExtResource( 3 )]
-script = SubResource( 4 )
+transform = Transform( 0.2, 0, 0, 0, -8.74228e-09, 0.2, 0, -0.2, -8.74228e-09, 0, 0, 0 )
-
-[node name="CollisionShape" type="CollisionShape" parent="FrontLeft/Area"]
-transform = Transform( 0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0 )
-shape = SubResource( 5 )
-
-[node name="FrontRight" type="Spatial" parent="."]
-transform = Transform( 0.5, -1.62921e-07, 0.866025, -3.25841e-07, -1, 0, 0.866025, -2.82187e-07, -0.5, -0.6, 0, 1 )
-
-[node name="FrontRightAttachMent" type="MeshInstance" parent="FrontRight"]
-transform = Transform( 0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0 )
-mesh = SubResource( 3 )
-material/0 = null
-
-[node name="Area" type="Area" parent="FrontRight"]
-
-[node name="CollisionShape" type="CollisionShape" parent="FrontRight/Area"]
-transform = Transform( 0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0 )
-shape = SubResource( 6 )

Ingame/Arena.tscn

@@ -0,0 +1,178 @@
+[gd_scene load_steps=6 format=2]
+
+[ext_resource path="res://Ingame/Level/Torch.tscn" type="PackedScene" id=1]
+[ext_resource path="res://Ingame/Level/Ground.tscn" type="PackedScene" id=2]
+[ext_resource path="res://Ingame/Level/Fence.tscn" type="PackedScene" id=5]
+
+[sub_resource type="Environment" id=1]
+ambient_light_color = Color( 0.203922, 0.231373, 0.329412, 1 )
+
+[sub_resource type="Curve3D" id=2]
+_data = {
+"points": PoolVector3Array( -6.18582, 0, 7.84923, 6.18582, 0, -7.84923, -49.9513, 0, -34.3585, -4.51454, 0, 0.679321, 4.51454, 0, -0.679321, -15.3927, 0, -53.766, -21.9094, 0, -9.41343, 21.9094, 0, 9.41343, 23.1226, 0, -50.5878, -3.51591, 0, -8.89224, 3.51591, 0, 8.89224, 48.9412, 0, -26.3448, -0.144619, 0, -5.61391, 0.144619, 0, 5.61391, 60.7732, 0, 13.6973, 4.99704, -4.57764e-05, -11.0807, -4.99704, 4.57764e-05, 11.0807, 54.4575, 0, 49.3261, 10.0432, 0, -5.64291, -10.0432, 0, 5.64291, 32.3244, 0, 71.386, 10.2301, 0, -1.21242, -10.2301, 0, 1.21242, 2.64864, -1.52588e-05, 80.1473, 8.65666, 0, 3.83833, -8.65666, 0, -3.83833, -24.225, 0, 77.5418, 6.10191, 0, 6.62698, -6.10191, 0, -6.62698, -47.3545, 0, 62.2559, 2.38824, 0, 9.77866, -2.38824, 0, -9.77866, -62.2404, 0, 29.8337, -1.39743, 0, 9.2999, 1.39743, 0, -9.2999, -65.2092, 0, -9.54412, 0, 0, 0, 0, 0, 0, -49.9513, 0, -34.3585 ),
+"tilts": PoolRealArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 )
+}
+
+[node name="Arena" type="Spatial"]
+
+[node name="Torch" parent="." instance=ExtResource( 1 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 46.6609, 0, -46.1498 )
+
+[node name="Torch3" parent="." instance=ExtResource( 1 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -40.7873, 0, -66.7423 )
+
+[node name="Torch2" parent="." instance=ExtResource( 1 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -80.7649, 0, 4.33311 )
+
+[node name="Torch4" parent="." instance=ExtResource( 1 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -55.8087, 0, 76.6803 )
+
+[node name="Torch5" parent="." instance=ExtResource( 1 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 52.7943, 0, 76.6803 )
+
+[node name="Torch6" parent="." instance=ExtResource( 1 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.293457, 0, 5.53332 )
+
+[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
+environment = SubResource( 1 )
+
+[node name="ground" parent="." instance=ExtResource( 2 )]
+
+[node name="Path" type="Path" parent="."]
+curve = SubResource( 2 )
+
+[node name="PathFollow" type="PathFollow" parent="Path"]
+transform = Transform( -0.564546, 0, 0.825401, 0, 1, 0, -0.825402, 0, -0.564546, -43.137, 0, -40.2265 )
+offset = 9.0
+rotation_mode = 4
+
+[node name="Fence" parent="Path/PathFollow" instance=ExtResource( 5 )]
+transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
+
+[node name="PathFollow2" type="PathFollow" parent="Path"]
+transform = Transform( -0.389933, 0, 0.920842, 0, 1, 0, -0.920843, 0, -0.389933, -22.4314, 0, -51.2965 )
+offset = 32.63
+rotation_mode = 4
+
+[node name="Fence" parent="Path/PathFollow2" instance=ExtResource( 5 )]
+transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
+
+[node name="PathFollow3" type="PathFollow" parent="Path"]
+transform = Transform( 0.0525302, 0, 0.998617, 0, 1, 0, -0.998619, 0, 0.0525301, 1.77306, 0, -55.9514 )
+offset = 57.5
+rotation_mode = 4
+
+[node name="Fence" parent="Path/PathFollow3" instance=ExtResource( 5 )]
+transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
+
+[node name="PathFollow4" type="PathFollow" parent="Path"]
+transform = Transform( 0.412628, 0, 0.910899, 0, 1, 0, -0.9109, 0, 0.412628, 25.6454, 0, -49.4766 )
+offset = 82.37
+rotation_mode = 4
+
+[node name="Fence" parent="Path/PathFollow4" instance=ExtResource( 5 )]
+transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
+
+[node name="PathFollow5" type="PathFollow" parent="Path"]
+transform = Transform( 0.868863, 0, 0.495052, 0, 1, 0, -0.495052, 0, 0.868862, 45.3036, 0, -34.9361 )
+offset = 107.24
+rotation_mode = 4
+
+[node name="Fence" parent="Path/PathFollow5" instance=ExtResource( 5 )]
+transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
+
+[node name="PathFollow6" type="PathFollow" parent="Path"]
+transform = Transform( 0.951672, 0, 0.307113, 0, 1, 0, -0.307114, 0, 0.951672, 54.056, 0, -11.6692 )
+offset = 132.11
+rotation_mode = 4
+
+[node name="Fence" parent="Path/PathFollow6" instance=ExtResource( 5 )]
+transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
+
+[node name="PathFollow7" type="PathFollow" parent="Path"]
+transform = Transform( 0.989853, 0, 0.142099, 0, 1, 0, -0.142099, 0, 0.98985, 60.6244, 0, 12.2053 )
+offset = 156.98
+rotation_mode = 4
+
+[node name="Fence" parent="Path/PathFollow7" instance=ExtResource( 5 )]
+transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
+
+[node name="PathFollow8" type="PathFollow" parent="Path"]
+transform = Transform( 0.978626, 1.91684e-07, -0.205647, -1.784e-07, 1, 8.31393e-08, 0.205648, -4.46748e-08, 0.978625, 58.2582, -2.03301e-05, 36.846 )
+offset = 181.85
+rotation_mode = 4
+
+[node name="Fence" parent="Path/PathFollow8" instance=ExtResource( 5 )]
+transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
+
+[node name="PathFollow9" type="PathFollow" parent="Path"]
+transform = Transform( 0.760079, -6.86382e-07, -0.64983, 7.11586e-07, 1, -2.23934e-07, 0.649831, -2.92203e-07, 0.760078, 48.2851, 2.0276e-05, 59.2494 )
+offset = 206.72
+rotation_mode = 4
+
+[node name="Fence" parent="Path/PathFollow9" instance=ExtResource( 5 )]
+transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
+
+[node name="PathFollow10" type="PathFollow" parent="Path"]
+transform = Transform( 0.425147, -4.37703e-07, -0.905123, 3.06861e-07, 1, -3.39447e-07, 0.905124, -1.33432e-07, 0.425147, 28.181, -7.98279e-07, 73.5253 )
+offset = 231.59
+rotation_mode = 4
+
+[node name="Fence" parent="Path/PathFollow10" instance=ExtResource( 5 )]
+transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
+
+[node name="PathFollow11" type="PathFollow" parent="Path"]
+transform = Transform( 0.126477, -1.61642e-07, -0.991968, 1.13677e-07, 1, -1.48456e-07, 0.991969, -9.39879e-08, 0.126477, 4.35371, -1.51216e-05, 79.9373 )
+offset = 256.46
+rotation_mode = 4
+
+[node name="Fence" parent="Path/PathFollow11" instance=ExtResource( 5 )]
+transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
+
+[node name="PathFollow12" type="PathFollow" parent="Path"]
+transform = Transform( -0.305839, 5.41201e-07, -0.952082, 4.12144e-07, 1, 4.36044e-07, 0.952083, -2.59036e-07, -0.305838, -20.2565, -9.77015e-07, 79.0522 )
+offset = 281.33
+rotation_mode = 4
+
+[node name="Fence" parent="Path/PathFollow12" instance=ExtResource( 5 )]
+transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
+
+[node name="PathFollow13" type="PathFollow" parent="Path"]
+transform = Transform( -0.625119, 2.66822e-07, -0.780529, 4.26834e-07, 1, 0, 0.780529, -3.33157e-07, -0.625118, -42.0269, 0, 67.1875 )
+offset = 306.2
+rotation_mode = 4
+
+[node name="Fence" parent="Path/PathFollow13" instance=ExtResource( 5 )]
+transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
+
+[node name="PathFollow14" type="PathFollow" parent="Path"]
+transform = Transform( -0.916028, 3.908e-07, -0.401115, 4.26625e-07, 1, 0, 0.401116, -1.71126e-07, -0.916026, -56.2049, 0, 47.1929 )
+offset = 331.07
+rotation_mode = 4
+
+[node name="Fence" parent="Path/PathFollow14" instance=ExtResource( 5 )]
+transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
+
+[node name="PathFollow15" type="PathFollow" parent="Path"]
+transform = Transform( -0.986687, 4.21016e-07, -0.162631, 4.26697e-07, 1, 0, 0.162631, -6.93941e-08, -0.986685, -63.4917, 0, 23.5427 )
+offset = 355.94
+rotation_mode = 4
+
+[node name="Fence" parent="Path/PathFollow15" instance=ExtResource( 5 )]
+transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
+
+[node name="PathFollow16" type="PathFollow" parent="Path"]
+transform = Transform( -0.999998, 4.26235e-07, -0.00197735, 4.26236e-07, 1, 0, 0.00197735, -8.42818e-10, -0.999997, -65.6734, 0, -1.33537 )
+offset = 380.81
+rotation_mode = 4
+
+[node name="Fence" parent="Path/PathFollow16" instance=ExtResource( 5 )]
+transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
+
+[node name="PathFollow17" type="PathFollow" parent="Path"]
+transform = Transform( -0.817611, 3.47972e-07, 0.57577, 4.25596e-07, 1, 0, -0.575771, 2.45046e-07, -0.817609, -57.8267, 0, -24.3573 )
+offset = 405.68
+rotation_mode = 4
+
+[node name="Fence" parent="Path/PathFollow17" instance=ExtResource( 5 )]
+transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )

Ingame/Level/Fence.tscn

@@ -0,0 +1,30 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://3D Input/Fence.glb" type="PackedScene" id=1]
+[ext_resource path="res://Ingame/Level/Wood.tres" type="Material" id=2]
+
+[sub_resource type="BoxShape" id=1]
+extents = Vector3( 0.537798, 6.09865, 12.5193 )
+
+[node name="Fence" instance=ExtResource( 1 )]
+
+[node name="Cube001" parent="." index="0"]
+material/0 = ExtResource( 2 )
+
+[node name="Cube002" parent="." index="1"]
+material/0 = ExtResource( 2 )
+
+[node name="Cube003" parent="." index="2"]
+material/0 = ExtResource( 2 )
+
+[node name="Cube004" parent="." index="3"]
+material/0 = ExtResource( 2 )
+
+[node name="Cube005" parent="." index="4"]
+material/0 = ExtResource( 2 )
+
+[node name="StaticBody" type="StaticBody" parent="." index="5"]
+
+[node name="CollisionShape" type="CollisionShape" parent="StaticBody" index="0"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6.12366, -0.572572 )
+shape = SubResource( 1 )

Ingame/Level/Ground.tres

@@ -0,0 +1,12 @@
+[gd_resource type="SpatialMaterial" load_steps=4 format=2]
+
+[ext_resource path="res://Textures/Ground/Ground20_nrm.jpg" type="Texture" id=1]
+[ext_resource path="res://Textures/Ground/Ground20_rgh.jpg" type="Texture" id=2]
+[ext_resource path="res://Textures/Ground/Ground20_col.jpg" type="Texture" id=3]
+
+[resource]
+albedo_texture = ExtResource( 3 )
+roughness_texture = ExtResource( 2 )
+normal_enabled = true
+normal_scale = 2.0
+normal_texture = ExtResource( 1 )

Ingame/Level/Ground.tscn

@@ -0,0 +1,20 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://3D Input/ground.glb" type="PackedScene" id=1]
+[ext_resource path="res://Ingame/Level/Ground.tres" type="Material" id=2]
+
+[sub_resource type="BoxShape" id=1]
+extents = Vector3( 100, 5, 100 )
+
+[node name="Ground" instance=ExtResource( 1 )]
+
+[node name="Plane" parent="." index="0"]
+material/0 = ExtResource( 2 )
+
+[node name="StaticBody" type="StaticBody" parent="." index="1" groups=[
+"Terrain",
+]]
+
+[node name="CollisionShape" type="CollisionShape" parent="StaticBody" index="0"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -5, 0 )
+shape = SubResource( 1 )

Ingame/Level/Torch.tscn

@@ -0,0 +1,17 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://3D Input/torch.glb" type="PackedScene" id=1]
+[ext_resource path="res://Ingame/Level/Wood.tres" type="Material" id=2]
+
+[node name="Torch" instance=ExtResource( 1 )]
+
+[node name="Cube" parent="." index="0"]
+cast_shadow = 0
+material/0 = ExtResource( 2 )
+
+[node name="OmniLight" type="OmniLight" parent="." index="1"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.730462, 7.55028, -0.0896119 )
+light_color = Color( 0.996078, 0.568627, 0.380392, 1 )
+light_energy = 3.0
+shadow_enabled = true
+omni_range = 87.1226

Ingame/Level/Wood.tres

@@ -0,0 +1,12 @@
+[gd_resource type="SpatialMaterial" load_steps=4 format=2]
+
+[ext_resource path="res://Textures/Wood/Bark02_col.jpg" type="Texture" id=1]
+[ext_resource path="res://Textures/Wood/Bark02_nrm.jpg" type="Texture" id=2]
+[ext_resource path="res://Textures/Wood/Bark02_rgh.jpg" type="Texture" id=3]
+
+[resource]
+albedo_texture = ExtResource( 1 )
+roughness_texture = ExtResource( 3 )
+normal_enabled = true
+normal_scale = 1.0
+normal_texture = ExtResource( 2 )

Ingame/Testing.tscn

@@ -1,64 +1,40 @@
-[gd_scene load_steps=7 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://BodyParts/Arm.tscn" type="PackedScene" id=1]
 [ext_resource path="res://UI/UI.tscn" type="PackedScene" id=2]
 [ext_resource path="res://BodyParts/BodyBase/BodyBase.tscn" type="PackedScene" id=3]
 [ext_resource path="res://Ingame/Ingame.gd" type="Script" id=4]
-
+[ext_resource path="res://Ingame/Arena.tscn" type="PackedScene" id=5]
-[sub_resource type="PlaneMesh" id=1]
-size = Vector2( 10, 10 )
-
-[sub_resource type="BoxShape" id=2]
-extents = Vector3( 5, 1, 5 )
 
 [node name="InGame" type="Spatial"]
 script = ExtResource( 4 )
 
-[node name="MeshInstance" type="MeshInstance" parent="."]
-transform = Transform( 10, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0 )
-mesh = SubResource( 1 )
-material/0 = null
-
-[node name="StaticBody" type="StaticBody" parent="MeshInstance" groups=[
-"Terrain",
-]]
-
-[node name="CollisionShape" type="CollisionShape" parent="MeshInstance/StaticBody"]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0 )
-shape = SubResource( 2 )
-
 [node name="Camera" type="Camera" parent="."]
 transform = Transform( -4.37114e-08, -0.5, 0.866025, 0, 0.866025, 0.5, -1, 2.18557e-08, -3.78552e-08, 17, 9, -2 )
 
-[node name="DirectionalLight" type="DirectionalLight" parent="."]
-transform = Transform( 0.999532, 0.0126075, 0.027872, -0.0305909, 0.411942, 0.910697, 0, -0.911123, 0.412135, 0, 0, 0 )
-shadow_enabled = true
-
 [node name="Torso" parent="." instance=ExtResource( 3 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.02111, 0 )
 
 [node name="Arm" parent="Torso/FrontLeft" index="1" instance=ExtResource( 1 )]
 key = 83
-damage = 10.0
 
 [node name="Arm" parent="Torso/FrontRight" index="1" instance=ExtResource( 1 )]
 key = 65
-damage = 10.0
 
 [node name="Torso2" parent="." instance=ExtResource( 3 )]
-transform = Transform( -0.866025, -0.353553, -0.353553, -6.18172e-08, -0.707107, 0.707107, -0.5, 0.612372, 0.612372, 0, 3.02111, -9 )
+transform = Transform( -0.866025, -0.353553, -0.353554, -1.0677e-07, -0.707107, 0.707106, -0.5, 0.612372, 0.612373, 0, 3.02111, -9 )
 player_id = 1
 
 [node name="Arm" parent="Torso2/FrontLeft" index="1" instance=ExtResource( 1 )]
 key = 81
-damage = 10.0
 
 [node name="Arm" parent="Torso2/FrontRight" index="1" instance=ExtResource( 1 )]
 key = 87
-damage = 10.0
 
 [node name="UI" parent="." instance=ExtResource( 2 )]
 
+[node name="Arena" parent="." instance=ExtResource( 5 )]
+
 [editable path="Torso"]
 
 [editable path="Torso2"]

Textures/Ground/Ground20_AO.jpg.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Ground20_AO.jpg-ebec70ed4704a65da0fd8f5403760fb8.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Textures/Ground/Ground20_AO.jpg"
+dest_files=[ "res://.import/Ground20_AO.jpg-ebec70ed4704a65da0fd8f5403760fb8.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Textures/Ground/Ground20_col.jpg.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/Ground20_col.jpg-a9166ab6a2458dab3329ca8216296cb7.s3tc.stex"
+path.etc2="res://.import/Ground20_col.jpg-a9166ab6a2458dab3329ca8216296cb7.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Textures/Ground/Ground20_col.jpg"
+dest_files=[ "res://.import/Ground20_col.jpg-a9166ab6a2458dab3329ca8216296cb7.s3tc.stex", "res://.import/Ground20_col.jpg-a9166ab6a2458dab3329ca8216296cb7.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=1
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Textures/Ground/Ground20_disp.jpg.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Ground20_disp.jpg-9af87d8607deffee07a71944985b42ea.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Textures/Ground/Ground20_disp.jpg"
+dest_files=[ "res://.import/Ground20_disp.jpg-9af87d8607deffee07a71944985b42ea.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Textures/Ground/Ground20_nrm.jpg.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/Ground20_nrm.jpg-9631484f45e235740a3e28452587ccc8.s3tc.stex"
+path.etc2="res://.import/Ground20_nrm.jpg-9631484f45e235740a3e28452587ccc8.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Textures/Ground/Ground20_nrm.jpg"
+dest_files=[ "res://.import/Ground20_nrm.jpg-9631484f45e235740a3e28452587ccc8.s3tc.stex", "res://.import/Ground20_nrm.jpg-9631484f45e235740a3e28452587ccc8.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=1
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Textures/Ground/Ground20_rgh.jpg.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/Ground20_rgh.jpg-fa26d00a6411b43a4fca5a0d46bdee82.s3tc.stex"
+path.etc2="res://.import/Ground20_rgh.jpg-fa26d00a6411b43a4fca5a0d46bdee82.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Textures/Ground/Ground20_rgh.jpg"
+dest_files=[ "res://.import/Ground20_rgh.jpg-fa26d00a6411b43a4fca5a0d46bdee82.s3tc.stex", "res://.import/Ground20_rgh.jpg-fa26d00a6411b43a4fca5a0d46bdee82.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Textures/Wood/Bark02_AO.jpg.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Bark02_AO.jpg-bf7d1d1baff8b0eae26e36fe4c273d3a.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Textures/Wood/Bark02_AO.jpg"
+dest_files=[ "res://.import/Bark02_AO.jpg-bf7d1d1baff8b0eae26e36fe4c273d3a.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Textures/Wood/Bark02_col.jpg.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/Bark02_col.jpg-086c8107ab42cbc3594137ddfb6cea33.s3tc.stex"
+path.etc2="res://.import/Bark02_col.jpg-086c8107ab42cbc3594137ddfb6cea33.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Textures/Wood/Bark02_col.jpg"
+dest_files=[ "res://.import/Bark02_col.jpg-086c8107ab42cbc3594137ddfb6cea33.s3tc.stex", "res://.import/Bark02_col.jpg-086c8107ab42cbc3594137ddfb6cea33.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=1
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Textures/Wood/Bark02_disp.jpg.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Bark02_disp.jpg-23c9a77b2ac75fdee5a6cda59f7f506d.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Textures/Wood/Bark02_disp.jpg"
+dest_files=[ "res://.import/Bark02_disp.jpg-23c9a77b2ac75fdee5a6cda59f7f506d.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Textures/Wood/Bark02_nrm.jpg.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/Bark02_nrm.jpg-6e48cda315470ca56d57b2c065640915.s3tc.stex"
+path.etc2="res://.import/Bark02_nrm.jpg-6e48cda315470ca56d57b2c065640915.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Textures/Wood/Bark02_nrm.jpg"
+dest_files=[ "res://.import/Bark02_nrm.jpg-6e48cda315470ca56d57b2c065640915.s3tc.stex", "res://.import/Bark02_nrm.jpg-6e48cda315470ca56d57b2c065640915.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=1
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Textures/Wood/Bark02_rgh.jpg.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/Bark02_rgh.jpg-056b399020ae216856881a0c3df406e9.s3tc.stex"
+path.etc2="res://.import/Bark02_rgh.jpg-056b399020ae216856881a0c3df406e9.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Textures/Wood/Bark02_rgh.jpg"
+dest_files=[ "res://.import/Bark02_rgh.jpg-056b399020ae216856881a0c3df406e9.s3tc.stex", "res://.import/Bark02_rgh.jpg-056b399020ae216856881a0c3df406e9.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

project.godot

@@ -33,12 +33,13 @@ _global_script_class_icons={
 [application]
 
 config/name="BodyPartFighter"
+run/main_scene="res://Ingame/Testing.tscn"
 config/icon="res://icon.png"
 
 [autoload]
 
-BodyPartLoader="*res://Global/BodyPartLoader.gd"
 InGameState="*res://Global/InGameState.gd"
+BodyPartLoader="*res://Global/BodyPartLoader.gd"
 
 [rendering]