kawaiizenbo/PneumaticPlaything
1
0
Fork 0
Code Issues Pull requests Projects Releases 9 Packages Wiki Activity Actions

fix labels that do not match program style

Browse source
This commit is contained in:
Persephone Bubblegum-Holiday 2025-08-14 15:18:48 -07:00
parent 5f157f386f
commit 3778dfb3f9
16 changed files with 56 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scenes/FreeRoam/Generic/Generic12Stage.tscn
View file

@ -1,7 +1,7 @@
[gd_scene load_steps=28 format=3 uid="uid://b1dg6jt31ju7w"]
[ext_resource type="PackedScene" uid="uid://ddqduheks5ltu" path="res://Models/GenericRooms/1-Stage/1StageGenericRoom.glb" id="1_alm3k"]
[ext_resource type="PackedScene" uid="uid://cdk6hwb4hi2wc" path="res://Scripts/Player/player.tscn" id="3_egg31"]
[ext_resource type="PackedScene" uid="uid://cdk6hwb4hi2wc" path="res://Scripts/Player/Player.tscn" id="3_egg31"]
[ext_resource type="PackedScene" uid="uid://mvv5sjk3vbtl" path="res://Scenes/Props/HelicopterLight.tscn" id="4_lj5m2"]
[ext_resource type="Script" uid="uid://d1p4ite8ts2wi" path="res://Scripts/LightController.gd" id="5_2gjfx"]
[ext_resource type="Script" uid="uid://csyks2ufy3o3x" path="res://Scripts/OneWayController.gd" id="7_o46fb"]

2
Scenes/FreeRoam/Generic/Generic1Stage.tscn
View file

@ -13,7 +13,7 @@
[ext_resource type="PackedScene" uid="uid://i2jx8qr8hit1" path="res://Models/Stages/1-Stage/Illum/1StageIllum-OrganLightsMiddle.glb" id="12_cw8uy"]
[ext_resource type="PackedScene" uid="uid://mvv5sjk3vbtl" path="res://Scenes/Props/HelicopterLight.tscn" id="13_1oq0m"]
[ext_resource type="PackedScene" uid="uid://c6fp5o20j87am" path="res://Models/Stages/1-Stage/Illum/1StageIllum-OrganLightsOuter.glb" id="13_qaqoe"]
[ext_resource type="PackedScene" uid="uid://cdk6hwb4hi2wc" path="res://Scripts/Player/player.tscn" id="14_ncqi6"]
[ext_resource type="PackedScene" uid="uid://cdk6hwb4hi2wc" path="res://Scripts/Player/Player.tscn" id="14_ncqi6"]
[ext_resource type="PackedScene" uid="uid://ce0bwyc6xm6t8" path="res://Models/Stages/1-Stage/Illum/1StageIllum-OrganFaceAmber.glb" id="14_yvbl1"]
[ext_resource type="PackedScene" uid="uid://cky4dxfbw52gb" path="res://Models/Stages/1-Stage/1StageCurtains.glb" id="15_r26gl"]
[ext_resource type="PackedScene" uid="uid://cltfuwsfemt8q" path="res://Models/Stages/1-Stage/Illum/1StageIllum-OrganFaceBlue.glb" id="15_shuix"]

2
Scenes/FreeRoam/Generic/Generic2Stage.tscn
View file

@ -2,7 +2,7 @@
[ext_resource type="PackedScene" uid="uid://ddqduheks5ltu" path="res://Models/GenericRooms/1-Stage/1StageGenericRoom.glb" id="1_1cxy2"]
[ext_resource type="PackedScene" uid="uid://d2op7m5kcf0o4" path="res://Models/Stages/2-Stage/2StageGeneric.glb" id="2_xuq3d"]
[ext_resource type="PackedScene" uid="uid://cdk6hwb4hi2wc" path="res://Scripts/Player/player.tscn" id="3_mu2fq"]
[ext_resource type="PackedScene" uid="uid://cdk6hwb4hi2wc" path="res://Scripts/Player/Player.tscn" id="3_mu2fq"]
[ext_resource type="PackedScene" uid="uid://c5fgw7t45p7r6" path="res://Models/Animatronics/Cyberamics/Cyber Chuck.glb" id="4_esubh"]
[ext_resource type="Script" uid="uid://du3pqtf3jixvl" path="res://Scripts/CyberamicController.gd" id="5_j7jcv"]
[ext_resource type="PackedScene" uid="uid://d34xfaignny8j" path="res://Models/Animatronics/Cyberamics/Cyber Helen.glb" id="6_7x0ui"]

