Преглед изворни кода

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

Kevin_Smarts пре 2 година
родитељ
комит
0abcf853b5
3 измењених фајлова са 16 додато и 14 уклоњено
  1. 13 13
      locations/ApperanceSystem.qsrc
  2. 2 0
      locations/booty_call.qsrc
  3. 1 1
      locations/npcgeneratec.qsrc

+ 13 - 13
locations/ApperanceSystem.qsrc

@@ -103,30 +103,30 @@ end
 
 if $ARGS[0] = 'CalcVisibleAgePenalty':
 	if vidage < 20:
-		tempAttributePenelty =   func('shortgs','round_divide', (5*(20 - vidage)), 2)
+		tempAttributePenalty =   func('shortgs','round_divide', (5*(20 - vidage)), 2)
 	else
-		tempAttributePenelty = 0
+		tempAttributePenalty = 0
 	end
 
-	result = func($this, 'AdjustFromBMI', tempAttributePenelty)
-	killvar 'tempAttributePenelty'
+	result = func($this, 'AdjustFromBMI', tempAttributePenalty)
+	killvar 'tempAttributePenalty'
 end
 
 if $ARGS[0] = 'CalcTeethPenalty':
 	if pcs_teeth > 0:
-		tempAttributePenelty =  10 * pcs_teeth
+		tempAttributePenalty =  10 * pcs_teeth
 	elseif pcs_teeth = 0:
-		tempAttributePenelty = 5
+		tempAttributePenalty = 5
 	else
-		tempAttributePenelty = 0
+		tempAttributePenalty = 0
 	end
 
 	if pcs_missing_teeth > 0:
-		tempAttributePenelty +=  10 * pcs_missing_teeth
+		tempAttributePenalty +=  10 * pcs_missing_teeth
 	end
 
-	result = func($this, 'AdjustFromBMI', tempAttributePenelty)
-	killvar 'tempAttributePenelty'
+	result = func($this, 'AdjustFromBMI', tempAttributePenalty)
+	killvar 'tempAttributePenalty'
 end
 
 if $ARGS[0] = 'SetBodyShapeBonus':
@@ -174,11 +174,11 @@ if $ARGS[0] = 'SetBodyShapeBonus':
 		if succubusflag = 1:
 			tempBodyShapeBonus += 10
 		else
-			if strenbuff > 180:
+			if strenbuf > 180:
 				tempBodyShapeBonus -= 70
-			elseif strenbuff > 160:
+			elseif strenbuf > 160:
 				tempBodyShapeBonus -= 50
-			elseif strenbuff > 140:
+			elseif strenbuf > 140:
 				tempBodyShapeBonus -= 30
 			elseif strenbuf <= 5 or strenbuf > 120:
 				tempBodyShapeBonus -= 20

+ 2 - 0
locations/booty_call.qsrc

@@ -24,6 +24,8 @@ if $ARGS[0] = 'SMS raiser':
 			gs 'booty_call_sms', 'start',$FuckBuddy[i]
 			gs 'booty_call_sms', 'Add SMS', $FuckBuddy[i]
 			booty_call_time[$FuckBuddy[i]] = 2000
+			!! this is a bit superfluous, but it makes the code run fater.
+			booty_call['A0'] = daystart
 		end
 		i += 1
 		jump 'booty_call_sms_raiser_loop'

+ 1 - 1
locations/npcgeneratec.qsrc

@@ -236,7 +236,7 @@ npc_love[$npclastgenerated] = 0
 npc_occupation[$npclastgenerated] = 0
 npc_outfit[$npclastgenerated] = 0
 
-! {Unspecified dad and <<$npc_nickname[''A29'']>>.
+! Unspecified dad and <<$npc_nickname[''A29'']>>.
 if npctempgsex = 1 or npctempgsex = 2:
    !! A female face
    $npc_pic[$npclastgenerated] = 'icon_bf' + rand(31, 60) + '.png'