aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--entities/entities/ws_researchtable/init.lua29
-rw-r--r--gamemode/hud/games/base.lua2
-rw-r--r--gamemode/hud/games/connectthedots.lua2
-rw-r--r--gamemode/hud/games/rubickscircle.lua2
4 files changed, 16 insertions, 19 deletions
diff --git a/entities/entities/ws_researchtable/init.lua b/entities/entities/ws_researchtable/init.lua
index d9e3045..3fc4233 100644
--- a/entities/entities/ws_researchtable/init.lua
+++ b/entities/entities/ws_researchtable/init.lua
@@ -5,24 +5,15 @@ include('shared.lua')
--[[An item to give hints to players that are just starting out]]
local PossibleRecipies = {
- [2] = { [0]="Barrel",
- [1]="Planks and Sap"},
- [3] = { [0]="Fence",
- [1]="Planks and Sap"},
- [4] = { [0]="Knife",
- [1]="Rock, Sap, Wood, and Crystal"},
- [5] = { [0]="Log",
- [1]="Vine, Sap, and Wood"},
- [6] = { [0]="Plank",
- [1]="Wood and Sap"},
- [7] = { [0]="Rope",
- [1]="Vine and Sap"},
- [8] = { [0]="Sickle",
- [1]="Wood, Rock, and Sap"},
- [9] = { [0]="Stoneblock",
- [1]="Rock and Sap"},
- [11] = { [0]="Vine",
- [1]="Hitting an Antlion hill with a Sickle"},
+ {"Barrel","Planks and Sap"},
+ {"Fence","Planks and Sap"},
+ {"Knife","Rock, Sap, Wood, and Crystal"},
+ {"Log","Vine, Sap, and Wood"},
+ {"Plank","Wood and Sap"},
+ {"Rope","Vine and Sap"},
+ {"Sickle","Wood, Rock, and Sap"},
+ {"Stoneblock","Rock and Sap"},
+ {"Vine","Hitting an Antlion hill with a Sickle"},
}
function ENT:Initialize()
@@ -43,7 +34,7 @@ end
function ENT:Think()
- local randomrecipie = PossibleRecipies[math.random(1,10)]
+ local randomrecipie = PossibleRecipies[math.random(1,#PossibleRecipies)]
if(randomrecipie == nil) then
print("Random recipie returned null in reasearchtable:init.lua line 47")
return
diff --git a/gamemode/hud/games/base.lua b/gamemode/hud/games/base.lua
index eba7642..5bf455a 100644
--- a/gamemode/hud/games/base.lua
+++ b/gamemode/hud/games/base.lua
@@ -1,6 +1,8 @@
--A file to show what functions are used for minigames
print("Base included!")
+Game = Game or {}
+
--Required functions
--Called once when the plyer starts casting
Game.Cast = function(spelltab,difficulty)
diff --git a/gamemode/hud/games/connectthedots.lua b/gamemode/hud/games/connectthedots.lua
index 20cc601..9e05919 100644
--- a/gamemode/hud/games/connectthedots.lua
+++ b/gamemode/hud/games/connectthedots.lua
@@ -1,6 +1,8 @@
--The connet the dots spell game
print("Hi from connectthedots.lua")
+Game = Game or {}
+
--Minigame is held in self.dots, each dot is a table,
--dot[num] = {dot x, dot y, {
-- {armor_start_angle, armor_end_angle},
diff --git a/gamemode/hud/games/rubickscircle.lua b/gamemode/hud/games/rubickscircle.lua
index 2e81bba..a659f9c 100644
--- a/gamemode/hud/games/rubickscircle.lua
+++ b/gamemode/hud/games/rubickscircle.lua
@@ -12,6 +12,8 @@ print("rubick's circle included!")
/ | \
]]-- 5 4 3
+Game = Game or {}
+
--Required functions
--Called once when the plyer starts casting
Game.Cast = function(spelltab,difficulty)