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

Now the spawner uses vector2s as positions.

Browse Source
This commit is contained in:
Relintai 2022-03-05 12:33:05 +01:00
parent dbd6926290
commit 8aaa1e82e1
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
game/player/bs_entity_spawner.gd
View File

@ -59,14 +59,14 @@ func despawn_for(player : Entity, target: Entity) -> void:
print("despawnfor " + target.name)
# rpc_id(player.get_network_master(), "creceive_despawn_for", target.get_path())
remote func creceive_spawn_for(data: String, global_name : String, position: Vector3) -> Entity:
remote func creceive_spawn_for(data: String, global_name : String, position: Vector2) -> Entity:
var createinfo : EntityCreateInfo = EntityCreateInfo.new()
createinfo.player_name = global_name
createinfo.entity_controller = EntityEnums.ENITIY_CONTROLLER_PLAYER
createinfo.entity_player_type = EntityEnums.ENTITY_PLAYER_TYPE_NETWORKED
createinfo.serialized_data = parse_json(data)
createinfo.transform.origin = position
createinfo.transform2d.origin = position
ESS.request_entity_spawn(createinfo)
@ -81,7 +81,7 @@ remote func creceive_despawn_for(path : NodePath) -> void:
if ent:
ent.queue_free()
puppet func spawn_owned_player(data : String, position : Vector3) -> Entity:
puppet func spawn_owned_player(data : String, position : Vector2) -> Entity:
var createinfo : EntityCreateInfo = EntityCreateInfo.new()
createinfo.guid = get_tree().multiplayer.get_network_unique_id()
@ -89,7 +89,7 @@ puppet func spawn_owned_player(data : String, position : Vector3) -> Entity:
createinfo.entity_controller = EntityEnums.ENITIY_CONTROLLER_PLAYER
createinfo.entity_player_type = EntityEnums.ENTITY_PLAYER_TYPE_PLAYER
createinfo.serialized_data = parse_json(data)
createinfo.transform.origin = position
createinfo.transform2d.origin = position
ESS.request_entity_spawn(createinfo)
@ -97,7 +97,7 @@ puppet func spawn_owned_player(data : String, position : Vector3) -> Entity:
return createinfo.created_entity
func load_player(file_name : String, position : Vector3, network_owner : int) -> Entity:
func load_player(file_name : String, position : Vector2, network_owner : int) -> Entity:
var createinfo : EntityCreateInfo = EntityCreateInfo.new()
createinfo.guid = _next_entity_guid
@ -106,7 +106,7 @@ func load_player(file_name : String, position : Vector3, network_owner : int) ->
createinfo.entity_controller = EntityEnums.ENITIY_CONTROLLER_PLAYER
createinfo.entity_player_type = EntityEnums.ENTITY_PLAYER_TYPE_PLAYER
createinfo.serialized_data = load_file(file_name)
createinfo.transform.origin = position
createinfo.transform2d.origin = position
createinfo.networked = false
# print("Player spawned ")
ESS.request_entity_spawn(createinfo)
@ -158,7 +158,7 @@ func spawn_display_player(file_name : String, node_path : NodePath) -> Entity:
return createinfo.created_entity
func spawn_networked_player(class_id : int, position : Vector3, name : String, node_name : String, sid : int) -> Entity:
func spawn_networked_player(class_id : int, position : Vector2, name : String, node_name : String, sid : int) -> Entity:
var createinfo : EntityCreateInfo = EntityCreateInfo.new()
var cls : EntityData = ESS.resource_db.get_player_character_data(class_id)
var class_profile : ClassProfile = ProfileManager.get_class_profile(class_id)
@ -178,9 +178,8 @@ func spawn_networked_player(class_id : int, position : Vector3, name : String,
createinfo.entity_controller = EntityEnums.ENITIY_CONTROLLER_PLAYER
createinfo.entity_player_type = EntityEnums.ENTITY_PLAYER_TYPE_NETWORKED
createinfo.network_owner = sid
createinfo.transform.origin = position
createinfo.transform2d.origin = position
createinfo.networked = false
createinfo.transform.origin = position
ESS.request_entity_spawn(createinfo)
@ -188,7 +187,7 @@ func spawn_networked_player(class_id : int, position : Vector3, name : String,
return createinfo.created_entity
func spawn_player(class_id : int, position : Vector3, name : String, node_name : String, network_owner : int) -> Entity:
func spawn_player(class_id : int, position : Vector2, name : String, node_name : String, network_owner : int) -> Entity:
var createinfo : EntityCreateInfo = EntityCreateInfo.new()
var cls : EntityData = ESS.resource_db.get_player_character_data(class_id)
var class_profile : ClassProfile = ProfileManager.get_class_profile(class_id)
@ -208,7 +207,7 @@ func spawn_player(class_id : int, position : Vector3, name : String, node_name
createinfo.entity_controller = EntityEnums.ENITIY_CONTROLLER_PLAYER
createinfo.entity_player_type = EntityEnums.ENTITY_PLAYER_TYPE_PLAYER
createinfo.network_owner = network_owner
createinfo.transform.origin = position
createinfo.transform2d.origin = position
createinfo.networked = false
ESS.request_entity_spawn(createinfo)
@ -218,7 +217,7 @@ func spawn_player(class_id : int, position : Vector3, name : String, node_name
return createinfo.created_entity
func spawn_mob(class_id : int, level : int, position : Vector3) -> void:
func spawn_mob(class_id : int, level : int, position : Vector2) -> void:
var createinfo : EntityCreateInfo = EntityCreateInfo.new()
var cls : EntityData = ESS.get_resource_db().get_entity_data(class_id)
@ -229,7 +228,7 @@ func spawn_mob(class_id : int, level : int, position : Vector3) -> void:
createinfo.level = level
createinfo.entity_controller = EntityEnums.ENITIY_CONTROLLER_AI
createinfo.entity_player_type = EntityEnums.ENTITY_PLAYER_TYPE_AI
createinfo.transform2d.origin = Vector2(position.x, position.y)
createinfo.transform2d.origin = position
ESS.request_entity_spawn_deferred(createinfo)
@ -275,7 +274,6 @@ func _request_entity_spawn(createinfo : EntityCreateInfo):
body.add_child(entity_node)
body.entity = entity_node
entity_node.set_transform_2d(createinfo.transform2d)
if (createinfo.parent_path == ""):

19
game/scenes/terra_2d_world/Terrain2DWorldBlockyGD.gd
View File

@ -39,7 +39,7 @@ func _enter_tree():
VisualServer.canvas_item_set_sort_children_by_y(get_canvas_item(), true)
func spawn(x, y):
func spawn(x : int, y : int):
chunks_clear()
for xx in range(x - spawn_range, x + spawn_range):
@ -56,16 +56,23 @@ func get_clear():
func load_character(file_name: String) -> void:
_player_file_name = file_name
_player = ESS.entity_spawner.load_player(file_name, Vector3(5, 5, 0), 1) as Entity
#This is where things start to break due to preceision
#var world_pos : Vector2 = Vector2(5000000, 5000000) # In world coords: (0, 4500000), chunk coords: (9765, 9765)
var world_pos : Vector2 = Vector2(0, 0)
var tm : Vector2 = mesh_transform_terrain.xform(world_pos)
_player = ESS.entity_spawner.load_player(file_name, tm, 1) as Entity
#TODO hack, do this properly
# _player.set_physics_process(false)
Server.sset_seed(_player.sseed)
spawn(0, 0)
spawn(world_pos.x / (cell_size_x * chunk_size_x), world_pos.y / (cell_size_y * chunk_size_x))
if spawn_mobs:
generate()
#if spawn_mobs:
# generate()
func _create_chunk(x, y, chunk):
if !chunk:
@ -101,7 +108,7 @@ func _create_chunk(x, y, chunk):
func generate() -> void:
for x in range(-2, 2):
for y in range(-2, 2):
ESS.entity_spawner.spawn_mob(1, 50, Vector3(x * 200, y * 200, 0))
ESS.entity_spawner.spawn_mob(1, 50, Vector2(x * 200, y * 200))
func save() -> void:
if _player == null or _player_file_name == "":