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

README.md

@@ -5,21 +5,10 @@
 - https://www.youtube.com/watch?v=VjuyfBaryu8
 
 ## 3d Assets
-- https://chilly-durango.itch.io/3d-retro-plumbing-wiring
-- https://maxparata.itch.io/voxel-plane
-- https://brokenvector.itch.io/low-poly-rock-pack
-- https://elbolilloduro.itch.io/trees-psx
-- https://free-game-assets.itch.io/free-tree-3d-low-poly-models
-- https://quaternius.itch.io/lowpoly-cars
-- https://lowpolyassets.itch.io/low-poly-construction-pack
-- https://chilly-durango.itch.io/2dieselpunktanks
 - https://ace-spectre.itch.io/ps1-heavy-and-light-weapons-pack
 - https://loafbrr.itch.io/small-apartment-block
 - https://dripsone.itch.io/barrels-psx-low-poly
 - https://t-allen-studios.itch.io/turret-pack-01
-- https://bukkbeek.itch.io/low-poly-trucks-collection-free-download
-- https://niko-3d-models.itch.io/low-poly-village-assets
-- https://brokenvector.itch.io/low-poly-road-pack
 - https://davidoreilly.itch.io/everything-library-buildings
 
 ## Textures 

assets/meshes/capitol.tscn

@@ -0,0 +1,39 @@
+[gd_scene load_steps=2 format=3 uid="uid://dfrtcsm4jq4q2"]
+
+[ext_resource type="PackedScene" uid="uid://bm1x0ruqtd3yf" path="res://assets/meshes/capitol.glb" id="1_dumdl"]
+
+[node name="capitol" instance=ExtResource("1_dumdl")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -35.0754, 0, 126.272)
+
+[node name="base073" parent="." index="0"]
+transform = Transform3D(0.0357665, 0, 0, 0, -1.59695e-08, -0.0773109, 0, 0.044654, -2.76485e-08, 33.9945, 4.79337, -43.7972)
+
+[node name="refl2" parent="." index="1"]
+transform = Transform3D(0.0357665, 0, 0, 0, -1.59695e-08, -0.0773109, 0, 0.044654, -2.76485e-08, 33.9945, 4.79337, -43.7972)
+
+[node name="windowRefl055" parent="." index="2"]
+transform = Transform3D(0.0357665, 0, 0, 0, -1.59695e-08, -0.0773109, 0, 0.044654, -2.76485e-08, 33.9945, 4.79337, -43.7972)
+
+[node name="base030" parent="." index="3"]
+transform = Transform3D(0.038, 0, 0, 0, -2.83126e-08, -0.0270756, 0, 0.0791679, -9.68298e-09, 36.1914, 7.83523, -160.178)
+
+[node name="windowRefl013" parent="." index="4"]
+transform = Transform3D(0.038, 0, 0, 0, -2.83126e-08, -0.0270756, 0, 0.0791679, -9.68298e-09, 36.1914, 7.83523, -160.178)
+
+[node name="base031" parent="." index="5"]
+transform = Transform3D(0.038, 0, 0, 0, -2.83126e-08, -0.0270756, 0, 0.0791679, -9.68298e-09, 36.1914, 7.83523, -160.178)
+
+[node name="windowRefl014" parent="." index="6"]
+transform = Transform3D(0.038, 0, 0, 0, -2.83126e-08, -0.0270756, 0, 0.0791679, -9.68298e-09, 36.1914, 7.83523, -160.178)
+
+[node name="base032" parent="." index="7"]
+transform = Transform3D(0.038, 0, 0, 0, -2.83126e-08, -0.0270756, 0, 0.0791679, -9.68298e-09, 36.1914, 7.83523, -160.178)
+
+[node name="windowRefl015" parent="." index="8"]
+transform = Transform3D(0.038, 0, 0, 0, -2.83126e-08, -0.0270756, 0, 0.0791679, -9.68298e-09, 36.1914, 7.83523, -160.178)
+
+[node name="base033" parent="." index="9"]
+transform = Transform3D(0.038, 0, 0, 0, -2.83126e-08, -0.0270756, 0, 0.0791679, -9.68298e-09, 36.1914, 7.83523, -160.178)
+
+[node name="windowRefl016" parent="." index="10"]
+transform = Transform3D(0.038, 0, 0, 0, -2.83126e-08, -0.0270756, 0, 0.0791679, -9.68298e-09, 36.1914, 7.83523, -160.178)

buildings/arms_building.cs

@@ -5,5 +5,5 @@ public partial class arms_building : base_building
     [Export]
     public int Megaton { get; set; } = 1;
     [Export]
-    public int Approval { get; set; } = -1;
+    public int ApprovalDrop { get; set; } = 1;
 }

buildings/base_building.cs

@@ -9,7 +9,7 @@ public partial class base_building : Node3D
     [Export]
     public string DisplayName { get; set; } = "base_building";
     [Export]
