فهرست منبع

Converted din2 to a new dynamic free events file and added in the ability to read magazines to locations where you can read books.

KevinSmarts 8 سال پیش
والد
کامیت
d84b22a790
13فایلهای تغییر یافته به همراه177 افزوده شده و 137 حذف شده
  1. 1 1
      glife.qproj
  2. 1 1
      locations/Gadhouse
  3. 47 5
      locations/bed2
  4. 1 1
      locations/bedrPar
  5. 25 1
      locations/card
  6. 1 22
      locations/divan
  7. 95 95
      locations/events
  8. 1 1
      locations/gopsex
  9. 1 1
      locations/lug
  10. 2 2
      locations/narkopriton
  11. 0 5
      locations/portmirror
  12. 1 1
      locations/street_event
  13. 1 1
      locations/vokzalperG

+ 1 - 1
glife.qproj

@@ -50,7 +50,7 @@
       <Location name="dinSex"/>
       <Location name="dinSex2"/>
       <Location name="dinsexFX"/>
-      <Location name="din2"/>
+      <Location name="events"/>
       <Location name="MenuLoc"/>
       <Location name="MenuMainLoc"/>
       <Location name="oral"/>

+ 1 - 1
locations/Gadhouse

@@ -327,7 +327,7 @@ if vitamin > 0:
 	end
 end
 
-dynamic $d_read_book
+gs 'events', 'read'
 
 if indorf = 1:
 	'The room resting parents.'

+ 47 - 5
locations/bed2

@@ -1,4 +1,32 @@
 # bed2
+
+if $args[0] = 'options':
+	cla
+	act 'Set Alarm Clock':gt 'budilnik', 'start'
+	if bedPanty = 0:
+		act 'You will wear panties in the morning, click to turn off':bedpanty = 1 & gt 'bed2', 'options'
+	else
+		act 'You will not wear panties in the morning, click to turn on':bedpanty = 0 & gt 'bed2', 'options'
+	end
+	if analplug = 1:
+		if bedanal = 0:
+			act 'If worn, you will remove your analplug at night, click to always leave it in':bedanal = 1 & gt 'bed2', 'options'
+		else
+			act 'If worn, you will wear your analplug through the night, click to always remove it':bedanal = 0 & gt 'bed2', 'options'
+		end
+	end
+
+	if vibrator = 1 and cheatVib = 1:
+		if bedvibrator = 0:
+			act 'If worn, you will remove your vibrator at night, click to always leave it in':bedvibrator = 1 & gt 'bed2', 'options'
+		else
+			act 'If worn, you will wear your vibrator through the night, click to always remove it':bedvibrator = 0 & gt 'bed2', 'options'
+		end
+	end
+
+	act 'Return':gt 'bed2'
+end
+
 if $args[0] = '':
 	gs 'stat'
 	cla
@@ -9,7 +37,11 @@ if $args[0] = '':
 		'<center><img src="images/pics/son.jpg"></center>'
 	end
 
-	dynamic $budilnikOn
+	if budilnikOn = 0:
+		'You lie on the bed. Alarm set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 1 & GT ''bed2''">off</a>.'
+	else
+		'You lie on the bed. Alarm set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 0 & GT ''bed2''">on</a>.'
+	end
 
 	if mop ! 1:'<b><font color="red">You need to wash off your makeup before going to bed.</font></b>'
 
@@ -31,7 +63,7 @@ if $args[0] = '':
 			gt 'bed2', 'sleep'
 		end
 	end
-	act 'Options':dynamic $sopts
+	act 'Options':gt 'bed2', 'options'
 
 	act 'Get out of bed':gt $locM, $metkaM
 end
@@ -125,20 +157,30 @@ if $args[0] = 'wake':
 			if schoolH[schtype] = 0:schtype = 6
 			gs 'clothing', 'wear', 'school', schtype
 			minut += 15
-			dynamic $wakepar
+			gs 'bed2', 'end'
 		end
 	end
 
 	act 'Get out of bed and get dressed (0:15)':
 		gs 'clothing', 'wear_last_worn'
 		minut += 15
-		dynamic $wakepar
+		gs 'bed2', 'end'
 	end
 
 	act 'Get out of bed (0:10)':
 		minut += 10
-		dynamic $wakepar
+		gs 'bed2', 'end'
+	end
+end
+
+if $args[0] = 'end':
+	InSleep = 0
+	if bedpanty = 0 and clrbelo > 0:
+		tanga = 1
+	else
+		tanga =0
 	end
