StudioFreresChasseurs/Mutually_Assured_Destruction
2
0
Fork 0
Code Releases Activity

Merge branch 'main' of https://github.com/MarcEricMartel/MAD

Browse Source
This commit is contained in:
Victor Turgeon 2023-06-11 10:49:16 -04:00
commit 19b5075a3a
6 changed files with 137 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
levels/test_level.tscn
View File

@ -1,10 +1,12 @@
[gd_scene load_steps=6 format=3 uid="uid://cbs0x36e3ranm"] [gd_scene load_steps=8 format=3 uid="uid://cbs0x36e3ranm"]
[ext_resource type="MeshLibrary" uid="uid://dwo1m72yajrb1" 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="PackedScene" uid="uid://2pw0p13lcklv" path="res://buildings/kash_buildings/factory.tscn" id="3_08gdj"]
[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"]
[sub_resource type="Environment" id="Environment_i4emf"] [sub_resource type="Environment" id="Environment_lo4sd"]
ambient_light_source = 3 ambient_light_source = 3
ambient_light_color = Color(0.54902, 0.815686, 0.964706, 1) ambient_light_color = Color(0.54902, 0.815686, 0.964706, 1)
ssao_radius = 11.01 ssao_radius = 11.01
@ -29,7 +31,7 @@ adjustment_brightness = 1.1
adjustment_contrast = 1.25 adjustment_contrast = 1.25
adjustment_saturation = 0.8 adjustment_saturation = 0.8
[sub_resource type="CameraAttributesPhysical" id="CameraAttributesPhysical_rja1c"] [sub_resource type="CameraAttributesPhysical" id="CameraAttributesPhysical_5s8jn"]
[node name="test_level" type="Node3D"] [node name="test_level" type="Node3D"]
@ -44,8 +46,16 @@ data = {
metadata/_editor_floor_ = Vector3(0, 0, 0) metadata/_editor_floor_ = Vector3(0, 0, 0)
[node name="player" parent="." instance=ExtResource("2_ojnju")] [node name="player" parent="." instance=ExtResource("2_ojnju")]
transform = Transform3D(1, 0, 0, 0, 0.494109, 0.8694, 0, -0.8694, 0.494109, -3.70665, 40.1006, 20.9216) transform = Transform3D(1, 0, 0, 0, 0.388867, 0.921294, 0, -0.921294, 0.388867, -1.19974, 40.1006, 13.3341)
attributes = null
current = true current = true
fov = 37.8493
near = 0.032
_test_building = ExtResource("3_08gdj")
[node name="Music" type="AudioStreamPlayer" parent="."]
stream = ExtResource("3_brvx4")
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(227.061, 0, -196.07, 0, 300, 0, 196.07, 0, 227.061, 0, 0.257405, 0)
@ -58,5 +68,5 @@ light_volumetric_fog_energy = 1.74
light_angular_distance = 5.2 light_angular_distance = 5.2
[node name="WorldEnvironment" type="WorldEnvironment" parent="."] [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_i4emf") environment = SubResource("Environment_lo4sd")
camera_attributes = SubResource("CameraAttributesPhysical_rja1c") camera_attributes = SubResource("CameraAttributesPhysical_5s8jn")

7
menu/start_game_menu.tscn
View File

@ -1,6 +1,7 @@
[gd_scene load_steps=6 format=3 uid="uid://4tym1auav4yv"] [gd_scene load_steps=7 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="AudioStream" uid="uid://ckg5eypyrhidg" path="res://music/I Feel Grunge (Slow).wav" id="2_yw57x"]
[sub_resource type="LabelSettings" id="LabelSettings_n38oc"] [sub_resource type="LabelSettings" id="LabelSettings_n38oc"]
font_size = 290 font_size = 290
@ -143,3 +144,7 @@ offset_bottom = -461.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
horizontal_alignment = 1 horizontal_alignment = 1
[node name="Music" type="AudioStreamPlayer" parent="."]
stream = ExtResource("2_yw57x")
autoplay = true

BIN
music/I Feel Grunge (Slow).wav Normal file
View File

Binary file not shown.

BIN
music/jazz.ogg Normal file
View File

Binary file not shown.

4
player/player.tscn
View File

@ -1,7 +1,6 @@
[gd_scene load_steps=19 format=3 uid="uid://b5gb5paiupum"] [gd_scene load_steps=18 format=3 uid="uid://b5gb5paiupum"]
[ext_resource type="Script" path="res://player/player.cs" id="1_of2l4"] [ext_resource type="Script" path="res://player/player.cs" id="1_of2l4"]
[ext_resource type="PackedScene" uid="uid://2pw0p13lcklv" path="res://buildings/kash_buildings/factory.tscn" id="2_mspwe"]
[sub_resource type="CameraAttributesPhysical" id="CameraAttributesPhysical_1ejpb"] [sub_resource type="CameraAttributesPhysical" id="CameraAttributesPhysical_1ejpb"]
frustum_near = 0.032 frustum_near = 0.032
@ -72,7 +71,6 @@ _mousePosLabel = NodePath("Debug info/mousePos")
_cursorPosLabel = NodePath("Debug info/cursorPointPos") _cursorPosLabel = NodePath("Debug info/cursorPointPos")
_cursor = NodePath("cursor") _cursor = NodePath("cursor")
_cursorPoint = NodePath("cursorPoint") _cursorPoint = NodePath("cursorPoint")
_test_building = ExtResource("2_mspwe")
_nuke = NodePath("NukeBar") _nuke = NodePath("NukeBar")
_pr = NodePath("PrBar") _pr = NodePath("PrBar")
_kash = NodePath("KashBar") _kash = NodePath("KashBar")