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

Implemented profile based class levelling. Update HEADS to grab the changes from the ESS side.

Browse Source
This commit is contained in:
Relintai 2020-03-20 03:32:44 +01:00
parent 78180afff0
commit e02dbe69a7
8 changed files with 119 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
game/autoload/Entities.gd
View File

@ -112,9 +112,9 @@ func load_player(file_name : String, position : Vector3, network_owner : int) ->
func spawn_player_for_menu(class_id : int, name : String, parent : Node) -> Entity: func spawn_player_for_menu(class_id : int, name : String, parent : Node) -> Entity:
var createinfo : EntityCreateInfo = EntityCreateInfo.new() var createinfo : EntityCreateInfo = EntityCreateInfo.new()
var cls : EntityData = EntityDataManager.get_player_character_data(class_id) var cls : EntityData = EntityDataManager.get_player_character_data(class_id)
var class_profile : ClassProfile = ProfileManager.get_class_profile(class_id) var class_profile : ClassProfile = ProfileManager.getc_player_profile().get_class_profile(class_id)
var level : int = class_profile.level var level : int = 1
if default_level_override > 0: if default_level_override > 0:
level = default_level_override level = default_level_override
@ -122,8 +122,8 @@ func spawn_player_for_menu(class_id : int, name : String, parent : Node) -> Enti
createinfo.class_id = class_id createinfo.class_id = class_id
createinfo.entity_data = cls createinfo.entity_data = cls
createinfo.player_name = name createinfo.player_name = name
createinfo.character_level = 1 createinfo.character_level = level
createinfo.class_level = level createinfo.class_level = class_profile.level
createinfo.character_xp = 0 createinfo.character_xp = 0
createinfo.class_xp = class_profile.xp createinfo.class_xp = class_profile.xp
createinfo.entity_controller = EntityEnums.ENITIY_CONTROLLER_PLAYER createinfo.entity_controller = EntityEnums.ENITIY_CONTROLLER_PLAYER

102
game/data/xp/xp_data.tres
View File

@ -4,28 +4,80 @@
character_level_1 = 22 character_level_1 = 22
character_level_2 = 34 character_level_2 = 34
character_level_3 = 43 character_level_3 = 43
character_level_4 = 4345 character_level_4 = 200
character_level_5 = 554 character_level_5 = 200
character_level_6 = 545 character_level_6 = 200
character_level_7 = 45 character_level_7 = 200
character_level_8 = 45 character_level_8 = 200
character_level_9 = 4 character_level_9 = 200
character_level_10 = 45 character_level_10 = 200
character_level_11 = 54 character_level_11 = 200
character_level_12 = 56 character_level_12 = 200
character_level_13 = 56 character_level_13 = 200
character_level_14 = 56 character_level_14 = 200
class_level_1 = 355 character_level_15 = 200
class_level_2 = 5 character_level_16 = 200
class_level_3 = 5 character_level_17 = 200
class_level_4 = 5 character_level_18 = 200
class_level_5 = 5555 character_level_19 = 200
class_level_6 = 555 character_level_20 = 200
class_level_7 = 555 class_level_1 = 100
class_level_8 = 55 class_level_2 = 200
class_level_9 = 55 class_level_3 = 300
class_level_10 = 5 class_level_4 = 400
class_level_11 = 5 class_level_5 = 500
class_level_12 = 5 class_level_6 = 600
class_level_13 = 5 class_level_7 = 700
class_level_14 = 55 class_level_8 = 800
class_level_9 = 1000
class_level_10 = 1000
class_level_11 = 1000
class_level_12 = 1000
class_level_13 = 1000
class_level_14 = 1000
class_level_15 = 1000
class_level_16 = 1000
class_level_17 = 1000
class_level_18 = 1000
class_level_19 = 1000
class_level_20 = 1000
class_level_21 = 1000
class_level_22 = 1000
class_level_23 = 1000
class_level_24 = 1000
class_level_25 = 1000
class_level_26 = 1000
class_level_27 = 1000
class_level_28 = 1000
class_level_29 = 1000
class_level_30 = 1000
class_level_31 = 1000
class_level_32 = 1000
class_level_33 = 1000
class_level_34 = 1000
class_level_35 = 1000
class_level_36 = 1000
class_level_37 = 1000
class_level_38 = 1000
class_level_39 = 1000
class_level_40 = 1000
class_level_41 = 1000
class_level_42 = 1000
class_level_43 = 1000
class_level_44 = 1000
class_level_45 = 1000
class_level_46 = 1000
class_level_47 = 1000
class_level_48 = 1000
class_level_49 = 1000
class_level_50 = 1000
class_level_51 = 1000
class_level_52 = 1000
class_level_53 = 1000
class_level_54 = 1000
class_level_55 = 1000
class_level_56 = 1000
class_level_57 = 1000
class_level_58 = 1000
class_level_59 = 1000
class_level_60 = 1000

