diff options
24 files changed, 555 insertions, 42 deletions
diff --git a/data/artery/maps/rp_subterranean/chests.txt b/data/artery/maps/rp_subterranean/chests.txt deleted file mode 100644 index e69de29..0000000 --- a/data/artery/maps/rp_subterranean/chests.txt +++ /dev/null diff --git a/data/artery/maps/rp_subterranean/npcs.txt b/data/artery/maps/rp_subterranean/npcs.txt deleted file mode 100644 index 82b595a..0000000 --- a/data/artery/maps/rp_subterranean/npcs.txt +++ /dev/null @@ -1 +0,0 @@ -{"procedures":{"SetModel":["models/player/Group02/Male_01.mdl"]}} diff --git a/gamemode/config/sv_newplayer.lua b/gamemode/config/sv_newplayer.lua index fc66c82..09638eb 100644 --- a/gamemode/config/sv_newplayer.lua +++ b/gamemode/config/sv_newplayer.lua @@ -17,7 +17,7 @@ end np.newmeta = function() return { lastserver = "67.163.245.187:27015", - lastlocation = "185 310 524" + lastlocation = "-1209 1544 -1770" } end diff --git a/gamemode/core/database/sv_setup.lua b/gamemode/core/database/sv_setup.lua index fd44174..743e19a 100644 --- a/gamemode/core/database/sv_setup.lua +++ b/gamemode/core/database/sv_setup.lua @@ -20,7 +20,7 @@ SELECT PlayerData, MetaData FROM playerdata WHERE SteamID=%.0f ]] local save_player_query = [[ -UPDATE playerdata SET MetaData="%s" PlayerData="%s" WHERE SteamID=%.0f +UPDATE playerdata SET MetaData='%s' PlayerData='%s' WHERE SteamID=%.0f ]] local function q_fai(err,query) diff --git a/gamemode/inventorysystem/equipment/cl_equipment.lua b/gamemode/inventorysystem/equipment/cl_equipment.lua index 74152dc..57a07ad 100644 --- a/gamemode/inventorysystem/equipment/cl_equipment.lua +++ b/gamemode/inventorysystem/equipment/cl_equipment.lua @@ -181,6 +181,7 @@ inv.DrawOnDPanel = function(self,panel) for k,v in pairs(pn:GetChildren()) do v:Remove() end + if pn.Entity then pn.Entity:Remove() end end return prox end diff --git a/gamemode/inventorysystem/equipment/sh_equipment.lua b/gamemode/inventorysystem/equipment/sh_equipment.lua index be930e0..0cd62e9 100644 --- a/gamemode/inventorysystem/equipment/sh_equipment.lua +++ b/gamemode/inventorysystem/equipment/sh_equipment.lua @@ -120,6 +120,7 @@ inv.DeSerialize = function(self,data) for k,v in pairs(tbl) do cpy.equiped[k] = itm.GetItemFromData(v) end + return cpy else return table.Copy(self) end diff --git a/gamemode/inventorysystem/shapedinventory/cl_shaped.lua b/gamemode/inventorysystem/shapedinventory/cl_shaped.lua index 051f0bc..746a37a 100644 --- a/gamemode/inventorysystem/shapedinventory/cl_shaped.lua +++ b/gamemode/inventorysystem/shapedinventory/cl_shaped.lua @@ -18,8 +18,8 @@ end --[[ -local function calcposition(dimx,dimy,x,y) - return (y * dimx) + x +local function calcposition(width,height,x,y) + return (y * width) + x end ]] @@ -49,7 +49,7 @@ local function drawitemat(self,x,y,item) print("Drawing item at ",x,y) local tp = self.gridpanels[x][y] if tp == nil then - error("Unable to continue") + error("Unable to continue, could not find item at (" .. x .. "," .. y .. ")") end tp:Droppable("item") runonshape(self,item.Shape,x,y,function(panel) @@ -100,7 +100,7 @@ inv.DrawOnDPanel = function(self,panel) local grid = vgui.Create( "DGrid", DScrollPanel ) grid:SetPos(0, 0) - grid:SetCols(self.dimx) + grid:SetCols(self.width) grid:SetColWide(iconsize) grid:SetRowHeight(iconsize) self.grid = grid @@ -108,8 +108,8 @@ inv.DrawOnDPanel = function(self,panel) self.gridpanels = {} --Create the full grid of dpanels - for x = 1, self.dimx do - for y = 1, self.dimy do + for x = 1, self.width do + for y = 1, self.height do local dp = vgui.Create("DModelPanel") function dp:LayoutEntity( Entity ) return end -- disables default rotation dp:SetSize(iconsize,iconsize) @@ -131,8 +131,8 @@ inv.DrawOnDPanel = function(self,panel) --Go through the items, and set the dpanels appropriately. for k,v in pairs(self.tracker) do if type(v) == "table" then - local px = k % self.dimx - local py = math.floor(k / self.dimy) + local px = k % self.width + local py = math.ceil(k / self.height) drawitemat(self,px,py,v) end end diff --git a/gamemode/inventorysystem/shapedinventory/sh_shaped.lua b/gamemode/inventorysystem/shapedinventory/sh_shaped.lua index b77f378..09668e2 100644 --- a/gamemode/inventorysystem/shapedinventory/sh_shaped.lua +++ b/gamemode/inventorysystem/shapedinventory/sh_shaped.lua @@ -1,5 +1,6 @@ --[[ An inventory, with a shape! + Items are stored in a 1-d array, array is 1-indexed ]] local reg = nrequire("inventory/inventory.lua") @@ -9,19 +10,20 @@ if CLIENT then inv = nrequire("cl_shaped.lua") end inv.Name = "Shaped Inventory" inv.tracker = {} -inv.dimx = 5 -inv.dimy = 5 +inv.width = 5 +inv.height = 5 -local function calcposition(dimx,dimy,x,y) - return ((x-1) * dimx) + y +local function calcposition(width,height,row,col) + return ((row-1) * width) + col end -local function canfitin(self,x,y,shape) +local function canfitin(self,arow,acol,shape) for rn,row in ipairs(shape) do for cn,col in ipairs(row) do - local absx,absy = x + rn - 1, y + cn - 1 - local slot = calcposition(self.dimx,self.dimy,absx,absy) - if col and ((self.tracker[slot] ~= nil) or (absx > self.dimx) or (absy > self.dimy)) then + local absrow,abscol = arow + rn - 1, acol + cn - 1 + print("absrow was",absrow,"abscol was",abscol) + local slot = calcposition(self.width,self.height,absrow,abscol) + if col and ((self.tracker[slot] ~= nil) or (absrow > self.width) or (abscol > self.height)) then return false end end @@ -30,10 +32,10 @@ local function canfitin(self,x,y,shape) end function inv:FindPlaceFor(item) - for x = 1, self.dimx do - for y = 1, self.dimy do - if canfitin(self,x,y,item.Shape) then - return {x,y} + for row = 1, self.height do + for col = 1, self.width do + if canfitin(self,row,col,item.Shape) then + return {row,col} end end end @@ -54,14 +56,16 @@ function inv:Put(tbl,item) for rn,row in ipairs(item.Shape) do for cn,col in ipairs(row) do if col then - local slot = calcposition(self.dimx,self.dimy,tbl[1] + rn - 1,tbl[2] + cn - 1) + local slot = calcposition(self.width,self.height,tbl[1] + rn - 1,tbl[2] + cn - 1) self.tracker[slot] = 1 end end end --Now set the item in the correct slot - local slot = calcposition(self.dimx,self.dimy,tbl[1],tbl[2]) + print("Put item at ",tbl[1],tbl[2]) + local slot = calcposition(self.width,self.height,tbl[1],tbl[2]) + print("Slot is",slot) self.tracker[slot] = item end @@ -74,22 +78,24 @@ function inv:Has(ptr) end for k,v in pairs(self.tracker) do if type(v) == "table" and compare_func(v) then - local x = math.floor(k / self.dimx) - local y = k % self.dimx - return {x,y} + local row = math.ceil(k / self.width) + local col = k % self.width + print("Has is retuning",row,col) + return {row,col} end end return nil end function inv:Remove(tbl) - local slot = calcposition(self.dimx,self.dimy,tbl[1],tbl[2]) + local slot = calcposition(self.width,self.height,tbl[1],tbl[2]) + print("Slot is",slot) local item = self.tracker[slot] self.tracker[slot] = nil for rn,row in ipairs(item.Shape) do for cn,col in ipairs(row) do if col then - slot = calcposition(self.dimx,self.dimy,tbl[1] + rn - 1,tbl[2] + cn - 1) + slot = calcposition(self.width,self.height,tbl[1] + rn - 1,tbl[2] + cn - 1) self.tracker[slot] = nil end end @@ -97,7 +103,7 @@ function inv:Remove(tbl) end function inv:Get(tbl) - local slot = calcposition(self.dimx,self.dimy,tbl[1],tbl[2]) + local slot = calcposition(self.width,self.height,tbl[1],tbl[2]) return self.tracker[slot] end @@ -114,13 +120,15 @@ end function inv:DeSerialize(str) --TODO:Implement + local ret = table.Copy(self) local tbl = util.JSONToTable(str) for k,v in pairs(tbl) do local name = k local pos = v[1] local data = v[2] - self.tracker[pos] = itm.GetItemFromData(name,data) + ret.tracker[pos] = itm.GetItemFromData(name,data) end + return ret end diff --git a/gamemode/itemsystem/armor/balaclava.lua b/gamemode/itemsystem/armor/balaclava.lua index cd31f97..0bd16c7 100644 --- a/gamemode/itemsystem/armor/balaclava.lua +++ b/gamemode/itemsystem/armor/balaclava.lua @@ -1,6 +1,7 @@ --[[ An example item ]] +do return end local item = {} --Required, a name, all item names must be unique diff --git a/gamemode/itemsystem/exampleitem.lua b/gamemode/itemsystem/exampleitem.lua index 82483e6..6beb1f6 100644 --- a/gamemode/itemsystem/exampleitem.lua +++ b/gamemode/itemsystem/exampleitem.lua @@ -90,8 +90,6 @@ end item.onDropped = function(self,ent) print("I've been dropped!(BUVVV WUB WUB WUB WUB WUB)") end - -print("Hello from exampleitem.lua") --Don't forget to register the item! local itm = nrequire("item.lua") itm.RegisterItem(item) diff --git a/gamemode/itemsystem/foodstuffs/ratmeat.lua b/gamemode/itemsystem/foodstuffs/ratmeat.lua index 0198e87..e8d9575 100644 --- a/gamemode/itemsystem/foodstuffs/ratmeat.lua +++ b/gamemode/itemsystem/foodstuffs/ratmeat.lua @@ -1,6 +1,7 @@ --[[ An example item ]] +do return end local item = {} --Required, a name, all item names must be unique diff --git a/gamemode/itemsystem/foodstuffs/watermelon.lua b/gamemode/itemsystem/foodstuffs/watermelon.lua index 3f858d7..d3dfd56 100644 --- a/gamemode/itemsystem/foodstuffs/watermelon.lua +++ b/gamemode/itemsystem/foodstuffs/watermelon.lua @@ -1,6 +1,7 @@ --[[ An example item ]] +do return end local item = {} local pac if SERVER then diff --git a/gamemode/itemsystem/quest/rougebadge.lua b/gamemode/itemsystem/quest/rougebadge.lua index d5e2950..df5a149 100644 --- a/gamemode/itemsystem/quest/rougebadge.lua +++ b/gamemode/itemsystem/quest/rougebadge.lua @@ -1,6 +1,7 @@ --[[ An example item ]] +do return end local item = {} --Required, a name, all item names must be unique diff --git a/gamemode/itemsystem/quest/rougebook.lua b/gamemode/itemsystem/quest/rougebook.lua index 7afb5db..409948a 100644 --- a/gamemode/itemsystem/quest/rougebook.lua +++ b/gamemode/itemsystem/quest/rougebook.lua @@ -1,6 +1,7 @@ --[[ A quest item for the prayer book quest ]] +do return end local item = {} item.Name = "Orders of the Silent Circle" diff --git a/gamemode/itemsystem/quest/togglechip.lua b/gamemode/itemsystem/quest/togglechip.lua index d920497..52e69aa 100644 --- a/gamemode/itemsystem/quest/togglechip.lua +++ b/gamemode/itemsystem/quest/togglechip.lua @@ -1,6 +1,7 @@ --[[ A toggle chip (quest item) for subterr_generator quest ]] +do return end local item = {} item.Name = "Toggle Chip" diff --git a/gamemode/itemsystem/scrapgun.lua b/gamemode/itemsystem/scrapgun.lua index 66222d5..ea3d67f 100644 --- a/gamemode/itemsystem/scrapgun.lua +++ b/gamemode/itemsystem/scrapgun.lua @@ -1,6 +1,7 @@ --[[ An example item ]] +do return end local item = {} --Required, a name, all item names must be unique diff --git a/gamemode/itemsystem/utility/flashlight.lua b/gamemode/itemsystem/utility/flashlight.lua index fa1e3c5..6b0a40c 100644 --- a/gamemode/itemsystem/utility/flashlight.lua +++ b/gamemode/itemsystem/utility/flashlight.lua @@ -1,6 +1,7 @@ --[[ An example item ]] +do return end local item = {} --Required, a name, all item names must be unique diff --git a/gamemode/itemsystem/weapons/knuckledclaw.lua b/gamemode/itemsystem/weapons/knuckledclaw.lua index 0665a98..c738f2e 100644 --- a/gamemode/itemsystem/weapons/knuckledclaw.lua +++ b/gamemode/itemsystem/weapons/knuckledclaw.lua @@ -1,6 +1,7 @@ --[[ An example item ]] +do return end local item = {} --Required, a name, all item names must be unique diff --git a/gamemode/itemsystem/weapons/rustyaxe.lua b/gamemode/itemsystem/weapons/rustyaxe.lua index 359580f..930a736 100644 --- a/gamemode/itemsystem/weapons/rustyaxe.lua +++ b/gamemode/itemsystem/weapons/rustyaxe.lua @@ -1,6 +1,7 @@ --[[ An axe that you can swing around! ]] +do return end local pac,swi if SERVER then pac = nrequire("core/pac/sv_pac.lua") @@ -78,7 +79,7 @@ item.pacname = "rustyaxe" if SERVER then --Before makeSwingable is called, an item needs a .Name field and a .attacks field and a .pacname field - swi.makeSwingable(item) + --swi.makeSwingable(item) end --[[ local swingdata = { @@ -239,7 +240,7 @@ item.onClick = function(self,owner) end ]] ---[[ + --Optional, if we should do something special on equip(like draw the PAC for this weapon) item.onEquip = function(self,who) print("onEquip",who) @@ -261,7 +262,7 @@ item.onUnEquip = function(self,who) who:GetActiveWeapon():SetHoldType("normal") if SERVER then pac.RemovePac(who,"rustyaxe") end end -]] + item.onDropped = function(self, ent) if SERVER then pac.ApplyPac(ent,"rustyaxe") end end diff --git a/gamemode/itemsystem/weapons/scraphammer.lua b/gamemode/itemsystem/weapons/scraphammer.lua index 762dc5f..2534907 100644 --- a/gamemode/itemsystem/weapons/scraphammer.lua +++ b/gamemode/itemsystem/weapons/scraphammer.lua @@ -1,6 +1,7 @@ --[[ An example item ]] +do return end local com = nrequire("core/inventory/common/weapons.lua") local itm = nrequire("core/inventory/common/items.lua") local reg = nrequire("core/inventory/item.lua") diff --git a/gamemode/itemsystem/weapons/seratedknife.lua b/gamemode/itemsystem/weapons/seratedknife.lua index ee116aa..738beb6 100644 --- a/gamemode/itemsystem/weapons/seratedknife.lua +++ b/gamemode/itemsystem/weapons/seratedknife.lua @@ -1,6 +1,7 @@ --[[ An example item ]] +do return end local item = {} --Required, a name, all item names must be unique diff --git a/gamemode/server/heatmap.lua b/gamemode/server/heatmap.lua index 7beb30f..2e8c1b3 100644 --- a/gamemode/server/heatmap.lua +++ b/gamemode/server/heatmap.lua @@ -1,7 +1,7 @@ --[[ Some helper methods for useing heatmaps ]] - +do return end print("Hello from heatmap.lua!") local prs = pairs local iprs = ipairs diff --git a/gamemode/shared/animations/swing_mele.lua b/gamemode/shared/animations/swing_mele.lua new file mode 100644 index 0000000..a0cd065 --- /dev/null +++ b/gamemode/shared/animations/swing_mele.lua @@ -0,0 +1,498 @@ +RegisterLuaAnimation('swing_onehand_left', { + FrameData = { + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + }, + ['ValveBiped.Bip01_L_Forearm'] = { + }, + ['ValveBiped.Bip01_L_UpperArm'] = { + }, + ['ValveBiped.Bip01_Spine4'] = { + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + }, + ['ValveBiped.Bip01_R_Forearm'] = { + } + }, + FrameRate = 10 + }, + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + RF = 14.9983 + }, + ['ValveBiped.Bip01_L_Forearm'] = { + RU = 58.1181, + RR = 27.0889 + }, + ['ValveBiped.Bip01_L_UpperArm'] = { + RU = -7.9421, + RR = 34.3556, + RF = 4.4799 + }, + ['ValveBiped.Bip01_Spine4'] = { + RF = 39.5103 + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + RR = 47.4665, + RF = -19.7371 + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + RU = -129.4263, + RR = -47.9277 + }, + ['ValveBiped.Bip01_R_Forearm'] = { + RR = 2.574 + } + }, + FrameRate = 5 + }, + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + RF = -18.8755 + }, + ['ValveBiped.Bip01_R_Forearm'] = { + RU = 90, + RR = -4.5286, + RF = -100.8045 + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + RU = 23.8203, + RR = -38.9972, + RF = -25.2662 + }, + ['ValveBiped.Bip01_Spine4'] = { + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + }, + ['ValveBiped.Bip01_L_UpperArm'] = { + RU = -7.9421, + RR = 34.3556, + RF = 4.4799 + }, + ['ValveBiped.Bip01_L_Forearm'] = { + } + }, + FrameRate = 10 + }, + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + }, + ['ValveBiped.Bip01_R_Forearm'] = { + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + }, + ['ValveBiped.Bip01_Spine4'] = { + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + }, + ['ValveBiped.Bip01_L_UpperArm'] = { + }, + ['ValveBiped.Bip01_L_Forearm'] = { + } + }, + FrameRate = 1.6667 + } + }, + Type = TYPE_GESTURE +}) + +RegisterLuaAnimation('swing_onehand_overhead', { + FrameData = { + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + }, + ['ValveBiped.Bip01_Neck1'] = { + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + }, + ['ValveBiped.Bip01_R_Forearm'] = { + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + }, + ['ValveBiped.Bip01_Spine1'] = { + }, + ['ValveBiped.Bip01_Spine4'] = { + }, + ['ValveBiped.Bip01_L_Clavicle'] = { + }, + ['ValveBiped.Bip01_R_Hand'] = { + } + }, + FrameRate = 10 + }, + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + }, + ['ValveBiped.Bip01_Neck1'] = { + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + RU = -14.9433, + RR = -26.7191, + RF = 10.6193 + }, + ['ValveBiped.Bip01_R_Forearm'] = { + RU = 83.616, + RR = 93.0582, + RF = 62.0103 + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + RU = -111.0966, + RR = -74.1549, + RF = -62.4384 + }, + ['ValveBiped.Bip01_Spine1'] = { + }, + ['ValveBiped.Bip01_Spine4'] = { + RR = -2.5225, + RF = -39.26 + }, + ['ValveBiped.Bip01_L_Clavicle'] = { + }, + ['ValveBiped.Bip01_R_Hand'] = { + RU = -9.0093, + RR = 14.4999, + RF = 25.671 + } + }, + FrameRate = 5 + }, + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + RF = 14.4193 + }, + ['ValveBiped.Bip01_Neck1'] = { + RU = 10.6282, + RR = 9.7472, + RF = -42.9906 + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + RU = -14.9433, + RR = -26.7191, + RF = 10.6193 + }, + ['ValveBiped.Bip01_R_Forearm'] = { + RU = 98.1268, + RR = 5.534, + RF = 96.1386 + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + RU = -203.1287, + RR = -120.029, + RF = -2.2254 + }, + ['ValveBiped.Bip01_Spine1'] = { + RF = 9.6129 + }, + ['ValveBiped.Bip01_Spine4'] = { + RU = 18.6599, + RF = 43.4352 + }, + ['ValveBiped.Bip01_L_Clavicle'] = { + }, + ['ValveBiped.Bip01_R_Hand'] = { + RU = -41.5509, + RR = -6.2725, + RF = 16.9206 + } + }, + FrameRate = 10 + }, + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + }, + ['ValveBiped.Bip01_Neck1'] = { + }, + ['ValveBiped.Bip01_L_Clavicle'] = { + }, + ['ValveBiped.Bip01_R_Forearm'] = { + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + }, + ['ValveBiped.Bip01_Spine1'] = { + }, + ['ValveBiped.Bip01_Spine4'] = { + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + }, + ['ValveBiped.Bip01_R_Hand'] = { + } + }, + FrameRate = 1.6667 + } + }, + Type = TYPE_GESTURE +}) + +RegisterLuaAnimation('swing_onehand_right', { + FrameData = { + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + }, + ['ValveBiped.Bip01_Neck1'] = { + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + }, + ['ValveBiped.Bip01_L_Forearm'] = { + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + }, + ['ValveBiped.Bip01_Spine1'] = { + }, + ['ValveBiped.Bip01_Spine4'] = { + }, + ['ValveBiped.Bip01_R_Forearm'] = { + }, + ['ValveBiped.Bip01_R_Hand'] = { + } + }, + FrameRate = 10 + }, + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + RF = -13.0166 + }, + ['ValveBiped.Bip01_Neck1'] = { + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + }, + ['ValveBiped.Bip01_R_Forearm'] = { + RU = 64.7312, + RR = -12.5429, + RF = -0.7 + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + }, + ['ValveBiped.Bip01_Spine1'] = { + }, + ['ValveBiped.Bip01_Spine4'] = { + RF = -26.2859 + }, + ['ValveBiped.Bip01_L_Forearm'] = { + }, + ['ValveBiped.Bip01_R_Hand'] = { + RU = -2.0679, + RR = -3.5029, + RF = 87.3164 + } + }, + FrameRate = 5 + }, + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + RF = 47.2023 + }, + ['ValveBiped.Bip01_Neck1'] = { + RR = -15.9212, + RF = -57.372 + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + RR = 21.3645, + RF = 0.6008 + }, + ['ValveBiped.Bip01_R_Forearm'] = { + RU = 64.7168, + RR = -50.8221, + RF = -48.8765 + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + RR = -35.8651, + RF = -47.1548 + }, + ['ValveBiped.Bip01_Spine1'] = { + RF = 11.3894 + }, + ['ValveBiped.Bip01_Spine4'] = { + RF = 36.4235 + }, + ['ValveBiped.Bip01_L_Forearm'] = { + RU = 49.4639, + RR = -10.0868, + RF = 6.7341 + }, + ['ValveBiped.Bip01_R_Hand'] = { + RU = -2.0679, + RR = 44.9745, + RF = 85.4281 + } + }, + FrameRate = 10 + }, + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + }, + ['ValveBiped.Bip01_Neck1'] = { + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + }, + ['ValveBiped.Bip01_R_Forearm'] = { + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + }, + ['ValveBiped.Bip01_Spine1'] = { + }, + ['ValveBiped.Bip01_Spine4'] = { + }, + ['ValveBiped.Bip01_L_Forearm'] = { + }, + ['ValveBiped.Bip01_R_Hand'] = { + } + }, + FrameRate = 1.6667 + } + }, + Type = TYPE_GESTURE +}) + +RegisterLuaAnimation('swing_onehand_stab', { + FrameData = { + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + }, + ['ValveBiped.Bip01_Neck1'] = { + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + }, + ['ValveBiped.Bip01_L_Forearm'] = { + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + }, + ['ValveBiped.Bip01_Spine1'] = { + }, + ['ValveBiped.Bip01_Spine4'] = { + }, + ['ValveBiped.Bip01_R_Forearm'] = { + }, + ['ValveBiped.Bip01_L_UpperArm'] = { + }, + ['ValveBiped.Bip01_R_Hand'] = { + } + }, + FrameRate = 10 + }, + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + RF = -18.294 + }, + ['ValveBiped.Bip01_Neck1'] = { + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + }, + ['ValveBiped.Bip01_L_Forearm'] = { + RU = -23.5308, + RF = -3.6617 + }, + ['ValveBiped.Bip01_L_UpperArm'] = { + RU = -22.1427 + }, + ['ValveBiped.Bip01_Spine1'] = { + RF = -11.4656 + }, + ['ValveBiped.Bip01_Spine4'] = { + RF = -4.7217 + }, + ['ValveBiped.Bip01_R_Forearm'] = { + RU = 24.4736, + RR = -3.368 + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + RU = 4.3187, + RR = 2.4775, + RF = -147.3305 + }, + ['ValveBiped.Bip01_R_Hand'] = { + RU = -43.7725, + RR = -3.349, + RF = -3.218 + } + }, + FrameRate = 5 + }, + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + RF = 25.4603 + }, + ['ValveBiped.Bip01_Neck1'] = { + RR = -20.3889, + RF = -45.1608 + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + RU = 3.6368, + RR = 20.8097, + RF = 6.6735 + }, + ['ValveBiped.Bip01_R_Forearm'] = { + RU = 83.1342, + RR = -4.2804, + RF = -21.4632 + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + RU = -11.8714, + RR = 4.3073, + RF = -65.2235 + }, + ['ValveBiped.Bip01_Spine1'] = { + RF = 45.7756 + }, + ['ValveBiped.Bip01_Spine4'] = { + RF = 4.61 + }, + ['ValveBiped.Bip01_L_Forearm'] = { + RU = -23.5308, + RF = -3.6617 + }, + ['ValveBiped.Bip01_L_UpperArm'] = { + RU = -22.1427 + }, + ['ValveBiped.Bip01_R_Hand'] = { + RU = -48.1903, + RR = -24.3979, + RF = 53.5558 + } + }, + FrameRate = 10 + }, + { + BoneInfo = { + ['ValveBiped.Bip01_Spine2'] = { + }, + ['ValveBiped.Bip01_Neck1'] = { + }, + ['ValveBiped.Bip01_R_Clavicle'] = { + }, + ['ValveBiped.Bip01_R_Forearm'] = { + }, + ['ValveBiped.Bip01_R_UpperArm'] = { + }, + ['ValveBiped.Bip01_Spine1'] = { + }, + ['ValveBiped.Bip01_Spine4'] = { + }, + ['ValveBiped.Bip01_L_Forearm'] = { + }, + ['ValveBiped.Bip01_L_UpperArm'] = { + }, + ['ValveBiped.Bip01_R_Hand'] = { + } + }, + FrameRate = 1.6667 + } + }, + Type = TYPE_GESTURE +}) diff --git a/gamemode/tools/markarea/sh_markarea.lua b/gamemode/tools/markarea/sh_markarea.lua deleted file mode 100644 index 217680a..0000000 --- a/gamemode/tools/markarea/sh_markarea.lua +++ /dev/null @@ -1,4 +0,0 @@ ---[[ - Allows you to easily mark areas of the map -]] -print("hello from markarea.lua") |