Compare commits

...

10 Commits

Author SHA1 Message Date
Victor Turgeon
10b4f01c6c some visual clarity to text (shadows) 2023-06-11 18:06:52 -04:00
MarcEricMartel
946f2dd2c1 Update start_game_menu.tscn 2023-06-11 17:54:33 -04:00
MarcEricMartel
d52e285371 Merge branch 'main' of https://github.com/marcericmartel/MAD 2023-06-11 17:53:42 -04:00
MarcEricMartel
ed81b0df84 Update start_game_menu.tscn 2023-06-11 17:53:35 -04:00
Victor Turgeon
1dcdf370a3 changed values in description 2023-06-11 17:49:57 -04:00
Victor Turgeon
71e524876f Merge branch 'main' of https://github.com/MarcEricMartel/MAD 2023-06-11 17:43:09 -04:00
Victor Turgeon
c3f7b7c67d some visual stuff 2023-06-11 17:43:05 -04:00
MarcEricMartel
49a78784f1 Update the_end.cs 2023-06-11 17:39:14 -04:00
MarcEricMartel
f9c8935818 woups 2023-06-11 17:33:21 -04:00
MarcEricMartel
e28f8cce58 woups 2023-06-11 17:32:40 -04:00
6 changed files with 77 additions and 30 deletions

View File

