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

Updated the engine and the modules. Also fixed a few smaller errors.

Browse Source
This commit is contained in:
Relintai 2021-09-06 19:30:23 +02:00
parent c13ac6d2ba
commit 4fafb12939
3 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "64a9e86c5c20bd4bd5833f0563457d0126617489", "3.x": "a5c62edc144255b1f5ee504440b8184f63d06843"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "378ebcff23e5ab0a04c0e92119d26391de4be139"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "texture_packer": {"master": "dbf3c59a9c52f155f0d98b567d571708e8b3f253"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "thread_pool": {"master": "b2e8c815392052947e7386f722913a12eea543a4"}} {"engine": {"3.2": "64a9e86c5c20bd4bd5833f0563457d0126617489", "3.x": "095dea7b71c4ba858710e8ecbd80ee28cf9877c8"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "cc9dc30b8377552df79ee4d53e1ed6d51cb87408"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "thread_pool": {"master": "b2e8c815392052947e7386f722913a12eea543a4"}}

13
game/characters/SheetCharacter.tscn
View File

@ -5,6 +5,19 @@
[ext_resource path="res://characters/SheetCharacter.gd" type="Script" id=3] [ext_resource path="res://characters/SheetCharacter.gd" type="Script" id=3]
[node name="SheetCharacter" type="CharacterSkeleton2D"] [node name="SheetCharacter" type="CharacterSkeleton2D"]
entity_type = 1
attach_point_paths/0_left_hand = NodePath("")
attach_point_paths/1_right_hand = NodePath("")
attach_point_paths/2_torso = NodePath("")
attach_point_paths/3_root = NodePath("")
attach_point_paths/4_right_hip = NodePath("")
attach_point_paths/5_left_hip = NodePath("")
attach_point_paths/6_spine_2 = NodePath("")
attach_point_paths/7_weapon_left = NodePath("")
attach_point_paths/8_weapon_right = NodePath("")
attach_point_paths/9_weapon_left_back = NodePath("")
attach_point_paths/10_weapon_right_back = NodePath("")
attach_point_paths/11_weapon_shield_left = NodePath("")
script = ExtResource( 3 ) script = ExtResource( 3 )
sprite_path = NodePath("CharacterSprite") sprite_path = NodePath("CharacterSprite")

30
game/player/Body.gd
View File

@ -85,6 +85,8 @@ var character_skeleton : CharacterSkeleton2D
var visibility_update_timer : float = 0 var visibility_update_timer : float = 0
var _nameplate : Node = null
func _enter_tree() -> void: func _enter_tree() -> void:
world = get_node(world_path) as Node2D world = get_node(world_path) as Node2D
camera = get_node_or_null("Camera") as Camera2D camera = get_node_or_null("Camera") as Camera2D
@ -94,10 +96,10 @@ func _enter_tree() -> void:
entity.set_character_skeleton(character_skeleton) entity.set_character_skeleton(character_skeleton)
# entity.connect("notification_ccast", self, "on_notification_ccast") # entity.connect("notification_ccast", self, "on_notification_ccast")
entity.connect("diesd", self, "on_diesd") entity.connect("diesd", self, "on_diesd")
entity.connect("isc_controlled_changed", self, "on_c_controlled_changed") entity.connect("onc_entity_controller_changed", self, "on_c_controlled_changed")
owner = entity owner = entity
on_c_controlled_changed(entity.c_is_controlled) on_c_controlled_changed()
transform = entity.get_transform_2d(true) transform = entity.get_transform_2d(true)
@ -142,7 +144,7 @@ func _physics_process(delta : float) -> void:
if dead: if dead:
return return
if entity.c_is_controlled: if entity.getc_is_controlled():
process_input(delta) process_input(delta)
process_movement_player(delta) process_movement_player(delta)
else: else:
@ -472,11 +474,14 @@ func analog_force_change(vector, touchpad):
# anim_node_state_machine.travel("run-loop") # anim_node_state_machine.travel("run-loop")
func on_c_controlled_changed(val): func on_c_controlled_changed():
#create camera and pivot if true #create camera and pivot if true
_controlled = val _controlled = entity.getc_is_controlled()
if _controlled:
if _nameplate:
_nameplate.queue_free()
if val:
camera = Camera2D.new() camera = Camera2D.new()
camera.zoom = Vector2(0.8, 0.8) camera.zoom = Vector2(0.8, 0.8)
add_child(camera) add_child(camera)
@ -498,9 +503,18 @@ func on_c_controlled_changed(val):
set_process_input(false) set_process_input(false)
set_process_unhandled_input(false) set_process_unhandled_input(false)
var nameplatescn : PackedScene = ResourceLoader.load("res://ui/nameplates/NamePlate.tscn") var nameplatescn : PackedScene = ResourceLoader.load("res://ui/nameplates/NamePlate.tscn")
var nameplate = nameplatescn.instance() _nameplate = nameplatescn.instance()
get_parent().add_child(nameplate) get_parent().add_child(_nameplate)
func on_diesd(entity):
if dead:
return
dead = true
#anim_node_state_machine.travel("dead")
#set_physics_process(false)
remote func sset_position(pposition : Vector2) -> void: remote func sset_position(pposition : Vector2) -> void: