Merge branch 'development' into browncoat-mission

Author: Causeless

.github/workflows/meson.yml

@@ -84,7 +84,7 @@ jobs:
           sudo pip install meson
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.11 # Keep this at 1.2.11 until #181 or #182 is closed
+        uses: hendrikmuhs/ccache-action@v1
         with:
           key: ${{ github.job }}-${{ matrix.os }}
 
@@ -175,6 +175,8 @@ jobs:
         env:
           OSXCROSS_MACPORTS_MIRROR: "https://packages.macports.org"
         run: |
+          echo "::group::Installing pkg-config"
+          sudo apt install pkg-config
           echo "::group::Installing mac deps"
           omp install libsdl2 onetbb lz4 libpng minizip luajit flac
           echo "OSXCROSS_PKG_CONFIG_PATH=${{env.OSXCROSS_TARGET}}/macports/pkgs/opt/local/libexec/onetbb/lib/pkgconfig" >> $GITHUB_ENV
@@ -191,7 +193,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2.11 # Keep this at 1.2.11 until #181 or #182 is closed
+        uses: hendrikmuhs/ccache-action@v1
         with:
           key: ${{ github.job }}-${{ matrix.os }}
 

Data/Base.rte/AI/NativeCrabAI.lua

@@ -8,12 +8,16 @@ function NativeCrabAI:Create(Owner)
 	local Members = {};
 
 	Members.lateralMoveState = Actor.LAT_STILL;
+	Members.jumpState = ACrab.NOTJUMPING;
 	Members.deviceState = ACrab.STILL;
 	Members.lastAIMode = Actor.AIMODE_NONE;
 	Members.teamBlockState = Actor.NOTBLOCKED;
 	Members.SentryFacing = Owner.HFlipped;
 	Members.fire = false;
+	Members.groundContact = 5;
+	Members.flying = false;
 
+	Members.AirTimer = Timer();
 	Members.ReloadTimer = Timer();
 	Members.BlockedTimer = Timer();
 	Members.TargetLostTimer = Timer();
@@ -38,6 +42,15 @@ function NativeCrabAI:Create(Owner)
 	-- set shooting skill
 	Members.aimSpeed, Members.aimSkill = SharedBehaviors.GetTeamShootingSkill(Owner.Team);
 
+	-- the native AI assume the jetpack cannot be destroyed
+	if Owner.Jetpack then
+		if not Members.isPlayerOwned then
+			Owner.Jetpack.JetTimeTotal = Owner.Jetpack.JetTimeTotal * 1.2;	-- increase jetpack fuel to compensate for extra fuel spend
+		end
+
+		Members.minBurstTime = math.min(Owner.Jetpack.BurstSpacing*2, Owner.Jetpack.JetTimeTotal*0.99); -- in milliseconds
+	end
+
 	setmetatable(Members, self);
 	self.__index = self;
 	return Members;
@@ -46,6 +59,12 @@ end
 function NativeCrabAI:Update(Owner)
 	self.Ctrl = Owner:GetController();
 
+	-- Our jetpack might have thrust balancing enabled, so update for our current mass
+	if Owner.Jetpack then		
+		self.jetImpulseFactor = Owner.Jetpack:EstimateImpulse(false) * GetPPM() / TimerMan.DeltaTimeSecs;
+		self.jetBurstFactor = (Owner.Jetpack:EstimateImpulse(true) * GetPPM() / TimerMan.DeltaTimeSecs - self.jetImpulseFactor) * math.pow(TimerMan.DeltaTimeSecs, 2) * 0.5;
+	end
+
 	if self.isPlayerOwned then
 		if self.PlayerInterferedTimer:IsPastSimTimeLimit() then
 			-- Tell the coroutines to abort to avoid memory leaks
@@ -273,6 +292,50 @@ function NativeCrabAI:Update(Owner)
 		end
 	end
 
