Skip to content
This repository has been archived by the owner on Jan 5, 2024. It is now read-only.

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
Gacyr authored and Gacyr committed Dec 25, 2020
2 parents d45bbd8 + 65e9ab4 commit 21a8ad1
Show file tree
Hide file tree
Showing 9,254 changed files with 58,232 additions and 55,228 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@

#Sprite Owners
*.bmp @spriters
*.png @spriters

#Audio Owners
*.wav @audio-makers
*.ogg @audio-makers
*.flac @audio-makers
*.mp3 @audio-makers
11 changes: 7 additions & 4 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,27 @@ luac.out
*.x86_64
*.hex

# Manifest files
*.manifest

.vs/
_Screenshots/
Base.rte/Settings.ini
Benchmark.rte/
Scenes.rte/
Metagames.rte/
Microsoft.VC90.CRT.manifest
DedicatedServer.bat
DedicatedServerDebug.bat

Cortex Command Experimental Multiplayer Operations Guide.docx

allegro.log
Cortex Command.exe.manifest
Cortex Command.debug.ilk
abortscreen.bmp
MemCleanupInfo.txt

MemCleanupInfo.txt
LogPublish.txt
LogLoading.txt
LogLoadingWarning.txt
LogConsole.txt
Console.dump.log
Console.input.log
Expand Down
22 changes: 11 additions & 11 deletions Base.rte/AI.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ AddActor = AHuman
GlobalAccScalar = 0
ScriptPath = Base.rte/AI/PathFinder.lua
SpriteFile = ContentFile
FilePath = Base.rte/Null.bmp
FilePath = Base.rte/Null.png
AtomGroup = AtomGroup
CopyOf = Null AtomGroup
Health = 100
Expand All @@ -25,7 +25,7 @@ AddActor = AHuman
HitsMOs = 0
GetsHitByMOs = 0
SpriteFile = ContentFile
FilePath = Base.rte/Null.bmp
FilePath = Base.rte/Null.png
AtomGroup = AtomGroup
CopyOf = Null AtomGroup
FGArm = Arm
Expand All @@ -34,31 +34,31 @@ AddActor = AHuman
HitsMOs = 0
GetsHitByMOs = 0
SpriteFile = ContentFile
FilePath = Base.rte/Null.bmp
FilePath = Base.rte/Null.png
AtomGroup = AtomGroup
CopyOf = Null AtomGroup
Hand = ContentFile
FilePath = Base.rte/Null.bmp
FilePath = Base.rte/Null.png
MaxLength = 0
BGArm = Arm
PresetName = Null Arm BG
Mass = 0
HitsMOs = 0
GetsHitByMOs = 0
SpriteFile = ContentFile
FilePath = Base.rte/Null.bmp
FilePath = Base.rte/Null.png
AtomGroup = AtomGroup
CopyOf = Null AtomGroup
Hand = ContentFile
FilePath = Base.rte/Null.bmp
FilePath = Base.rte/Null.png
MaxLength = 0
FGLeg = Leg
PresetName = Null Leg FG
Mass = 0
HitsMOs = 0
GetsHitByMOs = 0
SpriteFile = ContentFile
FilePath = Base.rte/Null.bmp
FilePath = Base.rte/Null.png
AtomGroup = AtomGroup
CopyOf = Null AtomGroup
BGLeg = Leg
Expand All @@ -67,7 +67,7 @@ AddActor = AHuman
HitsMOs = 0
GetsHitByMOs = 0
SpriteFile = ContentFile
FilePath = Base.rte/Null.bmp
FilePath = Base.rte/Null.png
AtomGroup = AtomGroup
CopyOf = Null AtomGroup
HandGroup = AtomGroup
Expand All @@ -88,7 +88,7 @@ AddDevice = TDExplosive
HitsMOs = 0
GetsHitByMOs = 0
SpriteFile = ContentFile
FilePath = Base.rte/Null.bmp
FilePath = Base.rte/Null.png
Buyable = 0
AtomGroup = AtomGroup
CopyOf = Null AtomGroup
Expand All @@ -105,7 +105,7 @@ AddDevice = TDExplosive
HitsMOs = 0
GetsHitByMOs = 0
SpriteFile = ContentFile
FilePath = Base.rte/Null.bmp
FilePath = Base.rte/Null.png
Buyable = 0
AtomGroup = AtomGroup
CopyOf = Null AtomGroup
Expand All @@ -122,7 +122,7 @@ AddDevice = TDExplosive
HitsMOs = 0
GetsHitByMOs = 0
SpriteFile = ContentFile
FilePath = Base.rte/Null.bmp
FilePath = Base.rte/Null.png
Buyable = 0
AtomGroup = AtomGroup
CopyOf = Null AtomGroup
Expand Down
2 changes: 1 addition & 1 deletion Base.rte/AI/CrabBehaviors.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function CrabBehaviors.LookForTargets(AI, Owner)
FoundMO = ToACRocket(FoundMO)
elseif FoundMO.ClassName == "ACDropShip" then
FoundMO = ToACDropShip(FoundMO)
elseif FoundMO.ClassName == "ADoor" then
elseif FoundMO.ClassName == "ADoor" and HumanBehaviors.GetProjectileData(Owner).pen * 0.9 > ToADoor(FoundMO).Door.Material.StructuralIntegrity then
FoundMO = ToADoor(FoundMO)
elseif FoundMO.ClassName == "Actor" then
FoundMO = ToActor(FoundMO)
Expand Down
10 changes: 10 additions & 0 deletions Base.rte/AI/DropShipAI.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,13 @@ end
function UpdateAI(self)
self.AI:Update(self)
end

function Update(self)
--Re-orient the craft at 180 degrees to help rotational AI
if self.RotAngle > math.pi then
self.RotAngle = self.RotAngle - (math.pi * 2);
end
if self.RotAngle < -math.pi then
self.RotAngle = self.RotAngle + (math.pi * 2);
end
end
3 changes: 1 addition & 2 deletions Base.rte/AI/HumanAI.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ function Create(self)
self.visibleInventory = true;
end
function Update(self)

self.controller = self:GetController();

if self.alternativeGib then
Expand All @@ -21,7 +20,7 @@ function Update(self)
HumanFunctions.DoAutomaticEquip(self);
end
if self.armSway then
HumanFunctions.DoArmSway(self, (self.Health / self.MaxHealth)); --Argument: shove strength
HumanFunctions.DoArmSway(self, (self.Health/self.MaxHealth)); --Argument: shove strength
end
if self.visibleInventory then
HumanFunctions.DoVisibleInventory(self, false); --Argument: whether to show all items
Expand Down
Loading

0 comments on commit 21a8ad1

Please sign in to comment.