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

using supply icon when hovering over to buildings to transfer resources to/from

Browse Source
This commit is contained in:
devZoGok
2025-04-19 15:53:27 +03:00
parent d29d5fdfa5
commit 50c5f7842d
2 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
activeGameState.cpp
+42 -17
View File
@@ -30,6 +30,7 @@
#include "unitButton.h"
#include "extractor.h"
#include "resourceDeposit.h"
#include "resourceRover.h"
#include "concreteGuiManager.h"
using namespace vb01;
@@ -133,7 +134,8 @@ namespace battleship{
cursorNode->setPosition(Vector3(cursorPos.x, cursorPos.y, .8));
if(mainPlayer->getNumSelectedUnits() > 0){
bool ownGameObj = (gameObjHoveredOn && gameObjHoveredOn->getPlayer()->getTeam() == mainPlayer->getTeam());
bool ownGameObj = (gameObjHoveredOn && gameObjHoveredOn->getPlayer() == mainPlayer);
bool alliedGameObj = (gameObjHoveredOn && !ownGameObj && gameObjHoveredOn->getPlayer()->getTeam() == mainPlayer->getTeam());
bool gameObjUnit = (gameObjHoveredOn && gameObjHoveredOn->getType() == GameObject::Type::UNIT);
bool gameObjTransport = (gameObjUnit && ((Unit*)gameObjHoveredOn)->getNumGarrisonSlots() > 0);
bool canGarrison = true;
@@ -145,27 +147,50 @@ namespace battleship{
break;
}
bool supply = (
gameObjUnit &&
(
(
((Unit*)gameObjHoveredOn)->getUnitClass() == UnitClass::EXTRACTOR &&
((Extractor*)gameObjHoveredOn)->getDeposit()->getAmmount()
) |
((Unit*)gameObjHoveredOn)->getUnitClass() == UnitClass::TRADE_CENTER |
((Unit*)gameObjHoveredOn)->getUnitClass() == UnitClass::REFINERY |
((Unit*)gameObjHoveredOn)->getUnitClass() == UnitClass::LAB
) &&
mainPlayer->getSelectedUnit(0)->getUnitClass() == UnitClass::RESOURCE_ROVER
);
vector<TradeOffer*> offers = (gameObjHoveredOn && alliedGameObj ? mainPlayer->getTradeOffers(gameObjHoveredOn->getPlayer()) : vector<TradeOffer*>{});
bool sellRefs = false, sellWealth = false, sellTech = false;
for(TradeOffer *offer : offers){
if(!sellRefs && offer->sellRefineds > 0) sellRefs = true;
if(!sellWealth && offer->sellWealth > 0) sellWealth = true;
if(!sellTech && offer->sellResearch > 0) sellTech = true;
if(sellRefs && sellWealth && sellTech) break;
}
int objClass = (gameObjUnit ? int(((Unit*)gameObjHoveredOn)->getUnitClass()) : -1);
bool tradeCenter = ((UnitClass)objClass == UnitClass::TRADE_CENTER);
bool refinery = ((UnitClass)objClass == UnitClass::REFINERY);
bool lab = ((UnitClass)objClass == UnitClass::LAB);
bool ownExtractor = (ownGameObj && (UnitClass)objClass == UnitClass::EXTRACTOR);
bool roverSelected = (mainPlayer->getSelectedUnit(0)->getUnitClass() == UnitClass::RESOURCE_ROVER);
ResourceRover *rover = (roverSelected ? (ResourceRover*)mainPlayer->getSelectedUnit(0) : nullptr);
if(!forceCursorState){
if(gameObjUnit && gameObjTransport){
orderPossible = (ownGameObj && canGarrison);
cursorState = CursorState::GARRISON;
}
else if(supply){
orderPossible = ownGameObj;
else if(roverSelected && ownExtractor){
orderPossible = (((Extractor*)gameObjHoveredOn)->getDeposit()->getAmmount() > 0);
cursorState = CursorState::SUPPLY;
}
else if(roverSelected && (tradeCenter || refinery || lab) && (ownGameObj || (alliedGameObj && (sellRefs || sellWealth || sellTech)))){
bool canLoad = (rover && rover->calcTotalLoad() < rover->getCapacity());
switch((UnitClass)objClass){
case UnitClass::TRADE_CENTER:
orderPossible = ((ownGameObj && canLoad) || (alliedGameObj && sellWealth && rover->getLoad((int)ResourceType::WEALTH) > 0));
break;
case UnitClass::REFINERY:
orderPossible = ((ownGameObj && canLoad) || (alliedGameObj && sellRefs && rover->getLoad((int)ResourceType::REFINEDS) > 0));
break;
case UnitClass::LAB:
orderPossible = ((ownGameObj && canLoad) || (alliedGameObj && sellTech && rover->getLoad((int)ResourceType::RESEARCH) > 0));
break;
}
cursorState = CursorState::SUPPLY;
}
else if(gameObjUnit && !ownGameObj)
@@ -177,7 +202,7 @@ namespace battleship{
if(cursorState == CursorState::GARRISON)
orderPossible = (ownGameObj && gameObjTransport && canGarrison);
else if(cursorState == CursorState::SUPPLY)
orderPossible = (ownGameObj && supply);
orderPossible = (roverSelected && (ownExtractor));
else if(cursorState == CursorState::HACK)
orderPossible = (!ownGameObj && gameObjUnit && mainPlayer->getSelectedUnit(0)->getUnitClass() == UnitClass::ENGINEER);
else if(gameObjUnit)
resourceRover.h
+3 -1
View File
@@ -14,6 +14,9 @@ namespace battleship{
ResourceRover(Player*, int, vb01::Vector3, vb01::Quaternion, Unit::State = Unit::State::STAND_GROUND);
~ResourceRover();
void update();
inline int getLoad(int id){return load[id];}
inline int calcTotalLoad(){return load[0] + load[1] + load[2];}
inline int getCapacity(){return capacity;}
private:
void initProperties();
void supply(Order);
@@ -22,7 +25,6 @@ namespace battleship{
Unit* getClosestUnit(std::vector<Structure*>);
inline bool canLoad(){return vb01::getTime() - lastLoadTime > loadRate && calcTotalLoad() < capacity;}
inline bool canUnload(int id){return vb01::getTime() - lastLoadTime > loadRate && load[id] > 0;}
inline int calcTotalLoad(){return load[0] + load[1] + load[2];}
vb01::s64 lastLoadTime = 0;
int load[3]{0, 0, 0}, capacity, loadRate, loadSpeed;