20 Commits 7029f184ee ... 1fc02d70f4

Author SHA1 Message Date
  ADCSux 1fc02d70f4 [Renamed] Renamed hotel.qsrc to city_hotel.qsrc to avoid confusion with pav hotel 2 years ago
  ADCSux 1af039a071 Merge branch 'working' 2 years ago
  rachels 7a0d4c2e8f fix typos 2 years ago
  rachels 2cba65c541 no changes, just cleaning (extra spaces,tabs) 2 years ago
  rachels 806cf8fc86 fix if elseif section 2 years ago
  Kevin_Smarts bdaf69b9a1 Merge remote-tracking branch 'Nekoforce/master' 2 years ago
  Kevin_Smarts fa0c7b2e37 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 2 years ago
  Kevin_Smarts 73fde4b075 Merge remote-tracking branch 'Gwen/master' 2 years ago
  Gwen 58fbb66651 [Changed] changed/ add new values for the new shoes in Cats 2 years ago
  Nekoforce 3e9ed68850 brothel.qsrc Changed variable arousal to horny 2 years ago
  Nekoforce f10612b158 brothel.qsrc variable renamed to fix crash 2 years ago
  Nekoforce 3a4c7c6f14 brothel.qsrc bugfixes 2 years ago
  Nekoforce 6f6684b7d2 brothel.qsrc bugfix wrong location 2 years ago
  Nekoforce ac99b51211 brothel.qsrc link to wrong location fixed 2 years ago
  Nekoforce 571b07a431 brothel.qsrc small fixes 2 years ago
  Nekoforce 588dbbeba6 brothel.qsrc more rewrites and added replug scene 2 years ago
  Nekoforce 50c8e003a3 brothel.qsrc startet refactoring section 1 code 2 years ago
  Nekoforce b646e60a29 brothel.qsrc temporary fix stretching bug 2 years ago
  Nekoforce fe208f14e6 brothel.qsrc minor fix 2 years ago
  Nekoforce 545ea14b3c brothel.qsrc functions for next act added, pictures moved, fixes 2 years ago

+ 1 - 1
glife.qproj

@@ -865,7 +865,7 @@
 		<Location name="MartinSex3"/>
 		<Location name="casino"/>
 		<Location name="mqroom"/>
-		<Location name="hotel"/>
+		<Location name="city_hotel"/>
 		<Location name="deckShuffle"/>
 	</Folder>
 	<Folder name="City Red Light">

+ 140 - 21
locations/_attributes_cats_shoes.qsrc

@@ -1,16 +1,16 @@
 # $attributes_cats_shoes
-!2020/03/26
-!price range from 3 to 5 but please avoid adding too many 5s
+!!2022/02/06
+!!price range from 3 to 5 but please avoid adding too many 5s
 
 if ARGS[1] = 1:
 	ShoQuality = 3
-	ShoHeels = 1
+	ShoHeels = 3
 	ShoCut = 1
 	ShoStyle = 0
 	
 elseif ARGS[1] = 2:
-	ShoQuality = 3
-	ShoHeels = 1
+	ShoQuality = 4
+	ShoHeels = 2
 	ShoCut = 1
 	ShoStyle = 0
 	
@@ -27,13 +27,13 @@ elseif ARGS[1] = 4:
 	ShoStyle = 0
 	
 elseif ARGS[1] = 5:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 	ShoStyle = 2
 	
 elseif ARGS[1] = 6:
-	ShoQuality = 5
+	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
 	ShoStyle = 0
@@ -51,46 +51,46 @@ elseif ARGS[1] = 8:
 	ShoStyle = 0
 	
 elseif ARGS[1] = 9:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 	ShoStyle = 0
 	
 elseif ARGS[1] = 10:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 	ShoStyle = 0
 	
 elseif ARGS[1] = 11:
-	ShoQuality = 4
+	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
 	ShoStyle = 0
 	
 elseif ARGS[1] = 12:
-	ShoQuality = 4
-	ShoHeels = 1
+	ShoQuality = 3
+	ShoHeels = 2
 	ShoCut = 1
 	ShoStyle = 0
 	
 elseif ARGS[1] = 13:
 	ShoQuality = 4
-	ShoHeels = 1
+	ShoHeels = 2
 	ShoCut = 1
 	ShoStyle = 0
 	
 elseif ARGS[1] = 14:
 	ShoQuality = 4
 	ShoHeels = 1
-	ShoCut = 1
-	ShoStyle = 2
+	ShoCut = 2
+	ShoStyle = 0
 	
 elseif ARGS[1] = 15:
-	ShoQuality = 4
-	ShoHeels = 1
+	ShoQuality = 5
+	ShoHeels = 2
 	ShoCut = 1
-	ShoStyle = 0
+	ShoStyle = 2
 	
 elseif ARGS[1] = 16:
 	ShoQuality = 5
@@ -99,13 +99,13 @@ elseif ARGS[1] = 16:
 	ShoStyle = 0
 	
 elseif ARGS[1] = 17:
-	ShoQuality = 5
+	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
 	ShoStyle = 0
 	
 elseif ARGS[1] = 18:
