Prechádzať zdrojové kódy

Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

Kevin_Smarts 1 týždeň pred
rodič
commit
f24aed6459

+ 10 - 5
locations/clothing_attributes.qsrc

@@ -277,11 +277,16 @@ if $ARGS[0] ! 'allure_swimsuit' and $ARGS[0] ! 'allure_bikinis' and $ARGS[0] ! '
 	end
 end
 
-if CloTopCut > 1:
-	if tits = 2 or tits = 3: CloTopCut += 1
-	if tits >= 4: CloTopCut += 2
-	if CloTopCut > 2 and tits >=6: CloTopCut += 1
-end
+!! Adjusting the cleavage to the player characters breast size.
+if CloTopCut = 3 and tits >=4: CloTopCut = 4
+if CloTopCut = 2 and tits >=6: CloTopCut = 3
+!! This is the old version giving to drastic changes when the scal of CloTopCut is only 1-4
+!!if CloTopCut > 1:
+!!	if tits = 2 or tits = 3: CloTopCut += 1
+!!	if tits >= 4: CloTopCut += 2
+!!	if CloTopCut > 2 and tits >=6: CloTopCut += 1
+!!end
+!!if CloTopCut > 4: CloTopCut = 4
 
 --- clothing_attributes ---------------------------------
 

+ 10 - 0
locations/npc_relationship.qsrc

@@ -68,8 +68,10 @@ if $ARGS[0] = 'modify':
 		npcRelSetVal = rand(1,2)
 	elseif $ARGS[2] = 'love':
 		npcRelSetVal = rand(3,4)
+		gs 'exp_gain', 'humint', rand(0,1)
 	elseif $ARGS[2] = 'adore':
 		npcRelSetVal = rand(5,6)
+		gs 'exp_gain', 'humint', rand(1,2)
 	elseif $ARGS[2] = 'dislike':
 		npcRelSetVal = 0-rand(1,2)
 	elseif $ARGS[2] = 'hate':
@@ -80,6 +82,14 @@ if $ARGS[0] = 'modify':
 	else
 		npcRelSetVal = 0
 	end
+
+	!Modify for people skill
+	if npcRelSetVal > 0:
+		npcRelSetVal += (npcRelSetVal*pcs_humint)/100
+	elseif npcRelSetVal < 0:
+		npcRelSetVal -= (npcRelSetVal*pcs_humint)/200
+	end
+
 	!Make sure the new value fits within correct range
 	npcRelSetVal += npc_rel[$ARGS[1]]
 	if npcRelSetVal > 100: npcRelSetVal=100