Skip to content

Commit

Permalink
Merge pull request #9 from the-dev-bin/tyler/cleanup
Browse files Browse the repository at this point in the history
Add a bunch more blocks
  • Loading branch information
tylercchase authored Jul 28, 2024
2 parents a08323e + a53ce3f commit 6226b8f
Show file tree
Hide file tree
Showing 33 changed files with 404 additions and 46 deletions.
11 changes: 11 additions & 0 deletions godot/assets/CubeBlock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions godot/assets/CubeBlock.svg.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://coah48h1p4ys8"
path="res://.godot/imported/CubeBlock.svg-ba4b8a9bbceb39eb063a857d200dc67d.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/CubeBlock.svg"
dest_files=["res://.godot/imported/CubeBlock.svg-ba4b8a9bbceb39eb063a857d200dc67d.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false
11 changes: 11 additions & 0 deletions godot/assets/DisconnectHookBlock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions godot/assets/DisconnectHookBlock.svg.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://cb43bertxseth"
path="res://.godot/imported/DisconnectHookBlock.svg-951853b672a7937bf2532cc41fef15e8.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/DisconnectHookBlock.svg"
dest_files=["res://.godot/imported/DisconnectHookBlock.svg-951853b672a7937bf2532cc41fef15e8.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false
11 changes: 11 additions & 0 deletions godot/assets/HookBlock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions godot/assets/HookBlock.svg.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://d4ll0slartdyk"
path="res://.godot/imported/HookBlock.svg-9e60fd56c7273e33c013b1a9e3ea0295.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/HookBlock.svg"
dest_files=["res://.godot/imported/HookBlock.svg-9e60fd56c7273e33c013b1a9e3ea0295.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false
4 changes: 2 additions & 2 deletions godot/assets/LBlock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions godot/assets/OffsetBlock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions godot/assets/OffsetBlock.svg.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://4me05add204a"
path="res://.godot/imported/OffsetBlock.svg-b1fb4270a06a0866561cabc46bd20c27.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/OffsetBlock.svg"
dest_files=["res://.godot/imported/OffsetBlock.svg-b1fb4270a06a0866561cabc46bd20c27.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false
11 changes: 11 additions & 0 deletions godot/assets/TBlock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions godot/assets/TBlock.svg.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://d0nqwemj0xyhn"
path="res://.godot/imported/TBlock.svg-0d4fca7eead26f8c6f6a7f7e45dc995c.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/TBlock.svg"
dest_files=["res://.godot/imported/TBlock.svg-0d4fca7eead26f8c6f6a7f7e45dc995c.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false
2 changes: 1 addition & 1 deletion godot/assets/one_block.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions godot/ingredients/resources/cube_block.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[gd_resource type="Resource" script_class="Ingredient" load_steps=4 format=3 uid="uid://8p82vshqls3p"]

[ext_resource type="Script" path="res://ingredient_actions/actions/defend_action.gd" id="1_ow2ti"]
[ext_resource type="Script" path="res://scenes/ingredient_block/ingredient_resource.gd" id="2_6un3w"]

[sub_resource type="Resource" id="Resource_vvcgy"]
script = ExtResource("1_ow2ti")
defense_value = 10

[resource]
script = ExtResource("2_6un3w")
ingredient_name = "Cube Block"
image = "res://assets/CubeBlock.svg"
action = SubResource("Resource_vvcgy")
color = Color(0.781871, 0.0319325, 0.340096, 1)
base_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, 1), Vector2(0, 2), Vector2(1, 0), Vector2(1, 1), Vector2(1, 2), Vector2(2, 0), Vector2(2, 1), Vector2(2, 2)])
right_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, 1), Vector2(0, 2), Vector2(-1, 0), Vector2(-1, 1), Vector2(-1, 2), Vector2(-2, 0), Vector2(-2, 1), Vector2(-2, 2)])
flipped_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, -1), Vector2(0, -2), Vector2(-1, 0), Vector2(-1, -1), Vector2(-1, -2), Vector2(-2, 0), Vector2(-2, -1), Vector2(-2, -2)])
left_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, -1), Vector2(0, -2), Vector2(1, 0), Vector2(1, -1), Vector2(1, -2), Vector2(2, 0), Vector2(2, -1), Vector2(2, -2)])
20 changes: 20 additions & 0 deletions godot/ingredients/resources/disconnected_block.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[gd_resource type="Resource" script_class="Ingredient" load_steps=4 format=3 uid="uid://curs4gmtnp140"]

[ext_resource type="Script" path="res://ingredient_actions/actions/attack_action.gd" id="1_p7vqq"]
[ext_resource type="Script" path="res://scenes/ingredient_block/ingredient_resource.gd" id="2_7vwyi"]

[sub_resource type="Resource" id="Resource_y52xg"]
script = ExtResource("1_p7vqq")
attack_range = Array[int]([2, 3])
target = 0

