Skip to content

Commit 84f6682

Browse files
manuqmanuq
committed
Category factory: Use multi-line strings for code
This is more readable. Even with the extra parenthesis added by the gdformat formatter.
1 parent ad90e57 commit 84f6682

File tree

1 file changed

+61
-7
lines changed

1 file changed

+61
-7
lines changed

‎addons/block_code/ui/picker/categories/category_factory.gd

Lines changed: 61 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -198,13 +198,25 @@ static func get_general_blocks() -> Array[Block]:
198198

199199
b = BLOCKS["statement_block"].instantiate()
200200
b.block_format = "Send signal {signal: STRING} to group {group: STRING}"
201-
b.statement = 'if get_tree().root.has_node("SignalManager"):\n' + '\tget_tree().root.get_node_or_null("SignalManager").broadcast_signal({group}, {signal})'
201+
b.statement = (
202+
"""
203+
if get_tree().root.has_node("SignalManager"):
204+
get_tree().root.get_node_or_null("SignalManager").broadcast_signal({group}, {signal})
205+
"""
206+
. dedent()
207+
)
202208
b.category = "Signal"
203209
block_list.append(b)
204210

205211
b = BLOCKS["statement_block"].instantiate()
206212
b.block_format = "Send signal {signal: STRING} to node {node: NODE_PATH}"
207-
b.statement = 'if get_tree().root.has_node("SignalManager"):\n' + '\tget_tree().root.get_node_or_null("SignalManager").send_signal_to_node({node}, {signal})'
213+
b.statement = (
214+
"""
215+
if get_tree().root.has_node("SignalManager"):
216+
get_tree().root.get_node_or_null("SignalManager").send_signal_to_node({node}, {signal})
217+
"""
218+
. dedent()
219+
)
208220
b.category = "Signal"
209221
block_list.append(b)
210222

@@ -345,14 +357,29 @@ static func get_general_blocks() -> Array[Block]:
345357
b = BLOCKS["statement_block"].instantiate()
346358
b.block_type = Types.BlockType.EXECUTE
347359
b.block_format = "Load file {file_path: STRING} as sound {name: STRING}"
348-
b.statement = "VAR_DICT[{name}] = AudioStreamPlayer.new()\nVAR_DICT[{name}].name = {name}\nVAR_DICT[{name}].set_stream(load({file_path}))\nadd_child(VAR_DICT[{name}])"
360+
b.statement = (
361+
"""
362+
VAR_DICT[{name}] = AudioStreamPlayer.new()
363+
VAR_DICT[{name}].name = {name}
364+
VAR_DICT[{name}].set_stream(load({file_path}))
365+
add_child(VAR_DICT[{name}])
366+
"""
367+
. dedent()
368+
)
349369
b.category = "Sound"
350370
block_list.append(b)
351371

352372
b = BLOCKS["statement_block"].instantiate()
353373
b.block_type = Types.BlockType.EXECUTE
354374
b.block_format = "Play the sound {name: STRING} with Volume dB {db: FLOAT} and Pitch Scale {pitch: FLOAT}"
355-
b.statement = "VAR_DICT[{name}].volume_db = {db}\nVAR_DICT[{name}].pitch_scale = {pitch}\nVAR_DICT[{name}].play()"
375+
b.statement = (
376+
"""
377+
VAR_DICT[{name}].volume_db = {db}
378+
VAR_DICT[{name}].pitch_scale = {pitch}
379+
VAR_DICT[{name}].play()
380+
"""
381+
. dedent()
382+
)
356383
b.defaults = {"db": "0.0", "pitch": "1.0"}
357384
b.category = "Sound"
358385
block_list.append(b)
@@ -450,14 +477,32 @@ static func get_built_in_blocks(_class_name: String) -> Array[Block]:
450477
b.block_format = "On [body: NODE_PATH] %s" % [verb]
451478
# HACK: Blocks refer to nodes by path but the callback receives the node itself;
452479
# convert to path
453-
b.statement = "func _on_body_%s(_body: Node):\n\tvar body: NodePath = _body.get_path()" % [verb]
480+
b.statement = (
481+
(
482+
"""
483+
func _on_body_%s(_body: Node):
484+
var body: NodePath = _body.get_path()
485+
"""
486+
. dedent()
487+
)
488+
% [verb]
489+
)
454490
b.signal_name = "body_%s" % [verb]
455491
b.category = "Signal"
456492
block_list.append(b)
457493

458494
var b = BLOCKS["statement_block"].instantiate()
459495
b.block_format = "Set Physics Position {position: VECTOR2}"
460-
b.statement = "PhysicsServer2D.body_set_state(get_rid(),PhysicsServer2D.BODY_STATE_TRANSFORM,Transform2D.IDENTITY.translated({position}))"
496+
b.statement = (
497+
"""
498+
PhysicsServer2D.body_set_state(
499+
get_rid(),
500+
PhysicsServer2D.BODY_STATE_TRANSFORM,
501+
Transform2D.IDENTITY.translated({position})
502+
)
503+
"""
504+
. dedent()
505+
)
461506
b.category = "Movement"
462507
block_list.append(b)
463508

@@ -473,7 +518,16 @@ static func get_built_in_blocks(_class_name: String) -> Array[Block]:
473518
b.block_format = "On [body: NODE_PATH] %s" % [verb]
474519
# HACK: Blocks refer to nodes by path but the callback receives the node itself;
475520
# convert to path
476-
b.statement = "func _on_body_%s(_body: Node2D):\n\tvar body: NodePath = _body.get_path()" % [verb]
521+
b.statement = (
522+
(
523+
"""
524+
func _on_body_%s(_body: Node2D):
525+
var body: NodePath = _body.get_path()
526+
"""
527+
. dedent()
528+
)
529+
% [verb]
530+
)
477531
b.signal_name = "body_%s" % [verb]
478532
b.category = "Signal"
479533
block_list.append(b)

0 commit comments

Comments
 (0)