fix some small bugs
This commit is contained in:
parent
8037f4f066
commit
b0733bd367
4 changed files with 27 additions and 16 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
[gd_scene load_steps=36 format=3 uid="uid://bbifoix4bccol"]
|
[gd_scene load_steps=38 format=3 uid="uid://bbifoix4bccol"]
|
||||||
|
|
||||||
[ext_resource type="PackedScene" uid="uid://bf4aq55iy3yey" path="res://Models/Stages/1-Stage/1StageGeneric.glb" id="2_42tmm"]
|
[ext_resource type="PackedScene" uid="uid://bf4aq55iy3yey" path="res://Models/Stages/1-Stage/1StageGeneric.glb" id="2_42tmm"]
|
||||||
[ext_resource type="PackedScene" uid="uid://cdk6hwb4hi2wc" path="res://Scripts/Player/Player.tscn" id="3_4253t"]
|
[ext_resource type="PackedScene" uid="uid://cdk6hwb4hi2wc" path="res://Scripts/Player/Player.tscn" id="3_4253t"]
|
||||||
|
|
@ -25,6 +25,8 @@
|
||||||
[ext_resource type="PackedScene" uid="uid://cky4dxfbw52gb" path="res://Models/Stages/1-Stage/1StageCurtains.glb" id="24_u88iu"]
|
[ext_resource type="PackedScene" uid="uid://cky4dxfbw52gb" path="res://Models/Stages/1-Stage/1StageCurtains.glb" id="24_u88iu"]
|
||||||
[ext_resource type="Script" uid="uid://csyks2ufy3o3x" path="res://Scripts/OneWayController.gd" id="25_tpb1c"]
|
[ext_resource type="Script" uid="uid://csyks2ufy3o3x" path="res://Scripts/OneWayController.gd" id="25_tpb1c"]
|
||||||
[ext_resource type="PackedScene" uid="uid://wsgdo32mqoa4" path="res://Models/FreeRoamLocations/KnoxvilleTN8225KingstonPike2010s/KnoxvilleTN8225KingstonPike2010s.glb" id="26_ree4k"]
|
[ext_resource type="PackedScene" uid="uid://wsgdo32mqoa4" path="res://Models/FreeRoamLocations/KnoxvilleTN8225KingstonPike2010s/KnoxvilleTN8225KingstonPike2010s.glb" id="26_ree4k"]
|
||||||
|
[ext_resource type="PackedScene" uid="uid://b4vtklfq8r861" path="res://Models/Props/Wink.glb" id="26_wi6ny"]
|
||||||
|
[ext_resource type="Script" uid="uid://bu68w4jnh0n2b" path="res://Scripts/AnimatronicController.gd" id="27_mred3"]
|
||||||
|
|
||||||
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_dqpnw"]
|
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_dqpnw"]
|
||||||
|
|
||||||
|
|
@ -518,3 +520,7 @@ light_color = Color(1, 1, 0.980392, 1)
|
||||||
light_energy = 2.0
|
light_energy = 2.0
|
||||||
light_angular_distance = 0.5
|
light_angular_distance = 0.5
|
||||||
shadow_enabled = true
|
shadow_enabled = true
|
||||||
|
|
||||||
|
[node name="Wink" parent="." instance=ExtResource("26_wi6ny")]
|
||||||
|
transform = Transform3D(0.9, 0, 0, 0, 0.9, 0, 0, 0, 0.9, 0, 3.4, 0.38)
|
||||||
|
script = ExtResource("27_mred3")
|
||||||
|
|
|
||||||
|
|
@ -660,21 +660,20 @@ grow_horizontal = 2
|
||||||
grow_vertical = 2
|
grow_vertical = 2
|
||||||
text = "Pneumatic Plaything Animatronic Simulator
|
text = "Pneumatic Plaything Animatronic Simulator
|
||||||
|
|
||||||
Project Oversight: Persephone (KawaiiZenbo)
|
Project Oversight: KawaiiZenbo
|
||||||
|
|
||||||
Interface Design, Simulator Backend: Persephone
|
Interface Design, Simulator Backend: KawaiiZenbo
|
||||||
Settings System: Pizza Perpetrator
|
Settings System: Pizza Perpetrator
|
||||||
|
|
||||||
Models:
|
Models:
|
||||||
Persephone: Helen House, Cyberamics, Cyberamic Stages,
|
KawaiiZenbo: Helen House, Cyberamics, Cyberamic Stages,
|
||||||
3-Stage, 3-Stage Bots, Free Roam Maps
|
3-Stage, 3-Stage Bots, Free Roam Maps
|
||||||
Luigigamin212: Chuck E's Corner
|
Luigigamin212: Chuck E's Corner
|
||||||
ToastHQ: Balcony Stage
|
|
||||||
Avery: Cyberamic Iris Textures
|
Avery: Cyberamic Iris Textures
|
||||||
|
|
||||||
Title Music: \"Future Tech\" by River City Sound Productions
|
Title Music: \"Future Tech\" by River City Sound Productions
|
||||||
|
|
||||||
This project is not associated with CEC Entertainment LLC, Creative Engineering Inc, VIZ Media, or River City Sound Productions"
|
This project is not associated with CEC Entertainment LLC, Creative Engineering Inc, or River City Sound Productions"
|
||||||
horizontal_alignment = 1
|
horizontal_alignment = 1
|
||||||
autowrap_mode = 2
|
autowrap_mode = 2
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ extends Control
|
||||||
|
|
||||||
var currentStage: String
|
var currentStage: String
|
||||||
var playing = false
|
var playing = false
|
||||||
|
var initted = false
|
||||||
var index = 0
|
var index = 0
|
||||||
var cam_index = 1
|
var cam_index = 1
|
||||||
var loaded_frames = []
|
var loaded_frames = []
|
||||||
|
|
@ -26,7 +27,9 @@ var rotationStages = [
|
||||||
]
|
]
|
||||||
|
|
||||||
func _ready() -> void:
|
func _ready() -> void:
|
||||||
if (GlobalVariables.title_dynamic == 1):
|
if (GlobalVariables.title_dynamic == 1): init()
|
||||||
|
|
||||||
|
func init():
|
||||||
currentStage = rotationStages[randi() % rotationStages.size()]
|
currentStage = rotationStages[randi() % rotationStages.size()]
|
||||||
$SubViewport.add_child(load(Stages.stages_info[currentStage]["scene"]).instantiate())
|
$SubViewport.add_child(load(Stages.stages_info[currentStage]["scene"]).instantiate())
|
||||||
for curtain in Stages.stages_info[currentStage]["curtains"]:
|
for curtain in Stages.stages_info[currentStage]["curtains"]:
|
||||||
|
|
@ -65,6 +68,7 @@ func _ready() -> void:
|
||||||
else: unpacked_frame.push_back(false)
|
else: unpacked_frame.push_back(false)
|
||||||
loaded_frames.push_back(unpacked_frame)
|
loaded_frames.push_back(unpacked_frame)
|
||||||
playing = true
|
playing = true
|
||||||
|
initted = true
|
||||||
|
|
||||||
func _physics_process(_delta: float) -> void:
|
func _physics_process(_delta: float) -> void:
|
||||||
if (playing):
|
if (playing):
|
||||||
|
|
|
||||||
|
|
@ -32,12 +32,14 @@ func _on_music_option_item_selected(index: int) -> void:
|
||||||
|
|
||||||
func _on_dynamic_option_item_selected(index: int) -> void:
|
func _on_dynamic_option_item_selected(index: int) -> void:
|
||||||
GlobalVariables.title_dynamic = index
|
GlobalVariables.title_dynamic = index
|
||||||
|
var db = get_node("../../../DynamicBackground")
|
||||||
if (index == 0):
|
if (index == 0):
|
||||||
get_node("../../../BackgroundImage").visible = true
|
get_node("../../../BackgroundImage").visible = true
|
||||||
get_node("../../../DynamicBackground").visible = false
|
db.visible = false
|
||||||
get_node("../../../DynamicBackground").playing = false
|
db.playing = false
|
||||||
else:
|
else:
|
||||||
get_node("../../../BackgroundImage").visible = false
|
get_node("../../../BackgroundImage").visible = false
|
||||||
get_node("../../../DynamicBackground").visible = true
|
db.visible = true
|
||||||
get_node("../../../DynamicBackground").playing = true
|
if (db.initted): db.playing = true
|
||||||
|
else: db.init()
|
||||||
GlobalVariables.updateConfig()
|
GlobalVariables.updateConfig()
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue