upgrade godot to alpha9

maps/shaders/ashtarie-bench_flower-band.gdshader

@@ -2,12 +2,12 @@
 
 shader_type spatial;
 render_mode blend_mix,depth_draw_opaque,cull_disabled,diffuse_burley,specular_schlick_ggx;
-uniform vec4 base_color : hint_color;
-uniform vec4 decor_color : hint_color;
-uniform sampler2D texture_albedo : hint_albedo,filter_linear_mipmap,repeat_enable;
+uniform vec4 base_color : source_color;
+uniform vec4 decor_color : source_color;
+uniform sampler2D texture_albedo : source_color,filter_linear_mipmap,repeat_enable;
 uniform float point_size : hint_range(0,128);
 uniform float roughness : hint_range(0,1);
-uniform sampler2D texture_metallic : hint_white,filter_linear_mipmap,repeat_enable;
+uniform sampler2D texture_metallic : hint_default_white,filter_linear_mipmap,repeat_enable;
 uniform vec4 metallic_texture_channel;
 uniform sampler2D texture_roughness : hint_roughness_r,filter_linear_mipmap,repeat_enable;
 uniform float specular;

maps/shaders/ashtarie-bench_flower.gdshader

@@ -2,12 +2,12 @@
 
 shader_type spatial;
 render_mode blend_mix,depth_draw_opaque,cull_disabled,diffuse_burley,specular_schlick_ggx;
-uniform vec4 base_color : hint_color;
-uniform vec4 decor_color : hint_color;
-uniform sampler2D texture_albedo : hint_albedo,filter_linear_mipmap,repeat_disable;
+uniform vec4 base_color : source_color;
+uniform vec4 decor_color : source_color;
+uniform sampler2D texture_albedo : source_color,filter_linear_mipmap,repeat_disable;
 uniform float point_size : hint_range(0,128);
 uniform float roughness : hint_range(0,1);
-uniform sampler2D texture_metallic : hint_white,filter_linear_mipmap,repeat_enable;
+uniform sampler2D texture_metallic : hint_default_white,filter_linear_mipmap,repeat_enable;
 uniform vec4 metallic_texture_channel;
 uniform sampler2D texture_roughness : hint_roughness_r,filter_linear_mipmap,repeat_enable;
 uniform float specular;

maps/shaders/base_ground.gdshader

@@ -2,18 +2,18 @@
 
 shader_type spatial;
 render_mode blend_mix,depth_draw_opaque,cull_back,diffuse_burley,specular_schlick_ggx;
-uniform vec4 albedo : hint_color;
-uniform sampler2D texture_albedo : hint_albedo,filter_linear_mipmap,repeat_enable;
+uniform vec4 albedo : source_color;
+uniform sampler2D texture_albedo : source_color,filter_linear_mipmap,repeat_enable;
 uniform float point_size : hint_range(0,128);
 uniform float roughness : hint_range(0,1);
-uniform sampler2D texture_metallic : hint_white,filter_linear_mipmap,repeat_enable;
+uniform sampler2D texture_metallic : hint_default_white,filter_linear_mipmap,repeat_enable;
 uniform vec4 metallic_texture_channel;
 uniform sampler2D texture_roughness : hint_roughness_gray,filter_linear_mipmap,repeat_enable;
 uniform float specular;
 uniform float metallic;
 uniform sampler2D texture_normal : hint_roughness_normal,filter_linear_mipmap,repeat_enable;
 uniform float normal_scale : hint_range(-16,16);
-uniform sampler2D texture_heightmap : hint_black,filter_linear_mipmap,repeat_enable;
+uniform sampler2D texture_heightmap : hint_default_black,filter_linear_mipmap,repeat_enable;
 uniform float heightmap_scale;
 uniform int heightmap_min_layers;
 uniform int heightmap_max_layers;

maps/shaders/khanat_sky.gdshader

@@ -5,28 +5,28 @@
 shader_type sky;
 
 uniform float rayleigh : hint_range(0, 64) = 2.0;
-uniform vec4 rayleigh_color : hint_color = vec4(0.3, 0.405, 0.6, 1.0);
+uniform vec4 rayleigh_color : source_color = vec4(0.3, 0.405, 0.6, 1.0);
 uniform float mie : hint_range(0, 1) = 0.005;
 uniform float mie_eccentricity : hint_range(-1, 1) = 0.8;
-uniform vec4 mie_color : hint_color = vec4(0.69, 0.729, 0.812, 1.0);
+uniform vec4 mie_color : source_color = vec4(0.69, 0.729, 0.812, 1.0);
 
 uniform float turbidity : hint_range(0, 1000) = 10.0;
 uniform float sun_disk_scale : hint_range(0, 360) = 1.0;