+	-- check if the feet reach the ground
+	if self.AirTimer:IsPastSimMS(250) then
+		self.AirTimer:Reset();
+
+		local Origin = {};
+		if Owner.LeftFGLeg then
+			table.insert(Origin, Vector(Owner.LeftFGLeg.Pos.X, Owner.LeftFGLeg.Pos.Y) + Vector(0, 4));
+		end
+		if Owner.RightFGLeg then
+			table.insert(Origin, Vector(Owner.RightFGLeg.Pos.X, Owner.RightFGLeg.Pos.Y) + Vector(0, 4));
+		end
+		if Owner.LeftBGLeg then
+			table.insert(Origin, Vector(Owner.LeftBGLeg.Pos.X, Owner.LeftBGLeg.Pos.Y) + Vector(0, 4));
+		end
+		if Owner.RightBGLeg then
+			table.insert(Origin, Vector(Owner.RightBGLeg.Pos.X, Owner.RightBGLeg.Pos.Y) + Vector(0, 4));
+		end
+		if #Origin == 0 then
+			table.insert(Origin, Vector(Owner.Pos.X, Owner.Pos.Y) + Vector(0, 4 + ToMOSprite(Owner):GetSpriteHeight() + Owner.SpriteOffset.Y));
+		end
+		for i = 1, #Origin do
+			if SceneMan:GetTerrMatter(Origin[i].X, Origin[i].Y) ~= rte.airID then
+				self.groundContact = 5;
+				break;
+			else
+				self.groundContact = self.groundContact - 1;
+			end
+		end
+
+		local newFlying = false;
+		if not (Owner.LeftFGLeg and Owner.RightFGLeg and Owner.LeftBGLeg and Owner.RightBGLeg) then
+			newFlying = true;
+		end
+
+		if self.groundContact < 0 then
+			newFlying = true;
+		end
+
+		if self.flying ~= newFlying then
+			Owner:SendMessage("AI_IsFlying", newFlying);
+			self.flying = newFlying;
+		end
+	end
+
 	-- controller states
 	self.Ctrl:SetState(Controller.WEAPON_FIRE, self.fire or self.squadShoot);
 
@@ -285,6 +348,24 @@ function NativeCrabAI:Update(Owner)
 	elseif self.lateralMoveState == Actor.LAT_RIGHT then
 		self.Ctrl:SetState(Controller.MOVE_RIGHT, true);
 	end
+
+	if self.jump and Owner.Jetpack and Owner.Jetpack.JetTimeLeft > TimerMan.AIDeltaTimeMS then
+		if self.jumpState == ACrab.PREJUMP then
+			self.jumpState = ACrab.UPJUMP;
+		elseif self.jumpState ~= ACrab.UPJUMP then	-- the jetpack is off
+			self.jumpState = ACrab.PREJUMP;
+		end
+	else
+		self.jumpState = ACrab.NOTJUMPING;
+	end
+
+	if Owner.Jetpack then
+		if self.jumpState == ACrab.PREJUMP then
+			self.Ctrl:SetState(Controller.BODY_JUMPSTART, true); -- try to trigger a burst
+		elseif self.jumpState == ACrab.UPJUMP then
+			self.Ctrl:SetState(Controller.BODY_JUMP, true); -- trigger normal jetpack emission
+		end
+	end
 end
 
 function NativeCrabAI:Destroy(Owner)

Data/Base.rte/AI/SharedBehaviors.lua

@@ -630,6 +630,9 @@ function SharedBehaviors.GoToWpt(AI, Owner, Abort)
 										AI.lateralMoveState = Actor.LAT_STILL;
 										AI.jump = false;
 
+										local _ai, _ownr, _abrt = coroutine.yield(); -- wait until next frame
+										if _abrt then return true end
+
 										if Owner.MOMoveTarget and MovableMan:ValidMO(Owner.MOMoveTarget) then
 											Trace = SceneMan:ShortestDistance(Owner.Pos, Owner.MOMoveTarget.Pos, false);
 											if Trace.Largest > Owner.Height * 0.4 + (Owner.MOMoveTarget.Height or 100) * 0.4 or
@@ -837,7 +840,7 @@ function SharedBehaviors.GoToWpt(AI, Owner, Abort)
 									end
 								end
 
-								if Owner.Jetpack and Owner.Head and Owner.Head:IsAttached() then
+								if Owner.Jetpack then
 									if Owner.Jetpack.JetTimeLeft < AI.minBurstTime then
 										if not AI.flying or Owner.Vel.Y > 4 then
 											AI.jump = false; -- not enough fuel left, no point in jumping yet
@@ -944,7 +947,7 @@ function SharedBehaviors.GoToWpt(AI, Owner, Abort)
 											local Trace = SceneMan:ShortestDistance(Owner.Pos, FallPos, false);
 											SceneMan:CastObstacleRay(Owner.Pos, Trace, FallPos, Vector(), Owner.ID, Owner.IgnoresWhichTeam, rte.grassID, 3);
 
-											local deltaToJump = 1;
+											local deltaToJump = 5;
 											if Owner.Jetpack.JetpackType == AEJetpack.JumpPack then
 												deltaToJump = deltaToJump * 1.4;
 											end