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

Merge pull request #47 from devZoGok/imp-31-game-class

Browse Source 
Imp 31 game class
This commit is contained in:
devZoGok
2023-10-12 15:21:45 +00:00
committed by GitHub
parent f59dbf92d3 afb8f34ae0
commit dc41f343ac
29 changed files with 9167 additions and 9093 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Models/Maps/111/111.lua
+4 -2
View File
@@ -9,7 +9,9 @@ spawnPoints = {
},
players = {
{
spawnPoint = 0,
numResourceDeposits = 0,
resourceDeposits = {
},
numUnits = 0,
}
},
@@ -332,4 +334,4 @@ skybox = "Skybox1",
terrain = {model = "111.xml", albedo = "111.jpg"},
waterbodies = {
{pos = {x = 7.296803, y = -0.948949, z = 6.370515}, size = {x = 42.873222, y = 42.948956}, albedo = "water.jpg"},}
}
}
Assets/Models/Maps/123/123.jpg → Assets/Models/Maps/222/222.jpg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 49 KiB

Assets/Models/Maps/123/123.lua → Assets/Models/Maps/222/222.lua
+46 -32
View File
@@ -9,7 +9,21 @@ spawnPoints = {
},
players = {
{
spawnPoint = 0,
numResourceDeposits = 12,
resourceDeposits = {
{id = 0, pos = {x = -2.211494, y = 0.000000, z = -10.615765}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
{id = 0, pos = {x = -2.211494, y = 0.000000, z = -10.615765}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
{id = 0, pos = {x = 6.105221, y = 0.000011, z = 0.419853}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
{id = 0, pos = {x = 6.105221, y = 0.000011, z = 0.419853}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
{id = 0, pos = {x = 19.663696, y = 0.000000, z = -0.795101}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
{id = 0, pos = {x = 19.663696, y = 0.000000, z = -0.795101}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
{id = 0, pos = {x = 13.173117, y = 0.000000, z = 12.344984}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
{id = 0, pos = {x = 13.112776, y = 0.000000, z = 12.405327}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
{id = 0, pos = {x = 10.513906, y = -0.000004, z = -14.970547}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
{id = 0, pos = {x = 10.513906, y = -0.000004, z = -14.970547}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
{id = 0, pos = {x = -5.240124, y = 0.000004, z = 11.061106}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
{id = 0, pos = {x = -5.381660, y = 0.000004, z = 11.083004}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
},
numUnits = 0,
}
},
@@ -58,9 +72,9 @@ cells = {
{type = 0, pos = {x = -18.270000, y = 0.000000, z = -46.270000}, numEdges = 8, edges = {{srcCellId = 40, destCellId = 39, weight = 1}, {srcCellId = 40, destCellId = 41, weight = 1}, {srcCellId = 40, destCellId = 23, weight = 1}, {srcCellId = 40, destCellId = 57, weight = 1}, {srcCellId = 40, destCellId = 22, weight = 1}, {srcCellId = 40, destCellId = 24, weight = 1}, {srcCellId = 40, destCellId = 56, weight = 1}, {srcCellId = 40, destCellId = 58, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = -11.270000, y = 0.000000, z = -46.270000}, numEdges = 8, edges = {{srcCellId = 41, destCellId = 40, weight = 1}, {srcCellId = 41, destCellId = 42, weight = 1}, {srcCellId = 41, destCellId = 24, weight = 1}, {srcCellId = 41, destCellId = 58, weight = 1}, {srcCellId = 41, destCellId = 23, weight = 1}, {srcCellId = 41, destCellId = 25, weight = 1}, {srcCellId = 41, destCellId = 57, weight = 1}, {srcCellId = 41, destCellId = 59, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = -4.270000, y = 0.000000, z = -46.270000}, numEdges = 8, edges = {{srcCellId = 42, destCellId = 41, weight = 1}, {srcCellId = 42, destCellId = 43, weight = 1}, {srcCellId = 42, destCellId = 25, weight = 1}, {srcCellId = 42, destCellId = 59, weight = 1}, {srcCellId = 42, destCellId = 24, weight = 1}, {srcCellId = 42, destCellId = 26, weight = 1}, {srcCellId = 42, destCellId = 58, weight = 1}, {srcCellId = 42, destCellId = 60, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 2.730000, y = 0.014008, z = -46.270000}, numEdges = 8, edges = {{srcCellId = 43, destCellId = 42, weight = 1}, {srcCellId = 43, destCellId = 44, weight = 1}, {srcCellId = 43, destCellId = 26, weight = 1}, {srcCellId = 43, destCellId = 60, weight = 1}, {srcCellId = 43, destCellId = 25, weight = 1}, {srcCellId = 43, destCellId = 27, weight = 1}, {srcCellId = 43, destCellId = 59, weight = 1}, {srcCellId = 43, destCellId = 61, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 9.730000, y = 0.328529, z = -46.270000}, numEdges = 8, edges = {{srcCellId = 44, destCellId = 43, weight = 1}, {srcCellId = 44, destCellId = 45, weight = 1}, {srcCellId = 44, destCellId = 27, weight = 1}, {srcCellId = 44, destCellId = 61, weight = 1}, {srcCellId = 44, destCellId = 26, weight = 1}, {srcCellId = 44, destCellId = 28, weight = 1}, {srcCellId = 44, destCellId = 60, weight = 1}, {srcCellId = 44, destCellId = 62, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 16.730000, y = 0.438850, z = -46.270000}, numEdges = 8, edges = {{srcCellId = 45, destCellId = 44, weight = 1}, {srcCellId = 45, destCellId = 46, weight = 1}, {srcCellId = 45, destCellId = 28, weight = 1}, {srcCellId = 45, destCellId = 62, weight = 1}, {srcCellId = 45, destCellId = 27, weight = 1}, {srcCellId = 45, destCellId = 29, weight = 1}, {srcCellId = 45, destCellId = 61, weight = 1}, {srcCellId = 45, destCellId = 63, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 2.730000, y = 0.000000, z = -46.270000}, numEdges = 8, edges = {{srcCellId = 43, destCellId = 42, weight = 1}, {srcCellId = 43, destCellId = 44, weight = 1}, {srcCellId = 43, destCellId = 26, weight = 1}, {srcCellId = 43, destCellId = 60, weight = 1}, {srcCellId = 43, destCellId = 25, weight = 1}, {srcCellId = 43, destCellId = 27, weight = 1}, {srcCellId = 43, destCellId = 59, weight = 1}, {srcCellId = 43, destCellId = 61, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 9.730000, y = 0.000000, z = -46.270000}, numEdges = 8, edges = {{srcCellId = 44, destCellId = 43, weight = 1}, {srcCellId = 44, destCellId = 45, weight = 1}, {srcCellId = 44, destCellId = 27, weight = 1}, {srcCellId = 44, destCellId = 61, weight = 1}, {srcCellId = 44, destCellId = 26, weight = 1}, {srcCellId = 44, destCellId = 28, weight = 1}, {srcCellId = 44, destCellId = 60, weight = 1}, {srcCellId = 44, destCellId = 62, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 16.730000, y = 0.000000, z = -46.270000}, numEdges = 8, edges = {{srcCellId = 45, destCellId = 44, weight = 1}, {srcCellId = 45, destCellId = 46, weight = 1}, {srcCellId = 45, destCellId = 28, weight = 1}, {srcCellId = 45, destCellId = 62, weight = 1}, {srcCellId = 45, destCellId = 27, weight = 1}, {srcCellId = 45, destCellId = 29, weight = 1}, {srcCellId = 45, destCellId = 61, weight = 1}, {srcCellId = 45, destCellId = 63, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 23.730000, y = 0.000000, z = -46.270000}, numEdges = 8, edges = {{srcCellId = 46, destCellId = 45, weight = 1}, {srcCellId = 46, destCellId = 47, weight = 1}, {srcCellId = 46, destCellId = 29, weight = 1}, {srcCellId = 46, destCellId = 63, weight = 1}, {srcCellId = 46, destCellId = 28, weight = 1}, {srcCellId = 46, destCellId = 30, weight = 1}, {srcCellId = 46, destCellId = 62, weight = 1}, {srcCellId = 46, destCellId = 64, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 30.730000, y = 0.000000, z = -46.270000}, numEdges = 8, edges = {{srcCellId = 47, destCellId = 46, weight = 1}, {srcCellId = 47, destCellId = 48, weight = 1}, {srcCellId = 47, destCellId = 30, weight = 1}, {srcCellId = 47, destCellId = 64, weight = 1}, {srcCellId = 47, destCellId = 29, weight = 1}, {srcCellId = 47, destCellId = 31, weight = 1}, {srcCellId = 47, destCellId = 63, weight = 1}, {srcCellId = 47, destCellId = 65, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 37.730000, y = 0.000000, z = -46.270000}, numEdges = 8, edges = {{srcCellId = 48, destCellId = 47, weight = 1}, {srcCellId = 48, destCellId = 49, weight = 1}, {srcCellId = 48, destCellId = 31, weight = 1}, {srcCellId = 48, destCellId = 65, weight = 1}, {srcCellId = 48, destCellId = 30, weight = 1}, {srcCellId = 48, destCellId = 32, weight = 1}, {srcCellId = 48, destCellId = 64, weight = 1}, {srcCellId = 48, destCellId = 66, weight = 1}, }, numUnderWaterCells = 0,},
@@ -75,11 +89,11 @@ cells = {
{type = 0, pos = {x = -18.270000, y = 0.000000, z = -39.270000}, numEdges = 8, edges = {{srcCellId = 57, destCellId = 56, weight = 1}, {srcCellId = 57, destCellId = 58, weight = 1}, {srcCellId = 57, destCellId = 40, weight = 1}, {srcCellId = 57, destCellId = 74, weight = 1}, {srcCellId = 57, destCellId = 39, weight = 1}, {srcCellId = 57, destCellId = 41, weight = 1}, {srcCellId = 57, destCellId = 73, weight = 1}, {srcCellId = 57, destCellId = 75, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = -11.270000, y = 0.000000, z = -39.270000}, numEdges = 8, edges = {{srcCellId = 58, destCellId = 57, weight = 1}, {srcCellId = 58, destCellId = 59, weight = 1}, {srcCellId = 58, destCellId = 41, weight = 1}, {srcCellId = 58, destCellId = 75, weight = 1}, {srcCellId = 58, destCellId = 40, weight = 1}, {srcCellId = 58, destCellId = 42, weight = 1}, {srcCellId = 58, destCellId = 74, weight = 1}, {srcCellId = 58, destCellId = 76, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = -4.270000, y = 0.000000, z = -39.270000}, numEdges = 8, edges = {{srcCellId = 59, destCellId = 58, weight = 1}, {srcCellId = 59, destCellId = 60, weight = 1}, {srcCellId = 59, destCellId = 42, weight = 1}, {srcCellId = 59, destCellId = 76, weight = 1}, {srcCellId = 59, destCellId = 41, weight = 1}, {srcCellId = 59, destCellId = 43, weight = 1}, {srcCellId = 59, destCellId = 75, weight = 1}, {srcCellId = 59, destCellId = 77, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 2.730000, y = 0.328827, z = -39.270000}, numEdges = 8, edges = {{srcCellId = 60, destCellId = 59, weight = 1}, {srcCellId = 60, destCellId = 61, weight = 1}, {srcCellId = 60, destCellId = 43, weight = 1}, {srcCellId = 60, destCellId = 77, weight = 1}, {srcCellId = 60, destCellId = 42, weight = 1}, {srcCellId = 60, destCellId = 44, weight = 1}, {srcCellId = 60, destCellId = 76, weight = 1}, {srcCellId = 60, destCellId = 78, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 9.730000, y = 0.843231, z = -39.270000}, numEdges = 8, edges = {{srcCellId = 61, destCellId = 60, weight = 1}, {srcCellId = 61, destCellId = 62, weight = 1}, {srcCellId = 61, destCellId = 44, weight = 1}, {srcCellId = 61, destCellId = 78, weight = 1}, {srcCellId = 61, destCellId = 43, weight = 1}, {srcCellId = 61, destCellId = 45, weight = 1}, {srcCellId = 61, destCellId = 77, weight = 1}, {srcCellId = 61, destCellId = 79, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 16.730000, y = 1.050255, z = -39.270000}, numEdges = 8, edges = {{srcCellId = 62, destCellId = 61, weight = 1}, {srcCellId = 62, destCellId = 63, weight = 1}, {srcCellId = 62, destCellId = 45, weight = 1}, {srcCellId = 62, destCellId = 79, weight = 1}, {srcCellId = 62, destCellId = 44, weight = 1}, {srcCellId = 62, destCellId = 46, weight = 1}, {srcCellId = 62, destCellId = 78, weight = 1}, {srcCellId = 62, destCellId = 80, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 2.730000, y = 0.000000, z = -39.270000}, numEdges = 8, edges = {{srcCellId = 60, destCellId = 59, weight = 1}, {srcCellId = 60, destCellId = 61, weight = 1}, {srcCellId = 60, destCellId = 43, weight = 1}, {srcCellId = 60, destCellId = 77, weight = 1}, {srcCellId = 60, destCellId = 42, weight = 1}, {srcCellId = 60, destCellId = 44, weight = 1}, {srcCellId = 60, destCellId = 76, weight = 1}, {srcCellId = 60, destCellId = 78, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 9.730000, y = 0.000000, z = -39.270000}, numEdges = 8, edges = {{srcCellId = 61, destCellId = 60, weight = 1}, {srcCellId = 61, destCellId = 62, weight = 1}, {srcCellId = 61, destCellId = 44, weight = 1}, {srcCellId = 61, destCellId = 78, weight = 1}, {srcCellId = 61, destCellId = 43, weight = 1}, {srcCellId = 61, destCellId = 45, weight = 1}, {srcCellId = 61, destCellId = 77, weight = 1}, {srcCellId = 61, destCellId = 79, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 16.730000, y = 0.000000, z = -39.270000}, numEdges = 8, edges = {{srcCellId = 62, destCellId = 61, weight = 1}, {srcCellId = 62, destCellId = 63, weight = 1}, {srcCellId = 62, destCellId = 45, weight = 1}, {srcCellId = 62, destCellId = 79, weight = 1}, {srcCellId = 62, destCellId = 44, weight = 1}, {srcCellId = 62, destCellId = 46, weight = 1}, {srcCellId = 62, destCellId = 78, weight = 1}, {srcCellId = 62, destCellId = 80, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 23.730000, y = 0.000000, z = -39.270000}, numEdges = 8, edges = {{srcCellId = 63, destCellId = 62, weight = 1}, {srcCellId = 63, destCellId = 64, weight = 1}, {srcCellId = 63, destCellId = 46, weight = 1}, {srcCellId = 63, destCellId = 80, weight = 1}, {srcCellId = 63, destCellId = 45, weight = 1}, {srcCellId = 63, destCellId = 47, weight = 1}, {srcCellId = 63, destCellId = 79, weight = 1}, {srcCellId = 63, destCellId = 81, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 30.730000, y = 0.158981, z = -39.270000}, numEdges = 8, edges = {{srcCellId = 64, destCellId = 63, weight = 1}, {srcCellId = 64, destCellId = 65, weight = 1}, {srcCellId = 64, destCellId = 47, weight = 1}, {srcCellId = 64, destCellId = 81, weight = 1}, {srcCellId = 64, destCellId = 46, weight = 1}, {srcCellId = 64, destCellId = 48, weight = 1}, {srcCellId = 64, destCellId = 80, weight = 1}, {srcCellId = 64, destCellId = 82, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 30.730000, y = 0.000000, z = -39.270000}, numEdges = 8, edges = {{srcCellId = 64, destCellId = 63, weight = 1}, {srcCellId = 64, destCellId = 65, weight = 1}, {srcCellId = 64, destCellId = 47, weight = 1}, {srcCellId = 64, destCellId = 81, weight = 1}, {srcCellId = 64, destCellId = 46, weight = 1}, {srcCellId = 64, destCellId = 48, weight = 1}, {srcCellId = 64, destCellId = 80, weight = 1}, {srcCellId = 64, destCellId = 82, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 37.730000, y = 0.000000, z = -39.270000}, numEdges = 8, edges = {{srcCellId = 65, destCellId = 64, weight = 1}, {srcCellId = 65, destCellId = 66, weight = 1}, {srcCellId = 65, destCellId = 48, weight = 1}, {srcCellId = 65, destCellId = 82, weight = 1}, {srcCellId = 65, destCellId = 47, weight = 1}, {srcCellId = 65, destCellId = 49, weight = 1}, {srcCellId = 65, destCellId = 81, weight = 1}, {srcCellId = 65, destCellId = 83, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 44.730000, y = 0.000000, z = -39.270000}, numEdges = 8, edges = {{srcCellId = 66, destCellId = 65, weight = 1}, {srcCellId = 66, destCellId = 67, weight = 1}, {srcCellId = 66, destCellId = 49, weight = 1}, {srcCellId = 66, destCellId = 83, weight = 1}, {srcCellId = 66, destCellId = 48, weight = 1}, {srcCellId = 66, destCellId = 50, weight = 1}, {srcCellId = 66, destCellId = 82, weight = 1}, {srcCellId = 66, destCellId = 84, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 51.730000, y = 0.000000, z = -39.270000}, numEdges = 5, edges = {{srcCellId = 67, destCellId = 66, weight = 1}, {srcCellId = 67, destCellId = 50, weight = 1}, {srcCellId = 67, destCellId = 84, weight = 1}, {srcCellId = 67, destCellId = 49, weight = 1}, {srcCellId = 67, destCellId = 83, weight = 1}, }, numUnderWaterCells = 0,},
@@ -109,12 +123,12 @@ cells = {
{type = 0, pos = {x = -18.270000, y = 0.000000, z = -25.270000}, numEdges = 8, edges = {{srcCellId = 91, destCellId = 90, weight = 1}, {srcCellId = 91, destCellId = 92, weight = 1}, {srcCellId = 91, destCellId = 74, weight = 1}, {srcCellId = 91, destCellId = 108, weight = 1}, {srcCellId = 91, destCellId = 73, weight = 1}, {srcCellId = 91, destCellId = 75, weight = 1}, {srcCellId = 91, destCellId = 107, weight = 1}, {srcCellId = 91, destCellId = 109, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = -11.270000, y = 0.000000, z = -25.270000}, numEdges = 8, edges = {{srcCellId = 92, destCellId = 91, weight = 1}, {srcCellId = 92, destCellId = 93, weight = 1}, {srcCellId = 92, destCellId = 75, weight = 1}, {srcCellId = 92, destCellId = 109, weight = 1}, {srcCellId = 92, destCellId = 74, weight = 1}, {srcCellId = 92, destCellId = 76, weight = 1}, {srcCellId = 92, destCellId = 108, weight = 1}, {srcCellId = 92, destCellId = 110, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = -4.270000, y = 0.000000, z = -25.270000}, numEdges = 8, edges = {{srcCellId = 93, destCellId = 92, weight = 1}, {srcCellId = 93, destCellId = 94, weight = 1}, {srcCellId = 93, destCellId = 76, weight = 1}, {srcCellId = 93, destCellId = 110, weight = 1}, {srcCellId = 93, destCellId = 75, weight = 1}, {srcCellId = 93, destCellId = 77, weight = 1}, {srcCellId = 93, destCellId = 109, weight = 1}, {srcCellId = 93, destCellId = 111, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 2.730000, y = 0.241905, z = -25.270000}, numEdges = 8, edges = {{srcCellId = 94, destCellId = 93, weight = 1}, {srcCellId = 94, destCellId = 95, weight = 1}, {srcCellId = 94, destCellId = 77, weight = 1}, {srcCellId = 94, destCellId = 111, weight = 1}, {srcCellId = 94, destCellId = 76, weight = 1}, {srcCellId = 94, destCellId = 78, weight = 1}, {srcCellId = 94, destCellId = 110, weight = 1}, {srcCellId = 94, destCellId = 112, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 9.730000, y = 0.906334, z = -25.270000}, numEdges = 8, edges = {{srcCellId = 95, destCellId = 94, weight = 1}, {srcCellId = 95, destCellId = 96, weight = 1}, {srcCellId = 95, destCellId = 78, weight = 1}, {srcCellId = 95, destCellId = 112, weight = 1}, {srcCellId = 95, destCellId = 77, weight = 1}, {srcCellId = 95, destCellId = 79, weight = 1}, {srcCellId = 95, destCellId = 111, weight = 1}, {srcCellId = 95, destCellId = 113, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 16.730000, y = 6.730377, z = -25.270000}, numEdges = 8, edges = {{srcCellId = 96, destCellId = 95, weight = 1}, {srcCellId = 96, destCellId = 97, weight = 1}, {srcCellId = 96, destCellId = 79, weight = 1}, {srcCellId = 96, destCellId = 113, weight = 1}, {srcCellId = 96, destCellId = 78, weight = 1}, {srcCellId = 96, destCellId = 80, weight = 1}, {srcCellId = 96, destCellId = 112, weight = 1}, {srcCellId = 96, destCellId = 114, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 23.730000, y = 10.044006, z = -25.270000}, numEdges = 8, edges = {{srcCellId = 97, destCellId = 96, weight = 1}, {srcCellId = 97, destCellId = 98, weight = 1}, {srcCellId = 97, destCellId = 80, weight = 1}, {srcCellId = 97, destCellId = 114, weight = 1}, {srcCellId = 97, destCellId = 79, weight = 1}, {srcCellId = 97, destCellId = 81, weight = 1}, {srcCellId = 97, destCellId = 113, weight = 1}, {srcCellId = 97, destCellId = 115, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 30.730000, y = 7.655518, z = -25.270000}, numEdges = 8, edges = {{srcCellId = 98, destCellId = 97, weight = 1}, {srcCellId = 98, destCellId = 99, weight = 1}, {srcCellId = 98, destCellId = 81, weight = 1}, {srcCellId = 98, destCellId = 115, weight = 1}, {srcCellId = 98, destCellId = 80, weight = 1}, {srcCellId = 98, destCellId = 82, weight = 1}, {srcCellId = 98, destCellId = 114, weight = 1}, {srcCellId = 98, destCellId = 116, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 37.730000, y = 1.607254, z = -25.270000}, numEdges = 8, edges = {{srcCellId = 99, destCellId = 98, weight = 1}, {srcCellId = 99, destCellId = 100, weight = 1}, {srcCellId = 99, destCellId = 82, weight = 1}, {srcCellId = 99, destCellId = 116, weight = 1}, {srcCellId = 99, destCellId = 81, weight = 1}, {srcCellId = 99, destCellId = 83, weight = 1}, {srcCellId = 99, destCellId = 115, weight = 1}, {srcCellId = 99, destCellId = 117, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 2.730000, y = 0.000000, z = -25.270000}, numEdges = 8, edges = {{srcCellId = 94, destCellId = 93, weight = 1}, {srcCellId = 94, destCellId = 95, weight = 1}, {srcCellId = 94, destCellId = 77, weight = 1}, {srcCellId = 94, destCellId = 111, weight = 1}, {srcCellId = 94, destCellId = 76, weight = 1}, {srcCellId = 94, destCellId = 78, weight = 1}, {srcCellId = 94, destCellId = 110, weight = 1}, {srcCellId = 94, destCellId = 112, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 9.730000, y = 0.000000, z = -25.270000}, numEdges = 8, edges = {{srcCellId = 95, destCellId = 94, weight = 1}, {srcCellId = 95, destCellId = 96, weight = 1}, {srcCellId = 95, destCellId = 78, weight = 1}, {srcCellId = 95, destCellId = 112, weight = 1}, {srcCellId = 95, destCellId = 77, weight = 1}, {srcCellId = 95, destCellId = 79, weight = 1}, {srcCellId = 95, destCellId = 111, weight = 1}, {srcCellId = 95, destCellId = 113, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 16.730000, y = 0.000000, z = -25.270000}, numEdges = 8, edges = {{srcCellId = 96, destCellId = 95, weight = 1}, {srcCellId = 96, destCellId = 97, weight = 1}, {srcCellId = 96, destCellId = 79, weight = 1}, {srcCellId = 96, destCellId = 113, weight = 1}, {srcCellId = 96, destCellId = 78, weight = 1}, {srcCellId = 96, destCellId = 80, weight = 1}, {srcCellId = 96, destCellId = 112, weight = 1}, {srcCellId = 96, destCellId = 114, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 23.730000, y = 0.000000, z = -25.270000}, numEdges = 8, edges = {{srcCellId = 97, destCellId = 96, weight = 1}, {srcCellId = 97, destCellId = 98, weight = 1}, {srcCellId = 97, destCellId = 80, weight = 1}, {srcCellId = 97, destCellId = 114, weight = 1}, {srcCellId = 97, destCellId = 79, weight = 1}, {srcCellId = 97, destCellId = 81, weight = 1}, {srcCellId = 97, destCellId = 113, weight = 1}, {srcCellId = 97, destCellId = 115, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 30.730000, y = 0.000000, z = -25.270000}, numEdges = 8, edges = {{srcCellId = 98, destCellId = 97, weight = 1}, {srcCellId = 98, destCellId = 99, weight = 1}, {srcCellId = 98, destCellId = 81, weight = 1}, {srcCellId = 98, destCellId = 115, weight = 1}, {srcCellId = 98, destCellId = 80, weight = 1}, {srcCellId = 98, destCellId = 82, weight = 1}, {srcCellId = 98, destCellId = 114, weight = 1}, {srcCellId = 98, destCellId = 116, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 37.730000, y = 0.000000, z = -25.270000}, numEdges = 8, edges = {{srcCellId = 99, destCellId = 98, weight = 1}, {srcCellId = 99, destCellId = 100, weight = 1}, {srcCellId = 99, destCellId = 82, weight = 1}, {srcCellId = 99, destCellId = 116, weight = 1}, {srcCellId = 99, destCellId = 81, weight = 1}, {srcCellId = 99, destCellId = 83, weight = 1}, {srcCellId = 99, destCellId = 115, weight = 1}, {srcCellId = 99, destCellId = 117, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 44.730000, y = 0.000000, z = -25.270000}, numEdges = 8, edges = {{srcCellId = 100, destCellId = 99, weight = 1}, {srcCellId = 100, destCellId = 101, weight = 1}, {srcCellId = 100, destCellId = 83, weight = 1}, {srcCellId = 100, destCellId = 117, weight = 1}, {srcCellId = 100, destCellId = 82, weight = 1}, {srcCellId = 100, destCellId = 84, weight = 1}, {srcCellId = 100, destCellId = 116, weight = 1}, {srcCellId = 100, destCellId = 118, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 51.730000, y = 0.000000, z = -25.270000}, numEdges = 5, edges = {{srcCellId = 101, destCellId = 100, weight = 1}, {srcCellId = 101, destCellId = 84, weight = 1}, {srcCellId = 101, destCellId = 118, weight = 1}, {srcCellId = 101, destCellId = 83, weight = 1}, {srcCellId = 101, destCellId = 117, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = -60.270000, y = 0.000000, z = -18.270000}, numEdges = 5, edges = {{srcCellId = 102, destCellId = 103, weight = 1}, {srcCellId = 102, destCellId = 85, weight = 1}, {srcCellId = 102, destCellId = 119, weight = 1}, {srcCellId = 102, destCellId = 86, weight = 1}, {srcCellId = 102, destCellId = 120, weight = 1}, }, numUnderWaterCells = 0,},
@@ -126,12 +140,12 @@ cells = {
{type = 0, pos = {x = -18.270000, y = 0.000000, z = -18.270000}, numEdges = 8, edges = {{srcCellId = 108, destCellId = 107, weight = 1}, {srcCellId = 108, destCellId = 109, weight = 1}, {srcCellId = 108, destCellId = 91, weight = 1}, {srcCellId = 108, destCellId = 125, weight = 1}, {srcCellId = 108, destCellId = 90, weight = 1}, {srcCellId = 108, destCellId = 92, weight = 1}, {srcCellId = 108, destCellId = 124, weight = 1}, {srcCellId = 108, destCellId = 126, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = -11.270000, y = 0.000000, z = -18.270000}, numEdges = 8, edges = {{srcCellId = 109, destCellId = 108, weight = 1}, {srcCellId = 109, destCellId = 110, weight = 1}, {srcCellId = 109, destCellId = 92, weight = 1}, {srcCellId = 109, destCellId = 126, weight = 1}, {srcCellId = 109, destCellId = 91, weight = 1}, {srcCellId = 109, destCellId = 93, weight = 1}, {srcCellId = 109, destCellId = 125, weight = 1}, {srcCellId = 109, destCellId = 127, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = -4.270000, y = 0.000000, z = -18.270000}, numEdges = 8, edges = {{srcCellId = 110, destCellId = 109, weight = 1}, {srcCellId = 110, destCellId = 111, weight = 1}, {srcCellId = 110, destCellId = 93, weight = 1}, {srcCellId = 110, destCellId = 127, weight = 1}, {srcCellId = 110, destCellId = 92, weight = 1}, {srcCellId = 110, destCellId = 94, weight = 1}, {srcCellId = 110, destCellId = 126, weight = 1}, {srcCellId = 110, destCellId = 128, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 2.730000, y = 0.471474, z = -18.270000}, numEdges = 8, edges = {{srcCellId = 111, destCellId = 110, weight = 1}, {srcCellId = 111, destCellId = 112, weight = 1}, {srcCellId = 111, destCellId = 94, weight = 1}, {srcCellId = 111, destCellId = 128, weight = 1}, {srcCellId = 111, destCellId = 93, weight = 1}, {srcCellId = 111, destCellId = 95, weight = 1}, {srcCellId = 111, destCellId = 127, weight = 1}, {srcCellId = 111, destCellId = 129, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 9.730000, y = 6.079140, z = -18.270000}, numEdges = 8, edges = {{srcCellId = 112, destCellId = 111, weight = 1}, {srcCellId = 112, destCellId = 113, weight = 1}, {srcCellId = 112, destCellId = 95, weight = 1}, {srcCellId = 112, destCellId = 129, weight = 1}, {srcCellId = 112, destCellId = 94, weight = 1}, {srcCellId = 112, destCellId = 96, weight = 1}, {srcCellId = 112, destCellId = 128, weight = 1}, {srcCellId = 112, destCellId = 130, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 16.730000, y = 15.610687, z = -18.270000}, numEdges = 8, edges = {{srcCellId = 113, destCellId = 112, weight = 1}, {srcCellId = 113, destCellId = 114, weight = 1}, {srcCellId = 113, destCellId = 96, weight = 1}, {srcCellId = 113, destCellId = 130, weight = 1}, {srcCellId = 113, destCellId = 95, weight = 1}, {srcCellId = 113, destCellId = 97, weight = 1}, {srcCellId = 113, destCellId = 129, weight = 1}, {srcCellId = 113, destCellId = 131, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 2.730000, y = 0.000000, z = -18.270000}, numEdges = 8, edges = {{srcCellId = 111, destCellId = 110, weight = 1}, {srcCellId = 111, destCellId = 112, weight = 1}, {srcCellId = 111, destCellId = 94, weight = 1}, {srcCellId = 111, destCellId = 128, weight = 1}, {srcCellId = 111, destCellId = 93, weight = 1}, {srcCellId = 111, destCellId = 95, weight = 1}, {srcCellId = 111, destCellId = 127, weight = 1}, {srcCellId = 111, destCellId = 129, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 9.730000, y = 0.000000, z = -18.270000}, numEdges = 8, edges = {{srcCellId = 112, destCellId = 111, weight = 1}, {srcCellId = 112, destCellId = 113, weight = 1}, {srcCellId = 112, destCellId = 95, weight = 1}, {srcCellId = 112, destCellId = 129, weight = 1}, {srcCellId = 112, destCellId = 94, weight = 1}, {srcCellId = 112, destCellId = 96, weight = 1}, {srcCellId = 112, destCellId = 128, weight = 1}, {srcCellId = 112, destCellId = 130, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 16.730000, y = 0.000000, z = -18.270000}, numEdges = 8, edges = {{srcCellId = 113, destCellId = 112, weight = 1}, {srcCellId = 113, destCellId = 114, weight = 1}, {srcCellId = 113, destCellId = 96, weight = 1}, {srcCellId = 113, destCellId = 130, weight = 1}, {srcCellId = 113, destCellId = 95, weight = 1}, {srcCellId = 113, destCellId = 97, weight = 1}, {srcCellId = 113, destCellId = 129, weight = 1}, {srcCellId = 113, destCellId = 131, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 23.730000, y = 0.000000, z = -18.270000}, numEdges = 8, edges = {{srcCellId = 114, destCellId = 113, weight = 1}, {srcCellId = 114, destCellId = 115, weight = 1}, {srcCellId = 114, destCellId = 97, weight = 1}, {srcCellId = 114, destCellId = 131, weight = 1}, {srcCellId = 114, destCellId = 96, weight = 1}, {srcCellId = 114, destCellId = 98, weight = 1}, {srcCellId = 114, destCellId = 130, weight = 1}, {srcCellId = 114, destCellId = 132, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 30.730000, y = 14.617821, z = -18.270000}, numEdges = 8, edges = {{srcCellId = 115, destCellId = 114, weight = 1}, {srcCellId = 115, destCellId = 116, weight = 1}, {srcCellId = 115, destCellId = 98, weight = 1}, {srcCellId = 115, destCellId = 132, weight = 1}, {srcCellId = 115, destCellId = 97, weight = 1}, {srcCellId = 115, destCellId = 99, weight = 1}, {srcCellId = 115, destCellId = 131, weight = 1}, {srcCellId = 115, destCellId = 133, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 37.730000, y = 6.128906, z = -18.270000}, numEdges = 8, edges = {{srcCellId = 116, destCellId = 115, weight = 1}, {srcCellId = 116, destCellId = 117, weight = 1}, {srcCellId = 116, destCellId = 99, weight = 1}, {srcCellId = 116, destCellId = 133, weight = 1}, {srcCellId = 116, destCellId = 98, weight = 1}, {srcCellId = 116, destCellId = 100, weight = 1}, {srcCellId = 116, destCellId = 132, weight = 1}, {srcCellId = 116, destCellId = 134, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 30.730000, y = 0.000000, z = -18.270000}, numEdges = 8, edges = {{srcCellId = 115, destCellId = 114, weight = 1}, {srcCellId = 115, destCellId = 116, weight = 1}, {srcCellId = 115, destCellId = 98, weight = 1}, {srcCellId = 115, destCellId = 132, weight = 1}, {srcCellId = 115, destCellId = 97, weight = 1}, {srcCellId = 115, destCellId = 99, weight = 1}, {srcCellId = 115, destCellId = 131, weight = 1}, {srcCellId = 115, destCellId = 133, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 37.730000, y = 0.000000, z = -18.270000}, numEdges = 8, edges = {{srcCellId = 116, destCellId = 115, weight = 1}, {srcCellId = 116, destCellId = 117, weight = 1}, {srcCellId = 116, destCellId = 99, weight = 1}, {srcCellId = 116, destCellId = 133, weight = 1}, {srcCellId = 116, destCellId = 98, weight = 1}, {srcCellId = 116, destCellId = 100, weight = 1}, {srcCellId = 116, destCellId = 132, weight = 1}, {srcCellId = 116, destCellId = 134, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 44.730000, y = 0.000000, z = -18.270000}, numEdges = 8, edges = {{srcCellId = 117, destCellId = 116, weight = 1}, {srcCellId = 117, destCellId = 118, weight = 1}, {srcCellId = 117, destCellId = 100, weight = 1}, {srcCellId = 117, destCellId = 134, weight = 1}, {srcCellId = 117, destCellId = 99, weight = 1}, {srcCellId = 117, destCellId = 101, weight = 1}, {srcCellId = 117, destCellId = 133, weight = 1}, {srcCellId = 117, destCellId = 135, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 51.730000, y = 0.000000, z = -18.270000}, numEdges = 5, edges = {{srcCellId = 118, destCellId = 117, weight = 1}, {srcCellId = 118, destCellId = 101, weight = 1}, {srcCellId = 118, destCellId = 135, weight = 1}, {srcCellId = 118, destCellId = 100, weight = 1}, {srcCellId = 118, destCellId = 134, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = -60.270000, y = 0.000000, z = -11.270000}, numEdges = 5, edges = {{srcCellId = 119, destCellId = 120, weight = 1}, {srcCellId = 119, destCellId = 102, weight = 1}, {srcCellId = 119, destCellId = 136, weight = 1}, {srcCellId = 119, destCellId = 103, weight = 1}, {srcCellId = 119, destCellId = 137, weight = 1}, }, numUnderWaterCells = 0,},
@@ -143,12 +157,12 @@ cells = {
{type = 0, pos = {x = -18.270000, y = 0.000000, z = -11.270000}, numEdges = 8, edges = {{srcCellId = 125, destCellId = 124, weight = 1}, {srcCellId = 125, destCellId = 126, weight = 1}, {srcCellId = 125, destCellId = 108, weight = 1}, {srcCellId = 125, destCellId = 142, weight = 1}, {srcCellId = 125, destCellId = 107, weight = 1}, {srcCellId = 125, destCellId = 109, weight = 1}, {srcCellId = 125, destCellId = 141, weight = 1}, {srcCellId = 125, destCellId = 143, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = -11.270000, y = 0.000000, z = -11.270000}, numEdges = 8, edges = {{srcCellId = 126, destCellId = 125, weight = 1}, {srcCellId = 126, destCellId = 127, weight = 1}, {srcCellId = 126, destCellId = 109, weight = 1}, {srcCellId = 126, destCellId = 143, weight = 1}, {srcCellId = 126, destCellId = 108, weight = 1}, {srcCellId = 126, destCellId = 110, weight = 1}, {srcCellId = 126, destCellId = 142, weight = 1}, {srcCellId = 126, destCellId = 144, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = -4.270000, y = 0.000000, z = -11.270000}, numEdges = 8, edges = {{srcCellId = 127, destCellId = 126, weight = 1}, {srcCellId = 127, destCellId = 128, weight = 1}, {srcCellId = 127, destCellId = 110, weight = 1}, {srcCellId = 127, destCellId = 144, weight = 1}, {srcCellId = 127, destCellId = 109, weight = 1}, {srcCellId = 127, destCellId = 111, weight = 1}, {srcCellId = 127, destCellId = 143, weight = 1}, {srcCellId = 127, destCellId = 145, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 2.730000, y = 2.770256, z = -11.270000}, numEdges = 8, edges = {{srcCellId = 128, destCellId = 127, weight = 1}, {srcCellId = 128, destCellId = 129, weight = 1}, {srcCellId = 128, destCellId = 111, weight = 1}, {srcCellId = 128, destCellId = 145, weight = 1}, {srcCellId = 128, destCellId = 110, weight = 1}, {srcCellId = 128, destCellId = 112, weight = 1}, {srcCellId = 128, destCellId = 144, weight = 1}, {srcCellId = 128, destCellId = 146, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 9.730000, y = 9.611275, z = -11.270000}, numEdges = 8, edges = {{srcCellId = 129, destCellId = 128, weight = 1}, {srcCellId = 129, destCellId = 130, weight = 1}, {srcCellId = 129, destCellId = 112, weight = 1}, {srcCellId = 129, destCellId = 146, weight = 1}, {srcCellId = 129, destCellId = 111, weight = 1}, {srcCellId = 129, destCellId = 113, weight = 1}, {srcCellId = 129, destCellId = 145, weight = 1}, {srcCellId = 129, destCellId = 147, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 16.730000, y = 19.778152, z = -11.270000}, numEdges = 8, edges = {{srcCellId = 130, destCellId = 129, weight = 1}, {srcCellId = 130, destCellId = 131, weight = 1}, {srcCellId = 130, destCellId = 113, weight = 1}, {srcCellId = 130, destCellId = 147, weight = 1}, {srcCellId = 130, destCellId = 112, weight = 1}, {srcCellId = 130, destCellId = 114, weight = 1}, {srcCellId = 130, destCellId = 146, weight = 1}, {srcCellId = 130, destCellId = 148, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 2.730000, y = 0.000000, z = -11.270000}, numEdges = 8, edges = {{srcCellId = 128, destCellId = 127, weight = 1}, {srcCellId = 128, destCellId = 129, weight = 1}, {srcCellId = 128, destCellId = 111, weight = 1}, {srcCellId = 128, destCellId = 145, weight = 1}, {srcCellId = 128, destCellId = 110, weight = 1}, {srcCellId = 128, destCellId = 112, weight = 1}, {srcCellId = 128, destCellId = 144, weight = 1}, {srcCellId = 128, destCellId = 146, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 9.730000, y = 0.000000, z = -11.270000}, numEdges = 8, edges = {{srcCellId = 129, destCellId = 128, weight = 1}, {srcCellId = 129, destCellId = 130, weight = 1}, {srcCellId = 129, destCellId = 112, weight = 1}, {srcCellId = 129, destCellId = 146, weight = 1}, {srcCellId = 129, destCellId = 111, weight = 1}, {srcCellId = 129, destCellId = 113, weight = 1}, {srcCellId = 129, destCellId = 145, weight = 1}, {srcCellId = 129, destCellId = 147, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 16.730000, y = 0.000000, z = -11.270000}, numEdges = 8, edges = {{srcCellId = 130, destCellId = 129, weight = 1}, {srcCellId = 130, destCellId = 131, weight = 1}, {srcCellId = 130, destCellId = 113, weight = 1}, {srcCellId = 130, destCellId = 147, weight = 1}, {srcCellId = 130, destCellId = 112, weight = 1}, {srcCellId = 130, destCellId = 114, weight = 1}, {srcCellId = 130, destCellId = 146, weight = 1}, {srcCellId = 130, destCellId = 148, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 23.730000, y = 0.000000, z = -11.270000}, numEdges = 8, edges = {{srcCellId = 131, destCellId = 130, weight = 1}, {srcCellId = 131, destCellId = 132, weight = 1}, {srcCellId = 131, destCellId = 114, weight = 1}, {srcCellId = 131, destCellId = 148, weight = 1}, {srcCellId = 131, destCellId = 113, weight = 1}, {srcCellId = 131, destCellId = 115, weight = 1}, {srcCellId = 131, destCellId = 147, weight = 1}, {srcCellId = 131, destCellId = 149, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 30.730000, y = 16.083710, z = -11.270000}, numEdges = 8, edges = {{srcCellId = 132, destCellId = 131, weight = 1}, {srcCellId = 132, destCellId = 133, weight = 1}, {srcCellId = 132, destCellId = 115, weight = 1}, {srcCellId = 132, destCellId = 149, weight = 1}, {srcCellId = 132, destCellId = 114, weight = 1}, {srcCellId = 132, destCellId = 116, weight = 1}, {srcCellId = 132, destCellId = 148, weight = 1}, {srcCellId = 132, destCellId = 150, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 37.730000, y = 6.390457, z = -11.270000}, numEdges = 8, edges = {{srcCellId = 133, destCellId = 132, weight = 1}, {srcCellId = 133, destCellId = 134, weight = 1}, {srcCellId = 133, destCellId = 116, weight = 1}, {srcCellId = 133, destCellId = 150, weight = 1}, {srcCellId = 133, destCellId = 115, weight = 1}, {srcCellId = 133, destCellId = 117, weight = 1}, {srcCellId = 133, destCellId = 149, weight = 1}, {srcCellId = 133, destCellId = 151, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 30.730000, y = 0.000000, z = -11.270000}, numEdges = 8, edges = {{srcCellId = 132, destCellId = 131, weight = 1}, {srcCellId = 132, destCellId = 133, weight = 1}, {srcCellId = 132, destCellId = 115, weight = 1}, {srcCellId = 132, destCellId = 149, weight = 1}, {srcCellId = 132, destCellId = 114, weight = 1}, {srcCellId = 132, destCellId = 116, weight = 1}, {srcCellId = 132, destCellId = 148, weight = 1}, {srcCellId = 132, destCellId = 150, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 37.730000, y = 0.000000, z = -11.270000}, numEdges = 8, edges = {{srcCellId = 133, destCellId = 132, weight = 1}, {srcCellId = 133, destCellId = 134, weight = 1}, {srcCellId = 133, destCellId = 116, weight = 1}, {srcCellId = 133, destCellId = 150, weight = 1}, {srcCellId = 133, destCellId = 115, weight = 1}, {srcCellId = 133, destCellId = 117, weight = 1}, {srcCellId = 133, destCellId = 149, weight = 1}, {srcCellId = 133, destCellId = 151, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 44.730000, y = 0.000000, z = -11.270000}, numEdges = 8, edges = {{srcCellId = 134, destCellId = 133, weight = 1}, {srcCellId = 134, destCellId = 135, weight = 1}, {srcCellId = 134, destCellId = 117, weight = 1}, {srcCellId = 134, destCellId = 151, weight = 1}, {srcCellId = 134, destCellId = 116, weight = 1}, {srcCellId = 134, destCellId = 118, weight = 1}, {srcCellId = 134, destCellId = 150, weight = 1}, {srcCellId = 134, destCellId = 152, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 51.730000, y = 0.000000, z = -11.270000}, numEdges = 5, edges = {{srcCellId = 135, destCellId = 134, weight = 1}, {srcCellId = 135, destCellId = 118, weight = 1}, {srcCellId = 135, destCellId = 152, weight = 1}, {srcCellId = 135, destCellId = 117, weight = 1}, {srcCellId = 135, destCellId = 151, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = -60.270000, y = 0.000000, z = -4.270000}, numEdges = 5, edges = {{srcCellId = 136, destCellId = 137, weight = 1}, {srcCellId = 136, destCellId = 119, weight = 1}, {srcCellId = 136, destCellId = 153, weight = 1}, {srcCellId = 136, destCellId = 120, weight = 1}, {srcCellId = 136, destCellId = 154, weight = 1}, }, numUnderWaterCells = 0,},
@@ -177,11 +191,11 @@ cells = {
{type = 0, pos = {x = -18.270000, y = 0.000000, z = 2.730000}, numEdges = 8, edges = {{srcCellId = 159, destCellId = 158, weight = 1}, {srcCellId = 159, destCellId = 160, weight = 1}, {srcCellId = 159, destCellId = 142, weight = 1}, {srcCellId = 159, destCellId = 176, weight = 1}, {srcCellId = 159, destCellId = 141, weight = 1}, {srcCellId = 159, destCellId = 143, weight = 1}, {srcCellId = 159, destCellId = 175, weight = 1}, {srcCellId = 159, destCellId = 177, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = -11.270000, y = 0.000000, z = 2.730000}, numEdges = 8, edges = {{srcCellId = 160, destCellId = 159, weight = 1}, {srcCellId = 160, destCellId = 161, weight = 1}, {srcCellId = 160, destCellId = 143, weight = 1}, {srcCellId = 160, destCellId = 177, weight = 1}, {srcCellId = 160, destCellId = 142, weight = 1}, {srcCellId = 160, destCellId = 144, weight = 1}, {srcCellId = 160, destCellId = 176, weight = 1}, {srcCellId = 160, destCellId = 178, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = -4.270000, y = 0.000000, z = 2.730000}, numEdges = 8, edges = {{srcCellId = 161, destCellId = 160, weight = 1}, {srcCellId = 161, destCellId = 162, weight = 1}, {srcCellId = 161, destCellId = 144, weight = 1}, {srcCellId = 161, destCellId = 178, weight = 1}, {srcCellId = 161, destCellId = 143, weight = 1}, {srcCellId = 161, destCellId = 145, weight = 1}, {srcCellId = 161, destCellId = 177, weight = 1}, {srcCellId = 161, destCellId = 179, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 2.730000, y = 1.639816, z = 2.730000}, numEdges = 8, edges = {{srcCellId = 162, destCellId = 161, weight = 1}, {srcCellId = 162, destCellId = 163, weight = 1}, {srcCellId = 162, destCellId = 145, weight = 1}, {srcCellId = 162, destCellId = 179, weight = 1}, {srcCellId = 162, destCellId = 144, weight = 1}, {srcCellId = 162, destCellId = 146, weight = 1}, {srcCellId = 162, destCellId = 178, weight = 1}, {srcCellId = 162, destCellId = 180, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 9.730000, y = 4.558510, z = 2.730000}, numEdges = 8, edges = {{srcCellId = 163, destCellId = 162, weight = 1}, {srcCellId = 163, destCellId = 164, weight = 1}, {srcCellId = 163, destCellId = 146, weight = 1}, {srcCellId = 163, destCellId = 180, weight = 1}, {srcCellId = 163, destCellId = 145, weight = 1}, {srcCellId = 163, destCellId = 147, weight = 1}, {srcCellId = 163, destCellId = 179, weight = 1}, {srcCellId = 163, destCellId = 181, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 16.730000, y = 5.411118, z = 2.730000}, numEdges = 8, edges = {{srcCellId = 164, destCellId = 163, weight = 1}, {srcCellId = 164, destCellId = 165, weight = 1}, {srcCellId = 164, destCellId = 147, weight = 1}, {srcCellId = 164, destCellId = 181, weight = 1}, {srcCellId = 164, destCellId = 146, weight = 1}, {srcCellId = 164, destCellId = 148, weight = 1}, {srcCellId = 164, destCellId = 180, weight = 1}, {srcCellId = 164, destCellId = 182, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 23.730000, y = 4.657310, z = 2.730000}, numEdges = 8, edges = {{srcCellId = 165, destCellId = 164, weight = 1}, {srcCellId = 165, destCellId = 166, weight = 1}, {srcCellId = 165, destCellId = 148, weight = 1}, {srcCellId = 165, destCellId = 182, weight = 1}, {srcCellId = 165, destCellId = 147, weight = 1}, {srcCellId = 165, destCellId = 149, weight = 1}, {srcCellId = 165, destCellId = 181, weight = 1}, {srcCellId = 165, destCellId = 183, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 30.730000, y = 0.638733, z = 2.730000}, numEdges = 8, edges = {{srcCellId = 166, destCellId = 165, weight = 1}, {srcCellId = 166, destCellId = 167, weight = 1}, {srcCellId = 166, destCellId = 149, weight = 1}, {srcCellId = 166, destCellId = 183, weight = 1}, {srcCellId = 166, destCellId = 148, weight = 1}, {srcCellId = 166, destCellId = 150, weight = 1}, {srcCellId = 166, destCellId = 182, weight = 1}, {srcCellId = 166, destCellId = 184, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 2.730000, y = 0.000000, z = 2.730000}, numEdges = 8, edges = {{srcCellId = 162, destCellId = 161, weight = 1}, {srcCellId = 162, destCellId = 163, weight = 1}, {srcCellId = 162, destCellId = 145, weight = 1}, {srcCellId = 162, destCellId = 179, weight = 1}, {srcCellId = 162, destCellId = 144, weight = 1}, {srcCellId = 162, destCellId = 146, weight = 1}, {srcCellId = 162, destCellId = 178, weight = 1}, {srcCellId = 162, destCellId = 180, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 9.730000, y = 0.000000, z = 2.730000}, numEdges = 8, edges = {{srcCellId = 163, destCellId = 162, weight = 1}, {srcCellId = 163, destCellId = 164, weight = 1}, {srcCellId = 163, destCellId = 146, weight = 1}, {srcCellId = 163, destCellId = 180, weight = 1}, {srcCellId = 163, destCellId = 145, weight = 1}, {srcCellId = 163, destCellId = 147, weight = 1}, {srcCellId = 163, destCellId = 179, weight = 1}, {srcCellId = 163, destCellId = 181, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 16.730000, y = 0.000000, z = 2.730000}, numEdges = 8, edges = {{srcCellId = 164, destCellId = 163, weight = 1}, {srcCellId = 164, destCellId = 165, weight = 1}, {srcCellId = 164, destCellId = 147, weight = 1}, {srcCellId = 164, destCellId = 181, weight = 1}, {srcCellId = 164, destCellId = 146, weight = 1}, {srcCellId = 164, destCellId = 148, weight = 1}, {srcCellId = 164, destCellId = 180, weight = 1}, {srcCellId = 164, destCellId = 182, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 23.730000, y = 0.000000, z = 2.730000}, numEdges = 8, edges = {{srcCellId = 165, destCellId = 164, weight = 1}, {srcCellId = 165, destCellId = 166, weight = 1}, {srcCellId = 165, destCellId = 148, weight = 1}, {srcCellId = 165, destCellId = 182, weight = 1}, {srcCellId = 165, destCellId = 147, weight = 1}, {srcCellId = 165, destCellId = 149, weight = 1}, {srcCellId = 165, destCellId = 181, weight = 1}, {srcCellId = 165, destCellId = 183, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 30.730000, y = 0.000000, z = 2.730000}, numEdges = 8, edges = {{srcCellId = 166, destCellId = 165, weight = 1}, {srcCellId = 166, destCellId = 167, weight = 1}, {srcCellId = 166, destCellId = 149, weight = 1}, {srcCellId = 166, destCellId = 183, weight = 1}, {srcCellId = 166, destCellId = 148, weight = 1}, {srcCellId = 166, destCellId = 150, weight = 1}, {srcCellId = 166, destCellId = 182, weight = 1}, {srcCellId = 166, destCellId = 184, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 37.730000, y = 0.000000, z = 2.730000}, numEdges = 8, edges = {{srcCellId = 167, destCellId = 166, weight = 1}, {srcCellId = 167, destCellId = 168, weight = 1}, {srcCellId = 167, destCellId = 150, weight = 1}, {srcCellId = 167, destCellId = 184, weight = 1}, {srcCellId = 167, destCellId = 149, weight = 1}, {srcCellId = 167, destCellId = 151, weight = 1}, {srcCellId = 167, destCellId = 183, weight = 1}, {srcCellId = 167, destCellId = 185, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 44.730000, y = 0.000000, z = 2.730000}, numEdges = 8, edges = {{srcCellId = 168, destCellId = 167, weight = 1}, {srcCellId = 168, destCellId = 169, weight = 1}, {srcCellId = 168, destCellId = 151, weight = 1}, {srcCellId = 168, destCellId = 185, weight = 1}, {srcCellId = 168, destCellId = 150, weight = 1}, {srcCellId = 168, destCellId = 152, weight = 1}, {srcCellId = 168, destCellId = 184, weight = 1}, {srcCellId = 168, destCellId = 186, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 51.730000, y = 0.000000, z = 2.730000}, numEdges = 5, edges = {{srcCellId = 169, destCellId = 168, weight = 1}, {srcCellId = 169, destCellId = 152, weight = 1}, {srcCellId = 169, destCellId = 186, weight = 1}, {srcCellId = 169, destCellId = 151, weight = 1}, {srcCellId = 169, destCellId = 185, weight = 1}, }, numUnderWaterCells = 0,},
@@ -195,8 +209,8 @@ cells = {
{type = 0, pos = {x = -11.270000, y = 0.000000, z = 9.730000}, numEdges = 8, edges = {{srcCellId = 177, destCellId = 176, weight = 1}, {srcCellId = 177, destCellId = 178, weight = 1}, {srcCellId = 177, destCellId = 160, weight = 1}, {srcCellId = 177, destCellId = 194, weight = 1}, {srcCellId = 177, destCellId = 159, weight = 1}, {srcCellId = 177, destCellId = 161, weight = 1}, {srcCellId = 177, destCellId = 193, weight = 1}, {srcCellId = 177, destCellId = 195, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = -4.270000, y = 0.000000, z = 9.730000}, numEdges = 8, edges = {{srcCellId = 178, destCellId = 177, weight = 1}, {srcCellId = 178, destCellId = 179, weight = 1}, {srcCellId = 178, destCellId = 161, weight = 1}, {srcCellId = 178, destCellId = 195, weight = 1}, {srcCellId = 178, destCellId = 160, weight = 1}, {srcCellId = 178, destCellId = 162, weight = 1}, {srcCellId = 178, destCellId = 194, weight = 1}, {srcCellId = 178, destCellId = 196, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 2.730000, y = 0.000000, z = 9.730000}, numEdges = 8, edges = {{srcCellId = 179, destCellId = 178, weight = 1}, {srcCellId = 179, destCellId = 180, weight = 1}, {srcCellId = 179, destCellId = 162, weight = 1}, {srcCellId = 179, destCellId = 196, weight = 1}, {srcCellId = 179, destCellId = 161, weight = 1}, {srcCellId = 179, destCellId = 163, weight = 1}, {srcCellId = 179, destCellId = 195, weight = 1}, {srcCellId = 179, destCellId = 197, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 9.730000, y = 0.713989, z = 9.730000}, numEdges = 8, edges = {{srcCellId = 180, destCellId = 179, weight = 1}, {srcCellId = 180, destCellId = 181, weight = 1}, {srcCellId = 180, destCellId = 163, weight = 1}, {srcCellId = 180, destCellId = 197, weight = 1}, {srcCellId = 180, destCellId = 162, weight = 1}, {srcCellId = 180, destCellId = 164, weight = 1}, {srcCellId = 180, destCellId = 196, weight = 1}, {srcCellId = 180, destCellId = 198, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 16.730000, y = 1.207443, z = 9.730000}, numEdges = 8, edges = {{srcCellId = 181, destCellId = 180, weight = 1}, {srcCellId = 181, destCellId = 182, weight = 1}, {srcCellId = 181, destCellId = 164, weight = 1}, {srcCellId = 181, destCellId = 198, weight = 1}, {srcCellId = 181, destCellId = 163, weight = 1}, {srcCellId = 181, destCellId = 165, weight = 1}, {srcCellId = 181, destCellId = 197, weight = 1}, {srcCellId = 181, destCellId = 199, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 9.730000, y = 0.000000, z = 9.730000}, numEdges = 8, edges = {{srcCellId = 180, destCellId = 179, weight = 1}, {srcCellId = 180, destCellId = 181, weight = 1}, {srcCellId = 180, destCellId = 163, weight = 1}, {srcCellId = 180, destCellId = 197, weight = 1}, {srcCellId = 180, destCellId = 162, weight = 1}, {srcCellId = 180, destCellId = 164, weight = 1}, {srcCellId = 180, destCellId = 196, weight = 1}, {srcCellId = 180, destCellId = 198, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 16.730000, y = 0.000000, z = 9.730000}, numEdges = 8, edges = {{srcCellId = 181, destCellId = 180, weight = 1}, {srcCellId = 181, destCellId = 182, weight = 1}, {srcCellId = 181, destCellId = 164, weight = 1}, {srcCellId = 181, destCellId = 198, weight = 1}, {srcCellId = 181, destCellId = 163, weight = 1}, {srcCellId = 181, destCellId = 165, weight = 1}, {srcCellId = 181, destCellId = 197, weight = 1}, {srcCellId = 181, destCellId = 199, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 23.730000, y = 0.000000, z = 9.730000}, numEdges = 8, edges = {{srcCellId = 182, destCellId = 181, weight = 1}, {srcCellId = 182, destCellId = 183, weight = 1}, {srcCellId = 182, destCellId = 165, weight = 1}, {srcCellId = 182, destCellId = 199, weight = 1}, {srcCellId = 182, destCellId = 164, weight = 1}, {srcCellId = 182, destCellId = 166, weight = 1}, {srcCellId = 182, destCellId = 198, weight = 1}, {srcCellId = 182, destCellId = 200, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 30.730000, y = 0.000000, z = 9.730000}, numEdges = 8, edges = {{srcCellId = 183, destCellId = 182, weight = 1}, {srcCellId = 183, destCellId = 184, weight = 1}, {srcCellId = 183, destCellId = 166, weight = 1}, {srcCellId = 183, destCellId = 200, weight = 1}, {srcCellId = 183, destCellId = 165, weight = 1}, {srcCellId = 183, destCellId = 167, weight = 1}, {srcCellId = 183, destCellId = 199, weight = 1}, {srcCellId = 183, destCellId = 201, weight = 1}, }, numUnderWaterCells = 0,},
{type = 0, pos = {x = 37.730000, y = 0.000000, z = 9.730000}, numEdges = 8, edges = {{srcCellId = 184, destCellId = 183, weight = 1}, {srcCellId = 184, destCellId = 185, weight = 1}, {srcCellId = 184, destCellId = 167, weight = 1}, {srcCellId = 184, destCellId = 201, weight = 1}, {srcCellId = 184, destCellId = 166, weight = 1}, {srcCellId = 184, destCellId = 168, weight = 1}, {srcCellId = 184, destCellId = 200, weight = 1}, {srcCellId = 184, destCellId = 202, weight = 1}, }, numUnderWaterCells = 0,},
@@ -306,7 +320,7 @@ cells = {
{type = 0, pos = {x = 51.730000, y = 0.000000, z = 51.730000}, numEdges = 3, edges = {{srcCellId = 288, destCellId = 287, weight = 1}, {srcCellId = 288, destCellId = 271, weight = 1}, {srcCellId = 288, destCellId = 270, weight = 1}, }, numUnderWaterCells = 0,},
},
skybox = "Skybox1",
terrain = {model = "123.xml", albedo = "123.jpg"},
terrain = {model = "222.xml", albedo = "222.jpg"},
waterbodies = {
}
}
Assets/Models/Maps/123/123.xml → Assets/Models/Maps/222/222.xml
+8922 -8922
View File
File diff suppressed because it is too large Load Diff
CMakeLists.txt
+1 -1
View File
@@ -20,7 +20,7 @@ set(STATES activeGameState.cpp inGameAppState.cpp guiAppState.cpp mapEditorAppSt
set(UTIL util.cpp binds.h)
set(CONTROLLERS gameObjectFrameController.cpp cameraController.cpp)
set(CONSOLE console.cpp abstractCommand.cpp addUnitCommand.cpp addResourceCommand.cpp)
set(CORE gameManager.cpp defConfigs.cpp ${CONSOLE} ${CONTROLLERS})
set(CORE gameManager.cpp game.cpp defConfigs.cpp ${CONSOLE} ${CONTROLLERS})
set(PROJECTILES projectile.cpp)
set(FX explosion.cpp)
set(VEHICLES vehicle.cpp engineer.cpp)
activeGameState.cpp
+4 -3
View File
@@ -18,6 +18,7 @@
#include "inGameAppState.h"
#include "defConfigs.h"
#include "structure.h"
#include "game.h"
#include "util.h"
#include "tooltip.h"
#include "gameObjectFrameController.h"
@@ -38,9 +39,9 @@ namespace battleship{
configData::calcSumBinds(AppStateType::ACTIVE_STATE, false),
GameManager::getSingleton()->getPath() + "Scripts/options.lua"){
this->guiState = guiState;
this->playerId = playerId;
mainPlayer = Map::getSingleton()->getPlayer(playerId);
mainPlayer = Game::getSingleton()->getPlayer(playerId);
initDragbox();
@@ -138,7 +139,7 @@ namespace battleship{
void ActiveGameState::renderUnits() {
vector<Unit*> units;
for (Player *p : Map::getSingleton()->getPlayers())
for (Player *p : Game::getSingleton()->getPlayers())
for (Unit *u : p->getUnits())
units.push_back(u);
addResourceCommand.cpp
+2 -2
View File
@@ -1,5 +1,5 @@
#include "addResourceCommand.h"
#include "map.h"
#include "game.h"
#include "player.h"
namespace battleship{
@@ -21,7 +21,7 @@ namespace battleship{
}
void AddResourceCommand::addResource(){
Player *player = Map::getSingleton()->getPlayer(playerId);
Player *player = Game::getSingleton()->getPlayer(playerId);
switch(resourceId){
case 0:
addUnitCommand.cpp
+2 -1
View File
@@ -5,6 +5,7 @@
#include "console.h"
#include "addUnitCommand.h"
#include "inGameAppState.h"
#include "game.h"
#include "player.h"
#include "gameObjectFactory.h"
@@ -47,7 +48,7 @@ namespace battleship{
}
void AddUnitCommand::addUnit(){
Player* player = Map::getSingleton()->getPlayer(playerId);
Player* player = Game::getSingleton()->getPlayer(playerId);
player->addUnit(GameObjectFactory::createUnit(player, unitId, pos, rot));
}
explosion.cpp
+13 -12
View File
@@ -3,14 +3,15 @@
#include "explosion.h"
#include "util.h"
#include "inGameAppState.h"
#include "game.h"
using namespace std;
using namespace vb01;
namespace battleship{
void detonate(InGameAppState *inGameState, Vector3 pos, Vector3 dir){
sf::SoundBuffer *sfxBuffer = new sf::SoundBuffer();
sf::Sound *sfx = nullptr;
void detonate(Vector3 pos, Vector3 dir){
sf::SoundBuffer *sfxBuffer = new sf::SoundBuffer();
sf::Sound *sfx = nullptr;
string p = GameManager::getSingleton()->getPath() + "Sounds/Explosions/explosion0" + to_string(rand() % 4) + ".ogg";
if(sfxBuffer->loadFromFile(p.c_str())){
@@ -22,12 +23,12 @@ namespace battleship{
fx.initTime = getTime();
fx.time = 2500;
fx.sfx = sfx;
inGameState->addFx(fx);
Game::getSingleton()->addFx(fx);
}
void detonateDepthCharge(InGameAppState *inGameState, Vector3){
sf::SoundBuffer *sfxBuffer = new sf::SoundBuffer();
sf::Sound *sfx = nullptr;
void detonateDepthCharge(){
sf::SoundBuffer *sfxBuffer = new sf::SoundBuffer();
sf::Sound *sfx = nullptr;
string p = GameManager::getSingleton()->getPath() + "Sounds/Destroyers/depthCharge.ogg";
if(sfxBuffer->loadFromFile(p.c_str())){
@@ -39,12 +40,12 @@ namespace battleship{
fx.initTime = getTime();
fx.time = 2000;
fx.sfx = sfx;
inGameState->addFx(fx);
Game::getSingleton()->addFx(fx);
}
void detonateTorpedo(InGameAppState *inGameState, Vector3){
sf::SoundBuffer *sfxBuffer = new sf::SoundBuffer();
sf::Sound *sfx = nullptr;
void detonateTorpedo(){
sf::SoundBuffer *sfxBuffer = new sf::SoundBuffer();
sf::Sound *sfx = nullptr;
string p = GameManager::getSingleton()->getPath() + "Sounds/Submarines/torpedo.ogg";
if(sfxBuffer->loadFromFile(p.c_str())){
@@ -56,6 +57,6 @@ namespace battleship{
fx.initTime = getTime();
fx.time = 250;
fx.sfx = sfx;
inGameState->addFx(fx);
Game::getSingleton()->addFx(fx);
}
}
explosion.h
+3 -6
View File
@@ -1,15 +1,12 @@
#pragma once
#ifndef EXPLOSION_H
#define EXPLOSION_H
#include <vector.h>
namespace battleship{
class InGameAppState;
void detonate(InGameAppState*, vb01::Vector3, vb01::Vector3);
void detonateDepthCharge(InGameAppState*, vb01::Vector3);
void detonateTorpedo(InGameAppState*, vb01::Vector3);
void detonate(vb01::Vector3, vb01::Vector3);
void detonateDepthCharge();
void detonateTorpedo();
}
#endif
fx.h
+17
View File
@@ -0,0 +1,17 @@
#ifndef FX_H
#define FX_H
#include <util.h>
namespace sf{
class Sound;
}
namespace battleship{
struct Fx {
vb01::s64 initTime, time;
sf::Sound *sfx = nullptr;
};
}
#endif
game.cpp
+25
View File
@@ -0,0 +1,25 @@
#include "game.h"
#include "player.h"
#include "projectile.h"
namespace battleship{
static Game *game = nullptr;
Game* Game::getSingleton(){
if(!game)
game = new Game();
return game;
}
void Game::update(){
for(Player *p : players)
p->update();
for(Projectile *proj : projectiles)
proj->update();
}
void Game::togglePause(){
}
}
game.h
+33
View File
@@ -0,0 +1,33 @@
#ifndef GAME_H
#define GAME_H
#include "fx.h"
#include <vector>
namespace battleship{
class Player;
class Projectile;
class Game{
public:
static Game* getSingleton();
void update();
void togglePause();
inline void addFx(Fx f){fx.push_back(f);}
inline void addPlayer(Player *pl){players.push_back(pl);}
inline void addProjectile(Projectile *proj){projectiles.push_back(proj);}
inline std::vector<Player*>& getPlayers(){return players;}
inline Player* getPlayer(int id){return players[id];}
inline int getNumPlayers(){return players.size();}
private:
Game(){}
bool paused = false;
std::vector<Fx> fx;
std::vector<Player*> players;
std::vector<Projectile*> projectiles;
};
}
#endif
gameObjectFactory.cpp
+2 -2
View File
@@ -31,7 +31,7 @@ namespace battleship{
return nullptr;
}
ResourceDeposit* GameObjectFactory::createResourceDeposit(int id, Vector3 pos, Quaternion rot){
return new ResourceDeposit(id, pos, rot);
ResourceDeposit* GameObjectFactory::createResourceDeposit(Player *player, int id, Vector3 pos, Quaternion rot){
return new ResourceDeposit(player, id, pos, rot);
}
}
gameObjectFactory.h
+1 -1
View File
@@ -15,7 +15,7 @@ namespace battleship{
enum GameObjectType{UNIT, PROJECTILE, RESOURCE_DEPOSIT};
static Unit* createUnit(Player*, int, vb01::Vector3, vb01::Quaternion);
static Projectile* createProjectile(Unit*, int, vb01::Vector3, vb01::Quaternion);
static ResourceDeposit* createResourceDeposit(int, vb01::Vector3, vb01::Quaternion);
static ResourceDeposit* createResourceDeposit(Player*, int, vb01::Vector3, vb01::Quaternion);
private:
};
}
inGameAppState.cpp
+6 -12
View File
@@ -11,6 +11,7 @@
#include "defConfigs.h"
#include "inGameAppState.h"
#include "game.h"
#include "console.h"
#include "gameObjectFrameController.h"
#include "concreteGuiManager.h"
@@ -45,7 +46,7 @@ namespace battleship{
Console::execute(wstringToString(textbox->getText()));
}
InGameAppState::InGameAppState(vector<string> difficultyLevels, vector<string> factions, string mapName) : AbstractAppState(
InGameAppState::InGameAppState(vector<string> difficultyLevels, vector<string> factions) : AbstractAppState(
AppStateType::IN_GAME_STATE,
configData::calcSumBinds(AppStateType::IN_GAME_STATE, true),
configData::calcSumBinds(AppStateType::IN_GAME_STATE, false),
@@ -53,7 +54,6 @@ namespace battleship{
this->playerId = 1;
this->difficultyLevels = difficultyLevels;
this->factions = factions;
this->mapName = mapName;
}
InGameAppState::~InGameAppState() {
@@ -62,9 +62,6 @@ namespace battleship{
void InGameAppState::onAttached() {
AbstractAppState::onAttached();
Map *map = Map::getSingleton();
map->load(mapName);
for (int i = 0; i < factions.size(); i++) {
int faction, difficulty;
@@ -80,16 +77,13 @@ namespace battleship{
}
faction = factions[i][0] - 48;
Player *p = new Player(difficulty, faction, i);
p->setId(map->getNumPlayers() - 1);
map->addPlayer(p);
}
Camera *cam = Root::getSingleton()->getCamera();
cam->setPosition(map->getSpawnPoint(playerId - 1) + Vector3(1, 1, 1) * 40);
cam->setPosition(Map::getSingleton()->getSpawnPoint(playerId - 1) + Vector3(1, 1, 1) * 40);
cam->lookAt(Vector3(-1, -1, -1).norm(), Vector3(-1, 1, -1).norm());
mainPlayer = map->getPlayer(playerId);
mainPlayer = Game::getSingleton()->getPlayer(playerId);
GameManager *gm = GameManager::getSingleton();
StateManager *stateManager = gm->getStateManager();
@@ -101,7 +95,7 @@ namespace battleship{
void InGameAppState::onDettached() {}
void InGameAppState::update() {
Map::getSingleton()->update();
Game::getSingleton()->update();
}
void InGameAppState::toggleMainMenu() {
@@ -122,7 +116,7 @@ namespace battleship{
guiManager->readLuaScreenScript("inGame.lua", activeState->getButtons());
for(Player *p : Map::getSingleton()->getPlayers())
for(Player *p : Game::getSingleton()->getPlayers())
for(Unit *u : p->getUnits())
u->reinit();
}
inGameAppState.h
+1 -12
View File
@@ -13,11 +13,6 @@
#include <vector>
namespace battleship{
struct Fx {
s64 initTime, time;
sf::Sound *sfx = nullptr;
};
class InGameAppState : public gameBase::AbstractAppState {
public:
class ResumeButton : public vb01Gui::Button {
@@ -43,7 +38,7 @@ namespace battleship{
private:
};
InGameAppState(std::vector<std::string>, std::vector<std::string>, std::string);
InGameAppState(std::vector<std::string>, std::vector<std::string>);
~InGameAppState();
void onAttached();
void onDettached();
@@ -51,15 +46,9 @@ namespace battleship{
void onAction(int, bool);
void onAnalog(int, float);
std::vector<Unit*> getSelectedUnits(Player*);
inline std::vector<Projectile*>& getProjectiles(){return projectiles;}
inline void addFx(Fx fx){this->fx.push_back(fx);}
inline void addProjectile(Projectile *p){projectiles.push_back(p);}
private:
bool isMainMenuActive = false;
std::vector<std::string> difficultyLevels, factions, modelPaths;
std::vector<Projectile*> projectiles;
std::vector<Fx> fx;
std::string mapName;
Player *mainPlayer;
int playerId;
ActiveGameState* activeState;
map.cpp
+5 -10
View File
@@ -42,8 +42,6 @@ namespace battleship{
}
void Map::update(){
for(Player *p : players)
p->update();
}
void Map::loadSkybox(){
@@ -123,7 +121,7 @@ namespace battleship{
}
}
void Map::loadPlayers(){
void Map::loadPlayerGameObjects(Player *player){
AssetManager *assetManager = AssetManager::getSingleton();
string path = GameManager::getSingleton()->getPath();
assetManager->load(path + DEFAULT_TEXTURE);
@@ -135,10 +133,10 @@ namespace battleship{
for(int i = 0; i < numPlayers; i++){
if(i == 0){
int numNpcObjs = SOL_LUA_STATE[mapTable][playerInd][i + 1]["numNpcGameObjs"];
int numNpcObjs = SOL_LUA_STATE[mapTable][playerInd][i + 1]["numResourceDeposits"];
for(int j = 0; j < numNpcObjs; j++){
sol::table npcObjTable = SOL_LUA_STATE[mapTable][playerInd][i + 1]["npcGameObjs"][j + 1];
sol::table npcObjTable = SOL_LUA_STATE[mapTable][playerInd][i + 1]["resourceDeposits"][j + 1];
int id = npcObjTable["id"];
sol::table posTable = npcObjTable["pos"];
@@ -147,15 +145,13 @@ namespace battleship{
sol::table rotTable = npcObjTable["rot"];
Quaternion rot = Quaternion(rotTable["w"], rotTable["x"], rotTable["y"], rotTable["z"]);
addNpcGameObject((GameObject*)GameObjectFactory::createResourceDeposit(id, pos, rot));
player->addResourceDeposit(GameObjectFactory::createResourceDeposit(player, id, pos, rot));
}
}
//int spawnPointId = SOL_LUA_STATE[mapTable]["spawnPointInd"][i + 1][spawnPointId];
int numUnits = SOL_LUA_STATE[mapTable][playerInd][i + 1]["numUnits"];
players.push_back(new Player(0, 0, 0, spawnPoints[i]));
for(int j = 0; j < numUnits; j++){
sol::table unitTable = SOL_LUA_STATE[mapTable][playerInd][i + 1]["units"][j + 1];
@@ -167,7 +163,7 @@ namespace battleship{
int id = unitTable["id"];
players[i]->addUnit(GameObjectFactory::createUnit(players[i], id, pos, rot));
player->addUnit(GameObjectFactory::createUnit(player, id, pos, rot));
}
}
}
@@ -249,7 +245,6 @@ namespace battleship{
int numWaterbodies = SOL_LUA_STATE[mapTable]["numWaterBodies"];
loadSpawnPoints();
loadPlayers();
loadSkybox();
loadCells();
loadTerrainObject(-1);
map.h
+3 -11
View File
@@ -1,4 +1,3 @@
#pragma once
#ifndef MAP_H
#define MAP_H
@@ -16,7 +15,8 @@ namespace vb01{
namespace battleship{
class Player;
class GameObject;
class Unit;
class ResourceDeposit;
struct Cell;
class Map {
@@ -48,19 +48,14 @@ namespace battleship{
void unload();
int getCellId(vb01::Vector3);
bool isPointWithinTerrainObject(vb01::Vector3, int);
void loadPlayerGameObjects(Player*);
inline std::string getMapName(){return mapName;}
inline vb01::Node* getNodeParent(){return terrainNode;}
inline vb01::Vector3 getCellSize(){return CELL_SIZE;}
inline std::vector<Player*> getPlayers() {return players;}
inline Player* getPlayer(int i){return players[i];}
inline void addPlayer(Player *p){players.push_back(p);}
inline int getNumPlayers(){return players.size();}
inline int getNumSpawnPoints(){return spawnPoints.size();}
inline vb01::Vector3 getSpawnPoint(int i){return spawnPoints[i];}
inline void addSpawnPoint(vb01::Vector3 sp){spawnPoints.push_back(sp);}
inline std::vector<Map::Cell>& getCells(){return cells;}
inline void addNpcGameObject(GameObject *obj){npcGameObjects.push_back(obj);}
inline std::vector<GameObject*> getNpcGameObjects(){return npcGameObjects;}
private:
std::string mapTable = "map";
vb01::Node *terrainNode = nullptr, *cellNode = nullptr;
@@ -68,14 +63,11 @@ namespace battleship{
std::string mapName;
vb01::Vector3 CELL_SIZE = vb01::Vector3(7, 7, 7), mapSize;
std::vector<vb01::Vector3> spawnPoints;
std::vector<Player*> players;
std::vector<Cell> cells;
std::vector<GameObject*> npcGameObjects;
Map(){}
void preprareScene();
void loadSpawnPoints();
void loadPlayers();
void loadSkybox();
void loadCells();
void loadTerrainObject(int);
mapEditorAppState.cpp
+34 -26
View File
@@ -2,6 +2,7 @@
#include "gameManager.h"
#include "defConfigs.h"
#include "cameraController.h"
#include "resourceDeposit.h"
#include "gameObjectFactory.h"
#include "gameObjectFrameController.h"
#include "player.h"
@@ -41,15 +42,6 @@ namespace battleship{
this->newMap = newMap;
this->mapSize = size;
map = Map::getSingleton();
map->load(name, newMap);
if(newMap){
map->addPlayer(new Player(0, 0, 0));
map->addSpawnPoint(Vector3::VEC_ZERO);
generatePlane(size);
}
string basePath = GameManager::getSingleton()->getPath();
prepareTextures(basePath + "Textures/Skyboxes/", true, skyTextures);
prepareTextures(basePath + "Textures/Landmass/", false, landmassTextures);
@@ -59,6 +51,24 @@ namespace battleship{
assetManager->load(basePath + "Models/Units/", true);
assetManager->load(basePath + "Models/Resources/", true);
assetManager->load(basePath + DEFAULT_TEXTURE);
map = Map::getSingleton();
map->load(name, newMap);
if(newMap){
addPlayer(new Player(0, 0, 0));
map->addSpawnPoint(Vector3::VEC_ZERO);
generatePlane(size);
}
else{
int numPlayers = map->getNumSpawnPoints();
for(int i = 0; i < numPlayers; i++){
Player *player = new Player(0, 0, 0);
map->loadPlayerGameObjects(player);
addPlayer(player);
}
}
}
void MapEditorAppState::MapEditor::updateCircleRadius(bool increase){
@@ -401,7 +411,7 @@ namespace battleship{
string mapScript = "map = {\nnumWaterBodies = " + to_string(numWaterBodies) + ",\n";
mapScript += "size = {x = " + to_string(mapSize.x) + ", y = 100, z = " + to_string(mapSize.y) + "},\n";
mapScript += "impassibleNodeValue = " + to_string(IMPASS_NODE_VAL) + ",\n";
mapScript += "numPlayers = " + to_string(map->getNumPlayers()) + ",\n";
mapScript += "numPlayers = " + to_string(players.size()) + ",\n";
int numSpawnPoints = map->getNumSpawnPoints();
mapScript += "numSpawnPoints = " + to_string(numSpawnPoints) + ",\n";
@@ -414,37 +424,37 @@ namespace battleship{
mapScript += "},\nplayers = {\n";
for(int i = 0; i < map->getNumPlayers(); i++){
for(int i = 0; i < players.size(); i++){
mapScript += "{\n";
if(i > 0)
mapScript += "spawnPoint = 0,\n";
else{
vector<GameObject*> npcGameObjs = map->getNpcGameObjects();
mapScript += "numNpcGameObjs = " + to_string(npcGameObjs.size()) + ",\n";
mapScript += "npcGameObjs = {\n";
vector<ResourceDeposit*> resourceDeposits = players[0]->getResourceDeposits();
mapScript += "numResourceDeposits = " + to_string(resourceDeposits.size()) + ",\n";
mapScript += "resourceDeposits = {\n";
for(GameObject *npcGameObj : npcGameObjs){
Vector3 pos = npcGameObj->getPos();
for(ResourceDeposit *rd : resourceDeposits){
Vector3 pos = rd->getPos();
string posStr = "x = " + to_string(pos.x) + ", y = " + to_string(pos.y) + ", z = " + to_string(pos.z);
Quaternion rot = npcGameObj->getRot();
Quaternion rot = rd->getRot();
string rotStr = "w = " + to_string(rot.w) + ", x = " + to_string(rot.x) + ", y = " + to_string(rot.y) + ", z = " + to_string(rot.z);
mapScript += "{id = " + to_string(npcGameObj->getId()) + ", pos = {" + posStr + "}, rot = {" + rotStr + "}},\n";
mapScript += "{id = " + to_string(rd->getId()) + ", pos = {" + posStr + "}, rot = {" + rotStr + "}},\n";
}
mapScript += "},\n";
}
int numUnits = map->getPlayer(i)->getNumberOfUnits();
int numUnits = players[i]->getNumberOfUnits();
mapScript += "numUnits = " + to_string(numUnits) + ",\n";
if(numUnits > 0){
mapScript += "units = {\n";
for(int j = 0; j < numUnits; j++){
Unit *unit = map->getPlayer(i)->getUnit(j);
Unit *unit = getPlayer(i)->getUnit(j);
string idStr = "id = " + to_string(unit->getId());
@@ -605,17 +615,15 @@ namespace battleship{
switch((Bind)bind){
case Bind::LOOK_AROUND:
if(ufCtr->isPlacingFrames()){
Map *map = Map::getSingleton();
Player *player = map->getPlayer(0);
Player *player = mapEditor->getPlayer(0);
GameObjectFrame &frame = ufCtr->getGameObjectFrame(0);
Model *model = frame.getModel();
Vector3 pos = model->getPosition();
Quaternion rot = model->getOrientation();
GameObject *obj;
if(frame.getType() == GameObject::Type::RESOURCE_DEPOSIT){
ResourceDeposit *dep = GameObjectFactory::createResourceDeposit(frame.getId(), pos, rot);
map->addNpcGameObject((GameObject*)dep);
}
if(frame.getType() == GameObject::Type::RESOURCE_DEPOSIT)
player->addResourceDeposit(GameObjectFactory::createResourceDeposit(player, frame.getId(), pos, rot));
else
player->addUnit(GameObjectFactory::createUnit(player, frame.getId(), pos, rot));
}
mapEditorAppState.h
+4
View File
@@ -2,6 +2,7 @@
#define MAP_EDITOR_APP_STATE_H
#include "map.h"
#include "player.h"
#include <listbox.h>
@@ -39,6 +40,8 @@ namespace battleship{
void exportMap();
void prepareTerrainObjects(int = 0, int = -1);
void togglePush(bool);
inline void addPlayer(Player *pl){players.push_back(pl);}
inline Player* getPlayer(int id){return players[id];}
inline vb01::Node* getSelectedNode(){return selectedTerrainNode;}
inline float getGuiThreshold(){return guiThreshold;}
inline float getCircleRadius(){return circleRadius;}
@@ -63,6 +66,7 @@ namespace battleship{
void prepareTerrainObject(vb01::u32**, Map::Cell*, int[3], float, bool);
Map *map;
std::vector<Player*> players;
vb01::Node *selectedTerrainNode = nullptr;
TransformAxis transformAxis = X_AXIS;
vb01Gui::Listbox *skyListbox = nullptr;
playButton.cpp
+15 -2
View File
@@ -2,6 +2,7 @@
#include "gameManager.h"
#include "inGameAppState.h"
#include "concreteGuiManager.h"
#include "game.h"
#include <stateManager.h>
@@ -28,10 +29,22 @@ namespace battleship{
for(int i = 0; i < factionsListboxes.size(); i++)
factions.push_back(to_string(factionsListboxes[i]->getSelectedOption()));
StateManager *stateManager = GameManager::getSingleton()->getStateManager();
int selectedMap = mapListbox->getSelectedOption();
string mapName = wstringToString(mapListbox->getContents()[selectedMap]);
stateManager->attachAppState(new InGameAppState(difficulties, factions, mapName));
Map *map = Map::getSingleton();
map->load(mapName);
Game::getSingleton()->addPlayer(new Player(0, 0, 0));
int numPlayers = map->getNumSpawnPoints();
for(int i = 0; i < numPlayers; i++){
Player *player = new Player(0, 0, 0);
map->loadPlayerGameObjects(player);
Game::getSingleton()->addPlayer(player);
}
StateManager *stateManager = GameManager::getSingleton()->getStateManager();
stateManager->attachAppState(new InGameAppState(difficulties, factions));
ConcreteGuiManager::getSingleton()->readLuaScreenScript("inGame.lua");
}
player.cpp
+9 -10
View File
@@ -1,18 +1,14 @@
#include <solUtil.h>
#include "player.h"
using namespace vb01;
using namespace gameBase;
using namespace std;
#include "resourceDeposit.h"
namespace battleship{
Player::Player(int difficulty, int faction, int id, Vector3 spawnPoint) {
this->difficulty = difficulty;
this->faction = faction;
this->spawnPoint = spawnPoint;
this->id = id;
using namespace vb01;
using namespace gameBase;
using namespace std;
Player::Player(int diff, int fac, int i, Vector3 sp) : difficulty(diff), faction(fac), id(i), spawnPoint(sp) {
//SOL_LUA_STATE.script("players[" + to_string(id + 1) + "] = Player:new({id = " + to_string(id + 1) + "})");
}
@@ -24,6 +20,9 @@ namespace battleship{
for(Unit *u : units)
u->update();
for(ResourceDeposit *rd : resourceDeposits)
rd->update();
}
void Player::issueOrder(Order::TYPE type, vector<Order::Target> targets, bool append){
@@ -39,7 +38,7 @@ namespace battleship{
}
}
bool Player::isThisPlayersUnit(Unit *u) {
bool Player::isThisPlayersUnit(GameObject *u) {
bool foundUnit = false;
if (units.size() > 0) {
player.h
+8 -2
View File
@@ -1,4 +1,3 @@
#pragma once
#ifndef PLAYER_H
#define PLAYER_H
@@ -8,6 +7,9 @@
#include "unit.h"
namespace battleship{
class ResourceDeposit;
class Projectile;
class Player {
public:
Player(int, int, int, vb01::Vector3 = vb01::Vector3::VEC_ZERO);
@@ -16,13 +18,15 @@ namespace battleship{
void issueOrder(Order::TYPE, std::vector<Order::Target>, bool);
void deselectUnit(int);
void deselectUnits();
bool isThisPlayersUnit(Unit*);
bool isThisPlayersUnit(GameObject*);
const inline std::vector<Unit*>& getSelectedUnits(){return selectedUnits;}
inline Unit* getSelectedUnit(int i){return selectedUnits[i];}
inline int getNumSelectedUnits(){return selectedUnits.size();}
inline void selectUnit(Unit *u){selectedUnits.push_back(u);}
inline void selectUnits(std::vector<Unit*> units){selectedUnits = units;}
inline void addUnit(Unit *u){units.push_back(u);}
inline std::vector<ResourceDeposit*>& getResourceDeposits(){return resourceDeposits;}
inline void addResourceDeposit(ResourceDeposit *rd){resourceDeposits.push_back(rd);}
inline Unit* getUnit(int i){return units[i];}
inline std::vector<Unit*>& getUnits(){return units;}
inline void setId(int i){id=i;}
@@ -43,6 +47,8 @@ namespace battleship{
private:
int refineds = 0, wealth = 0, research = 0, faction, difficulty,side,id;
std::vector<Unit*> units, selectedUnits;
std::vector<Projectile*> projectiles;
std::vector<ResourceDeposit*> resourceDeposits;
vb01::Vector3 spawnPoint;
};
}
projectile.cpp
+5 -5
View File
@@ -8,7 +8,7 @@
#include <stateManager.h>
#include "map.h"
#include "game.h"
#include "unit.h"
#include "util.h"
#include "projectile.h"
@@ -103,7 +103,7 @@ namespace battleship{
void Projectile::explode(Node *collNode) {
exploded = true;
for (Player *p : Map::getSingleton()->getPlayers()) {
for (Player *p : Game::getSingleton()->getPlayers()) {
for (Unit *u : p->getUnits())
if (collNode == u->getNode())
u->takeDamage(damage);
@@ -113,11 +113,11 @@ namespace battleship{
InGameAppState *inGameState = ((InGameAppState*)sm->getAppStateByType((int)AppStateType::IN_GAME_STATE));
if(id == 8)
detonateTorpedo(inGameState, pos);
detonateTorpedo();
else if(weaponTypeId == 1 && (id == 2 || id == 3))
detonateDepthCharge(inGameState, pos);
detonateDepthCharge();
else
detonate(inGameState, pos, -dirVec);
detonate(pos, -dirVec);
}
void Projectile::debug(){
resourceDeposit.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
namespace battleship{
using namespace vb01;
ResourceDeposit::ResourceDeposit(int id, Vector3 pos, Quaternion rot) : GameObject(GameObject::Type::RESOURCE_DEPOSIT, id, nullptr, pos, rot){
ResourceDeposit::ResourceDeposit(Player *player, int id, Vector3 pos, Quaternion rot) : GameObject(GameObject::Type::RESOURCE_DEPOSIT, id, player, pos, rot){
initModel();
placeAt(pos);
orientAt(rot);
resourceDeposit.h
+1 -1
View File
@@ -6,7 +6,7 @@
namespace battleship{
class ResourceDeposit : public GameObject{
public:
ResourceDeposit(int, vb01::Vector3, vb01::Quaternion);
ResourceDeposit(Player*, int, vb01::Vector3, vb01::Quaternion);
void update();
private:
};
unit.cpp
-16
View File
@@ -192,17 +192,6 @@ namespace battleship{
removeOrder(orders.size() - 1);
}
std::vector<Projectile*> Unit::getProjectiles(){
std::vector<Projectile*> projectiles;
InGameAppState *inGameState = ((InGameAppState*)GameManager::getSingleton()->getStateManager()->getAppStateByType((int)AppStateType::IN_GAME_STATE));
for(Projectile *p: inGameState->getProjectiles())
if(p->getUnit() == this)
projectiles.push_back(p);
return projectiles;
}
void Unit::addOrder(Order order){
orders.push_back(order);
}
@@ -220,9 +209,4 @@ namespace battleship{
orderLineDispTime = getTime();
}
void Unit::addProjectile(Projectile *p) {
StateManager *stateManager = GameManager::getSingleton()->getStateManager();
((InGameAppState*)stateManager->getAppStateByType((int)AppStateType::IN_GAME_STATE))->addProjectile(p);
}
}
unit.h
-1
View File
@@ -55,7 +55,6 @@ namespace battleship{
virtual void halt();
void toggleSelection(bool);
void setOrder(Order);
void addProjectile(Projectile*);
std::vector<Projectile*> getProjectiles();
virtual void addOrder(Order);
virtual void reinit();