Browse Source

Code Fixes
Katja / Katia value confusion
Missing exit acts taking friend to café
'Refuse' choices for dancing events at 'House of Culture' has chance to improve Willpower changed to Will as 0-1 increase on Willpower is not consistent with normal loss and gains of Willpower but is consistent with will gains as is paired with Int gains of 0-1.
Change Uncle Micha events to trigger even if MumSlut > 1 as set when talked to your mother
At the 'Fitness Center' location there is an invalid argument 'razd' used breaking some activities. Changed to 'dressing room' to allow you to exit broken activities
Changed 'Shop-Keys Pussy' to trade same as other stores in the 'Center Shoppingcentyer'
Changed 'Shop-Keys Pussy manager to be available only Monday to Friday

Wonder Dog 9 years ago
parent
commit
1167279336

BIN
glife.txt


+ 2 - 1
locations/BMloc

@@ -43,7 +43,8 @@ act 'Dance':
 
 	act 'Refuse':
 		cls
-		willpower += rand(0, 1)
+		! WD: Should be will not willpower
+		will += rand(0, 1)
 		gt 'gdkin'
 	end
 end

+ 10 - 5
locations/EvgopBuh

@@ -82,7 +82,8 @@ if GorSlut < 3:
 		if alko < 4:
 			act 'Go back to the club':
 				cls
-				willpower += rand(0, 1)
+				! WD: Should be will not willpower
+				will += rand(0, 1)
 				intel += rand(0, 1)
 				gt 'gdkin'
 			end
@@ -106,7 +107,8 @@ if GorSlut < 3:
 
 					act 'Go back to the club':
 						cls
-						willpower += rand(1, 3)
+						! WD: Should be will not willpower
+						will += rand(1, 3)
 						intel += rand(1, 3)
 						gt 'gdkin'
 					end
@@ -124,7 +126,8 @@ if GorSlut < 3:
 				if horny < 75:
 					act 'Go back to the club':
 						cls
-						willpower += rand(1, 3)
+						! WD: Should be will not willpower
+						will += rand(1, 3)
 						intel += rand(1, 3)
 						gt 'gdkin'
 					end
@@ -140,7 +143,8 @@ if GorSlut < 3:
 
 						act 'Go back to the club':
 							cls
-							willpower += rand(1, 3)
+							! WD: Should be will not willpower
+							will += rand(1, 3)
 							intel += rand(1, 3)
 							gt 'gdkin'
 						end
@@ -190,7 +194,8 @@ if GorSlut < 3:
 
 									act 'Go back to the club':
 										cls
-										willpower += rand(0, 1)
+										! WD: Should be will not willpower
+										will += rand(0, 1)
 										intel += rand(0, 1)
 										gt 'gdkin'
 									end

+ 1 - 1
locations/KatjaHomeDin