2
Scenes/FreeRoam/Generic/GenericMiniUnit1Stage.tscn
View file

@ -20,7 +20,7 @@
[ext_resource type="PackedScene" uid="uid://b07yisr263huu" path="res://Models/Stages/MiniUnit1Stage/MiniUnit1StageFiberCurtain.glb" id="18_kwua7"]
[ext_resource type="PackedScene" uid="uid://d4g8qshiob1pe" path="res://Models/Stages/MiniUnit1Stage/MiniUnit1StageRopeLights.glb" id="19_1c3mt"]
[ext_resource type="PackedScene" uid="uid://mvv5sjk3vbtl" path="res://Scenes/Props/HelicopterLight.tscn" id="20_xa5yq"]
[ext_resource type="PackedScene" uid="uid://cdk6hwb4hi2wc" path="res://Scripts/Player/player.tscn" id="21_fte8p"]
[ext_resource type="PackedScene" uid="uid://cdk6hwb4hi2wc" path="res://Scripts/Player/Player.tscn" id="21_fte8p"]
[sub_resource type="Environment" id="Environment_firkc"]
ambient_light_source = 1

8
Scripts/EditorScreen.gd
View file

@ -40,7 +40,7 @@ func reload_stage() -> void:
cam_index = 0
var stage = load(Stages.stages_info[current_stage]["scene"]).instantiate()
$SubViewport.add_child(stage)
if (Globalvariables.shadows == 0):
if (GlobalVariables.shadows == 0):
get_tree().set_group("lights", "shadow_enabled", false)
var cam_offset = 4
@ -141,9 +141,9 @@ func set_transport_enabled(enabled: bool):
transport_enabled = enabled
func _ready() -> void:
$SubViewport.msaa_3d = Globalvariables.msaa
$SubViewport.screen_space_aa = Globalvariables.ssaa
get_window().set_theme(load(Globalvariables.theme_index[Globalvariables.theme]))
$SubViewport.msaa_3d = GlobalVariables.msaa
$SubViewport.screen_space_aa = GlobalVariables.ssaa
get_window().set_theme(load(GlobalVariables.theme_index[GlobalVariables.theme]))
$ColorRect.color = get_window().theme.get_color("color", "EditorBG")
get_tree().get_root().size_changed.connect(_on_size_changed)
erase_all.connect(_erase_all)

18
Scripts/GraphicsOptions.gd
View file

@ -5,9 +5,9 @@ extends Panel
func _ready() -> void:
$AAOption.select(get_viewport().msaa_3d)
$SSAAOption.select(get_viewport().screen_space_aa)
$ShadowsOption.select(Globalvariables.shadows)
$FOVSlider.value = Globalvariables.FOV
$FOVSlider/CurrentLabel.text = str(int(Globalvariables.FOV))
$ShadowsOption.select(GlobalVariables.shadows)
$FOVSlider.value = GlobalVariables.FOV
$FOVSlider/CurrentLabel.text = str(int(GlobalVariables.FOV))
func _on_tab_bar_tab_changed(tab: int) -> void:
if (thisTab == tab):
@ -16,13 +16,13 @@ func _on_tab_bar_tab_changed(tab: int) -> void:
visible = false
func _on_fov_slider_value_changed(value: float) -> void:
Globalvariables.FOV = value
GlobalVariables.FOV = value
$FOVSlider/CurrentLabel.text = str(int(value))
Globalvariables.updateConfig()
GlobalVariables.updateConfig()
func _on_option_aa_ss_item_selected(index: int) -> void:
get_viewport().screen_space_aa = int(index == 1) as Viewport.ScreenSpaceAA
Globalvariables.updateConfig()
GlobalVariables.updateConfig()
func _on_option_aa_msaa_item_selected(index: int) -> void:
if index == 0: # Disabled
@ -33,8 +33,8 @@ func _on_option_aa_msaa_item_selected(index: int) -> void:
get_viewport().msaa_3d = Viewport.MSAA_4X
elif index == 3: # 8×
get_viewport().msaa_3d = Viewport.MSAA_8X
Globalvariables.updateConfig()
GlobalVariables.updateConfig()
func _on_shadows_option_item_selected(index: int) -> void:
Globalvariables.shadows = index
Globalvariables.updateConfig()
GlobalVariables.shadows = index
GlobalVariables.updateConfig()

