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

3D Input/Beintextur.png.import

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

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

@@ -75,20 +75,32 @@ func _physics_process(delta):
 
 
 func _input(event):
-	if _viewport.get_viewport().get_mouse_position().x >= 0:
 	if event is InputEventMouseButton:
 		if event.pressed:
-				print("Mouse Click at: ", event.position)
+			if _viewport.get_viewport().get_mouse_position().x >= 0:
+				if event.button_index == BUTTON_WHEEL_UP:
+					_attachment_point.get_node("Limb").rotate_z(0.1)
+				elif event.button_index == BUTTON_WHEEL_DOWN:
+					_attachment_point.get_node("Limb").rotate_z(-0.1)
+				else:
 					_prev_mouse_pos = event.position
 					_viewRot = true
 		else: 
-				print("mouse unpressed at: ", event.position)
 			_viewRot = false
 
 
 func body_part_chosen(params):
+	#no _attachment_point 
+	if _attachment_point != null:
 		var limb = _attachment_point.get_node("Limb")
-	if limb != null:
+		
+		#adding only possible if no first child
+		#if limb.get_child(0) == null:
+		#	limb.add_child(BodyPartLoader.bodyparts[params].instance())
+		
+		#if spot already taken, DELETE
+		if limb.get_child(0) != null:
+			delete_body_part()
 		limb.add_child(BodyPartLoader.bodyparts[params].instance())
 
 
@@ -98,10 +110,8 @@ func make_it_shine(highlight : bool):
 
 
 func delete_body_part():
+	if _attachment_point != null:
 		var body_part = _attachment_point.get_node("Limb").get_child(0)
 		if body_part != null:
 			body_part.queue_free()
 
-
-
-

BodyParts/Arm.gd

@@ -15,7 +15,7 @@ func action():
 
 func push(body):
 	# We multiply by 0.1 because we only want it to spin slightly, it should mostly go up
-	base.apply_impulse(transform.basis.xform(touch_area.global_transform.origin) * 0.1, base.transform.basis.y * 5.0)
+	base.apply_impulse(transform.basis.xform(touch_area.global_transform.origin - global_transform.origin) * 0.1, base.transform.basis.y * 5.0)
 	
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 #func _process(delta: float) -> void:

BodyParts/Arm.tscn

@@ -13,8 +13,6 @@ 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, -2.83 )
@@ -29,14 +27,14 @@ visible = false
 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.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 )
+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 )
 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.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 )
+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 )
 
 [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, 0, 0, 0 )

BodyParts/BodyBase/AttachmentPoint.tscn

@@ -5,7 +5,6 @@
 [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 )

BodyParts/BodyBase/BodyBase.tscn

@@ -1,14 +1,23 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=6 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]
-[ext_resource path="res://3D Input/Fertige GLBs/Torso.glb" type="PackedScene" id=3]
+[ext_resource path="res://3D Input/Torso.glb" type="PackedScene" id=3]
+
+[sub_resource type="CapsuleMesh" id=1]
 
 [sub_resource type="CapsuleShape" id=2]
 
-[node name="Torso" type="RigidBody"]
+[node name="Torso" type="RigidBody" groups=[
+"Player",
+]]
 script = ExtResource( 1 )
 
+[node name="TorsoMesh" type="MeshInstance" parent="."]
+visible = false
+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 )
@@ -17,7 +26,7 @@ shape = SubResource( 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="FrontRight" parent="." instance=ExtResource( 2 )]
-transform = Transform( -0.5, 0, 0.866025, 0, 1, 0, -0.866025, 0, -0.5, -0.6, 0, 1 )
+transform = Transform( 0.5, -7.54979e-08, 0.866025, -1.50996e-07, -1, 0, 0.866025, -1.30766e-07, -0.5, -0.6, 0, 1 )
 
-[node name="Mesh" parent="." instance=ExtResource( 3 )]
+[node name="Torso" parent="." instance=ExtResource( 3 )]
 transform = Transform( 0.2, 0, 0, 0, -8.74228e-09, 0.2, 0, -0.2, -8.74228e-09, 0, 0, 0 )

BodyParts/BodyPart.gd

@@ -17,8 +17,6 @@ func _ready() -> void:
 	assert(base is BodyBase)
 
 
-
-
 func _process(delta: float) -> void:
 	# We do this here because we want the whole tree to really be done instancing
 	if not setup_done:

BodyParts/BodyPart.tscn

@@ -2,7 +2,6 @@
 
 [ext_resource path="res://BodyParts/BodyPart.gd" type="Script" id=1]
 
-
 [node name="BodyPart" type="Spatial"]
 script = ExtResource( 1 )
 

Controllers/GameStateController.gd

@@ -2,21 +2,17 @@ extends Node
 
 var _win_screen_scene
 var _fighting_scene_path = "res://Ingame/Testing.tscn"
-
+var _fighting_scene
-#test vars
+var _body_build_scene
-var test = 0
-var tested = false
-signal player_win(player_id)
-
-
 
 func _ready():
 	_win_screen_scene = preload("res://UI/WinScreen.tscn").instance()
-	#_fighting_scene = preload("res://Ingame/Testing.tscn").instance()
+	_body_build_scene = preload("res://BodyConfig/bodyBuilderMenu.tscn").instance()
-	
+	_fighting_scene = preload("res://Ingame/Testing.tscn").instance()
-	connect("player_win", self, "_switch_to_win")
-	_win_screen_scene.connect("start_fight", self, "_switch_to_fighting")
 	