14
game/menu/CharacterEntry.gd
View File

@ -26,16 +26,20 @@ export(NodePath) var level_label_path : NodePath
var id : int var id : int
var file_name : String var file_name : String
var name_label : Label var name_label : Label
var class_label : Label var class_label : Label
var level_label : Label var level_label : Label
var entity : Entity var entity : Entity
var class_profile : ClassProfile
func _ready(): func _ready():
name_label = get_node(name_label_path) as Label name_label = get_node(name_label_path) as Label
class_label = get_node(class_label_path) as Label class_label = get_node(class_label_path) as Label
level_label = get_node(level_label_path) as Label level_label = get_node(level_label_path) as Label
connect("visibility_changed", self, "on_visibility_changed")
func setup(pfile_name : String, name : String, cls_name : String, level : int, class_level : int, pentity : Entity) -> void: func setup(pfile_name : String, name : String, cls_name : String, level : int, class_level : int, pentity : Entity) -> void:
file_name = pfile_name file_name = pfile_name
@ -44,6 +48,12 @@ func setup(pfile_name : String, name : String, cls_name : String, level : int, c
level_label.text = str(level) level_label.text = str(level)
entity = pentity entity = pentity
func set_class_name(name : String, level : int) -> void: func set_class_name(name : String, level : int, pclass_profile : ClassProfile) -> void:
name_label.text = name name_label.text = name
level_label.text = str(level) level_label.text = str(level)
class_profile = pclass_profile
func on_visibility_changed():
if visible and class_profile != null:
level_label.text = str(class_profile.level)

2
game/project.godot
View File

@ -360,6 +360,8 @@ enabled=PoolStringArray( "ess_data" )
[ess] [ess]
spells/allow_class_spell_learning=true
spells/allow_class_recipe_learning=true
level/use_class_xp=true level/use_class_xp=true
data/xp_data_path="res://data/xp/xp_data.tres" data/xp_data_path="res://data/xp/xp_data.tres"
data/entity_resources_folder="res://data/entity_resources" data/entity_resources_folder="res://data/entity_resources"

3
game/scenes/CharacterCreationMenu.gd
View File

@ -50,7 +50,8 @@ func _ready():
ce.owner = container ce.owner = container
ce.id = d.id ce.id = d.id
ce.set_class_name(d.entity_class_data.text_name, profile.get_class_profile(d.id).class_id) var class_profile : ClassProfile = profile.get_class_profile(d.id)
ce.set_class_name(d.entity_class_data.text_name, class_profile.level, class_profile)
ce.group = character_creation_button_group ce.group = character_creation_button_group
if fb != null: if fb != null:

20
game/scenes/CharacterSelectorMenu.gd
View File

@ -110,12 +110,29 @@ func clear() -> void:
for e in player_display_container_node.get_children(): for e in player_display_container_node.get_children():
e.queue_free() e.queue_free()
func delete_character() -> void: func retire_character() -> void:
var b : BaseButton = character_button_group.get_pressed_button() var b : BaseButton = character_button_group.get_pressed_button()
if b == null: if b == null:
return return
var class_profile : ClassProfile = ProfileManager.getc_player_profile().get_class_profile(b.entity.characterclass_id)
var xp_data : XPData = EntityDataManager.get_xp_data()
if xp_data.can_class_level_up(class_profile.level):
class_profile.xp += b.entity.sclass_xp
var xpr : int = xp_data.get_class_xp(class_profile.level)
while xp_data.can_class_level_up(class_profile.level) and class_profile.xp >= xpr:
class_profile.level += 1
class_profile.xp -= xpr
xpr = xp_data.get_class_xp(class_profile.level)
ProfileManager.save()
var file_name : String = "user://" + character_folder + "/" + b.file_name var file_name : String = "user://" + character_folder + "/" + b.file_name
var f : File = File.new() var f : File = File.new()
@ -161,3 +178,4 @@ func character_selection_changed() -> void:
e.get_body().hide() e.get_body().hide()
b.entity.get_body().show() b.entity.get_body().show()

6
game/scenes/Menu.tscn
View File

@ -164,12 +164,12 @@ margin_top = 526.0
margin_right = 261.0 margin_right = 261.0
margin_bottom = 552.0 margin_bottom = 552.0
[node name="Delete" type="Button" parent="CharacterSelectorMenu/CharacterSelector/CharacterSelector/VBoxContainer/HBoxContainer"] [node name="Retire" type="Button" parent="CharacterSelectorMenu/CharacterSelector/CharacterSelector/VBoxContainer/HBoxContainer"]
margin_right = 128.0 margin_right = 128.0
margin_bottom = 26.269 margin_bottom = 26.269
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
text = "Delete" text = "Retire"
[node name="Create" type="Button" parent="CharacterSelectorMenu/CharacterSelector/CharacterSelector/VBoxContainer/HBoxContainer"] [node name="Create" type="Button" parent="CharacterSelectorMenu/CharacterSelector/CharacterSelector/VBoxContainer/HBoxContainer"]
margin_left = 132.0 margin_left = 132.0
@ -589,7 +589,7 @@ light_specular = 0.65
shadow_bias = 0.07 shadow_bias = 0.07
script = ExtResource( 19 ) script = ExtResource( 19 )
[connection signal="pressed" from="CharacterSelectorMenu/CharacterSelector/CharacterSelector/VBoxContainer/Load" to="CharacterSelectorMenu" method="load_character"] [connection signal="pressed" from="CharacterSelectorMenu/CharacterSelector/CharacterSelector/VBoxContainer/Load" to="CharacterSelectorMenu" method="load_character"]
[connection signal="pressed" from="CharacterSelectorMenu/CharacterSelector/CharacterSelector/VBoxContainer/HBoxContainer/Delete" to="CharacterSelectorMenu" method="delete_character"] [connection signal="pressed" from="CharacterSelectorMenu/CharacterSelector/CharacterSelector/VBoxContainer/HBoxContainer/Retire" to="CharacterSelectorMenu" method="retire_character"]
[connection signal="pressed" from="CharacterSelectorMenu/CharacterSelector/CharacterSelector/VBoxContainer/HBoxContainer/Create" to="." method="switch_to_menu" binds= [ 1 ]] [connection signal="pressed" from="CharacterSelectorMenu/CharacterSelector/CharacterSelector/VBoxContainer/HBoxContainer/Create" to="." method="switch_to_menu" binds= [ 1 ]]
[connection signal="pressed" from="CharacterCreationMenu/CharacterSelector2/CharacterSelector/VBoxContainer/PanelContainer/VBoxContainer/Create" to="CharacterCreationMenu" method="create"] [connection signal="pressed" from="CharacterCreationMenu/CharacterSelector2/CharacterSelector/VBoxContainer/PanelContainer/VBoxContainer/Create" to="CharacterCreationMenu" method="create"]
[connection signal="pressed" from="CharacterCreationMenu/CharacterSelector2/CharacterSelector/VBoxContainer/PanelContainer/VBoxContainer/Back" to="." method="switch_to_menu" binds= [ 0 ]] [connection signal="pressed" from="CharacterCreationMenu/CharacterSelector2/CharacterSelector/VBoxContainer/PanelContainer/VBoxContainer/Back" to="." method="switch_to_menu" binds= [ 0 ]]

2
game/ui/windows/SpellBookWindow.gd
View File

@ -116,8 +116,6 @@ func refresh_all() -> void:
if _player == null: if _player == null:
return return
if _character_class == null: if _character_class == null:
return return