merge

3D Input/gorillaarmtexture.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/gorillaarmtexture.png-c64af8f8e427f7cc8fbbb08cb004940b.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://3D Input/gorillaarmtexture.png"
+dest_files=[ "res://.import/gorillaarmtexture.png-c64af8f8e427f7cc8fbbb08cb004940b.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

@@ -6,10 +6,11 @@
 
 [node name="Body Builder Menu" type="Spatial"]
 script = ExtResource( 2 )
-torsoPath = NodePath("Player")
+torsoPath = NodePath("Torso")
 cameraPath = NodePath("GUI/HBoxC/ViewportContainer/Viewport/Camera")
 rayCastPath = NodePath("GUI/HBoxC/ViewportContainer/Viewport/MouseLook")
 viewPortPath = NodePath("GUI/HBoxC/ViewportContainer/Viewport")
+playerNumPath = NodePath("PlayerCountLabel")
 
 [node name="GUI" type="MarginContainer" parent="."]
 anchor_right = 1.0
@@ -65,9 +66,17 @@ enabled = true
 collide_with_areas = true
 collide_with_bodies = false
 
+[node name="PlayerCountLabel" type="Label" parent="."]
+anchor_left = 1.0
+anchor_right = 1.0
+margin_left = -30.0
+margin_right = 1.90735e-06
+margin_bottom = 600.0
+rect_min_size = Vector2( 30, 30 )
+text = "1/4"
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [node name="Torso" parent="." instance=ExtResource( 1 )]
-[node name="TorsoCollider" parent="Torso" index="0"]
-shape = null
-
 [connection signal="pressed" from="GUI/HBoxC/VBoxC/Start" to="." method="_on_Start_pressed"]

BodyConfig/bodyBuildingScript.gd

@@ -4,6 +4,7 @@ export(NodePath) var torsoPath
 export(NodePath) var cameraPath
 export(NodePath) var rayCastPath
 export(NodePath) var viewPortPath
+export(NodePath) var playerNumPath
 
 const ROT_MOD = 500 
 const ROT_DECLINE = 0.1
@@ -14,26 +15,37 @@ var _camera : Camera
 var _rayCast : RayCast
 var _torso : RigidBody
 var _viewport : Viewport
+var _playerNum : Label
 
 var _velx = 0
 var _vely = 0
 var _attachment_point : Spatial
 
 var _default_grav
+var done_player_count = 0
 
 signal start_fight()
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
-	_default_grav = PhysicsServer.area_get_param(get_viewport().find_world().get_space(), PhysicsServer.AREA_PARAM_GRAVITY)
-	PhysicsServer.area_set_param(get_viewport().find_world().get_space(), PhysicsServer.AREA_PARAM_GRAVITY, 0)
 	_torso = get_node(torsoPath) as RigidBody
 	_camera = get_node(cameraPath) as Camera
 	_rayCast = get_node(rayCastPath) as RayCast
 	_viewport = get_node(viewPortPath) as Viewport
+	_playerNum = get_node(playerNumPath) as Label
+
+
+func change_count_ui():
+	if done_player_count == null:
+		print("test")
+		done_player_count = 0
+	_playerNum.text = str(done_player_count + 1) + "/" + str(InGameState.player_count)
 
 
 func _process(delta):
+	# TODO: Would be nicer to just disable gravity, but then it can't be re-enabled...
+	_torso.translation = Vector3.ZERO
+	
 	if _viewRot:
 		var mouse_pos = get_viewport().get_mouse_position()
 		
@@ -122,6 +134,4 @@ func delete_body_part():
 
 
 func _on_Start_pressed():
-	PhysicsServer.area_set_param(get_viewport().find_world().get_space(), PhysicsServer.AREA_PARAM_GRAVITY, _default_grav)
-	
 	emit_signal("start_fight", _torso)

BodyParts/BodyBase/AttachmentPoint.gd

@@ -0,0 +1,23 @@
+extends Spatial
+
+
+export(int) var key
+
+onready var limb = get_node("Limb")
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready() -> void:
+	pass # Replace with function body.
+
+
+func _unhandled_input(event):
+	if event is InputEventKey:
+		if event.pressed and event.scancode == key:
+			if limb.get_child_count() > 0:
+				limb.get_child(0).action()
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta: float) -> void:
+#	pass

BodyParts/BodyBase/AttachmentPoint.tscn

