summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Pickering <alexandermpickering@gmail.com>2016-05-01 11:42:43 -0400
committerAlexander Pickering <alexandermpickering@gmail.com>2016-05-01 11:42:43 -0400
commit489fca6e8e514e5061e82a3b4d299410ea978f34 (patch)
tree36a225a0ebb805dc7f0db947e46aaac0d71286a2
parenta1a02f08a06e8d150099a483a2a4e1844364ac5a (diff)
downloadgmstranded-489fca6e8e514e5061e82a3b4d299410ea978f34.tar.gz
gmstranded-489fca6e8e514e5061e82a3b4d299410ea978f34.tar.bz2
gmstranded-489fca6e8e514e5061e82a3b4d299410ea978f34.zip
Fixed recepies for platinum furnace, added elm, platinum, and pure mithril resources
-rw-r--r--gamemode/craftablesystem/furnaces/platinumfurnace.lua16
-rw-r--r--gamemode/itemsystem/items/aaaItemExample.lua (renamed from gamemode/itemsystem/items/anexample.lua)4
-rw-r--r--gamemode/itemsystem/items/elm.lua10
-rw-r--r--gamemode/itemsystem/items/platinum.lua10
-rw-r--r--gamemode/itemsystem/items/puremithril.lua10
5 files changed, 40 insertions, 10 deletions
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/anexample.lua b/gamemode/itemsystem/items/aaaItemExample.lua
index 100096f..ee67639 100644
--- a/gamemode/itemsystem/items/anexample.lua
+++ b/gamemode/itemsystem/items/aaaItemExample.lua
@@ -8,7 +8,7 @@ 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
+--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
@@ -29,7 +29,7 @@ ITEM.Actions = {
}
}
}
---]]
+]]
ITEM.Actions = {}
--Be sure to register when everything is said and done!
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)