Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
This commit is contained in:
commit
c2fa4e36ba
1062
3D Input/Fertige GLBs/Kopf_Stier.glb.import
Normal file
1062
3D Input/Fertige GLBs/Kopf_Stier.glb.import
Normal file
File diff suppressed because it is too large
Load Diff
34
3D Input/Flugeltextur.png.import
Normal file
34
3D Input/Flugeltextur.png.import
Normal file
@ -0,0 +1,34 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture"
|
||||
path="res://.import/Flugeltextur.png-26cef747ba4cfd8b0ac92c412a917c69.stex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://3D Input/Flugeltextur.png"
|
||||
dest_files=[ "res://.import/Flugeltextur.png-26cef747ba4cfd8b0ac92c412a917c69.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
|
BIN
3D Input/hühnchen kopf.blend
Normal file
BIN
3D Input/hühnchen kopf.blend
Normal file
Binary file not shown.
BIN
3D Input/hühnchen kopf.blend1
Normal file
BIN
3D Input/hühnchen kopf.blend1
Normal file
Binary file not shown.
34
3D Input/stiertextur.png.import
Normal file
34
3D Input/stiertextur.png.import
Normal file
@ -0,0 +1,34 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture"
|
||||
path="res://.import/stiertextur.png-deb6038266d9a20bfe850d7c34f3aec9.stex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://3D Input/stiertextur.png"
|
||||
dest_files=[ "res://.import/stiertextur.png-deb6038266d9a20bfe850d7c34f3aec9.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
|
@ -17,9 +17,9 @@ 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, 0, -1.5 )
|
||||
visible = false
|
||||
light_color = Color( 0.956863, 0.121569, 0.121569, 1 )
|
||||
light_energy = 3.86
|
||||
omni_range = 1.8
|
||||
light_color = Color( 0, 0.188235, 0.756863, 1 )
|
||||
light_energy = 10.0
|
||||
omni_range = 2.0
|
||||
|
||||
[node name="Area" type="Area" parent="."]
|
||||
|
||||
|
@ -14,11 +14,20 @@ func on_ingame():
|
||||
axis_lock_linear_x = true
|
||||
|
||||
|
||||
func _process(delta):
|
||||
func _physics_process(delta):
|
||||
if ingame:
|
||||
current_angle = ((-transform.basis.z).angle_to(ground.transform.basis.y))
|
||||
|
||||
var rot_vector = (-transform.basis.z).cross(ground.transform.basis.y)
|
||||
|
||||
if current_angle > 0.2:
|
||||
apply_torque_impulse(rot_vector * current_angle * 14)
|
||||
for body in get_colliding_bodies():
|
||||
if body.name == "StaticBody":
|
||||
if current_angle > 0.3:
|
||||
apply_torque_impulse(rot_vector * current_angle * 7)
|
||||
elif current_angle > 0.05:
|
||||
apply_torque_impulse(-(rot_vector * current_angle * 20))
|
||||
else:
|
||||
angular_velocity = Vector3.ZERO
|
||||
|
||||
print("deg: %s" % rad2deg(current_angle))
|
||||
print("rad: %s" % current_angle)
|
||||
|
@ -12,8 +12,10 @@ height = 1.48749
|
||||
"Player",
|
||||
]]
|
||||
transform = Transform( 1, 0, 0, 0, -1.62921e-07, -1, 0, 1, -1.62921e-07, 0, 0, 0 )
|
||||
mass = 1.5
|
||||
mass = 1.73469
|
||||
gravity_scale = 1.5
|
||||
contacts_reported = 5
|
||||
contact_monitor = true
|
||||
script = ExtResource( 1 )
|
||||
|
||||
[node name="TorsoCollider" type="CollisionShape" parent="."]
|
||||
|
@ -18,6 +18,7 @@ roughness = 0.3
|
||||
[node name="FrogLeg" instance=ExtResource( 1 )]
|
||||
transform = Transform( -1, 8.74228e-08, 0, -8.74228e-08, -1, 0, 0, 0, 1, 0, 0, 0 )
|
||||
script = ExtResource( 2 )
|
||||
cost = 30.0
|
||||
|
||||
[node name="PartCollider" parent="." index="0"]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.21377, -0.911304, -3.94992 )
|
||||
@ -32,6 +33,9 @@ shape = SubResource( 3 )
|
||||
[node name="Mesh" parent="." index="2" instance=ExtResource( 3 )]
|
||||
transform = Transform( -1.13133e-08, 4.2222e-08, 1, 0.965926, 0.258819, 0, -0.258819, 0.965926, -4.37114e-08, 0.734499, -2.94707, -2.68774 )
|
||||
|
||||
[node name="Skeleton" parent="Mesh/Armature" index="0"]
|
||||
bones/3/bound_children = [ NodePath("BoneAttachment") ]
|
||||
|
||||
[node name="froschbein" parent="Mesh/Armature/Skeleton" index="0"]
|
||||
transform = Transform( 1, -1.49012e-08, 0, 0, 1, -5.96046e-08, 0, 2.98023e-08, 1, 0, 0, 0 )
|
||||
material/0 = SubResource( 1 )
|
||||
|
@ -17,6 +17,8 @@ albedo_texture = ExtResource( 4 )
|
||||
[node name="GorillaArm" instance=ExtResource( 1 )]
|
||||
transform = Transform( 1, 0, 0, 0, 0.966025, 0.258448, 0, -0.258448, 0.966025, 0, 0, 0 )
|
||||
script = ExtResource( 2 )
|
||||
cost = 25.0
|
||||
damage = 15.0
|
||||
|
||||
[node name="PartCollider" parent="." index="0"]
|
||||
transform = Transform( 1, 0, 0, 0, 0.534515, -0.845159, 0, 0.845159, 0.534515, -0.0701199, -4.33779, -2.5341 )
|
||||
|
@ -5,18 +5,19 @@
|
||||
[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 )
|
||||
extents = Vector3( 0.533899, 0.405119, 2.17243 )
|
||||
|
||||
[sub_resource type="SphereShape" id=2]
|
||||
radius = 0.125064
|
||||
radius = 0.101154
|
||||
|
||||
[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 )
|
||||
cost = 10.0
|
||||
damage = 5.0
|
||||
|
||||
[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 )
|
||||
transform = Transform( 0.796097, 0.0325159, -0.604295, 0, 0.998555, 0.0537302, 0.605169, -0.0427745, 0.794947, -0.893398, -0.0369669, -2.62016 )
|
||||
shape = SubResource( 1 )
|
||||
|
||||
[node name="TouchArea" parent="." index="1"]
|
||||
@ -28,6 +29,9 @@ 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.0646207, -0.736312, -0.673549, -0.240426, 0.64359, -0.726627, 0.968514, 0.208894, -0.135439, 0.054756, 1.13784, 0.129916 )
|
||||
bone_name = "bone_6"
|
||||
|
@ -18,6 +18,7 @@ albedo_texture = ExtResource( 4 )
|
||||
transform = Transform( 1, 8.74228e-08, -3.82137e-15, 0, -4.37114e-08, -1, -8.74228e-08, 1, -4.37114e-08, 0, 0, 0 )
|
||||
script = ExtResource( 2 )
|
||||
cost = 20.0
|
||||
damage = 8.0
|
||||
|
||||
[node name="PartCollider" parent="." index="0"]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -3.37252, -0.326758 )
|
||||
|
@ -5,7 +5,7 @@
|
||||
[ext_resource path="res://default_env.tres" type="Environment" id=3]
|
||||
[ext_resource path="res://Ingame/Level/Fence.tscn" type="PackedScene" id=5]
|
||||
|
||||
[sub_resource type="Curve3D" id=2]
|
||||
[sub_resource type="Curve3D" id=1]
|
||||
_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 )
|
||||
@ -37,7 +37,7 @@ environment = ExtResource( 3 )
|
||||
[node name="ground" parent="." instance=ExtResource( 2 )]
|
||||
|
||||
[node name="Path" type="Path" parent="."]
|
||||
curve = SubResource( 2 )
|
||||
curve = SubResource( 1 )
|
||||
|
||||
[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 )
|
||||
@ -56,7 +56,7 @@ rotation_mode = 4
|
||||
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.05253, 1.77306, 0, -55.9514 )
|
||||
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
|
||||
|
||||
|
@ -4,7 +4,7 @@
|
||||
[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 )
|
||||
extents = Vector3( 0.537798, 23, 12.5193 )
|
||||
|
||||
[node name="Fence" instance=ExtResource( 1 )]
|
||||
|
||||
@ -24,6 +24,7 @@ material/0 = ExtResource( 2 )
|
||||
material/0 = ExtResource( 2 )
|
||||
|
||||
[node name="StaticBody" type="StaticBody" parent="." index="5"]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 16, 0 )
|
||||
|
||||
[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 )
|
||||
|
@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=8 format=2]
|
||||
[gd_scene load_steps=9 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]
|
||||
@ -19,6 +19,9 @@ normal_enabled = true
|
||||
normal_scale = 1.0
|
||||
normal_texture = ExtResource( 6 )
|
||||
|
||||
[sub_resource type="BoxShape" id=2]
|
||||
extents = Vector3( 0.226179, 3.74534, 0.250637 )
|
||||
|
||||
[node name="Torch" instance=ExtResource( 1 )]
|
||||
|
||||
[node name="Cube" parent="." index="0"]
|
||||
@ -34,3 +37,9 @@ shadow_enabled = true
|
||||
omni_range = 87.1226
|
||||
|
||||
[node name="Smoke" parent="." index="2" instance=ExtResource( 3 )]
|
||||
|
||||
[node name="StaticBody" type="StaticBody" parent="." index="3"]
|
||||
|
||||
[node name="CollisionShape" type="CollisionShape" parent="StaticBody" index="0"]
|
||||
transform = Transform( 0.99774, -0.0671969, 0, 0.0671969, 0.99774, 0, 0, 0, 1, -0.404917, 3.92084, 0 )
|
||||
shape = SubResource( 2 )
|
||||
|
@ -12,6 +12,24 @@ script = ExtResource( 4 )
|
||||
|
||||
[node name="Arena" parent="." instance=ExtResource( 5 )]
|
||||
|
||||
[node name="PathFollow3" parent="Arena/Path" index="2"]
|
||||
transform = Transform( 0.0525302, 0, 0.998617, 0, 1, 0, -0.998619, 0, 0.05253, 1.77306, 0, -55.9514 )
|
||||
|
||||
[node name="PathFollow6" parent="Arena/Path" index="5"]
|
||||
transform = Transform( 0.951672, 0, 0.307114, 0, 1, 0, -0.307114, 0, 0.951672, 54.056, 0, -11.6692 )
|
||||
|
||||
[node name="PathFollow7" parent="Arena/Path" index="6"]
|
||||
transform = Transform( 0.989853, 0, 0.142099, 0, 1, 0, -0.142099, 0, 0.98985, 60.6244, 0, 12.2053 )
|
||||
|
||||
[node name="PathFollow12" parent="Arena/Path" index="11"]
|
||||
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 )
|
||||
|
||||
[node name="PathFollow15" parent="Arena/Path" index="14"]
|
||||
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 )
|
||||
|
||||
[node name="PathFollow16" parent="Arena/Path" index="15"]
|
||||
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 )
|
||||
|
||||
[node name="CameraFocus" type="Spatial" parent="."]
|
||||
script = ExtResource( 6 )
|
||||
|
||||
|
17
Ingame/TrueTest.gd
Normal file
17
Ingame/TrueTest.gd
Normal file
@ -0,0 +1,17 @@
|
||||
extends Spatial
|
||||
|
||||
|
||||
# Declare member variables here. Examples:
|
||||
# var a = 2
|
||||
# var b = "text"
|
||||
|
||||
|
||||
# Called when the node enters the scene tree for the first time.
|
||||
func _ready():
|
||||
get_parent().get_child(3).on_ingame()
|
||||
get_parent().get_child(4).on_ingame()
|
||||
|
||||
|
||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||
#func _process(delta):
|
||||
# pass
|
62
Ingame/TrueTest.tscn
Normal file
62
Ingame/TrueTest.tscn
Normal file
@ -0,0 +1,62 @@
|
||||
[gd_scene load_steps=8 format=2]
|
||||
|
||||
[ext_resource path="res://BodyParts/BodyBase/BodyBase.tscn" type="PackedScene" id=1]
|
||||
[ext_resource path="res://UI/UI.tscn" type="PackedScene" id=2]
|
||||
[ext_resource path="res://BodyParts/HumanLeg.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://Ingame/TrueTest.gd" type="Script" id=7]
|
||||
|
||||
[node name="InGame" type="Spatial"]
|
||||
script = ExtResource( 4 )
|
||||
|
||||
[node name="UI" parent="." instance=ExtResource( 2 )]
|
||||
|
||||
[node name="Arena" parent="." instance=ExtResource( 5 )]
|
||||
|
||||
[node name="PathFollow3" parent="Arena/Path" index="2"]
|
||||
transform = Transform( 0.0525302, 0, 0.998614, 0, 1, 0, -0.998619, 0, 0.0525299, 1.77306, 0, -55.9514 )
|
||||
|
||||
[node name="PathFollow6" parent="Arena/Path" index="5"]
|
||||
transform = Transform( 0.951672, 0, 0.307114, 0, 1, 0, -0.307114, 0, 0.951672, 54.056, 0, -11.6692 )
|
||||
|
||||
[node name="PathFollow7" parent="Arena/Path" index="6"]
|
||||
transform = Transform( 0.989853, 0, 0.142099, 0, 1, 0, -0.142099, 0, 0.98985, 60.6244, 0, 12.2053 )
|
||||
|
||||
[node name="PathFollow12" parent="Arena/Path" index="11"]
|
||||
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 )
|
||||
|
||||
[node name="PathFollow16" parent="Arena/Path" index="15"]
|
||||
transform = Transform( -0.999998, 4.26235e-07, -0.00197735, 4.26236e-07, 1, 0, 0.00197735, -8.42818e-10, -0.999998, -65.6734, 0, -1.33537 )
|
||||
|
||||
[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 )
|
||||
|
||||
[node name="Torso" parent="." instance=ExtResource( 1 )]
|
||||
transform = Transform( 1, 0, 0, 0, -1.62921e-07, -1, 0, 1, -1.62921e-07, 0, 13.6326, 2.22103e-06 )
|
||||
|
||||
[node name="HumanLeg" parent="Torso/DownFrontLeft/Limb" index="0" instance=ExtResource( 3 )]
|
||||
damage = 65.0
|
||||
|
||||
[node name="HumanLeg" parent="Torso/DownFrontRight/Limb" index="0" instance=ExtResource( 3 )]
|
||||
damage = 83.0
|
||||
|
||||
[node name="Torso2" parent="." instance=ExtResource( 1 )]
|
||||
transform = Transform( 1, 0, 0, 0, -1.62921e-07, -1, 0, 1, -1.62921e-07, 0, 13.6326, 36.3206 )
|
||||
|
||||
[node name="Spatial" type="Spatial" parent="."]
|
||||
script = ExtResource( 7 )
|
||||
|
||||
[editable path="Arena"]
|
||||
|
||||
[editable path="Torso"]
|
||||
|
||||
[editable path="Torso/DownFrontLeft"]
|
||||
|
||||
[editable path="Torso/DownFrontRight"]
|
||||
|
||||
[editable path="Torso2"]
|
Loading…
x
Reference in New Issue
Block a user