@@ -1,10 +1,13 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://BodyParts/BodyBase/AttachmentPoint.gd" type="Script" id=1]
 
 [sub_resource type="SphereMesh" id=1]
 
 [sub_resource type="SphereShape" id=2]
 
 [node name="AttachmentPoint" type="Spatial"]
+script = ExtResource( 1 )
 
 [node name="Mesh" type="MeshInstance" parent="."]
 transform = Transform( 0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0, 0, 0 )

BodyParts/BodyBase/BodyBase.tscn

@@ -19,12 +19,14 @@ shape = SubResource( 1 )
 
 [node name="DownFrontLeft" parent="." instance=ExtResource( 2 )]
 transform = Transform( 0.965926, -1.45851e-07, -0.258819, -1.50996e-07, -1, -1.77636e-15, -0.258819, 3.90806e-08, -0.965926, 1.3, 1, 4.2 )
+key = 68
 
 [node name="Mesh" parent="DownFrontLeft" index="0"]
 transform = Transform( 0.2, 0, 3.72529e-09, 0, 0.2, 0, -3.72529e-09, 0, 0.2, 0, 0, 0 )
 
 [node name="DownFrontRight" parent="." instance=ExtResource( 2 )]
 transform = Transform( 0.965926, -1.45851e-07, 0.258819, -1.50996e-07, -1, 1.77636e-15, 0.258819, -3.90806e-08, -0.965926, -1.3, 1, 4.2 )
+key = 70
 
 [node name="OmniLight" parent="DownFrontRight" index="1"]
 transform = Transform( 1, 3.13083e-13, 0, -3.09641e-13, 1, -5.59552e-14, 0, 5.59552e-14, 1, -0.680858, -1.19209e-07, -1.38872 )