4
Scripts/InGameMenu.gd
View file

@ -18,10 +18,10 @@ var stage
func _ready() -> void:
stage = FreeRoamMaps.MapIndex[get_node("../").current_map]["stage"]
if (Globalvariables.shadows == 0):
if (GlobalVariables.shadows == 0):
get_tree().set_group("lights", "shadow_enabled", false)
set_theme(load(Globalvariables.theme_index[Globalvariables.theme]))
set_theme(load(GlobalVariables.theme_index[GlobalVariables.theme]))
var cosmetics_offset = 0
var cosmetics_count = 0

14
Scripts/InterfaceOptions.gd
View file

@ -3,8 +3,8 @@ extends Panel
@export var thisTab = 1
func _ready() -> void:
$ScalingOption.select(Globalvariables.scaling)
$ThemeOption.select(Globalvariables.theme)
$ScalingOption.select(GlobalVariables.scaling)
$ThemeOption.select(GlobalVariables.theme)
func _on_tab_bar_tab_changed(tab: int) -> void:
if (thisTab == tab):
@ -13,11 +13,11 @@ func _on_tab_bar_tab_changed(tab: int) -> void:
visible = false
func _on_scaling_option_item_selected(index: int) -> void:
Globalvariables.scaling = index
GlobalVariables.scaling = index
get_window().content_scale_mode = index as Window.ContentScaleMode
Globalvariables.updateConfig()
GlobalVariables.updateConfig()
func _on_theme_option_item_selected(index: int) -> void:
Globalvariables.theme = index
get_window().set_theme(load(Globalvariables.theme_index[Globalvariables.theme]))
Globalvariables.updateConfig()
GlobalVariables.theme = index
get_window().set_theme(load(GlobalVariables.theme_index[GlobalVariables.theme]))
GlobalVariables.updateConfig()

14
Scripts/MainMenu.gd
View file

@ -7,12 +7,12 @@ func _ready():
$Backgrounds.get_child(randi() % $Backgrounds.get_child_count()).visible = true
$Buttons/EditorButton.grab_focus()
Globalvariables.loadConfig()
$SettingsScreen/DialogPanel/GraphicsPanel/FOVSlider.value = Globalvariables.FOV
$SettingsScreen/DialogPanel/GraphicsPanel/AAOption.selected = Globalvariables.msaa
$SettingsScreen/DialogPanel/GraphicsPanel/SSAAOption.selected = Globalvariables.ssaa
GlobalVariables.loadConfig()
$SettingsScreen/DialogPanel/GraphicsPanel/FOVSlider.value = GlobalVariables.FOV
$SettingsScreen/DialogPanel/GraphicsPanel/AAOption.selected = GlobalVariables.msaa
$SettingsScreen/DialogPanel/GraphicsPanel/SSAAOption.selected = GlobalVariables.ssaa
get_window().set_theme(load(Globalvariables.theme_index[Globalvariables.theme]))
get_window().set_theme(load(GlobalVariables.theme_index[GlobalVariables.theme]))
var moddir = DirAccess.open("user://Mods")
if moddir == null:
@ -48,7 +48,7 @@ func _on_button_pressed() -> void:
get_tree().change_scene_to_file("res://Scenes/GUI/EditorScreen.tscn")
func _on_exit_button_pressed() -> void:
Globalvariables.updateConfig()
GlobalVariables.updateConfig()
get_tree().quit()
func _on_credits_button_pressed() -> void:
@ -67,7 +67,7 @@ func _on_settings_button_pressed() -> void:
$SettingsScreen.visible = true
func _on_input_eater_pressed() -> void:
Globalvariables.updateConfig()
GlobalVariables.updateConfig()
$CreditsScreen.visible = false
$ControlsScreen.visible = false
$FreeRoamChooseScreen.visible = false

