diff --git a/Actors/Objects/Item/Item.tscn b/Actors/Objects/Item/Item.tscn new file mode 100644 index 0000000..e0f3efc --- /dev/null +++ b/Actors/Objects/Item/Item.tscn @@ -0,0 +1,8 @@ +[gd_scene load_steps=2 format=2] + +[sub_resource type="CircleShape2D" id=1] + +[node name="Node2D" type="Area2D"] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource( 1 ) diff --git a/Actors/Player/BodyPart.gd b/Actors/Player/BodyPart.gd index 9b2326e..d435d5d 100644 --- a/Actors/Player/BodyPart.gd +++ b/Actors/Player/BodyPart.gd @@ -1,5 +1,8 @@ extends Node2D -const MAX_HEALTH = 100.0 +var base_hp = 100.0 -var health = MAX_HEALTH +var damage = 0.0 + +func get_health() -> float: + return base_hp - damage diff --git a/Actors/Player/Player.gd b/Actors/Player/Player.gd index d6e27d8..2e6b2cd 100644 --- a/Actors/Player/Player.gd +++ b/Actors/Player/Player.gd @@ -24,6 +24,8 @@ onready var netgame = $"/root/Multiplayer" export var is_controlled = false setget set_is_controlled +var object_name setget ,get_name + func _ready(): $Camera.current = is_controlled @@ -103,3 +105,18 @@ func draw_circle_arc_poly(center, radius, angle_from, angle_to, color): func get_info(): return netgame.player_info[get_network_master()] + +func get_name(): + var id = get_network_master() + return netgame.player_info[id].name + +func inspect(): + if is_network_master(): + return { + "type": "Crewmember", + "description": "That's you!" + } + return { + "type": "Crewmember", + "description": "A fellow crewmember" + } diff --git a/Actors/Player/Player.tscn b/Actors/Player/Player.tscn index ac9ba6a..27bac48 100644 --- a/Actors/Player/Player.tscn +++ b/Actors/Player/Player.tscn @@ -13,7 +13,7 @@ extents = Vector2( 32, 32 ) [node name="Player" type="KinematicBody2D"] z_index = 10 -collision_layer = 8 +collision_layer = 10 script = ExtResource( 2 ) [node name="Camera" type="Camera2D" parent="."] diff --git a/Scenes/MapEditor.gd b/Scenes/MapEditor.gd index 2f1ceb8..6c6a675 100644 --- a/Scenes/MapEditor.gd +++ b/Scenes/MapEditor.gd @@ -26,7 +26,7 @@ func _input(ev: InputEvent): map_node.position = view_origin - (mouse_origin - ev.global_position) else: # Map cursor location to grid - var mouseOffset = ev.global_position - map_node.global_position + var mouse_offset = ev.global_position - map_node.global_position if ev is InputEventMouseButton: