Skip to content

Commit 7fdabe6

Browse files
rainlizardrainlizard
committed
custom images, finish fixing right-click bug, brighter selection, fix 1st person angle
1 parent a8131f3 commit 7fdabe6

16 files changed

+362
-29
lines changed

‎Art/Cursor96x96Blue.png

23 Bytes
Loading

‎Scenes/Main.tscn

+2-1
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ shader = ExtResource( 36 )
253253
[sub_resource type="ShaderMaterial" id=9]
254254
shader = ExtResource( 8 )
255255
shader_param/zoom = 1.0
256+
shader_param/thickness = 4.0
256257

257258
[sub_resource type="StyleBoxFlat" id=15]
258259
content_margin_left = 12.0
@@ -1670,7 +1671,7 @@ custom_colors/font_color_hover = Color( 1, 0.65098, 0.556863, 1 )
16701671
custom_colors/font_color_pressed = Color( 0.333333, 0.607843, 1, 1 )
16711672
text = "View"
16721673
align = 0
1673-
items = [ "Map folder", null, 0, false, false, 0, 0, null, "", false, "Script file", null, 0, false, false, 1, 0, null, "", false, "Log file", null, 0, false, false, 2, 0, null, "", false, "", null, 0, false, true, -1, 0, null, "", true, "3D: 1st person", null, 0, false, false, 3, 0, null, "", false, "3D: Overhead", null, 0, false, false, 4, 0, null, "", false, "2D", null, 0, false, false, 5, 0, null, "", false ]
1674+
items = [ "Map folder", null, 0, false, false, 0, 0, null, "", false, "Script file", null, 0, false, false, 1, 0, null, "", false, "Log file", null, 0, false, false, 2, 0, null, "", false, "", null, 0, false, true, -1, 0, null, "", true, "3D: 1st person", null, 0, false, false, 3, 0, null, "", false ]
16741675
switch_on_hover = true
16751676
__meta__ = {
16761677
"_edit_use_anchors_": false

‎Scenes/Player.gd

+6-25
Original file line numberDiff line numberDiff line change
@@ -30,32 +30,13 @@ onready var oCamera2D = $'../../Game2D/Camera2D'
3030

3131
func switch_camera_type(type):
3232
velocity = Vector3(0,0,0) # stop moving
33-
34-
if type == 0: # 3D overhead orthogonal
35-
if oCamera3D.projection == Camera.PROJECTION_PERSPECTIVE:
36-
rememberPerspective = [transform, oHead.transform, oCamera3D.transform]
37-
if rememberOrthogonal != [null,null,null]:
38-
transform = rememberOrthogonal[0]
39-
oHead.transform = rememberOrthogonal[1]
40-
oCamera3D.transform = rememberOrthogonal[2]
41-
else:
42-
# Default orthogonal camera position and rotation
43-
rotation_degrees = Vector3(-45, -135, 0) #Vector2(270, 45, 0)
44-
oHead.rotation_degrees = Vector3(0, 0, 0)
45-
translation = Vector3(0,60,0)
46-
47-
oCamera3D.size = translation.y
48-
49-
oCamera3D.set_orthogonal(oCamera3D.size, -1000000, 1000000)
50-
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
51-
5233
if type == 1: # 3D 1st person perspective
53-
if oCamera3D.projection == Camera.PROJECTION_ORTHOGONAL:
54-
rememberOrthogonal = [transform, oHead.transform, oCamera3D.transform]
55-
if rememberPerspective != [null,null,null]:
56-
transform = rememberPerspective[0]
57-
oHead.transform = rememberPerspective[1]
58-
oCamera3D.transform = rememberPerspective[2]
34+
if rememberPerspective == [null,null,null]:
35+
oHead.rotation_degrees = Vector3(0,0,0)
36+
else:
37+
transform = rememberPerspective[0]
38+
oHead.transform = rememberPerspective[1]
39+
oCamera3D.transform = rememberPerspective[2]
5940

6041
oCamera3D.set_perspective(oCamera3D.fov, 0.01, 8192)
6142
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)

‎Scenes/Selection.gd

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func update_paint():
116116
newPaintSlab(cursorOverSlab)
117117
oPickSlabWindow.set_selection(cursorOverSlab)
118118

119-
if cursorOverSlabOwner != 5 or oOwnableNaturalTerrain.pressed == true:
119+
if cursorOverSlabOwner != 5 or oOwnableNaturalTerrain.pressed == true or Slabs.data[cursorOverSlab][Slabs.IS_OWNABLE] == true:
120120
newOwnership(cursorOverSlabOwner)
121121

122122
oSelector.MODE_SUBTILE:

‎Shaders/cursor.shader

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
shader_type canvas_item;
22

33
uniform float zoom = 1.00;
4-
4+
uniform float thickness = 2.00;
55
const float animationRate = 0.15;
66