-	ShoQuality = 6
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 	ShoStyle = 0
@@ -113,15 +113,134 @@ elseif ARGS[1] = 18:
 elseif ARGS[1] = 19:
 	ShoQuality = 5
 	ShoHeels = 1
+	ShoCut = 2
+	ShoStyle = 0
+	
+elseif ARGS[1] = 20:
+	ShoQuality = 4
+	ShoHeels = 1
+	ShoCut = 1
+	ShoStyle = 0
+	
+elseif ARGS[1] = 21:
+	ShoQuality = 5
+	ShoHeels = 2
+	ShoCut = 1
+	ShoStyle = 0
+	
+elseif ARGS[1] = 22:
+	ShoQuality = 3
+	ShoHeels = 2
+	ShoCut = 1
+	ShoStyle = 0
+	
+elseif ARGS[1] = 23:
+	ShoQuality = 4
+	ShoHeels = 2
+	ShoCut = 1
+	ShoStyle = 0
+	
+elseif ARGS[1] = 24:
+	ShoQuality = 5
+	ShoHeels = 3
+	ShoCut = 1
+	ShoStyle = 0
+	
+elseif ARGS[1] = 25:
+	ShoQuality = 4
+	ShoHeels = 2
 	ShoCut = 1
+	ShoStyle = 0
+	
+elseif ARGS[1] = 26:
+	ShoQuality = 4
+	ShoHeels = 2
+	ShoCut = 1
+	ShoStyle = 0
+	
+elseif ARGS[1] = 27:
+	ShoQuality = 4
+	ShoHeels = 2
+	ShoCut = 1
+	ShoStyle = 0
+	
+elseif ARGS[1] = 28:
+	ShoQuality = 4
+	ShoHeels = 2
+	ShoCut = 1
+	ShoStyle = 0
+	
+elseif ARGS[1] = 29:
+	ShoQuality = 5
+	ShoHeels = 2
+	ShoCut = 2
+	ShoStyle = 0
+	
+elseif ARGS[1] = 30:
+	ShoQuality = 5
+	ShoHeels = 2
+	ShoCut = 2
+	ShoStyle = 0
+
+elseif ARGS[1] = 31:
+	ShoQuality = 6
+	ShoHeels = 2
+	ShoCut = 2
 	ShoStyle = 2
 	
-elseif ARGS[1] = 20:
+elseif ARGS[1] = 32:
+	ShoQuality = 4
+	ShoHeels = 2
+	ShoCut = 1
+	ShoStyle = 0
+	
+elseif ARGS[1] = 33:
+	ShoQuality = 4
+	ShoHeels = 2
+	ShoCut = 2
+	ShoStyle = 0
+	
+elseif ARGS[1] = 34:
+	ShoQuality = 3
+	ShoHeels = 2
+	ShoCut = 1
+	ShoStyle = 0
+	
+elseif ARGS[1] = 35:
+	ShoQuality = 4
+	ShoHeels = 2
+	ShoCut = 1
+	ShoStyle = 2
+	
+elseif ARGS[1] = 36:
+	ShoQuality = 4
+	ShoHeels = 2
+	ShoCut = 1
+	ShoStyle = 0
+	
+elseif ARGS[1] = 37:
+	ShoQuality = 4
+	ShoHeels = 2
+	ShoCut = 1
+	ShoStyle = 2
+	
+elseif ARGS[1] = 38:
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
 	ShoStyle = 0
 	
+elseif ARGS[1] = 39:
+	ShoQuality = 5
+	ShoHeels = 2
+	ShoCut = 1
+	ShoStyle = 0
+	
+elseif ARGS[1] = 20:
+	ShoQuality = 4
+	ShoHeels = 1
+	ShoCut = 1
+	ShoStyle = 0
 
 end
 

+ 1 - 1
locations/body_desc.qsrc

@@ -1207,7 +1207,7 @@ if $ARGS[0] = 'hair':
 	end
 
 	!! A pair of ready-made long strings for writers to pull from for descriptions
-	$pc_des['hair'] = '<<$pc_desc[''hair status'']>>, <<$pc_desc[''hair length'']>> <<$pc_desc[''hair colour'']>> <<$pc_descWordy[''hair texture'']>>'
+	$pc_desc['hair'] = '<<$pc_desc[''hair status'']>>, <<$pc_desc[''hair length'']>> <<$pc_desc[''hair colour'']>> <<$pc_descWordy[''hair texture'']>>'
 	$pc_descWordy['hair'] = '<<$pc_desc[''hair status'']>>, <<$pc_descWordy[''hair length'']>> <<$pc_descWordy[''hair texture'']>> of <<$pc_descWordy[''hair colour'']>>'
 end
 

File diff suppressed because it is too large
+ 255 - 732
locations/brothel.qsrc


+ 1 - 1
locations/city_center.qsrc

@@ -219,7 +219,7 @@ if hour >= 8 and hour <= 18:
 else
 	$desc_txt5 = '<a href="exec:msg ''The National Library of Russia is closed and will reopen at 8:00''">National Library of Russia</a>'
 end
