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

checking if appropriate FX are defined

Browse Source
This commit is contained in:
devZoGok
2025-06-08 11:07:56 +03:00
parent 44a22ab98e
commit 9743563649
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/GameObjects/Units/unitData.lua
+1 -1
View File
@@ -99,7 +99,7 @@ units = {
{
orderType = OrderType.ATTACK,
rateOfFire = 100,
maxRange = 10,
maxRange = 14,
damage = 50,
fireFx = {
{
weapon.cpp
+8 -5
View File
@@ -190,17 +190,20 @@ namespace battleship{
if(projId == -1){
sol::table weaponTbl = generateView()["units"][unit->getId() + 1]["weapons"][id + 1];
FxManager *fxManager = FxManager::getSingleton();
string fxKey = "unitHitFx";
if(targetUnit){
if(targetUnit)
updateTargetUnit(targetUnit);
useFx(fxManager->initFx(weaponTbl["unitHitFx"], unit->getModel(), false), targPos, false);
}
else{
Map *map = Map::getSingleton();
Map::Cell::Type cellType = map->getCells()[map->getCellId(targPos)].type;
string fxKey = (cellType == Map::Cell::Type::LAND ? "landHitFx" : "waterHitFx");
useFx(fxManager->initFx(weaponTbl[fxKey], unit->getModel(), false), targPos, false);
fxKey = (cellType == Map::Cell::Type::LAND ? "landHitFx" : "waterHitFx");
}
sol::optional<sol::table> hitFxOpt = weaponTbl[fxKey];
if(hitFxOpt != sol::nullopt && ((sol::table)weaponTbl[fxKey]).size() > 0)
useFx(fxManager->initFx(weaponTbl[fxKey], unit->getModel(), false), targPos, false);
}
else{
Quaternion r = projPar->localToGlobalOrientation(projRot);