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

README.md

@@ -13,3 +13,4 @@
 
 ## Textures 
 - https://zlab.itch.io/realistic-texture-pack
+- https://screamingbrainstudios.itch.io/seamless-abstract-pack 

buildings/kash_buildings/factory.tscn

@@ -5,7 +5,7 @@
 [ext_resource type="PackedScene" uid="uid://m3lrwoup4i4r" path="res://buildings/grass_block.tscn" id="3_4p2cy"]
 
 [node name="factory" type="Node3D" node_paths=PackedStringArray("BlocksNode")]
-transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 1.1, 0)
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0)
 script = ExtResource("1_bcr1q")
 BlocksNode = NodePath("blocks")
 DisplayName = "Factory"

game/game_manager.cs

@@ -0,0 +1,14 @@
+public static class game_manager
+{
+    public enum State
+    {
+        Play,
+        Building,
+        Pause,
+    }
+
+    public static State CurrentState { get; set; } = State.Play;
+    public static int Kash { get; set; } = 0;
+    public static int Approval { get; set; } = 0;
+    public static int Megaton { get; set; } = 0;
+}

levels/test_level.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 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="AudioStream" uid="uid://bba7tiqty57ek" path="res://music/jazz.ogg" id="3_brvx4"]
 
@@ -17,7 +17,8 @@ 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, -2.76897, 18.3017, 8.82022)
+transform = Transform3D(1, 0, 0, 0, 0.388867, 0.921294, 0, -0.921294, 0.388867, -1.19974, 40.1006, 13.3341)
+current = true
 attributes = null
 fov = 37.8493
 near = 0.032

player/player.cs

