hamcha/odyssey-old
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Try fixing the plugin problem + more odyssey

Browse source
This commit is contained in:
Hamcha 2020-07-16 17:08:30 +02:00
parent a7c35e24e8
commit a62da2f057
Signed by: hamcha
GPG key ID: 41467804B19A3315
5 changed files with 68 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Actors/Objects/ElectricSocket/ElectricSocket.tscn
View file

@ -35,7 +35,7 @@ void fragment() {
[sub_resource type="ShaderMaterial" id=2] [sub_resource type="ShaderMaterial" id=2]
shader = SubResource( 1 ) shader = SubResource( 1 )
shader_param/cable_color = Color( 0, 0, 0, 0 ) shader_param/cable_color = Color( 0.0901961, 0.533333, 0.960784, 1 )
[sub_resource type="CircleShape2D" id=3] [sub_resource type="CircleShape2D" id=3]
radius = 12.0 radius = 12.0
@ -44,18 +44,16 @@ radius = 12.0
collision_layer = 4 collision_layer = 4
collision_mask = 2147483652 collision_mask = 2147483652
script = ExtResource( 2 ) script = ExtResource( 2 )
direction = 2
source_color = Color( 0.937255, 0.0823529, 0.0823529, 1 ) source_color = Color( 0.937255, 0.0823529, 0.0823529, 1 )
sink_color = Color( 0.0901961, 0.533333, 0.960784, 1 ) sink_color = Color( 0.0901961, 0.533333, 0.960784, 1 )
bidirectional_color = Color( 0, 0, 0, 0 ) bidirectional_color = Color( 0, 0, 0, 0 )
flow = 2
[node name="socket" type="Sprite" parent="."] [node name="socket" type="Sprite" parent="."]
material = SubResource( 2 ) material = SubResource( 2 )
texture = ExtResource( 1 ) texture = ExtResource( 1 )
centered = false centered = false
region_enabled = true region_enabled = true
region_rect = Rect2( 32, 0, 32, 32 ) region_rect = Rect2( 0, 0, 32, 32 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 16, 16 ) position = Vector2( 16, 16 )

2
Actors/Objects/Engine/Engine.gd
View file

@ -17,7 +17,7 @@ onready var activationRange = $ActivationRange as ActivationRange
onready var manager = $PowerManager as PowerManager onready var manager = $PowerManager as PowerManager
export var strength = 1.0 setget set_strength export var strength = 1.0 setget set_strength
export var max_force = 0.3 export var max_force = 0.05
var force = 0 var force = 0

1
Actors/Objects/Engine/Engine.tscn
View file

@ -14,6 +14,7 @@ extents = Vector2( 72, 72 )
[node name="Engine" type="StaticBody2D"] [node name="Engine" type="StaticBody2D"]
script = ExtResource( 2 ) script = ExtResource( 2 )
max_force = 0.05
[node name="CollisionShape2D" type="CollisionShape2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 48, 48 ) position = Vector2( 48, 48 )

92
Scenes/Maps/odyssey.tscn
View file

File diff suppressed because one or more lines are too long

2
addons/pnhelper/pngui.gd
View file

@ -43,9 +43,9 @@ func _make_socket(direction: String) -> void:
var nodes = api.get_editor_interface().get_selection().get_selected_nodes() var nodes = api.get_editor_interface().get_selection().get_selected_nodes()
for node in nodes: for node in nodes:
var socket = socketTemplate.instance() var socket = socketTemplate.instance()
sockets.add_child(socket)
socket.direction = socket_dir socket.direction = socket_dir
socket.flow = socket_type socket.flow = socket_type
sockets.add_child(socket)
socket.owner = map socket.owner = map
socket.global_position = node.global_position + offset socket.global_position = node.global_position + offset
socket.connectionPaths = [socket.get_path_to(node)] socket.connectionPaths = [socket.get_path_to(node)]