From c60d13112b1890762c7387b74124e59d75179ded Mon Sep 17 00:00:00 2001
From: Hector Franqui <hyfranqui@gmail.com>
Date: Sat, 19 Nov 2016 12:38:16 -0500
Subject: [PATCH] Finished implementation of gifts per phases. Added
 relationship timer decrease. Added disliked items

---
 npc.lua                   |   7 +++++--
 textures/diamond_ring.png | Bin 334 -> 323 bytes
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/npc.lua b/npc.lua
index 20b19b1..8ae1a17 100755
--- a/npc.lua
+++ b/npc.lua
@@ -9,6 +9,9 @@ npc = {}
 npc.FEMALE = "female"
 npc.MALE = "male"
 npc.ITEM_GIFT_EFFECT = 2.5
+-- Expected values for these are 720 each respectively
+npc.GIFT_TIMER_INTERVAL = 2
+npc.RELATIONSHIP_DECREASE_TIMER_INTERVAL = 60
 npc.RELATIONSHIP_PHASE = {}
 -- Define phases
 npc.RELATIONSHIP_PHASE["phase1"] = {limit = 10}
@@ -258,11 +261,11 @@ local function create_relationship(self, clicker_name)
     -- Relationship phase, used for items and for phrases
     phase = "phase1",
     -- How frequent can the NPC receive a gift
-    gift_interval = 1,
+    gift_interval = npc.GIFT_TIMER_INTERVAL,
     -- Current timer count since last gift
     gift_timer_value = 0,
     -- The amount of time without providing gift or talking that will decrease relationship points
-    relationship_decrease_interval = 5,
+    relationship_decrease_interval = npc.RELATIONSHIP_DECREASE_TIMER_INTERVAL,
     -- Current timer count for relationship decrease
     relationship_decrease_timer_value = 0
   }
diff --git a/textures/diamond_ring.png b/textures/diamond_ring.png
index 5cc76d2c446b0f28c5cf513504e510a6cc5f9ae5..11c56a8145c29ab9df994cd263d05bd27fe66335 100644
GIT binary patch
delta 281
zcmV+!0p|YB0>c83Gk*a3Nkl<ZIE~$q!AiqG7=*t~tXjc>6f`8a-g@c5gD=o?Za#ts
zpGo=%zC!Q~JhTVVLqO7$Vzjkj6hgAUx8ioU#hc(9XXl@t8Tj825y|shc4?H0+&n6Z
zf-K93<Ji*gxeQJ|Z+KqydHsq2==dq;XZOwoPJ?!taJZOquzv~xIBw?zorm95(Bq+~
zk4KtWg??|$-v$G`i#uoS^|4MusYYFExN6juCJ9B4hsK*xK|f6Z@S~Px?nf>3vPLZ@
z2JcxZN)5`9QYoa=HtmWE;Pra=K>$EApQF>1x)wRQUU)kVewu7z|LV=sZ(X#$JvGO=
feA&MKpW+*1#u8whpO;pu00000NkvXXu0mjf`80}e

delta 292
zcmV+<0o(q=0?q=EGk*aENkl<ZIE~$qy-LGy6vcl@S~Y_O$zVyqp_@xV2VcNBZz1Tj
z=nIJSDY_TmK*2>^LN!JT>4ybdAtd*@Ce1&^P4H~@aPGP1T=?HmRZWsaw`nXBxw(|4
zDRCSVhG9+LG8r7K?|5AvGyM(#=r|FlhY!XCMgw;>VsHM=?tjt;VBbyXcAkG%L7vXl
z`g)=G$dJ#Xdad8bKD#&824HyOjb-F(Ht=eX%LbknBVUKt-ng-XOmk%6-~{cOxf8UJ
zMUKq!3U8MOT??`junZ|J3tb7imMU$E3SjqoINdG)#bkm+5k;ZuUe4{U24#~?>|D%h
q`o@o*9JOxC^Bv<`e$}M?Tl@g4rDzO%$$ZiP0000<MNUMnLSTa5P>N3g