-'Next door is the <<$desc_txt1>> followed by a <<$desc_txt2>> and <<$desc_txt3>> and the 5-star <a href="exec: minut += 5 & gt ''hotel'', ''foyer''">Hotel Indigo</a> for your housing needs. Lastly, the local <<$desc_txt4>> and <<$desc_txt5>> can be found at the end of the road.'
+'Next door is the <<$desc_txt1>> followed by a <<$desc_txt2>> and <<$desc_txt3>> and the 5-star <a href="exec: minut += 5 & gt ''city_hotel'', ''start''">Hotel Indigo</a> for your housing needs. Lastly, the local <<$desc_txt4>> and <<$desc_txt5>> can be found at the end of the road.'
 *nl
 if week < 6 and hour >= 7 and hour <= 17:
 	$desc_txt6 = '<a href="exec: minut += 5 & gt ''sentence'',''start''">The City Courthouse</a>'

+ 14 - 13
locations/hotel.qsrc → locations/city_hotel.qsrc

@@ -1,15 +1,16 @@
-# hotel
+# city_hotel
+$this = 'city_hotel'
 
-if $ARGS[0] = 'foyer':
+if $ARGS[0] = 'start':
 	*clr & cla
 	nom_o[1] = 100
 	nom_o[2] = 1000
 	nom_o[3] = 10000
 	nom_o[4] = 100000
-	$loc = 'hotel'
-	$menu_loc = 'hotel'
-	$loc_arg = 'foyer'
-	$menu_arg = 'foyer'
+	$loc = 'city_hotel'
+	$menu_loc = 'city_hotel'
+	$loc_arg = 'start'
+	$menu_arg = 'start'
 	menu_off = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/casino/metrd.jpg"></center>'
@@ -39,14 +40,14 @@ if $ARGS[0] = 'foyer':
 
 	act 'Leave': minut += 5 & gt 'city_center'
 
-	act 'Go to the reception desk': gt 'hotel', 'reception'
+	act 'Go to the reception desk': gt 'city_hotel', 'reception'
 	
 	act 'Go to the lift': 
 		*clr & cla
 		minut += 1
 		gs 'stat'
 		msg 'Excuse me, but the elevator is not working'
-		gt 'hotel', 'foyer'
+		gt 'city_hotel', 'start'
 	end
 end
 
@@ -59,7 +60,7 @@ if $ARGS[0] = 'reception':
 	'You walk up to the front reception and get greeted by a smiling young woman behind the counter.'
 	'"How can I help you?" she asks.'
 
-	act 'Go back to the foyer': minut += 1 & gt 'hotel', 'foyer'
+	act 'Go back to the foyer': minut += 1 & gt 'city_hotel', 'start'
 	
 	act 'See the room descriptions':
 		cla
@@ -71,7 +72,7 @@ if $ARGS[0] = 'reception':
 		'3. Suites, our luxurious room. Beside a private bathroom there''s also an extra livingroom.'
 		'4. Presidential Suite, our most prized room with all the modern necessities. Free room service included.'
 
-		act 'Continue': gt 'hotel', 'reception'
+		act 'Continue': gt 'city_hotel', 'reception'
 	end
 
 	if tobiQW = 2000:
@@ -81,7 +82,7 @@ if $ARGS[0] = 'reception':
 			minut += 1
 			'"Why so the hotel so crowded today?" you ask.'
 			'"There''s an conference on indigenous languages, they meet every year and complain about their disappearing languages." she says laughing.'
-				act 'Move away': gt 'hotel', 'foyer'
+				act 'Move away': gt 'city_hotel', 'start'
 		end
 	end
 
@@ -92,10 +93,10 @@ if $ARGS[0] = 'reception':
 		*nl
 		'"I would like to rent a room." you tell the girl at the counter.'
 		'"Unfortunately, we have no rooms available." she replies.'
-		act 'Move away': gt 'hotel', 'foyer'
+		act 'Move away': gt 'city_hotel', 'start'
 	end
 end
 
 
---- hotel ---------------------------------
+--- city_hotel ---------------------------------
 

+ 1 - 1
locations/pav_market.qsrc

@@ -34,7 +34,7 @@ else
 	end
 end
 *nl
-'Pavlovsk''s modest train station, is near the Pavlovsk market Square. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pav_train_hall''">train station</a>. Down the street from the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif(storyline = 1,' where your mother works','') + '. Next to the train station you can see the <a href="exec:minut += 5 & gt ''pavstation'', ''station_outside''">Pavlovsk police station</a> where you can find Pavlovsk''s finest.'
+'Pavlovsk''s modest train station, is near the Pavlovsk market Square. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pav_train_hall''">train station</a>. Down the street from the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif(storyline = 1,' where your mother works','') + '. Next to the train station you can see the <a href="exec:minut += 5 & gt ''pav_station'', ''station_outside''">Pavlovsk police station</a> where you can find Pavlovsk''s finest.'
 *nl
 'The other side of the train station is a large square, where you can find a <a href="exec:minut += 1 & gt ''pav_train_market'', ''start''">market</a> on most days.'
 *nl

Some files were not shown because too many files changed in this diff