@@ -34,21 +36,27 @@ transform = Transform( 0.5, 1.4988e-15, 0, 1.4988e-15, 0.5, 0, 0, 0, 0.5, 0, 0,
 
 [node name="DownBackRight" parent="." instance=ExtResource( 2 )]
 transform = Transform( 0.982402, -3.24601e-07, 0.0859489, -3.2133e-07, -1, 0, 0.0859489, -2.83989e-08, -0.982402, -1.9, -1, 3.6 )
+key = 83
 
 [node name="DownBackLeft" parent="." instance=ExtResource( 2 )]
 transform = Transform( 0.982402, 3.24601e-07, -0.0859489, 3.2133e-07, -1, 0, -0.0859489, -2.83989e-08, -0.982402, 1.9, -1, 3.6 )
+key = 65
 
 [node name="UpFrontLeft" parent="." instance=ExtResource( 2 )]
 transform = Transform( 0.103081, -3.40598e-08, -0.980752, -3.2133e-07, -1, 0, -0.980752, 3.24056e-07, -0.103081, 2.9, 0, -2 )
+key = 69
 
 [node name="UpFrontRight" parent="." instance=ExtResource( 2 )]
 transform = Transform( 0.103081, 3.40598e-08, 0.980752, 3.2133e-07, -1, 0, 0.980752, 3.24056e-07, -0.103081, -2.9, 0, -2 )
+key = 82
 
 [node name="UpBackRight" parent="." instance=ExtResource( 2 )]
 transform = Transform( -0.870723, 0.384569, 0.26555, -1.84307e-07, -0.573576, 0.807811, 0.462972, 0.723268, 0.499426, -1, -1.9, -2.5 )
+key = 81
 
 [node name="UpBackLeft" parent="." instance=ExtResource( 2 )]
 transform = Transform( -0.870723, -0.384569, -0.26555, 1.84307e-07, -0.573576, 0.807811, -0.462972, 0.723268, 0.499426, 1, -1.9, -2.5 )
+key = 87
 
 [node name="Torso" parent="." instance=ExtResource( 3 )]
 transform = Transform( 0.5, 0, 0, 0, -2.18557e-08, 0.5, 0, -0.5, -2.18557e-08, 0, 0, 0 )

BodyParts/BodyPart.gd

@@ -7,8 +7,6 @@ class_name BodyPart
 onready var base = get_parent().get_parent().get_parent()
 onready var physics_shape = get_node("PartCollider")
 
-export(int) var key
-
 var setup_done = false
 
 
@@ -31,12 +29,6 @@ func _process(delta: float) -> void:
 		setup_done = true
 
 
-func _unhandled_input(event):
-	if event is InputEventKey:
-		if event.pressed and event.scancode == key:
-			action()
-
-
 # Do something with the base
 func action():
 	pass

Controllers/GameStateController.gd

@@ -7,8 +7,13 @@ const _win_screen_path = "res://UI/WinScreen.tscn"
 var _body_build_scene
 var _fighting_scene
 var _win_screen_scene
+var _bodies : Array
+var _body_count = 0
+var _body_positions = [Vector3(-30, 3, 0), Vector3(30, 3, 0), Vector3(0, 3, -30), Vector3(0, 3, 30)]
 
 func _ready():
+	InGameState.player_count = 2
+	
 	_prep_scene("body_build")
 	_prep_scene("fight_scene")
 	_prep_scene("win_screen")
@@ -31,6 +36,7 @@ func _prep_scene(scene_name) -> Node:
 		return _win_screen_scene
 	return null
 
+
 func _switch_scene(scene, scene_name):
 	#delete children
 	for child in get_children():
@@ -52,13 +58,25 @@ func _switch_to_win(player_id):
 
 func _switch_to_fighting(torso):
 	_body_build_scene.remove_child(torso)
-	torso.translation += Vector3(0, 3, 0)
-	torso.rotation = Vector3(0, 0, 0)
-	_switch_scene(_fighting_scene, "fight_scene")
 	
-	_fighting_scene.add_child(torso)
+	torso.global_transform.origin = Vector3.ZERO
+	torso.translation += Vector3(0, 4, 0)
+	torso.rotation = Vector3.ZERO
+	
+	_body_count += 1
+	if _body_count < InGameState.player_count:
+		_bodies.append(torso)
+		_switch_scene(_body_build_scene, "body_build")
+		
+		_body_build_scene.done_player_count = _body_count
+		_body_build_scene.change_count_ui()
+	else:
+		_switch_scene(_fighting_scene, "fight_scene")
+	
+		for body in _bodies:
+			_fighting_scene.add_child(body)
+		_fighting_scene.add_child(torso)
 
 
 func _switch_to_body_build():
 	_switch_scene(_body_build_scene, "body_build")
-

Global/BodyPartLoader.gd

@@ -4,5 +4,5 @@ var bodyparts : Dictionary
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
-	bodyparts["Arm"] = load("res://BodyParts/Arm.tscn")
+	bodyparts["Human Arm"] = load("res://BodyParts/HumanArm.tscn")
-	bodyparts["Humanleg"] = load("res://BodyParts/HumanLeg.tscn")
+	bodyparts["Human Leg"] = load("res://BodyParts/HumanLeg.tscn")

Ingame/CameraFocus.gd

@@ -1,13 +1,14 @@
 extends Spatial
 
-
-onready var player1 = get_parent().get_node("Torso")
-onready var player2 = get_parent().get_node("Torso2")
-
 onready var camera = get_node("Camera")
 
 
 func _process(delta: float) -> void:
+	var player1 = get_parent().get_child(3)
+	var player2 = get_parent().get_child(4)
+	
+	if not player1 and player2: return
+	
 	var center = player2.transform.origin + (player1.transform.origin - player2.transform.origin) / 2.0
 	var distance = (player1.transform.origin - player2.transform.origin).length()
 	

Ingame/Level/Torch.tscn

@@ -1,14 +1,30 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=8 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]
 [ext_resource path="res://Textures/Particles/Smoke.tscn" type="PackedScene" id=3]
+[ext_resource path="res://Textures/Fabric/Fabric28_rgh.jpg" type="Texture" id=4]
+[ext_resource path="res://Textures/Fabric/Fabric28_col.jpg" type="Texture" id=5]
+[ext_resource path="res://Textures/Fabric/Fabric28_nrm.jpg" type="Texture" id=6]
+
+[sub_resource type="SpatialMaterial" id=1]
+albedo_texture = ExtResource( 5 )
+roughness_texture = ExtResource( 4 )
+emission_enabled = true
+emission = Color( 0.270588, 0.203922, 0, 1 )
+emission_energy = 1.0
+emission_operator = 0
+emission_on_uv2 = false
+normal_enabled = true
+normal_scale = 1.0
+normal_texture = ExtResource( 6 )
 
 [node name="Torch" instance=ExtResource( 1 )]
 
 [node name="Cube" parent="." index="0"]
 cast_shadow = 0
 material/0 = ExtResource( 2 )
+material/1 = SubResource( 1 )
 
 [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 )

