Skip to content

Commit

Permalink
Improve code style and add license to basic projectile files (FAForev…
Browse files Browse the repository at this point in the history
  • Loading branch information
Garanas authored Nov 6, 2023
1 parent 8e95372 commit f1b6e0a
Show file tree
Hide file tree
Showing 27 changed files with 625 additions and 77 deletions.
2 changes: 1 addition & 1 deletion engine/Sim.lua
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
---@alias Object Blip | CollisionBeam | moho.entity_methods | moho.prop_methods | moho.projectile_methods | moho.unit_methods
---@alias BoneObject moho.entity_methods | moho.prop_methods | moho.projectile_methods | moho.unit_methods
---@alias ReclaimObject moho.prop_methods | moho.unit_methods
---@alias TargetObject moho.prop_methods | moho.unit_methods
---@alias TargetObject moho.prop_methods | moho.unit_methods | moho.projectile_methods

--- restricts the army from building the unit category
---@param army Army
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--******************************************************************************************************
--** Copyright (c) 2023 Willem 'Jip' Wijnia
--** Copyright (c) 2023 FAForever
--**
--** Permission is hereby granted, free of charge, to any person obtaining a copy
--** of this software and associated documentation files (the "Software"), to deal
Expand Down
26 changes: 24 additions & 2 deletions projectiles/ADFDisruptor01/ADFDisruptor01_script.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,26 @@
--******************************************************************************************************
--** Copyright (c) 2023 FAForever
--**
--** Permission is hereby granted, free of charge, to any person obtaining a copy
--** of this software and associated documentation files (the "Software"), to deal
--** in the Software without restriction, including without limitation the rights
--** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--** copies of the Software, and to permit persons to whom the Software is
--** furnished to do so, subject to the following conditions:
--**
--** The above copyright notice and this permission notice shall be included in all
--** copies or substantial portions of the Software.
--**
--** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--** SOFTWARE.
--******************************************************************************************************

-- Aeon Disruptor Projectile
---@class ADFDisruptor01 : ADisruptorProjectile
ADFDisruptor01 = ClassProjectile(import("/lua/aeonprojectiles.lua").ADisruptorProjectile) { }
TypeClass = ADFDisruptor01
ADFDisruptor01 = ClassProjectile(import("/lua/aeonprojectiles.lua").ADisruptorProjectile) {}
TypeClass = ADFDisruptor01
24 changes: 23 additions & 1 deletion projectiles/ADFGraviton01/ADFGraviton01_script.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
--******************************************************************************************************
--** Copyright (c) 2023 FAForever
--**
--** Permission is hereby granted, free of charge, to any person obtaining a copy
--** of this software and associated documentation files (the "Software"), to deal
--** in the Software without restriction, including without limitation the rights
--** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--** copies of the Software, and to permit persons to whom the Software is
--** furnished to do so, subject to the following conditions:
--**
--** The above copyright notice and this permission notice shall be included in all
--** copies or substantial portions of the Software.
--**
--** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--** SOFTWARE.
--******************************************************************************************************

local AGravitonProjectile = import("/lua/aeonprojectiles.lua").AGravitonProjectile

-- Aeon sonic 'bolt'
---@class ADFGraviton01 : AGravitonProjectile
ADFGraviton01 = ClassProjectile(AGravitonProjectile) {}
TypeClass = ADFGraviton01
TypeClass = ADFGraviton01
24 changes: 23 additions & 1 deletion projectiles/ADFLaserHeavy01/ADFLaserHeavy01_script.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
--******************************************************************************************************
--** Copyright (c) 2023 FAForever
--**
--** Permission is hereby granted, free of charge, to any person obtaining a copy
--** of this software and associated documentation files (the "Software"), to deal
--** in the Software without restriction, including without limitation the rights
--** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--** copies of the Software, and to permit persons to whom the Software is
--** furnished to do so, subject to the following conditions:
--**
--** The above copyright notice and this permission notice shall be included in all
--** copies or substantial portions of the Software.
--**
--** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--** SOFTWARE.
--******************************************************************************************************

local ALaserBotProjectile = import("/lua/aeonprojectiles.lua").ALaserBotProjectile

--- Aeon laser 'bolt'
---@class ADFLaserHeavy01 : ALaserBotProjectile
ADFLaserHeavy01 = ClassProjectile(ALaserBotProjectile) {}
TypeClass = ADFLaserHeavy01
TypeClass = ADFLaserHeavy01
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
--******************************************************************************************************
--** Copyright (c) 2023 FAForever
--**
--** Permission is hereby granted, free of charge, to any person obtaining a copy
--** of this software and associated documentation files (the "Software"), to deal
--** in the Software without restriction, including without limitation the rights
--** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--** copies of the Software, and to permit persons to whom the Software is
--** furnished to do so, subject to the following conditions:
--**
--** The above copyright notice and this permission notice shall be included in all
--** copies or substantial portions of the Software.
--**
--** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--** SOFTWARE.
--******************************************************************************************************

local AHighIntensityLaserProjectile = import("/lua/aeonprojectiles.lua").AHighIntensityLaserProjectile

-- Aeon laser 'bolt'
---@class ADFLaserHighIntensity01 : AHighIntensityLaserProjectile
ADFLaserHighIntensity01 = ClassProjectile(AHighIntensityLaserProjectile) {}
TypeClass = ADFLaserHighIntensity01
TypeClass = ADFLaserHighIntensity01
24 changes: 23 additions & 1 deletion projectiles/ADFLaserLight01/ADFLaserLight01_script.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
--******************************************************************************************************
--** Copyright (c) 2023 FAForever
--**
--** Permission is hereby granted, free of charge, to any person obtaining a copy
--** of this software and associated documentation files (the "Software"), to deal
--** in the Software without restriction, including without limitation the rights
--** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--** copies of the Software, and to permit persons to whom the Software is
--** furnished to do so, subject to the following conditions:
--**
--** The above copyright notice and this permission notice shall be included in all
--** copies or substantial portions of the Software.
--**
--** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--** SOFTWARE.
--******************************************************************************************************

local ALightLaserProjectile = import("/lua/aeonprojectiles.lua").ALightLaserProjectile

-- Aeon laser 'bolt'
---@class ADFLaserLight01 : ALightLaserProjectile
ADFLaserLight01 = ClassProjectile(ALightLaserProjectile) {}
TypeClass = ADFLaserLight01
TypeClass = ADFLaserLight01
24 changes: 23 additions & 1 deletion projectiles/ADFLaserLight02/ADFLaserLight02_script.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
--******************************************************************************************************
--** Copyright (c) 2023 FAForever
--**
--** Permission is hereby granted, free of charge, to any person obtaining a copy
--** of this software and associated documentation files (the "Software"), to deal
--** in the Software without restriction, including without limitation the rights
--** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--** copies of the Software, and to permit persons to whom the Software is
--** furnished to do so, subject to the following conditions:
--**
--** The above copyright notice and this permission notice shall be included in all
--** copies or substantial portions of the Software.
--**
--** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--** SOFTWARE.
--******************************************************************************************************

local ALightLaserProjectile = import("/lua/aeonprojectiles.lua").ALightLaserProjectile

-- Aeon laser 'bolt'
---@class ADFLaserLight02 : ALightLaserProjectile
ADFLaserLight02 = ClassProjectile(ALightLaserProjectile) {}
TypeClass = ADFLaserLight02
TypeClass = ADFLaserLight02
24 changes: 23 additions & 1 deletion projectiles/ADFOblivionCannon01/ADFOblivionCannon01_script.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
--******************************************************************************************************
--** Copyright (c) 2023 FAForever
--**
--** Permission is hereby granted, free of charge, to any person obtaining a copy
--** of this software and associated documentation files (the "Software"), to deal
--** in the Software without restriction, including without limitation the rights
--** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--** copies of the Software, and to permit persons to whom the Software is
--** furnished to do so, subject to the following conditions:
--**
--** The above copyright notice and this permission notice shall be included in all
--** copies or substantial portions of the Software.
--**
--** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--** SOFTWARE.
--******************************************************************************************************

local AOblivionCannonProjectile = import("/lua/aeonprojectiles.lua").AOblivionCannonProjectile

-- Aeon quantum 'bolt'
---@class ADFOblivionCannon01 : AOblivionCannonProjectile
ADFOblivionCannon01 = ClassProjectile(AOblivionCannonProjectile) {}
TypeClass = ADFOblivionCannon01
TypeClass = ADFOblivionCannon01
24 changes: 23 additions & 1 deletion projectiles/ADFOblivionCannon02/ADFOblivionCannon02_script.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
--******************************************************************************************************
--** Copyright (c) 2023 FAForever
--**
--** Permission is hereby granted, free of charge, to any person obtaining a copy
--** of this software and associated documentation files (the "Software"), to deal
--** in the Software without restriction, including without limitation the rights
--** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--** copies of the Software, and to permit persons to whom the Software is
--** furnished to do so, subject to the following conditions:
--**
--** The above copyright notice and this permission notice shall be included in all
--** copies or substantial portions of the Software.
--**
--** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--** SOFTWARE.
--******************************************************************************************************

local AOblivionCannonProjectile = import("/lua/aeonprojectiles.lua").AOblivionCannonProjectile

-- Aeon quantum 'bolt'
---@class ADFOblivionCannon02 : AOblivionCannonProjectile
ADFOblivionCannon02 = ClassProjectile(AOblivionCannonProjectile) {}
TypeClass = ADFOblivionCannon02
TypeClass = ADFOblivionCannon02
26 changes: 24 additions & 2 deletions projectiles/ADFOblivionCannon03/ADFOblivionCannon03_script.lua
Original file line number Diff line number Diff line change
@@ -1,8 +1,30 @@
--******************************************************************************************************
--** Copyright (c) 2023 FAForever
--**
--** Permission is hereby granted, free of charge, to any person obtaining a copy
--** of this software and associated documentation files (the "Software"), to deal
--** in the Software without restriction, including without limitation the rights
--** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--** copies of the Software, and to permit persons to whom the Software is
--** furnished to do so, subject to the following conditions:
--**
--** The above copyright notice and this permission notice shall be included in all
--** copies or substantial portions of the Software.
--**
--** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--** SOFTWARE.
--******************************************************************************************************

local AOblivionCannonProjectile = import("/lua/aeonprojectiles.lua").AOblivionCannonProjectile

--- Aeon Oblivion Cannon projectile
---@class ADFOblivionCannon01 : AOblivionCannonProjectile
ADFOblivionCannon03 = ClassProjectile(AOblivionCannonProjectile) {
FxTrails = {'/effects/emitters/oblivion_cannon_munition_02_emit.bp'},
FxTrails = { '/effects/emitters/oblivion_cannon_munition_02_emit.bp' },
}
TypeClass = ADFOblivionCannon03
TypeClass = ADFOblivionCannon03
24 changes: 23 additions & 1 deletion projectiles/ADFOblivionCannon04/ADFOblivionCannon04_script.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
--******************************************************************************************************
--** Copyright (c) 2023 FAForever
--**
--** Permission is hereby granted, free of charge, to any person obtaining a copy
--** of this software and associated documentation files (the "Software"), to deal
--** in the Software without restriction, including without limitation the rights
--** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--** copies of the Software, and to permit persons to whom the Software is
--** furnished to do so, subject to the following conditions:
--**
--** The above copyright notice and this permission notice shall be included in all
--** copies or substantial portions of the Software.
--**
--** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--** SOFTWARE.
--******************************************************************************************************

local AOblivionCannonProjectile = import("/lua/aeonprojectiles.lua").AOblivionCannonProjectile02

-- Aeon quantum 'bolt'
---@class ADFOblivionCannon04 : AOblivionCannonProjectile02
ADFOblivionCannon04 = ClassProjectile(AOblivionCannonProjectile) {}
TypeClass = ADFOblivionCannon04
TypeClass = ADFOblivionCannon04
24 changes: 23 additions & 1 deletion projectiles/ADFOblivionCannon05/ADFOblivionCannon05_script.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
--******************************************************************************************************
--** Copyright (c) 2023 FAForever
--**
--** Permission is hereby granted, free of charge, to any person obtaining a copy
--** of this software and associated documentation files (the "Software"), to deal
--** in the Software without restriction, including without limitation the rights
--** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--** copies of the Software, and to permit persons to whom the Software is
--** furnished to do so, subject to the following conditions:
--**
--** The above copyright notice and this permission notice shall be included in all
--** copies or substantial portions of the Software.
--**
--** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--** SOFTWARE.
--******************************************************************************************************

local AOblivionCannonProjectile = import("/lua/aeonprojectiles.lua").AOblivionCannonProjectile03

-- Aeon quantum 'bolt'
---@class ADFOblivionCannon04 : AOblivionCannonProjectile03
ADFOblivionCannon03 = ClassProjectile(AOblivionCannonProjectile) {}
TypeClass = ADFOblivionCannon03
TypeClass = ADFOblivionCannon03
Loading

0 comments on commit f1b6e0a

Please sign in to comment.