+	gt $locM, $metkaM
 end
 
 --- bed2 ---------------------------------

+ 1 - 1
locations/bedrPar

@@ -65,7 +65,7 @@ else
 	if pornMagazine > 0:'You have hidden your porn magazines under the mattress of your bed.'
 	if sisterHere = 0 and pornMagazine > 0:dynamic $d_read_porn
 
-	dynamic $d_read_book
+	gs 'events', 'read'
 
 	if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry with you is 30.'
 

+ 25 - 1
locations/card

@@ -3,7 +3,31 @@ gs 'stat'
 
 act 'Pull the card':
 	cls
-	dynamic $d_slut_horny
+	you_slut += 1
+
+	!!if you_slut < 10:end
+
+	if you_slut >= 10 and you_slut < 20:
+		horny += 1
+	elseif you_slut >= 20 and you_slut < 30:
+		horny += 2
+	elseif you_slut >= 30 and you_slut < 40:
+		horny += 3
+	elseif you_slut >= 40 and you_slut < 50:
+		horny += 4
+	elseif you_slut >= 50 and you_slut < 60:
+		horny += 5
+	elseif you_slut >= 60 and you_slut < 70:
+		horny += 6
+	elseif you_slut >= 70 and you_slut < 80:
+		horny += 7
+	elseif you_slut >= 80 and you_slut < 90:
+		horny += 8
+	elseif you_slut >= 90 and you_slut < 100:
+		horny += 9
+	elseif you_slut >= 100:
+		horny += 10
+	end
 	minut += 1
 	gs 'stat'
 	papkarand = rand(0, 4)

+ 1 - 22
locations/divan

@@ -45,28 +45,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		end
 	end
 
-
-	! WD: Uninitialised ~ 'book'
-	!{
-	if book > 0:
-		act 'Read a book (0:30)':
-			cla
-			*clr
-			minut += 30
-			horny += 5
-			'<center><img src="images/pics/book.jpg"></center>'
-			'You are reading a book.'
-
-			act 'Put the book':gt 'divan', 'start'
-		end
-	end
-	}
-	! WD: Use read book code
-	if f_book > 0 or fantasybook > 0 or w_book > 0 or womanbook > 0:
-		$loc = 'divan'
-		dynamic $d_read_book
-	end
-
+	gs 'events', 'read'
 
 	if horny >= 75:
 		act 'Masturbate (0:15)':dynamic $divmastr

+ 95 - 95
locations/din2 → locations/events