@@ -3,81 +3,140 @@ using System;
 
 public partial class player : Camera3D
 {
-	private const string _path = "/root/player/";
+    private const string _path = "/root/player/";
+    //private Camera3D _cam;
+    [Export]
+    private Label _con;
+    [Export]
+    private Label _mousePosLabel;
+    [Export]
+    private Label _cursorPosLabel;
+    [Export]
+    private RayCast3D _cursor;
+    [Export]
+    private Node3D _cursorPoint;
+    private bool _mUp, _mDown, _mLeft, _mRight, _wIn, _wOut;
 
-	private bool _mUp, _mDown, _mLeft, _mRight, _wIn, _wOut;
-	[Export]
-	private TextureProgressBar _nuke, _pr, _kash;
+    [Export]
+    private PackedScene _test_building;
 
-	private float Nuke { 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; }
+    [Export]
+    private TextureProgressBar _nuke, _pr, _kash;
+
+    private float Nuke { 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; }
+
+    public Node3D CurrentBuilding { get; set; }
+
+    public override void _Ready()
+    {
+        //for debugging TODO: Remove
+        game_manager.CurrentState = game_manager.State.Building;
+        if (_test_building != null)
+        {
+            CurrentBuilding = _test_building.Instantiate<Node3D>();
+            GD.Print(CurrentBuilding);
+
+            GetTree().Root.CallDeferred("add_child", CurrentBuilding);
+        }
+    }
+
+    public override void _Process(double delta)
+    {
+        Vector3 rot = this.Rotation;
+        bool zin = true, zout = true;
+
+        if (Input.IsActionPressed("CamNorth"))
+            _mUp = true;
+        if (Input.IsActionPressed("CamSouth"))
+            _mDown = true;
+        if (Input.IsActionPressed("CamEast"))
+            _mRight = true;
+        if (Input.IsActionPressed("CamWest"))
+            _mLeft = true;
+
+        this.Rotation -= rot;
+        if (this.Position.Y < 5)
+            zin = false;
+        else if (this.Position.Y > 45)
+            zout = false;
+        if (_mLeft && this.Position.X > -30)
+            this.Translate(new Vector3((float)-delta * 10, 0, 0));
+        if (_mRight && this.Position.X < 30)
+            this.Translate(new Vector3((float)delta * 10, 0, 0));
+        if (_mUp && this.Position.Z > -25)
+            this.Translate(new Vector3(0, 0, (float)-delta * 10));
+        if (_mDown && this.Position.Z < 25)
+            this.Translate(new Vector3(0, 0, (float)delta * 10));
+        this.Rotation += rot;
+
+        if (_wIn && zin)
+            this.Translate(new Vector3(0, 0, (float)-delta * 10));
+        if (_wOut && zout)
+            this.Translate(new Vector3(0, 0, (float)delta * 10));
+
+        _con.Set("text", this.Position);
 
 
+        if (_cursor != null && _cursorPoint != null)
+        {
+            //Get the collision with map and change its X and Z value to always be in the center of a tile
+            Vector3I collisionVector = (Vector3I)_cursor.GetCollisionPoint();
+            _cursorPosLabel.Text = "Virtual Cursor Postion" + collisionVector.ToString();
+            _cursorPoint.GlobalPosition = new Vector3(collisionVector.X - collisionVector.X % 2, collisionVector.Y + 0.1f, collisionVector.Z - collisionVector.Z % 2);
 
-	// Called when the node enters the scene tree for the first time.
-	public override void _Ready()
-	{
-	}
+            if (game_manager.CurrentState == game_manager.State.Building)
+                HandleBuilding();
+        }
+    }
 
-	// Called every frame. 'delta' is the elapsed time since the previous frame.
-	public override void _Process(double delta)
-	{
-		Vector3 rot = this.Rotation;
-		bool zin = true, zout = true;
+    public override void _Input(InputEvent @event)
+    {
+        _mLeft = _mRight = _mUp = _mDown = _wIn = _wOut = false;
 
-		if (Input.IsActionPressed("CamNorth"))
-			_mUp = true;
-		if (Input.IsActionPressed("CamSouth"))
-			_mDown = true;
-		if (Input.IsActionPressed("CamEast"))
-			_mRight = true;
-		if (Input.IsActionPressed("CamWest"))
-			_mLeft = true;
+        if (@event is InputEventMouseMotion mouse)
+        {
+            Vector2 vec = mouse.Position;
+            if (vec.X < 5)
+                _mLeft = true;
+            else if (vec.X > 1915)
+                _mRight = true;
+            if (vec.Y < 20)
+                _mUp = true;
+            else if (vec.Y > 1060)
+                _mDown = true;
 
-		this.Rotation -= rot;
-		if (this.Position.Y < 5)
-			zin = false;
-		else if (this.Position.Y > 20)
-			zout = false;
-		if (_mLeft && this.Position.X > -30)
-			this.Translate(new Vector3((float)-delta*10, 0, 0));
-		if (_mRight && this.Position.X < 30)
-			this.Translate(new Vector3((float)delta*10, 0, 0));
-		if (_mUp && this.Position.Z > -25)
-			this.Translate(new Vector3(0, 0, (float)-delta*10));
-		if (_mDown && this.Position.Z < 25)
-			this.Translate(new Vector3(0, 0, (float)delta*10));
-		this.Rotation += rot;
 
-		if (_wIn && zin)
-			this.Translate(new Vector3(0, 0, (float)-delta*10));
-		if (_wOut && zout)
-			this.Translate(new Vector3(0, 0, (float)delta*10));
+            _mousePosLabel.Text = "Mouse position: " + vec.ToString();
 
-	}
+            _cursor.Position = new Vector3(
+                (vec.X - GetViewport().GetVisibleRect().Size.X / 2) * this.Position.Y / 700,
+                -((vec.Y - GetViewport().GetVisibleRect().Size.Y / 2) * this.Position.Y / 700)
+                , 0
+                );
+        }
+        else if (@event is InputEventMouseButton mousebtn)
+        {
+            if (mousebtn.ButtonIndex == MouseButton.WheelUp)
+                _wIn = true;
+            else if (mousebtn.ButtonIndex == MouseButton.WheelDown)
+                _wOut = true;
+        }
 
-	public override void _Input(InputEvent @event)
-	{
-		_mLeft = _mRight = _mUp = _mDown = _wIn = _wOut = false;
+    }
 
-		if (@event is InputEventMouseMotion mouse) {
-			Vector2 vec = mouse.Position;
-			if (vec.X < 5)
-				_mLeft = true;
-			else if (vec.X > 1915)
-				_mRight = true;
-			if (vec.Y < 20)
-				_mUp = true;
-			else if (vec.Y > 1060)
-				_mDown = true;
-		}
-		else if (@event is InputEventMouseButton mousebtn) {
-			if (mousebtn.ButtonIndex == MouseButton.WheelUp)
-				_wIn = true;
-			else if (mousebtn.ButtonIndex == MouseButton.WheelDown)
-				_wOut = true;
-		}
+    public void HandleBuilding()
+    {
+        if (CurrentBuilding != null)
+        {
+            CurrentBuilding.GlobalPosition = _cursorPoint.GlobalPosition;
 
-	}
+            if (Input.IsActionJustPressed("build"))
+            {
+                Node3D tempBuilding = (Node3D)CurrentBuilding.Duplicate();
+                GetTree().Root.CallDeferred("add_child", tempBuilding);
+            }
+        }
+    }
 }

