darknight/puzzle-quest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature/templating-level (#74)

Browse Source 
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#74
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
This commit is contained in:
darknight
2021-06-05 14:11:47 +02:00
parent dee1ee5b1b
commit 213847e95c
23 changed files with 869 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scenes/UI/UI_back.tscn
-22
View File
@@ -1,22 +0,0 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://assets/ui/themes/UI-Button-Back.png" type="Texture" id=1]
[ext_resource path="res://assets/ui/themes/UI-Button-Back-Overlay.png" type="Texture" id=2]
[node name="Control" type="Control"]
margin_right = 1440.0
margin_bottom = 900.0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="TextureButton" type="TextureButton" parent="."]
margin_right = 40.0
margin_bottom = 40.0
mouse_default_cursor_shape = 2
texture_normal = ExtResource( 1 )
texture_hover = ExtResource( 2 )
texture_focused = ExtResource( 2 )
__meta__ = {
"_edit_use_anchors_": false
}
scenes/UI/Background.tscn → scenes/UI/background/Background.tscn
View File
scenes/UI/choose_scenes/ChooseScene.gd
+1 -1
View File
@@ -1,6 +1,6 @@
extends Control
export (PackedScene) var template = load("res://scenes/levels/Template.tscn")
export (PackedScene) var template = load("res://scenes/levels/parts/Template.tscn")
onready var mlevel = load("res://db/MLevel.gd")
scenes/UI/Ending.gd → scenes/UI/ending/Ending.gd
View File
scenes/UI/Ending.tscn → scenes/UI/ending/Ending.tscn
+1 -1
View File
@@ -1,6 +1,6 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://scenes/UI/Ending.gd" type="Script" id=1]
[ext_resource path="res://scenes/UI/ending/Ending.gd" type="Script" id=1]
[ext_resource path="res://assets/sounds/victory.ogg" type="AudioStream" id=2]
[ext_resource path="res://assets/fonts/MKX Title.ttf" type="DynamicFontData" id=3]
scenes/UI/list_ho/ObjectListFirst.tscn
-27
View File
@@ -1,27 +0,0 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://assets/ui/themes/UI-Button-ItemsList-first-hover.png" type="Texture" id=1]
[ext_resource path="res://assets/ui/themes/UI-Button-ItemsList-first.png" type="Texture" id=2]
[ext_resource path="res://assets/fonts/kirsty/kirsty_base.tres" type="DynamicFont" id=3]
[node name="TextureButton" type="TextureButton"]
margin_right = 196.0
margin_bottom = 81.0
texture_normal = ExtResource( 2 )
texture_hover = ExtResource( 1 )
texture_focused = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false,
"_editor_description_": ""
}
[node name="Label" type="Label" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0
custom_fonts/font = ExtResource( 3 )
text = "First Entry"
align = 1
valign = 1
__meta__ = {
"_edit_use_anchors_": false
}
scenes/UI/list_ho/ObjectListLast.tscn
-29
View File
@@ -1,29 +0,0 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://assets/ui/themes/leather.theme" type="Theme" id=1]
[ext_resource path="res://assets/ui/themes/UI-Button-ItemsList-last.png" type="Texture" id=2]
[ext_resource path="res://assets/ui/themes/UI-Button-ItemsList-last-hover.png" type="Texture" id=3]
[ext_resource path="res://assets/fonts/kirsty/kirsty_base.tres" type="DynamicFont" id=4]
[node name="TextureButton" type="TextureButton"]
margin_right = 196.0
margin_bottom = 81.0
texture_normal = ExtResource( 2 )
texture_hover = ExtResource( 3 )
texture_focused = ExtResource( 3 )
__meta__ = {
"_edit_use_anchors_": false,
"_editor_description_": ""
}
[node name="Label" type="Label" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0
theme = ExtResource( 1 )
custom_fonts/font = ExtResource( 4 )
text = "Last"
align = 1
valign = 1
__meta__ = {
"_edit_use_anchors_": false
}
scenes/UI/list_ho/ObjectListStd.tscn
-27
View File
@@ -1,27 +0,0 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://assets/ui/themes/UI-Button-ItemsList-hover.png" type="Texture" id=1]
[ext_resource path="res://assets/fonts/kirsty/kirsty_base.tres" type="DynamicFont" id=2]
[ext_resource path="res://assets/ui/themes/UI-Button-ItemsList.png" type="Texture" id=3]
[node name="TextureButton" type="TextureButton"]
margin_right = 196.0
margin_bottom = 81.0
texture_normal = ExtResource( 3 )
texture_hover = ExtResource( 1 )
texture_focused = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false,
"_editor_description_": ""
}
[node name="Label" type="Label" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0
custom_fonts/font = ExtResource( 2 )
text = "Middle"
align = 1
valign = 1
__meta__ = {
"_edit_use_anchors_": false
}
scenes/UI/list_ho/UI_list_ho.tscn
-106
View File
@@ -1,106 +0,0 @@
[gd_scene load_steps=10 format=2]
[ext_resource path="res://assets/ui/icones/skull.png" type="Texture" id=1]
[ext_resource path="res://assets/ui/themes/UI-Button-ItemsList-first.png" type="Texture" id=2]
[ext_resource path="res://assets/ui/themes/UI-Button-ItemsList-last.png" type="Texture" id=3]
[ext_resource path="res://assets/ui/themes/UI-Button-ItemsList.png" type="Texture" id=4]
[ext_resource path="res://assets/ui/themes/leather.theme" type="Theme" id=5]
[ext_resource path="res://assets/fonts/kirsty/kirsty_base.tres" type="DynamicFont" id=6]
[ext_resource path="res://assets/ui/themes/UI-Button-ItemsList-hover.png" type="Texture" id=7]
[ext_resource path="res://assets/ui/themes/UI-Button-ItemsList-first-hover.png" type="Texture" id=8]
[ext_resource path="res://assets/ui/themes/UI-Button-ItemsList-last-hover.png" type="Texture" id=9]
[node name="Control" type="MarginContainer"]
anchor_left = 1.0
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
margin_left = -196.0
margin_top = -450.0
margin_bottom = 450.0
grow_horizontal = 0
grow_vertical = 2
size_flags_vertical = 3
__meta__ = {
"_edit_use_anchors_": false
}
[node name="ListContainer" type="VBoxContainer" parent="."]
margin_right = 196.0
margin_bottom = 900.0
rect_min_size = Vector2( 196, 900 )
size_flags_horizontal = 3
size_flags_vertical = 3
custom_constants/separation = -10
[node name="TextureButtonFirst" type="TextureButton" parent="ListContainer"]
visible = false
margin_right = 196.0
margin_bottom = 81.0
focus_mode = 0
texture_normal = ExtResource( 2 )
texture_hover = ExtResource( 8 )
texture_focused = ExtResource( 8 )
[node name="Label" type="Label" parent="ListContainer/TextureButtonFirst"]
anchor_right = 1.0
anchor_bottom = 1.0
custom_fonts/font = ExtResource( 6 )
text = "First Entry"
align = 1
valign = 1
__meta__ = {
"_edit_use_anchors_": false
}
[node name="TextureButtonMiddle" type="TextureButton" parent="ListContainer"]
visible = false
margin_right = 196.0
margin_bottom = 81.0
focus_mode = 0
texture_normal = ExtResource( 4 )
texture_hover = ExtResource( 7 )
texture_focused = ExtResource( 7 )
[node name="Label" type="Label" parent="ListContainer/TextureButtonMiddle"]
anchor_right = 1.0
anchor_bottom = 1.0
custom_fonts/font = ExtResource( 6 )
text = "Middle"
align = 1
valign = 1
__meta__ = {
"_edit_use_anchors_": false
}
[node name="TextureButtonLast" type="TextureButton" parent="ListContainer"]
visible = false
margin_right = 196.0
margin_bottom = 81.0
focus_mode = 0
texture_normal = ExtResource( 3 )
texture_hover = ExtResource( 9 )
texture_focused = ExtResource( 9 )
[node name="Label" type="Label" parent="ListContainer/TextureButtonLast"]
anchor_right = 1.0
anchor_bottom = 1.0
theme = ExtResource( 5 )
custom_fonts/font = ExtResource( 6 )
text = "Last"
align = 1
valign = 1
__meta__ = {
"_edit_use_anchors_": false
}
[node name="HBoxContainer" type="HBoxContainer" parent="ListContainer"]
margin_right = 196.0
margin_bottom = 128.0
alignment = 1
[node name="TextureButtonIndice" type="TextureButton" parent="ListContainer/HBoxContainer"]
margin_left = 34.0
margin_right = 162.0
margin_bottom = 128.0
texture_normal = ExtResource( 1 )
scenes/UI/loading/Loading.tscn
+1 -1
View File
@@ -2,7 +2,7 @@
[ext_resource path="res://scenes/UI/loading/parts/LoadingBare.tscn" type="PackedScene" id=1]
[ext_resource path="res://scenes/UI/loading/parts/TopPart.tscn" type="PackedScene" id=2]
[ext_resource path="res://scenes/UI/Background.tscn" type="PackedScene" id=3]
[ext_resource path="res://scenes/UI/background/Background.tscn" type="PackedScene" id=3]
[sub_resource type="Animation" id=1]
resource_name = "BorderAnim"
scenes/UI/UI_summary.tscn → scenes/UI/summary/Summary.tscn
+53 -52
View File
@@ -1,14 +1,14 @@
[gd_scene load_steps=27 format=2]
[ext_resource path="res://assets/ui/themes/button-summary.jpg" type="Texture" id=1]
[ext_resource path="res://assets/ui/themes/bck-vert-grd.png" type="Texture" id=2]
[ext_resource path="res://assets/ui/icones/treasure.png" type="Texture" id=3]
[ext_resource path="res://assets/ui/themes/wood-tile.jpg" type="Texture" id=4]
[ext_resource path="res://assets/ui/themes/button-summary-hover.jpg" type="Texture" id=5]
[ext_resource path="res://assets/ui/icones/treasure-hover.png" type="Texture" id=6]
[ext_resource path="res://assets/fonts/kirsty/kirsty_base.tres" type="DynamicFont" id=7]
[ext_resource path="res://assets/fonts/text_outline.material" type="Material" id=8]
[ext_resource path="res://assets/fonts/kirsty/kirsty_title.tres" type="DynamicFont" id=9]
[ext_resource path="res://assets/ui/themes/button-summary-hover.jpg" type="Texture" id=1]
[ext_resource path="res://assets/ui/themes/button-summary.jpg" type="Texture" id=2]
[ext_resource path="res://assets/fonts/kirsty/kirsty_base.tres" type="DynamicFont" id=3]
[ext_resource path="res://assets/fonts/kirsty/kirsty_title.tres" type="DynamicFont" id=4]
[ext_resource path="res://assets/ui/icones/treasure.png" type="Texture" id=5]
[ext_resource path="res://assets/fonts/text_outline.material" type="Material" id=6]
[ext_resource path="res://assets/ui/icones/treasure-hover.png" type="Texture" id=7]
[ext_resource path="res://assets/ui/themes/bck-vert-grd.png" type="Texture" id=8]
[ext_resource path="res://assets/ui/themes/wood-tile.jpg" type="Texture" id=9]
[sub_resource type="VisualShaderNodeVectorOp" id=1]
operator = 3
@@ -40,7 +40,7 @@ operator = 2
input_name = "screen_uv"
[sub_resource type="VisualShaderNodeTexture" id=11]
texture = ExtResource( 4 )
texture = ExtResource( 9 )
texture_type = 1
[sub_resource type="VisualShaderNodeVectorCompose" id=12]
@@ -179,7 +179,7 @@ __meta__ = {
[node name="PanelWood" type="Panel" parent="."]
material = SubResource( 17 )
margin_right = 350.0
margin_bottom = 720.0
margin_bottom = 1080.0
rect_min_size = Vector2( 350, 0 )
size_flags_vertical = 3
@@ -196,45 +196,46 @@ __meta__ = {
[node name="CenterContainer" type="CenterContainer" parent="PanelWood/VBoxContainer"]
margin_right = 350.0
margin_bottom = 128.0
margin_bottom = 271.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="TextureRect" type="TextureButton" parent="PanelWood/VBoxContainer/CenterContainer"]
margin_left = 111.0
margin_top = 71.0
margin_right = 239.0
margin_bottom = 128.0
margin_bottom = 199.0
mouse_default_cursor_shape = 2
size_flags_horizontal = 4
size_flags_vertical = 4
texture_normal = ExtResource( 3 )
texture_hover = ExtResource( 6 )
texture_focused = ExtResource( 6 )
texture_normal = ExtResource( 5 )
texture_hover = ExtResource( 7 )
texture_focused = ExtResource( 7 )
stretch_mode = 3
[node name="ButtonPuzzle" type="TextureButton" parent="PanelWood/VBoxContainer"]
margin_top = 158.0
margin_top = 301.0
margin_right = 350.0
margin_bottom = 235.0
margin_bottom = 378.0
mouse_default_cursor_shape = 2
size_flags_horizontal = 0
size_flags_vertical = 0
texture_normal = ExtResource( 1 )
texture_hover = ExtResource( 5 )
texture_focused = ExtResource( 5 )
texture_normal = ExtResource( 2 )
texture_hover = ExtResource( 1 )
texture_focused = ExtResource( 1 )
__meta__ = {
"_editor_description_": ""
}
[node name="Label" type="Label" parent="PanelWood/VBoxContainer/ButtonPuzzle"]
material = ExtResource( 8 )
material = ExtResource( 6 )
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 7
size_flags_vertical = 3
custom_fonts/font = ExtResource( 9 )
custom_fonts/font = ExtResource( 4 )
text = "Puzzles"
align = 1
valign = 1
@@ -244,26 +245,26 @@ __meta__ = {
}
[node name="ButtonSetting" type="TextureButton" parent="PanelWood/VBoxContainer"]
margin_top = 265.0
margin_top = 408.0
margin_right = 350.0
margin_bottom = 342.0
margin_bottom = 485.0
mouse_default_cursor_shape = 2
size_flags_horizontal = 0
size_flags_vertical = 0
texture_normal = ExtResource( 1 )
texture_hover = ExtResource( 5 )
texture_focused = ExtResource( 5 )
texture_normal = ExtResource( 2 )
texture_hover = ExtResource( 1 )
texture_focused = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Label" type="Label" parent="PanelWood/VBoxContainer/ButtonSetting"]
material = ExtResource( 8 )
material = ExtResource( 6 )
anchor_right = 1.0
anchor_bottom = 1.0
size_flags_horizontal = 7
size_flags_vertical = 3
custom_fonts/font = ExtResource( 9 )
custom_fonts/font = ExtResource( 4 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "Paramètres"
align = 1
@@ -274,26 +275,26 @@ __meta__ = {
}
[node name="ButtonCredits" type="TextureButton" parent="PanelWood/VBoxContainer"]
margin_top = 372.0
margin_top = 515.0
margin_right = 350.0
margin_bottom = 449.0
margin_bottom = 592.0
mouse_default_cursor_shape = 2
size_flags_horizontal = 0
size_flags_vertical = 0
texture_normal = ExtResource( 1 )
texture_hover = ExtResource( 5 )
texture_focused = ExtResource( 5 )
texture_normal = ExtResource( 2 )
texture_hover = ExtResource( 1 )
texture_focused = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Label" type="Label" parent="PanelWood/VBoxContainer/ButtonCredits"]
material = ExtResource( 8 )
material = ExtResource( 6 )
anchor_right = 1.0
anchor_bottom = 1.0
size_flags_horizontal = 7
size_flags_vertical = 3
custom_fonts/font = ExtResource( 9 )
custom_fonts/font = ExtResource( 4 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "Crédits"
align = 1
@@ -304,31 +305,31 @@ __meta__ = {
}
[node name="MarginContainer" type="MarginContainer" parent="PanelWood/VBoxContainer"]
margin_top = 479.0
margin_top = 622.0
margin_right = 350.0
margin_bottom = 533.0
margin_bottom = 893.0
size_flags_vertical = 3
[node name="ButtonQuit" type="TextureButton" parent="PanelWood/VBoxContainer"]
margin_top = 563.0
margin_top = 923.0
margin_right = 350.0
margin_bottom = 640.0
margin_bottom = 1000.0
mouse_default_cursor_shape = 2
size_flags_horizontal = 0
size_flags_vertical = 0
texture_normal = ExtResource( 1 )
texture_hover = ExtResource( 5 )
texture_normal = ExtResource( 2 )
texture_hover = ExtResource( 1 )
__meta__ = {
"_editor_description_": ""
}
[node name="Label" type="Label" parent="PanelWood/VBoxContainer/ButtonQuit"]
material = ExtResource( 8 )
material = ExtResource( 6 )
anchor_right = 1.0
anchor_bottom = 1.0
size_flags_horizontal = 7
size_flags_vertical = 3
custom_fonts/font = ExtResource( 9 )
custom_fonts/font = ExtResource( 4 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "Quit"
align = 1
@@ -339,9 +340,9 @@ __meta__ = {
}
[node name="ContainerVersion" type="HBoxContainer" parent="PanelWood/VBoxContainer"]
margin_top = 670.0
margin_top = 1030.0
margin_right = 350.0
margin_bottom = 690.0
margin_bottom = 1050.0
[node name="MarginLeft" type="MarginContainer" parent="PanelWood/VBoxContainer/ContainerVersion"]
margin_right = 283.0
@@ -353,7 +354,7 @@ margin_left = 287.0
margin_right = 334.0
margin_bottom = 20.0
size_flags_vertical = 0
custom_fonts/font = ExtResource( 7 )
custom_fonts/font = ExtResource( 3 )
custom_colors/font_color = Color( 0.741176, 0.478431, 0.372549, 1 )
text = "v 0.0.0"
align = 2
@@ -366,19 +367,19 @@ size_flags_horizontal = 3
size_flags_stretch_ratio = 0.04
[node name="MarginContainerBottom" type="MarginContainer" parent="PanelWood/VBoxContainer"]
margin_top = 720.0
margin_top = 1080.0
margin_right = 350.0
margin_bottom = 720.0
margin_bottom = 1080.0
size_flags_stretch_ratio = 0.2
[node name="TextureRect" type="TextureRect" parent="."]
margin_left = 350.0
margin_right = 446.0
margin_bottom = 720.0
margin_bottom = 1080.0
rect_clip_content = true
size_flags_horizontal = 11
size_flags_vertical = 3
texture = ExtResource( 2 )
texture = ExtResource( 8 )
stretch_mode = 2
__meta__ = {
"_edit_use_anchors_": false
scenes/UI/title/UI_title.tscn → scenes/UI/title/Title.tscn
View File