[resource]
script = ExtResource("2_7vwyi")
ingredient_name = "Disconnected Block"
image = "res://assets/DisconnectHookBlock.svg"
action = SubResource("Resource_y52xg")
color = Color(0.781871, 0.0319325, 0.340096, 1)
base_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, 1), Vector2(1, 2), Vector2(2, 2)])
right_structure = Array[Vector2]([Vector2(0, 0), Vector2(-1, 0), Vector2(-2, 1), Vector2(-2, 2)])
flipped_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, -1), Vector2(-1, -2), Vector2(-2, -2)])
left_structure = Array[Vector2]([Vector2(0, 0), Vector2(1, 0), Vector2(2, -1), Vector2(2, -2)])
1 change: 1 addition & 0 deletions godot/ingredients/resources/godot_single.tres
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ script = ExtResource("1_dmw50")
ingredient_name = "Godot"
image = "res://assets/one_block.svg"
action = SubResource("Resource_8c46l")
color = Color(0.996078, 0.423529, 0.564706, 1)
base_structure = Array[Vector2]([Vector2(0, 0)])
right_structure = Array[Vector2]([Vector2(0, 0)])
flipped_structure = Array[Vector2]([Vector2(0, 0)])
Expand Down
20 changes: 20 additions & 0 deletions godot/ingredients/resources/hook_block.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[gd_resource type="Resource" script_class="Ingredient" load_steps=4 format=3 uid="uid://crywtu8cg1y53"]

[ext_resource type="Script" path="res://ingredient_actions/actions/attack_action.gd" id="1_4378i"]
[ext_resource type="Script" path="res://scenes/ingredient_block/ingredient_resource.gd" id="2_6i7m1"]

[sub_resource type="Resource" id="Resource_y52xg"]
script = ExtResource("1_4378i")
attack_range = Array[int]([2, 3])
target = 0

[resource]
script = ExtResource("2_6i7m1")
ingredient_name = "L Block"
image = "res://assets/HookBlock.svg"
action = SubResource("Resource_y52xg")
color = Color(0.781871, 0.0319325, 0.340096, 1)
base_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, 1), Vector2(0, 2), Vector2(1, 2), Vector2(2, 2)])
right_structure = Array[Vector2]([Vector2(0, 0), Vector2(-1, 0), Vector2(-2, 0), Vector2(-2, 1), Vector2(-2, 2)])
flipped_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, -1), Vector2(0, -2), Vector2(-1, -2), Vector2(-2, -2)])
left_structure = Array[Vector2]([Vector2(0, 0), Vector2(1, 0), Vector2(2, 0), Vector2(2, -1), Vector2(2, -2)])
12 changes: 6 additions & 6 deletions godot/ingredients/resources/l_block.tres
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[gd_resource type="Resource" script_class="Ingredient" load_steps=4 format=3 uid="uid://cyhd24hu3rkmq"]

[ext_resource type="Script" path="res://ingredient_actions/actions/attack_action.gd" id="1_4wwl0"]
[ext_resource type="Script" path="res://scenes/ingredient_block/ingredient_resource.gd" id="1_vl3xs"]
[ext_resource type="Script" path="res://ingredient_actions/actions/defend_action.gd" id="1_xmaqc"]

[sub_resource type="Resource" id="Resource_y52xg"]
script = ExtResource("1_4wwl0")
attack_range = Array[int]([1, 2])
target = 0
[sub_resource type="Resource" id="Resource_tha6s"]
script = ExtResource("1_xmaqc")
defense_value = 4

[resource]
script = ExtResource("1_vl3xs")
ingredient_name = "L Block"
image = "res://assets/LBlock.svg"
action = SubResource("Resource_y52xg")
action = SubResource("Resource_tha6s")
color = Color(0.996078, 0.423529, 0.564706, 1)
base_structure = Array[Vector2]([Vector2(0, 0), Vector2(1, 0), Vector2(1, 1)])
right_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, 1), Vector2(-1, 1)])
flipped_structure = Array[Vector2]([Vector2(0, 0), Vector2(-1, 0), Vector2(-1, -1)])
Expand Down
20 changes: 20 additions & 0 deletions godot/ingredients/resources/t_block.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[gd_resource type="Resource" script_class="Ingredient" load_steps=4 format=3 uid="uid://dnfyhrn54p1s"]

[ext_resource type="Script" path="res://ingredient_actions/actions/attack_action.gd" id="1_43irh"]
[ext_resource type="Script" path="res://scenes/ingredient_block/ingredient_resource.gd" id="2_caslh"]

[sub_resource type="Resource" id="Resource_y52xg"]
script = ExtResource("1_43irh")
attack_range = Array[int]([3, 6])
target = 0

[resource]
script = ExtResource("2_caslh")
ingredient_name = "L Block"
image = "res://assets/TBlock.svg"
action = SubResource("Resource_y52xg")
color = Color(0.946404, 0.0816347, 0.421494, 1)
base_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, 1), Vector2(1, 1), Vector2(0, 2), Vector2(2, 1)])
right_structure = Array[Vector2]([Vector2(0, 0), Vector2(-1, 0), Vector2(-2, 0), Vector2(-1, 1), Vector2(-1, 2)])
flipped_structure = Array[Vector2]([Vector2(0, 0), Vector2(0, -1), Vector2(0, -2), Vector2(-1, -1), Vector2(-2, -1)])
left_structure = Array[Vector2]([Vector2(0, 0), Vector2(1, 0), Vector2(2, 0), Vector2(1, -1), Vector2(1, -2)])
Loading

0 comments on commit 6226b8f

Please sign in to comment.