Browse Source

Update PC to use syntaxadditions

Scarlett Schäfer 2 years ago
parent
commit
b3b5d0dd2d

+ 2 - 2
source/event/bed.qsps

@@ -1,7 +1,7 @@
 # event_bed
-
+!!Process: syntaxadditions
 if $ARGS[0] = 'start':
-    if $gender_appearance = 'm':
+    if #pc.$genderAppearance = 'm':
         if $chastity ! '':
             gs 'util_image','render_image','events/bed/male_chastity(0).jpg'
         else

+ 3 - 3
source/event/mirror.qsps

@@ -1,7 +1,7 @@
 # event_mirror
-
+!!Process: syntaxadditions
 if $ARGS[0] = 'start':
-    if $gender_appearance = 'f':
+    if #pc.$genderAppearance = 'f':
         gs 'util_image','render_image','events/bath/mirror_female.png'
     else
         gs 'util_image','render_image','events/bath/mirror_male.png'
@@ -51,7 +51,7 @@ elseif $ARGS[0] = 'hair_comb':
 
     temp_time = max(1,body_hair_head+5) * 60
 
-    if $gender_appearance = 'm':
+    if #pc.$genderAppearance = 'm':
         gs 'util_image','render_image','events/bath/comb_male(0).jpg'
     else
         gs 'util_image','render_image','events/bath/comb_female('+rand(0,3)+').jpg'

+ 1 - 1
source/event/school/schoolday.qsps

@@ -30,7 +30,7 @@ if $ARGS[0] = 'start':
     elseif _performance = 4:
         $_performance_text = 'You put no effort into your school work.'
     end
-    $_performance_picture = 'events/school/schoolday/classes/participate_'+FUNC('pc','get','genderMedia')+'_<<_performance>>.jpg'
+    $_performance_picture = 'events/school/schoolday/classes/participate_'+#pc.$genderMedia+'_<<_performance>>.jpg'
 
     gs 'util_action','render_action',$_hang_out_with_text,'gt ''event_school_schoolday'',''startSwitchHangout'' ',0,$_hang_out_with_picture
     gs 'util_action','render_action',$_performance_text,'gt ''event_school_schoolday'',''startSwitchPerformance'' ',0,$_performance_picture

+ 2 - 2
source/event/shower.qsps

@@ -1,5 +1,5 @@
 # event_shower
-
+!!Process: syntaxadditions
 if $ARGS[0] = 'start':
     gs 'util_image','render_image','events/bath/shower.jpg'
     'You enter the shower and turn on the water.'
@@ -12,7 +12,7 @@ if $ARGS[0] = 'start':
         gt 'util_event','end'
     end
 elseif $ARGS[0] = 'shower':
-    if $gender_appearance = 'm':
+    if #pc.$genderAppearance = 'm':
         gs 'util_image','render_image','events/bath/shower_male(0).jpg'
     else
         gs 'util_image','render_image','events/bath/shower_female('+rand(0,3)+').jpg'

+ 3 - 3
source/pc/gender.qsps

@@ -1,5 +1,5 @@
 # pc_gender
-
+!!Process: syntaxadditions
 if $ARGS[0] = 'get_gender_visible':
     _verbose = 0
     _sex_visible = 0
@@ -47,7 +47,7 @@ elseif $ARGS[0] = 'set_body_female':
     body_genital_balls = 0
     body_genital_penis = 0
     body_genital_vagina = 1
-    $gender_appearance = 'f'
+    #pc.$genderAppearance = 'f'#
     $gender_identification = 'f'
     gender_usesMakeup = 1
     gs 'util_wardrobe','style_update'
@@ -62,7 +62,7 @@ elseif $ARGS[0] = 'set_body_male':
     body_genital_balls = 2
     body_genital_penis = 1
     body_genital_vagina = 0
-    $gender_appearance = 'm'
+    #pc.$genderAppearance = 'm'#
     $gender_identification = 'm'
     gender_usesMakeup = 0
     gs 'util_wardrobe','style_update'

+ 5 - 7
source/pc/pc.qsps

@@ -1,9 +1,7 @@
 # pc
-
-if $ARGS[0] = 'get':
-    if $ARGS[1] = 'genderMedia':
-        $RESULT = $gender_appearance
-    end
-end
-
+!!Process: syntaxadditions
+!CLASS(pc){ 
+    $genderAppearance:;
+    $genderMedia:GET(#THIS.$genderAppearance);    
+}   
 -

+ 18 - 0
source/test.qsps

@@ -0,0 +1,18 @@
+# test
+!!Process: syntaxadditions
+
+!CLASS(pc){
+    age: GET(
+        LOOKUP(#THIS.height?    
+            [0/40]: 1,
+            [41/100]:2     
+        )
+    );
+    height: get;
+    $name: set;  
+    weight: set;           
+}                      
+#pc.$name = 'Hans'# & #pc.$name = 'Hans'#
+*PL #pc.$name
+ 
+-

+ 5 - 5
source/util/wardrobe.qsps

@@ -1,5 +1,5 @@
 # util_wardrobe
-
+!!Process: syntaxadditions
 
 if $ARGS[0] = 'loadItemAtSlot':
     $item_gender = 'none'
@@ -65,7 +65,7 @@ elseif $ARGS[0] = 'render_wardrobe':
     $wardrobe_code = ''
 
     if $wardrobe_current_bra_file = '':
-        if $gender_appearance = 'm':
+        if #pc.$genderAppearance = 'm':
             $temp_bra_name = 'No Undershirt'
         else
             $temp_bra_name = 'No Bra'
@@ -88,7 +88,7 @@ elseif $ARGS[0] = 'render_wardrobe':
     end
 
     if $wardrobe_current_panties_file = '':
-        if $gender_appearance = 'm':
+        if #pc.$genderAppearance = 'm':
             $temp_panties_name = 'No Underpants'
         else
             $temp_panties_name = 'No Panties'
@@ -244,7 +244,7 @@ elseif $ARGS[0] = 'style_update':
         if $temp_style_panties = 'Naked':
             $wardrobe_current_style = 'Naked'
         elseif $temp_style_bra = 'Naked':
-            if $gender_appearance = 'm':
+            if #pc.$genderAppearance = 'm':
                 $wardrobe_current_style = 'Underwear'
             else
                 $wardrobe_current_style = 'Topless'
@@ -252,7 +252,7 @@ elseif $ARGS[0] = 'style_update':
         else
             $wardrobe_current_style = 'Underwear'
         end
-    elseif ($temp_gender_clothes ! 'fm' and $temp_gender_clothes ! $gender_appearance) or ($temp_gender_shoes ! 'fm' and $temp_gender_shoes ! $gender_appearance):
+    elseif ($temp_gender_clothes ! 'fm' and $temp_gender_clothes !#pc.$genderAppearance) or ($temp_gender_shoes ! 'fm' and $temp_gender_shoes !#pc.$genderAppearance):
         $wardrobe_current_style = 'Crossdresser'
     else
         $wardrobe_current_style = $temp_style_clothes