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

Change 'Things' to 'Interactables', new structure

Browse Source
This commit is contained in:
karl 2019-11-22 12:19:22 +01:00
parent 6be42f3d7a
commit 5e72c7c699
18 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Characters/Player/Player.tscn
View File

@ -7,7 +7,9 @@
[ext_resource path="res://Resources/Audio/Step.wav" type="AudioStream" id=5] [ext_resource path="res://Resources/Audio/Step.wav" type="AudioStream" id=5]
[ext_resource path="res://Characters/Player/UI/UI.tscn" type="PackedScene" id=6] [ext_resource path="res://Characters/Player/UI/UI.tscn" type="PackedScene" id=6]
[ext_resource path="res://Characters/Player/PillTaker.gd" type="Script" id=7] [ext_resource path="res://Characters/Player/PillTaker.gd" type="Script" id=7]
[ext_resource path="res://Things/Pills/Pills.tscn" type="PackedScene" id=8] [ext_resource path="res://Level/Interactables/Pills/Pills.tscn" type="PackedScene" id=8]
[sub_resource type="ViewportTexture" id=1] [sub_resource type="ViewportTexture" id=1]

0
Things/Door/Door.gd → Level/Interactables/Door/Door.gd
View File

4
Things/Door/Door.tscn → Level/Interactables/Door/Door.tscn
View File

@ -1,9 +1,11 @@
[gd_scene load_steps=7 format=2] [gd_scene load_steps=7 format=2]
[ext_resource path="res://Things/Door/Door.gd" type="Script" id=1] [ext_resource path="res://Level/Interactables/Door/Door.gd" type="Script" id=1]
[ext_resource path="res://Materials/Glow.tres" type="Material" id=2] [ext_resource path="res://Materials/Glow.tres" type="Material" id=2]
[sub_resource type="CubeMesh" id=1] [sub_resource type="CubeMesh" id=1]
[sub_resource type="ArrayMesh" id=2] [sub_resource type="ArrayMesh" id=2]

14
Level/Machinations/FactoryGameplay.tscn → Level/Interactables/FactoryMachines/FactoryGameplay.tscn
View File

@ -1,11 +1,15 @@
[gd_scene load_steps=16 format=2] [gd_scene load_steps=16 format=2]
[ext_resource path="res://Level/Machinations/PipeGame.gd" type="Script" id=1] [ext_resource path="res://Level/Interactables/FactoryMachines/PipeGame.gd" type="Script" id=1]
[ext_resource path="res://Things/Pipes/EckiPipe.tscn" type="PackedScene" id=2] [ext_resource path="res://Level/Interactables/Pipes/EckiPipe.tscn" type="PackedScene" id=2]
[ext_resource path="res://Materials/Pipe_Dream.tres" type="Material" id=3] [ext_resource path="res://Materials/Pipe_Dream.tres" type="Material" id=3]
[ext_resource path="res://Things/Pipes/StraightPipe.tscn" type="PackedScene" id=4] [ext_resource path="res://Level/Interactables/Pipes/StraightPipe.tscn" type="PackedScene" id=4]
[ext_resource path="res://Things/Pipes/StraightForkPipe.tscn" type="PackedScene" id=5] [ext_resource path="res://Level/Interactables/Pipes/StraightForkPipe.tscn" type="PackedScene" id=5]
[ext_resource path="res://Things/Lever/Lever.tscn" type="PackedScene" id=6] [ext_resource path="res://Level/Interactables/Lever/Lever.tscn" type="PackedScene" id=6]
[sub_resource type="BoxShape" id=1] [sub_resource type="BoxShape" id=1]

0
Level/Machinations/PipeGame.gd → Level/Interactables/FactoryMachines/PipeGame.gd
View File

0
Things/Key/Key.gd → Level/Interactables/Key/Key.gd
View File

4
Things/Key/Key.tscn → Level/Interactables/Key/Key.tscn
View File