-uniform vec4 ground_color : hint_color = vec4(0.1, 0.07, 0.034, 1.0);
+uniform vec4 ground_color : source_color = vec4(0.1, 0.07, 0.034, 1.0);
 uniform float exposure : hint_range(0, 128) = 0.1;
 uniform float dither_strength : hint_range(0, 10) = 1.0;
 
-uniform sampler2D night_sky : hint_black_albedo;
+uniform sampler2D night_sky : source_color;
 
-uniform sampler2D samayun : hint_albedo;
+uniform sampler2D samayun : source_color;
 uniform float samayun_arc = 45 ;
 uniform vec3 samayun_position = vec3( 0.0, 0.5, 0.0 );
 
-uniform sampler2D zabr : hint_albedo;
+uniform sampler2D zabr : source_color;
 uniform float zabr_arc = 15 ;
 uniform vec3 zabr_position = vec3( 0.0, 0.7, 0.0 );
 
-uniform sampler2D stigi : hint_albedo;
+uniform sampler2D stigi : source_color;
 uniform float stigi_arc = 8 ;
 uniform vec3 stigi_position = vec3( 0.0, 0.8, 0.0 );
 

maps/shaders/micro_vegetation_aa.gdshader

@@ -2,11 +2,11 @@
 
 shader_type spatial;
 render_mode blend_mix,depth_draw_opaque,cull_disabled,diffuse_burley,specular_schlick_ggx,depth_prepass_alpha;
-uniform vec4 albedo : hint_color;
-uniform sampler2D texture_albedo : hint_albedo,filter_linear_mipmap,repeat_enable;
+uniform vec4 albedo : source_color;
+uniform sampler2D texture_albedo : source_color,filter_linear_mipmap,repeat_enable;
 uniform float point_size : hint_range(0,128);
 uniform float roughness : hint_range(0,1);
-uniform sampler2D texture_metallic : hint_white,filter_linear_mipmap,repeat_enable;
+uniform sampler2D texture_metallic : hint_default_white,filter_linear_mipmap,repeat_enable;
 uniform vec4 metallic_texture_channel;
 uniform sampler2D texture_roughness : hint_roughness_g,filter_linear_mipmap,repeat_enable;
 uniform vec4 roughness_texture_channel;

maps/shaders/water.gdshader

@@ -40,20 +40,20 @@ uniform float 	uv_sampler_strength = 0.04; 		// UV shifting strength
 uniform sampler2D normalmap_a_sampler : hint_normal;	// Normalmap sampler A
 uniform sampler2D normalmap_b_sampler : hint_normal;	// Normalmap sampler B
 
-uniform sampler2D foam_sampler : hint_black;	// Foam sampler
+uniform sampler2D foam_sampler : hint_default_black;	// Foam sampler
 uniform float 	foam_level 		 = 0.5;	// Foam level -> distance from the object (0.0 - 0.5)
 
 // Volume settings:
 uniform float 	refraction 		 = 0.075;	// Refraction of the water
 
-uniform vec4 	color_deep : hint_color;		// Color for deep places in the water, medium to dark blue
-uniform vec4 	color_shallow : hint_color;	// Color for lower places in the water, bright blue - green
+uniform vec4 	color_deep : source_color;		// Color for deep places in the water, medium to dark blue
+uniform vec4 	color_shallow : source_color;	// Color for lower places in the water, bright blue - green
 uniform float 	beers_law		 = 2.0;		// Beers law value, regulates the blending size to the deep water level
 uniform float 	depth_offset	 = -0.75;	// Offset for the blending
 
 // Projector for the water caustics:
 uniform mat4	projector;			// Projector matrix, mostly the matric of the sun / directlight
-uniform sampler2DArray caustic_sampler : hint_black;	// Caustic sampler, (Texture array with 16 Textures for the animation)
+uniform sampler2DArray caustic_sampler : hint_default_black;	// Caustic sampler, (Texture array with 16 Textures for the animation)
 
 
 // Vertex -> Fragment:

scenes/hud/hud.gd

@@ -53,8 +53,8 @@ func _on_confirmation_dialog_confirmed():
 
 
 func _on_languages_pressed():
-	$MenuLanguage/Window.popup_centered()
-	$MenuLanguage/Window.visible = true
+	#$MenuLanguage/Window.popup_centered()
+	$MenuLanguage/Window.set_visible(true)
 
 
 func _on_keys_pressed():

scenes/languages/languages.gd

@@ -41,4 +41,4 @@ func _on_select_item_selected(_index):
 
 
 func _on_quit_pressed():
-	$Window.visible = false
+	$Window.set_visible(false)

scenes/languages/languages.tscn

@@ -1,12 +1,15 @@
-[gd_scene load_steps=2 format=3 uid="uid://dpvequp5fv27k"]
+[gd_scene load_steps=3 format=3 uid="uid://dpvequp5fv27k"]
 
 [ext_resource type="Script" path="res://scenes/languages/languages.gd" id="1_qc7c5"]
