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

Updated the engine to the latest.

Browse Source
This commit is contained in:
Relintai 2023-03-18 09:45:58 +01:00
parent c0d1c2681e
commit cb815b12ad
15 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}, "pandemonium_engine": {"master": "642a590949715d790aff7844df4cdba2241d9e6d"}} {"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}, "pandemonium_engine": {"master": "e607aba7327422238fbf078778bc3463512240ac"}}

2
game/autoload/Server.gd
View File

@ -224,4 +224,4 @@ func set_terrarin_player():
var terrarin : TerrainWorld = get_node("/root/main/World") var terrarin : TerrainWorld = get_node("/root/main/World")
terrarin.set_player(local_player_master.player.get_body() as Spatial) terrarin.set_player(local_player_master.player.body_get() as Spatial)

2
game/player/Body.gd
View File

@ -450,7 +450,7 @@ func player_walk(delta : float) -> void:
func process_movement_mob(delta : float) -> void: func process_movement_mob(delta : float) -> void:
if entity.starget != null: if entity.starget != null:
look_at(entity.starget.get_body().translation, Vector3(0, 1, 0)) look_at(entity.starget.body_get().translation, Vector3(0, 1, 0))
var state : int = entity.getc_state() var state : int = entity.getc_state()

2
game/player/CameraPivot.gd
View File

@ -46,7 +46,7 @@ func _physics_process(delta):
var space_state = get_world_3d().direct_space_state var space_state = get_world_3d().direct_space_state
var result : Dictionary = space_state.intersect_ray(pos, to_global(Vector3(0, 0, target_camera_distance)), [ player.get_body() ], player.get_body().collision_mask) var result : Dictionary = space_state.intersect_ray(pos, to_global(Vector3(0, 0, target_camera_distance)), [ player.body_get() ], player.body_get().collision_mask)
if result: if result:
camera_distance = (result.position - pos).length() - 0.2 camera_distance = (result.position - pos).length() - 0.2

6
game/player/Mob.gd
View File

@ -98,7 +98,7 @@ func _notification_sdeath():
func set_position(position : Vector3, rotation : Vector3) -> void: func set_position(position : Vector3, rotation : Vector3) -> void:
get_body().set_position(position, rotation) body_get().set_position(position, rotation)
func _notification_sdamage(what, info): func _notification_sdamage(what, info):
if what == SpellEnums.NOTIFICATION_DAMAGE_DAMAGE_DEALT: if what == SpellEnums.NOTIFICATION_DAMAGE_DAMAGE_DEALT:
@ -107,11 +107,11 @@ func _notification_sdamage(what, info):
func _notification_cdamage(what, info): func _notification_cdamage(what, info):
if what == SpellEnums.NOTIFICATION_DAMAGE_DAMAGE_DEALT: if what == SpellEnums.NOTIFICATION_DAMAGE_DAMAGE_DEALT:
WorldNumbers.damage(get_body().translation, 1.6, info.damage, info.crit) WorldNumbers.damage(body_get().translation, 1.6, info.damage, info.crit)
func _notification_cheal(what, info): func _notification_cheal(what, info):
if what == SpellEnums.NOTIFICATION_DAMAGE_DAMAGE_DEALT: if what == SpellEnums.NOTIFICATION_DAMAGE_DAMAGE_DEALT:
WorldNumbers.heal(get_body().translation, 1.6, info.heal, info.crit) WorldNumbers.heal(body_get().translation, 1.6, info.heal, info.crit)
func _notification_sxp_gained(value : int) -> void: func _notification_sxp_gained(value : int) -> void:
if not ESS.get_resource_db().get_xp_data().can_character_level_up(slevel): if not ESS.get_resource_db().get_xp_data().can_character_level_up(slevel):

4
game/player/NamePlate.gd
View File

@ -61,7 +61,7 @@ func _enter_tree():
entity = get_node("../..") as Entity entity = get_node("../..") as Entity
entity.connect("centity_resource_added", self, "on_centity_resource_added") entity.connect("centity_resource_added", self, "on_centity_resource_added")
entity_body = entity.get_body() entity_body = entity.body_get()
name_label.text = entity.centity_name name_label.text = entity.centity_name
@ -189,7 +189,7 @@ func on_centity_resource_added(resorce) -> void:
c_health_changed() c_health_changed()
func _body_changed(ent): func _body_changed(ent):
entity_body = entity.get_body() entity_body = entity.body_get()
if entity_body && entity_body.has_signal("visibility_changed"): if entity_body && entity_body.has_signal("visibility_changed"):
entity_body.connect("visibility_changed", self, "_on_body_visibility_changed") entity_body.connect("visibility_changed", self, "_on_body_visibility_changed")

4
game/player/PlayerGDBase.gd
View File

@ -50,8 +50,8 @@ func _physics_process(delta):
update_visibility() update_visibility()
func update_visibility() -> void: func update_visibility() -> void:
_query.transform = Transform(Basis(), get_body().translation) _query.transform = Transform(Basis(), body_get().translation)
var res : Array = get_body().get_world_3d().direct_space_state.intersect_shape(_query) var res : Array = body_get().get_world_3d().direct_space_state.intersect_shape(_query)
#warning-ignore:unassigned_variable #warning-ignore:unassigned_variable
var currenty_sees : Array = Array() var currenty_sees : Array = Array()

4
game/scenes/CharacterSelectorMenu.gd
View File

@ -229,6 +229,6 @@ func character_selection_changed() -> void:
return return
for e in player_display_container_node.get_children(): for e in player_display_container_node.get_children():
e.get_body().hide() e.body_get().hide()
b.entity.get_body().show() b.entity.body_get().show()

4
game/scenes/menu/MenuWorld.gd
View File

@ -103,7 +103,7 @@ func _process(delta):
if vis_update >= VIS_UPDATE_INTERVAL: if vis_update >= VIS_UPDATE_INTERVAL:
vis_update = 0 vis_update = 0
var ppos : Vector3 = _player.get_body_3d().transform.origin var ppos : Vector3 = _player.body_get_3d().transform.origin
var cpos : Vector3 = ppos var cpos : Vector3 = ppos
var ppx : int = int(cpos.x / (chunk_size_x * voxel_scale)) var ppx : int = int(cpos.x / (chunk_size_x * voxel_scale))
@ -324,7 +324,7 @@ func load_character(file_name : String) -> void:
mob_level = _player.clevel mob_level = _player.clevel
set_player(_player.get_body()) set_player(_player.body_get())
Server.sset_seed(_player.sseed) Server.sset_seed(_player.sseed)

4
game/scenes/world/TerrainWorldBlocky.gd
View File

@ -112,7 +112,7 @@ func _process_game(delta) -> void:
if vis_update >= VIS_UPDATE_INTERVAL: if vis_update >= VIS_UPDATE_INTERVAL:
vis_update = 0 vis_update = 0
var ppos : Vector3 = _player.get_body_3d().transform.origin var ppos : Vector3 = _player.body_get_3d().transform.origin
var cpos : Vector3 = ppos var cpos : Vector3 = ppos
var ppx : int = int(cpos.x / (chunk_size_x * voxel_scale)) var ppx : int = int(cpos.x / (chunk_size_x * voxel_scale))
@ -426,7 +426,7 @@ func load_character(file_name : String) -> void:
var ppos : Vector3 = Vector3(spawn_chunk_pos.x * chunk_size_x * voxel_scale, 100, spawn_chunk_pos.y * chunk_size_z * voxel_scale) var ppos : Vector3 = Vector3(spawn_chunk_pos.x * chunk_size_x * voxel_scale, 100, spawn_chunk_pos.y * chunk_size_z * voxel_scale)
_player.set_transform_3d(Transform(Basis(), ppos)) _player.set_transform_3d(Transform(Basis(), ppos))
set_player(_player.get_body()) set_player(_player.body_get())
spawn(spawn_chunk_pos.x, spawn_chunk_pos.y) spawn(spawn_chunk_pos.x, spawn_chunk_pos.y)

10
game/scripts/ai/EntityAIGD.gd
View File

@ -76,7 +76,7 @@ func attack(delta):
if target == null: if target == null:
owner.ai_state = EntityEnums.AI_STATE_REGENERATE owner.ai_state = EntityEnums.AI_STATE_REGENERATE
owner.get_body().target_movement_direction = Vector2() owner.body_get().target_movement_direction = Vector2()
return return
var cast : bool = false var cast : bool = false
@ -116,16 +116,16 @@ func attack(delta):
break break
if owner.cast_is_castings(): if owner.cast_is_castings():
owner.get_body().target_movement_direction = Vector2() owner.body_get().target_movement_direction = Vector2()
return return
owner.get_body().target_movement_direction = Vector2() owner.body_get().target_movement_direction = Vector2()
var dir : Vector3 = target.get_body().translation - owner.get_body().translation var dir : Vector3 = target.body_get().translation - owner.body_get().translation
var l = dir.length() var l = dir.length()
if l > 2.5: if l > 2.5:
owner.get_body().target_movement_direction = Vector2(dir.x, dir.z) owner.body_get().target_movement_direction = Vector2(dir.x, dir.z)
func sort_spells_by_rank(a, b): func sort_spells_by_rank(a, b):
if a == null or b == null: if a == null or b == null:

6
game/scripts/dungeons/teleporters/dung_back_teleporter.gd
View File

@ -65,7 +65,7 @@ func teleport():
if world && world._player: if world && world._player:
var p : Entity = world._player var p : Entity = world._player
if (p.get_body().transform.origin - transform.origin).length() > use_range: if (p.body_get().transform.origin - transform.origin).length() > use_range:
return return
if _dungeon: if _dungeon:
@ -75,5 +75,5 @@ func teleport():
#turn back on world #turn back on world
world.active = true world.active = true
p.get_body().teleport(teleport_to) p.body_get().teleport(teleport_to)
# p.get_body().transform.origin = teleport_to # p.body_get().transform.origin = teleport_to

6
game/scripts/dungeons/teleporters/dung_teleporter.gd
View File

@ -84,7 +84,7 @@ func teleport():
if _world && _world._player: if _world && _world._player:
var p : Entity = _world._player var p : Entity = _world._player
if (p.get_body().transform.origin - transform.origin).length() > use_range: if (p.body_get().transform.origin - transform.origin).length() > use_range:
return return
if !_dungeon: if !_dungeon:
@ -115,8 +115,8 @@ func teleport():
#turn on dungeon #turn on dungeon
_dungeon.show() _dungeon.show()
p.get_body().teleport(teleport_to) p.body_get().teleport(teleport_to)
# p.get_body().transform.origin = teleport_to # p.body_get().transform.origin = teleport_to
func on_chunk_removed(chunk : TerrainChunk) -> void: func on_chunk_removed(chunk : TerrainChunk) -> void:

2
game/scripts/networking/SpawnPoint.gd
View File

@ -91,7 +91,7 @@ func spawn():
# ESS.entity_spawner.spawn_mob(1, 50, Vector3(76, 6, 54)) # ESS.entity_spawner.spawn_mob(1, 50, Vector3(76, 6, 54))
func set_terrarin_player(): func set_terrarin_player():
terrarin.set_player(player.get_body() as Spatial) terrarin.set_player(player.body_get() as Spatial)
func _on_host_button_clicked(): func _on_host_button_clicked():
get_tree().connect("network_peer_connected", self, "_network_peer_connected") get_tree().connect("network_peer_connected", self, "_network_peer_connected")

4
game/scripts/spells/gd_spell_script.gd
View File

@ -61,8 +61,8 @@ func _cast_starts(info : SpellCastInfo) -> void:
if range_enabled: if range_enabled:
if info.caster != info.target: if info.caster != info.target:
var c : Vector3 = info.caster.get_body().transform.origin var c : Vector3 = info.caster.body_get().transform.origin
var t : Vector3 = info.target.get_body().transform.origin var t : Vector3 = info.target.body_get().transform.origin
if (c - t).length() > range_range: if (c - t).length() > range_range:
return return