From 489fca6e8e514e5061e82a3b4d299410ea978f34 Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Sun, 1 May 2016 11:42:43 -0400 Subject: Fixed recepies for platinum furnace, added elm, platinum, and pure mithril resources --- .../craftablesystem/furnaces/platinumfurnace.lua | 16 +++++----- gamemode/itemsystem/items/aaaItemExample.lua | 36 ++++++++++++++++++++++ gamemode/itemsystem/items/anexample.lua | 36 ---------------------- gamemode/itemsystem/items/elm.lua | 10 ++++++ gamemode/itemsystem/items/platinum.lua | 10 ++++++ gamemode/itemsystem/items/puremithril.lua | 10 ++++++ 6 files changed, 74 insertions(+), 44 deletions(-) create mode 100644 gamemode/itemsystem/items/aaaItemExample.lua delete mode 100644 gamemode/itemsystem/items/anexample.lua create mode 100644 gamemode/itemsystem/items/elm.lua create mode 100644 gamemode/itemsystem/items/platinum.lua create mode 100644 gamemode/itemsystem/items/puremithril.lua diff --git a/gamemode/craftablesystem/furnaces/platinumfurnace.lua b/gamemode/craftablesystem/furnaces/platinumfurnace.lua index eb1147d..263fec2 100644 --- a/gamemode/craftablesystem/furnaces/platinumfurnace.lua +++ b/gamemode/craftablesystem/furnaces/platinumfurnace.lua @@ -21,10 +21,10 @@ COMBI.Description = "The purest form of mithril able to be made" COMBI.Entity = "gms_platinumfurnace" COMBI.Req = {} -COMBI.Req["Mithril_Ore"] = 2 +COMBI.Req["Mithril Ore"] = 2 COMBI.Results = {} -COMBI.Results["Pure_Mithril"] = 1 +COMBI.Results["Pure Mithril"] = 1 GMS.RegisterCombi ( COMBI, "gms_platinumfurnace" ) @@ -35,10 +35,10 @@ COMBI.Description = "The purest form of mithril able to be made" COMBI.Entity = "gms_platinumfurnace" COMBI.Req = {} -COMBI.Req["Mithril_Ore"] = 10 +COMBI.Req["Mithril Ore"] = 10 COMBI.Results = {} -COMBI.Results["Pure_Mithril"] = 5 +COMBI.Results["Pure Mithril"] = 5 GMS.RegisterCombi ( COMBI, "gms_platinumfurnace" ) @@ -49,10 +49,10 @@ COMBI.Description = "The purest form of mithril able to be made" COMBI.Entity = "gms_platinumfurnace" COMBI.Req = {} -COMBI.Req["Mithril_Ore"] = 20 +COMBI.Req["Mithril Ore"] = 20 COMBI.Results = {} -COMBI.Results["Pure_Mithril"] = 10 +COMBI.Results["Pure Mithril"] = 10 GMS.RegisterCombi ( COMBI, "gms_platinumfurnace" ) @@ -63,10 +63,10 @@ COMBI.Description = "Pure Mithril can be used to start of you industrial needs" COMBI.Entity = "gms_platinumfurnace" COMBI.Req = {} -COMBI.Req["Mithril_Ore"] = 2 +COMBI.Req["Mithril Ore"] = 2 COMBI.Results = {} -COMBI.Results["Pure_Mithril"] = 1 +COMBI.Results["Pure Mithril"] = 1 COMBI.AllSmelt = true COMBI.Max = 50 diff --git a/gamemode/itemsystem/items/aaaItemExample.lua b/gamemode/itemsystem/items/aaaItemExample.lua new file mode 100644 index 0000000..ee67639 --- /dev/null +++ b/gamemode/itemsystem/items/aaaItemExample.lua @@ -0,0 +1,36 @@ +--This file is to help developers add new items to the game + +ITEM = {} + +--The name of this item +ITEM.Name = "An Example" + +--A description that shows up when hovering over the item in the inventory +ITEM.Description = "Why did I even write this? No one will ever read it!" + +--The icon that this item uses, relative to the gmsurvival/content/materials directory +ITEM.Icon = "test.png" + +--If this item has "unique data", for example batteries that run out of charge +ITEM.UniqueData = false + +--A table of strings to functions that show up when the player clicks the item in their inventory. +--The you may also use strings to tables of strings to functions (and so on) to make drop-down menus. +--Example: +--[[ +ITEM.Actions = { + "Click me!" = functions(player) print("I was clicked!") end + "Or me!" = functions(player) print("I was clicked by " .. player:Name()) end + "Drop down" = { + "This is an item in a drop down" = function(player) print("Drop1") end + "Drop downs can have more drop downs!" = { + "Drop2" = function(player) print("Drop2") end + "Drop3" = function(player) print("Drop3") end + } + } +} +]] +ITEM.Actions = {} + +--Be sure to register when everything is said and done! +GMS.RegisterResource(ITEM) diff --git a/gamemode/itemsystem/items/anexample.lua b/gamemode/itemsystem/items/anexample.lua deleted file mode 100644 index 100096f..0000000 --- a/gamemode/itemsystem/items/anexample.lua +++ /dev/null @@ -1,36 +0,0 @@ ---This file is to help developers add new items to the game - -ITEM = {} - ---The name of this item -ITEM.Name = "An Example" - ---A description that shows up when hovering over the item in the inventory -ITEM.Description = "Why did I even write this? No one will ever read it!" - ---The icon that this item users, relative to the gmsurvival/content/materials directory -ITEM.Icon = "test.png" - ---If this item has "unique data", for example batteries that run out of charge -ITEM.UniqueData = false - ---A table of strings to functions that show up when the player clicks the item in their inventory. ---The you may also use strings to tables of strings to functions (and so on) to make drop-down menus. ---Example: ---[[ -ITEM.Actions = { - "Click me!" = functions(player) print("I was clicked!") end - "Or me!" = functions(player) print("I was clicked by " .. player:Name()) end - "Drop down" = { - "This is an item in a drop down" = function(player) print("Drop1") end - "Drop downs can have more drop downs!" = { - "Drop2" = function(player) print("Drop2") end - "Drop3" = function(player) print("Drop3") end - } - } -} ---]] -ITEM.Actions = {} - ---Be sure to register when everything is said and done! -GMS.RegisterResource(ITEM) diff --git a/gamemode/itemsystem/items/elm.lua b/gamemode/itemsystem/items/elm.lua new file mode 100644 index 0000000..ab62432 --- /dev/null +++ b/gamemode/itemsystem/items/elm.lua @@ -0,0 +1,10 @@ +ITEM = {} + +ITEM.Name = "Elm" +ITEM.Description = "You can identify that this is wood." +ITEM.Icon = "test.png" +ITEM.UniqueData = false + +genericMakeDroppable(ITEM) + +GMS.RegisterResource(ITEM) diff --git a/gamemode/itemsystem/items/platinum.lua b/gamemode/itemsystem/items/platinum.lua new file mode 100644 index 0000000..b6c8985 --- /dev/null +++ b/gamemode/itemsystem/items/platinum.lua @@ -0,0 +1,10 @@ +ITEM = {} + +ITEM.Name = "Platinum" +ITEM.Description = "Something you can craft with!" +ITEM.Icon = "test.png" +ITEM.UniqueData = false + +genericMakeDroppable(ITEM) + +GMS.RegisterResource(ITEM) diff --git a/gamemode/itemsystem/items/puremithril.lua b/gamemode/itemsystem/items/puremithril.lua new file mode 100644 index 0000000..80ad764 --- /dev/null +++ b/gamemode/itemsystem/items/puremithril.lua @@ -0,0 +1,10 @@ +ITEM = {} + +ITEM.Name = "Pure Mithril" +ITEM.Description = "Something you can craft with!" +ITEM.Icon = "test.png" +ITEM.UniqueData = false + +genericMakeDroppable(ITEM) + +GMS.RegisterResource(ITEM) -- cgit v1.2.3-70-g09d2