-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into hook-docs
- Loading branch information
Showing
108 changed files
with
397 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| name: Deploy to Workshop | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| deploy: | ||
| if: github.repository == 'ACF-Team/ACF-3-Missiles' | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| path: project | ||
|
|
||
| - name: Create Commit Version File | ||
| shell: bash | ||
| run: | | ||
| mkdir -p ${{ github.workspace }}/project/data_static/acf | ||
| echo "${{ github.sha }}" > ${{ github.workspace }}/project/data_static/acf/acf-3-missiles-version.txt | ||
| - name: Upload to Workshop | ||
| uses: CFC-Servers/gmod-upload@master | ||
| with: | ||
| id: 3248769787 | ||
| changelog: "${{ github.event.head_commit.message }}" | ||
| title: "[ACF-3] Armored Combat Framework - Missiles" | ||
| type: "tool" | ||
| tag1: "build" | ||
| tag2: "fun" | ||
| tag3: "realism" | ||
| env: | ||
| STEAM_USERNAME: ${{ secrets.ACF_STEAM_ACCOUNT }} | ||
| STEAM_PASSWORD: ${{ secrets.ACF_STEAM_PASSWORD }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,147 @@ | ||
| local Clock = ACF.Utilities.Clock | ||
| local Queued = {} | ||
|
|
||
| include("shared.lua") | ||
|
|
||
| language.Add("Cleanup_acf_rack", "ACF Racks") | ||
| language.Add("Cleaned_acf_rack", "Cleaned up all ACF Racks") | ||
| language.Add("SBoxLimit__acf_rack", "You've hit the ACF Rack limit!") | ||
|
|
||
| do -- Overlay/networking | ||
| function ENT:RequestRackInfo() | ||
| if Queued[self] then return end | ||
|
|
||
| Queued[self] = true | ||
|
|
||
| timer.Simple(5, function() Queued[self] = nil end) | ||
|
|
||
| net.Start("ACF.RequestRackInfo") | ||
| net.WriteEntity(self) | ||
| net.SendToServer() | ||
| end | ||
|
|
||
| net.Receive("ACF.RequestRackInfo",function() | ||
| local Rack = net.ReadEntity() | ||
| if not IsValid(Rack) then return end | ||
|
|
||
| Queued[Rack] = nil | ||
|
|
||
| local RackInfo = util.JSONToTable(net.ReadString()) | ||
| local CrateInfo = util.JSONToTable(net.ReadString()) | ||
|
|
||
| if RackInfo.HasComputer then | ||
| local Computer = Entity(RackInfo.Computer) | ||
| if IsValid(Computer) then | ||
| Rack.Computer = Computer | ||
| end | ||
| end | ||
|
|
||
| if RackInfo.HasRadar then | ||
| local Radar = Entity(RackInfo.Radar) | ||
| if IsValid(Radar) then | ||
| Rack.Radar = Radar | ||
| end | ||
| end | ||
|
|
||
| Rack.MountPoints = {} | ||
| if next(RackInfo.MountPoints) then | ||
| for _,T in ipairs(RackInfo.MountPoints) do | ||
| local Dir = Vector(1,0,0) | ||
| Dir:Rotate(T.Ang) | ||
| Rack.MountPoints[#Rack.MountPoints + 1] = {Index = T.Index, Pos = T.Pos, Dir = Dir} | ||
| end | ||
| end | ||
|
|
||
| local CrateEnts = {} | ||
| for _,E in ipairs(CrateInfo) do | ||
| local Crate = Entity(E) | ||
|
|
||
| if IsValid(Crate) then | ||
| local Col = ColorAlpha(Crate:GetColor(),25) | ||
| CrateEnts[#CrateEnts + 1] = {Ent = Crate, Col = Col} | ||
| end | ||
| end | ||
|
|
||
| Rack.Crates = CrateEnts | ||
| Rack.HasData = true | ||
| Rack.Age = Clock.CurTime + 5 | ||
| end) | ||
|
|
||
| -- icon16/feed.png radar sprite | ||
| -- icon16/joystick.png controller sprite | ||
| local RadarSprite = Material("icon16/transmit.png") | ||
| local JoystickMat = Material("icon16/joystick.png") | ||
| local RadarColor = Color(255,255,0,25) | ||
| local ControllerColor = Color(0,255,0,25) | ||
| local ForwardColor = Color(255,0,0) | ||
|
|
||
| function ENT:DrawOverlay() | ||
| local SelfTbl = self:GetTable() | ||
|
|
||
| if not SelfTbl.HasData then | ||
| self:RequestRackInfo() | ||
| return | ||
| elseif Clock.CurTime > SelfTbl.Age then | ||
| self:RequestRackInfo() | ||
| end | ||
|
|
||
| if next(SelfTbl.Crates) then | ||
| for _,T in ipairs(SelfTbl.Crates) do | ||
| local E = T.Ent | ||
|
|
||
| if IsValid(E) then | ||
| render.DrawWireframeBox(E:GetPos(),E:GetAngles(),E:OBBMins(),E:OBBMaxs(),T.Col,true) | ||
| render.DrawBox(E:GetPos(),E:GetAngles(),E:OBBMins(),E:OBBMaxs(),T.Col) | ||
| end | ||
| end | ||
| end | ||
|
|
||
| if next(SelfTbl.MountPoints) then | ||
| for _,T in ipairs(SelfTbl.MountPoints) do | ||
| local Pos1 = self:LocalToWorld(T.Pos - T.Dir * 6) | ||
| local Pos2 = self:LocalToWorld(T.Pos + T.Dir * 6) | ||
| render.DrawBeam(Pos1, Pos2, 2, 0, 0, color_black) | ||
| render.DrawBeam(Pos1, Pos2, 1.5, 0, 0, color_white) | ||
| end | ||
|
|
||
| cam.Start2D() | ||
| for _,T in ipairs(SelfTbl.MountPoints) do | ||
| local Pos = self:LocalToWorld(T.Pos):ToScreen() | ||
| draw.SimpleTextOutlined("Mount " .. T.Index,"ACF_Title",Pos.x,Pos.y,color_white,TEXT_ALIGN_CENTER,TEXT_ALIGN_CENTER,1,color_black) | ||
| end | ||
| cam.End2D() | ||
| end | ||
|
|
||
| if IsValid(SelfTbl.Radar) then | ||
| local Radar = SelfTbl.Radar | ||
| local RadPos, RadAng, OBBMin, OBBMax = Radar:GetPos(), Radar:GetAngles(), Radar:OBBMins(), Radar:OBBMaxs() | ||
| render.DrawWireframeBox(RadPos,RadAng,OBBMin,OBBMax,RadarColor,true) | ||
| render.DrawBox(RadPos,RadAng,OBBMin,OBBMax,RadarColor) | ||
|
|
||
| render.SetMaterial(RadarSprite) | ||
| render.DrawSprite(Radar:LocalToWorld(Radar:OBBCenter()), 12, 12, color_white) | ||
| end | ||
|
|
||
| render.SetColorMaterial() | ||
|
|
||
| if IsValid(SelfTbl.Computer) then | ||
| local Computer = SelfTbl.Computer | ||
| local ComPos, ComAng, OBBMin, OBBMax = Computer:GetPos(), Computer:GetAngles(), Computer:OBBMins(), Computer:OBBMaxs() | ||
| render.DrawWireframeBox(ComPos,ComAng,OBBMin,OBBMax,ControllerColor,true) | ||
| render.DrawBox(ComPos,ComAng,OBBMin,OBBMax,ControllerColor) | ||
|
|
||
| render.SetMaterial(JoystickMat) | ||
| render.DrawSprite(Computer:LocalToWorld(Computer:OBBCenter()), 12, 12, color_white) | ||
| end | ||
|
|
||
| local p1 = self:GetPos() + self:GetForward() * 24 | ||
| local p2 = self:GetPos() | ||
| local dir = (p1 - p2):GetNormalized() | ||
| local dir2 = EyeVector() | ||
| local right = (dir:Cross(dir2)):GetNormalized() | ||
|
|
||
| render.DrawLine(p1, p2, ForwardColor) | ||
| render.DrawLine(p1, p1 + (-dir - right) * 5, ForwardColor) | ||
| render.DrawLine(p1, p1 + (-dir + right) * 5, ForwardColor) | ||
| end | ||
| end |
Oops, something went wrong.