Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-11-13 20:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved the menu into a new folder.

Browse Source
This commit is contained in:
Relintai 2020-07-12 19:46:30 +02:00
parent c294b4a008
commit dda00d0491
6 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
game/scenes/Menu.gd → game/menu/Menu.gd
View File

3
game/scenes/Menu.tscn → game/menu/Menu.tscn
View File

@ -2,7 +2,7 @@
[ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1] [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
[ext_resource path="res://ui/menu/CharacterEntry.tscn" type="PackedScene" id=2] [ext_resource path="res://ui/menu/CharacterEntry.tscn" type="PackedScene" id=2]
[ext_resource path="res://scenes/Menu.gd" type="Script" id=3] [ext_resource path="res://menu/Menu.gd" type="Script" id=3]
[ext_resource path="res://ui/menu/menu_character_button_group.tres" type="ButtonGroup" id=4] [ext_resource path="res://ui/menu/menu_character_button_group.tres" type="ButtonGroup" id=4]
[ext_resource path="res://scenes/CharacterSelectorMenu.gd" type="Script" id=5] [ext_resource path="res://scenes/CharacterSelectorMenu.gd" type="Script" id=5]
[ext_resource path="res://scenes/CharacterCreationMenu.gd" type="Script" id=6] [ext_resource path="res://scenes/CharacterCreationMenu.gd" type="Script" id=6]
@ -21,6 +21,7 @@
[ext_resource path="res://scripts/settings/DirectionalLightSettings.gd" type="Script" id=19] [ext_resource path="res://scripts/settings/DirectionalLightSettings.gd" type="Script" id=19]
[ext_resource path="res://ui/about/About.tscn" type="PackedScene" id=20] [ext_resource path="res://ui/about/About.tscn" type="PackedScene" id=20]
[sub_resource type="VoxelmanLevelGenerator" id=1] [sub_resource type="VoxelmanLevelGenerator" id=1]
script = ExtResource( 18 ) script = ExtResource( 18 )
_force_planet = -1 _force_planet = -1

4
game/modules/core/materials/1_standard_material.tres
View File

File diff suppressed because one or more lines are too long

2
game/project.godot
View File

@ -77,7 +77,7 @@ _global_script_classes=[ {
"base": "Control", "base": "Control",
"class": "Menu", "class": "Menu",
"language": "GDScript", "language": "GDScript",
"path": "res://scenes/Menu.gd" "path": "res://menu/Menu.gd"
}, { }, {
"base": "Entity", "base": "Entity",
"class": "MobGD", "class": "MobGD",

1
game/scenes/CharacterSelectorMenu.gd
View File

@ -162,6 +162,7 @@ func renounce_character() -> void:
if ESS.can_class_level_up(class_profile.level): if ESS.can_class_level_up(class_profile.level):
class_profile.xp += b.entity.sclass_xp class_profile.xp += b.entity.sclass_xp
var xpr : int = ESS.get_class_xp(class_profile.level) var xpr : int = ESS.get_class_xp(class_profile.level)
while ESS.can_class_level_up(class_profile.level) and class_profile.xp >= xpr: while ESS.can_class_level_up(class_profile.level) and class_profile.xp >= xpr:

2
game/scenes/Main.tscn
View File

@ -2,7 +2,7 @@
[ext_resource path="res://scenes/MainScene.gd" type="Script" id=1] [ext_resource path="res://scenes/MainScene.gd" type="Script" id=1]
[ext_resource path="res://scenes/World.tscn" type="PackedScene" id=2] [ext_resource path="res://scenes/World.tscn" type="PackedScene" id=2]
[ext_resource path="res://scenes/Menu.tscn" type="PackedScene" id=3] [ext_resource path="res://menu/Menu.tscn" type="PackedScene" id=3]
[ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=4] [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://ui/debug/DebugInfo.tscn" type="PackedScene" id=5]
[ext_resource path="res://voxelman/debug/FreeLookCam.tscn" type="PackedScene" id=6] [ext_resource path="res://voxelman/debug/FreeLookCam.tscn" type="PackedScene" id=6]