Skip to content

Commit 849f8d3

Browse files
committed
updated space gems
1 parent 7a7814c commit 849f8d3

File tree

6 files changed

+106
-45
lines changed

6 files changed

+106
-45
lines changed
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://chjx4dikt1rp3"
6+
path="res://.godot/imported/anim-asteroid.png-e7c37840c61ff62513b5a976888abc6c.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://assets/bkgd/anim-asteroid.png"
14+
dest_files=["res://.godot/imported/anim-asteroid.png-e7c37840c61ff62513b5a976888abc6c.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1

assets/gems/space/Space_Z.png

32.1 KB
Loading
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://dwf6yosfhinvi"
6+
path="res://.godot/imported/Space_Z.png-13f1767497460eea0e208aa3e172523b.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://assets/gems/space/Space_Z.png"
14+
dest_files=["res://.godot/imported/Space_Z.png-13f1767497460eea0e208aa3e172523b.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1

game_boards/all_common/cmn_gem_cell.gd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ const gem_textures_gems: Dictionary = {
3434
Enums.GemColor.BLU: preload("res://assets/gems/gems/gem5.png"),
3535
Enums.GemColor.PRP: preload("res://assets/gems/gems/gem6.png")
3636
}
37-
const gem_textures_space2: Dictionary = {
37+
const gem_textures_space: Dictionary = {
3838
Enums.GemColor.RED: preload("res://assets/gems/space/Space_R.png"),
39-
Enums.GemColor.ORG: preload("res://assets/gems/space/Space_O.png"),
39+
Enums.GemColor.ORG: preload("res://assets/gems/space/Space_Z.png"),
4040
Enums.GemColor.YLW: preload("res://assets/gems/space/Space_Y.png"),
4141
Enums.GemColor.GRN: preload("res://assets/gems/space/Space_G.png"),
4242
Enums.GemColor.BLU: preload("res://assets/gems/space/Space_B.png"),
4343
Enums.GemColor.PRP: preload("res://assets/gems/space/Space_P.png")
4444
}
45-
const gem_textures_space: Dictionary = {
45+
const gem_textures_spacefun: Dictionary = {
4646
Enums.GemColor.RED: preload("res://assets/gems/gems2/gem_z.png"),
4747
Enums.GemColor.ORG: preload("res://assets/gems/gems2/gem_o.png"),
4848
Enums.GemColor.YLW: preload("res://assets/gems/gems2/gem_x.png"),

game_boards/all_common/cmn_gem_cell.tscn

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
[gd_scene load_steps=93 format=3 uid="uid://8rbpehubrrps"]
1+
[gd_scene load_steps=91 format=3 uid="uid://8rbpehubrrps"]
22

33
[ext_resource type="Script" path="res://game_boards/all_common/cmn_gem_cell.gd" id="1_taq7m"]
4-
[ext_resource type="Shader" path="res://game_boards/board_space/assets/gem_cell.gdshader" id="2_aext1"]
54
[ext_resource type="Texture2D" uid="uid://duau66qew6757" path="res://assets/gems/food/characters_0001.png" id="2_nap56"]
65
[ext_resource type="Texture2D" uid="uid://c4u0bdf7rh0u3" path="res://assets/gems/gems/Overlay-Lock.png" id="3_ry8vu"]
76
[ext_resource type="Texture2D" uid="uid://cooat8cgq2rb4" path="res://assets/gems/gems/Overlay-Ice.png" id="4_r411p"]
@@ -18,11 +17,6 @@
1817
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lpbyf"]
1918
bg_color = Color(0, 0, 0, 0.533333)
2019

21-
[sub_resource type="ShaderMaterial" id="ShaderMaterial_careo"]
22-
shader = ExtResource("2_aext1")
23-
shader_parameter/line_color = Color(1, 1, 1, 1)
24-
shader_parameter/line_thickness = 5.0
25-
2620
[sub_resource type="Animation" id="Animation_3mn62"]
2721
resource_name = "explode"
2822
length = 0.5
@@ -684,7 +678,6 @@ grow_vertical = 2
684678
color = Color(1, 1, 1, 0)
685679

686680
[node name="Sprite2D" type="Sprite2D" parent="."]
687-
material = SubResource("ShaderMaterial_careo")
688681
position = Vector2(64, 64)
689682
scale = Vector2(0.5, 0.5)
690683
texture = ExtResource("2_nap56")

game_boards/board_space/game_space.tscn

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[ext_resource type="Shader" path="res://game_boards/board_space/assets/gem_cell.gdshader" id="6_tywfq"]
99
[ext_resource type="Texture2D" uid="uid://dt14wt38x2ddb" path="res://assets/gems/space/Space_R.png" id="7_8sijq"]
1010
[ext_resource type="Theme" uid="uid://1cdmnqyil8gy" path="res://themes/game_stats_label_theme.tres" id="8_nteo6"]
11-
[ext_resource type="Texture2D" uid="uid://c3gf2kl8ex7ru" path="res://assets/gems/space/Space_O.png" id="9_vnsth"]
11+
[ext_resource type="Texture2D" uid="uid://dwf6yosfhinvi" path="res://assets/gems/space/Space_Z.png" id="9_ygwn3"]
1212
[ext_resource type="Texture2D" uid="uid://cavqcc5satl8d" path="res://assets/gems/space/Space_Y.png" id="10_yghiu"]
1313
[ext_resource type="Texture2D" uid="uid://c37gqqvuu16v3" path="res://assets/gems/space/Space_G.png" id="11_1nee1"]
1414
[ext_resource type="Texture2D" uid="uid://cvlodafggu8vg" path="res://assets/gems/space/Space_B.png" id="12_rwo65"]
@@ -30,32 +30,32 @@ bg_color = Color(0, 0, 0, 0.6)
3030
[sub_resource type="ShaderMaterial" id="ShaderMaterial_2xg0a"]
3131
shader = ExtResource("6_tywfq")
3232
shader_parameter/line_color = Color(1, 1, 1, 1)
33-
shader_parameter/line_thickness = 7.0
34-
35-
[sub_resource type="ShaderMaterial" id="ShaderMaterial_csjnx"]
36-
shader = ExtResource("6_tywfq")
37-
shader_parameter/line_color = Color(1, 1, 1, 1)
38-
shader_parameter/line_thickness = 7.0
33+
shader_parameter/line_thickness = 5.0
3934

4035
[sub_resource type="ShaderMaterial" id="ShaderMaterial_v882r"]
4136
shader = ExtResource("6_tywfq")
4237
shader_parameter/line_color = Color(1, 1, 1, 1)
43-
shader_parameter/line_thickness = 7.0
38+
shader_parameter/line_thickness = 5.0
4439

4540
[sub_resource type="ShaderMaterial" id="ShaderMaterial_u84gj"]
4641
shader = ExtResource("6_tywfq")
4742
shader_parameter/line_color = Color(1, 1, 1, 1)
48-
shader_parameter/line_thickness = 7.0
43+
shader_parameter/line_thickness = 5.0
4944

5045
[sub_resource type="ShaderMaterial" id="ShaderMaterial_oi0wf"]
5146
shader = ExtResource("6_tywfq")
5247
shader_parameter/line_color = Color(1, 1, 1, 1)
53-
shader_parameter/line_thickness = 7.0
48+
shader_parameter/line_thickness = 5.0
5449

5550
[sub_resource type="ShaderMaterial" id="ShaderMaterial_skchu"]
5651
shader = ExtResource("6_tywfq")
5752
shader_parameter/line_color = Color(1, 1, 1, 1)
58-
shader_parameter/line_thickness = 7.0
53+
shader_parameter/line_thickness = 5.0
54+
55+
[sub_resource type="ShaderMaterial" id="ShaderMaterial_csjnx"]
56+
shader = ExtResource("6_tywfq")
57+
shader_parameter/line_color = Color(1, 1, 1, 1)
58+
shader_parameter/line_thickness = 5.0
5959

6060
[sub_resource type="Animation" id="Animation_3xeuw"]
6161
resource_name = "show_msg_amazing"
@@ -282,29 +282,6 @@ text = "0"
282282
horizontal_alignment = 2
283283
vertical_alignment = 1
284284

285-
[node name="HBoxContainer2" type="HBoxContainer" parent="ContGameStats/GameStats"]
286-
layout_mode = 2
287-
theme_override_constants/separation = 25
288-
289-
[node name="Control" type="Control" parent="ContGameStats/GameStats/HBoxContainer2"]
290-
custom_minimum_size = Vector2(128, 128)
291-
layout_mode = 2
292-
293-
[node name="Sprite2D" type="Sprite2D" parent="ContGameStats/GameStats/HBoxContainer2/Control"]
294-
material = SubResource("ShaderMaterial_csjnx")
295-
scale = Vector2(0.5, 0.5)
296-
texture = ExtResource("9_vnsth")
297-
centered = false
298-
299-
[node name="Label" type="Label" parent="ContGameStats/GameStats/HBoxContainer2"]
300-
layout_mode = 2
301-
size_flags_horizontal = 3
302-
theme = ExtResource("8_nteo6")
303-
theme_override_font_sizes/font_size = 96
304-
text = "0"
305-
horizontal_alignment = 2
306-
vertical_alignment = 1
307-
308285
[node name="HBoxContainer3" type="HBoxContainer" parent="ContGameStats/GameStats"]
309286
layout_mode = 2
310287
theme_override_constants/separation = 25
@@ -401,6 +378,29 @@ text = "0"
401378
horizontal_alignment = 2
402379
vertical_alignment = 1
403380

381+
[node name="HBoxContainer2" type="HBoxContainer" parent="ContGameStats/GameStats"]
382+
layout_mode = 2
383+
theme_override_constants/separation = 25
384+
385+
[node name="Control" type="Control" parent="ContGameStats/GameStats/HBoxContainer2"]
386+
custom_minimum_size = Vector2(128, 128)
387+
layout_mode = 2
388+
389+
[node name="Sprite2D" type="Sprite2D" parent="ContGameStats/GameStats/HBoxContainer2/Control"]
390+
material = SubResource("ShaderMaterial_csjnx")
391+
scale = Vector2(0.5, 0.5)
392+
texture = ExtResource("9_ygwn3")
393+
centered = false
394+
395+
[node name="Label" type="Label" parent="ContGameStats/GameStats/HBoxContainer2"]
396+
layout_mode = 2
397+
size_flags_horizontal = 3
398+
theme = ExtResource("8_nteo6")
399+
theme_override_font_sizes/font_size = 96
400+
text = "0"
401+
horizontal_alignment = 2
402+
vertical_alignment = 1
403+
404404
[node name="ContBoard" type="Control" parent="."]
405405
layout_mode = 3
406406
anchors_preset = 0

0 commit comments

Comments
 (0)