Merge branch 'master' into master

This commit is contained in:
NewbProgrammer101 2017-09-10 16:22:51 -05:00 committed by GitHub
commit 0368a4d579
2 changed files with 2 additions and 2 deletions

View File

@ -100,6 +100,7 @@ local priest_def = {
[30] = "Love is a tool for capturing the souls of men. Pretend to love, and he will accept you. \nLove is reverence, and worship, and glory, and the upward glance. Not a bandage for dirty sores. \nBut he doesnt know it. Those who speak of love most promiscuously are the ones whove never felt it. \nThey make some sort of feeble stew out of sympathy, compassion, contempt and general indifference, and they call it love. \nOnce youve felt what it means to love, the total passion for the total height—youre incapable of anything less.", [30] = "Love is a tool for capturing the souls of men. Pretend to love, and he will accept you. \nLove is reverence, and worship, and glory, and the upward glance. Not a bandage for dirty sores. \nBut he doesnt know it. Those who speak of love most promiscuously are the ones whove never felt it. \nThey make some sort of feeble stew out of sympathy, compassion, contempt and general indifference, and they call it love. \nOnce youve felt what it means to love, the total passion for the total height—youre incapable of anything less.",
[31] = "If you learn how to rule one single mans soul, you can get the rest of mankind. \nIts the soul, not whips or swords or fire or guns. \nThats why the Caesars, the Attilas, the Napoleons were fools and did not last. \nThe soul, is that which cant be ruled. It must be broken. \nDrive a wedge in, get your fingers on it—and the man is yours.", [31] = "If you learn how to rule one single mans soul, you can get the rest of mankind. \nIts the soul, not whips or swords or fire or guns. \nThats why the Caesars, the Attilas, the Napoleons were fools and did not last. \nThe soul, is that which cant be ruled. It must be broken. \nDrive a wedge in, get your fingers on it—and the man is yours.",
[32] = "Great and wise men cant be ruled." [32] = "Great and wise men cant be ruled."
} }
npc.chat(self.npc_name, player:get_player_name(), teachings[math.random(1, #teachings)] npc.chat(self.npc_name, player:get_player_name(), teachings[math.random(1, #teachings)]
..". \nThese are the teachings of our Creator.") ..". \nThese are the teachings of our Creator.")
@ -211,4 +212,4 @@ local priest_def = {
} }
-- Register occupation -- Register occupation
npc.occupations.register_occupation("priest", priest_def) npc.occupations.register_occupation("basic_priest", priest_def)

View File

@ -43,6 +43,5 @@ dofile(path .. "/data/names_data.lua")
dofile(path .. "/data/occupations/default.lua") dofile(path .. "/data/occupations/default.lua")
dofile(path .. "/data/occupations/default_farmer.lua") dofile(path .. "/data/occupations/default_farmer.lua")
dofile(path .. "/data/occupations/default_priest.lua") dofile(path .. "/data/occupations/default_priest.lua")
dofile(path .. "/data/occupations/default_miner.lua")
print (S("[Mod] Advanced NPC loaded")) print (S("[Mod] Advanced NPC loaded"))