@@ -174,7 +174,7 @@ $d_katjaSextalk = {
 }
 
 $d_katjahornykiss = {
-	'Katia brought his face to your, like_this, that you could feel her hot breath on her skin.'
+	'Katja brought his face to your, like_this, that you could feel her hot breath on her skin.'
 
 	act 'Bring your face close to hers':
 		cls

+ 1 - 1
locations/Katlake

@@ -34,7 +34,7 @@ if $ARGS[0] = 'znakomstvo':
 		'"Hello" you say a bit shyly.'
 		'Girl looks you up and down, smiles and says, "Hi."'
 		'She looks at you with a slight smile and waits. You frantically trying to think of what to say, blushing trying to squeeze out a word.'
-		'Girl notices your flour and decides to take matters into their own hands, "I Katia, for friends Kate and what''s your name?"'
+		'Girl notices your flour and decides to take matters into their own hands, "I Katja, for friends Kate and what''s your name?"'
 		'"<<$name>>" you exhale with relief. Continue the conversation went much better and you chatted for another half hour.'
 
 		act 'Leave.':gt 'Nudelake'

+ 1 - 1
locations/Kwlake2

@@ -3,7 +3,7 @@ clr
 gs 'stat'
 '<center><img src="images/img/Lake/kwlake2/kwlake1.jpg"></center>'
 'Walking along the beach you notice a man sitting alone.'
-'"Let''s sit here not much" Katia offers.'
+'"Let''s sit here not much" Katja offers.'
 
 act '"No, let''s go"':gt 'Nudelake'
 

+ 2 - 2
locations/ParkKafe

@@ -219,7 +219,7 @@ if $ARGS[0] = 'man':
 				!!oral += 1
 				cumlip += 1
 				cumass += 1
-				! WD: breaks horny test below ~ 
+				! WD: breaks horny test below ~
 				!horny = 0
 				vnesh += 1
 				vagina += 1
@@ -229,7 +229,7 @@ if $ARGS[0] = 'man':
 				! WD: fix horny test logic stop both trigger
 				if horny > 75:
 					horny = 0
-					orgasm += 1 
+					orgasm += 1
 					'You covered orgasm'
 				! if horny <= 75:
 				else

+ 2 - 2
locations/Snpc

@@ -28,7 +28,7 @@ if grupNPC[numnpc] >= 60 and grupNPC[numnpc] < 80:'You have a good relationship.
 if grupNPC[numnpc] >= 80:'You have a great relationship.'
 
 if numnpc = 14 and KatjaOTN > 0:
-	if KatjaHorny < 20:'Katia looks calm and indifferent.'
+	if KatjaHorny < 20:'Katja looks calm and indifferent.'
 	if KatjaHorny >= 20 and KatjaHorny < 40:'Katja in the eyes jump merry twinkle.'
 	if KatjaHorny >= 40 and KatjaHorny < 60:'Katja has a faint blush on her cheeks and she looks at you mischievously.'
 	if KatjaHorny >= 60 and KatjaHorny < 80:'Katja blushed and languid looks at you.'
@@ -218,7 +218,7 @@ if numnpc = 14 and meynoldQW > 1 and mop <= 1:
 		'<center><b><font color="maroon"><<$npcName[numnpc]>> <<$npcSurName[numnpc]>></font></b></center>'
 		! WD: Remove Dupe Images ~ '<center><img src="images/qwest/alter/npc<<numnpc>>.jpg"></center>'
 		'<center><img src="images/qwest/alter/npc/<<numnpc>>.jpg"></center>'
-		'Katia quickly straightened your hair and asked. "You what? Little tint, usually distribute or shovel?"'
+		'Katja quickly straightened your hair and asked. "You what? Little tint, usually distribute or shovel?"'
 
 		act 'Light makeup':
 			cla

+ 2 - 1
locations/beg

@@ -19,7 +19,8 @@ if $ARGS[0] = 'start':
 		'<center><img src="images/etogame/fit5.jpg"></center>'
 		'You ran around the stadium practicing the skill of running and developing speed.'
 
-		act 'Leave':gt 'fit', 'razd'
+		! WD: Argument is 'dressing room'
+		act 'Leave':gt 'fit', 'dressing room'
 	end
 end
 

+ 2 - 1
locations/beg1

@@ -43,7 +43,8 @@ if $ARGS[0] = 'start':
 			razradbeg = 6
 			'You have not been qualified for the European Championship.'
 
-			act 'Leave':gt 'fit', 'razd'
+			! WD: Argument is 'dressing room'
+			act 'Leave':gt 'fit', 'dressing room'
 		elseif razradbegK >= 8:
 			cla
 			razradbegK = 0

+ 1 - 1
locations/billsvid

@@ -32,7 +32,7 @@ act 'Play':
 		elseif masha < 20:
 			gt 'billsvid', '3'
 		end
-	elseif $telsob = 'Katia':
+	elseif $telsob = 'Katja':
 		kat += 1
 
 		if kat >= 20:

+ 1 - 1
locations/budgetclothes

@@ -125,7 +125,7 @@ act 'Leave the store':
 	gt 'down'
 end
 
-! WD: Rename 'png' clothing images as scripts are only using 'jpg' ~  
+! WD: Rename 'png' clothing images as scripts are only using 'jpg' ~
 if hour >= 9 and hour <= 21:
 	'<table>
 	<tr>

+ 3 - 3
locations/danceclass

@@ -24,7 +24,7 @@ act 'Modern club dancing (2:00)':
 	if dance < 100:'You studied modern dance club, which is very popular in discos.'
 	if dance >= 100:'Podcherpnut you tried something new in modern club dancing, but you all already know it.'
 
-	act 'Leave':gt 'fit', 'razd'
+	act 'Leave':gt 'fit', 'dressing room'
 end
 
 act 'Striptease (2:00)':
@@ -48,7 +48,7 @@ act 'Striptease (2:00)':
 		'Striptease for you too complicated, you can not perform the dance moves combining them strip. Teacher recommends that you first learn ordinary club dances.'
 	end
 
-	act 'Leave':gt 'fit', 'razd'
+	act 'Leave':gt 'fit', 'dressing room'
 end
 
 act 'Dancing on a pole (2:00)':
@@ -74,7 +74,7 @@ act 'Dancing on a pole (2:00)':
 		if stren < 80:'The teacher explained that you dance on the pole, except the ability to dance, and still requires physical strength.'
 	end
 
-	act 'Leave':gt 'fit', 'razd'
+	act 'Leave':gt 'fit', 'dressing room'
 end
 
 --- danceclass ---------------------------------

+ 1 - 1
locations/dorm

@@ -897,7 +897,7 @@ if $ARGS[0] = 'korr':
 					gs 'stat'
 					'Kendra slides on the strapon and fucks you hard.'
 					picrand = rand(1, 5)
-					
+
 					! WD: Rename missing Image ~ 'kendraStrap.jpg' to 'kendraStrap1.jpg'
 					'<center><img src="images/pics2/kendraStrap<<picrand>>.jpg"></center>'
 

+ 6 - 3
locations/enderKik

@@ -65,7 +65,8 @@ if profi = 1:
 			KikDrawPro += 1
 		end
 
-	act 'Leave the ring':gt 'fit', 'razd'
+	! WD: Argument is 'dressing room'
+	act 'Leave the ring':gt 'fit', 'dressing room'
 	end
 
 
@@ -144,7 +145,8 @@ elseif amateur = 1:
 			KikDrawAm += 1
 		end
 
-		act 'Leave the ring':gt 'fit', 'razd'
+		! WD: Argument is 'dressing room'
+		act 'Leave the ring':gt 'fit', 'dressing room'
 	end
 
 
@@ -187,7 +189,8 @@ elseif sparing = 1:
 		'She turned around and left to the dressing room.'
 	end
 
-	act 'Leave the ring':gt 'fit', 'razd'
+	! WD: Argument is 'dressing room'
+	act 'Leave the ring':gt 'fit', 'dressing room'
 
 end
 

+ 2 - 2
locations/garfather

@@ -110,7 +110,7 @@ if horny>50 and hadsexwithfather=1:
 					gs 'stat'
 					! WD: Correct Image path ~ 'СЃ0,' to 'с0,' Cyrillic Unicode broke during translation
 					'<center><img src="images/nigma/gor/с0,<<rand(0,10)>>.gif"></center>'
-					
+
 					'You continue to suck your stepfathers dick as it continues throbbing. Suddenly, he arches his back and you feel cum begin to pour into your mouth. Although you try your best, the amount of cum flowing from your stepfathers dick is simply too much for you, and some of it instead flows out of your mouth and down your chin. Soon <<$boy>> finishes and you pull his cock out of your sperm-smelling mouth. You can feel the taste of sperm in your mouth, and your <<$liptalk3>> is wet with cum.'
 					act '<B>Move away</B>':gt 'gargazel'
 				end
@@ -123,7 +123,7 @@ if horny>50 and hadsexwithfather=1:
 					facial += 1
 					minut += 10
 					gs 'stat'
-					
+
 					! WD: Correct Image path ~ 'С„0,' to 'ф0,' Cyrillic Unicode broke during translation
 					if rand1<49:'<center><img src="images/nigma/gor/ф0,<<rand(0,9)>>.jpg"></center>'
 					if rand1=>50:'<center><img src="images/nigma/gor/ф0,<<rand(0,9)>>.jpg"></center>'

+ 3 - 2
locations/gdkin

@@ -106,7 +106,8 @@ $din_dance_otkaz = {
 	if alko <= 2 and horny <= 75:
 		act 'Refuse':
 			cls
-			willpower += rand(0, 1)
+			! WD: Should be will not willpower
+			will += rand(0, 1)
 			gt 'gdkin'
 		end
 	end
@@ -322,7 +323,7 @@ if hour >= 20 and hour <= 23:
 		if dance < 50 and agil >= dance:dance += 1
 
 		manna += 10
-		willpower += 10
+		willpower += 10 & ! WD: Should be willpower as is mood
 		frost = 0
 		gs 'stat'
 

+ 2 - 1
locations/gkafe

@@ -95,7 +95,8 @@ else
 
 			razvrand = rand(1, 10)
 
-			if razvrand > 7 and hour > 16 and hour < 20 and age < 18 and dyadyamishaevent = 0 and momslut = 1:
+			! WD: Allpw event to trigger even after talking to mum about fucking her boss
+			if razvrand > 7 and hour > 16 and hour < 20 and age < 18 and dyadyamishaevent = 0 and momslut >= 1:
 				''
 				'Past your table is going to release an adult male, where you will find Uncle Misha, who lives in the house next door, who see you, suddenly stops and tells you:'
 				'Oh, <<$name>>, hello. I learned? See, what yes. Listen, here it is... We are your stepfather as it repaired the car late, and then lay down with me to overthrow ryumashki, and I stayed at the apartment of his luggage with tools. Help him to return? I''ll give a money for ice cream.'

+ 1 - 1
locations/kafe

@@ -582,7 +582,7 @@ if $ARGS[0] = 'workPred':
 
 									if SergeaAndKatjaQW = 0:
 										SergeaAndKatjaQW = 1
-										'After blowjob guy introduced himself, "I Sergei and Katia it. Did not know what''s so hot waitresses work."'
+										'After blowjob guy introduced himself, "I Sergei and Katja it. Did not know what''s so hot waitresses work."'
 									end
 
 									act 'Leave':gt 'kafe', 'workPred'

+ 4 - 1
locations/kafesvid

@@ -29,7 +29,7 @@ act 'Chat':
 		else
 			gt 'kafesvid', '3'
 		end
-	elseif $telsob = 'Katia':
+	elseif $telsob = 'Katja':
 		kat += 1
 
 		if kat >= 20:
@@ -188,6 +188,9 @@ if $ARGS[0] = '2':
 				swallow += 1
 				'<center><img src="images/img/kafesvid/16.jpg"></center>'
 				'You go down on his knees, and <<$telsob>> you catching his cock quickly starts to masturbate aiming your mouth, just seconds after jet of sperm enters your mouth, and <<$telsob>> continues to play cock trying to squeeze it dry in your mouth when she finally ends and the last drop of warm liquid falls into your mouth, you swallow it quickly, and licking lips sit at the table and continue to talk as if nothing had happened.'
+
+				! WD: missing exit
+				act 'Finish':gt 'kafesvid', '3'
 			end
 
 			act 'Continue to masturbate':

+ 1 - 1
locations/kathouse0

@@ -3,7 +3,7 @@ hour = 31
 son = 20
 gs 'stat'
 '<center><img src="images/img/Kathouse/slip.jpg"></center>'
-'Katia brought you to myself and put him to bed and she lay with you too. Early in the morning you povstvovali as she slipped out of your embrace and opened his eyes.'
+'Katja brought you to myself and put him to bed and she lay with you too. Early in the morning you povstvovali as she slipped out of your embrace and opened his eyes.'
 '"Go to sleep, I need to work, I''ll leave you the keys." said Kate and smacking you ran away.'
 'You slept and began to look around, on the couch in front of the bed lay man and looked at you. Probably this is one of her many guys about whom you have described it.'
 

+ 1 - 1
locations/katjaEv

@@ -36,7 +36,7 @@ $din_katja_kiss = {
 				katjalustrand = rand(0, 30)
 
 				if KatjaLust < katjalustrand:
-					'You''re a little touched each other breast and Katia moved away from you.'
+					'You''re a little touched each other breast and Katja moved away from you.'
 
 					act 'Further':gt 'KatjaHomeTalk'
 

+ 1 - 1
locations/kazinosvid

@@ -31,7 +31,7 @@ act 'Play':
 		else
 			gt 'kazinosvid', '3'
 		end
-	elseif $telsob = 'Katia':
+	elseif $telsob = 'Katja':
 		kat += 1
 		if kat >= 20:
 			kisvrand = rand(0, 10)

+ 2 - 1
locations/mirror

@@ -31,7 +31,8 @@ if $ARGS[0] = 'fin':
 
 		if housrA = 0 and fitMir = 1 and saunaYouRoom = 0:
 			fitMir = 0
-			gt 'fit', 'razd'
+			! WD: Argument is 'dressing room'
+			gt 'fit', 'dressing room'
 		end
 
 		if housrA = 0 and stripMir = 1 and saunaYouRoom = 0:

+ 1 - 1
locations/onobjsel

@@ -127,7 +127,7 @@ $objskills = {
 		if Suspeh >= 90:pl 'You are an A+ student.'
 		if Suspeh >= 80 and Suspeh < 90:pl 'You are a bright student, just not the top of your class.'
 		if Suspeh >= 70 and Suspeh < 80:pl 'You are an above average student, but you have to work hard to keep up.'
-		if Suspeh >= 60 and Suspeh < 70:pl 'You are the typical average student. You''re good in the fields you like, but can''t be bothered with the rest.'
+		if Suspeh >= 60 and Suspeh < 70:pl "You are the typical average student. You're good in the fields you like, but can't be bothered with the rest."
 		if Suspeh >= 50 and Suspeh < 60:pl 'You''re not very good in school, you wish you could be somewhere else and your grades show it.'
 		if Suspeh >= 40 and Suspeh < 50:pl 'You are not cut out for school, you skip out most of the time. You wonder how you''re going to manage to get passing grades.'
 		if Suspeh < 40:pl 'You are the class nitwit. You''re still not sure how you got this far in the first place.'

+ 1 - 1
locations/parksvid

@@ -35,7 +35,7 @@ act 'Go for a walk':
 		else
 			gt 'parksvid', '3'
 		end
-	elseif $telsob = 'Katia':
+	elseif $telsob = 'Katja':
 		kat += 1
 
 		if kat >= 20:

+ 16 - 11
locations/stat

@@ -975,22 +975,27 @@ end
 
 
 !
-! WD: Triggers every 15 minutes
+! WD: Triggers every 15 minutes if not sleeping
 !
 if totminut - Trig15Minute >= 15:
 
-	if Trig15Minute = 0:	& ! Init in case of a old save game
+	if Trig15Minute = 0 or InSleep ! 0:	& ! Skip if old save game or sleepimg
 		set Trig15Minute = totminut
+
+	else
+		set Trig15Minute += 15
+
+		! WD: Fix vibrator arousal to trigger every 15 minutes, moved from 'time' location
+		if vibratorin = 1:horny += rand(1, 5)
+
+		! WD: Fixed Piecing arousal to trigger every 15 minutes, instead of once per day
+		hornyStat = pirsA + pirsB + pirsC + pirsD + pirsE + pirsN + (pirsF + pirsG) * 5
+		set horny = hornyStat / 4 + rand(1,4) <= hornyStat mod 4 & ! Apply 1/4 of value on average
+
+		! WD: Clothing
+		if Sexual = 1 and horny < 70:set horny += rand(0, 2)
+		if glamur = 1 and horny < 50:set horny += rand(0, 1)
 	end
-	
-	set Trig15Minute += 15
-	
-	! WD: Fix vibrator arousal to trigger every 15 minutes, moved from 'time' location
-	if vibratorin = 1:horny += rand(1, 5)
-
-	! WD: Fixed Piecing arousal to trigger every 15 minutes, instead of once per day
-	hornyStat = pirsA + pirsB + pirsC + pirsD + pirsE + pirsN + (pirsF + pirsG) * 5
-	set horny = hornyStat / 4 + rand(1,4) <= hornyStat mod 4 & ! Apply 1/4 of value on average
 end
 
 !!!!!!!!!!!!!!!!!!!

+ 1 - 1
locations/telefon

@@ -193,7 +193,7 @@ if $ARGS[0] = 'start':
 
 			if telkat > 0:
 				act 'Call Kate':
-					$telsob = 'Katia'
+					$telsob = 'Katja'
 					dynamic $objmobilaraz
 				end
 			end

+ 2 - 2
locations/torgcentr

@@ -2,12 +2,12 @@
 gs 'stat'
 '<center><b>Shopping mall</b></center>'
 '<center><img src="images/img/centr/torgcentr.jpg"></center>'
-'On the other side <a href="exec:gt ''young_shop''">Shop-Keys Pussy</a> sells clothing for young adults and a <a href="exec:gt ''sportShop'', ''start''">sporting goods store</a>.'
-
 ! WD: Supermarket fix
 $loc = $CURLOC
 
 if hour >= 8 and hour <= 20:
+	! WD: Move Shop-Keys Pussy to consistant open and close
+	'On the other side <a href="exec:gt ''young_shop''">Shop-Keys Pussy</a> sells clothing for young adults and a <a href="exec:gt ''sportShop'', ''start''">sporting goods store</a>.'
 	'Elite <a href="exec:gt ''butik'', ''start''">Boutique</a> with a fashionable and expensive clothes.'
 	'Next to it there is an expensive <a href="exec:gt ''salon'', ''start''">Beauty Salon</a>.'
 	'<a href="exec:GT ''sportShop'',''start''">Sporting goods store</a>.'

+ 7 - 3
locations/young_shop

@@ -31,11 +31,13 @@ lcolor = rgb(106, 90, 205)
 'Manager works from 10:00 to 18:00.'
 
 !!if young_shop_work = 0:
-	act '<font color="navy">Login to the manager</font>':
+! WD: Set managment hours
+if hour >= 8 and hour <= 18 and young_shop_work = 0 and week < 6:
+	act '<font color="navy">Go to the manager</font>':
 		minut += 1
 		gt 'andrey'
 	end
-!!end
+end
 
 act '<b>Get out of the shop</b>':
 	minut += 3
@@ -590,7 +592,9 @@ end
 
 if hour >= 8 and hour <= 18 and young_shop_work = 1 and young_shop_miss >= 3 and week < 6:gt 'andrey'
 
-if hour > 21 or hour < 8 or week >= 6:
+! WD: Change trading hours to consistant with the other shops
+! if hour > 21 or hour < 8 or week >= 6:
+if hour > 21 or hour < 8:
 	cla
 	'Sorry, but the store is closed, - guard comes up to me. - Proceed to the exit.'
 	'<b><center><font color="red">The store is closing.</font></center></b>'