From 01699d1d4a8ee4e8123490d3eca085adc4f7fd41 Mon Sep 17 00:00:00 2001 From: zorman2000 Date: Sun, 4 Dec 2016 15:24:32 -0500 Subject: [PATCH] Relationships: Improved marriage dialogue. When relationships change phase, dialogues are now updated as well. Data: Added placeholder dialogues for both sexes and all phases. --- npc.lua | 7 +++ random_data.lua | 161 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+) diff --git a/npc.lua b/npc.lua index d5a047f..73ed367 100755 --- a/npc.lua +++ b/npc.lua @@ -375,8 +375,15 @@ local function update_relationship(self, clicker_name, modifier) local current_phase = self.relationships[i].phase self.relationships[i].phase = npc.get_relationship_phase_by_points(self.relationships[i].points) if current_phase ~= self.relationships[i].phase then + -- Re-select favorite items per new phase self.gift_data.favorite_items = select_random_favorite_items(self.sex, self.relationships[i].phase) + -- Re-select dialogues per new + self.dialogues = + npc.dialogue.select_random_dialogues_for_npc(self.sex, + self.relationships[i].phase, + self.gift_data.favorite_items, + self.gift_data.disliked_items) return true end return false diff --git a/random_data.lua b/random_data.lua index 9efb971..3c3f585 100644 --- a/random_data.lua +++ b/random_data.lua @@ -55,6 +55,87 @@ npc.data.DIALOGUES.female["phase1"] = { } } +-- Phase 2 +npc.data.DIALOGUES.female["phase2"] = { + [1] = { + text = "Hey buddy!" + }, + [2] = { + text = "Hey buddy!" + }, + [3] = { + text = "Hey buddy!" + }, + [4] = { + text = "Hey buddy!" + } +} + +-- Phase 3 +npc.data.DIALOGUES.female["phase3"] = { + [1] = { + text = "Hi there! Great to see you!" + }, + [2] = { + text = "Hi there! Great to see you!" + }, + [3] = { + text = "Hi there! Great to see you!" + }, + [4] = { + text = "Hi there! Great to see you!" + } +} + +-- Phase 4 +npc.data.DIALOGUES.female["phase4"] = { + [1] = { + text = "I was honestly looking forward to talk to you!" + }, + [2] = { + text = "I was honestly looking forward to talk to you!" + }, + [3] = { + text = "I was honestly looking forward to talk to you!" + }, + [4] = { + text = "I was honestly looking forward to talk to you!" + } +} + +-- Phase 5 +npc.data.DIALOGUES.female["phase5"] = { + [1] = { + text = "You are the love of my life" + }, + [2] = { + text = "You are the love of my life" + }, + [3] = { + text = "You are the love of my life" + }, + [4] = { + text = "You are the love of my life" + } +} + +-- Phase 6 +npc.data.DIALOGUES.female["phase6"] = { + [1] = { + text = "You are the best thing that has happened to me!" + }, + [2] = { + text = "You are the best thing that has happened to me!" + }, + [3] = { + text = "You are the best thing that has happened to me!" + }, + [4] = { + text = "You are the best thing that has happened to me!" + }, +} + + -- Male dialogue options defined by phase -- Phase 1 npc.data.DIALOGUES.male["phase1"] = { @@ -99,4 +180,84 @@ npc.data.DIALOGUES.male["phase1"] = { } } } +} + +-- Phase 2 +npc.data.DIALOGUES.male["phase2"] = { + [1] = { + text = "Hey buddy!" + }, + [2] = { + text = "Hey buddy!" + }, + [3] = { + text = "Hey buddy!" + }, + [4] = { + text = "Hey buddy!" + } +} + +-- Phase 3 +npc.data.DIALOGUES.male["phase3"] = { + [1] = { + text = "Hi there! Great to see you!" + }, + [2] = { + text = "Hi there! Great to see you!" + }, + [3] = { + text = "Hi there! Great to see you!" + }, + [4] = { + text = "Hi there! Great to see you!" + } +} + +-- Phase 4 +npc.data.DIALOGUES.male["phase4"] = { + [1] = { + text = "I was honestly looking forward to talk to you!" + }, + [2] = { + text = "I was honestly looking forward to talk to you!" + }, + [3] = { + text = "I was honestly looking forward to talk to you!" + }, + [4] = { + text = "I was honestly looking forward to talk to you!" + } +} + +-- Phase 5 +npc.data.DIALOGUES.male["phase5"] = { + [1] = { + text = "You are the love of my life" + }, + [2] = { + text = "You are the love of my life" + }, + [3] = { + text = "You are the love of my life" + }, + [4] = { + text = "You are the love of my life" + } +} + +-- Phase 6 +npc.data.DIALOGUES.male["phase6"] = { + [1] = { + text = "You are the best thing that has happened to me!" + }, + [2] = { + text = "You are the best thing that has happened to me!" + }, + [3] = { + text = "You are the best thing that has happened to me!" + }, + [4] = { + text = "You are the best thing that has happened to me!" + }, } \ No newline at end of file