devZoGok/PlanetFleet
1
0
Fork 0
mirror of https://github.com/devZoGok/PlanetFleet.git synced 2026-08-26 19:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

improved CPU player behaviour land force transporting subsystem to use multiple transports

Browse Source
This commit is contained in:
devZoGok
2026-03-15 15:21:11 +02:00
parent dbc1a05567
commit 5bcd86d606
4 changed files with 87 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/Core/player.lua
+75 -41
View File
@@ -39,7 +39,7 @@ Player.landTaskForceData = {
}
Player.navalTaskForceData = {
{class = UnitClass.TRANSPORT, numUnits = 1},
{class = UnitClass.TRANSPORT, numUnits = 2},
--{class = UnitClass.CRUISER, numUnits = 1},
--{class = UnitClass.ANTI_SUB_CRUISER, numUnits = 1}
}
@@ -485,7 +485,7 @@ function Player:formLandTaskForces(arguments)
for i = 1, numSpawnPoints do
if i - 1 == self:getSpawnPointId() then goto continue end
self.taskForces[tfId] = {units = {}, moving = false, arrived = false, spawnPointId = i - 1}
self.taskForces[tfId] = {units = {}, moving = false, arrived = false, landed = false, spawnPointId = i - 1}
for j = 1, #self.landTaskForceData do
subArrId = (tfId - 1) * self.landTaskForceData[j].numUnits + 1
@@ -506,69 +506,103 @@ function Player:formLandTaskForces(arguments)
return BTNodeResult.SUCCESS
end
function Player:boardTransports(arguments)
transports = self:getUnitsByClass(UnitClass.TRANSPORT, -1)
function Player:getTransportData(transports)
allIdle = true
allInWater = true
allInLand = true
if not transports[1] then return BTNodeResult.FAILURE end
for i = 1, #transports do
numOrders = transports[i]:getNumOrders()
currCell = map:getCell(map:getCellId(transports[i]:getPos(), false))
if numOrders > 0 then allIdle = false end
if currCell.type ~= 1 then allInWater = false
elseif currCell.type ~= 0 then allInLand = false end
end
return {allIdle = allIdle, allInWater = allInWater, allInLand = allInLand}
end
function Player:boardTransports(arguments)
taskForce = self.taskForces[arguments.taskForceId]
if taskForce.landed then return BTNodeResult.SUCCESS end
map = Map.getSingleton()
tpPos = transports[1]:getPos()
currTransportCell = map:getCell(map:getCellId(tpPos, false))
transports = self:getUnitsByClass(UnitClass.TRANSPORT, -1)
tpData = self:getTransportData(transports)
spId = self.taskForces[arguments.taskForceId].spawnPointId
embarkCell = map:getCell(self.spawnPointData[spId + 1].embarkCellId)
disembarkCell = map:getCell(self.spawnPointData[spId + 1].disembarkCellId)
if transports[1]:getNumOrders() == 0 and currTransportCell.type == 1 then
if tpData.allIdle and tpData.allInWater then
self:deselectUnits()
self:selectUnits(transports)
embarkCell = map:getCell(self.spawnPointData[taskForce.spawnPointId + 1].embarkCellId)
self:issueOrder(OrderType.MOVE, Vector3:new(0, 0, 0), {Target:new(nil, embarkCell.pos)}, false)
elseif currTransportCell.type == 0 then
closerToDisembark = (tpPos:getDistanceFrom(disembarkCell.pos) < tpPos:getDistanceFrom(embarkCell.pos))
end
if tpData.allInWater and not tpData.allIdle then return BTNodeResult.RUNNING end
if not taskForce.moving and tpData.allInLand and tpData.allIdle then
usaId = 1
for i = 1, #transports do
numSlots = transports[i]:getNumGarrisonSlots()
un = table.move(taskForce.units, usaId, usaId + numSlots - 1, 1, {})
usaId = usaId + numSlots
if closerToDisembark then return BTNodeResult.SUCCESS
elseif not self.taskForces[arguments.taskForceId].moving then
self:deselectUnits()
self:selectUnits(self.taskForces[arguments.taskForceId].units)
self:issueOrder(OrderType.GARRISON, Vector3:new(0, 0, 0), {Target:new(transports[1]:toGameObject(), Vector3:new(0, 0, 0))}, false)
self.taskForces[arguments.taskForceId].moving = true
self:selectUnits(un)
self:issueOrder(OrderType.GARRISON, Vector3:new(0, 0, 0), {Target:new(transports[i]:toGameObject(), Vector3:new(0, 0, 0))}, false)
end
taskForce.moving = true
end
garrisonSlots = transports[1]:getGarrisonSlots()
for i = 1, #taskForce.units do
garrisoned = taskForce.units[i]:toVehicle():getGarrisonable()
for i = 1, #garrisonSlots do
if not garrisonSlots[i].vehicle then
return BTNodeResult.RUNNING
end
if i == #taskForce.units and garrisoned then
taskForce.moving = false
return BTNodeResult.SUCCESS
elseif not garrisoned then return BTNodeResult.RUNNING end
end
self.taskForces[arguments.taskForceId].moving = false
return BTNodeResult.SUCCESS
end
function Player:moveTransports(arguments)
transports = self:getUnitsByClass(UnitClass.TRANSPORT, -1)
if transports[1]:isGarrisonEmpty() then return BTNodeResult.SUCCESS end
for i = 1, #transports do
empty = transports[i]:isGarrisonEmpty()
map = Map.getSingleton()
spId = self.taskForces[arguments.taskForceId].spawnPointId
if i == #transports and empty then return BTNodeResult.SUCCESS
elseif not empty then break end
end
tpData = self:getTransportData(transports)
if tpData.allInLand and tpData.allIdle then
spId = self.taskForces[arguments.taskForceId].spawnPointId
targPos = Map.getSingleton():getCell(self.spawnPointData[spId + 1].disembarkCellId).pos
for i = 1, #transports do
nearDisembarkPoint = (transports[i]:getPos():getDistanceFrom(targPos) < 10)
if i == #transports and nearDisembarkPoint then
self:deselectUnits()
self:selectUnits(transports)
self:issueOrder(OrderType.EJECT, Vector3:new(0, 0, 0), {}, false)
self.taskForces[arguments.taskForceId].landed = true
return BTNodeResult.SUCCESS
elseif not nearDisembarkPoint then break end
end
if map:getCellId(transports[1]:getPos(), false) == self.spawnPointData[spId + 1].disembarkCellId then
self:deselectUnits()
self:selectUnits(transports)
self:issueOrder(OrderType.EJECT, Vector3:new(0, 0, 0), {}, false)
return BTNodeResult.SUCCESS
elseif transports[1]:getNumOrders() > 0 then return BTNodeResult.RUNNING end
self:issueOrder(OrderType.MOVE, Vector3:new(0, 0, 0), {Target:new(nil, targPos)}, false)
end
self:deselectUnits()
self:selectUnits(transports)
targPos = map:getCell(self.spawnPointData[spId + 1].disembarkCellId).pos
self:issueOrder(OrderType.MOVE, Vector3:new(0, 0, 0), {Target:new(nil, targPos)}, false)
return BTNodeResult.RUNNING
if not tpData.allIdle then return BTNodeResult.RUNNING end
end
function Player:occupySpawnPoint(arguments)
Assets/Scripts/GameObjects/Units/unitData.lua
+2 -2
View File
@@ -1006,7 +1006,7 @@ units = {
health = 500,
buildTime = 1000,
cost = 500,
garrisonCapacity = {2, 2, 2, 2},
garrisonCapacity = {2, 2, 2},
size = {x = 16.5, y = 15.2, z = 45.8},
hitboxOffset = {x = 0, y = 7, z = 0},
lineOfSight = 5,
@@ -1016,7 +1016,7 @@ units = {
meshPath = 'acsTransport.xml',
albedoPath = 'transport.jpg',
selectionSfx = PATH .. 'Sounds/Units/Transports/selection.ogg',
speed = .1,
speed = .6,
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
gameManager.cpp
+8
View File
@@ -17,6 +17,7 @@
#include "player.h"
#include "extractor.h"
#include "factory.h"
#include "vehicle.h"
#include "engineer.h"
#include "destructable.h"
#include "pointDefense.h"
@@ -83,11 +84,18 @@ namespace battleship{
"toStructure", &Unit::toStructure,
"toFactory", &Unit::toFactory,
"toGameObject", &Unit::toGameObject,
"toVehicle", &Unit::toVehicle,
//"toVehicle", [](Unit *u){return (Vehicle*)u;},
"getBuildableUnit", &Unit::getBuildableUnit,
"getBuildableUnits", &Unit::getBuildableUnits,
"getNumBuildableUnits", &Unit::getNumBuildableUnits
);
SOL_LUA_STATE.new_usertype<Vehicle>(
"Engineer", sol::constructors<Vehicle(Player*, int, Vector3, Quaternion, Unit::State)>(),
"getGarrisonable", &Vehicle::getGarrisonable
);
SOL_LUA_STATE.new_usertype<Engineer>(
"Engineer", sol::constructors<Engineer(Player*, int, Vector3, Quaternion, Unit::State)>(),
"getBuildableUnit", &Unit::getBuildableUnit,
unit.h
+2
View File
@@ -30,6 +30,7 @@ namespace battleship{
class Weapon;
class Unit;
class Vehicle;
class Vehicle;
class Structure;
class Factory;
class Cruiser;
@@ -121,6 +122,7 @@ namespace battleship{
int getNumFreeGarrisonSlots();
inline void setState(State s){state = s;}
inline State getState(){return state;}
inline Vehicle* toVehicle(){return (Vehicle*)this;}
inline Engineer* toEngineer(){return (Engineer*)this;}
inline Structure* toStructure(){return (Structure*)this;}
inline Factory* toFactory(){return (Factory*)this;}