From 94cc3813c462df5f7bfd875d5a817b0da42006e6 Mon Sep 17 00:00:00 2001 From: Apickx Date: Wed, 12 Feb 2025 16:41:17 -0600 Subject: Final commit --- lua/autorun/animations.lua | 706 +++++++++++++++++++++--------------------- lua/autorun/server/init.lua | 22 +- lua/autorun/zone_shipyard.lua | 63 ++++ 3 files changed, 427 insertions(+), 364 deletions(-) create mode 100644 lua/autorun/zone_shipyard.lua (limited to 'lua/autorun') diff --git a/lua/autorun/animations.lua b/lua/autorun/animations.lua index f8aae38..444782b 100644 --- a/lua/autorun/animations.lua +++ b/lua/autorun/animations.lua @@ -1,353 +1,353 @@ -hook.Add("OnGamemodeLoaded","artery_stranded_anims",function() -RegisterLuaAnimation('stranded_chop_wood', { - FrameData = { - { - BoneInfo = { - ['ValveBiped.Bip01_R_Calf'] = { - RU = 52.7383 - }, - ['ValveBiped.Bip01_R_Thigh'] = { - RU = -45.5908, - RR = 32.311, - RF = 19.3292 - }, - ['ValveBiped.Bip01_Spine2'] = { - RF = -12.8903 - }, - ['ValveBiped.Bip01_R_UpperArm'] = { - RU = 4.6922, - RR = 28.2239, - RF = 95.649 - }, - ['ValveBiped.Bip01_Spine'] = { - }, - ['ValveBiped.Bip01_R_Forearm'] = { - RU = 6.7985, - RR = -138.8409, - RF = -3.6922 - }, - ['ValveBiped.Bip01_L_UpperArm'] = { - RU = -118.8375, - RR = 1.33, - RF = -18.6262 - }, - ['ValveBiped.Bip01_L_Forearm'] = { - RU = -54.1778, - RR = 49.3891, - RF = -17.4275 - }, - ['ValveBiped.Bip01_Spine1'] = { - }, - ['ValveBiped.Bip01_L_Thigh'] = { - RU = 17.8439, - RR = -27.2881, - RF = -66.1325 - }, - ['ValveBiped.Bip01_Spine4'] = { - RF = -19.375 - }, - ['ValveBiped.Bip01_Pelvis'] = { - MU = -6.2234 - }, - ['ValveBiped.Bip01_L_Calf'] = { - RU = 0.1249, - RR = 23.1365 - }, - ['ValveBiped.Bip01_L_Foot'] = { - RU = 4.2748 - } - }, - FrameRate = 1 - }, - { - BoneInfo = { - ['ValveBiped.Bip01_R_Calf'] = { - RU = 52.7383 - }, - ['ValveBiped.Bip01_R_Thigh'] = { - RU = -45.5908, - RR = 32.311, - RF = 19.3292 - }, - ['ValveBiped.Bip01_L_Foot'] = { - RU = 4.2748 - }, - ['ValveBiped.Bip01_L_Calf'] = { - RU = 0.1249, - RR = 23.1365 - }, - ['ValveBiped.Bip01_Pelvis'] = { - MU = -6.2234 - }, - ['ValveBiped.Bip01_L_Forearm'] = { - RU = 14.726354797221, - RR = 14.372249178086, - RF = 67.254853315307 - }, - ['ValveBiped.Bip01_L_UpperArm'] = { - RU = -118.55072559209, - RR = -18.472382158172, - RF = -25.571552996169 - }, - ['ValveBiped.Bip01_R_Forearm'] = { - RU = 20.84833112133, - RR = -44.285748284171, - RF = 53.271771890186 - }, - ['ValveBiped.Bip01_Spine1'] = { - RU = 7.0719397868016 - }, - ['ValveBiped.Bip01_L_Thigh'] = { - RU = 17.8439, - RR = -27.2881, - RF = -66.1325 - }, - ['ValveBiped.Bip01_Spine4'] = { - RU = 6.7183427974615, - RF = 19.490397940959 - }, - ['ValveBiped.Bip01_Spine'] = { - RU = 11.400272978762 - }, - ['ValveBiped.Bip01_Spine2'] = { - RU = 6.3647458081214, - RF = 11.644257572985 - }, - ['ValveBiped.Bip01_R_UpperArm'] = { - RU = -107.25174221889, - RR = 2.5677191930821, - RF = 62.475625466013 - } - }, - FrameRate = 10 - }, - { - BoneInfo = { - ['ValveBiped.Bip01_R_Calf'] = { - RU = 52.7383 - }, - ['ValveBiped.Bip01_R_Thigh'] = { - RU = -45.5908, - RR = 32.311, - RF = 19.3292 - }, - ['ValveBiped.Bip01_L_Foot'] = { - RU = 4.2748 - }, - ['ValveBiped.Bip01_L_Calf'] = { - RU = 0.1249, - RR = 23.1365 - }, - ['ValveBiped.Bip01_Pelvis'] = { - MU = -6.2234 - }, - ['ValveBiped.Bip01_L_Forearm'] = { - RU = -54.1778, - RR = 49.3891, - RF = -17.4275 - }, - ['ValveBiped.Bip01_L_UpperArm'] = { - RU = -118.8375, - RR = 1.33, - RF = -18.6262 - }, - ['ValveBiped.Bip01_R_Forearm'] = { - RU = 6.7985, - RR = -138.8409, - RF = -3.6922 - }, - ['ValveBiped.Bip01_Spine1'] = { - }, - ['ValveBiped.Bip01_L_Thigh'] = { - RU = 17.8439, - RR = -27.2881, - RF = -66.1325 - }, - ['ValveBiped.Bip01_Spine4'] = { - RF = -19.375 - }, - ['ValveBiped.Bip01_Spine'] = { - }, - ['ValveBiped.Bip01_Spine2'] = { - RF = -12.8903 - }, - ['ValveBiped.Bip01_R_UpperArm'] = { - RU = 4.6922, - RR = 28.2239, - RF = 95.649 - } - }, - FrameRate = 1 - } - }, - RestartFrame = 2, - Type = TYPE_SEQUENCE -}) - -RegisterLuaAnimation('stranded_mine_rocks', { - FrameData = { - { - BoneInfo = { - ['ValveBiped.Bip01_Spine2'] = { - }, - ['ValveBiped.Bip01_L_Thigh'] = { - }, - ['ValveBiped.Bip01_Head1'] = { - RU = 16.3653 - }, - ['ValveBiped.Bip01_R_Clavicle'] = { - }, - ['ValveBiped.Bip01_L_UpperArm'] = { - RU = -169.4528, - RR = -17.0857 - }, - ['ValveBiped.Bip01_Spine4'] = { - }, - ['ValveBiped.Bip01_Pelvis'] = { - }, - ['ValveBiped.Bip01_R_Hand'] = { - }, - ['ValveBiped.Bip01_L_Calf'] = { - }, - ['ValveBiped.Bip01_R_Forearm'] = { - RU = 0.3663, - RR = -23.8679 - }, - ['ValveBiped.Bip01_L_Clavicle'] = { - }, - ['ValveBiped.Bip01_Spine1'] = { - }, - ['ValveBiped.Bip01_Spine'] = { - }, - ['ValveBiped.Bip01_R_Thigh'] = { - }, - ['ValveBiped.Bip01_R_UpperArm'] = { - RU = -160, - RR = 16.6091, - RF = -5.0659 - }, - ['ValveBiped.Bip01_L_Forearm'] = { - RU = 13.9547, - RR = 23.0274 - }, - ['ValveBiped.Bip01_R_Foot'] = { - } - }, - FrameRate = 1 - }, - { - BoneInfo = { - ['ValveBiped.Bip01_Spine2'] = { - RU = 19.5945 - }, - ['ValveBiped.Bip01_L_Thigh'] = { - RU = -25.9972, - RR = -4.3907 - }, - ['ValveBiped.Bip01_Head1'] = { - }, - ['ValveBiped.Bip01_R_Clavicle'] = { - RF = 57.3827 - }, - ['ValveBiped.Bip01_R_UpperArm'] = { - RU = 2.5616, - RR = -11.5777 - }, - ['ValveBiped.Bip01_Spine4'] = { - RU = 9.6885 - }, - ['ValveBiped.Bip01_Pelvis'] = { - MU = -3.3808, - RR = -11.3417 - }, - ['ValveBiped.Bip01_R_Hand'] = { - RU = 26.3055, - RR = -25.3824, - RF = -7.8628 - }, - ['ValveBiped.Bip01_L_Calf'] = { - RU = 25.0442 - }, - ['ValveBiped.Bip01_L_Forearm'] = { - RR = 38.3937 - }, - ['ValveBiped.Bip01_L_Clavicle'] = { - RU = 2.3203, - RF = -38.6058 - }, - ['ValveBiped.Bip01_Spine1'] = { - RU = 0.6215 - }, - ['ValveBiped.Bip01_Spine'] = { - RU = 17.2787 - }, - ['ValveBiped.Bip01_R_Thigh'] = { - RU = 19.0125 - }, - ['ValveBiped.Bip01_L_UpperArm'] = { - RU = -29.9497, - RR = -6.5064 - }, - ['ValveBiped.Bip01_R_Forearm'] = { - RR = -33.6703 - }, - ['ValveBiped.Bip01_R_Foot'] = { - RU = -17.9333 - } - }, - FrameRate = 4 - }, - { - BoneInfo = { - ['ValveBiped.Bip01_Spine2'] = { - }, - ['ValveBiped.Bip01_L_Thigh'] = { - }, - ['ValveBiped.Bip01_Head1'] = { - RU = 16.3653 - }, - ['ValveBiped.Bip01_L_Clavicle'] = { - }, - ['ValveBiped.Bip01_R_UpperArm'] = { - RU = -160, - RR = 16.6091, - RF = -5.0659 - }, - ['ValveBiped.Bip01_Spine4'] = { - }, - ['ValveBiped.Bip01_Pelvis'] = { - }, - ['ValveBiped.Bip01_R_Hand'] = { - }, - ['ValveBiped.Bip01_L_Calf'] = { - }, - ['ValveBiped.Bip01_R_Forearm'] = { - RU = 0.3663, - RR = -23.8679 - }, - ['ValveBiped.Bip01_R_Clavicle'] = { - }, - ['ValveBiped.Bip01_Spine1'] = { - }, - ['ValveBiped.Bip01_Spine'] = { - }, - ['ValveBiped.Bip01_R_Thigh'] = { - }, - ['ValveBiped.Bip01_L_UpperArm'] = { - RU = -169.4528, - RR = -17.0857 - }, - ['ValveBiped.Bip01_L_Forearm'] = { - RU = 13.9547, - RR = 23.0274 - }, - ['ValveBiped.Bip01_R_Foot'] = { - } - }, - FrameRate = 1 - } - }, - RestartFrame = 2, - Type = TYPE_STANCE -}) -end) +hook.Add("OnGamemodeLoaded","artery_stranded_anims",function() +RegisterLuaAnimation('stranded_chop_wood', { + FrameData = { + { + BoneInfo = { + ['ValveBiped.Bip01_R_Calf'] = { + RU = 52.7383 + }, + ['ValveBiped.Bip01_R_Thigh'] = { + RU = -45.5908, + RR = 32.311, + RF = 19.3292 + }, + ['ValveBiped.Bip01_Spine2'] = { + RF = -12.8903 + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + RU = 4.6922, + RR = 28.2239, + RF = 95.649 + }, + ['ValveBiped.Bip01_Spine'] = { + }, + ['ValveBiped.Bip01_R_Forearm'] = { + RU = 6.7985, + RR = -138.8409, + RF = -3.6922 + }, + ['ValveBiped.Bip01_L_UpperArm'] = { + RU = -118.8375, + RR = 1.33, + RF = -18.6262 + }, + ['ValveBiped.Bip01_L_Forearm'] = { + RU = -54.1778, + RR = 49.3891, + RF = -17.4275 + }, + ['ValveBiped.Bip01_Spine1'] = { + }, + ['ValveBiped.Bip01_L_Thigh'] = { + RU = 17.8439, + RR = -27.2881, + RF = -66.1325 + }, + ['ValveBiped.Bip01_Spine4'] = { + RF = -19.375 + }, + ['ValveBiped.Bip01_Pelvis'] = { + MU = -6.2234 + }, + ['ValveBiped.Bip01_L_Calf'] = { + RU = 0.1249, + RR = 23.1365 + }, + ['ValveBiped.Bip01_L_Foot'] = { + RU = 4.2748 + } + }, + FrameRate = 1 + }, + { + BoneInfo = { + ['ValveBiped.Bip01_R_Calf'] = { + RU = 52.7383 + }, + ['ValveBiped.Bip01_R_Thigh'] = { + RU = -45.5908, + RR = 32.311, + RF = 19.3292 + }, + ['ValveBiped.Bip01_L_Foot'] = { + RU = 4.2748 + }, + ['ValveBiped.Bip01_L_Calf'] = { + RU = 0.1249, + RR = 23.1365 + }, + ['ValveBiped.Bip01_Pelvis'] = { + MU = -6.2234 + }, + ['ValveBiped.Bip01_L_Forearm'] = { + RU = 14.726354797221, + RR = 14.372249178086, + RF = 67.254853315307 + }, + ['ValveBiped.Bip01_L_UpperArm'] = { + RU = -118.55072559209, + RR = -18.472382158172, + RF = -25.571552996169 + }, + ['ValveBiped.Bip01_R_Forearm'] = { + RU = 20.84833112133, + RR = -44.285748284171, + RF = 53.271771890186 + }, + ['ValveBiped.Bip01_Spine1'] = { + RU = 7.0719397868016 + }, + ['ValveBiped.Bip01_L_Thigh'] = { + RU = 17.8439, + RR = -27.2881, + RF = -66.1325 + }, + ['ValveBiped.Bip01_Spine4'] = { + RU = 6.7183427974615, + RF = 19.490397940959 + }, + ['ValveBiped.Bip01_Spine'] = { + RU = 11.400272978762 + }, + ['ValveBiped.Bip01_Spine2'] = { + RU = 6.3647458081214, + RF = 11.644257572985 + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + RU = -107.25174221889, + RR = 2.5677191930821, + RF = 62.475625466013 + } + }, + FrameRate = 10 + }, + { + BoneInfo = { + ['ValveBiped.Bip01_R_Calf'] = { + RU = 52.7383 + }, + ['ValveBiped.Bip01_R_Thigh'] = { + RU = -45.5908, + RR = 32.311, + RF = 19.3292 + }, + ['ValveBiped.Bip01_L_Foot'] = { + RU = 4.2748 + }, + ['ValveBiped.Bip01_L_Calf'] = { + RU = 0.1249, + RR = 23.1365 + }, + ['ValveBiped.Bip01_Pelvis'] = { + MU = -6.2234 + }, + ['ValveBiped.Bip01_L_Forearm'] = { + RU = -54.1778, + RR = 49.3891, + RF = -17.4275 + }, + ['ValveBiped.Bip01_L_UpperArm'] = { + RU = -118.8375, + RR = 1.33, + RF = -18.6262 + }, + ['ValveBiped.Bip01_R_Forearm'] = { + RU = 6.7985, + RR = -138.8409, + RF = -3.6922 + }, + ['ValveBiped.Bip01_Spine1'] = { + }, + ['ValveBiped.Bip01_L_Thigh'] = { + RU = 17.8439, + RR = -27.2881, + RF = -66.1325 + }, + ['ValveBiped.Bip01_Spine4'] = { + RF = -19.375 + }, + ['ValveBiped.Bip01_Spine'] = { + }, + ['ValveBiped.Bip01_Spine2'] = { + RF = -12.8903 + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + RU = 4.6922, + RR = 28.2239, + RF = 95.649 + } + }, + FrameRate = 1 + } + }, + RestartFrame = 2, + Type = TYPE_SEQUENCE +}) + +RegisterLuaAnimation('stranded_mine_rocks', { + FrameData = { + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + }, + ['ValveBiped.Bip01_L_Thigh'] = { + }, + ['ValveBiped.Bip01_Head1'] = { + RU = 16.3653 + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + }, + ['ValveBiped.Bip01_L_UpperArm'] = { + RU = -169.4528, + RR = -17.0857 + }, + ['ValveBiped.Bip01_Spine4'] = { + }, + ['ValveBiped.Bip01_Pelvis'] = { + }, + ['ValveBiped.Bip01_R_Hand'] = { + }, + ['ValveBiped.Bip01_L_Calf'] = { + }, + ['ValveBiped.Bip01_R_Forearm'] = { + RU = 0.3663, + RR = -23.8679 + }, + ['ValveBiped.Bip01_L_Clavicle'] = { + }, + ['ValveBiped.Bip01_Spine1'] = { + }, + ['ValveBiped.Bip01_Spine'] = { + }, + ['ValveBiped.Bip01_R_Thigh'] = { + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + RU = -160, + RR = 16.6091, + RF = -5.0659 + }, + ['ValveBiped.Bip01_L_Forearm'] = { + RU = 13.9547, + RR = 23.0274 + }, + ['ValveBiped.Bip01_R_Foot'] = { + } + }, + FrameRate = 1 + }, + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + RU = 19.5945 + }, + ['ValveBiped.Bip01_L_Thigh'] = { + RU = -25.9972, + RR = -4.3907 + }, + ['ValveBiped.Bip01_Head1'] = { + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + RF = 57.3827 + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + RU = 2.5616, + RR = -11.5777 + }, + ['ValveBiped.Bip01_Spine4'] = { + RU = 9.6885 + }, + ['ValveBiped.Bip01_Pelvis'] = { + MU = -3.3808, + RR = -11.3417 + }, + ['ValveBiped.Bip01_R_Hand'] = { + RU = 26.3055, + RR = -25.3824, + RF = -7.8628 + }, + ['ValveBiped.Bip01_L_Calf'] = { + RU = 25.0442 + }, + ['ValveBiped.Bip01_L_Forearm'] = { + RR = 38.3937 + }, + ['ValveBiped.Bip01_L_Clavicle'] = { + RU = 2.3203, + RF = -38.6058 + }, + ['ValveBiped.Bip01_Spine1'] = { + RU = 0.6215 + }, + ['ValveBiped.Bip01_Spine'] = { + RU = 17.2787 + }, + ['ValveBiped.Bip01_R_Thigh'] = { + RU = 19.0125 + }, + ['ValveBiped.Bip01_L_UpperArm'] = { + RU = -29.9497, + RR = -6.5064 + }, + ['ValveBiped.Bip01_R_Forearm'] = { + RR = -33.6703 + }, + ['ValveBiped.Bip01_R_Foot'] = { + RU = -17.9333 + } + }, + FrameRate = 4 + }, + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + }, + ['ValveBiped.Bip01_L_Thigh'] = { + }, + ['ValveBiped.Bip01_Head1'] = { + RU = 16.3653 + }, + ['ValveBiped.Bip01_L_Clavicle'] = { + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + RU = -160, + RR = 16.6091, + RF = -5.0659 + }, + ['ValveBiped.Bip01_Spine4'] = { + }, + ['ValveBiped.Bip01_Pelvis'] = { + }, + ['ValveBiped.Bip01_R_Hand'] = { + }, + ['ValveBiped.Bip01_L_Calf'] = { + }, + ['ValveBiped.Bip01_R_Forearm'] = { + RU = 0.3663, + RR = -23.8679 + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + }, + ['ValveBiped.Bip01_Spine1'] = { + }, + ['ValveBiped.Bip01_Spine'] = { + }, + ['ValveBiped.Bip01_R_Thigh'] = { + }, + ['ValveBiped.Bip01_L_UpperArm'] = { + RU = -169.4528, + RR = -17.0857 + }, + ['ValveBiped.Bip01_L_Forearm'] = { + RU = 13.9547, + RR = 23.0274 + }, + ['ValveBiped.Bip01_R_Foot'] = { + } + }, + FrameRate = 1 + } + }, + RestartFrame = 2, + Type = TYPE_STANCE +}) +end) diff --git a/lua/autorun/server/init.lua b/lua/autorun/server/init.lua index 71956ae..39e396f 100644 --- a/lua/autorun/server/init.lua +++ b/lua/autorun/server/init.lua @@ -1,11 +1,11 @@ -print("hello from artery_stranded init.lua") -do return end ---for k,v in pairs(ents.FindByClass("trigger_teleport")) do v:Remove() end - -local config = nrequire("sv_newplayer.lua") -config.newmeta = function() - return { - lastserver = "67.163.245.187:27015", - lastlocation = "5699 -5191 131" - } -end +print("hello from artery_stranded init.lua") +do return end +--for k,v in pairs(ents.FindByClass("trigger_teleport")) do v:Remove() end + +local config = nrequire("sv_newplayer.lua") +config.newmeta = function() + return { + lastserver = "67.163.245.187:27015", + lastlocation = "5699 -5191 131" + } +end diff --git a/lua/autorun/zone_shipyard.lua b/lua/autorun/zone_shipyard.lua new file mode 100644 index 0000000..b2f9395 --- /dev/null +++ b/lua/autorun/zone_shipyard.lua @@ -0,0 +1,63 @@ +--[[ + A hunting ground zone will occasionally spawn a monster near a player that will go attack the player +]] +zones.RegisterClass("artery_shipyard",Color(238,238,255)) + +--Use this to set default properties. Only called on server. +hook.Add("OnZoneCreated","artery_outpost",function(zone,class,zoneID) + if class == "artery_shipyard" then + zone.datatbl = {} + zone.datatbl.control = ents.Create("art_shipyardcontrol") + zone.datatbl.control:SetPos(Entity(1):GetPos()) + zone.datatbl.control:Spawn() + zone.datatbl.control.Zone = zoneID + end +end) + +-- Use this hook to let a player change a zone after making it or with the edit tool. +-- class is zone.class, zone is the zone's full table, DPanel is a panel to parent your things to, zoneID is the zone's ID, DFrame is the whole frame. +-- Return your preferred width and height for the panel and the frame will size to it. +hook.Add("ShowZoneOptions","artery_shipyard",function(zone,class,DPanel,zoneID,DFrame) + if class == "artery_shipyard" then + local w,h = 500, 400 + + local scroll = vgui.Create( "DScrollPanel",DPanel) + scroll:Dock(FILL) + + function synctbl() + net.Start("artery_shipyard_settbl") + net.WriteFloat(zoneID) + net.WriteTable(zone.datatbl) + net.SendToServer() + end + + print("Displaying table, my table is") + PrintTable(zone.datatbl) + + local shipinstr = vgui.Create("DLabel",DPanel) + shipinstr:Dock(TOP) + shipinstr:SetText("Find the control entity, and palce it somewhere reasonable.") + shipinstr:SetDark(true) + shipinstr:SizeToContents() + + return w, h -- Specify the width and height for the DPanel container. The frame will resize accordingly. + + end +end) + +if SERVER then + util.AddNetworkString("artery_shipyard_settbl") + net.Receive("artery_shipyard_settbl",function(len,ply) + print("Server change received!") + local id, new = net.ReadFloat(), net.ReadTable() + print("New table is:") + PrintTable(new) + if not ply:IsAdmin() then return end + local zone = zones.List[id] + zone.datatbl = new + if new.Name then + zone.Name = new.Name + end + zones.Sync() + end) +end -- cgit v1.2.3-70-g09d2