From 245c2c32c2b7f7a93c9ac23b32e1fe379fbbf622 Mon Sep 17 00:00:00 2001 From: NewbProgrammer101 Date: Fri, 8 Sep 2017 07:31:19 -0500 Subject: [PATCH] My first pull request. (#15) * Delete occupations_data.lua * Update default_priest.lua * Update init.lua --- data/occupations/default_priest.lua | 15 +++++++++++++-- data/occupations_data.lua | 7 ------- init.lua | 4 +++- 3 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 data/occupations_data.lua diff --git a/data/occupations/default_priest.lua b/data/occupations/default_priest.lua index fa8b588..f91bed6 100644 --- a/data/occupations/default_priest.lua +++ b/data/occupations/default_priest.lua @@ -82,7 +82,18 @@ local priest_def = { [12] = "Judge not, lest ye be judged. Mankind is nothing but a great family and we all spring from common source", [13] = "Anger clouds the mind in the very moments that clarity and objectivity are needed most.", [14] = "Nature, Being, The Absolute, Creator... whatever name man chooses, there is but one force in the universe. All people and things are of one essence", - [15] = "Study the words, no doubt, but look behind them to the thought they indicate;\nhaving fond it, throw the words away. Live the spirit of them" + [15] = "Study the words, no doubt, but look behind them to the thought they indicate;\nhaving fond it, throw the words away. Live the spirit of them", + [16] = "The wise store up choice food and olive oil, \nbut fools gulp theirs down.", + [17] = "An inheritance claimed too soon \nwill not be blessed at the end.", + [18] = "Young men give glory in their strength, \nbut old men are honored for their gray hair.", + [19] = "Humility is the fear of the Creator, or whatever name man chooses; \nits wages are riches and honor in life.", + [20] = "Listen, my child, and be wise, \nand set your heart on the right path.", + [21] = "Do not speak to fools, \nfor they will scorn your prudent words.", + [22] = "The schemes of folly are sin, \nand people detest a mocker.", + [23] = "An honest answer is like a kiss on the lips.", + [24] = "Do not envy the wicked, \ndo not desire their company; \nfor their hearts plot violence, \nand their lips talk about making trouble.", + [25] = "Do not fret because of evildoers, for the evildoer has no future hope.", + [26] = "It is to one's honor to avoid strife, \nbut every fool is quick to quarrel" } npc.chat(self.npc_name, player:get_player_name(), teachings[math.random(1, #teachings)] ..". \nThese are the teachings of our Creator.") @@ -194,4 +205,4 @@ local priest_def = { } -- Register occupation -npc.occupations.register_occupation("basic_priest", priest_def) \ No newline at end of file +npc.occupations.register_occupation("basic_priest", priest_def) diff --git a/data/occupations_data.lua b/data/occupations_data.lua deleted file mode 100644 index 600f694..0000000 --- a/data/occupations_data.lua +++ /dev/null @@ -1,7 +0,0 @@ - -local path = minetest.get_modpath("advanced_npc") - --- This may be temporary for now. -dofile(path.."/data/occupations/default.lua") -dofile(path.."/data/occupations/default_farmer.lua") -dofile(path.."/data/occupations/default_priest.lua") \ No newline at end of file diff --git a/init.lua b/init.lua index 23efd33..0fb0aac 100755 --- a/init.lua +++ b/init.lua @@ -40,6 +40,8 @@ dofile(path .. "/random_data.lua") dofile(path .. "/data/dialogues_data.lua") dofile(path .. "/data/gift_items_data.lua") dofile(path .. "/data/names_data.lua") -dofile(path .. "/data/occupations_data.lua") +dofile(path .. "/data/occupations/default.lua") +dofile(path .. "/data/occupations/default_farmer.lua") +dofile(path .. "/data/occupations/default_priest.lua") print (S("[Mod] Advanced NPC loaded"))