merge

3D Input/handTextur.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/handTextur.png-033a3dd9ac9dc649dfe719b0dc401e9e.s3tc.stex"
+path.etc2="res://.import/handTextur.png-033a3dd9ac9dc649dfe719b0dc401e9e.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://3D Input/handTextur.png"
+dest_files=[ "res://.import/handTextur.png-033a3dd9ac9dc649dfe719b0dc401e9e.s3tc.stex", "res://.import/handTextur.png-033a3dd9ac9dc649dfe719b0dc401e9e.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

BodyConfig/bodyBuilderMenu.tscn

@@ -65,5 +65,9 @@ enabled = true
 collide_with_areas = true
 collide_with_bodies = false
 
-[node name="Player" parent="." instance=ExtResource( 1 )]
+
+[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"]

BodyParts/BodyBase/BodyBase.tscn

@@ -5,6 +5,8 @@
 [ext_resource path="res://3D Input/Torso.glb" type="PackedScene" id=3]
 
 [sub_resource type="CapsuleShape" id=1]
+radius = 0.855929
+height = 1.48749
 
 [node name="Torso" type="RigidBody" groups=[
 "Player",

BodyParts/HumanArm.gd

@@ -0,0 +1,20 @@
+extends PushingBodyPart
+
+
+onready var anim = get_node("Mesh/AnimationPlayer")
+
+
+func action():
+	anim.play("ArmatureAction")
+
+
+func push(body):
+	# We multiply by 0.1 because we only want it to spin slightly, it should mostly go up
+	var offset = transform.basis.xform(touch_area.global_transform.origin - base.global_transform.origin) * 0.1
+	var direction = (base.transform.basis.y - base.transform.basis.z).normalized() * 5.0
+	
+	base.apply_impulse(offset, direction)
+	
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta: float) -> void:
+#	pass

BodyParts/HumanArm.tscn

@@ -0,0 +1,43 @@
+[gd_scene load_steps=6 format=2]
+
+[ext_resource path="res://BodyParts/PushingBodyPart.tscn" type="PackedScene" id=1]
+[ext_resource path="res://BodyParts/HumanArm.gd" type="Script" id=2]
+[ext_resource path="res://3D Input/Fertige GLBs/Arm_Mensch.glb" type="PackedScene" id=4]
+
+[sub_resource type="BoxShape" id=1]
+extents = Vector3( 0.533899, 0.203146, 2.17243 )
+
+[sub_resource type="SphereShape" id=2]
+radius = 0.125064
+
+[node name="HumanArm" instance=ExtResource( 1 )]
+transform = Transform( -4.37114e-08, 1, 4.37114e-08, 0, -4.37114e-08, 1, 1, 4.37114e-08, 1.91069e-15, 0, 0, 0 )
+script = ExtResource( 2 )
+
+[node name="PartCollider" parent="." index="0"]
+transform = Transform( 0.796097, 0, -0.605169, 0, 1, -3.55271e-15, 0.605169, 8.35188e-23, 0.796097, -0.894889, 1.42109e-14, -2.6182 )
+shape = SubResource( 1 )
+
+[node name="TouchArea" parent="." index="1"]
+transform = Transform( -0.114995, 2.15415, 2.55188, -3.31495, -0.382831, 0.173782, 0.404395, -2.52562, 2.15021, -0.0333271, -0.131349, -3.878 )
+
+[node name="CollisionShape" type="CollisionShape" parent="TouchArea" index="0"]
+shape = SubResource( 2 )
+
+[node name="Mesh" parent="." index="2" instance=ExtResource( 4 )]
+transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 2, -0.357728, -8.51476, 0 )
+
+[node name="Skeleton" parent="Mesh/Armature" index="0"]
+bones/7/bound_children = [ NodePath("BoneAttachment") ]
+
+[node name="BoneAttachment" type="BoneAttachment" parent="Mesh/Armature/Skeleton" index="1"]
+transform = Transform( 0.0638506, -0.727912, -0.682691, -0.242273, 0.652315, -0.718184, 0.968104, 0.211254, -0.134703, 0.0541456, 1.16231, 0.134369 )
+bone_name = "bone_6"
+
+[node name="RemoteTransform" type="RemoteTransform" parent="Mesh/Armature/Skeleton/BoneAttachment" index="0"]
+remote_path = NodePath("../../../../../TouchArea")
+
+[node name="AnimationPlayer" parent="Mesh" index="2"]
+playback_speed = 3.0
+
+[editable path="Mesh"]

Ingame/Level/Torch.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 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]
 
 [node name="Torch" instance=ExtResource( 1 )]
 
@@ -15,3 +16,5 @@ light_color = Color( 0.996078, 0.568627, 0.380392, 1 )
 light_energy = 3.0
 shadow_enabled = true
 omni_range = 87.1226
+
+[node name="Smoke" parent="." index="2" instance=ExtResource( 3 )]

Textures/Particles/Smoke.tscn

@@ -0,0 +1,76 @@
+[gd_scene load_steps=10 format=2]
+
+[ext_resource path="res://Textures/Particles/smoke.png" type="Texture" id=1]
+
+[sub_resource type="SpatialMaterial" id=1]
+flags_transparent = true
+flags_unshaded = true
+vertex_color_use_as_albedo = true
+params_blend_mode = 1
+params_billboard_mode = 3
+particles_anim_h_frames = 1
+particles_anim_v_frames = 1
+particles_anim_loop = false
+albedo_texture = ExtResource( 1 )
+
+[sub_resource type="Gradient" id=2]
+offsets = PoolRealArray( 0, 0.621849, 1 )
+colors = PoolColorArray( 1, 0, 0, 1, 0.40625, 0.00317383, 0.00317383, 1, 1, 1, 1, 0 )
+
+[sub_resource type="GradientTexture" id=3]
+gradient = SubResource( 2 )
+
+[sub_resource type="Curve" id=4]
+_data = [ Vector2( 0, 0 ), 0.0, 2.01322, 0, 0, Vector2( 0.532567, 0.990909 ), 0.0, 0.0, 0, 0, Vector2( 1, 0.3 ), -2.28485, 0.0, 0, 0 ]
+
+[sub_resource type="CurveTexture" id=5]
+curve = SubResource( 4 )
+
+[sub_resource type="ParticlesMaterial" id=6]
+emission_shape = 1
+emission_sphere_radius = 0.5
+gravity = Vector3( 0, 5, 0 )
+angular_velocity = 40.0
+angular_velocity_random = 0.07
+linear_accel = -1.45
+angle = 360.0
+angle_random = 1.0
+scale = 0.7
+scale_random = 0.2
+scale_curve = SubResource( 5 )
+color_ramp = SubResource( 3 )
+
+[sub_resource type="QuadMesh" id=7]
+
+[sub_resource type="ParticlesMaterial" id=8]
+emission_shape = 1
+emission_sphere_radius = 0.2
+gravity = Vector3( 0, 4, 0 )
+angular_velocity = 40.0
+angular_velocity_random = 0.07
+linear_accel = -1.45
+angle = 360.0
+angle_random = 1.0
+scale = 0.7
+scale_random = 0.2
+scale_curve = SubResource( 5 )
+color_ramp = SubResource( 3 )
+
+[node name="Smoke" type="Spatial"]
+
+[node name="SpottedSmoke" type="Particles" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.701113, 7.2704, 0 )
+visible = false
+material_override = SubResource( 1 )
+amount = 4
+lifetime = 1.71
+process_material = SubResource( 6 )
+draw_pass_1 = SubResource( 7 )
+
+[node name="ContinuousSmoke" type="Particles" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.701113, 7.2704, 0 )
+material_override = SubResource( 1 )
+amount = 40
+lifetime = 1.71
+process_material = SubResource( 8 )
+draw_pass_1 = SubResource( 7 )

Textures/Particles/smoke.png.import

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

project.godot

@@ -43,4 +43,5 @@ InGameState="*res://Global/InGameState.gd"
 
 [rendering]
 
+quality/shadows/filter_mode=2
 environment/default_environment="res://default_env.tres"