-    public int KashCost { get; set; } = -1;
+    public int KashCost { get; set; } = 1;
     public bool IsPlaceable
     {
         get

buildings/kash_buildings/capitol.tscn

@@ -0,0 +1,56 @@
+[gd_scene load_steps=4 format=3 uid="uid://djl6qrak0t8km"]
+
+[ext_resource type="Script" path="res://buildings/kash_building.cs" id="1_2i177"]
+[ext_resource type="PackedScene" uid="uid://dfrtcsm4jq4q2" path="res://assets/meshes/capitol.tscn" id="2_k872b"]
+[ext_resource type="PackedScene" uid="uid://m3lrwoup4i4r" path="res://buildings/grass_block.tscn" id="3_nf4at"]
+
+[node name="capitol" 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)
+script = ExtResource("1_2i177")
+KashGenPerSec = 2
+BlocksNode = NodePath("blocks")
+DisplayName = "Capitol"
+KashCost = 69
+
+[node name="mesh" parent="." instance=ExtResource("2_k872b")]
+transform = Transform3D(0.0261279, 0, 0, 0, 0.042186, 0, 0, 0, 0.0268019, -0.878754, 0, 0.342177)
+
+[node name="blocks" type="Node3D" parent="."]
+
+[node name="grass_block" parent="blocks" instance=ExtResource("3_nf4at")]
+
+[node name="grass_block2" parent="blocks" node_paths=PackedStringArray("_ray") instance=ExtResource("3_nf4at")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0, -2)
+_ray = NodePath("../grass_block/RayCast3D")
+
+[node name="grass_block3" parent="blocks" node_paths=PackedStringArray("_ray") instance=ExtResource("3_nf4at")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0, -2)
+_ray = NodePath("../grass_block/RayCast3D")
+
+[node name="grass_block4" parent="blocks" node_paths=PackedStringArray("_ray") instance=ExtResource("3_nf4at")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2)
+_ray = NodePath("../grass_block/RayCast3D")
+
+[node name="grass_block5" parent="blocks" node_paths=PackedStringArray("_ray") instance=ExtResource("3_nf4at")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0, -4)
+_ray = NodePath("../grass_block/RayCast3D")
+
+[node name="grass_block6" parent="blocks" node_paths=PackedStringArray("_ray") instance=ExtResource("3_nf4at")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0, -4)
+_ray = NodePath("../grass_block/RayCast3D")
+
+[node name="grass_block7" parent="blocks" node_paths=PackedStringArray("_ray") instance=ExtResource("3_nf4at")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -4)
+_ray = NodePath("../grass_block/RayCast3D")
+
+[node name="grass_block8" parent="blocks" node_paths=PackedStringArray("_ray") instance=ExtResource("3_nf4at")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0, -6)
+_ray = NodePath("../grass_block/RayCast3D")
+
+[node name="grass_block9" parent="blocks" node_paths=PackedStringArray("_ray") instance=ExtResource("3_nf4at")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0, -6)
+_ray = NodePath("../grass_block/RayCast3D")
+
+[node name="grass_block10" parent="blocks" node_paths=PackedStringArray("_ray") instance=ExtResource("3_nf4at")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -6)
+_ray = NodePath("../grass_block/RayCast3D")

buildings/kash_buildings/factory.tscn

@@ -0,0 +1,25 @@
+[gd_scene load_steps=4 format=3 uid="uid://2pw0p13lcklv"]
+
+[ext_resource type="Script" path="res://buildings/kash_building.cs" id="1_bcr1q"]
+[ext_resource type="PackedScene" uid="uid://bbxjweewwjrd4" path="res://assets/meshes/factory.tscn" id="2_st133"]
+[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)
+script = ExtResource("1_bcr1q")
+BlocksNode = NodePath("blocks")
+DisplayName = "Factory"
+KashCost = 6
+
+[node name="mesh" parent="." instance=ExtResource("2_st133")]
+transform = Transform3D(2.10296, 0, 0, 0, 2.10008, 0, 1.42109e-14, 0, 2.24669, -1.12056e-08, 0, 0.128178)
+
+[node name="blocks" type="Node3D" parent="."]
+
+[node name="grass_block" parent="blocks" instance=ExtResource("3_4p2cy")]
+
+[node name="grass_block2" parent="blocks" instance=ExtResource("3_4p2cy")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0, -1.74846e-07)
+
+[node name="grass_block3" parent="blocks" instance=ExtResource("3_4p2cy")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0, 1.74846e-07)

buildings/propaganda_building.cs

@@ -3,5 +3,5 @@ using Godot;
 public partial class propaganda_building : base_building
 {
     [Export]
-    public int Approval { get; set; } = 1;
+    public int ApprovalGain { get; set; } = 1;
 }

island/base_island.tscn

@@ -1,9 +1,15 @@
-[gd_scene load_steps=2 format=3 uid="uid://sgo6x1450dbh"]
+[gd_scene load_steps=3 format=3 uid="uid://sgo6x1450dbh"]
 
 [ext_resource type="MeshLibrary" uid="uid://dwo1m72yajrb1" path="res://assets/tilesets/tileset.tres" id="1_kpsvv"]
+[ext_resource type="PackedScene" uid="uid://djl6qrak0t8km" path="res://buildings/kash_buildings/capitol.tscn" id="1_m8vbj"]
 
 [node name="base-island" type="Node3D"]
 
+[node name="buildings" type="Node3D" parent="."]
+
+[node name="capitol" parent="buildings" instance=ExtResource("1_m8vbj")]
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -14, 1.1, -10)
+
 [node name="island-grid" type="GridMap" parent="."]
 mesh_library = ExtResource("1_kpsvv")
 cell_center_x = false