@@ -1,5 +1,6 @@
-# din2
-$din_street_cum = {
+# events
+
+if $ARGS[0] = 'street_cum':
 	if spdirtyc > 0 or spdirtyv > 0:
 		if hour >= 7 and hour <= 21:
 			manna -= 5
@@ -11,14 +12,13 @@ $din_street_cum = {
 			end
 		end
 	elseif spdirtyc = 0 and spdirtyv = 0 and face_write > 0:
-	manna -= 5
-	'Surrounding look at you with surprise, grin or a slight contempt. Someone just point the finger and laughs. Someone photographed phone. Hair obviously can not hide "art" on your face.'
-	
+		manna -= 5
+		'Surrounding look at you with surprise, grin or a slight contempt. Someone just point the finger and laughs. Someone photographed phone. Hair obviously can not hide "art" on your face.'
 	end
-}
+end
 
-$d_read_book = {
-	act 'Read the book':
+if $ARGS[0] = 'read':
+	act 'Read a book':
 		cls
 		gs 'stat'
 		'<center><img src="images/pics/book.jpg"></center>'
@@ -61,7 +61,7 @@ $d_read_book = {
 					'For an hour you read the book.'
 				end
 
-				act 'Close the book':gt $loc
+				act 'Close the book':gt $loc, $Metka
 			end
 		end
 
@@ -103,43 +103,88 @@ $d_read_book = {
 					'For an hour you read the book.'
 				end
 
-				act 'Close the book':gt $loc
+				act 'Close the book':$loc, $Metka
 			end
 		end
 
-		act ' Close the book':gt $loc
+		act ' Close the book':$loc, $Metka
 	end
-}
-
-$d_slut_horny = {
-	you_slut += 1
-
-	!!if you_slut < 10:end
-
-	if you_slut >= 10 and you_slut < 20:
-		horny += 1
-	elseif you_slut >= 20 and you_slut < 30:
-		horny += 2
-	elseif you_slut >= 30 and you_slut < 40:
-		horny += 3
-	elseif you_slut >= 40 and you_slut < 50:
-		horny += 4
-	elseif you_slut >= 50 and you_slut < 60:
-		horny += 5
-	elseif you_slut >= 60 and you_slut < 70:
-		horny += 6
-	elseif you_slut >= 70 and you_slut < 80:
-		horny += 7
-	elseif you_slut >= 80 and you_slut < 90:
-		horny += 8
-	elseif you_slut >= 90 and you_slut < 100:
-		horny += 9
-	elseif you_slut >= 100:
-		horny += 10
+	
+	if cookmag = 0 and fashmag = 0 and compmag = 0 and biomag = 0 and knitmag = 0 and fitmag = 0:
+		'You have no magazines to read.'
+	else
+		act 'Read a magazine':
+			cls
+			gs 'stat'
+			'<center><img src="images/pics/book.jpg"></center>'
+
+			if cookmag = 1:
+				act 'Read your cooking magazine':
+					cookmag = 0
+					manna += 5
+					minut += 30
+					'You relax for half an hour reading your cooking magazine.'
+					act 'Return':$loc, $Metka
+				end
+			end
+
+			if fashmag = 1:
+				act 'Read your fashion magazine':
+					fashmag = 0
+					manna += 5
+					minut += 30
+					'You relax for half an hour reading your fashion magazine.'
+					act 'Return':$loc, $Metka
+				end
+			end
+
+			if compmag = 1:
+				act 'Read your computing magazine':
+					compmag = 0
+					manna += 5
+					minut += 30
+					'You relax for half an hour reading your computing magazine.'
+					act 'Return':$loc, $Metka
+				end
+			end
+
+			if biomag = 1:
+				act 'Read your biographical magazine':
+					biomag = 0
+					manna += 5
+					minut += 30
+					'You relax for half an hour reading your biographical magazine.'
+					act 'Return':$loc, $Metka
+				end
+			end
+
+			if knitmag = 1:
+				act 'Read your knitting magazine':
+					knitmag = 0
+					manna += 5
+					minut += 30
+					if poSkill <= 100: poSkill += rand(1,3)
+					'You relax for half an hour reading your knitting magazine.'
+					act 'Return':$loc, $Metka
+				end
+			end
+
+			if fitmag = 1:
+				act 'Read your fitness magazine':
+					fitmag = 0
+					manna += 5
+					minut += 30
+					'You relax for half an hour reading your fitness magazine.'
+					act 'Return':$loc, $Metka
+				end
+			end
+
+			act 'Return':$loc, $Metka
+		end
 	end
-}
+end
 
-$snkayf = {
+if $ARGS[0] = 'snkayf':
 	snkz = RAND(1,6)
 	if tanga = 1:tanga = 0
 	if snkz = 1:
@@ -159,16 +204,16 @@ $snkayf = {
 	end
 
 	if snkz = 5:
-		dynamic $din_vokzalg_toilet & hour += 2
+		gt 'vokmantoiev', 'female' & hour += 2
 	end
 
 	if snkz = 6:
 		$clothingworntype = 'nude'
 		gt'Glake' & hour += 2
 	end
-}
+end
 
-$narkozakladka = {
+if $ARGS[0] = 'narkozakladka':
 	cls
 	'<center><b>Shooting galleries</b></center>'
 	'<center><img src="images/etogame/narkopriton.jpg"></center>'
@@ -184,9 +229,9 @@ $narkozakladka = {
 		'Guy added, that bookmarks will be on the train/train station from the platform. '
 		act 'Escape':gt'narkopriton'
 	end
-}
+end
 
-$snarkozaka = {
+if $ARGS[0] = 'snarkozaka':
 	cls
 	minut += 20 
 	money -= 2000
@@ -199,10 +244,10 @@ $snarkozaka = {
 	'<center><img src="images/pic/vokzalperG.jpg"></center>'
 	'You buy the drugs and without thinking twice you shoot up.'
 
-	act 'Escape':dynamic $snkayf
-}
+	act 'Escape':gt 'events', 'snkayf'
+end
 
-$snkayf1 = {
+if $ARGS[0] = 'snkayf1':
 	snkz = RAND(1,6)
 	if tanga = 1:tanga = 0
 	if snkz = 1:
@@ -228,52 +273,7 @@ $snkayf1 = {
 	if snkz = 6:
 		gt'lake','start' & hour += 2
 	end
-}
-
-$budilnikOn = {
-	if budilnikOn = 0:
-		'You lie on the bed. Alarm set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 1 & GT ''bed2''">off</a>.'
-	else
-		'You lie on the bed. Alarm set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 0 & GT ''bed2''">on</a>.'
-	end
-}
-
-$wakepar = {
-	InSleep = 0
-	if bedpanty = 0 and clrbelo > 0:
-		tanga = 1
-	else
-		tanga =0
-	end
-	gt $locM, $metkaM
-}
-
-$sopts = {
-	cla
-	act 'Set Alarm Clock':gt 'budilnik', 'start'
-	if bedPanty = 0:
-		act 'You will wear panties in the morning, click to turn off':bedpanty = 1 & dynamic $sopts
-	else
-		act 'You will not wear panties in the morning, click to turn on':bedpanty = 0 & dynamic $sopts
-	end
-	if analplug = 1:
-		if bedanal = 0:
-			act 'If worn, you will remove your analplug at night, click to always leave it in':bedanal = 1 & dynamic $sopts
-		else
-			act 'If worn, you will wear your analplug through the night, click to always remove it':bedanal = 0 & dynamic $sopts
-		end
-	end
-
-	if vibrator = 1 and cheatVib = 1:
-		if bedvibrator = 0:
-			act 'If worn, you will remove your vibrator at night, click to always leave it in':bedvibrator = 1 & dynamic $sopts
-		else
-			act 'If worn, you will wear your vibrator through the night, click to always remove it':bedvibrator = 0 & dynamic $sopts
-		end
-	end
-
-	act 'Return':gt 'bed2'
-}
+end
 
---- din2 ---------------------------------
+--- events ---------------------------------
 

+ 1 - 1
locations/gopsex

@@ -1,5 +1,5 @@
 # gopsex
-*P ' '
+*P ''
 !------------------------------------!
 ! Different variations of sex -------------!
 !====================================!

+ 1 - 1
locations/lug

@@ -45,7 +45,7 @@ act 'Going back':
     gt'parks'
 end
 
-dynamic $din_street_cum
+gs 'events', 'street_cum'
 
 --- lug ---------------------------------
 

+ 2 - 2
locations/narkopriton

@@ -12,10 +12,10 @@ lcolor = rgb(106, 90, 205)
 
 if StrongNarkota >= 24:
     if StoryLine = 1 and snarkozak = 0:
-        act 'Ask a period in Pavlovsk':dynamic $narkozakladka
+        act 'Ask a period in Pavlovsk':gs 'events', 'narkozakladka'
     end
 
-    act 'Escape':minut += 15 & dynamic $snkayf1
+    act 'Escape':minut += 15 & gs 'events', 'snkayf1'
 end
 
 if StrongNarkota <= 23:

+ 0 - 5
locations/portmirror

@@ -144,11 +144,6 @@ $portmirror = {
 		if $gt2 = '':
 			if $gt1 = 'stwork':dynamic $striptoilet
 			if $gt1 = 'kafedinamic':dynamic $kafetualet
-			if $gt1 = 'vokzalGin':
-				if vokzalToilet = 1:dynamic $din_vokzalg_toilet_f
-				if vokzalToilet = 2:dynamic $din_vokzalg_toilet_m
-			end
-			if $gt1 ! 'stwork' and $gt1 ! 'kafedinamic' and $gt1 ! 'vokzalGin':gt '<<$gt1>>'
 		else
 			gt '<<$gt1>>', '<<$gt2>>'
 		end

+ 1 - 1
locations/street_event

@@ -331,7 +331,7 @@ if tanga = 0 and PCloSkirt > 2 and hour > 6 and hour <= 20:
 	end
 end
 
-dynamic $din_street_cum
+gs 'events', 'street_cum'
 
 if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 

+ 1 - 1
locations/vokzalperG

@@ -22,7 +22,7 @@ gs 'outdoors'
 
 if snarkozak = 1 and narkossista = 0 and narkozakday!day:
     if money >= 2000:
-        act 'Find the drug dealer':dynamic $snarkozaka
+        act 'Find the drug dealer':gs 'events', 'snarkozaka'
     end
 end