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

levels/test_level.tscn

@@ -1,9 +1,8 @@
-[gd_scene load_steps=8 format=3 uid="uid://cbs0x36e3ranm"]
+[gd_scene load_steps=7 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://bo7ir5us230sa" 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://2pw0p13lcklv" path="res://buildings/kash_buildings/factory.tscn" id="3_08gdj"]
+[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"]
 
 [sub_resource type="Environment" id="Environment_lo4sd"]
@@ -45,14 +44,6 @@ data = {
 }
 metadata/_editor_floor_ = Vector3(0, 0, 0)
 
-[node name="player" parent="." instance=ExtResource("2_ojnju")]
-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
-fov = 37.8493
-near = 0.032
-_test_building = ExtResource("3_08gdj")
-
 [node name="Music" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("3_brvx4")
 autoplay = true
@@ -70,3 +61,6 @@ light_angular_distance = 5.2
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_lo4sd")
 camera_attributes = SubResource("CameraAttributesPhysical_5s8jn")
+
+[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)

player/player.cs

@@ -30,11 +30,12 @@ public partial class player : Camera3D
 	private AudioStreamPlayer _sndChtr, _sndBtn;
 
 	[Export]
-    private Timer _tmrChtr;
+	private Timer _tmrChtr, _tmrCashGen;
 
-    private float Nuke { get => (float)_nuke.Value; set => _nuke.Value = value; }
+	private float Nukes { get => (float)_nuke.Value; set => _nuke.Value = value; }
 	private float PR { get => (float)_pr.Value; set => _pr.Value = value; }
 	private float Kash { get => (float)_kash.Value; set => _kash.Value = value; }
+	private int KashFlow { get; set; } = 1;
 	
 	private string Chatter
 	{
@@ -47,6 +48,7 @@ public partial class player : Camera3D
 		}
 	}
 
+
 	public base_building CurrentBuilding { get; set; }
 
 	public override void _Ready()
@@ -56,11 +58,11 @@ public partial class player : Camera3D
 		if (_test_building != null)
 		{
 			CurrentBuilding = _test_building.Instantiate<base_building>();
-
 			GetTree().Root.CallDeferred("add_child", CurrentBuilding);
 		}
 		_tmrChtr.Start();
 		_tmrChtr.Timeout += () => Chatter = "";
+	_tmrCashGen.Timeout += MakeMoney;
 	}
 
 	public override void _Process(double delta)
@@ -144,8 +146,39 @@ public partial class player : Camera3D
 			else if (mousebtn.ButtonIndex == MouseButton.WheelDown)
 				_wOut = true;
 		}
-
 	}
