From be06a9fc6e22e5729c3f071870cd5906a5a5d9b8 Mon Sep 17 00:00:00 2001 From: Jan Heemstra Date: Fri, 9 Apr 2021 16:08:26 +0200 Subject: [PATCH] Added killfloor to level DM1 --- Game/Assets/Maps/DM1/DM1.tscn | 8 +++++++- Game/Classes/LevelComponents/Killfloor.tscn | 2 +- Game/Classes/Player/Player.tscn | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Game/Assets/Maps/DM1/DM1.tscn b/Game/Assets/Maps/DM1/DM1.tscn index 4db4221..e7a7cb9 100644 --- a/Game/Assets/Maps/DM1/DM1.tscn +++ b/Game/Assets/Maps/DM1/DM1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=33 format=2] +[gd_scene load_steps=34 format=2] [ext_resource path="res://Assets/Maps/DM1/DM1.glb" type="PackedScene" id=1] [ext_resource path="res://Assets/Audio/SFX/Ambient_BuzzAndHum.wav" type="AudioStream" id=2] @@ -13,6 +13,7 @@ [ext_resource path="res://Assets/Maps/DM1/SpotFlicker.gd" type="Script" id=11] [ext_resource path="res://Assets/Audio/SFX/Ambient_Pipes.wav" type="AudioStream" id=12] [ext_resource path="res://Classes/LevelComponents/SpawnPointsManager.gd" type="Script" id=13] +[ext_resource path="res://Classes/LevelComponents/Killfloor.tscn" type="PackedScene" id=14] [sub_resource type="ProceduralSky" id=1] @@ -1685,4 +1686,9 @@ light_bake_mode = 2 spot_range = 38.0 spot_angle = 63.7888 +[node name="Killfloor" parent="." instance=ExtResource( 14 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -10.0737, 0 ) + [editable path="DM1"] + +[editable path="Killfloor"] diff --git a/Game/Classes/LevelComponents/Killfloor.tscn b/Game/Classes/LevelComponents/Killfloor.tscn index 76e102c..3841172 100644 --- a/Game/Classes/LevelComponents/Killfloor.tscn +++ b/Game/Classes/LevelComponents/Killfloor.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://Classes/LevelComponents/Killfloor.gd" type="Script" id=1] [sub_resource type="BoxShape" id=1] -extents = Vector3( 100, 1, 100 ) +extents = Vector3( 200, 1, 200 ) [node name="Killfloor" type="Area"] script = ExtResource( 1 ) diff --git a/Game/Classes/Player/Player.tscn b/Game/Classes/Player/Player.tscn index 94b11c4..58c7667 100644 --- a/Game/Classes/Player/Player.tscn +++ b/Game/Classes/Player/Player.tscn @@ -220,7 +220,7 @@ script = ExtResource( 8 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.53592, -0.0651628 ) [node name="Hand" type="Spatial" parent="Camera"] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.335, -0.391233, -0.559 ) +transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.335, -0.392298, -0.559 ) [node name="WeaponBobAnimationTree" type="AnimationTree" parent="Camera/Hand"] tree_root = SubResource( 12 )