Ingame/Testing.tscn

@@ -1,12 +1,9 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=5 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]
 [ext_resource path="res://Ingame/CameraFocus.gd" type="Script" id=6]
-[ext_resource path="res://BodyParts/HumanLeg.tscn" type="PackedScene" id=7]
 
 [node name="InGame" type="Spatial"]
 script = ExtResource( 4 )
@@ -15,37 +12,8 @@ script = ExtResource( 4 )
 
 [node name="Arena" parent="." instance=ExtResource( 5 )]
 
-[node name="Torso" parent="." instance=ExtResource( 3 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 17.8512, 2, 0 )
-
-[node name="Torso2" parent="." instance=ExtResource( 3 )]
-transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 2, -10 )
-
-[node name="HumanLeg" parent="Torso2/DownFrontLeft/Limb" index="0" instance=ExtResource( 7 )]
-
-[node name="Arm" parent="Torso2/DownFrontRight/Limb" index="0" instance=ExtResource( 1 )]
-key = 83
-
-[node name="Arm" parent="Torso2/DownBackRight/Limb" index="0" instance=ExtResource( 1 )]
-key = 81
-
-[node name="Arm" parent="Torso2/DownBackLeft/Limb" index="0" instance=ExtResource( 1 )]
-key = 80
-
 [node name="CameraFocus" type="Spatial" parent="."]
 script = ExtResource( 6 )
 
 [node name="Camera" type="Camera" parent="CameraFocus"]
 transform = Transform( -4.2222e-08, -0.707107, 0.707107, -1.13133e-08, 0.707107, 0.707107, -1, 2.18557e-08, -3.78552e-08, 19, 17, -2 )
-
-[editable path="Torso"]
-
-[editable path="Torso2"]
-
-[editable path="Torso2/DownFrontLeft"]
-
-[editable path="Torso2/DownFrontRight"]
-
-[editable path="Torso2/DownBackRight"]
-
-[editable path="Torso2/DownBackLeft"]

Textures/Fabric/Fabric28_col.jpg.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/Fabric28_col.jpg-38d2e00b860817dc47ff3322974f73ca.s3tc.stex"
+path.etc2="res://.import/Fabric28_col.jpg-38d2e00b860817dc47ff3322974f73ca.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Textures/Fabric/Fabric28_col.jpg"
+dest_files=[ "res://.import/Fabric28_col.jpg-38d2e00b860817dc47ff3322974f73ca.s3tc.stex", "res://.import/Fabric28_col.jpg-38d2e00b860817dc47ff3322974f73ca.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/Fabric/Fabric28_disp.jpg.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Fabric28_disp.jpg-648f8e3ec3b3eef09560cf744278592f.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Textures/Fabric/Fabric28_disp.jpg"
+dest_files=[ "res://.import/Fabric28_disp.jpg-648f8e3ec3b3eef09560cf744278592f.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/Fabric/Fabric28_nrm.jpg.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/Fabric28_nrm.jpg-b6f0e8aedb0a7ab9a3f2aa0084146129.s3tc.stex"
+path.etc2="res://.import/Fabric28_nrm.jpg-b6f0e8aedb0a7ab9a3f2aa0084146129.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Textures/Fabric/Fabric28_nrm.jpg"
+dest_files=[ "res://.import/Fabric28_nrm.jpg-b6f0e8aedb0a7ab9a3f2aa0084146129.s3tc.stex", "res://.import/Fabric28_nrm.jpg-b6f0e8aedb0a7ab9a3f2aa0084146129.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/Fabric/Fabric28_rgh.jpg.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/Fabric28_rgh.jpg-6ae3f67af686558aba1365b73a0999ac.s3tc.stex"
+path.etc2="res://.import/Fabric28_rgh.jpg-6ae3f67af686558aba1365b73a0999ac.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Textures/Fabric/Fabric28_rgh.jpg"
+dest_files=[ "res://.import/Fabric28_rgh.jpg-6ae3f67af686558aba1365b73a0999ac.s3tc.stex", "res://.import/Fabric28_rgh.jpg-6ae3f67af686558aba1365b73a0999ac.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,7 +33,7 @@ _global_script_class_icons={
 [application]
 
 config/name="BodyPartFighter"
-run/main_scene="res://Ingame/Testing.tscn"
+run/main_scene="res://Controllers/GameStateController.tscn"
 config/icon="res://icon.png"
 
 [autoload]