+	InGameState.connect("player_win", self, "_switch_to_win")
+	_body_build_scene.connect("start_fight", self, "_switch_to_fighting")
+	_win_screen_scene.connect("build_body", self, "_switch_to_body_build")
 
 func _switch_scene(scene):
 	#delete children
@@ -35,15 +31,11 @@ func _switch_to_win(player_id):
 
 
 func _switch_to_fighting():
-	#_switch_scene(_fighting_scene)
+	print("oh fuck")
-	get_tree().reload_current_scene()
+	
+	_switch_scene(_fighting_scene)
+	#get_tree().reload_current_scene()
 
 
-# test
+func _switch_to_body_build():
-#func _process(delta):
+	_switch_scene(_body_build_scene)
-	#if test > 3 and not tested:
-		#tested = true
-		#test = 0
-		#emit_signal("player_win", 1)
-	#else:
-		#test += delta

Controllers/GameStateController.tscn

@@ -1,9 +1,9 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://Controllers/GameStateController.gd" type="Script" id=1]
-[ext_resource path="res://Ingame/Testing.tscn" type="PackedScene" id=2]
+[ext_resource path="res://BodyConfig/bodyBuilderMenu.tscn" type="PackedScene" id=2]
 
 [node name="GameStateController" type="Node"]
 script = ExtResource( 1 )
 
-[node name="InGame" parent="." instance=ExtResource( 2 )]
+[node name="Body Builder Menu" parent="." instance=ExtResource( 2 )]

Ingame/CameraFocus.gd

@@ -0,0 +1,16 @@
+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 center = player2.transform.origin + (player1.transform.origin - player2.transform.origin) / 2.0
+	var distance = (player1.transform.origin - player2.transform.origin).length()
+	
+	camera.fov = distance + 50.0
+	
+	transform.origin = center

Ingame/Testing.tscn

@@ -1,40 +1,52 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=7 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]
 
 [node name="InGame" type="Spatial"]
 script = ExtResource( 4 )
 
-[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="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
-
-[node name="Arm" parent="Torso/FrontRight" index="1" instance=ExtResource( 1 )]
-key = 65
-
-[node name="Torso2" parent="." instance=ExtResource( 3 )]
-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
-
-[node name="Arm" parent="Torso2/FrontRight" index="1" instance=ExtResource( 1 )]
-key = 87
-
 [node name="UI" parent="." instance=ExtResource( 2 )]
 
 [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, 0, 2, 0 )
+
+[node name="Arm" parent="Torso/FrontLeft/Limb" index="0" instance=ExtResource( 1 )]
+key = 81
+
+[node name="Arm" parent="Torso/FrontRight/Limb" index="0" instance=ExtResource( 1 )]
+key = 87
+
+[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="Arm" parent="Torso2/FrontLeft/Limb" index="0" instance=ExtResource( 1 )]
+transform = Transform( 1, 2.84217e-14, 0, -2.84217e-14, 1, 0, 0, 0, 1, 0, 0, 0 )
+key = 79
+
+[node name="Arm" parent="Torso2/FrontRight/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="Torso/FrontLeft"]
+
+[editable path="Torso/FrontRight"]
+
 [editable path="Torso2"]
+
+[editable path="Torso2/FrontLeft"]
+
+[editable path="Torso2/FrontRight"]

Resources/Fonts/FontReadMe.txt

@@ -0,0 +1,29 @@
+T E P I D   M O N K E Y   F O N T S
+freeware fonts for a freeware world
+
+Site:   http://www.tepidmonkey.com/
+E-mail: brandon@tepidmonkey.com
+
+Thanks for your interest in my fonts!
+
+For help on how to unzip, unstuff or install one of my 
+fonts, please visit my site at 
+www.tepidmonkey.com and go to the Help section.
+If you have any comments or questions, you can e-mail 
+me at brandon@tepidmonkey.com and I'll try to reply as 
+soon as possible.
+
+Every week, I present a brand new original font for 
+your downloading pleasure, so be sure to visit the web 
+site every Sunday.
+
+You may use this font(s) for non-commercial and 
+commercial purposes. You are not allowed to sell this 
+font for any fee at all. You are allowed to 
+redistribute it as long as you don't charge anything 
+for it and as long as you include this unaltered 
+ReadMe.txt file. You may not change any aspect of the font 
+file or of this file.
+For the full set of terms of use (which override what 
+is listed here anyway), go to www.tepidmonkey.com 
+and visit the Terms section.

UI/WinScreen.tscn

@@ -38,9 +38,9 @@ align = 1
 valign = 2
 
 [node name="PlayerWon" type="Label" parent="MarginContainer/VBoxContainer"]
-margin_top = 253.0
+margin_top = 254.0
 margin_right = 1024.0
-margin_bottom = 503.0
+margin_bottom = 504.0
 rect_min_size = Vector2( 0, 250 )
 custom_fonts/font = ExtResource( 3 )
 align = 1

UI/WinScreenScript.gd

@@ -3,7 +3,7 @@ extends Control
 export(NodePath) var labelPath
 export(NodePath) var continuePath
 
-signal start_fight()
+signal build_body()
 
 var _playerWonLabel
 var _continueButton
@@ -20,4 +20,4 @@ func set_win_message(player_id):
 func _on_Continue_pressed():
 	print("test2")
 	
-	emit_signal("start_fight")
+	emit_signal("build_body")

project.godot

@@ -38,8 +38,8 @@ config/icon="res://icon.png"
 
 [autoload]
 
-InGameState="*res://Global/InGameState.gd"
 BodyPartLoader="*res://Global/BodyPartLoader.gd"
+InGameState="*res://Global/InGameState.gd"
 
 [rendering]