@ -18,7 +18,7 @@ public partial class the_end : Control
private void Tick() { private void Tick() {
if (_tock == 0) if (_tock == 0)
_lbl.Set("visible", true); _lbl.Set("visible", true);
if (_tock == 4) { if (_tock == 3) {
var scene = GD.Load<PackedScene>("res://menu/start_game_menu.tscn"); var scene = GD.Load<PackedScene>("res://menu/start_game_menu.tscn");
var instance = scene.Instantiate(); var instance = scene.Instantiate();
GetNode<Node>("/root/").AddChild(instance); GetNode<Node>("/root/").AddChild(instance);

View File

@ -1,22 +1,39 @@
[gd_scene load_steps=7 format=3 uid="uid://cbs0x36e3ranm"] [gd_scene load_steps=10 format=3 uid="uid://cbs0x36e3ranm"]
[ext_resource type="MeshLibrary" uid="uid://bo7ir5us230sa" path="res://assets/tilesets/tileset.tres" id="1_l447d"] [ext_resource type="MeshLibrary" uid="uid://dwo1m72yajrb1" path="res://assets/tilesets/tileset.tres" id="1_l447d"]
[ext_resource type="PackedScene" uid="uid://b5gb5paiupum" path="res://player/player.tscn" id="2_ojnju"] [ext_resource type="PackedScene" uid="uid://b5gb5paiupum" path="res://player/player.tscn" id="2_ojnju"]
[ext_resource type="AudioStream" uid="uid://bba7tiqty57ek" path="res://music/jazz.ogg" id="3_brvx4"] [ext_resource type="AudioStream" uid="uid://byo1w5vecks0m" path="res://music/jazz.ogg" id="3_brvx4"]
[ext_resource type="PackedScene" uid="uid://c2casdi4d2o3j" path="res://shaders/water_plane.tscn" id="3_ga7wg"] [ext_resource type="PackedScene" uid="uid://c2casdi4d2o3j" path="res://shaders/water_plane.tscn" id="3_ga7wg"]
[ext_resource type="Shader" path="res://shaders/water.gdshader" id="4_nrn2i"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_f48s3"]
render_priority = 0
shader = ExtResource("4_nrn2i")
shader_parameter/albedo = null
shader_parameter/albedo2 = null
shader_parameter/metallic = 0.0
shader_parameter/roughness = 0.02
shader_parameter/wave_direction = Vector2(2, 0)
shader_parameter/wave_direction2 = Vector2(0, 1)
shader_parameter/time_scale = 0.0
[sub_resource type="Sky" id="Sky_arxx1"]
sky_material = SubResource("ShaderMaterial_f48s3")
[sub_resource type="Environment" id="Environment_lo4sd"] [sub_resource type="Environment" id="Environment_lo4sd"]
background_mode = 2
sky = SubResource("Sky_arxx1")
ambient_light_source = 3 ambient_light_source = 3
ambient_light_color = Color(0.54902, 0.815686, 0.964706, 1) ambient_light_color = Color(0.717647, 0.886275, 0.980392, 1)
ssao_radius = 11.01 ssao_radius = 11.01
sdfgi_enabled = true sdfgi_enabled = true
sdfgi_use_occlusion = true sdfgi_use_occlusion = true
sdfgi_bounce_feedback = 0.56 sdfgi_bounce_feedback = 0.56
glow_intensity = 1.69 glow_intensity = 1.69
fog_enabled = true fog_enabled = true
fog_light_color = Color(0.294118, 0.439216, 0.411765, 1) fog_light_color = Color(0.298039, 0.713726, 0.992157, 1)
fog_light_energy = 0.8 fog_light_energy = 1.37
fog_density = 0.005 fog_density = 0.001
fog_height = -1.0 fog_height = -1.0
fog_height_density = 0.5 fog_height_density = 0.5
volumetric_fog_enabled = true volumetric_fog_enabled = true
@ -28,7 +45,7 @@ volumetric_fog_detail_spread = 1.68179
adjustment_enabled = true adjustment_enabled = true
adjustment_brightness = 1.1 adjustment_brightness = 1.1
adjustment_contrast = 1.25 adjustment_contrast = 1.25
adjustment_saturation = 0.8 adjustment_saturation = 1.1
[sub_resource type="CameraAttributesPhysical" id="CameraAttributesPhysical_5s8jn"] [sub_resource type="CameraAttributesPhysical" id="CameraAttributesPhysical_5s8jn"]
@ -49,7 +66,7 @@ stream = ExtResource("3_brvx4")
autoplay = true autoplay = true
[node name="water_plane" parent="." instance=ExtResource("3_ga7wg")] [node name="water_plane" parent="." instance=ExtResource("3_ga7wg")]
transform = Transform3D(227.061, 0, -196.07, 0, 300, 0, 196.07, 0, 227.061, 0, 0.257405, 0) transform = Transform3D(189.216, 0, -163.39, 0, 249.998, 0, 163.39, 0, 189.216, 0, 0.257405, 0)
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(0.175911, -0.891337, 0.41782, 0.878449, 0.333691, 0.34202, -0.444278, 0.306869, 0.841694, 0, 3.35555, 0) transform = Transform3D(0.175911, -0.891337, 0.41782, 0.878449, 0.333691, 0.34202, -0.444278, 0.306869, 0.841694, 0, 3.35555, 0)
@ -63,4 +80,4 @@ environment = SubResource("Environment_lo4sd")
camera_attributes = SubResource("CameraAttributesPhysical_5s8jn") camera_attributes = SubResource("CameraAttributesPhysical_5s8jn")
[node name="player" parent="." instance=ExtResource("2_ojnju")] [node name="player" parent="." instance=ExtResource("2_ojnju")]
transform = Transform3D(1, 0, 0, 0, 0.414487, 0.910055, 0, -0.910055, 0.414487, 0, 32.5889, 13.9222) transform = Transform3D(1, 0, 0, 0, 0.414487, 0.910055, 0, -0.910055, 0.414487, -2.98987, 38.8435, 15.148)

View File

@ -1,10 +1,10 @@
[gd_scene load_steps=10 format=3 uid="uid://4tym1auav4yv"] [gd_scene load_steps=10 format=3 uid="uid://4tym1auav4yv"]
[ext_resource type="Script" path="res://menu/start_game_menu.cs" id="1_0k2xm"] [ext_resource type="Script" path="res://menu/start_game_menu.cs" id="1_0k2xm"]
[ext_resource type="Texture2D" uid="uid://b44vs2lwgnh37" path="res://images/mushroom_cloud001.webp" id="2_aky60"] [ext_resource type="Texture2D" uid="uid://bd7j1ug5gs26w" path="res://images/mushroom_cloud001.webp" id="2_aky60"]
[ext_resource type="AudioStream" uid="uid://ckg5eypyrhidg" path="res://music/I Feel Grunge (Slow).wav" id="2_yw57x"] [ext_resource type="AudioStream" uid="uid://co52ygvp3wcra" path="res://music/I Feel Grunge (Slow).wav" id="2_yw57x"]
[ext_resource type="AudioStream" uid="uid://c8dcqkmytnyay" path="res://audio/btn.wav" id="4_fx2mk"] [ext_resource type="AudioStream" uid="uid://ds7ec1n3pytnr" path="res://audio/btn.wav" id="4_fx2mk"]
[ext_resource type="AudioStream" uid="uid://dja6tipmq1m8l" path="res://audio/dot.wav" id="5_y8gc7"] [ext_resource type="AudioStream" uid="uid://cg78xtngxrjlg" path="res://audio/dot.wav" id="5_y8gc7"]
[sub_resource type="LabelSettings" id="LabelSettings_n38oc"] [sub_resource type="LabelSettings" id="LabelSettings_n38oc"]
font_size = 290 font_size = 290
@ -212,3 +212,24 @@ stream = ExtResource("4_fx2mk")
[node name="State" type="AudioStreamPlayer" parent="."] [node name="State" type="AudioStreamPlayer" parent="."]
stream = ExtResource("5_y8gc7") stream = ExtResource("5_y8gc7")
[node name="Controls" type="Label" parent="."]
modulate = Color(1, 1, 1, 0.329412)
layout_mode = 1
anchors_preset = 3
anchor_left = 1.0
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = -307.0
offset_top = -148.0
offset_right = -18.0
offset_bottom = -18.0
grow_horizontal = 0
grow_vertical = 0
text = "mouse-scroll: Zoom In/Out
WASD: move camera
left-click / b: place selected building
right-click / r: rotate selected building
esc / c / backspace: deselect building"
horizontal_alignment = 2

View File

@ -222,7 +222,7 @@ public partial class player : Camera3D
{ {
_btnEnd.Disabled = false; _btnEnd.Disabled = false;
_btnEnd.Pressed += () => { _sndBtn.Play(); End("res://endings/mad.tscn"); }; _btnEnd.Pressed += () => { _sndBtn.Play(); End("res://endings/mad.tscn"); };
Chatter = "You can destroy your enemy, you have the nuclear capacity." Chatter = "You can destroy your enemy, you have the nuclear capacity.";
} }
if (GameTime < 0) if (GameTime < 0)
if (Nukes >= 100) if (Nukes >= 100)
@ -315,10 +315,10 @@ public partial class player : Camera3D
} }
} }
public void End(string scene) public void End(string str)
{ {
var scene = GD.Load<PackedScene>(scene); var scene = GD.Load<PackedScene>(str);
var instance = scene.Instantiate(); var instance = scene.Instantiate();
GetNode<Node>("/root/").AddChild(instance); GetNode<Node>("/root/").AddChild(instance);
this.GetParent().QueueFree(); this.GetParent().QueueFree();

View File

@ -12,6 +12,8 @@ frustum_near = 0.032
[sub_resource type="LabelSettings" id="LabelSettings_pws5q"] [sub_resource type="LabelSettings" id="LabelSettings_pws5q"]
font_size = 28 font_size = 28
shadow_size = 5
shadow_color = Color(0, 0, 0, 0.580392)
[sub_resource type="Gradient" id="Gradient_g0gsr"] [sub_resource type="Gradient" id="Gradient_g0gsr"]
colors = PackedColorArray(0.625134, 0, 0.0234951, 1, 0.409478, 0.173927, 1.44392e-07, 1) colors = PackedColorArray(0.625134, 0, 0.0234951, 1, 0.409478, 0.173927, 1.44392e-07, 1)
@ -76,6 +78,8 @@ font_color = Color(0, 0, 0, 1)
[sub_resource type="LabelSettings" id="LabelSettings_adeuk"] [sub_resource type="LabelSettings" id="LabelSettings_adeuk"]
font_size = 15 font_size = 15
shadow_size = 10
shadow_color = Color(0, 0, 0, 0.603922)
[sub_resource type="LabelSettings" id="LabelSettings_kxike"] [sub_resource type="LabelSettings" id="LabelSettings_kxike"]
font_size = 64 font_size = 64
@ -410,8 +414,8 @@ offset_right = -132.0
offset_bottom = -135.0 offset_bottom = -135.0
grow_horizontal = 0 grow_horizontal = 0
grow_vertical = 0 grow_vertical = 0
text = "Kash Flow: +1M$/sec. PR: +10%. Mtons: +10. text = "Kash Flow: +2M$/sec. PR: +10%. Mtons: +20.
Cost: 6M$. Cost: 5M$. PR: -5%. Cost: 6M$. Cost: 5M$. PR: -15%.
Cost: 30M$." Cost: 30M$."
label_settings = SubResource("LabelSettings_adeuk") label_settings = SubResource("LabelSettings_adeuk")
@ -441,14 +445,14 @@ skeleton = NodePath("../..")
[node name="snd_Chatter" type="AudioStreamPlayer" parent="."] [node name="snd_Chatter" type="AudioStreamPlayer" parent="."]
stream = ExtResource("2_sa1qd") stream = ExtResource("2_sa1qd")
volume_db = -20.771 volume_db = -10.0
pitch_scale = 0.88 pitch_scale = 0.88
[node name="snd_Button" type="AudioStreamPlayer" parent="."] [node name="snd_Button" type="AudioStreamPlayer" parent="."]
stream = ExtResource("3_00x5l") stream = ExtResource("3_00x5l")
[node name="tmr_Chatter" type="Timer" parent="."] [node name="tmr_Chatter" type="Timer" parent="."]
wait_time = 3.0 wait_time = 5.0
one_shot = true one_shot = true
[node name="tmr_kash" type="Timer" parent="."] [node name="tmr_kash" type="Timer" parent="."]

View File

@ -4,8 +4,8 @@
[ext_resource type="Texture2D" uid="uid://bsw8l5crn3aid" path="res://assets/textures/water.png" id="2_83coh"] [ext_resource type="Texture2D" uid="uid://bsw8l5crn3aid" path="res://assets/textures/water.png" id="2_83coh"]
[sub_resource type="QuadMesh" id="QuadMesh_x322w"] [sub_resource type="QuadMesh" id="QuadMesh_x322w"]
subdivide_width = 200 subdivide_width = 1
subdivide_depth = 200 subdivide_depth = 1
orientation = 1 orientation = 1
[sub_resource type="FastNoiseLite" id="FastNoiseLite_ido7w"] [sub_resource type="FastNoiseLite" id="FastNoiseLite_ido7w"]
@ -13,9 +13,11 @@ noise_type = 3
fractal_type = 2 fractal_type = 2
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_ntr7e"] [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_ntr7e"]
width = 1920
height = 1920
seamless = true seamless = true
as_normal_map = true as_normal_map = true
bump_strength = 1.5 bump_strength = 21.8
noise = SubResource("FastNoiseLite_ido7w") noise = SubResource("FastNoiseLite_ido7w")
[sub_resource type="FastNoiseLite" id="FastNoiseLite_bfpu3"] [sub_resource type="FastNoiseLite" id="FastNoiseLite_bfpu3"]
@ -24,18 +26,21 @@ seed = 69
fractal_type = 2 fractal_type = 2
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_wvpl0"] [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_wvpl0"]
width = 1920
height = 1920
seamless = true seamless = true
seamless_blend_skirt = 0.283
as_normal_map = true as_normal_map = true
bump_strength = 1.5 bump_strength = 20.8
noise = SubResource("FastNoiseLite_bfpu3") noise = SubResource("FastNoiseLite_bfpu3")
[sub_resource type="ShaderMaterial" id="ShaderMaterial_yma05"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_yma05"]
render_priority = 0 render_priority = 0
shader = ExtResource("1_yfj5n") shader = ExtResource("1_yfj5n")
shader_parameter/albedo = Color(0.101961, 0.0509804, 0.431373, 1) shader_parameter/albedo = Color(0.0980392, 0.0470588, 0.415686, 1)
shader_parameter/albedo2 = Color(0.658824, 0.905882, 0.929412, 1) shader_parameter/albedo2 = Color(0.298039, 0.341176, 0.658824, 1)
shader_parameter/metallic = 0.0 shader_parameter/metallic = 0.809
shader_parameter/roughness = 0.02 shader_parameter/roughness = 0.166
shader_parameter/wave_direction = Vector2(2, 0) shader_parameter/wave_direction = Vector2(2, 0)
shader_parameter/wave_direction2 = Vector2(0, 1) shader_parameter/wave_direction2 = Vector2(0, 1)
shader_parameter/time_scale = 0.005 shader_parameter/time_scale = 0.005