Bellsworne/steamforged-skies
Bellsworne/steamforged-skies
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ship mostly works #10

Merged
chrisbell merged 60 commits from feature/ship-syncing into develop 2024-12-29 04:35:51 +00:00
Conversation 2 Commits 60 Files Changed 14 +9 -8
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3ce0fc5311 - Show all commits

8
assets/core/interactables/ship-helm/ship_helm.gd
View File

@ -1,11 +1,7 @@
class_name ShipHelm
extends Interactable
var parent_ship: Ship
func _ready():
parent_ship = get_parent().get_parent() #sets the parent ship to the ship that the helm is placed on
@export var parent_ship: Ship
func interact():
if player_reference.is_network_authority:
@ -17,4 +13,4 @@ func interact():
player_reference.set_is_piloting(false)
parent_ship.remove_piloting_player()
parent_ship._sync_piloting_state()

2
assets/core/ships/ship_script.gd
View File

@ -102,4 +102,4 @@ func set_piloting_player(player: Player):
func remove_piloting_player():
piloting_player = null
ship_is_piloted = false
print("The ship is no longer piloted.")
print("The ship is no longer piloted.")

7
assets/core/ships/shuttle-class/shuttle-class.tscn
View File

@ -1,7 +1,8 @@
[gd_scene load_steps=7 format=3 uid="uid://y0xb2vktsr1k"]
[gd_scene load_steps=8 format=3 uid="uid://y0xb2vktsr1k"]
[ext_resource type="Script" path="res://assets/core/ships/ship_script.gd" id="1_ghft7"]
[ext_resource type="Texture2D" uid="uid://gymb0tju4y67" path="res://addons/kennysprototypetextures/Dark/texture_black (1).png" id="2_3koq8"]
[ext_resource type="PackedScene" uid="uid://dm31ddavxv5gt" path="res://assets/core/interactables/ship-helm/ship-helm.tscn" id="3_eyiku"]
[sub_resource type="BoxShape3D" id="BoxShape3D_6gbwt"]
size = Vector3(5, 0.15, 20)
@ -50,3 +51,7 @@ shape = SubResource("BoxShape3D_7o08p")
[node name="HelmLocationMarker" type="Marker3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 0)
[node name="ShipHelm" parent="." node_paths=PackedStringArray("parent_ship") instance=ExtResource("3_eyiku")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -7.54699)
parent_ship = NodePath("..")