+[ext_resource type="Texture2D" uid="uid://0cn1ngjhkhrj" path="res://scenes/languages/panel.jpg" id="2_nhy1g"]
 
 [node name="Control" type="Control"]
 script = ExtResource( "1_qc7c5" )
 
 [node name="Window" type="Window" parent="."]
 title = "Language"
+position = Vector2i(50, 100)
+size = Vector2i(300, 150)
 visible = false
 
 [node name="VBoxContainer" type="VBoxContainer" parent="Window"]
@@ -19,20 +22,71 @@ size_flags_vertical = 3
 metadata/_edit_use_custom_anchors = false
 
 [node name="Label" type="Label" parent="Window/VBoxContainer"]
-offset_right = 40.0
-offset_bottom = 23.0
+offset_right = 1024.0
+offset_bottom = 26.0
 text = "Select language"
 
 [node name="Select" type="OptionButton" parent="Window/VBoxContainer"]
-offset_right = 43.0
-offset_bottom = 31.0
+offset_top = 30.0
+offset_right = 1024.0
+offset_bottom = 565.0
 size_flags_vertical = 3
 metadata/_edit_use_custom_anchors = false
 
 [node name="Quit" type="Button" parent="Window/VBoxContainer"]
-offset_top = 35.0
-offset_right = 43.0
-offset_bottom = 66.0
+offset_left = 491.0
+offset_top = 569.0
+offset_right = 533.0
+offset_bottom = 600.0
+size_flags_horizontal = 4
+size_flags_vertical = 8
+text = "Quit"
+
+[node name="Window3" type="NinePatchRect" parent="."]
+visible = false
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = 72.0
+offset_top = 38.0
+offset_right = 681.0
+offset_bottom = 411.0
+grow_horizontal = 2
+grow_vertical = 2
+texture = ExtResource( "2_nhy1g" )
+patch_margin_left = 8
+patch_margin_top = 8
+patch_margin_right = 8
+patch_margin_bottom = 8
+metadata/_edit_layout_mode = 1
+metadata/_edit_use_custom_anchors = true
+
+[node name="VBoxContainer" type="VBoxContainer" parent="Window3"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+metadata/_edit_layout_mode = 1
+
+[node name="Label" type="Label" parent="Window3/VBoxContainer"]
+offset_right = 609.0
+offset_bottom = 26.0
+text = "Select language"
+
+[node name="Select" type="OptionButton" parent="Window3/VBoxContainer"]
+offset_top = 30.0
+offset_right = 609.0
+offset_bottom = 338.0
+size_flags_vertical = 3
+metadata/_edit_use_custom_anchors = false
+
+[node name="Quit" type="Button" parent="Window3/VBoxContainer"]
+offset_left = 283.0
+offset_top = 342.0
+offset_right = 325.0
+offset_bottom = 373.0
 size_flags_horizontal = 4
 size_flags_vertical = 8
 text = "Quit"
@@ -40,3 +94,5 @@ text = "Quit"
 [connection signal="close_requested" from="Window" to="." method="_on_quit_pressed"]
 [connection signal="item_selected" from="Window/VBoxContainer/Select" to="." method="_on_select_item_selected"]
 [connection signal="pressed" from="Window/VBoxContainer/Quit" to="." method="_on_quit_pressed"]
+[connection signal="item_selected" from="Window3/VBoxContainer/Select" to="." method="_on_select_item_selected"]
+[connection signal="pressed" from="Window3/VBoxContainer/Quit" to="." method="_on_quit_pressed"]

scenes/main/main.tscn

@@ -6,6 +6,7 @@
 [ext_resource type="PackedScene" uid="uid://cdyi1a858p7em" path="res://scenes/hud/hud.tscn" id="3_5vcj4"]
 
 [node name="main_scene" type="Node3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -16.7863, -3.32883, 24.6513)
 script = ExtResource( "1_ld2xt" )
 
 [node name="player" parent="." instance=ExtResource( "1_btdsd" )]

start-khanat-client.sh

@@ -7,7 +7,7 @@ declare FORCE=0
 declare IMPORT=0
 declare ERASEIMPORT=0
 declare WORKDIR="$(dirname $(readlink -f $0))"
-declare GODOT_SRC="https://downloads.tuxfamily.org/godotengine/4.0/alpha8/Godot_v4.0-alpha8_linux.64.zip"
+declare GODOT_SRC="https://downloads.tuxfamily.org/godotengine/4.0/alpha9/Godot_v4.0-alpha9_linux.64.zip"
 declare OUTZIP="$WORKDIR/$(basename $GODOT_SRC)"
 declare OPTION=""
 declare NEWPRG=0