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

Merge pull request #251 from devZoGok/develop

Browse Source 
Develop
This commit is contained in:
devZoGok
2026-05-26 16:58:04 +00:00
committed by GitHub
parent 02f78a7bf5 2ad584fc79
commit 0c0ad4566e
75 changed files with 96 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/GameObjects/Units/unitData.lua
+88 -88
View File
@@ -703,13 +703,13 @@ units = {
},
{
buildableUnits = {
{id = UnitId.ACS_LAND_FACTORY, buildable = true, trigger = 76},
{id = UnitId.ACS_NAVAL_FACTORY, buildable = true, trigger = 78},
{id = UnitId.ACS_TRADE_CENTER, buildable = true, trigger = 77},
{id = UnitId.ACS_LAB, buildable = true, trigger = 84},
{id = UnitId.ACS_REFINERY, buildable = true, trigger = 82},
{id = UnitId.POINT_DEFENSE, buildable = true, trigger = 80},
{id = UnitId.EXTRACTOR, buildable = true, trigger = 69},
{id = UnitId.ACS_LAND_FACTORY, iconPath = 'Icons/Buttons/GameObjects/acsLandFactory.png', buildable = true, trigger = 76},
{id = UnitId.ACS_NAVAL_FACTORY, iconPath = 'Icons/Buttons/GameObjects/acsNavalFactory.png', buildable = true, trigger = 78},
{id = UnitId.ACS_TRADE_CENTER, iconPath = 'Icons/Buttons/GameObjects/acsTradeCenter.png', buildable = true, trigger = 77},
{id = UnitId.ACS_LAB, iconPath = 'Icons/Buttons/GameObjects/acsLab.png', buildable = true, trigger = 84},
{id = UnitId.ACS_REFINERY, iconPath = 'Icons/Buttons/GameObjects/acsRefinery.png', buildable = true, trigger = 82},
{id = UnitId.POINT_DEFENSE, iconPath = 'Icons/Buttons/GameObjects/pointDefense.png', buildable = true, trigger = 80},
{id = UnitId.EXTRACTOR, iconPath = 'Icons/Buttons/GameObjects/extractor.png', buildable = true, trigger = 69},
},
unitClass = UnitClass.ROBO_ENGINEER,
unitType = UnitType.HOVER,
@@ -723,7 +723,7 @@ units = {
cost = 500,
size = {x = 2.43, y = 2.43, z = 2.47},
hitboxOffset = {x = 0, y = 1.21, z = 0},
lineOfSight = 150,
lineOfSight = 200,
name = 'Engineer',
basePath = PATH .. vehiclePrefix .. 'Engineers/',
albedoPath = 'engineer.jpg',
@@ -747,13 +747,13 @@ units = {
}
},
buildableUnits = {
{id = UnitId.ACS_LAND_FACTORY, buildable = true, trigger = 76},
{id = UnitId.ACS_NAVAL_FACTORY, buildable = true, trigger = 78},
{id = UnitId.ACS_TRADE_CENTER, buildable = true, trigger = 77},
{id = UnitId.ACS_LAB, buildable = true, trigger = 84},
{id = UnitId.ACS_REFINERY, buildable = true, trigger = 82},
{id = UnitId.POINT_DEFENSE, buildable = true, trigger = 80},
{id = UnitId.EXTRACTOR, buildable = true, trigger = 69},
{id = UnitId.ACS_LAND_FACTORY, iconPath = 'Icons/Buttons/GameObjects/acsLandFactory.png', buildable = true, trigger = 76},
{id = UnitId.ACS_NAVAL_FACTORY, iconPath = 'Icons/Buttons/GameObjects/acsNavalFactory.png', buildable = true, trigger = 78},
{id = UnitId.ACS_TRADE_CENTER, iconPath = 'Icons/Buttons/GameObjects/acsTradeCenter.png', buildable = true, trigger = 77},
{id = UnitId.ACS_LAB, iconPath = 'Icons/Buttons/GameObjects/acsLab.png', buildable = true, trigger = 84},
{id = UnitId.ACS_REFINERY, iconPath = 'Icons/Buttons/GameObjects/acsRefinery.png', buildable = true, trigger = 82},
{id = UnitId.POINT_DEFENSE, iconPath = 'Icons/Buttons/GameObjects/pointDefense.png', buildable = true, trigger = 80},
{id = UnitId.EXTRACTOR, iconPath = 'Icons/Buttons/GameObjects/extractor.png', buildable = true, trigger = 69},
},
abilityButtons = {{buttonType = ButtonType.ORDER, name = 'Hack', orderType = OrderType.HACK}},
unitClass = UnitClass.CYBORG_ENGINEER,
@@ -768,7 +768,7 @@ units = {
cost = 500,
size = {x = 4.95, y = 6.59, z = 4.11},
hitboxOffset = {x = .178, y = 3.27, z = 0},
lineOfSight = 1500,
lineOfSight = 150,
name = 'Engineer',
basePath = PATH .. vehiclePrefix .. 'Engineers/',
albedoPath = 'engineer.jpg',
@@ -784,13 +784,13 @@ units = {
},
{
buildableUnits = {
{id = UnitId.AINC_LAND_FACTORY, buildable = true, trigger = 76},
{id = UnitId.AINC_NAVAL_FACTORY, buildable = true, trigger = 78},
{id = UnitId.AINC_TRADE_CENTER, buildable = true, trigger = 77},
{id = UnitId.AINC_LAB, buildable = true, trigger = 84},
{id = UnitId.AINC_REFINERY, buildable = true, trigger = 82},
{id = UnitId.POINT_DEFENSE, buildable = true, trigger = 80},
{id = UnitId.EXTRACTOR, buildable = true, trigger = 69},
{id = UnitId.AINC_LAND_FACTORY, iconPath = 'Icons/Buttons/GameObjects/aincLandFactory.png', buildable = true, trigger = 76},
{id = UnitId.AINC_NAVAL_FACTORY, iconPath = 'Icons/Buttons/GameObjects/aincNavalFactory.png', buildable = true, trigger = 78},
{id = UnitId.AINC_TRADE_CENTER, iconPath = 'Icons/Buttons/GameObjects/aincTradeCenter.png', buildable = true, trigger = 77},
{id = UnitId.AINC_LAB, iconPath = 'Icons/Buttons/GameObjects/aincLab.png', buildable = true, trigger = 84},
{id = UnitId.AINC_REFINERY, iconPath = 'Icons/Buttons/GameObjects/aincRefinery.png', buildable = true, trigger = 82},
{id = UnitId.POINT_DEFENSE, iconPath = 'Icons/Buttons/GameObjects/pointDefense.png', buildable = true, trigger = 80},
{id = UnitId.EXTRACTOR, iconPath = 'Icons/Buttons/GameObjects/extractor.png', buildable = true, trigger = 69},
},
unitClass = UnitClass.ROBO_ENGINEER,
unitType = UnitType.HOVER,
@@ -828,13 +828,13 @@ units = {
}
},
buildableUnits = {
{id = UnitId.AINC_LAND_FACTORY, buildable = true, trigger = 76},
{id = UnitId.AINC_NAVAL_FACTORY, buildable = true, trigger = 78},
{id = UnitId.AINC_TRADE_CENTER, buildable = true, trigger = 77},
{id = UnitId.AINC_LAB, buildable = true, trigger = 84},
{id = UnitId.AINC_REFINERY, buildable = true, trigger = 82},
{id = UnitId.POINT_DEFENSE, buildable = true, trigger = 80},
{id = UnitId.EXTRACTOR, buildable = true, trigger = 69},
{id = UnitId.AINC_LAND_FACTORY, iconPath = 'Icons/Buttons/GameObjects/aincLandFactory.png', buildable = true, trigger = 76},
{id = UnitId.AINC_NAVAL_FACTORY, iconPath = 'Icons/Buttons/GameObjects/aincNavalFactory.png', buildable = true, trigger = 78},
{id = UnitId.AINC_TRADE_CENTER, iconPath = 'Icons/Buttons/GameObjects/aincTradeCenter.png', buildable = true, trigger = 77},
{id = UnitId.AINC_LAB, iconPath = 'Icons/Buttons/GameObjects/aincLab.png', buildable = true, trigger = 84},
{id = UnitId.AINC_REFINERY, iconPath = 'Icons/Buttons/GameObjects/aincRefinery.png', buildable = true, trigger = 82},
{id = UnitId.POINT_DEFENSE, iconPath = 'Icons/Buttons/GameObjects/pointDefense.png', buildable = true, trigger = 80},
{id = UnitId.EXTRACTOR, iconPath = 'Icons/Buttons/GameObjects/extractor.png', buildable = true, trigger = 69},
},
abilityButtons = {{buttonType = ButtonType.ORDER, name = 'Hack', orderType = OrderType.HACK}},
unitClass = UnitClass.CYBORG_ENGINEER,
@@ -865,13 +865,13 @@ units = {
},
{
buildableUnits = {
{id = UnitId.ER_LAND_FACTORY, buildable = true, trigger = 76},
{id = UnitId.ER_NAVAL_FACTORY, buildable = true, trigger = 78},
{id = UnitId.ER_TRADE_CENTER, buildable = true, trigger = 77},
{id = UnitId.ER_LAB, buildable = true, trigger = 84},
{id = UnitId.ER_REFINERY, buildable = true, trigger = 82},
{id = UnitId.POINT_DEFENSE, buildable = true, trigger = 80},
{id = UnitId.EXTRACTOR, buildable = true, trigger = 69},
{id = UnitId.ER_LAND_FACTORY, iconPath = 'Icons/Buttons/GameObjects/erLandFactory.png', buildable = true, trigger = 76},
{id = UnitId.ER_NAVAL_FACTORY, iconPath = 'Icons/Buttons/GameObjects/erNavalFactory.png', buildable = true, trigger = 78},
{id = UnitId.ER_TRADE_CENTER, iconPath = 'Icons/Buttons/GameObjects/erTradeCenter.png', buildable = true, trigger = 77},
{id = UnitId.ER_LAB, iconPath = 'Icons/Buttons/GameObjects/erLab.png', buildable = true, trigger = 84},
{id = UnitId.ER_REFINERY, iconPath = 'Icons/Buttons/GameObjects/erRefinery.png', buildable = true, trigger = 82},
{id = UnitId.POINT_DEFENSE, iconPath = 'Icons/Buttons/GameObjects/pointDefense.png', buildable = true, trigger = 80},
{id = UnitId.EXTRACTOR, iconPath = 'Icons/Buttons/GameObjects/extractor.png', buildable = true, trigger = 69},
},
unitClass = UnitClass.ROBO_ENGINEER,
unitType = UnitType.HOVER,
@@ -909,13 +909,13 @@ units = {
}
},
buildableUnits = {
{id = UnitId.ER_LAND_FACTORY, buildable = true, trigger = 76},
{id = UnitId.ER_NAVAL_FACTORY, buildable = true, trigger = 78},
{id = UnitId.ER_TRADE_CENTER, buildable = true, trigger = 77},
{id = UnitId.ER_LAB, buildable = true, trigger = 84},
{id = UnitId.ER_REFINERY, buildable = true, trigger = 82},
{id = UnitId.POINT_DEFENSE, buildable = true, trigger = 80},
{id = UnitId.EXTRACTOR, buildable = true, trigger = 69},
{id = UnitId.ER_LAND_FACTORY, iconPath = 'Icons/Buttons/GameObjects/erLandFactory.png', buildable = true, trigger = 76},
{id = UnitId.ER_NAVAL_FACTORY, iconPath = 'Icons/Buttons/GameObjects/erNavalFactory.png', buildable = true, trigger = 78},
{id = UnitId.ER_TRADE_CENTER, iconPath = 'Icons/Buttons/GameObjects/erTradeCenter.png', buildable = true, trigger = 77},
{id = UnitId.ER_LAB, iconPath = 'Icons/Buttons/GameObjects/erLab.png', buildable = true, trigger = 84},
{id = UnitId.ER_REFINERY, iconPath = 'Icons/Buttons/GameObjects/erRefinery.png', buildable = true, trigger = 82},
{id = UnitId.POINT_DEFENSE, iconPath = 'Icons/Buttons/GameObjects/pointDefense.png', buildable = true, trigger = 80},
{id = UnitId.EXTRACTOR, iconPath = 'Icons/Buttons/GameObjects/extractor.png', buildable = true, trigger = 69},
},
abilityButtons = {{buttonType = ButtonType.ORDER, name = 'Hack', orderType = OrderType.HACK}},
unitClass = UnitClass.CYBORG_ENGINEER,
@@ -2430,12 +2430,12 @@ units = {
},
{
buildableUnits = {
{id = UnitId.ACS_MECH, buildable = true, trigger = 87},
{id = UnitId.ACS_TANK, buildable = true, trigger = 84},
{id = UnitId.ACS_ARTILLERY, buildable = true, trigger = 65},
{id = UnitId.ACS_CARGO_SHIP, buildable = true, trigger = 82},
{id = UnitId.ACS_ROBO_ENGINEER, buildable = true, trigger = 85},
{id = UnitId.ACS_CYBORG_ENGINEER, buildable = true, trigger = 86}
{id = UnitId.ACS_MECH, iconPath = 'Icons/Buttons/GameObjects/acsMech.png', buildable = true, trigger = 87},
{id = UnitId.ACS_TANK, iconPath = 'Icons/Buttons/GameObjects/acsTank.png', buildable = true, trigger = 84},
{id = UnitId.ACS_ARTILLERY, iconPath = 'Icons/Buttons/GameObjects/acsArtillery.png', buildable = true, trigger = 65},
{id = UnitId.ACS_CARGO_SHIP, iconPath = 'Icons/Buttons/GameObjects/cargoship.png', buildable = true, trigger = 82},
{id = UnitId.ACS_ROBO_ENGINEER, iconPath = 'Icons/Buttons/GameObjects/acsRoboEngineer.png', buildable = true, trigger = 85},
{id = UnitId.ACS_CYBORG_ENGINEER, iconPath = 'Icons/Buttons/GameObjects/acsCyborgEngineer.png', buildable = true, trigger = 86}
},
unitClass = UnitClass.LAND_FACTORY,
unitType = UnitType.LAND,
@@ -2457,12 +2457,12 @@ units = {
},
{
buildableUnits = {
{id = UnitId.AINC_MECH, buildable = true, trigger = 87},
{id = UnitId.AINC_TANK, buildable = true, trigger = 84},
{id = UnitId.AINC_ARTILLERY, buildable = true, trigger = 65},
{id = UnitId.AINC_CARGO_SHIP, buildable = true, trigger = 82},
{id = UnitId.AINC_ROBO_ENGINEER, buildable = true, trigger = 85},
{id = UnitId.AINC_CYBORG_ENGINEER, buildable = true, trigger = 86}
{id = UnitId.AINC_MECH, iconPath = 'Icons/Buttons/GameObjects/aincMech.png', buildable = true, trigger = 87},
{id = UnitId.AINC_TANK, iconPath = 'Icons/Buttons/GameObjects/aincTank.png', buildable = true, trigger = 84},
{id = UnitId.AINC_ARTILLERY, iconPath = 'Icons/Buttons/GameObjects/aincArtillery.png', buildable = true, trigger = 65},
{id = UnitId.AINC_CARGO_SHIP, iconPath = 'Icons/Buttons/GameObjects/cargoship.png', buildable = true, trigger = 82},
{id = UnitId.AINC_ROBO_ENGINEER, iconPath = 'Icons/Buttons/GameObjects/aincRoboEngineer.png', buildable = true, trigger = 85},
{id = UnitId.AINC_CYBORG_ENGINEER, iconPath = 'Icons/Buttons/GameObjects/aincCyborgEngineer.png', buildable = true, trigger = 86}
},
unitClass = UnitClass.LAND_FACTORY,
unitType = UnitType.LAND,
@@ -2484,12 +2484,12 @@ units = {
},
{
buildableUnits = {
{id = UnitId.ER_MECH, buildable = true, trigger = 87},
{id = UnitId.ER_TANK, buildable = true, trigger = 84},
{id = UnitId.ER_ARTILLERY, buildable = true, trigger = 65},
{id = UnitId.ER_CARGO_SHIP, buildable = true, trigger = 82},
{id = UnitId.ER_ROBO_ENGINEER, buildable = true, trigger = 85},
{id = UnitId.ER_CYBORG_ENGINEER, buildable = true, trigger = 86}
{id = UnitId.ER_MECH, iconPath = 'Icons/Buttons/GameObjects/erMech.png', buildable = true, trigger = 87},
{id = UnitId.ER_TANK, iconPath = 'Icons/Buttons/GameObjects/erTank.png', buildable = true, trigger = 84},
{id = UnitId.ER_ARTILLERY, iconPath = 'Icons/Buttons/GameObjects/erArtillery.png', buildable = true, trigger = 65},
{id = UnitId.ER_CARGO_SHIP, iconPath = 'Icons/Buttons/GameObjects/cargoship.png', buildable = true, trigger = 82},
{id = UnitId.ER_ROBO_ENGINEER, iconPath = 'Icons/Buttons/GameObjects/erRoboEngineer.png', buildable = true, trigger = 85},
{id = UnitId.ER_CYBORG_ENGINEER, iconPath = 'Icons/Buttons/GameObjects/erCyborgEngineer.png', buildable = true, trigger = 86}
},
unitClass = UnitClass.LAND_FACTORY,
unitType = UnitType.LAND,
@@ -2511,14 +2511,14 @@ units = {
},
{
buildableUnits = {
{id = UnitId.ACS_ASSAULT_CRUISER, buildable = true, trigger = 76},
{id = UnitId.ACS_ANTI_SUB_CRUISER, buildable = true, trigger = 78},
{id = UnitId.ACS_MISSILE_SUBMARINE, buildable = true, trigger = 77},
{id = UnitId.ACS_SUBMARINE, buildable = true, trigger = 84},
{id = UnitId.ACS_CARGO_SHIP, buildable = true, trigger = 80},
{id = UnitId.ACS_ROBO_ENGINEER, buildable = true, trigger = 82},
{id = UnitId.ACS_ICEBREAKER, buildable = true, trigger = 69},
{id = UnitId.ACS_TRANSPORT, buildable = true, trigger = 70},
{id = UnitId.ACS_ASSAULT_CRUISER, iconPath = 'Icons/Buttons/GameObjects/heavyAssaultCruiser.png', buildable = true, trigger = 76},
{id = UnitId.ACS_ANTI_SUB_CRUISER, iconPath = 'Icons/Buttons/GameObjects/acsAntiSubCruiser.png', buildable = true, trigger = 78},
{id = UnitId.ACS_MISSILE_SUBMARINE, iconPath = 'Icons/Buttons/GameObjects/acsMissileSubmarine.png', buildable = true, trigger = 77},
{id = UnitId.ACS_SUBMARINE, iconPath = 'Icons/Buttons/GameObjects/acsSubmarine.png', buildable = true, trigger = 84},
{id = UnitId.ACS_CARGO_SHIP, iconPath = 'Icons/Buttons/GameObjects/cargoship.png', buildable = true, trigger = 80},
{id = UnitId.ACS_ICEBREAKER, iconPath = 'Icons/Buttons/GameObjects/acsIcebreaker.png', buildable = true, trigger = 69},
{id = UnitId.ACS_ROBO_ENGINEER, iconPath = 'Icons/Buttons/GameObjects/acsRoboEngineer.png', buildable = true, trigger = 82},
{id = UnitId.ACS_TRANSPORT, iconPath = 'Icons/Buttons/GameObjects/acsTransport.png', buildable = true, trigger = 70},
},
unitClass = UnitClass.NAVAL_FACTORY,
unitType = UnitType.SEA_LEVEL,
@@ -2539,14 +2539,14 @@ units = {
},
{
buildableUnits = {
{id = UnitId.AINC_ASSAULT_CRUISER, buildable = true, trigger = 76},
{id = UnitId.AINC_ANTI_SUB_CRUISER, buildable = true, trigger = 78},
{id = UnitId.AINC_MISSILE_SUBMARINE, buildable = true, trigger = 77},
{id = UnitId.AINC_SUBMARINE, buildable = true, trigger = 84},
{id = UnitId.AINC_CARGO_SHIP, buildable = true, trigger = 80},
{id = UnitId.AINC_ICEBREAKER, buildable = true, trigger = 69},
{id = UnitId.AINC_ROBO_ENGINEER, buildable = true, trigger = 82},
{id = UnitId.AINC_TRANSPORT, buildable = true, trigger = 70},
{id = UnitId.AINC_ASSAULT_CRUISER, iconPath = 'Icons/Buttons/GameObjects/mediumAssaultCruiser.png', buildable = true, trigger = 76},
{id = UnitId.AINC_ANTI_SUB_CRUISER, iconPath = 'Icons/Buttons/GameObjects/aincAntiSubCruiser.png', buildable = true, trigger = 78},
{id = UnitId.AINC_MISSILE_SUBMARINE, iconPath = 'Icons/Buttons/GameObjects/aincMissileSubmarine.png', buildable = true, trigger = 77},
{id = UnitId.AINC_SUBMARINE, iconPath = 'Icons/Buttons/GameObjects/aincSubmarine.png', buildable = true, trigger = 84},
{id = UnitId.AINC_CARGO_SHIP, iconPath = 'Icons/Buttons/GameObjects/cargoship.png', buildable = true, trigger = 80},
{id = UnitId.AINC_ICEBREAKER, iconPath = 'Icons/Buttons/GameObjects/aincIcebreaker.png', buildable = true, trigger = 69},
{id = UnitId.AINC_ROBO_ENGINEER, iconPath = 'Icons/Buttons/GameObjects/aincRoboEngineer.png', buildable = true, trigger = 82},
{id = UnitId.AINC_TRANSPORT, iconPath = 'Icons/Buttons/GameObjects/aincTransport.png', buildable = true, trigger = 70},
},
unitClass = UnitClass.NAVAL_FACTORY,
unitType = UnitType.SEA_LEVEL,
@@ -2567,16 +2567,16 @@ units = {
},
{
buildableUnits = {
{id = UnitId.ER_ASSAULT_CRUISER, buildable = true, trigger = 76},
{id = UnitId.ER_ANTI_SUB_CRUISER, buildable = true, trigger = 78},
{id = UnitId.ER_MISSILE_SUBMARINE, buildable = true, trigger = 77},
{id = UnitId.ER_SUBMARINE, buildable = true, trigger = 84},
{id = UnitId.ER_CARGO_SHIP, buildable = true, trigger = 80},
{id = UnitId.ER_ICEBREAKER, buildable = true, trigger = 69},
{id = UnitId.EMP_BOAT, buildable = true, trigger = 81},
{id = UnitId.FREEZER, buildable = true, trigger = 83},
{id = UnitId.ER_ROBO_ENGINEER, buildable = true, trigger = 82},
{id = UnitId.ER_TRANSPORT, buildable = true, trigger = 70},
{id = UnitId.ER_ASSAULT_CRUISER, iconPath = 'Icons/Buttons/GameObjects/lightAssaultCruiser.png', buildable = true, trigger = 76},
{id = UnitId.ER_ANTI_SUB_CRUISER, iconPath = 'Icons/Buttons/GameObjects/erAntiSubCruiser.png', buildable = true, trigger = 78},
{id = UnitId.ER_MISSILE_SUBMARINE, iconPath = 'Icons/Buttons/GameObjects/erMissileSubmarine.png', buildable = true, trigger = 77},
{id = UnitId.ER_SUBMARINE, iconPath = 'Icons/Buttons/GameObjects/erSubmarine.png', buildable = true, trigger = 84},
{id = UnitId.ER_CARGO_SHIP, iconPath = 'Icons/Buttons/GameObjects/cargoship.png', buildable = true, trigger = 80},
{id = UnitId.ER_ICEBREAKER, iconPath = 'Icons/Buttons/GameObjects/erIcebreaker.png', buildable = true, trigger = 69},
{id = UnitId.EMP_BOAT, iconPath = 'Icons/Buttons/GameObjects/empShip.png', buildable = true, trigger = 81},
{id = UnitId.FREEZER, iconPath = 'Icons/Buttons/GameObjects/freezer.png', buildable = true, trigger = 83},
{id = UnitId.ER_ROBO_ENGINEER, iconPath = 'Icons/Buttons/GameObjects/erRoboEngineer.png', buildable = true, trigger = 82},
{id = UnitId.ER_TRANSPORT, iconPath = 'Icons/Buttons/GameObjects/erTransport.png', buildable = true, trigger = 70},
},
unitClass = UnitClass.NAVAL_FACTORY,
unitType = UnitType.SEA_LEVEL,
Assets/Scripts/Gui/unitGui.lua
+1
View File
@@ -93,6 +93,7 @@ function generateGui(unitId)
buttonType = (mainUnit.isVehicle and ButtonType.BUILD or ButtonType.TRAIN),
factoryId = (isFactory and unitId or nil),
engineerId = (isEng and unitId or nil),
imagePath = buildUnit.iconPath,
slotId = (ButtonType.BUILD and i - 1 or nil)
}
gui[#gui + 1] = generateButton(#gui, buttonData)
Assets/Textures/Icons/Buttons/GameObjects/acsAntiSubCruiser.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.7 KiB

Assets/Textures/Icons/Buttons/GameObjects/acsArtillery.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

Assets/Textures/Icons/Buttons/GameObjects/acsCyborgEngineer.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

Assets/Textures/Icons/Buttons/GameObjects/acsIcebreaker.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

Assets/Textures/Icons/Buttons/GameObjects/acsLab.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

Assets/Textures/Icons/Buttons/GameObjects/acsLandFactory.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

Assets/Textures/Icons/Buttons/GameObjects/acsMech.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

Assets/Textures/Icons/Buttons/GameObjects/acsMissileSubmarine.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

Assets/Textures/Icons/Buttons/GameObjects/acsNavalFactory.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

Assets/Textures/Icons/Buttons/GameObjects/acsRefinery.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

Assets/Textures/Icons/Buttons/GameObjects/acsRoboEngineer.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

Assets/Textures/Icons/Buttons/GameObjects/acsSubmarine.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

Assets/Textures/Icons/Buttons/GameObjects/acsTank.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.7 KiB

Assets/Textures/Icons/Buttons/GameObjects/acsTradeCenter.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

Assets/Textures/Icons/Buttons/GameObjects/acsTransport.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

Assets/Textures/Icons/Buttons/GameObjects/aincAntiSubCruiser.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.9 KiB

Assets/Textures/Icons/Buttons/GameObjects/aincArtillery.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.9 KiB

Assets/Textures/Icons/Buttons/GameObjects/aincCyborgEngineer.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

Assets/Textures/Icons/Buttons/GameObjects/aincIcebreaker.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

Assets/Textures/Icons/Buttons/GameObjects/aincLab.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

Assets/Textures/Icons/Buttons/GameObjects/aincLandFactory.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

Assets/Textures/Icons/Buttons/GameObjects/aincMech.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

Assets/Textures/Icons/Buttons/GameObjects/aincMissileSubmarine.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

Assets/Textures/Icons/Buttons/GameObjects/aincNavalFactory.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

Assets/Textures/Icons/Buttons/GameObjects/aincRefinery.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

Assets/Textures/Icons/Buttons/GameObjects/aincRoboEngineer.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.8 KiB

Assets/Textures/Icons/Buttons/GameObjects/aincSubmarine.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

Assets/Textures/Icons/Buttons/GameObjects/aincTank.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

Assets/Textures/Icons/Buttons/GameObjects/aincTradeCenter.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

Assets/Textures/Icons/Buttons/GameObjects/aincTransport.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

Assets/Textures/Icons/Buttons/GameObjects/cargoship.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

Assets/Textures/Icons/Buttons/GameObjects/empShip.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

Assets/Textures/Icons/Buttons/GameObjects/erAntiSubCruiser.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.7 KiB

Assets/Textures/Icons/Buttons/GameObjects/erArtillery.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

Assets/Textures/Icons/Buttons/GameObjects/erCyborgEngineer.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

Assets/Textures/Icons/Buttons/GameObjects/erIcebreaker.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

Assets/Textures/Icons/Buttons/GameObjects/erLab.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

Assets/Textures/Icons/Buttons/GameObjects/erLandFactory.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

Assets/Textures/Icons/Buttons/GameObjects/erMech.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.8 KiB

Assets/Textures/Icons/Buttons/GameObjects/erMissileSubmarine.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

Assets/Textures/Icons/Buttons/GameObjects/erNavalFactory.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.5 KiB

Assets/Textures/Icons/Buttons/GameObjects/erRefinery.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.9 KiB

Assets/Textures/Icons/Buttons/GameObjects/erRoboEngineer.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

Assets/Textures/Icons/Buttons/GameObjects/erSubmarine.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

Assets/Textures/Icons/Buttons/GameObjects/erTank.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

Assets/Textures/Icons/Buttons/GameObjects/erTradeCenter.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

Assets/Textures/Icons/Buttons/GameObjects/erTransport.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

Assets/Textures/Icons/Buttons/GameObjects/extractor.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

Assets/Textures/Icons/Buttons/GameObjects/freezer.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

Assets/Textures/Icons/Buttons/GameObjects/heavyAssaultCruiser.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

Assets/Textures/Icons/Buttons/GameObjects/lightAssaultCruiser.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

Assets/Textures/Icons/Buttons/GameObjects/mediumAssaultCruiser.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

Assets/Textures/Icons/Buttons/GameObjects/pointDefense.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

Assets/Textures/Icons/GameObjects/aam.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

Assets/Textures/Icons/GameObjects/aircraftCarrier00.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

Assets/Textures/Icons/GameObjects/aircraftCarrier01.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

Assets/Textures/Icons/GameObjects/awm.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

Assets/Textures/Icons/GameObjects/battleship00.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

Assets/Textures/Icons/GameObjects/battleship01.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

Assets/Textures/Icons/GameObjects/cruiser00.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

Assets/Textures/Icons/GameObjects/cruiser01.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

Assets/Textures/Icons/GameObjects/destroyer00.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

Assets/Textures/Icons/GameObjects/destroyer01.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

Assets/Textures/Icons/GameObjects/guidedMissile00.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

Assets/Textures/Icons/GameObjects/guidedMissile01.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

Assets/Textures/Icons/GameObjects/jet00.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

Assets/Textures/Icons/GameObjects/jet01.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

Assets/Textures/Icons/GameObjects/submarine00.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

Assets/Textures/Icons/GameObjects/submarine01.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

external/gameBase
Vendored
+1 -1
Submodule external/gameBase updated: 0002879d41...0ab8f6bbcd
external/vb01
Vendored
+1 -1
Submodule external/vb01 updated: 7f8b6fe03a...eb53ad485d
gameObject.cpp
+2 -1
View File
@@ -40,6 +40,8 @@ namespace battleship{
upVec = model->getGlobalAxis(1);
dirVec = model->getGlobalAxis(2);
screenPos = spaceToScreen(pos);
if(hitbox) hitbox->setVisible(Game::getSingleton()->isDebug());
}
void GameObject::placeAt(Vector3 p) {
@@ -71,7 +73,6 @@ namespace battleship{
hitbox = new Node(Vector3(offsetPosTable["x"], offsetPosTable["y"], offsetPosTable["z"]));
hitbox->attachMesh(box);
hitbox->setVisible(Game::getSingleton()->isDebug());
model->attachChild(hitbox);
}
vehicle.cpp
+3 -1
View File
@@ -36,6 +36,9 @@ namespace battleship{
Unit::update();
if(garrisonable) model->setVisible(false);
for(Node *n : debugPathPoints)
n->setVisible(Game::getSingleton()->isDebug());
}
void Vehicle::halt(){
@@ -311,7 +314,6 @@ namespace battleship{
Node *n = new Node(pointPos);
n->attachMesh(b);
n->setVisible(Game::getSingleton()->isDebug());
Root::getSingleton()->getRootNode()->attachChild(n);
debugPathPoints.push_back(n);
}