From 92edab98c63d2c1c1b84c1bd0a2f6a5218ee1649 Mon Sep 17 00:00:00 2001 From: Hamcha Date: Thu, 16 Jul 2020 14:37:56 +0200 Subject: [PATCH] Add crew monitor computer type --- Actors/Objects/Computer/Computer.gd | 5 ++++- Actors/Objects/Computer/Computer.tscn | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Actors/Objects/Computer/Computer.gd b/Actors/Objects/Computer/Computer.gd index 05b6961..0112dc8 100644 --- a/Actors/Objects/Computer/Computer.gd +++ b/Actors/Objects/Computer/Computer.gd @@ -5,7 +5,7 @@ extends StaticBody2D class_name GameObjectComputer enum Direction { LEFT, RIGHT, UP, DOWN } -enum ComputerType { ShipCommand, Comms, Medical, Research, Energy, ShipEngine, Atmos } +enum ComputerType { ShipCommand, Comms, Medical, Research, Energy, ShipEngine, Atmos, Monitoring } export(Direction) var direction = Direction.DOWN setget set_direction export(ComputerType) var computer_type = ComputerType.ShipCommand setget set_type @@ -37,6 +37,8 @@ func set_type(val): screen_region_offset = Vector2(128, 192) ComputerType.ShipEngine: screen_region_offset = Vector2(0, 256) + ComputerType.Monitoring: + screen_region_offset = Vector2(128, 32) refresh_sprite() @@ -100,6 +102,7 @@ func _force_close_ui(): $Control/ControlComp.force_close() func _power_status_changed(powered: bool) -> void: + print(name, " is ", powered) activationRange.visible = powered if powered: $ScreenAnimation.play("on") diff --git a/Actors/Objects/Computer/Computer.tscn b/Actors/Objects/Computer/Computer.tscn index 67d5a04..ee288ba 100644 --- a/Actors/Objects/Computer/Computer.tscn +++ b/Actors/Objects/Computer/Computer.tscn @@ -139,6 +139,7 @@ region_enabled = true region_rect = Rect2( 0, 0, 32, 32 ) [node name="screen" type="Sprite" parent="computer"] +modulate = Color( 0, 0, 0, 1 ) material = SubResource( 2 ) texture = ExtResource( 1 ) centered = false @@ -147,6 +148,7 @@ region_rect = Rect2( 0, 0, 32, 32 ) [node name="Light2D" type="Light2D" parent="computer/screen"] position = Vector2( 16, 16 ) +enabled = false texture = ExtResource( 5 ) texture_scale = 0.5 energy = 0.5 @@ -161,6 +163,8 @@ anims/fadein = SubResource( 5 ) anims/fadeout = SubResource( 6 ) [node name="Control" type="Node2D" parent="."] +modulate = Color( 1, 1, 1, 0 ) +position = Vector2( 0, 10 ) z_index = 999 [node name="ControlComp" parent="Control" instance=ExtResource( 4 )]