@ -1,12 +1,14 @@
[gd_scene load_steps=8 format=2] [gd_scene load_steps=8 format=2]
[ext_resource path="res://Things/Key/Key.gd" type="Script" id=1] [ext_resource path="res://Level/Interactables/Key/Key.gd" type="Script" id=1]
[ext_resource path="res://Resources/Models/key/Material.material" type="Material" id=2] [ext_resource path="res://Resources/Models/key/Material.material" type="Material" id=2]
[ext_resource path="res://Materials/Glow.tres" type="Material" id=3] [ext_resource path="res://Materials/Glow.tres" type="Material" id=3]
[ext_resource path="res://Resources/Models/key/key.dae" type="PackedScene" id=4] [ext_resource path="res://Resources/Models/key/key.dae" type="PackedScene" id=4]
[sub_resource type="ArrayMesh" id=1] [sub_resource type="ArrayMesh" id=1]
resource_name = "Cube.001" resource_name = "Cube.001"
surfaces/0 = { surfaces/0 = {

0
Things/Keycard/Keycard.gd → Level/Interactables/Keycard/Keycard.gd
View File

4
Things/Keycard/Keycard.tscn → Level/Interactables/Keycard/Keycard.tscn
View File

@ -1,11 +1,13 @@
[gd_scene load_steps=9 format=2] [gd_scene load_steps=9 format=2]
[ext_resource path="res://Things/Keycard/Keycard.gd" type="Script" id=1] [ext_resource path="res://Level/Interactables/Keycard/Keycard.gd" type="Script" id=1]
[ext_resource path="res://Resources/Models/keycard/Material_002.material" type="Material" id=2] [ext_resource path="res://Resources/Models/keycard/Material_002.material" type="Material" id=2]
[ext_resource path="res://Resources/Models/keycard/Material.material" type="Material" id=3] [ext_resource path="res://Resources/Models/keycard/Material.material" type="Material" id=3]
[ext_resource path="res://Materials/Glow.tres" type="Material" id=4] [ext_resource path="res://Materials/Glow.tres" type="Material" id=4]
[ext_resource path="res://Resources/Models/keycard/keycard.dae" type="PackedScene" id=5] [ext_resource path="res://Resources/Models/keycard/keycard.dae" type="PackedScene" id=5]
[sub_resource type="ArrayMesh" id=1] [sub_resource type="ArrayMesh" id=1]
resource_name = "Cube" resource_name = "Cube"
surfaces/0 = { surfaces/0 = {

0
Things/Lever/Lever.gd → Level/Interactables/Lever/Lever.gd
View File

4
Things/Lever/Lever.tscn → Level/Interactables/Lever/Lever.tscn
View File

@ -1,9 +1,11 @@
[gd_scene load_steps=7 format=2] [gd_scene load_steps=7 format=2]
[ext_resource path="res://Things/Lever/Lever.gd" type="Script" id=1] [ext_resource path="res://Level/Interactables/Lever/Lever.gd" type="Script" id=1]
[ext_resource path="res://Materials/Glow.tres" type="Material" id=2] [ext_resource path="res://Materials/Glow.tres" type="Material" id=2]
[sub_resource type="CubeMesh" id=1] [sub_resource type="CubeMesh" id=1]
[sub_resource type="CubeMesh" id=2] [sub_resource type="CubeMesh" id=2]

1
Things/Pills/Pills.tscn → Level/Interactables/Pills/Pills.tscn
View File

@ -4,7 +4,6 @@
[ext_resource path="res://Resources/Models/pill/other.material" type="Material" id=2] [ext_resource path="res://Resources/Models/pill/other.material" type="Material" id=2]
[ext_resource path="res://Resources/Models/pill/pill101blend.glb" type="PackedScene" id=3] [ext_resource path="res://Resources/Models/pill/pill101blend.glb" type="PackedScene" id=3]
[sub_resource type="ArrayMesh" id=1] [sub_resource type="ArrayMesh" id=1]
resource_name = "Sphere" resource_name = "Sphere"
surfaces/0 = { surfaces/0 = {

4
Things/Pipes/EckiPipe.tscn → Level/Interactables/Pipes/EckiPipe.tscn
View File

@ -1,11 +1,13 @@
[gd_scene load_steps=7 format=2] [gd_scene load_steps=7 format=2]
[ext_resource path="res://Things/Pipes/PipeScript.gd" type="Script" id=1] [ext_resource path="res://Level/Interactables/Pipes/PipeScript.gd" type="Script" id=1]
[ext_resource path="res://Resources/Models/eckiPipe/Material.material" type="Material" id=2] [ext_resource path="res://Resources/Models/eckiPipe/Material.material" type="Material" id=2]
[ext_resource path="res://Materials/Glow.tres" type="Material" id=3] [ext_resource path="res://Materials/Glow.tres" type="Material" id=3]
[sub_resource type="ArrayMesh" id=1] [sub_resource type="ArrayMesh" id=1]
resource_name = "Cube" resource_name = "Cube"
surfaces/0 = { surfaces/0 = {

0
Things/Pipes/PipeScript.gd → Level/Interactables/Pipes/PipeScript.gd
View File

4
Things/Pipes/StraightForkPipe.tscn → Level/Interactables/Pipes/StraightForkPipe.tscn
View File

@ -1,11 +1,13 @@
[gd_scene load_steps=7 format=2] [gd_scene load_steps=7 format=2]
[ext_resource path="res://Things/Pipes/PipeScript.gd" type="Script" id=1] [ext_resource path="res://Level/Interactables/Pipes/PipeScript.gd" type="Script" id=1]
[ext_resource path="res://Resources/Models/straightForkPipe/Material_001.material" type="Material" id=2] [ext_resource path="res://Resources/Models/straightForkPipe/Material_001.material" type="Material" id=2]
[ext_resource path="res://Materials/Glow.tres" type="Material" id=3] [ext_resource path="res://Materials/Glow.tres" type="Material" id=3]
[sub_resource type="ArrayMesh" id=1] [sub_resource type="ArrayMesh" id=1]
resource_name = "Cube.001" resource_name = "Cube.001"
surfaces/0 = { surfaces/0 = {

4
Things/Pipes/StraightPipe.tscn → Level/Interactables/Pipes/StraightPipe.tscn
View File

@ -1,11 +1,13 @@
[gd_scene load_steps=7 format=2] [gd_scene load_steps=7 format=2]
[ext_resource path="res://Things/Pipes/PipeScript.gd" type="Script" id=1] [ext_resource path="res://Level/Interactables/Pipes/PipeScript.gd" type="Script" id=1]
[ext_resource path="res://Resources/Models/straightPipe/Material_001.material" type="Material" id=2] [ext_resource path="res://Resources/Models/straightPipe/Material_001.material" type="Material" id=2]
[ext_resource path="res://Materials/Glow.tres" type="Material" id=3] [ext_resource path="res://Materials/Glow.tres" type="Material" id=3]
[sub_resource type="ArrayMesh" id=1] [sub_resource type="ArrayMesh" id=1]
resource_name = "Cube.001" resource_name = "Cube.001"
surfaces/0 = { surfaces/0 = {

12
Level/PathTestWorld.tscn
View File

@ -4,10 +4,14 @@
[ext_resource path="res://Characters/Util/PathNavigatorForNPC.tscn" type="PackedScene" id=2] [ext_resource path="res://Characters/Util/PathNavigatorForNPC.tscn" type="PackedScene" id=2]
[ext_resource path="res://Characters/Meldewesen/Meldewesen.tscn" type="PackedScene" id=3] [ext_resource path="res://Characters/Meldewesen/Meldewesen.tscn" type="PackedScene" id=3]
[ext_resource path="res://Util/NodeGroupNotifier.tscn" type="PackedScene" id=4] [ext_resource path="res://Util/NodeGroupNotifier.tscn" type="PackedScene" id=4]
[ext_resource path="res://Things/Key/Key.tscn" type="PackedScene" id=5] [ext_resource path="res://Level/Interactables/Key/Key.tscn" type="PackedScene" id=5]
[ext_resource path="res://Things/Keycard/Keycard.tscn" type="PackedScene" id=6] [ext_resource path="res://Level/Interactables/Keycard/Keycard.tscn" type="PackedScene" id=6]
[ext_resource path="res://Things/Door/Door.tscn" type="PackedScene" id=7] [ext_resource path="res://Level/Interactables/Door/Door.tscn" type="PackedScene" id=7]
[ext_resource path="res://Level/Machinations/FactoryGameplay.tscn" type="PackedScene" id=8] [ext_resource path="res://Level/Interactables/FactoryMachines/FactoryGameplay.tscn" type="PackedScene" id=8]
[sub_resource type="NavigationMesh" id=1] [sub_resource type="NavigationMesh" id=1]
vertices = PoolVector3Array( -1.9, 0.4, -2.2, 0.200001, 0.4, -2.5, 0.200001, 0.4, -8.5, -8.5, 0.4, -0.0999994, -2.5, 0.4, -0.0999994, -1.9, 0.4, -2.2, -1.9, 0.4, -2.2, 0.200001, 0.4, -8.5, -8.5, 0.4, -8.5, -8.5, 0.4, -0.0999994, 0.200001, 0.4, -8.5, 0.200001, 0.4, -2.5, 2, 0.4, -2.2, 2, 0.4, -2.2, 2.6, 0.4, -0.0999994, 8.6, 0.4, -0.0999994, 2, 0.4, -2.2, 8.6, 0.4, -0.0999994, 8.6, 0.4, -8.5, 0.200001, 0.4, -8.5, -1.3, 0.4, 3.8, 0.200001, 0.4, 3.8, 0.200001, 0.4, 2.6, -2.2, 0.4, 2, -8.5, 0.4, 8.6, -2.2, 0.4, 8.6, -2.5, 0.4, 5, -2.5, 0.4, 5, -1.3, 0.4, 3.8, -2.2, 0.4, 2, -2.5, 0.4, 5, -2.2, 0.4, 2, -2.5, 0.4, -0.0999994, -8.5, 0.4, -0.0999994, -8.5, 0.4, 8.6, 0.200001, 0.4, 2.6, 0.200001, 0.4, 3.8, 1.4, 0.4, 3.8, 2.3, 0.4, 2, 2.6, 0.4, 5, 2.3, 0.4, 8.6, 8.6, 0.4, 8.6, 2.3, 0.4, 2, 1.4, 0.4, 3.8, 2.6, 0.4, 5, 2.6, 0.4, -0.0999994, 2.3, 0.4, 2, 2.6, 0.4, 5, 8.6, 0.4, 8.6, 8.6, 0.4, -0.0999994 ) vertices = PoolVector3Array( -1.9, 0.4, -2.2, 0.200001, 0.4, -2.5, 0.200001, 0.4, -8.5, -8.5, 0.4, -0.0999994, -2.5, 0.4, -0.0999994, -1.9, 0.4, -2.2, -1.9, 0.4, -2.2, 0.200001, 0.4, -8.5, -8.5, 0.4, -8.5, -8.5, 0.4, -0.0999994, 0.200001, 0.4, -8.5, 0.200001, 0.4, -2.5, 2, 0.4, -2.2, 2, 0.4, -2.2, 2.6, 0.4, -0.0999994, 8.6, 0.4, -0.0999994, 2, 0.4, -2.2, 8.6, 0.4, -0.0999994, 8.6, 0.4, -8.5, 0.200001, 0.4, -8.5, -1.3, 0.4, 3.8, 0.200001, 0.4, 3.8, 0.200001, 0.4, 2.6, -2.2, 0.4, 2, -8.5, 0.4, 8.6, -2.2, 0.4, 8.6, -2.5, 0.4, 5, -2.5, 0.4, 5, -1.3, 0.4, 3.8, -2.2, 0.4, 2, -2.5, 0.4, 5, -2.2, 0.4, 2, -2.5, 0.4, -0.0999994, -8.5, 0.4, -0.0999994, -8.5, 0.4, 8.6, 0.200001, 0.4, 2.6, 0.200001, 0.4, 3.8, 1.4, 0.4, 3.8, 2.3, 0.4, 2, 2.6, 0.4, 5, 2.3, 0.4, 8.6, 8.6, 0.4, 8.6, 2.3, 0.4, 2, 1.4, 0.4, 3.8, 2.6, 0.4, 5, 2.6, 0.4, -0.0999994, 2.3, 0.4, 2, 2.6, 0.4, 5, 8.6, 0.4, 8.6, 8.6, 0.4, -0.0999994 )

4
Level/World.tscn
View File

File diff suppressed because one or more lines are too long