15
Scripts/OneWayController.gd
View file

@ -6,6 +6,9 @@ var blend_tree : AnimationNodeBlendTree
var movement_states : Dictionary
@export var inSuffix: String = " Up"
@export var outSuffix: String = " Down"
func _ready():
animation_player = $AnimationPlayer
@ -85,12 +88,12 @@ func _physics_process(delta: float) -> void:
animation_tree.set(anim_path, state[1])
func _movement_in(movement: String, rate):
if (movement.ends_with(" Up")):
movement_states[movement.trim_suffix(" Up")][0] = true
movement_states[movement.trim_suffix(" Up")][2] = rate
elif (movement.ends_with(" Down")):
movement_states[movement.trim_suffix(" Down")][0] = false
movement_states[movement.trim_suffix(" Down")][3] = rate
if (movement.ends_with(inSuffix)):
movement_states[movement.trim_suffix(inSuffix)][0] = true
movement_states[movement.trim_suffix(inSuffix)][2] = rate
elif (movement.ends_with(outSuffix)):
movement_states[movement.trim_suffix(outSuffix)][0] = false
movement_states[movement.trim_suffix(outSuffix)][3] = rate
else:
movement_states[movement][0] = true
movement_states[movement][2] = rate

4
Scripts/Player/player.gd → Scripts/Player/Player.gd
View file

@ -38,8 +38,8 @@ var jump_vel: Vector3 # Jumping velocity
func _ready() -> void:
capture_mouse()
if ($Camera.fov != Globalvariables.FOV):
$Camera.fov = Globalvariables.FOV
if ($Camera.fov != GlobalVariables.FOV):
$Camera.fov = GlobalVariables.FOV
func _unhandled_input(event: InputEvent) -> void:
if (interact):

0
Scripts/Player/player.gd.uid → Scripts/Player/Player.gd.uid
View file

2
Scripts/Player/player.tscn → Scripts/Player/Player.tscn
View file

@ -1,6 +1,6 @@
[gd_scene load_steps=5 format=3 uid="uid://cdk6hwb4hi2wc"]
[ext_resource type="Script" uid="uid://b0c02p6ckmpdq" path="res://Scripts/Player/player.gd" id="1_2f8j2"]
[ext_resource type="Script" uid="uid://b0c02p6ckmpdq" path="res://Scripts/Player/Player.gd" id="1_2f8j2"]
[ext_resource type="PackedScene" uid="uid://cd67bfok34xhy" path="res://Scenes/GUI/InGameMenu.tscn" id="2_0s4r2"]
[ext_resource type="PackedScene" uid="uid://fjveglbs1vfv" path="res://Scenes/GUI/DebugMenu.tscn" id="3_ejydr"]

9
Scripts/TurntableRedirector.gd Normal file
View file

@ -0,0 +1,9 @@
extends Node
@export var bot_path: String
func _movement_in(movement, rate):
get_node("../%s" % bot_path)._movement_in(movement, rate)
func _movement_out(movement, rate):
get_node("../%s" % bot_path)._movement_out(movement, rate)

1
Scripts/TurntableRedirector.gd.uid Normal file
View file

@ -0,0 +1 @@
uid://dhaf46wuoba7r

2
project.godot
View file

@ -25,7 +25,7 @@ config/windows_native_icon="res://UI/icon.ico"
Cosmetics="*res://Scripts/Configs/Cosmetics.gd"
Stages="*res://Scripts/Configs/Stages.gd"
FreeRoamMaps="*res://Scripts/Configs/FreeRoamMaps.gd"
Globalvariables="*res://Scripts/GlobalVariables.gd"
GlobalVariables="*res://Scripts/GlobalVariables.gd"
[display]