5 Комити 939b6e0d9c ... 8bb1c560e4

Аутор SHA1 Порука Датум
  Kevin_Smarts 8bb1c560e4 [fixed] varible checked twice spotted by Lurk пре 1 година
  Kevin_Smarts 2b89fe6621 Merge branch 'fix-road-house-tips' of LoyalCourtJester/glife into master пре 1 година
  Kevin_Smarts 974c731e00 Merge branch 'master' of Ethan99/glife into master пре 1 година
  Kevin_Smarts dec0ccbcab [fixed] My dumbassery spotted by Ethan99 пре 1 година
  LoyalCourtJester f593485089 [fixed] Sveta now gets her total tips instead of tips_roll variable after working a shift at Road House cafe пре 1 година
3 измењених фајлова са 6 додато и 6 уклоњено
  1. 4 4
      locations/AppearanceSystem.qsrc
  2. 1 1
      locations/city_kafe.qsrc
  3. 1 1
      locations/korrPar.qsrc

+ 4 - 4
locations/AppearanceSystem.qsrc

@@ -262,13 +262,13 @@ if $ARGS[0] = 'CalcAccessoriesBonus':
 	end
 
 	if BraQuality = 6:
-		pantyBonus = 4
+		braBonus = 4
 	elseif BraQuality = 5:
-		pantyBonus = 3
+		braBonus = 3
 	elseif BraQuality >= 3:
-		pantyBonus = 2
+		braBonus = 2
 	else
-		pantyBonus = BraQuality - 1
+		braBonus = BraQuality - 1
 	end
 
 	result = coatQualityBonus + shoesQualityBonus + pantyBonus + braBonus

+ 1 - 1
locations/city_kafe.qsrc

@@ -619,7 +619,7 @@ if $ARGS[0] = 'tips':
 	if workKafe['tips_total'] < 100: workKafe['tips_total'] = 110 - rand(0,20)
 	if workKafe['tips_total'] > 500: workKafe['tips_total'] = 510 - rand(0,20)
 	!! Give Sveta her tips
-	money += workKafe['tips_roll']
+	money += workKafe['tips_total']
 	!! Reset daily modifier
 	workKafe['tips_roll'] = 0
 	!! Skill and attribute gains

+ 1 - 1
locations/korrPar.qsrc

@@ -145,7 +145,7 @@ end
 
 !! Natasha Belova quest checks
 !!gs 'natbel_init', 'quests'
-if NatbelQW['QWstage'] >= 4 and week < 6 and (hour = 6 or hour = 7) and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and (PCloStyle2 = 4 or Enable_sforma = 1) and SchoolAtestat = 0:
+if NatbelQW['QWstage'] >= 4 and week < 6 and (hour = 6 or hour = 7) and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and (PCloStyle2 = 4 or Enable_sforma = 1):
     *nl
     'You could go to Natasha''s apartment and get her to carry your books to school.'
     act 'Go to Natasha''s apartment': gt 'natbel_cp_1', 'carrybooks'