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 branch 'depth-charge' into ft-217-depth-charge

Browse Source
This commit is contained in:
devZoGok
2026-01-29 20:47:52 +02:00
parent 6ffa182150 ad1922fe48
commit 450dcdb1d8
16 changed files with 137769 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Models/Maps/w4/minimap.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 754 B

Assets/Models/Maps/w4/w4.jpg
Executable
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 49 KiB

Assets/Models/Maps/w4/w4.lua
+15161
View File
File diff suppressed because it is too large Load Diff
Assets/Models/Maps/w4/w4.xml
+122418
View File
File diff suppressed because it is too large Load Diff
Assets/Scripts/GameObjects/Projectiles/projectileData.lua
+17 -5
View File
@@ -1,5 +1,5 @@
ProjectileId = {HE_SHELL = 0, EMP_SHELL = 1, CRUISE_MISSILE = 2, MISSILE = 3, TORPEDO = 4}
ProjectileClass = {SHELL = 0, CRUISE_MISSILE = 1, MISSILE = 2, TORPEDO = 3}
ProjectileId = {HE_SHELL = 0, EMP_SHELL = 1, CRUISE_MISSILE = 2, MISSILE = 3, TORPEDO = 4, DEPTH_CHARGE = 5}
ProjectileClass = {SHELL = 0, CRUISE_MISSILE = 1, MISSILE = 2, TORPEDO = 3, DEPTH_CHARGE = 4}
G = 9.8
explosionVfx = {
@@ -20,7 +20,7 @@ explosionSfx = {
path = PATH .. 'Sounds/SFX/Explosions/explosion02.ogg',
duration = 2500
}
Detonation = {EXPLOSION = 0, EMP = 1, CRYO = 2}
Detonation = {EXPLOSION = 0, EMP = 1, CRYO = 2, UNDERWATER = 3}
projectiles = {
{
@@ -80,13 +80,25 @@ projectiles = {
{
projectileClass = ProjectileClass.TORPEDO,
size = {x = 1, y = 6, z = 1},
speed = .06,
explosion = {detonation = Detonation.EXPLOSION, damage = 20, radius = 3, fx = {explosionVfx, explosionSfx}},
speed = .6,
explosion = {detonation = Detonation.UNDERWATER, damage = 20, radius = 3, fx = {explosionVfx, explosionSfx}},
directHitDamage = 450,
rayLength = 3.5,
name = "Torpedo",
basePath = PATH .. "Models/GameObjects/Projectiles/Torpedos/",
meshPath = "torpedo.xml",
albedoPath = 'torpedo.jpg'
},
{
projectileClass = ProjectileClass.DEPTH_CHARGE,
size = {x = 5.3, y = 5.3, z = 5.8},
speed = .06,
explosion = {detonation = Detonation.UNDERWATER, damage = 20, radius = 3, fx = {explosionVfx, explosionSfx}},
directHitDamage = 450,
rayLength = 3.5,
name = "Depth charge",
basePath = PATH .. "Models/GameObjects/Projectiles/DepthCharges/",
meshPath = "depthCharge.xml",
albedoPath = 'depthCharge.jpg'
}
}
Assets/Scripts/GameObjects/Units/unitData.lua
+64 -17
View File
@@ -200,6 +200,7 @@ units = {
rateOfFire = 100,
maxRange = 14,
damage = 50,
maxFireAngle = .15,
fireFx = {
{
vfx = true,
@@ -260,7 +261,7 @@ units = {
selectionSfx = PATH .. 'Sounds/Units/WarMechs/selection.ogg',
speed = .3,
destinationOffset = .1,
anglePrecision = .1,
anglePrecision = .01,
maxTurnAngle = .1,
garrisonCategory = 1,
deathFx = {explosionVfx, explosionSfx},
@@ -623,7 +624,7 @@ units = {
colorNodes = {'barrel'},
selectionSfx = PATH .. 'Sounds/Units/Tanks/selection.ogg',
speed = .3,
destinationOffset = .1,
destinationOffset = .01,
anglePrecision = .1,
maxTurnAngle = .1,
garrisonCategory = 2,
@@ -1199,7 +1200,7 @@ units = {
meshPath = 'acsCargoShip.xml',
albedoPath = 'cargoship.jpg',
selectionSfx = PATH .. 'Sounds/Units/Cargoships/selection.ogg',
speed = .1,
speed = .3,
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
@@ -1234,7 +1235,7 @@ units = {
meshPath = 'aincCargoShip.xml',
albedoPath = 'cargoship.jpg',
selectionSfx = PATH .. 'Sounds/Units/Cargoships/selection.ogg',
speed = .1,
speed = .3,
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
@@ -1269,7 +1270,7 @@ units = {
meshPath = 'erCargoShip.xml',
albedoPath = 'cargoship.jpg',
selectionSfx = PATH .. 'Sounds/Units/Cargoships/selection.ogg',
speed = .1,
speed = .3,
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
@@ -1609,9 +1610,25 @@ units = {
weapons = {
{
orderType = OrderType.ATTACK,
rateOfFire = 200,
rateOfFire = 2000,
damage = 10,
maxRange = 100,
targetUnits = {UnitType.UNDERWATER},
targetProjectiles = {},
fireDir = {x = 0, y = -1, z = 0},
projectile = {id = ProjectileId.DEPTH_CHARGE, parent = 'hull', pos = {x = 0, y = -2, z = 0}, rot = {w = .707, x = .707, y = 0, z = 0}},
fireFx = {
{vfx = false, duration = 50, path = PATH .. 'Sounds/Units/Submarines/fire.ogg'}
},
hitFx = {}
},
{
orderType = OrderType.ATTACK,
rateOfFire = 200,
damage = 10,
minRange = 10,
maxRange = 500,
maxFireAngle = .01,
nodes = {
{name = 'FrontTurret', rotationSpeed = .05, angleConstraints = {min = -2.53, max = 2.53}, vertical = false},
{name = 'FrontTurretBarrel', rotationSpeed = .05, angleConstraints = {min = -.174, max = .174}, vertical = true}
@@ -1634,7 +1651,9 @@ units = {
orderType = OrderType.ATTACK,
rateOfFire = 200,
damage = 10,
maxRange = 100,
minRange = 10,
maxRange = 500,
maxFireAngle = .01,
nodes = {
{name = 'RearTurret', rotationSpeed = .05, angleConstraints = {min = -2.53, max = 2.53}, vertical = false},
{name = 'RearTurretBarrel', rotationSpeed = .05, angleConstraints = {min = -.174, max = .174}, vertical = true}
@@ -1663,14 +1682,14 @@ units = {
cost = 500,
size = {x = 6.93, y = 17.7, z = 76.1},
hitboxOffset = {x = 0, y = 4.77, z = 0},
lineOfSight = 5,
lineOfSight = 100,
colorNodes = {'FrontTurret', 'RearTurret'},
name = 'Anti sub cruiser',
basePath = PATH .. vehiclePrefix .. 'Cruisers/',
meshPath = 'acsAntiSubCruiser.xml',
albedoPath = 'cruiser.jpg',
selectionSfx = PATH .. 'Sounds/Units/Cruisers/selection.ogg',
speed = .1,
speed = .3,
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
@@ -1679,6 +1698,20 @@ units = {
},
{
weapons = {
{
orderType = OrderType.ATTACK,
rateOfFire = 2000,
damage = 10,
maxRange = 100,
targetUnits = {UnitType.UNDERWATER},
targetProjectiles = {},
fireDir = {x = 0, y = -1, z = 0},
projectile = {id = ProjectileId.DEPTH_CHARGE, parent = 'Cruiser', pos = {x = 0, y = -2, z = 0}, rot = {w = .707, x = .707, y = 0, z = 0}},
fireFx = {
{vfx = false, duration = 50, path = PATH .. 'Sounds/Units/Submarines/fire.ogg'}
},
hitFx = {}
},
{
orderType = OrderType.ATTACK,
rateOfFire = 200,
@@ -1779,7 +1812,7 @@ units = {
cost = 500,
size = {x = 9.09, y = 13.6, z = 66.6},
hitboxOffset = {x = 0, y = .88, z = 0},
lineOfSight = 5,
lineOfSight = 100,
colorNodes = {'sides'},
name = 'Anti sub cruiser',
basePath = PATH .. vehiclePrefix .. 'Cruisers/',
@@ -1795,6 +1828,20 @@ units = {
},
{
weapons = {
{
orderType = OrderType.ATTACK,
rateOfFire = 2000,
damage = 10,
maxRange = 100,
targetUnits = {UnitType.UNDERWATER},
targetProjectiles = {},
fireDir = {x = 0, y = -1, z = 0},
projectile = {id = ProjectileId.DEPTH_CHARGE, parent = 'Gunship', pos = {x = 0, y = -2, z = 0}, rot = {w = .707, x = .707, y = 0, z = 0}},
fireFx = {
{vfx = false, duration = 50, path = PATH .. 'Sounds/Units/Submarines/fire.ogg'}
},
hitFx = {}
},
{
orderType = OrderType.ATTACK,
rateOfFire = 200,
@@ -1925,14 +1972,14 @@ units = {
cost = 500,
size = {x = 6.59, y = 8.6, z = 71.8},
hitboxOffset = {x = 0, y = 1.11, z = .84},
lineOfSight = 5,
lineOfSight = 100,
colorNodes = {'Gunship.001'},
name = 'Anti sub cruiser',
basePath = PATH .. vehiclePrefix .. 'Cruisers/',
meshPath = 'erAntiSubCruiser.xml',
albedoPath = 'cruiser.jpg',
selectionSfx = PATH .. 'Sounds/Units/Cruisers/selection.ogg',
speed = .1,
speed = .3,
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
@@ -2101,7 +2148,7 @@ units = {
orderType = OrderType.ATTACK,
projectile = {id = ProjectileId.TORPEDO, pos = {x = 0, y = -.27, z = 4.6}, rot = {w = 1, x = 0, y = 0, z = 0}},
damage = 200,
maxRange = 20,
maxRange = 200,
rateOfFire = 500,
fireFx = {
{
@@ -2120,14 +2167,14 @@ units = {
cost = 500,
size = {x = 9.29, y = 11.6, z = 32.9},
hitboxOffset = {x = 0, y = 1.8, z = -1.3},
lineOfSight = 5,
lineOfSight = 0,
name = 'Stealth submarine',
colorNodes = {'Cube.001'},
basePath = PATH .. vehiclePrefix .. 'Submarines/',
meshPath = 'acsSubmarine.xml',
albedoPath = 'submarine.jpg',
selectionSfx = PATH .. 'Sounds/Units/Submarines/selection.ogg',
speed = .1,
speed = .2,
destinationOffset = .1,
anglePrecision = .1,
maxTurnAngle = .1,
@@ -2159,7 +2206,7 @@ units = {
cost = 500,
hitboxOffset = {x = 0, y = 1.83, z = -3.46},
size = {x = 8.32, y = 12.1, z = 57.4},
lineOfSight = 5,
lineOfSight = 0,
name = 'Stealth submarine',
colorNodes = {'Cube.001'},
basePath = PATH .. vehiclePrefix .. 'Submarines/',
@@ -2198,7 +2245,7 @@ units = {
cost = 500,
hitboxOffset = {x = 0, y = 1.03, z = -1.41},
size = {x = 5.37, y = 7.66, z = 43},
lineOfSight = 5,
lineOfSight = 0,
name = 'Stealth submarine',
colorNodes = {'Sphere.001'},
basePath = PATH .. vehiclePrefix .. 'Submarines/',