mirror of
https://github.com/Relintai/broken_seals.git
synced 2024-11-13 20:47:19 +01:00
Update ESS. The EntitySpawner is inherited from Node now.
This commit is contained in:
parent
c520e9037a
commit
2a0f36a03f
2
HEADS
2
HEADS
@ -1 +1 @@
|
|||||||
{"engine": {"3.2": "36b746d90393299b81ecb991f4aa94a8d742fd11", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "c7a98e704dd62782b9f8b4a22b74787278574657"}, "entity_spell_system": {"master": "aaf6ea68d294dcfa9076ca37fd12d5682b5535a9"}, "ui_extensions": {"master": "ca7df8435154d1146be36c4fc97e6cc7092d3eb9"}, "voxelman": {"master": "6f8e54879bcab6c628c761b545f6df4cd7534a07"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "6c99ddcaa6203e77163b4770e7af95bc2a181e3d"}, "procedural_animations": {"master": "ec465a7a683a047cd373959bb022bde1321fb72d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "bfb60df21570415b1860c25c2dae7722cf158ed9"}, "mesh_utils": {"master": "3365df3faf89a4c29c3b4664b53e9007e4e6267b"}, "broken_seals_module": {"master": "9f89e2a4e7b59351ac4cb4c4dc5f88e5b60a2f15"}, "thread_pool": {"master": "b1030eaf92ba595c56ae8caac90b58081303d16f"}}
|
{"engine": {"3.2": "36b746d90393299b81ecb991f4aa94a8d742fd11", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "c7a98e704dd62782b9f8b4a22b74787278574657"}, "entity_spell_system": {"master": "cdc8b7830daf3341871be1c9b38eceeed947f4a1"}, "ui_extensions": {"master": "ca7df8435154d1146be36c4fc97e6cc7092d3eb9"}, "voxelman": {"master": "6f8e54879bcab6c628c761b545f6df4cd7534a07"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "6c99ddcaa6203e77163b4770e7af95bc2a181e3d"}, "procedural_animations": {"master": "ec465a7a683a047cd373959bb022bde1321fb72d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "bfb60df21570415b1860c25c2dae7722cf158ed9"}, "mesh_utils": {"master": "3365df3faf89a4c29c3b4664b53e9007e4e6267b"}, "broken_seals_module": {"master": "9f89e2a4e7b59351ac4cb4c4dc5f88e5b60a2f15"}, "thread_pool": {"master": "b1030eaf92ba595c56ae8caac90b58081303d16f"}}
|
@ -75,7 +75,7 @@ remote func creceive_spawn_for(data: String, global_name : String, position: Vec
|
|||||||
|
|
||||||
remote func creceive_despawn_for(path : NodePath) -> void:
|
remote func creceive_despawn_for(path : NodePath) -> void:
|
||||||
# print("recdespawnfor " + path)
|
# print("recdespawnfor " + path)
|
||||||
var ent = get_scene_tree().root.get_node_or_null(path)
|
var ent = get_tree().root.get_node_or_null(path)
|
||||||
|
|
||||||
if ent:
|
if ent:
|
||||||
ent.queue_free()
|
ent.queue_free()
|
||||||
@ -83,7 +83,7 @@ remote func creceive_despawn_for(path : NodePath) -> void:
|
|||||||
puppet func spawn_owned_player(data : String, position : Vector3) -> Entity:
|
puppet func spawn_owned_player(data : String, position : Vector3) -> Entity:
|
||||||
var createinfo : EntityCreateInfo = EntityCreateInfo.new()
|
var createinfo : EntityCreateInfo = EntityCreateInfo.new()
|
||||||
|
|
||||||
createinfo.guid = get_scene_tree().multiplayer.get_network_unique_id()
|
createinfo.guid = multiplayer.get_network_unique_id()
|
||||||
# createinfo.player_name = ""
|
# createinfo.player_name = ""
|
||||||
createinfo.entity_controller = EntityEnums.ENITIY_CONTROLLER_PLAYER
|
createinfo.entity_controller = EntityEnums.ENITIY_CONTROLLER_PLAYER
|
||||||
createinfo.entity_player_type = EntityEnums.ENTITY_PLAYER_TYPE_PLAYER
|
createinfo.entity_player_type = EntityEnums.ENTITY_PLAYER_TYPE_PLAYER
|
||||||
@ -259,14 +259,14 @@ func _request_entity_spawn(createinfo : EntityCreateInfo):
|
|||||||
|
|
||||||
if (createinfo.parent_path == ""):
|
if (createinfo.parent_path == ""):
|
||||||
if _spawn_parent == null:
|
if _spawn_parent == null:
|
||||||
_spawn_parent = get_scene_tree().root.get_node(spawn_parent_path)
|
_spawn_parent = get_tree().root.get_node(spawn_parent_path)
|
||||||
|
|
||||||
if _spawn_parent.current_scene != null:
|
if _spawn_parent.current_scene != null:
|
||||||
var spawn_parent = _spawn_parent.current_scene
|
var spawn_parent = _spawn_parent.current_scene
|
||||||
|
|
||||||
spawn_parent.add_child(entity_node)
|
spawn_parent.add_child(entity_node)
|
||||||
else:
|
else:
|
||||||
get_scene_tree().root.get_node(createinfo.parent_path).add_child(entity_node)
|
get_tree().root.get_node(createinfo.parent_path).add_child(entity_node)
|
||||||
|
|
||||||
entity_node.setup(createinfo)
|
entity_node.setup(createinfo)
|
||||||
|
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
[gd_resource type="ESSEntitySpawner" load_steps=3 format=2]
|
|
||||||
|
|
||||||
[ext_resource path="res://player/bs_entity_spawner.gd" type="Script" id=1]
|
|
||||||
[ext_resource path="res://player/DisplayPlayer.tscn" type="PackedScene" id=4]
|
|
||||||
|
|
||||||
[resource]
|
|
||||||
script = ExtResource( 1 )
|
|
||||||
player_display_scene = ExtResource( 4 )
|
|
||||||
spawn_parent_path = "/root/Main"
|
|
||||||
default_level_override = 0
|
|
8
game/player/bs_entity_spawner.tscn
Normal file
8
game/player/bs_entity_spawner.tscn
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
[gd_scene load_steps=3 format=2]
|
||||||
|
|
||||||
|
[ext_resource path="res://player/bs_entity_spawner.gd" type="Script" id=1]
|
||||||
|
[ext_resource path="res://player/DisplayPlayer.tscn" type="PackedScene" id=2]
|
||||||
|
|
||||||
|
[node name="ESSEntitySpawner" type="ESSEntitySpawner"]
|
||||||
|
script = ExtResource( 1 )
|
||||||
|
player_display_scene = ExtResource( 2 )
|
@ -173,6 +173,7 @@ CursorManager="*res://cursors/autoload/CursorManager.tscn"
|
|||||||
WorldNumbers="*res://ui/autoload/WorldNumbers.tscn"
|
WorldNumbers="*res://ui/autoload/WorldNumbers.tscn"
|
||||||
ThemeAtlas="*res://ui/autoload/ThemeAtlas.tscn"
|
ThemeAtlas="*res://ui/autoload/ThemeAtlas.tscn"
|
||||||
Server="*res://autoload/Server.tscn"
|
Server="*res://autoload/Server.tscn"
|
||||||
|
EntitySpawner="*res://player/bs_entity_spawner.tscn"
|
||||||
|
|
||||||
[debug]
|
[debug]
|
||||||
|
|
||||||
@ -197,12 +198,12 @@ window/size/ui_scale_touch=1.0
|
|||||||
|
|
||||||
level/auto_learn_spells=false
|
level/auto_learn_spells=false
|
||||||
data/ess_resource_db_path="res://data/resource_db.tres"
|
data/ess_resource_db_path="res://data/resource_db.tres"
|
||||||
data/ess_entity_spawner_path="res://player/bs_entity_spawner.tres"
|
|
||||||
enums/stats="Agility,Strength,Stamina,Intellect,Spirit,Health,Mana,Speed,Global Cooldown,Haste,Haste Rating,Resilience,Armor,Attack Power,Spell Power,Melee Crit,Melee Crit Bonus,Spell Crit,Spell Crit Bonus,Block,Parry,Damage Reduction,Melee Damage Reduction,Spell Damage Reduction,Damage Taken,Heal Taken,Melee Damage,Spell Damage,Holy Resist,Shadow Resist,Nature Resist,Fire Resist,Frost Resist,Lightning Resist,Chaos Resist,Silence Resist,Fear Resist,Stun Resist,Energy,Rage,XP Rate,Weapon Damage Min,Weapon Damage Max"
|
enums/stats="Agility,Strength,Stamina,Intellect,Spirit,Health,Mana,Speed,Global Cooldown,Haste,Haste Rating,Resilience,Armor,Attack Power,Spell Power,Melee Crit,Melee Crit Bonus,Spell Crit,Spell Crit Bonus,Block,Parry,Damage Reduction,Melee Damage Reduction,Spell Damage Reduction,Damage Taken,Heal Taken,Melee Damage,Spell Damage,Holy Resist,Shadow Resist,Nature Resist,Fire Resist,Frost Resist,Lightning Resist,Chaos Resist,Silence Resist,Fear Resist,Stun Resist,Energy,Rage,XP Rate,Weapon Damage Min,Weapon Damage Max"
|
||||||
enums/skeletons_bones=PoolStringArray( "", "root,pelvis,spine,spine_1,spine_2,neck,head,left_clavicle,left_upper_arm,left_forearm,left_hand,left_thumb_base,left_thumb_end,left_fingers_base,left_fingers_end,right_clavicle,right_upper_arm,right_forearm,right_hand,right_thumb_base,right_thumb_end,right_fingers_base,right_fingers_end,left_thigh,left_calf,left_foot,right_thigh,right_calf,right_foot" )
|
enums/skeletons_bones=PoolStringArray( "", "root,pelvis,spine,spine_1,spine_2,neck,head,left_clavicle,left_upper_arm,left_forearm,left_hand,left_thumb_base,left_thumb_end,left_fingers_base,left_fingers_end,right_clavicle,right_upper_arm,right_forearm,right_hand,right_thumb_base,right_thumb_end,right_fingers_base,right_fingers_end,left_thigh,left_calf,left_foot,right_thigh,right_calf,right_foot" )
|
||||||
enums/skeletons_bone_attachment_points=PoolStringArray( "", "left_hand,right_hand,torso,root,right_hip,left_hip,spine_2,weapon_left,weapon_right,weapon_left_back,weapon_right_back,weapon_shield_left" )
|
enums/skeletons_bone_attachment_points=PoolStringArray( "", "left_hand,right_hand,torso,root,right_hip,left_hip,spine_2,weapon_left,weapon_right,weapon_left_back,weapon_right_back,weapon_shield_left" )
|
||||||
xp/character_xps=PoolIntArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 )
|
xp/character_xps=PoolIntArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 )
|
||||||
profiles/automatic_save=true
|
profiles/automatic_save=true
|
||||||
|
data/ess_entity_spawner_path="res://player/bs_entity_spawner.tres"
|
||||||
level/max_character_level=60
|
level/max_character_level=60
|
||||||
level/max_class_level=60
|
level/max_class_level=60
|
||||||
|
|
||||||
|
@ -42,7 +42,6 @@ func _ready() -> void:
|
|||||||
_loading_screen = get_node(loading_screen_path)
|
_loading_screen = get_node(loading_screen_path)
|
||||||
|
|
||||||
ProfileManager.load()
|
ProfileManager.load()
|
||||||
ESS.load_entity_spawner()
|
|
||||||
# ESS.resource_db = ESSResourceDBMap.new()
|
# ESS.resource_db = ESSResourceDBMap.new()
|
||||||
ESS.resource_db = ESSResourceDBStatic.new()
|
ESS.resource_db = ESSResourceDBStatic.new()
|
||||||
ESS.resource_db.remap_ids = true
|
ESS.resource_db.remap_ids = true
|
||||||
|
@ -71,12 +71,7 @@ chunk_spawn_range = 6
|
|||||||
build_flags = 511
|
build_flags = 511
|
||||||
lod_update_interval = 2.0
|
lod_update_interval = 2.0
|
||||||
script = ExtResource( 8 )
|
script = ExtResource( 8 )
|
||||||
meshes = [ ]
|
|
||||||
editor_generate = false
|
|
||||||
show_loading_screen = true
|
|
||||||
generate_on_ready = false
|
|
||||||
spawn_height = 3
|
spawn_height = 3
|
||||||
use_global_chunk_settings = true
|
|
||||||
test_prop = ExtResource( 4 )
|
test_prop = ExtResource( 4 )
|
||||||
|
|
||||||
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
|
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
|
||||||
|
Loading…
Reference in New Issue
Block a user