Now the actionbars are profile-based. Also an update ESS to get the ProfileManager, and the levelling changes.

This commit is contained in:
Relintai 2020-03-18 03:08:37 +01:00
parent 0c99bd0d35
commit 8106222585
3 changed files with 13 additions and 6 deletions

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "809dc1a12ae16c6665a837e1ae7e3359650aadb0", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "3367f3bc96b1eac86bdbfffe007221636c0e2937"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "666695a220938190c91f201aa773dfa5a31e6a4d"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "ec07898853d3d50c0ebd6e6ea8706084548901c2"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "0007d4793ef76b1998586018b66382b0fc8a9c99"}}
{"engine": {"3.2": "69081c000dcc25a9534c8358d931af0b1b8b8dd2", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "affacaea5825d47a7fcf7bd69405a11416fc88a3"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "666695a220938190c91f201aa773dfa5a31e6a4d"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "1126980e9d333e6f42bf194a756d3ece5b69f00e"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "0007d4793ef76b1998586018b66382b0fc8a9c99"}}

View File

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

View File

@ -23,7 +23,7 @@ extends Node
export(PackedScene) var actionbar_scene
var _player : Entity
var _abp : ActionBarProfile
func set_player(p_player: Entity) -> void:
if not _player == null:
@ -40,15 +40,20 @@ func set_player(p_player: Entity) -> void:
_player.connect("centity_data_changed", self, "_centity_data_changed")
func _centity_data_changed(cls: EntityData) -> void:
if _abp != null:
_abp.disconnect("changed", self, "on_changed")
clear_actionbars()
if cls == null:
return
var abp = _player.get_action_bar_profile()
_abp = _player.get_action_bar_profile()
_abp.connect("changed", self, "on_changed")
for i in range(abp.get_action_bar_count()):
var abe = abp.get_action_bar(i)
for i in range(_abp.get_action_bar_count()):
var abe = _abp.get_action_bar(i)
var s = actionbar_scene.instance()
add_child(s)
@ -57,7 +62,8 @@ func _centity_data_changed(cls: EntityData) -> void:
s.owner = self
func on_changed():
ProfileManager.save()
func clear_actionbars() -> void:
var children = get_children()