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

guiScreen is now an optional property

Browse Source
This commit is contained in:
devZoGok
2024-03-09 14:54:20 +02:00
parent feef91c999
commit 8a885391f9
2 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/GameObjects/Units/unitData.lua
-18
View File
@@ -73,7 +73,6 @@ units = {
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
guiScreen = '',
garrisonCategory = 1
},
{
@@ -97,7 +96,6 @@ units = {
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
guiScreen = '',
garrisonCategory = 2
},
{
@@ -121,7 +119,6 @@ units = {
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
guiScreen = '',
garrisonCategory = 2
},
{
@@ -181,7 +178,6 @@ units = {
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
guiScreen = '',
garrisonCategory = 3
},
{
@@ -206,7 +202,6 @@ units = {
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
guiScreen = '',
garrisonCategory = 3
},
{
@@ -233,7 +228,6 @@ units = {
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
guiScreen = '',
garrisonCategory = 3
},
{
@@ -257,7 +251,6 @@ units = {
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
guiScreen = '',
garrisonCategory = 3
},
{
@@ -282,7 +275,6 @@ units = {
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
guiScreen = '',
garrisonCategory = 3
},
{
@@ -306,7 +298,6 @@ units = {
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
guiScreen = '',
garrisonCategory = 3
},
{
@@ -330,7 +321,6 @@ units = {
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
guiScreen = '',
garrisonCategory = 3
},
{
@@ -353,7 +343,6 @@ units = {
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
guiScreen = '',
garrisonCategory = 3
},
{
@@ -385,7 +374,6 @@ units = {
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
guiScreen = '',
garrisonCategory = 3
},
{
@@ -424,7 +412,6 @@ units = {
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
guiScreen = '',
garrisonCategory = 3
},
{
@@ -456,7 +443,6 @@ units = {
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
guiScreen = '',
garrisonCategory = 3
},
{
@@ -513,7 +499,6 @@ units = {
basePath = PATH .. structurePrefix .. 'Markets/',
meshPath = 'market.xml',
selectionSfx = PATH .. 'Sounds/Units/Sample/selection.ogg',
guiScreen = '',
deathSfx = PATH .. 'Sounds/SFX/Explosions/explosion01.ogg',
},
{
@@ -551,7 +536,6 @@ units = {
basePath = PATH .. structurePrefix .. 'PointDefenses/',
meshPath = 'pointDefense.xml',
selectionSfx = PATH .. 'Sounds/Units/Sample/selection.ogg',
guiScreen = '',
deathSfx = PATH .. 'Sounds/SFX/Explosions/explosion01.ogg',
},
{
@@ -570,7 +554,6 @@ units = {
basePath = PATH .. structurePrefix .. 'Extractors/',
meshPath = 'extractor.xml',
selectionSfx = PATH .. 'Sounds/Units/Sample/selection.ogg',
guiScreen = '',
deathSfx = PATH .. 'Sounds/SFX/Explosions/explosion01.ogg',
},
{
@@ -586,7 +569,6 @@ units = {
name = 'Refinery',
basePath = PATH .. structurePrefix .. 'Refineries/',
meshPath = 'refinery.xml',
guiScreen = '',
selectionSfx = PATH .. 'Sounds/Units/Sample/selection.ogg',
deathSfx = PATH .. 'Sounds/SFX/Explosions/explosion01.ogg',
},
unit.cpp
+4 -1
View File
@@ -141,7 +141,10 @@ namespace battleship{
lineOfSight = unitTable["lineOfSight"]; lineOfSight += game->calcAbilFromTech(Ability::Type::LINE_OF_SIGHT, currTechs, (int)GameObject::type, id);
unitClass = (UnitClass)unitTable["unitClass"];
type = (UnitType)unitTable["unitType"];
guiScreen = unitTable["guiScreen"];
string gsk = "guiScreen";
sol::optional<string> nameOpt = unitTable[gsk];
guiScreen = (nameOpt != sol::nullopt ? (string)unitTable[gsk] : "");
string tblName = "garrisonCapacity";
sol::optional<sol::table> gc = unitTable[tblName];