Nicola/RuinAdventurer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Finished first EA Version #1

Merged
Nicola merged 110 commits from dev into main 2026-05-19 20:01:13 +02:00
Conversation 0 Commits 110 Files Changed 456
+135 -20
7 changed files with 135 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aee2ee7f3d - Show all commits
Assets/Research.json
+28 -4
View File
@@ -36,7 +36,13 @@
],
"research": "stoneage",
"crafttime": 5.0,
"texture": "res://Assets/Images/Items/StoneGearSymbol.png"
"texture": "res://Assets/Images/Items/StoneGearSymbol.png",
"effects": [
{
"stat": "robot_count_increase",
"value": 10
}
]
},
{
"id": "basic_machines",
@@ -166,7 +172,13 @@
],
"research": "heat_control",
"crafttime": 12.0,
"texture": "res://Assets/Images/Research/CopperageSymbol.png"
"texture": "res://Assets/Images/Research/CopperageSymbol.png",
"effects": [
{
"stat": "robot_count_increase",
"value": 10
}
]
},
{
"id": "copper_smelting",
@@ -358,7 +370,13 @@
],
"research": "basic_electricity",
"crafttime": 24.0,
"texture": "res://Assets/Images/Research/BronzeageSymbol.png"
"texture": "res://Assets/Images/Research/BronzeageSymbol.png",
"effects": [
{
"stat": "robot_count_increase",
"value": 10
}
]
},
{
"id": "bronze_smelting",
@@ -480,7 +498,13 @@
],
"research": "bronze_robotics",
"crafttime": 38.0,
"texture": "res://Assets/Images/Research/IronageSymbol.png"
"texture": "res://Assets/Images/Research/IronageSymbol.png",
"effects": [
{
"stat": "robot_count_increase",
"value": 10
}
]
},
{
"id": "iron_smelting",
Scripts/Core/GameData.cs
+2 -2
View File
@@ -4,7 +4,7 @@ using Godot;
public partial class GameData
{
public static bool debugMode = true;
public static bool debugMode = false;
public static Random rand = new Random(seed);
public static Layer[] map;
@@ -13,7 +13,7 @@ public partial class GameData
public static int lowestLayer = 0;
public static bool canMove = true;
public static int maxRobotCount = 1000;
public static int maxRobotCount = 10;
public static List<Robot> robots = new List<Robot>();
public static float robotSpeed = 10f;
public static float tileWidth = 6;
Scripts/Gameplay/Research/ResearchEffect.cs
+1
View File
@@ -18,6 +18,7 @@ public class ResearchEffect
"robot_cooling_bonus" => $"Robot cooling +{Value * 100f:0}%",
"robot_maintenance_loss_reduction" => $"Robot maintenance loss -{Value * 100f:0}%",
"robot_minimum_efficiency_bonus" => $"Damaged robot efficiency +{Value * 100f:0}%",
"robot_count_increase" => $"Allows more robots +{Value}",
_ => Stat
};
}
Scripts/Gameplay/Robots/Robot.cs
+62 -12
View File
@@ -11,7 +11,6 @@ public partial class Robot : Node3D
private const float CooldownTarget = 35f;
private const float MaintenanceLossPerSecond = 0.04f;
private List<ProgramNode> nodes = new List<ProgramNode>();
private bool isExecuting = false;
private ProgramNode currentNode;
@@ -21,6 +20,12 @@ public partial class Robot : Node3D
public float maintenance = 100f;
public bool isCoolingDown = false;
public bool isBroken = false;
public string robotType = "iron_robot";
private RobotTypeStats TypeStats =>
GameData.robotStats.RobotTypes.TryGetValue(robotType, out RobotTypeStats stats)
? stats
: GameData.robotStats.RobotTypes["stone_robot"];
public override void _Process(double delta)
{
@@ -37,10 +42,12 @@ public partial class Robot : Node3D
isExecuting = false;
}
break;
case NodeResult.FAILURE:
isExecuting = false;
currentMessage = "(FAILED)" + currentNode.lastExecutionMessage;
break;
case NodeResult.RUNNING:
currentMessage = "";
break;
@@ -49,26 +56,32 @@ public partial class Robot : Node3D
}
else if (currentMessage.Length <= 0)
{
CoolDown(delta, GameData.robotStats.GetCoolingRate(IdleHeatLossPerSecond));
CoolDown(
delta,
GameData.robotStats.GetCoolingRate(IdleHeatLossPerSecond)
* TypeStats.CoolingMultiplier
);
currentMessage = "No script executing";
}
Visible = Math.Round(Math.Abs(Position.Y / GameData.tileHeight), 0) == GameData.visibleLayer;
}
public void SetupExecution(List<ProgramNode> nodes)
{
if (nodes.Count <= 0) return;
this.nodes = new List<ProgramNode>(nodes);
isExecuting = true;
currentNode = nodes[0];
currentMessage = "";
}
public float GetMovementSpeed()
{
return GameData.robotStats.GetMovementSpeed(GameData.robotSpeed) * GetWorkEfficiency();
return GameData.robotStats.GetMovementSpeed(GameData.robotSpeed)
* TypeStats.SpeedMultiplier
* GetWorkEfficiency();
}
public float GetWorkEfficiency()
@@ -76,8 +89,17 @@ public partial class Robot : Node3D
if (isBroken) return 0f;
if (maintenance >= 50f) return 1f;
float minimumEfficiency = GameData.robotStats.GetMinimumEfficiency();
return Math.Clamp(minimumEfficiency + maintenance / 100f, minimumEfficiency, 1f);
float minimumEfficiency =
GameData.robotStats.GetMinimumEfficiency()
+ TypeStats.MinimumEfficiencyBonus;
minimumEfficiency = Math.Clamp(minimumEfficiency, 0f, 1f);
return Math.Clamp(
minimumEfficiency + maintenance / 100f,
minimumEfficiency,
1f
);
}
public void Maintain()
@@ -103,19 +125,42 @@ public partial class Robot : Node3D
if (isCoolingDown)
{
CoolDown(delta, GameData.robotStats.GetCoolingRate(ActiveHeatLossPerSecond));
CoolDown(
delta,
GameData.robotStats.GetCoolingRate(ActiveHeatLossPerSecond)
* TypeStats.CoolingMultiplier
);
currentMessage = $"Cooling down ({heat:0}%)";
return false;
}
if (!GameData.survival.TryConsumeEnergy(GameData.robotStats.GetEnergyUse(EnergyUsePerSecond) * (float)delta))
float energyUse =
GameData.robotStats.GetEnergyUse(EnergyUsePerSecond)
* TypeStats.EnergyUseMultiplier
* (float)delta;
if (!GameData.survival.TryConsumeEnergy(energyUse))
{
currentMessage = "Not enough energy";
return false;
}
heat = Math.Clamp(heat + GameData.robotStats.GetHeatGain(HeatGainPerSecond) * (float)delta, 0f, 100f);
maintenance = Math.Clamp(maintenance - GameData.robotStats.GetMaintenanceLoss(MaintenanceLossPerSecond) * (float)delta, 0f, 100f);
heat = Math.Clamp(
heat + GameData.robotStats.GetHeatGain(HeatGainPerSecond)
* TypeStats.HeatGainMultiplier
* (float)delta,
0f,
100f
);
maintenance = Math.Clamp(
maintenance - GameData.robotStats.GetMaintenanceLoss(MaintenanceLossPerSecond)
* TypeStats.MaintenanceLossMultiplier
* (float)delta,
0f,
100f
);
if (heat >= 100f)
{
@@ -136,7 +181,12 @@ public partial class Robot : Node3D
private void CoolDown(double delta, float heatLossPerSecond)
{
heat = Math.Clamp(heat - heatLossPerSecond * (float)delta, 0f, 100f);
heat = Math.Clamp(
heat - heatLossPerSecond * (float)delta,
0f,
100f
);
if (heat <= CooldownTarget)
{
isCoolingDown = false;
Scripts/Gameplay/Robots/RobotStats.cs
+11
View File
@@ -3,6 +3,14 @@ using System.Collections.Generic;
public class RobotStats
{
public readonly Dictionary<string, RobotTypeStats> RobotTypes = new()
{
["stone_robot"] = new RobotTypeStats(0.75f, 0.60f, 0.80f, 0.80f, 1.40f, -0.10f),
["copper_robot"] = new RobotTypeStats(1.00f, 1.00f, 1.00f, 1.00f, 1.00f, 0.00f),
["tin_robot"] = new RobotTypeStats(1.00f, 1.00f, 1.00f, 1.00f, 1.00f, 0.00f),
["bronze_robot"] = new RobotTypeStats(1.15f, 1.10f, 0.90f, 1.10f, 0.80f, 0.05f),
["iron_robot"] = new RobotTypeStats(1.35f, 1.25f, 1.15f, 1.20f, 0.65f, 0.10f)
};
private const float BaseMinimumEfficiency = 0.35f;
private float speedBonus = 0f;
@@ -76,6 +84,9 @@ public class RobotStats
case "robot_minimum_efficiency_bonus":
minimumEfficiencyBonus += effect.Value;
break;
case "robot_count_increase":
GameData.maxRobotCount += (int)effect.Value;
break;
}
}
}
Scripts/Gameplay/Robots/RobotTypeStats.cs
+28
View File
@@ -0,0 +1,28 @@
using System.Collections.Generic;
public readonly struct RobotTypeStats
{
public readonly float SpeedMultiplier;
public readonly float EnergyUseMultiplier;
public readonly float HeatGainMultiplier;
public readonly float CoolingMultiplier;
public readonly float MaintenanceLossMultiplier;
public readonly float MinimumEfficiencyBonus;
public RobotTypeStats(
float speedMultiplier,
float energyUseMultiplier,
float heatGainMultiplier,
float coolingMultiplier,
float maintenanceLossMultiplier,
float minimumEfficiencyBonus)
{
SpeedMultiplier = speedMultiplier;
EnergyUseMultiplier = energyUseMultiplier;
HeatGainMultiplier = heatGainMultiplier;
CoolingMultiplier = coolingMultiplier;
MaintenanceLossMultiplier = maintenanceLossMultiplier;
MinimumEfficiencyBonus = minimumEfficiencyBonus;
}
}
Scripts/Gameplay/Robots/RobotTypeStats.cs.uid
+1
View File
@@ -0,0 +1 @@
uid://bfmf5tb3pmmug