Browse Source

[fixed] All the stamina changes (and som Katja stuff) I had added to stat have been overwritten because of merging someting that was behind. Be very carefull when you merge sensitive thinks like stat.

bgkjdgbizgblzdgbr 10 months ago
parent
commit
4c2a2d9daa
1 changed files with 11 additions and 7 deletions
  1. 11 7
      locations/stat.qsrc

+ 11 - 7
locations/stat.qsrc

@@ -87,10 +87,6 @@ end
 if lernSkill >= 8: gs 'exp_gain', 'intel', 1 & lernSkill = 0
 if lern >= 10: gs 'exp_gain', 'intel', 1 & lern = 0
 
-!! Katja learning about you sexual experience from other sources because you are a slut.
-if fame['pav_slut'] >= 150 and stat['bj'] > 0 and katjaQW['knows_BJ'] ! 1: katjaQW['knows_BJ'] = 1
-if fame['pav_slut'] >= 250 or preg > 0 and stat['vaginal'] > 0 and katjaQW['knows_sex'] ! 1: katjaQW['knows_sex'] = 1
-
 shameless = guy + stat['bj'] + stat['anal'] + stat['hj'] + ((slutty + gang) * 2)
 moneySUM = money + karta + stolmoney
 cumSUM = cumsumbod/40
@@ -195,7 +191,7 @@ elseif pcs_inhib > 100:
 end
 
 healthmax = (pcs_vital * 10 + pcs_stren * 5)
-stammax = 5 * (2 * pcs_vital + pcs_agil + pcs_stren) / 2
+stammax = (30* (2 * pcs_vital + pcs_agil + pcs_stren) +1000)/ 13
 speed = (2 * (pcs_stren + pcs_agil) + pcs_vital) / 5
 if healthmax < 1: healthmax = 1
 if willpowermax < 50: willpowermax = 50
@@ -454,7 +450,7 @@ if minut >= 60:
 			pcs_energy -= (4 * amphetamineBonus + succublvl/2)
 			pcs_hydra -= (8 * amphetamineBonus + succublvl/2)
 		end
-		pcs_stam += stammax / 10
+		pcs_stam += stammax / 8
 		pcs_sleep -= 4
 		if alko > 0: alko -= 1
 		pcs_willpower_feeder += willpowermax*4
@@ -468,7 +464,6 @@ if minut >= 60:
 			pcs_energy -= (8 * amphetamineBonus + succublvl)
 			pcs_hydra -= (16 * amphetamineBonus + succublvl)
 		end
-		pcs_stam += stammax / 20
 		if InSleepWake <= hour or InSleepWake[1] < daystart:
 			pcs_sleep -= 4
 		end
@@ -497,6 +492,13 @@ if minut >= 60:
 		else
 			pcs_mood['hydredcheck'] = 0
 		end
+-		if pcs_stam <= 0:
+-			pcs_mood -= 6
+-			pcs_sleep -= 5
+-		elseif pcs_stam < stammax / 5:
+-			pcs_mood -= 3
+-		end
+-		pcs_stam += stammax / 40
 		pcs_willpower_feeder += willpowermax*4/3
 		pcs_willpwr += pcs_willpower_feeder/100
 		pcs_willpower_feeder = pcs_willpower_feeder mod 100
@@ -694,6 +696,8 @@ if minut >= 60:
 
 	gs 'traits', 'hourly'
 
+	gs 'katja_procedural', 'hourly'
+
 	if (hour mod 2) = 0: gs 'outdoors', 'weather'
 
 	!! I do not think that this should be here, but I put it here temporaly - rachels