bif/retrace
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace

Browse Source
This commit is contained in:
Leon Palluch 2020-01-27 17:52:53 +01:00
commit 6ebab1cdfa
2 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Characters/Meldewesen/Meldewesen.gd
View File

@ -1,7 +1,7 @@
extends NPC extends NPC
export(NodePath) var _visibility_path: NodePath #export(NodePath) var _visibility_path: NodePath
export(int) var _player_follow_pill_level = 3 export(int) var _player_follow_pill_level = 3
onready var visibility_cone_mesh = get_node("Visibility/VisibilityCone") onready var visibility_cone_mesh = get_node("Visibility/VisibilityCone")
@ -45,7 +45,7 @@ func _ready():
_audioPlayer = get_node("AudioStreamPlayer3D") as AudioStreamPlayer3D _audioPlayer = get_node("AudioStreamPlayer3D") as AudioStreamPlayer3D
assert(null != _audioPlayer) assert(null != _audioPlayer)
_visibility = get_node(_visibility_path) as Area _visibility = get_node("Visibility") as Area
assert(null != _visibility) assert(null != _visibility)
_visibility.connect("body_entered", self, "_on_body_entered_visibility") _visibility.connect("body_entered", self, "_on_body_entered_visibility")
_visibility.connect("body_exited", self, "_on_body_exited_visibility") _visibility.connect("body_exited", self, "_on_body_exited_visibility")
@ -153,7 +153,7 @@ func _set_behavior ():
if Pills.get_round_level() <= _player_follow_pill_level: if Pills.get_round_level() <= _player_follow_pill_level:
Logger.info("The player's pill level is too low - following!") Logger.info("The player's pill level is too low - following!")
_followingPlayer = true _followingPlayer = true
change_visibility_cone_color(Color.yellowgreen) change_visibility_cone_color(Color.yellow)
if _huntingPlayer or _followingPlayer: if _huntingPlayer or _followingPlayer:
current_target = _playerRef.transform.origin current_target = _playerRef.transform.origin

47
Level/OutsideWorld.tscn
View File

