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 #67 from devZoGok/ft-62-carriers

Browse Source 
Ft 62 carriers
This commit is contained in:
devZoGok
2024-01-24 16:52:41 +00:00
committed by GitHub
parent aeee79826f 912e65194e
commit 65e8a123d2
10 changed files with 241656 additions and 47441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Models/GameObjects/Units/Vehicles/Carriers/carrier.blend1
BIN
View File
Binary file not shown.
Assets/Models/GameObjects/Units/Vehicles/Carriers/championCarrier.blend
BIN
View File
Binary file not shown.
Assets/Models/GameObjects/Units/Vehicles/Carriers/championCarrier.blend1
BIN
View File
Binary file not shown.
Assets/Models/GameObjects/Units/Vehicles/Carriers/championCarrier.xml
+194202
View File
File diff suppressed because it is too large Load Diff
Assets/Models/GameObjects/Units/Vehicles/Carriers/heavyCarrier.blend
BIN
View File
Binary file not shown.
Assets/Models/GameObjects/Units/Vehicles/Carriers/carrier.blend → Assets/Models/GameObjects/Units/Vehicles/Carriers/heavyCarrier.blend1
BIN
View File
Binary file not shown.
Assets/Models/GameObjects/Units/Vehicles/Carriers/carrier.xml → Assets/Models/GameObjects/Units/Vehicles/Carriers/heavyCarrier.xml
+47437 -47437
View File
File diff suppressed because it is too large Load Diff
Assets/Scripts/Core/player.lua
+1 -1
View File
@@ -83,7 +83,7 @@ function Player:issueBuildOrder()
end
spawnPoint = self:getSpawnPoint()
structure = GameObjectFactory.createUnit(self, 14, spawnPoint, Quaternion:new(1, 0, 0, 0), 0)
structure = GameObjectFactory.createUnit(self, 15, spawnPoint, Quaternion:new(1, 0, 0, 0), 0)
self:addUnit(structure)
self:issueOrder(1, Vector3:new(0, 0, 0), {Target:new(structure, Vector3:new(0, 0, 0))}, false)
Assets/Scripts/GameObjects/Units/unitData.lua
+15 -3
View File
@@ -39,7 +39,13 @@ units = {
{{type = WeaponClass.HITSCAN, rateOfFire = 200, fireSfx = PATH .. 'Sounds/Units/Cruisers/fire.ogg', damage = 300, maxRange = 15}},
{{type = WeaponClass.HITSCAN, rateOfFire = 200, fireSfx = PATH .. 'Sounds/Units/Cruisers/fire.ogg', damage = 300, maxRange = 15}},
{{type = WeaponClass.HITSCAN, rateOfFire = 200, fireSfx = PATH .. 'Sounds/Units/Cruisers/fire.ogg', damage = 300, maxRange = 15}},
{},
{
{type = WeaponClass.HITSCAN, rateOfFire = 100, fireSfx = PATH .. 'Sounds/Units/WarMechs/fire.ogg', damage = 80, maxRange = 100},
},
{
{type = WeaponClass.HITSCAN, rateOfFire = 300, fireSfx = PATH .. 'Sounds/Units/Tanks/attack.ogg', damage = 500, maxRange = 100},
{type = WeaponClass.CRUISE_MISSILE, rateOfFire = 500, fireSfx = PATH .. 'Sounds/Units/Submarines/missile.ogg', maxRange = 30, projectile = {id = 0, pos = {x = 0, y = 1, z = 0}, rot = {w = .707, x = -.707, y = 0, z = 0}}}
},
{
{type = WeaponClass.TORPEDO, rateOfFire = 500, fireSfx = PATH .. 'Sounds/Units/Submarines/fire.ogg', damage = 200, maxRange = 20, projectile = {id = 1, pos = {x = 0, y = -.27, z = 4.6}, rot = {w = 1, x = 0, y = 0, z = 0}}},
{type = WeaponClass.CRUISE_MISSILE, rateOfFire = 500, fireSfx = PATH .. 'Sounds/Units/Submarines/missile.ogg', maxRange = 30, projectile = {id = 0, pos = {x = 0, y = 2.44, z = -3.5}, rot = {w = .707, x = -.707, y = 0, z = 0}}}
@@ -49,7 +55,7 @@ units = {
{},
{},
{},
{{type = WeaponClass.HITSCAN, rateOfFire = 500, fireSfx = PATH .. 'Sounds/Units/WarMechs/fire.ogg', damage = 50, maxRange = 10}},
{{type = WeaponClass.HITSCAN, rateOfFire = 100, fireSfx = PATH .. 'Sounds/Units/WarMechs/fire.ogg', damage = 50, maxRange = 50}},
{},
{}
},
@@ -66,6 +72,7 @@ units = {
UnitClass.CRUISER,
UnitClass.CRUISER,
UnitClass.CARRIER,
UnitClass.CARRIER,
UnitClass.MISSILE_SUBMARINE,
UnitClass.STEALTH_SUBMARINE,
UnitClass.LAND_FACTORY,
@@ -90,6 +97,7 @@ units = {
UnitType.SEA_LEVEL,
UnitType.SEA_LEVEL,
UnitType.SEA_LEVEL,
UnitType.SEA_LEVEL,
UnitType.UNDERWATER,
UnitType.UNDERWATER,
UnitType.LAND,
@@ -121,7 +129,6 @@ units = {
{},
{},
{},
{},
{}
},
@@ -679,6 +686,7 @@ units = {
'Cheap cruiser',
'Transport cruiser',
'Heavy carrier',
'Champion carrier',
'Missile submarine',
'Stealth submarine',
'Land factory',
@@ -702,6 +710,7 @@ units = {
'cheapCruiser.xml',
'transportCruiser.xml',
'heavyCarrier.xml',
'championCarrier.xml',
'missileSubmarine.xml',
'stealthSubmarine.xml',
'landFactory.xml',
@@ -725,6 +734,7 @@ units = {
PATH .. vehiclePrefix .. 'Cruisers/',
PATH .. vehiclePrefix .. 'Cruisers/',
PATH .. vehiclePrefix .. 'Carriers/',
PATH .. vehiclePrefix .. 'Carriers/',
PATH .. vehiclePrefix .. 'Submarines/',
PATH .. vehiclePrefix .. 'Submarines/',
PATH .. structurePrefix .. 'LandFactories/',
@@ -748,6 +758,7 @@ units = {
PATH .. 'Sounds/Units/Cruisers/selection.ogg',
PATH .. 'Sounds/Units/Cruisers/selection.ogg',
PATH .. 'Sounds/Units/Carriers/selection.ogg',
PATH .. 'Sounds/Units/Carriers/selection.ogg',
PATH .. 'Sounds/Units/Submarines/selection.ogg',
PATH .. 'Sounds/Units/Submarines/selection.ogg',
PATH .. 'Sounds/Units/Sample/selection.ogg',
@@ -780,5 +791,6 @@ units = {
PATH .. 'Sounds/SFX/Explosions/explosion01.ogg',
PATH .. 'Sounds/SFX/Explosions/explosion01.ogg',
PATH .. 'Sounds/SFX/Explosions/explosion01.ogg',
PATH .. 'Sounds/SFX/Explosions/explosion01.ogg',
}
}
vehicle.cpp
+1
View File
@@ -227,6 +227,7 @@ namespace battleship{
debugPathPoints.push_back(n);
}
//TODO allow ships to attack land targets and vice versa
void Vehicle::preparePathpoints(Order &order, Vector3 destPos, bool appendDestPos){
removeAllPathpoints();