Remove the style setting.

This commit is contained in:
Relintai 2020-07-16 20:07:49 +02:00
parent 4e71be4245
commit 3e1abc4b2c
5 changed files with 17 additions and 46 deletions

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=13 format=2]
[gd_scene load_steps=10 format=2]
[ext_resource path="res://scenes/MainScene.gd" type="Script" id=1]
[ext_resource path="res://scenes/World.tscn" type="PackedScene" id=2]
@ -6,9 +6,6 @@
[ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=4]
[ext_resource path="res://ui/debug/DebugInfo.tscn" type="PackedScene" id=5]
[ext_resource path="res://debug/FreeLookCam.tscn" type="PackedScene" id=6]
[ext_resource path="res://tilesets/denzi_public_domain/denzi_public_domain_world.tscn" type="PackedScene" id=9]
[ext_resource path="res://tilesets/dc_32x32/dc_32x32_world.tscn" type="PackedScene" id=10]
[ext_resource path="res://tilesets/denzi_32x32_orthogonal/denzi_32x32_orthogonal_world.tscn" type="PackedScene" id=12]
[ext_resource path="res://tilesets/dc_32x32/player.tscn" type="PackedScene" id=15]
[ext_resource path="res://tilesets/denzi_32x32_orthogonal/player.tscn" type="PackedScene" id=16]
[ext_resource path="res://tilesets/denzi_public_domain/player.tscn" type="PackedScene" id=17]
@ -19,10 +16,9 @@ menu_scene = ExtResource( 3 )
world_scene = ExtResource( 2 )
debug_camera_scene = ExtResource( 6 )
loading_screen_path = NodePath("LoadingScreen/PanelContainer")
worlds = [ ExtResource( 10 ), ExtResource( 12 ), ExtResource( 9 ) ]
world_scales = [ Vector2( 0.8, 0.8 ), Vector2( 0.8, 0.8 ), Vector2( 0.8, 0.8 ) ]
world_scale = Vector2( 0.8, 0.8 )
bodies = [ ExtResource( 15 ), ExtResource( 16 ), ExtResource( 17 ) ]
tile_sizes = [ 32, 32, 32 ]
tile_size = 32
[node name="LoadingScreen" type="CanvasLayer" parent="."]
layer = 100

View File

@ -26,11 +26,10 @@ export(PackedScene) var menu_scene : PackedScene
export(PackedScene) var world_scene : PackedScene
export(PackedScene) var debug_camera_scene : PackedScene
export(NodePath) var loading_screen_path : NodePath
export(int) var curent_style : int = 0
export(Array, PackedScene) var worlds : Array
export(Array, Vector2) var world_scales : Array
export(Vector2) var world_scale : Vector2
export(Array, PackedScene) var bodies : Array
export(Array, int) var tile_sizes : Array
export(int) var tile_size : int
enum StartSceneTypes {
NONE, MENU, WORLD
@ -55,20 +54,8 @@ func _ready() -> void:
initialize_modules()
Settings.connect("setting_changed", self, "setting_changed")
Settings.connect("settings_loaded", self, "settings_loaded")
settings_loaded()
switch_scene(start_scene)
func setting_changed(section, key, value):
if section == "debug" and key == "style":
curent_style = value
func settings_loaded():
curent_style = Settings.get_value("debug", "style")
func initialize_modules() -> void:
_modules.clear()
@ -166,10 +153,10 @@ func get_world():
return world_scene
func get_world_scale():
return world_scales[curent_style]
return world_scale
func get_body():
return bodies[curent_style]
return bodies[randi() % bodies.size()]
func get_tile_size():
return tile_sizes[curent_style]
return tile_size

View File

@ -43,7 +43,6 @@ var _settings : Dictionary = {
"touchscreen_mode" : OS.has_touchscreen_ui_hint(),
},
"debug" : {
"style" : 0,
"debug_info" : false
}
}

View File

@ -151,17 +151,6 @@ margin_right = -4.0
margin_bottom = -4.0
size_flags_horizontal = 3
[node name="OptionsSpinboxRow" parent="PanelContainer/VBoxContainer/TabContainer/Debug" instance=ExtResource( 8 )]
margin_top = 0.0
margin_bottom = 24.0
property_category = "debug"
property_name = "style"
property_label = "Style"
min_value = 0
max_value = 100
prefix = ""
suffix = ""
[node name="DebugInfo" type="CheckBox" parent="PanelContainer/VBoxContainer/TabContainer/Debug"]
margin_top = 32.0
margin_right = 527.0

File diff suppressed because one or more lines are too long