Et toujours du dev pour la béta
* Evolution de l'histoire avec de nouveaux dialogues, une plus grande durée de vie du jeu, des nouvelles zones d'histoire... * Suppression du mode infini * Ajout d'un écran des mutations découvertes * Ajout d'un nouveau mécanisme de respawn situé dans le vaissau * Ajout de 2 nouveaux modificateurs de région * Quatre nouveaux artefacts * Visuel de la décontamination de la planète 3D en cours de la partie * Ajout d'une annonce visuelle des scène du jeu * Fix sur la mutation Généreux pour être en accord avec sa description * Amélioration de l'effet de la mutation Purification * Fix de la mutation sociale aux niveau supérieurs * Ajout d'un effet visuel de réacteur sur le joueur 3D * Fix sur l'annonce de nouveaux objets qui se déclenchaient à une nouvelle run * Amélioration des animation et des informations données dans le vaisseau * Correction mineure des traductions
This commit is contained in:
30
stages/title_screen/assets/materials/planet_3d_terrain.tres
Normal file
30
stages/title_screen/assets/materials/planet_3d_terrain.tres
Normal file
@@ -0,0 +1,30 @@
|
||||
[gd_resource type="ShaderMaterial" format=3 uid="uid://c1h3xs2xahhm7"]
|
||||
|
||||
[ext_resource type="Shader" uid="uid://ctt1ykb11oh22" path="res://stages/title_screen/resources/shaders/terrain.gdshader" id="1_2voo7"]
|
||||
[ext_resource type="Texture2D" uid="uid://c4usrfeevb4n1" path="res://stages/title_screen/resources/gradient_planet.tres" id="2_t1vtm"]
|
||||
|
||||
[sub_resource type="Gradient" id="Gradient_exbh2"]
|
||||
interpolation_mode = 1
|
||||
offsets = PackedFloat32Array(0, 0.44278607, 0.64179105, 0.7164179)
|
||||
colors = PackedColorArray(0.14509805, 0.75686276, 0.2784314, 1, 1, 0.6509804, 0.09019608, 1, 1, 0.31764707, 0.2627451, 1, 1, 1, 1, 1)
|
||||
|
||||
[sub_resource type="GradientTexture1D" id="GradientTexture1D_neuam"]
|
||||
gradient = SubResource("Gradient_exbh2")
|
||||
|
||||
[sub_resource type="FastNoiseLite" id="FastNoiseLite_hqt5a"]
|
||||
frequency = 0.0212
|
||||
|
||||
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_8o8xi"]
|
||||
noise = SubResource("FastNoiseLite_hqt5a")
|
||||
|
||||
[resource]
|
||||
render_priority = 0
|
||||
shader = ExtResource("1_2voo7")
|
||||
shader_parameter/specular = 0.0
|
||||
shader_parameter/roughness = 0.6
|
||||
shader_parameter/radius = 8.0
|
||||
shader_parameter/height = 3.81
|
||||
shader_parameter/gradient = ExtResource("2_t1vtm")
|
||||
shader_parameter/random_fertility_texture = SubResource("NoiseTexture2D_8o8xi")
|
||||
shader_parameter/fertility_gradient = SubResource("GradientTexture1D_neuam")
|
||||
shader_parameter/fertility_factor = 0.0
|
||||
File diff suppressed because one or more lines are too long
@@ -3,13 +3,19 @@
|
||||
shader_type spatial;
|
||||
render_mode world_vertex_coords;
|
||||
|
||||
|
||||
uniform float specular = 0.8;
|
||||
uniform float roughness = 0.6;
|
||||
uniform float radius = 8.0;
|
||||
uniform float height = 4;
|
||||
uniform sampler2D gradient: repeat_disable;
|
||||
|
||||
uniform sampler2D random_fertility_texture;
|
||||
uniform sampler2D fertility_gradient: repeat_disable;
|
||||
uniform float fertility_factor: hint_range(0, 1.) = 0.5;
|
||||
|
||||
varying vec4 world_vert;
|
||||
varying vec4 vert;
|
||||
|
||||
void vertex() {
|
||||
world_vert = inverse(MODEL_MATRIX) * vec4(VERTEX,1.0);
|
||||
@@ -19,9 +25,15 @@ void fragment() {
|
||||
METALLIC = 0.0;
|
||||
SPECULAR = specular;
|
||||
ROUGHNESS = roughness;
|
||||
|
||||
float fertility_score = texture(random_fertility_texture, UV).r;
|
||||
float color_uv = (length(world_vert.xyz) - radius) / (height);
|
||||
if (fertility_score < fertility_factor) {
|
||||
ALBEDO = texture(fertility_gradient, vec2(color_uv, 0.0)).rgb;
|
||||
} else {
|
||||
ALBEDO = texture(gradient, vec2(color_uv, 0.0)).rgb;
|
||||
}
|
||||
|
||||
float color_uv = (length(world_vert.xyz) - radius) / (height);
|
||||
ALBEDO = texture(gradient, vec2(color_uv, 0.0)).rgb;
|
||||
}
|
||||
|
||||
//void light() {
|
||||
|
||||
@@ -16,6 +16,12 @@ class_name Planet3D
|
||||
if is_node_ready():
|
||||
update_terrain()
|
||||
|
||||
@export var fertility_factor : float = 0:
|
||||
set(v):
|
||||
fertility_factor = min(1.,max(0.,v))
|
||||
if is_node_ready():
|
||||
update_terrain()
|
||||
|
||||
|
||||
@export_group("Terrain")
|
||||
@export var noise : Noise = FastNoiseLite.new():
|
||||
@@ -105,6 +111,7 @@ func update_terrain() -> void:
|
||||
if terrain_material and terrain_material is ShaderMaterial:
|
||||
terrain_material.set_shader_parameter("radius", radius)
|
||||
terrain_material.set_shader_parameter("height", height)
|
||||
terrain_material.set_shader_parameter("fertility_factor", fertility_factor)
|
||||
|
||||
func update_water() -> void:
|
||||
if !water or %Water == null:
|
||||
|
||||
@@ -12,15 +12,25 @@ var next_mouse_pos : Vector2
|
||||
|
||||
func _ready():
|
||||
%Version.text = ProjectSettings.get_setting("application/config/version")
|
||||
%Start.text = tr("CONTINUE") if GameInfo.game_loaded else tr("START")
|
||||
%Restart.visible = GameInfo.game_loaded
|
||||
%ModeChoose.hide()
|
||||
%Start.text = tr("CONTINUE") if GameInfo.game_data else tr("START")
|
||||
%Restart.visible = GameInfo.game_data != null
|
||||
if GameInfo.game_data:
|
||||
%Planet3d.fertility_factor = (
|
||||
max(0,float(GameInfo.game_data.progression_data.story_step_i - 1))
|
||||
/ len(
|
||||
GameInfo.game_data.progression_data.get_all_story_steps()
|
||||
) - 1
|
||||
)
|
||||
|
||||
func _on_start_pressed():
|
||||
if GameInfo.game_data and GameInfo.game_data.last_game_scene:
|
||||
SceneManager.change_to_scene(GameInfo.game_data.last_game_scene)
|
||||
if GameInfo.game_data :
|
||||
if GameInfo.game_data.last_game_scene:
|
||||
SceneManager.change_to_scene(GameInfo.game_data.last_game_scene)
|
||||
else :
|
||||
SceneManager.change_to_scene(CockpitScene.new())
|
||||
else:
|
||||
%ModeChoose.show()
|
||||
GameInfo.start_game_data()
|
||||
SceneManager.change_to_scene(IntroScene.new())
|
||||
|
||||
func _process(delta):
|
||||
next_mouse_pos = get_viewport().get_mouse_position()
|
||||
@@ -50,13 +60,6 @@ func _process(delta):
|
||||
|
||||
|
||||
func _on_restart_button_down():
|
||||
GameInfo.restart_game_data()
|
||||
%ModeChoose.show()
|
||||
GameInfo.start_game_data()
|
||||
SceneManager.change_to_scene(IntroScene.new())
|
||||
|
||||
|
||||
func _on_story_mode_start_button_down():
|
||||
SceneManager.change_to_scene_id("INTRO")
|
||||
|
||||
func _on_infinite_mode_start_button_down():
|
||||
GameInfo.game_data.game_mode = GameData.GameMode.INFINITE
|
||||
SceneManager.change_to_scene_id("COCKPIT")
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
[ext_resource type="PackedScene" uid="uid://cm5b7w7j6527f" path="res://stages/title_screen/planet_3d.tscn" id="5_7a1qq"]
|
||||
[ext_resource type="PackedScene" uid="uid://c8flevrkelpvy" path="res://gui/credits/socials/instagram.tscn" id="6_7a1qq"]
|
||||
[ext_resource type="PackedScene" uid="uid://bc3byq8e45ejj" path="res://gui/credits/socials/steam.tscn" id="7_nmsah"]
|
||||
[ext_resource type="Shader" uid="uid://bv2rghn44mrrf" path="res://stages/title_screen/resources/shaders/stars.gdshader" id="7_y6tw6"]
|
||||
[ext_resource type="Shader" uid="uid://cuni3ggtw2uuy" path="res://common/vfx/materials/shaders/blur.gdshader" id="8_pjo5j"]
|
||||
[ext_resource type="LabelSettings" uid="uid://dqwayi8yjwau2" path="res://gui/ressources/title_label_settings.tres" id="9_5mxqx"]
|
||||
[ext_resource type="Theme" uid="uid://5au2k3vf2po3" path="res://gui/ressources/menu.tres" id="10_tsp1v"]
|
||||
@@ -23,41 +22,9 @@ shader = ExtResource("8_pjo5j")
|
||||
shader_parameter/strength = 5.00000023424012
|
||||
shader_parameter/mix_percentage = 0.3
|
||||
|
||||
[sub_resource type="FastNoiseLite" id="FastNoiseLite_pjo5j"]
|
||||
[sub_resource type="FastNoiseLite" id="FastNoiseLite_60mme"]
|
||||
frequency = 1.0
|
||||
|
||||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_7a1qq"]
|
||||
shader = ExtResource("7_y6tw6")
|
||||
shader_parameter/sky_color = Color(0.03, 0.05, 0.11, 1)
|
||||
shader_parameter/star_base_color = Color(0.8, 1, 0.3, 1)
|
||||
shader_parameter/star_hue_offset = 0.6
|
||||
shader_parameter/star_intensity = 0.08
|
||||
shader_parameter/star_twinkle_speed = 0.8
|
||||
shader_parameter/star_twinkle_intensity = 0.2
|
||||
shader_parameter/layer_scale = 20.0
|
||||
shader_parameter/layer_scale_step = 10.0
|
||||
shader_parameter/layers_count = 3
|
||||
|
||||
[sub_resource type="Sky" id="Sky_65b6a"]
|
||||
sky_material = SubResource("ShaderMaterial_7a1qq")
|
||||
|
||||
[sub_resource type="Environment" id="Environment_nmsah"]
|
||||
background_mode = 2
|
||||
sky = SubResource("Sky_65b6a")
|
||||
sky_custom_fov = 61.7
|
||||
ambient_light_source = 3
|
||||
glow_intensity = 1.16
|
||||
glow_bloom = 0.49
|
||||
glow_hdr_threshold = 0.32
|
||||
glow_hdr_scale = 0.0
|
||||
glow_hdr_luminance_cap = 5.63
|
||||
fog_light_energy = 0.0
|
||||
fog_density = 0.0
|
||||
fog_sky_affect = 0.0
|
||||
fog_height = -1024.0
|
||||
fog_height_density = 0.4145
|
||||
adjustment_enabled = true
|
||||
|
||||
[node name="TitleScreen" type="CanvasLayer" unique_id=1166097103]
|
||||
script = ExtResource("1_6yuhi")
|
||||
|
||||
@@ -149,11 +116,12 @@ layout_mode = 2
|
||||
size_flags_horizontal = 8
|
||||
|
||||
[node name="SteamButton" parent="MarginContainer/Socials" unique_id=1181450581 instance=ExtResource("7_nmsah")]
|
||||
visible = false
|
||||
layout_mode = 2
|
||||
link = "https://store.steampowered.com/app/4444510/Seeding_The_Wasteland/"
|
||||
|
||||
[node name="ModeChoose" type="Control" parent="." unique_id=1527342716]
|
||||
unique_name_in_owner = true
|
||||
visible = false
|
||||
z_index = 2
|
||||
layout_mode = 3
|
||||
anchors_preset = 15
|
||||
@@ -208,24 +176,21 @@ size = Vector2i(1980, 1080)
|
||||
|
||||
[node name="Planet3d" parent="SubViewport" unique_id=926789923 instance=ExtResource("5_7a1qq")]
|
||||
unique_name_in_owner = true
|
||||
noise = SubResource("FastNoiseLite_pjo5j")
|
||||
noise = SubResource("FastNoiseLite_60mme")
|
||||
|
||||
[node name="Camera3D" type="Camera3D" parent="SubViewport" unique_id=806252928]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14.369979, 0, 64.323425)
|
||||
current = true
|
||||
fov = 34.0
|
||||
|
||||
[node name="WorldEnvironment" type="WorldEnvironment" parent="SubViewport" unique_id=466718971]
|
||||
environment = SubResource("Environment_nmsah")
|
||||
|
||||
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="SubViewport" unique_id=1446693225]
|
||||
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="SubViewport" unique_id=1113690056]
|
||||
transform = Transform3D(0.044800885, 0.76661056, -0.6405476, -0.8325595, 0.38302267, 0.4001729, 0.55212104, 0.51536596, 0.65540874, -23.18848, 19.508549, 0)
|
||||
light_volumetric_fog_energy = 0.0
|
||||
light_specular = 0.0
|
||||
shadow_enabled = true
|
||||
shadow_normal_bias = 0.0
|
||||
shadow_opacity = 0.48
|
||||
shadow_blur = 3.055
|
||||
shadow_opacity = 0.92
|
||||
shadow_blur = 4.667
|
||||
|
||||
[connection signal="pressed" from="MarginContainer/GridContainer/VBoxContainer/VBoxContainer/Start" to="." method="_on_start_pressed"]
|
||||
[connection signal="button_down" from="MarginContainer/GridContainer/VBoxContainer/VBoxContainer/Restart" to="." method="_on_restart_button_down"]
|
||||
|
||||
Reference in New Issue
Block a user