77
void fragment() {
@@ -13,7 +13,7 @@ void fragment() {
1313

1414
baseCol.a = 0.0;
1515

16-
float superPixel = max(texel.x, texel.x*zoom)*2.0;
16+
float superPixel = max(texel.x, texel.x*zoom)*thickness;
1717

1818
if ( UV.x <= superPixel ) {
1919
baseCol.a = 1.0;

‎Shaders/cursorMat.tres

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
[resource]
66
shader = ExtResource( 1 )
77
shader_param/zoom = 1.0
8+
shader_param/thickness = 2.0

‎unearthdata/custom-object-images/ice_pillar.png.import

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="StreamTexture"
5+
path="res://.import/ice_pillar.png-c0ab13848d04f073e6ae8198f6638fc4.stex"
6+
metadata={
7+
"vram_texture": false
8+
}
9+
10+
[deps]
11+
12+
source_file="res://unearthdata/custom-object-images/ice_pillar.png"
13+
dest_files=[ "res://.import/ice_pillar.png-c0ab13848d04f073e6ae8198f6638fc4.stex" ]
14+
15+
[params]
16+
17+
compress/mode=0
18+
compress/lossy_quality=0.7
19+
compress/hdr_mode=0
20+
compress/bptc_ldr=0
21+
compress/normal_map=0
22+
flags/repeat=0
23+
flags/filter=false
24+
flags/mipmaps=true
25+
flags/anisotropic=true
26+
flags/srgb=2
27+
process/fix_alpha_border=true
28+
process/premult_alpha=false
29+
process/HDR_as_SRGB=false
30+
process/invert_color=false
31+
process/normal_map_invert_y=false
32+
stream=false
33+
size_limit=0
34+
detect_3d=false
35+
svg/scale=1.0

‎unearthdata/custom-object-images/ice_rock.png.import

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="StreamTexture"
5+
path="res://.import/ice_rock.png-64f4931903df685b8bd2954e7649c173.stex"
6+
metadata={
7+
"vram_texture": false
8+
}
9+
10+
[deps]
11+
12+
source_file="res://unearthdata/custom-object-images/ice_rock.png"
13+
dest_files=[ "res://.import/ice_rock.png-64f4931903df685b8bd2954e7649c173.stex" ]
14+
15+
[params]
16+
17+
compress/mode=0
18+
compress/lossy_quality=0.7
19+
compress/hdr_mode=0
20+
compress/bptc_ldr=0
21+
compress/normal_map=0
22+
flags/repeat=0
23+
flags/filter=false
24+
flags/mipmaps=true
25+
flags/anisotropic=true
26+
flags/srgb=2
27+
process/fix_alpha_border=true
28+
process/premult_alpha=false
29+
process/HDR_as_SRGB=false
30+
process/invert_color=false
31+
process/normal_map_invert_y=false
32+
stream=false
33+
size_limit=0
34+
detect_3d=false
35+
svg/scale=1.0

‎unearthdata/custom-object-images/lava_pillar.png.import

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="StreamTexture"
5+
path="res://.import/lava_pillar.png-40dedd5cef8c6fd30696dc0566a9d044.stex"
6+
metadata={
7+
"vram_texture": false
8+
}
9+
10+
[deps]
11+
12+
source_file="res://unearthdata/custom-object-images/lava_pillar.png"
13+
dest_files=[ "res://.import/lava_pillar.png-40dedd5cef8c6fd30696dc0566a9d044.stex" ]
14+
15+
[params]
16+
17+
compress/mode=0
18+
compress/lossy_quality=0.7
19+
compress/hdr_mode=0
20+
compress/bptc_ldr=0
21+
compress/normal_map=0
22+
flags/repeat=0
23+
flags/filter=false
24+
flags/mipmaps=true
25+
flags/anisotropic=true
26+
flags/srgb=2
27+
process/fix_alpha_border=true
28+
process/premult_alpha=false
29+
process/HDR_as_SRGB=false
30+
process/invert_color=false
31+
process/normal_map_invert_y=false
32+
stream=false
33+
size_limit=0
34+
detect_3d=false
35+
svg/scale=1.0

‎unearthdata/custom-object-images/lava_rock.png.import

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="StreamTexture"
5+
path="res://.import/lava_rock.png-69b497b944d3862e1003d383934dc422.stex"
6+
metadata={
7+
"vram_texture": false
8+
}
9+
10+
[deps]
11+
12+
source_file="res://unearthdata/custom-object-images/lava_rock.png"
13+
dest_files=[ "res://.import/lava_rock.png-69b497b944d3862e1003d383934dc422.stex" ]
14+
15+
[params]
16+
17+
compress/mode=0
18+
compress/lossy_quality=0.7
19+
compress/hdr_mode=0
20+
compress/bptc_ldr=0
21+
compress/normal_map=0
22+
flags/repeat=0
23+
flags/filter=false
24+
flags/mipmaps=true
25+
flags/anisotropic=true
26+
flags/srgb=2
27+
process/fix_alpha_border=true
28+
process/premult_alpha=false
29+
process/HDR_as_SRGB=false
30+
process/invert_color=false
31+
process/normal_map_invert_y=false
32+
stream=false
33+
size_limit=0
34+
detect_3d=false
35+
svg/scale=1.0

‎unearthdata/custom-object-images/potion_brown.png.import

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="StreamTexture"
5+
path="res://.import/potion_brown.png-3cbb67415d0ce12260f61d25b2b7a9ef.stex"
6+
metadata={
7+
"vram_texture": false
8+
}
9+
10+
[deps]
11+
12+
source_file="res://unearthdata/custom-object-images/potion_brown.png"
13+
dest_files=[ "res://.import/potion_brown.png-3cbb67415d0ce12260f61d25b2b7a9ef.stex" ]
14+
15+
[params]
16+
17+
compress/mode=0
18+
compress/lossy_quality=0.7
19+
compress/hdr_mode=0
20+
compress/bptc_ldr=0
21+
compress/normal_map=0
22+
flags/repeat=0
23+
flags/filter=false
24+
flags/mipmaps=true
25+
flags/anisotropic=true
26+
flags/srgb=2
27+
process/fix_alpha_border=true
28+
process/premult_alpha=false
29+
process/HDR_as_SRGB=false
30+
process/invert_color=false
31+
process/normal_map_invert_y=false
32+
stream=false
33+
size_limit=0
34+
detect_3d=false
35+
svg/scale=1.0

‎unearthdata/custom-object-images/potion_red.png.import

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="StreamTexture"
5+
path="res://.import/potion_red.png-1f6ac617d4b543a5a11f62ac9f32e940.stex"
6+
metadata={
7+
"vram_texture": false
8+
}
9+
10+
[deps]
11+
12+
source_file="res://unearthdata/custom-object-images/potion_red.png"
13+
dest_files=[ "res://.import/potion_red.png-1f6ac617d4b543a5a11f62ac9f32e940.stex" ]
14+
15+
[params]
16+
17+
compress/mode=0
18+
compress/lossy_quality=0.7
19+
compress/hdr_mode=0
20+
compress/bptc_ldr=0
21+
compress/normal_map=0
22+
flags/repeat=0
23+
flags/filter=false
24+
flags/mipmaps=true
25+
flags/anisotropic=true
26+
flags/srgb=2
27+
process/fix_alpha_border=true
28+
process/premult_alpha=false
29+
process/HDR_as_SRGB=false
30+
process/invert_color=false
31+
process/normal_map_invert_y=false
32+
stream=false
33+
size_limit=0
34+
detect_3d=false
35+
svg/scale=1.0

‎unearthdata/custom-object-images/potion_white.png.import

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="StreamTexture"
5+
path="res://.import/potion_white.png-6227881eeb5fd0c609939461f2df12dc.stex"
6+
metadata={
7+
"vram_texture": false
8+
}
9+
10+
[deps]
11+
12+
source_file="res://unearthdata/custom-object-images/potion_white.png"
13+
dest_files=[ "res://.import/potion_white.png-6227881eeb5fd0c609939461f2df12dc.stex" ]
14+
15+
[params]
16+
17+
compress/mode=0
18+
compress/lossy_quality=0.7
19+
compress/hdr_mode=0
20+
compress/bptc_ldr=0
21+
compress/normal_map=0
22+
flags/repeat=0
23+
flags/filter=false
24+
flags/mipmaps=true
25+
flags/anisotropic=true
26+
flags/srgb=2
27+
process/fix_alpha_border=true
28+
process/premult_alpha=false
29+
process/HDR_as_SRGB=false
30+
process/invert_color=false
31+
process/normal_map_invert_y=false
32+
stream=false
33+
size_limit=0
34+
detect_3d=false
35+
svg/scale=1.0

‎unearthdata/custom-object-images/potion_yellow.png.import

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="StreamTexture"
5+
path="res://.import/potion_yellow.png-e1a537b359a8acc5bc7a16ddb7bb0a6d.stex"
6+
metadata={
7+
"vram_texture": false
8+
}
9+
10+
[deps]
11+
12+
source_file="res://unearthdata/custom-object-images/potion_yellow.png"
13+
dest_files=[ "res://.import/potion_yellow.png-e1a537b359a8acc5bc7a16ddb7bb0a6d.stex" ]
14+
15+
[params]
16+
17+
compress/mode=0
18+
compress/lossy_quality=0.7
19+
compress/hdr_mode=0
20+
compress/bptc_ldr=0
21+
compress/normal_map=0
22+
flags/repeat=0
23+
flags/filter=false
24+
flags/mipmaps=true
25+
flags/anisotropic=true
26+
flags/srgb=2
27+
process/fix_alpha_border=true
28+
process/premult_alpha=false
29+
process/HDR_as_SRGB=false
30+
process/invert_color=false
31+
process/normal_map_invert_y=false
32+
stream=false
33+
size_limit=0
34+
detect_3d=false
35+
svg/scale=1.0

0 commit comments

Comments
 (0)