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

Update ESS to get the TalentRowData changes. Also updated the engine.

Browse Source
This commit is contained in:
Relintai 2020-06-05 18:05:54 +02:00
parent 68dd994e56
commit 70b1b4badd
6 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "f108037cbfdd010ca61954fcb0a341f754a7a9f0", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "d063f8da2816e9e016112a2cc9a22a61c1f43d92"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "7c93cc8f52a60746aa43c0a78631baecbabfe6dc"}, "texture_packer": {"master": "e3047f7dfab861767c5295ea93d2f1404e8de66e"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "3cc9f15f05be53380e20763efc0be753b621b8a2"}, "procedural_animations": {"master": "e4f048d67c171c34995763519e6d21bf40df29a7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}, "mesh_utils": {"master": "e540e84f9b9505cbba14d1abcd7777ea0b9963e6"}, "broken_seals_module": {"master": "14c239fd8716988b837c2fcfe20fe7d9f11dd515"}, "thread_pool": {"master": "c2aa3018961655165d31aa4586bf1c2a76ed57c1"}}
{"engine": {"3.2": "9f4a14ba97394d1fc08d123c40699c03f56b6aad", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "64cb83c5436690aa0196a8036cdb18cbfc16b7b0"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "7c93cc8f52a60746aa43c0a78631baecbabfe6dc"}, "texture_packer": {"master": "e3047f7dfab861767c5295ea93d2f1404e8de66e"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "3cc9f15f05be53380e20763efc0be753b621b8a2"}, "procedural_animations": {"master": "e4f048d67c171c34995763519e6d21bf40df29a7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}, "mesh_utils": {"master": "e540e84f9b9505cbba14d1abcd7777ea0b9963e6"}, "broken_seals_module": {"master": "14c239fd8716988b837c2fcfe20fe7d9f11dd515"}, "thread_pool": {"master": "c2aa3018961655165d31aa4586bf1c2a76ed57c1"}}

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

File diff suppressed because one or more lines are too long

15
game/modules/entity_classes/naturalist/1_naturalist.tres
View File

@ -1,11 +1,9 @@
[gd_resource type="EntityClassData" load_steps=29 format=2]
[gd_resource type="EntityClassData" load_steps=25 format=2]
[ext_resource path="res://modules/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres" type="Spell" id=1]
[ext_resource path="res://modules/entity_classes/naturalist/spells/19_uproot_rank_1.tres" type="Spell" id=2]
[ext_resource path="res://modules/entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres" type="Spell" id=3]
[ext_resource path="res://modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres" type="Aura" id=4]
[ext_resource path="res://modules/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=5]
[ext_resource path="res://modules/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres" type="Aura" id=6]
[ext_resource path="res://modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres" type="Spell" id=7]
[ext_resource path="res://modules/core/entity_resources/1_mana_resource.tres" type="EntityResourceData" id=8]
[ext_resource path="res://scripts/ai/EntityAIGD.gd" type="Script" id=9]
@ -28,22 +26,15 @@
[sub_resource type="EntityAI" id=1]
script = ExtResource( 9 )
[sub_resource type="TalentRowData" id=2]
Talent_0_0 = ExtResource( 6 )
[sub_resource type="TalentRowData" id=3]
Talent_2_0 = ExtResource( 4 )
[sub_resource type="CharacterSpec" id=4]
[sub_resource type="CharacterSpec" id=2]
id = 1
talent_rows = [ SubResource( 2 ), SubResource( 3 ) ]
[resource]
resource_name = "Naturalist"
id = 1
text_name = "Naturalist"
entity_resources = [ ExtResource( 8 ) ]
specs = [ SubResource( 4 ) ]
specs = [ SubResource( 2 ) ]
spells = [ ExtResource( 7 ), ExtResource( 3 ), ExtResource( 15 ), ExtResource( 5 ), ExtResource( 12 ), ExtResource( 23 ), ExtResource( 1 ), ExtResource( 10 ), ExtResource( 24 ), ExtResource( 2 ), ExtResource( 19 ), ExtResource( 18 ), ExtResource( 17 ), ExtResource( 20 ), ExtResource( 11 ), ExtResource( 22 ), ExtResource( 16 ), ExtResource( 21 ), ExtResource( 14 ) ]
start_spells = [ ExtResource( 7 ), ExtResource( 21 ), ExtResource( 14 ) ]
ais = [ SubResource( 1 ) ]

2
game/player/Mob.gd
View File

@ -129,7 +129,7 @@ func _notification_scharacter_level_up(value: int) -> void:
refresh_spells(value)
func refresh_spells(value: int):
if gets_free_spell_points() == 0 and gets_free_talent_points() == 0:
if gets_free_spell_points() == 0 and gets_free_class_talent_points() == 0:
return
var ecd : EntityClassData = sentity_data.entity_class_data

2
game/ui/talents/Spec.gd
View File

@ -43,7 +43,7 @@ func set_spec(player : Entity, spec : CharacterSpec, spec_index: int) -> void:
if _player == null or _spec == null:
return
for i in range(spec.get_num_talent_rows()):
for i in range(spec.num_rows):
var r : Node = talent_row_scene.instance()
_container.add_child(r)
r.owner = self

10
game/ui/talents/TalentEntry.gd
View File

@ -73,17 +73,15 @@ func set_player(player : Entity, spec : CharacterSpec, spec_index : int, row : i
func refresh() -> void:
var tr : TalentRowData = _spec.get_talent_row(_row)
if tr.get_talent(culomn, 0) == null:
if _spec.get_talent(_row, culomn, 0) == null:
_main_container.hide()
return
var rank_count : int = 0
var known_rank_count : int = 0
for i in range(TalentRowData.MAX_TALENTS_PER_ENTRY):
var a : Aura = tr.get_talent(culomn, i)
for i in range(_spec.get_num_ranks(_row, culomn)):
var a : Aura = _spec.get_talent(_row, culomn, i)
if a == null:
break
@ -102,7 +100,7 @@ func refresh() -> void:
_upgrade_button.show()
var aura : Aura = tr.get_talent(culomn, ridx)
var aura : Aura = _spec.get_talent(_row, culomn, ridx)
_aura_name_label.text = aura.text_name
_aura_description_label.text = aura.text_description