Browse Source

Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

LinaHirata 8 months ago
parent
commit
6173953e3b
2 changed files with 114 additions and 29 deletions
  1. 2 2
      locations/item_cart.qsrc
  2. 112 27
      locations/npcstatic1.qsrc

+ 2 - 2
locations/item_cart.qsrc

@@ -115,7 +115,7 @@ if $ARGS[0] = 'cash':
 		dynamic 'cart_quantity = quantity_curr_aisle[''<<i>>''] * cart_curr_quantity[''<<i>>'']'
 		dynamic 'mc_inventory[''<<$cart_tmp1>>''] += cart_quantity'
 		i += 1
-	if i < item_idx:jump 'loopshopping_cash'
+	if i <= item_idx:jump 'loopshopping_cash'
 	money -= cart_tally
 	gs 'item_cart', 'shopping_var_clear'
 	gt $loc_s, $args_s
@@ -128,7 +128,7 @@ if $ARGS[0] = 'card':
 		dynamic 'cart_quantity = quantity_curr_aisle[''<<i>>''] * cart_curr_quantity[''<<i>>'']'
 		dynamic 'mc_inventory[''<<$cart_tmp1>>''] += cart_quantity'
 		i += 1
-	if i < item_idx:jump 'loopshopping_card'
+	if i <= item_idx:jump 'loopshopping_card'
 	karta -= cart_tally
 	gs 'item_cart', 'shopping_var_clear'
 	gt $loc_s, $args_s

+ 112 - 27
locations/npcstatic1.qsrc

@@ -45,28 +45,77 @@ npc_selfieon['A<<npctemp>>']		= 1
 $npc_selfie['A<<npctemp>>']			= '<a href="exec:numnpc = 1 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></a>'
 }
 
-!!current reactions list
+!!		Preferences:
+!!		
+!!		body_
+
+
+
+
+
 !!	Body
+!!	'body_ass_bubble'
+!!	'body_ass_big'
+!!	'body_ass_average'
+!!	'body_ass_flat'
+!!	'body_bmi_starving'
+!!	'body_bmi_underweight'
+!!	'body_bmi_normal'
+!!	'body_bmi_overweight'
+!!	'body_bmi_obese'
 !!	'body_fit'
+!!	'body_lips_thin'
+!!	'body_lips_normal'
+!!	'body_lips_plump'
+!!	'body_lips_big'
+!!	'body_lips_pillowy'
 !!	'body_pregnant'
-!!	'body_strong'
 !!	'body_tan'
-!!
+!!	'body_tan_not'
+!!	'body_tits_big'
+!!	'body_tits_average'
+!!	'body_tits_small'
+!!	'body_strong'
+!!	'body_weak'
+!!	'body_sweaty'
+!!	'body_stinky'
+!!	
 !!	Clothes
 !!	'clothes_bimbo'
 !!	'clothes_goth'
 !!	'clothes_punk'
-!!	'clothes_skirt_short'
 !!	'clothes_thin'
-!!
+!!	'clothes_skirt_long'
+!!	'clothes_skirt_short'
+!!	'clothes_exposed_ass'
+!!	'clothes_exposed_bra'
+!!	'clothes_exposed_panties'
+!!	'clothes_exposed_pussy'
+!!	'clothes_exposed_tits'
+!!	
 !!	Cosmetics
+!!	'cosmetics_deodorant'
 !!	'cosmetics_makeup'
 !!	'cosmetics_piercing'
 !!	'cosmetics_tattoo'
-!!
+!!	
 !!	Cum
 !!	'cum_face'
 !!	'cum_clothes'
+!!	
+!!	Hair
+!!	'hair_pubes_shaven'
+!!	'hair_pubes_grown'
+!!		'hair_pubes_style_...'	& !!	not yet implemented.
+!!	'hair_leg'
+!!	'hair_leg_not'
+!!	'hair_short'
+!!	'hair_average'
+!!	'hair_long'
+!!	'hair_curly'
+!!	'hair_straight'
+!!	'hair_color_black'
+!!		'hair_color_....' & !!	not yet implemented.
 !!
 !!
 !! Add a preference to an npc:
@@ -85,27 +134,63 @@ $npc_selfie['A<<npctemp>>']			= '<a href="exec:numnpc = 1 & gt ''phone_selfies''
 
 gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 
-gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',		'neutral'
-gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',		'neutral'
-
-gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',			'neutral'
-gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',		'neutral'
-gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',			'neutral'
-gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',			'neutral'
-
-gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',		'neutral'
-gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',		'neutral'
-gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',		'neutral'
-gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',		'neutral'
-gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',	'neutral'
-
-gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',	'neutral'
-gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_piercing',	'neutral'
-gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_tattoo',	'neutral'
-
-gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',			'neutral'
-gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',			'neutral'
-
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_bubble',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_big',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_average',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_ass_flat',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_bmi_starving',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_bmi_underweight',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_bmi_normal',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_bmi_overweight',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_bmi_obese',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_fit',				'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_lips_thin',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_lips_normal',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_lips_plump',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_lips_big',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_lips_pillowy',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_pregnant',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan',				'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tan_not',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_big',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_average',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_tits_small',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_strong',				'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_weak',				'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_sweaty',				'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'body_stinky',				'neutral'
+
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_bimbo',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_punk',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_goth',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_thin',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_long',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_skirt_short',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_exposed_ass',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_exposed_bra',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_exposed_panties',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_exposed_pussy',	'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'clothes_exposed_tits',	'neutral'
+
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_deodorant',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_makeup',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_piercing',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cosmetics_tattoo',		'neutral'
+
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_face',				'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'cum_clothes',				'neutral'
+
+gs 'npc_set_preference', 'A<<npctemp>>', 'hair_pubes_shaven',		'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'hair_pubes_grown',		'neutral'
+
+gs 'npc_set_preference', 'A<<npctemp>>', 'hair_leg',				'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'hair_leg_not',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'hair_short',				'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'hair_average',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'hair_long',				'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'hair_curly',				'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'hair_straight',			'neutral'
+gs 'npc_set_preference', 'A<<npctemp>>', 'hair_color_black',		'neutral'