@ -17,8 +17,8 @@
[sub_resource type="Curve3D" id=1] [sub_resource type="Curve3D" id=1]
_data = { _data = {
"points": PoolVector3Array( 0, 0, 0, 0, 0, 0, 2.77093, 0, 97.8557, 0, 0, 0, 0, 0, 0, 26.9732, -0.000976562, 98.019, 0, 0, 0, 0, 0, 0, 26.5524, -0.0141602, 64.329, 0, 0, 0, 0, 0, 0, 3.05817, 0, 64.3674 ), "points": PoolVector3Array( 0, 0, 0, 0, 0, 0, -2.79141, 0, 64.3776, 0, 0, 0, 0, 0, 0, 3.92828, 0, 58.7873, 0, 0, 0, 0, 0, 0, 25.1256, 0, 59.1506, 0, 0, 0, 0, 0, 0, 31.6821, 0, 65.5338, 0, 0, 0, 0, 0, 0, 31.843, 0, 89.6361, 0, 0, 0, 0, 0, 0, 25.1319, 7.62939e-006, 95.8734, 0, 0, 0, 0, 0, 0, 3.93893, 1.52588e-005, 95.8336, 0, 0, 0, 0, 0, 0, -2.78792, 2.28882e-005, 88.8055, 0, 0, 0, 0, 0, 0, -2.79141, 0, 64.3776 ),
"tilts": PoolRealArray( 0, 0, 0, 0 ) "tilts": PoolRealArray( 0, 0, 0, 0, 0, 0, 0, 0, 0 )
} }
[sub_resource type="BoxShape" id=2] [sub_resource type="BoxShape" id=2]
@ -52,18 +52,24 @@ background_sky = SubResource( 7 )
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 18.5724, 0, 79.2998 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 18.5724, 0, 79.2998 )
[node name="PathNavigatorForNPC" parent="." instance=ExtResource( 2 )] [node name="PathNavigatorForNPC" parent="." instance=ExtResource( 2 )]
editor/display_folded = true
curve = SubResource( 1 ) curve = SubResource( 1 )
body_nodepath = NodePath("Meldewesen") body_nodepath = NodePath("Meldewesen")
[node name="Meldewesen" parent="PathNavigatorForNPC" instance=ExtResource( 3 )] [node name="Meldewesen" parent="PathNavigatorForNPC" instance=ExtResource( 3 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 93.2622 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.14131, 0, 101.825 )
[node name="Enemies" type="Spatial" parent="."] [node name="Enemies" type="Spatial" parent="."]
editor/display_folded = true
[node name="Meldewesen2" parent="Enemies" instance=ExtResource( 3 )] [node name="Meldewesen2" parent="Enemies" instance=ExtResource( 3 )]
transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -0.600893, 0, 30.3683 ) transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 14.9623, 0, 52.3728 )
_visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility")
[node name="Meldewesen3" parent="Enemies" instance=ExtResource( 3 )]
transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 70.7133, 0, 4.86107 )
_visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility")
[node name="Meldewesen4" parent="Enemies" instance=ExtResource( 3 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 56.7007, 0, 24.1842 )
_visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility") _visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility")
[node name="MaskedAmbience" type="AudioStreamPlayer" parent="."] [node name="MaskedAmbience" type="AudioStreamPlayer" parent="."]
@ -84,7 +90,7 @@ bus = "True"
transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 15.0831, 1.63203, 13.0809 ) transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 15.0831, 1.63203, 13.0809 )
[node name="Keycard" parent="Collectibles" instance=ExtResource( 7 )] [node name="Keycard" parent="Collectibles" instance=ExtResource( 7 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -32.6122, 0, -88.5269 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 8.09239, 0, 67.8154 )
[node name="Key" parent="Collectibles" groups=[ [node name="Key" parent="Collectibles" groups=[
"Collectibles", "Collectibles",
@ -130,24 +136,25 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.127018, 0, 0.00287628 )
curve = SubResource( 3 ) curve = SubResource( 3 )
[node name="PathFollow" type="PathFollow" parent="WorkerSpawner/Path"] [node name="PathFollow" type="PathFollow" parent="WorkerSpawner/Path"]
transform = Transform( -0.998276, 0.00481672, 0.0584792, 0.0049628, 0.999985, 0.00235273, -0.0584662, 0.00263891, -0.998284, -15.7672, 0.284373, -190.888 ) transform = Transform( 0.981009, 0.00261139, -0.193941, -0.00238476, 0.999996, 0.00140191, 0.193943, -0.000912789, 0.98101, -15.7672, 0.284373, -190.888 )
offset = 380.29 offset = 380.29
[node name="Touchables" type="Spatial" parent="."] [node name="Touchables" type="Spatial" parent="."]
editor/display_folded = true editor/display_folded = true
[node name="Lever" parent="Touchables" instance=ExtResource( 9 )] [node name="Lever" parent="Touchables" instance=ExtResource( 9 )]
transform = Transform( 1.19249e-008, 0, -1, 0, 1, 0, 1, 0, 1.19249e-008, 27.0918, 2.20599, 77.1957 ) transform = Transform( 1.19249e-008, 0, -1, 0, 1, 0, 1, 0, 1.19249e-008, 25.749, 2.20599, 77.1957 )
[node name="NavigationMeshInstance" type="NavigationMeshInstance" parent="."] [node name="NavigationMeshInstance" type="NavigationMeshInstance" parent="."]
navmesh = SubResource( 4 ) navmesh = SubResource( 4 )
[node name="PlayerHouse" parent="NavigationMeshInstance" instance=ExtResource( 10 )] [node name="PlayerHouse" parent="NavigationMeshInstance" instance=ExtResource( 10 )]
transform = Transform( 0.9, 0, 0, 0, 1, 0, 0, 0, 1, 16.3266, 0, 77.8091 ) transform = Transform( 0.9, 0, 0, 0, 1, 0, 0, 0, 1, 15.0218, 0, 77.8091 )
[node name="SaveArea" type="Area" parent="NavigationMeshInstance/PlayerHouse" groups=[ [node name="SaveArea" type="Area" parent="NavigationMeshInstance/PlayerHouse" groups=[
"Savehouse", "Savehouse",
]] ]]
editor/display_folded = true
transform = Transform( -2.76707e-008, 0, 0.633032, 0, 1, 0, -0.385105, 0, -1.68335e-008, -0.163094, 1.63203, -5.18841 ) transform = Transform( -2.76707e-008, 0, 0.633032, 0, 1, 0, -0.385105, 0, -1.68335e-008, -0.163094, 1.63203, -5.18841 )
[node name="CollisionShape" type="CollisionShape" parent="NavigationMeshInstance/PlayerHouse/SaveArea"] [node name="CollisionShape" type="CollisionShape" parent="NavigationMeshInstance/PlayerHouse/SaveArea"]
@ -155,13 +162,22 @@ transform = Transform( 15, 0, 0, 0, 1, 0, 0, 0, 15, -12.1728, 0, -9.53674e-007 )
shape = SubResource( 2 ) shape = SubResource( 2 )
[node name="MeldewesenHouse" parent="NavigationMeshInstance" instance=ExtResource( 10 )] [node name="MeldewesenHouse" parent="NavigationMeshInstance" instance=ExtResource( 10 )]
transform = Transform( 0.8, 0, 0, 0, 1, 0, 0, 0, 1, 82.1951, 0, 13.5105 ) transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 82.8181, 0, 14.3189 )
[node name="ForbiddenArea" type="Area" parent="NavigationMeshInstance/MeldewesenHouse" groups=[
"Forbidden",
]]
transform = Transform( 1, 0, 1.06581e-014, 0, 1, 0, -1.06581e-014, 0, 1, 11.3143, 1.63203, -19.6591 )
[node name="CollisionShape" type="CollisionShape" parent="NavigationMeshInstance/MeldewesenHouse/ForbiddenArea"]
transform = Transform( 15, 0, 0, 0, 1, 0, 0, 0, 15, -12.1728, 0, -9.53674e-007 )
shape = SubResource( 2 )
[node name="Factory" parent="NavigationMeshInstance" instance=ExtResource( 11 )] [node name="Factory" parent="NavigationMeshInstance" instance=ExtResource( 11 )]
transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 12.9505, 0, -109.851 ) transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 12.9505, 0, -109.851 )
[node name="DoorWall" parent="NavigationMeshInstance" instance=ExtResource( 12 )] [node name="DoorWall" parent="NavigationMeshInstance" instance=ExtResource( 12 )]
transform = Transform( -6.15088e-008, 0, 1.40716, 0, 1.40716, 0, -1.40716, 0, -6.15088e-008, 72.1424, -0.0216179, 48.7983 ) transform = Transform( -6.15088e-008, 0, 1.40716, 0, 1.40716, 0, -1.40716, 0, -6.15088e-008, 72.1424, -0.0216179, 64.9277 )
[node name="BuildingBlocks" type="Spatial" parent="NavigationMeshInstance"] [node name="BuildingBlocks" type="Spatial" parent="NavigationMeshInstance"]
editor/display_folded = true editor/display_folded = true
@ -175,6 +191,12 @@ transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 41, 0
[node name="BuildingBlock11" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] [node name="BuildingBlock11" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )]
transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 41, 0.047, 41.124 ) transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 41, 0.047, 41.124 )
[node name="BuildingBlock14" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 62.4331, 0.047, -6.91832 )
[node name="BuildingBlock19" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 62.4331, 0.047, 34.9624 )
[node name="BuildingBlock12" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )] [node name="BuildingBlock12" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 13 )]
transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, 14 ) transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, 14 )
@ -220,6 +242,7 @@ collision_mask = 7
shape = SubResource( 6 ) shape = SubResource( 6 )
[node name="Environment" type="Spatial" parent="."] [node name="Environment" type="Spatial" parent="."]
editor/display_folded = true
[node name="WorldEnvironment" type="WorldEnvironment" parent="Environment"] [node name="WorldEnvironment" type="WorldEnvironment" parent="Environment"]
environment = SubResource( 8 ) environment = SubResource( 8 )