+	private void CheckGame() {
+		bool gameover = false;
+		
+		if (PR <= 0)
+			gameover = true;
+		else if (Kash <= 0)
+			gameover = true;
+		else if (Nukes >= 100)
+			gameover = true;
+			
+		if (gameover)
+			Chatter = "Game Over.";
+	}
+	
+	public void ChangeScore(int price, int pr, int nukes, int isCashCow) {
+		if (isCashCow > 1)
+			isCashCow = 1;
+		else if (isCashCow < -1)
+			isCashCow = -1;
+			
+		Nukes += nukes;
+		PR += pr;
+		Kash -= price;
+		KashFlow += isCashCow;
+		CheckGame();
+	}
+	
+	private void MakeMoney() {
+		Kash += KashFlow * 10;
+		CheckGame();
+	}
+
 
 	public void HandleBuilding()
 	{

player/player.tscn

@@ -1,16 +1,13 @@
-[gd_scene load_steps=18 format=3 uid="uid://b5gb5paiupum"]
+[gd_scene load_steps=20 format=3 uid="uid://b5gb5paiupum"]
 
 [ext_resource type="Script" path="res://player/player.cs" id="1_of2l4"]
+[ext_resource type="AudioStream" uid="uid://dye3nhm41yk6r" path="res://audio/chatter.wav" id="2_sa1qd"]
+[ext_resource type="AudioStream" uid="uid://c8dcqkmytnyay" path="res://audio/btn.wav" id="3_00x5l"]
 
 [sub_resource type="CameraAttributesPhysical" id="CameraAttributesPhysical_1ejpb"]
 frustum_near = 0.032
 
-[sub_resource type="Gradient" id="Gradient_hcpag"]
-interpolation_mode = 2
-colors = PackedColorArray(1, 0, 0, 1, 0.35782, 0, 0.0248139, 1)
-
 [sub_resource type="GradientTexture2D" id="GradientTexture2D_y5odr"]
-gradient = SubResource("Gradient_hcpag")
 fill_to = Vector2(0.858974, 0.615385)
 
 [sub_resource type="Gradient" id="Gradient_camjl"]
@@ -63,7 +60,10 @@ height = 255
 
 [sub_resource type="SphereMesh" id="SphereMesh_mtv4x"]
 
-[node name="player" type="Camera3D" node_paths=PackedStringArray("_con", "_mousePosLabel", "_cursorPosLabel", "_cursor", "_cursorPoint", "_nuke", "_pr", "_kash")]
+[sub_resource type="LabelSettings" id="LabelSettings_pws5q"]
+font_size = 28
+
+[node name="player" type="Camera3D" node_paths=PackedStringArray("_con", "_mousePosLabel", "_cursorPosLabel", "_cursor", "_cursorPoint", "_nuke", "_pr", "_kash", "_chatter", "_sndChtr", "_sndBtn", "_tmrChtr", "_tmrCashGen")]
 attributes = SubResource("CameraAttributesPhysical_1ejpb")
 script = ExtResource("1_of2l4")
 _con = NodePath("Debug info/Label")
@@ -74,8 +74,14 @@ _cursorPoint = NodePath("cursorPoint")
 _nuke = NodePath("NukeBar")
 _pr = NodePath("PrBar")
 _kash = NodePath("KashBar")
+_chatter = NodePath("lbl_Chatter")
+_sndChtr = NodePath("snd_Chatter")
+_sndBtn = NodePath("snd_Button")
+_tmrChtr = NodePath("tmr_Chatter")
+_tmrCashGen = NodePath("tmr_kash")
 
 [node name="Debug info" type="Control" parent="."]
+visible = false
 layout_mode = 3
 anchors_preset = 0
 offset_right = 40.0
@@ -105,17 +111,45 @@ offset_right = 402.0
 offset_bottom = 182.0
 text = "Eat ze caca."
 
-[node name="Button" type="Button" parent="."]
+[node name="btn_boom" type="Button" parent="."]
 offset_left = 1772.0
 offset_top = 926.0
 offset_right = 1904.0
 offset_bottom = 1058.0
-text = "BOOM"
+text = "Nuke Enemy"
 icon = SubResource("GradientTexture2D_y5odr")
 flat = true
 icon_alignment = 1
 expand_icon = true
 
+[node name="btn_nukes" type="Button" parent="."]
+offset_left = 1637.0
+offset_top = 926.0
+offset_right = 1769.0
+offset_bottom = 1058.0
+text = "BDE"
+icon_alignment = 1
+expand_icon = true
+
+[node name="btn_pr" type="Button" parent="."]
+offset_left = 1502.0
+offset_top = 926.0
+offset_right = 1634.0
+offset_bottom = 1058.0
+text = ":)
+"
+icon_alignment = 1
+expand_icon = true
+
+[node name="btn_kashcow" type="Button" parent="."]
+offset_left = 1366.0
+offset_top = 926.0
+offset_right = 1498.0
+offset_bottom = 1058.0
+text = "$"
+icon_alignment = 1
+expand_icon = true
+
 [node name="NukeBar" type="TextureProgressBar" parent="."]
 offset_left = 1817.0
 offset_top = 664.0
@@ -123,6 +157,8 @@ offset_right = 1841.0
 offset_bottom = 919.0
 value = 50.0
 rounded = true
+allow_greater = true
+allow_lesser = true
 fill_mode = 3
 texture_under = SubResource("GradientTexture2D_2xkee")
 texture_progress = SubResource("GradientTexture2D_d5w6a")
@@ -134,6 +170,8 @@ offset_right = 1869.0
 offset_bottom = 919.0
 value = 50.0
 rounded = true
+allow_greater = true
+allow_lesser = true
 fill_mode = 3
 texture_under = SubResource("GradientTexture2D_7myfq")
 texture_progress = SubResource("GradientTexture2D_kdame")
@@ -143,8 +181,11 @@ offset_left = 1873.0
 offset_top = 664.0
 offset_right = 1897.0
 offset_bottom = 919.0
-value = 50.0
+max_value = 1000.0
+value = 5.0
 rounded = true
+allow_greater = true
+allow_lesser = true
 fill_mode = 3
 texture_under = SubResource("GradientTexture2D_18k81")
 texture_progress = SubResource("GradientTexture2D_nfg3s")
@@ -186,3 +227,24 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 2)
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
 mesh = SubResource("SphereMesh_mtv4x")
 skeleton = NodePath("../..")
+
+[node name="lbl_Chatter" type="Label" parent="."]
+offset_left = 314.0
+offset_top = 270.0
+offset_right = 756.0
+offset_bottom = 513.0
+label_settings = SubResource("LabelSettings_pws5q")
+autowrap_mode = 3
+
+[node name="snd_Chatter" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("2_sa1qd")
+
+[node name="snd_Button" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("3_00x5l")
+
+[node name="tmr_Chatter" type="Timer" parent="."]
+wait_time = 3.0
+one_shot = true
+
+[node name="tmr_kash" type="Timer" parent="."]
+autostart = true