mirror of
https://github.com/Relintai/broken_seals_roguelike.git
synced 2024-11-14 10:57:19 +01:00
Update ESS to the latest to grab a crashfix, also update the Engine.
This commit is contained in:
parent
a6727bab07
commit
5b152735ce
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,6 +1,7 @@
|
||||
engine
|
||||
modules/*
|
||||
ignore/*
|
||||
logs/*
|
||||
|
||||
*.d
|
||||
*.o
|
||||
|
||||
2
HEADS
2
HEADS
@ -1 +1 @@
|
||||
{"engine": {"3.2": "3f57cb12b435f44d60ab813ba824b8bf7f44d5b3"}, "world_generator": {"master": "9a4f9f9809cb4da6d0196a9b37ea480e3cd0c400"}, "entity_spell_system": {"master": "f343482bf6e2346c91d5a57603f67e3a7fbd684f"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "texture_packer": {"master": "2993ed34f34cfa6a5e61b7913380231e9c55eda6"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "thread_pool": {"master": "93320fe864128d706bcc47fc7ed0731e6e9bcf69"}}
|
||||
{"engine": {"3.2": "3de89f78e51eab7b2e3299098a34c9a9d0764005"}, "world_generator": {"master": "9a4f9f9809cb4da6d0196a9b37ea480e3cd0c400"}, "entity_spell_system": {"master": "9839cb49721f2d9a37670d6040a4f56ce26001fe"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "texture_packer": {"master": "2993ed34f34cfa6a5e61b7913380231e9c55eda6"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "thread_pool": {"master": "93320fe864128d706bcc47fc7ed0731e6e9bcf69"}}
|
||||
@ -51,6 +51,7 @@ class Logfile:
|
||||
var base_dir = ppath.get_base_dir()
|
||||
if not dir.dir_exists(base_dir):
|
||||
# TODO: Move directory creation to the function that will actually *write*
|
||||
dir.open(base_dir)
|
||||
var err = dir.make_dir_recursive(base_dir)
|
||||
if err:
|
||||
print("[ERROR] [logger] Could not create the '%s' directory; exited with error %d." \
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
tool
|
||||
extends CharacterSkeleton3D
|
||||
|
||||
# Copyright Péter Magyar relintai@gmail.com
|
||||
# MIT License, functionality from this class needs to be protable to the entity spell system
|
||||
|
||||
# Copyright (c) 2019 Péter Magyar
|
||||
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to deal
|
||||
# in the Software without restriction, including without limitation the rights
|
||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
# copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included in all
|
||||
# copies or substantial portions of the Software.
|
||||
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
|
||||
@ -1,398 +0,0 @@
|
||||
extends Entity
|
||||
|
||||
# Copyright Péter Magyar relintai@gmail.com
|
||||
# MIT License, functionality from this class needs to be protable to the entity spell system
|
||||
|
||||
# Copyright (c) 2019 Péter Magyar
|
||||
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to deal
|
||||
# in the Software without restriction, including without limitation the rights
|
||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
# copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included in all
|
||||
# copies or substantial portions of the Software.
|
||||
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
|
||||
export (float) var MOUSE_SENSITIVITY : float = 0.05
|
||||
export (String) var map_path : String
|
||||
|
||||
const ray_length = 1000
|
||||
const ACCEL : float = 100.0
|
||||
const DEACCEL : float = 100.0
|
||||
const GRAVITY : float = -24.8
|
||||
const JUMP_SPEED : float = 3.8
|
||||
const MAX_SLOPE_ANGLE : float = 40.0
|
||||
const MOUSE_TARGET_MAX_OFFSET : int = 10
|
||||
|
||||
var _on : bool = true
|
||||
|
||||
var y_rot : float = 0.0
|
||||
|
||||
var vel : Vector3 = Vector3()
|
||||
var dir : Vector3 = Vector3()
|
||||
|
||||
var input_dir : Vector2 = Vector2()
|
||||
var mouse_dir : Vector2 = Vector2()
|
||||
var mouse_move_dir : Vector2 = Vector2()
|
||||
var mouse_left_down : bool = false
|
||||
var mouse_right_down : bool = false
|
||||
var touchpad_dir : Vector2 = Vector2()
|
||||
var mouse_down_delta : Vector2 = Vector2()
|
||||
var queued_camera_rotaions : Vector2 = Vector2()
|
||||
|
||||
var key_left : bool = false
|
||||
var key_right : bool = false
|
||||
var key_up : bool = false
|
||||
var key_down : bool = false
|
||||
|
||||
var cursor_grabbed : bool = false
|
||||
var last_cursor_pos : Vector2 = Vector2()
|
||||
var mouse_down_pos : Vector2 = Vector2()
|
||||
var total_down_mouse_delta : Vector2 = Vector2()
|
||||
|
||||
var camera : Camera
|
||||
var camera_pivot : Spatial
|
||||
|
||||
var animation_tree : AnimationTree
|
||||
var anim_node_state_machine : AnimationNodeStateMachinePlayback = null
|
||||
var animation_run : bool = false
|
||||
|
||||
var moving : bool = false
|
||||
var casting_anim : bool = false
|
||||
|
||||
var last_mouse_over : Entity = null
|
||||
|
||||
func _ready() -> void:
|
||||
camera = $CameraPivot/Camera as Camera
|
||||
camera_pivot = $CameraPivot as Spatial
|
||||
|
||||
animation_tree = get_character_skeleton().get_animation_tree()
|
||||
|
||||
if animation_tree != null:
|
||||
anim_node_state_machine = animation_tree["parameters/playback"]
|
||||
|
||||
set_process(true)
|
||||
|
||||
func _physics_process(delta : float) -> void:
|
||||
if not _on:
|
||||
return
|
||||
|
||||
process_input(delta)
|
||||
process_movement(delta)
|
||||
|
||||
func process_input(delta: float) -> void:
|
||||
var key_dir : Vector2 = Vector2()
|
||||
|
||||
if key_up:
|
||||
key_dir.y += 1
|
||||
if key_down:
|
||||
key_dir.y -= 1
|
||||
if key_left:
|
||||
key_dir.x += 1
|
||||
if key_right:
|
||||
key_dir.x -= 1
|
||||
|
||||
input_dir = key_dir + mouse_dir + touchpad_dir + mouse_move_dir
|
||||
|
||||
var state : int = getc_state()
|
||||
|
||||
if state & EntityEnums.ENTITY_STATE_TYPE_FLAG_ROOT != 0 or state & EntityEnums.ENTITY_STATE_TYPE_FLAG_STUN != 0:
|
||||
input_dir = Vector2()
|
||||
return
|
||||
|
||||
var input_length : float = input_dir.length_squared()
|
||||
|
||||
if input_length > 0.1:
|
||||
if anim_node_state_machine != null and not animation_run:
|
||||
anim_node_state_machine.travel("run-loop")
|
||||
animation_run = true
|
||||
|
||||
input_dir = input_dir.normalized()
|
||||
|
||||
animation_tree["parameters/run-loop/blend_position"] = input_dir
|
||||
else:
|
||||
if anim_node_state_machine != null and animation_run:
|
||||
anim_node_state_machine.travel("idle-loop")
|
||||
animation_run = false
|
||||
|
||||
if queued_camera_rotaions.length_squared() > 1:
|
||||
camera_pivot.rotate_delta(queued_camera_rotaions.x * 2.0, -queued_camera_rotaions.y)
|
||||
queued_camera_rotaions = Vector2()
|
||||
|
||||
|
||||
func process_movement(delta : float) -> void:
|
||||
var state : int = getc_state()
|
||||
|
||||
if state & EntityEnums.ENTITY_STATE_TYPE_FLAG_ROOT != 0 or state & EntityEnums.ENTITY_STATE_TYPE_FLAG_STUN != 0:
|
||||
moving = false
|
||||
return
|
||||
|
||||
if input_dir.x > 0.1 or input_dir.y > 0.1 or input_dir.x < -0.1 or input_dir.y < -0.1:
|
||||
var forward : Vector3 = Vector3(0, 0, 1).rotated(Vector3(0, 1, 0), deg2rad(y_rot))
|
||||
var right : Vector3 = forward.cross(Vector3(0, 1, 0)) * -input_dir.x
|
||||
forward *= input_dir.y #only potentially make it zero after getting the right vector
|
||||
|
||||
dir = forward
|
||||
dir += right
|
||||
|
||||
if dir.length_squared() > 0.1:
|
||||
dir = dir.normalized()
|
||||
|
||||
moving = true
|
||||
moved()
|
||||
else:
|
||||
dir = Vector3()
|
||||
moving = false
|
||||
|
||||
vel.y += delta * GRAVITY
|
||||
|
||||
var hvel : Vector3 = vel
|
||||
hvel.y = 0
|
||||
|
||||
var target : Vector3 = dir
|
||||
target *= get_speed().ccurrent
|
||||
|
||||
var accel
|
||||
if dir.dot(hvel) > 0:
|
||||
accel = ACCEL
|
||||
else:
|
||||
accel = DEACCEL
|
||||
|
||||
hvel = hvel.linear_interpolate(target, accel * delta) as Vector3
|
||||
vel.x = hvel.x
|
||||
vel.z = hvel.z
|
||||
# vel = move_and_slide(vel, Vector3(0,1,0), false, 4, deg2rad(MAX_SLOPE_ANGLE))
|
||||
|
||||
if get_tree().network_peer:
|
||||
if get_tree().is_network_server():
|
||||
rset_position(get_body().position, get_body().rotation)
|
||||
else:
|
||||
rpc("set_position", get_body().position, get_body().rotation)
|
||||
|
||||
func _input(event: InputEvent) -> void:
|
||||
if not cursor_grabbed:
|
||||
set_process_input(false)
|
||||
return
|
||||
|
||||
if event is InputEventMouseMotion and event.device != -1:
|
||||
var s : float = ProjectSettings.get("display/mouse_cursor/sensitivity")
|
||||
|
||||
var relx : float = event.relative.x * s
|
||||
var rely : float = event.relative.y * s
|
||||
|
||||
mouse_down_delta.x += relx
|
||||
mouse_down_delta.y += rely
|
||||
|
||||
total_down_mouse_delta.x += relx
|
||||
total_down_mouse_delta.y += rely
|
||||
|
||||
get_tree().set_input_as_handled()
|
||||
|
||||
|
||||
func _unhandled_input(event: InputEvent) -> void:
|
||||
if event is InputEventKey:
|
||||
var ievkey : InputEventKey = event as InputEventKey
|
||||
|
||||
if ievkey.scancode == KEY_W:
|
||||
key_up = ievkey.pressed
|
||||
if ievkey.scancode == KEY_S:
|
||||
key_down = ievkey.pressed
|
||||
if ievkey.scancode == KEY_A:
|
||||
key_left = ievkey.pressed
|
||||
if ievkey.scancode == KEY_D:
|
||||
key_right = ievkey.pressed
|
||||
|
||||
if event is InputEventMouseMotion and not (mouse_right_down or mouse_left_down) and event.device != -1:
|
||||
cmouseover(event)
|
||||
|
||||
if event is InputEventMouseButton:
|
||||
if event.button_index == BUTTON_LEFT and event.device != -1:
|
||||
mouse_left_down = event.pressed
|
||||
|
||||
if mouse_left_down:
|
||||
mouse_down_delta = Vector2()
|
||||
mouse_down_pos = event.position
|
||||
|
||||
if event.button_index == BUTTON_RIGHT and event.device != -1:
|
||||
mouse_right_down = event.pressed
|
||||
|
||||
|
||||
if mouse_left_down and mouse_right_down:
|
||||
mouse_move_dir.y = 1
|
||||
else:
|
||||
mouse_move_dir.y = 0
|
||||
|
||||
if event.is_pressed() and event.device != -1:
|
||||
if event.button_index == BUTTON_WHEEL_UP:
|
||||
camera_pivot.camera_distance_set_delta(-0.2)
|
||||
if event.button_index == BUTTON_WHEEL_DOWN:
|
||||
camera_pivot.camera_distance_set_delta(0.2)
|
||||
|
||||
if not event.pressed and event.button_index == BUTTON_LEFT and event.device != -1:
|
||||
if mouse_down_delta.length() < MOUSE_TARGET_MAX_OFFSET:
|
||||
target(event.position)
|
||||
|
||||
if event is InputEventScreenTouch and event.pressed:
|
||||
target(event.position)
|
||||
|
||||
update_cursor_mode()
|
||||
|
||||
func update_cursor_mode():
|
||||
if mouse_left_down or mouse_right_down:
|
||||
if not cursor_grabbed:
|
||||
set_process_input(true)
|
||||
total_down_mouse_delta = Vector2()
|
||||
|
||||
cursor_grabbed = true
|
||||
last_cursor_pos = get_viewport().get_mouse_position()
|
||||
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
|
||||
else:
|
||||
if cursor_grabbed:
|
||||
set_process_input(false)
|
||||
cursor_grabbed = false
|
||||
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
|
||||
get_viewport().warp_mouse(last_cursor_pos)
|
||||
|
||||
if total_down_mouse_delta.length_squared() < 8:
|
||||
target(last_cursor_pos)
|
||||
|
||||
|
||||
|
||||
func target(position : Vector2):
|
||||
var from = camera.project_ray_origin(position)
|
||||
var to = from + camera.project_ray_normal(position) * ray_length
|
||||
|
||||
var space_state = get_body().get_world_2d().direct_space_state
|
||||
var result = space_state.intersect_ray(from, to, [], 2)
|
||||
|
||||
if result:
|
||||
print(result)
|
||||
if result.collider and result.collider is Entity:
|
||||
var ent : Entity = result.collider as Entity
|
||||
|
||||
crequest_target_change(ent.get_path())
|
||||
return
|
||||
|
||||
crequest_target_change(NodePath())
|
||||
else:
|
||||
crequest_target_change(NodePath())
|
||||
|
||||
func cmouseover(event):
|
||||
var from = camera.project_ray_origin(event.position)
|
||||
var to = from + camera.project_ray_normal(event.position) * ray_length
|
||||
|
||||
var space_state = get_body().get_world_2d().direct_space_state
|
||||
var result = space_state.intersect_ray(from, to, [], 2)
|
||||
|
||||
if result:
|
||||
if result.collider and result.collider is Entity:
|
||||
var mo : Entity = result.collider as Entity
|
||||
|
||||
if last_mouse_over != null and last_mouse_over != mo:
|
||||
if is_instance_valid(last_mouse_over):
|
||||
last_mouse_over.onc_mouse_exit()
|
||||
|
||||
last_mouse_over = null
|
||||
|
||||
if last_mouse_over == null:
|
||||
mo.onc_mouse_enter()
|
||||
last_mouse_over = mo
|
||||
|
||||
return
|
||||
|
||||
if last_mouse_over != null:
|
||||
last_mouse_over.onc_mouse_exit()
|
||||
last_mouse_over = null
|
||||
|
||||
func analog_force_change(vector, touchpad):
|
||||
if touchpad.padname == "TouchPad":
|
||||
touchpad_dir = vector
|
||||
touchpad_dir.x *= -1
|
||||
elif touchpad.padname == "TargetPad":
|
||||
#try to target
|
||||
return
|
||||
|
||||
func queue_camera_rotation(rot : Vector2) -> void:
|
||||
queued_camera_rotaions += rot
|
||||
|
||||
remote func rset_position(pposition : Vector2, protation : float) -> void:
|
||||
if get_tree().is_network_server():
|
||||
rpc("set_position", pposition, protation)
|
||||
|
||||
func _moved() -> void:
|
||||
if sis_casting():
|
||||
sfail_cast()
|
||||
|
||||
func _con_target_changed(entity: Node, old_target: Node) -> void:
|
||||
if is_instance_valid(old_target):
|
||||
old_target.onc_untargeted()
|
||||
|
||||
if is_instance_valid(ctarget):
|
||||
ctarget.onc_targeted()
|
||||
|
||||
if canc_interact():
|
||||
crequest_interact()
|
||||
|
||||
func _con_cast_started(info):
|
||||
if anim_node_state_machine != null and not casting_anim:
|
||||
anim_node_state_machine.travel("casting-loop")
|
||||
casting_anim = true
|
||||
animation_run = false
|
||||
|
||||
func _con_cast_failed(info):
|
||||
if anim_node_state_machine != null and casting_anim:
|
||||
anim_node_state_machine.travel("idle-loop")
|
||||
casting_anim = false
|
||||
|
||||
if animation_run:
|
||||
anim_node_state_machine.travel("run-loop")
|
||||
|
||||
func _con_cast_finished(info):
|
||||
if anim_node_state_machine != null:
|
||||
anim_node_state_machine.travel("cast-end")
|
||||
casting_anim = false
|
||||
|
||||
if animation_run:
|
||||
anim_node_state_machine.travel("run-loop")
|
||||
|
||||
func _con_spell_cast_success(info):
|
||||
if anim_node_state_machine != null:
|
||||
anim_node_state_machine.travel("cast-end")
|
||||
casting_anim = false
|
||||
|
||||
if animation_run:
|
||||
anim_node_state_machine.travel("run-loop")
|
||||
|
||||
func _son_level_up(level: int) -> void:
|
||||
if sentity_data == null:
|
||||
return
|
||||
|
||||
var ecd : EntityClassData = sentity_data.entity_class_data
|
||||
|
||||
if ecd == null:
|
||||
return
|
||||
|
||||
sfree_spell_points += ecd.spell_points_per_level * level
|
||||
sfree_talent_points += level
|
||||
|
||||
for i in range(Stat.MAIN_STAT_ID_COUNT):
|
||||
var st : int = sentity_data.entity_class_data.get_stat_data().get_level_stat_data().get_stat_diff(i, slevel - level, slevel)
|
||||
|
||||
var statid : int = i + Stat.MAIN_STAT_ID_START
|
||||
|
||||
var stat : Stat = get_stat_int(statid)
|
||||
|
||||
var sm : StatModifier = stat.get_modifier(0)
|
||||
sm.base_mod += st
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ class_name DisplayPlayerGD
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
#
|
||||
|
||||
#func _setup():
|
||||
# setup_actionbars()
|
||||
|
||||
|
||||
@ -1,14 +1,22 @@
|
||||
[gd_scene load_steps=2 format=2]
|
||||
[gd_scene load_steps=6 format=2]
|
||||
|
||||
[ext_resource path="res://player/DisplayPlayer.gd" type="Script" id=1]
|
||||
|
||||
[sub_resource type="EntityResourceHealth" id=1]
|
||||
|
||||
[sub_resource type="EntityResourceSpeed" id=2]
|
||||
|
||||
[sub_resource type="EntityResourceHealth" id=3]
|
||||
|
||||
[sub_resource type="EntityResourceSpeed" id=4]
|
||||
|
||||
[node name="DisplayPlayer" type="Entity" groups=[
|
||||
"players",
|
||||
]]
|
||||
body_path = NodePath("KinematicBody2D")
|
||||
character_skeleton_path = NodePath("KinematicBody2D/Rotation_Helper/Model")
|
||||
sseed = 9240987
|
||||
cseed = 9240987
|
||||
sresources = [ SubResource( 1 ), SubResource( 2 ) ]
|
||||
script = ExtResource( 1 )
|
||||
|
||||
[node name="KinematicBody2D" type="KinematicBody2D" parent="."]
|
||||
@ -24,3 +32,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.875205, 0 )
|
||||
__meta__ = {
|
||||
"_editor_description_": ""
|
||||
}
|
||||
|
||||
[node name="DisplayPlayerGD" type="Entity" parent="."]
|
||||
sresources = [ SubResource( 3 ), SubResource( 4 ) ]
|
||||
script = ExtResource( 1 )
|
||||
|
||||
@ -1,120 +0,0 @@
|
||||
extends "PlayerGDBase.gd"
|
||||
class_name NetworkedPlayerGD
|
||||
|
||||
# Copyright Péter Magyar relintai@gmail.com
|
||||
# MIT License, functionality from this class needs to be protable to the entity spell system
|
||||
|
||||
# Copyright (c) 2019 Péter Magyar
|
||||
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to deal
|
||||
# in the Software without restriction, including without limitation the rights
|
||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
# copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included in all
|
||||
# copies or substantial portions of the Software.
|
||||
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
|
||||
#export (float) var MOUSE_SENSITIVITY : float = 0.05
|
||||
#export (String) var map_path : String
|
||||
|
||||
#const ray_length = 1000
|
||||
#const ACCEL : float = 100.0
|
||||
#const DEACCEL : float = 100.0
|
||||
#const GRAVITY : float = -24.8
|
||||
#const JUMP_SPEED : float = 3.8
|
||||
#const MAX_SLOPE_ANGLE : float = 40.0
|
||||
#const MOUSE_TARGET_MAX_OFFSET : int = 10
|
||||
#
|
||||
##var _on : bool = true
|
||||
#
|
||||
#var y_rot : float = 0.0
|
||||
#
|
||||
##var vel : Vector3 = Vector3()
|
||||
##var dir : Vector3 = Vector3()
|
||||
#
|
||||
#var animation_tree : AnimationTree
|
||||
#var anim_node_state_machine : AnimationNodeStateMachinePlayback = null
|
||||
##var animation_run : bool = false
|
||||
#
|
||||
#func _ready() -> void:
|
||||
# animation_tree = get_character_skeleton().get_animation_tree()
|
||||
#
|
||||
# if animation_tree != null:
|
||||
# anim_node_state_machine = animation_tree["parameters/playback"]
|
||||
|
||||
|
||||
#func _physics_process(delta : float) -> void:
|
||||
# if not _on:
|
||||
# return
|
||||
#
|
||||
#process_movement(delta)
|
||||
|
||||
#func process_movement(delta : float) -> void:
|
||||
# if input_dir.x > 0.1 or input_dir.y > 0.1 or input_dir.x < -0.1 or input_dir.y < -0.1:
|
||||
# var forward : Vector3 = Vector3(0, 0, 1).rotated(Vector3(0, 1, 0), deg2rad(y_rot))
|
||||
# var right : Vector3 = forward.cross(Vector3(0, 1, 0)) * -input_dir.x
|
||||
# forward *= input_dir.y #only potentially make it zero after getting the right vector
|
||||
#
|
||||
# dir = forward
|
||||
# dir += right
|
||||
#
|
||||
# if dir.length_squared() > 0.1:
|
||||
# dir = dir.normalized()
|
||||
# else:
|
||||
# dir = Vector3()
|
||||
#
|
||||
# vel.y += delta * GRAVITY
|
||||
#
|
||||
# var hvel : Vector3 = vel
|
||||
# hvel.y = 0
|
||||
#
|
||||
# var target : Vector3 = dir
|
||||
# target *= get_speed().ccurrent
|
||||
#
|
||||
# var accel
|
||||
# if dir.dot(hvel) > 0:
|
||||
# accel = ACCEL
|
||||
# else:
|
||||
# accel = DEACCEL
|
||||
#
|
||||
# hvel = hvel.linear_interpolate(target, accel * delta) as Vector3
|
||||
# vel.x = hvel.x
|
||||
# vel.z = hvel.z
|
||||
# vel = move_and_slide(vel, Vector3(0,1,0), false, 4, deg2rad(MAX_SLOPE_ANGLE))
|
||||
|
||||
|
||||
#remote func set_position(position : Vector3, rot : Vector3) -> void:
|
||||
# translation = position
|
||||
# rotation = rot
|
||||
#
|
||||
#remote func sset_position(pposition : Vector2, protation : float) -> void:
|
||||
#
|
||||
## if get_network_master() != 1:
|
||||
## print(str(get_network_master()) + "npsset")
|
||||
#
|
||||
# if multiplayer.network_peer and multiplayer.is_network_server():
|
||||
# cset_position(pposition, protation)
|
||||
# vrpc("cset_position", pposition, protation)
|
||||
#
|
||||
#remote func cset_position(pposition : Vector2, protation : float) -> void:
|
||||
## if get_network_master() != 1:
|
||||
## print(str(get_network_master()) + "npcset")
|
||||
#
|
||||
# get_body().position = pposition
|
||||
# get_body().rotation = protation
|
||||
#
|
||||
#func _moved() -> void:
|
||||
#
|
||||
# if sis_casting():
|
||||
# sfail_cast()
|
||||
#
|
||||
@ -1,22 +0,0 @@
|
||||
[gd_scene load_steps=5 format=2]
|
||||
|
||||
[ext_resource path="res://player/NetworkedPlayer.gd" type="Script" id=1]
|
||||
[ext_resource path="res://ui/nameplates/NamePlate.tscn" type="PackedScene" id=2]
|
||||
[ext_resource path="res://characters/Character.tscn" type="PackedScene" id=3]
|
||||
|
||||
[sub_resource type="CircleShape2D" id=1]
|
||||
radius = 20.0
|
||||
|
||||
[node name="NetworkedPlayer" type="Entity"]
|
||||
body_path = NodePath("KinematicBody2D")
|
||||
character_skeleton_path = NodePath("KinematicBody2D/Character")
|
||||
script = ExtResource( 1 )
|
||||
|
||||
[node name="NamePlate" parent="." instance=ExtResource( 2 )]
|
||||
|
||||
[node name="KinematicBody2D" type="KinematicBody2D" parent="."]
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"]
|
||||
shape = SubResource( 1 )
|
||||
|
||||
[node name="Character" parent="KinematicBody2D" instance=ExtResource( 3 )]
|
||||
@ -1,4 +1,4 @@
|
||||
extends "PlayerGDBase.gd"
|
||||
extends Entity
|
||||
class_name PlayerGD
|
||||
|
||||
# Copyright Péter Magyar relintai@gmail.com
|
||||
@ -24,9 +24,99 @@ class_name PlayerGD
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
|
||||
#func _initialize():
|
||||
# print("dadad")
|
||||
|
||||
func _from_dict(dict):
|
||||
._from_dict(dict)
|
||||
|
||||
randomize()
|
||||
sseed = randi()
|
||||
|
||||
|
||||
#PlayerGDBase
|
||||
|
||||
var _timer : float = randf() * 2.0
|
||||
|
||||
var _query : Physics2DShapeQueryParameters
|
||||
var _shape : SphereShape
|
||||
|
||||
func _ready():
|
||||
_shape = SphereShape.new()
|
||||
_shape.radius = 50
|
||||
|
||||
_query = Physics2DShapeQueryParameters.new()
|
||||
_query.exclude = [ self ]
|
||||
_query.shape_rid = _shape.get_rid()
|
||||
|
||||
set_physics_process(true)
|
||||
|
||||
func _physics_process(delta):
|
||||
# if (multiplayer.has_network_peer() and multiplayer.is_network_server()) or not multiplayer.has_network_peer():
|
||||
if multiplayer.has_network_peer() and multiplayer.is_network_server():
|
||||
_timer += delta
|
||||
|
||||
if _timer > 3:
|
||||
_timer -= 3
|
||||
|
||||
update_visibility()
|
||||
|
||||
func update_visibility() -> void:
|
||||
_query.collision_layer = get_body().get_collision_layer()
|
||||
|
||||
_query.transform = Transform2D(0, get_body().position)
|
||||
var res : Array = get_body().get_world_2d().direct_space_state.intersect_shape(_query)
|
||||
|
||||
#warning-ignore:unassigned_variable
|
||||
var currenty_sees : Array = Array()
|
||||
|
||||
for collision in res:
|
||||
var collider = collision["collider"]
|
||||
|
||||
if collider is Entity and not currenty_sees.has(collider):
|
||||
currenty_sees.append(collider)
|
||||
|
||||
|
||||
#warning-ignore:unassigned_variable
|
||||
var used_to_see : Array = Array()
|
||||
|
||||
for i in range(sees_gets_count()):
|
||||
var ent : Entity = sees_gets(i)
|
||||
|
||||
used_to_see.append(ent)
|
||||
|
||||
|
||||
#warning-ignore:unassigned_variable
|
||||
var currenty_sees_filtered : Array = Array()
|
||||
|
||||
for e in currenty_sees:
|
||||
currenty_sees_filtered.append(e)
|
||||
|
||||
for e in currenty_sees:
|
||||
if used_to_see.has(e):
|
||||
used_to_see.erase(e)
|
||||
currenty_sees_filtered.erase(e)
|
||||
|
||||
for e in used_to_see:
|
||||
var ent : Entity = e as Entity
|
||||
|
||||
if self.get_network_master() != 1:
|
||||
ESS.entity_spawner.despawn_for(self, ent)
|
||||
|
||||
sees_removes(ent)
|
||||
|
||||
for e in currenty_sees_filtered:
|
||||
var ent : Entity = e as Entity
|
||||
|
||||
if self.get_network_master() != 1:
|
||||
ESS.entity_spawner.spawn_for(self, ent)
|
||||
|
||||
sees_adds(ent)
|
||||
|
||||
|
||||
remote func set_position_remote(pos : Vector2) -> void:
|
||||
if get_tree().is_network_server():
|
||||
rpc("set_position_remote", pos)
|
||||
#print(position)
|
||||
get_body().position = pos
|
||||
|
||||
|
||||
@ -249,7 +249,8 @@ func _request_entity_spawn(createinfo : EntityCreateInfo):
|
||||
else:
|
||||
entity_node = MobGD.new()
|
||||
else:
|
||||
entity_node = NetworkedPlayerGD.new()
|
||||
entity_node = Entity.new()
|
||||
# entity_node = NetworkedPlayerGD.new()
|
||||
|
||||
if entity_node == null:
|
||||
print("EntityManager: entity node is null")
|
||||
|
||||
@ -254,12 +254,7 @@ _global_script_classes=[ {
|
||||
"language": "GDScript",
|
||||
"path": "res://player/Mob.gd"
|
||||
}, {
|
||||
"base": "",
|
||||
"class": "NetworkedPlayerGD",
|
||||
"language": "GDScript",
|
||||
"path": "res://player/NetworkedPlayer.gd"
|
||||
}, {
|
||||
"base": "",
|
||||
"base": "Entity",
|
||||
"class": "PlayerGD",
|
||||
"language": "GDScript",
|
||||
"path": "res://player/Player.gd"
|
||||
@ -334,7 +329,6 @@ _global_script_class_icons={
|
||||
"ManaResource": "",
|
||||
"Menu": "",
|
||||
"MobGD": "",
|
||||
"NetworkedPlayerGD": "",
|
||||
"PlayerGD": "",
|
||||
"PlayerMaster": "",
|
||||
"SpeedResource": "",
|
||||
|
||||
@ -178,7 +178,11 @@ func renounce_character() -> void:
|
||||
var f : File = File.new()
|
||||
|
||||
if f.file_exists(file_name):
|
||||
|
||||
var d : Directory = Directory.new()
|
||||
|
||||
d.open(file_name.get_base_dir())
|
||||
|
||||
if d.remove(file_name) == OK:
|
||||
refresh()
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user