player/player.tscn

@@ -1,6 +1,7 @@
-[gd_scene load_steps=17 format=3 uid="uid://b5gb5paiupum"]
+[gd_scene load_steps=19 format=3 uid="uid://b5gb5paiupum"]
 
 [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"]
 frustum_near = 0.032
@@ -61,13 +62,51 @@ gradient = SubResource("Gradient_od2su")
 width = 24
 height = 255
 
-[node name="player" type="Camera3D" node_paths=PackedStringArray("_nuke", "_pr", "_kash")]
+[sub_resource type="SphereMesh" id="SphereMesh_mtv4x"]
+
+[node name="player" type="Camera3D" node_paths=PackedStringArray("_con", "_mousePosLabel", "_cursorPosLabel", "_cursor", "_cursorPoint", "_nuke", "_pr", "_kash")]
 attributes = SubResource("CameraAttributesPhysical_1ejpb")
 script = ExtResource("1_of2l4")
+_con = NodePath("Debug info/Label")
+_mousePosLabel = NodePath("Debug info/mousePos")
+_cursorPosLabel = NodePath("Debug info/cursorPointPos")
+_cursor = NodePath("cursor")
+_cursorPoint = NodePath("cursorPoint")
+_test_building = ExtResource("2_mspwe")
 _nuke = NodePath("NukeBar")
 _pr = NodePath("PrBar")
 _kash = NodePath("KashBar")
 
+[node name="Debug info" type="Control" parent="."]
+layout_mode = 3
+anchors_preset = 0
+offset_right = 40.0
+offset_bottom = 40.0
+
+[node name="mousePos" type="Label" parent="Debug info"]
+layout_mode = 0
+offset_left = 314.0
+offset_top = 228.0
+offset_right = 403.0
+offset_bottom = 254.0
+text = "Eat ze caca."
+
+[node name="cursorPointPos" type="Label" parent="Debug info"]
+layout_mode = 0
+offset_left = 314.0
+offset_top = 195.0
+offset_right = 403.0
+offset_bottom = 221.0
+text = "Eat ze caca."
+
+[node name="Label" type="Label" parent="Debug info"]
+layout_mode = 0
+offset_left = 313.0
+offset_top = 156.0
+offset_right = 402.0
+offset_bottom = 182.0
+text = "Eat ze caca."
+
 [node name="Button" type="Button" parent="."]
 offset_left = 1772.0
 offset_top = 926.0
@@ -137,3 +176,15 @@ offset_right = 1937.0
 offset_bottom = 917.0
 rotation = 1.5708
 text = "M$"
+
+[node name="cursor" type="RayCast3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.17786)
+target_position = Vector3(0, 0, -999)
+
+[node name="cursorPoint" type="Node3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 2)
+
+[node name="cursorPointMesh" type="MeshInstance3D" parent="cursorPoint"]
+transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
+mesh = SubResource("SphereMesh_mtv4x")
+skeleton = NodePath("../..")

project.godot

@@ -51,6 +51,12 @@ CamEast={
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
+build={
+"deadzone": 0.5,
+"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"pressed":false,"double_click":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":66,"key_label":0,"unicode":98,"echo":false,"script":null)
+]
+}
 
 [rendering]