Update to the latest ESS. (Separated level into class and character levels.)

This commit is contained in:
Relintai 2020-02-19 12:19:28 +01:00
parent f0420af96b
commit a1fd74a34a
4 changed files with 4 additions and 34 deletions

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "245ecb6684d089940273564fb7a314e5e11ea72e", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "e16c021ac88cacd4d47ad0e339ee921bb9a3153e"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "509d45a66281c87e3136ea7252e062208fc64555"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "fast_quadratic_mesh_simplifier": {"master": "898d3a212c41d14bc5cc0262c82ad30049ddd45b"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}} {"engine": {"3.2": "eb22bcead7f643f9099ddab3307521520e1143db", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "a2d4df0c89dc398756630a12f8ea5ac823cef680"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "509d45a66281c87e3136ea7252e062208fc64555"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "fast_quadratic_mesh_simplifier": {"master": "898d3a212c41d14bc5cc0262c82ad30049ddd45b"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}}

View File

@ -20,33 +20,3 @@ level_17 = 1000
level_18 = 1000 level_18 = 1000
level_19 = 1000 level_19 = 1000
level_20 = 1000 level_20 = 1000
level_21 = 1000
level_22 = 1000
level_23 = 1000
level_24 = 1000
level_25 = 1000
level_26 = 1000
level_27 = 1000
level_28 = 1000
level_29 = 1000
level_30 = 1000
level_31 = 1000
level_32 = 1000
level_33 = 1000
level_34 = 1000
level_35 = 1000
level_36 = 1000
level_37 = 1000
level_38 = 1000
level_39 = 1000
level_40 = 1000
level_41 = 1000
level_42 = 1000
level_43 = 1000
level_44 = 1000
level_45 = 1000
level_46 = 1000
level_47 = 1000
level_48 = 1000
level_49 = 1000
level_50 = 1000

View File

@ -279,7 +279,7 @@ func _son_xp_gained(value : int) -> void:
var xpr : int = EntityDataManager.get_xp_data().get_xp(gets_level()); var xpr : int = EntityDataManager.get_xp_data().get_xp(gets_level());
if xpr <= sxp: if xpr <= sxp:
slevelup(1) scharacter_levelup(1)
sxp = 0 sxp = 0
func _son_level_up(value: int) -> void: func _son_level_up(value: int) -> void:

View File

@ -58,8 +58,8 @@ func set_player(p_player: Entity) -> void:
_player = p_player _player = p_player
_player.connect("cname_changed", self, "cname_changed") _player.connect("cname_changed", self, "cname_changed")
_player.connect("con_level_up", self, "clevel_changed") _player.connect("con_character_level_up", self, "clevel_changed")
_player.connect("con_level_changed", self, "clevel_changed") _player.connect("con_character_level_changed", self, "clevel_changed")
_player.connect("con_xp_gained", self, "con_xp_gained") _player.connect("con_xp_gained", self, "con_xp_gained")
_player.connect("centity_data_changed", self, "centity_data_changed") _player.connect("centity_data_changed", self, "centity_data_changed")