Преглед на файлове

New stat/attribute system

KevinSmarts преди 7 години
родител
ревизия
9dac1981cf
променени са 87 файла, в които са добавени 1155 реда и са изтрити 834 реда
  1. 1 0
      glife-notepad++
  2. 12 9
      glife.qproj
  3. 1 1
      locations/BMloc
  4. 63 53
      locations/Cheatmenu_din
  5. 5 5
      locations/Gadgarden
  6. 1 1
      locations/Gadhouse
  7. 1 1
      locations/Gadsarai
  8. 2 2
      locations/Gnpc2
  9. 1 1
      locations/JuliaMilHome
  10. 2 2
      locations/Katlake
  11. 1 1
      locations/Komp
  12. 2 2
      locations/LariskaHome
  13. 21 10
      locations/Military
  14. 4 4
      locations/Miroslava
  15. 1 1
      locations/NatBelHome
  16. 4 4
      locations/Nudelake
  17. 1 1
      locations/Vika
  18. 2 2
      locations/Voltrener
  19. 6 6
      locations/albinahome
  20. 2 2
      locations/artemEv
  21. 1 1
      locations/artemhome
  22. 3 3
      locations/bass
  23. 1 1
      locations/bedrPar
  24. 1 1
      locations/beg
  25. 9 9
      locations/beg1
  26. 3 3
      locations/bicycle
  27. 6 5
      locations/body
  28. 5 5
      locations/body_shape
  29. 2 2
      locations/brother
  30. 1 1
      locations/cafe2
  31. 2 2
      locations/chessplay
  32. 57 63
      locations/cikl
  33. 2 2
      locations/club
  34. 9 9
      locations/danceclass
  35. 4 4
      locations/din_bad
  36. 2 2
      locations/dina
  37. 4 4
      locations/dk
  38. 1 1
      locations/dom_gor
  39. 6 6
      locations/etoexhib
  40. 9 9
      locations/events
  41. 11 11
      locations/fit
  42. 1 1
      locations/gLakeNude
  43. 12 12
      locations/gadfield
  44. 4 4
      locations/gadforestswamp
  45. 4 4
      locations/gadriver
  46. 1 1
      locations/gadroad
  47. 6 6
      locations/gdkbibl
  48. 5 5
      locations/gdkin
  49. 59 45
      locations/gdksport
  50. 3 3
      locations/glake
  51. 4 4
      locations/grandpahelp
  52. 4 4
      locations/gschool_grounds
  53. 5 5
      locations/gschool_lessons
  54. 1 1
      locations/gskver
  55. 4 4
      locations/hanters
  56. 2 2
      locations/kafe
  57. 3 3
      locations/katjaEv
  58. 1 1
      locations/kinoM
  59. 1 1
      locations/kotovSex
  60. 1 1
      locations/kotovtalker
  61. 2 2
      locations/kruchess
  62. 2 2
      locations/krupo
  63. 1 1
      locations/krutishi
  64. 6 6
      locations/lab
  65. 1 1
      locations/lake
  66. 3 3
      locations/lesbimistress
  67. 12 0
      locations/loadg
  68. 1 1
      locations/mey_vika_events
  69. 2 2
      locations/obroom
  70. 6 6
      locations/park
  71. 42 20
      locations/parkivent
  72. 1 1
      locations/placer_sex
  73. 2 2
      locations/preCUST
  74. 5 5
      locations/saveupdater
  75. 1 1
      locations/shulga_room
  76. 1 1
      locations/soniaDisco
  77. 96 273
      locations/stat
  78. 85 118
      locations/stat_display
  79. 463 0
      locations/stat_sklattrib
  80. 11 11
      locations/strelba
  81. 6 6
      locations/swamphouse
  82. 1 1
      locations/tanspalnya
  83. 3 3
      locations/univer
  84. 6 6
      locations/vokzalGin
  85. 1 1
      locations/vokzaltorg
  86. 1 1
      locations/ybass
  87. 1 1
      locations/ykamin

+ 1 - 0
glife-notepad++

@@ -629,6 +629,7 @@
             <File name="locations\stat" />
             <File name="locations\statBat" />
             <File name="locations\stat_display" />
+            <File name="locations\stat_sklattrib" />
             <File name="locations\stihi" />
             <File name="locations\stol" />
             <File name="locations\street" />

+ 12 - 9
glife.qproj

@@ -43,24 +43,16 @@
       <Location name="body"/>
       <Location name="body_shape"/>
       <Location name="cikl"/>
-      <Location name="pain"/>
-      <Location name="arousal"/>
-      <Location name="orgasm"/>
       <Location name="daystart"/>
       <Location name="dina"/>
       <Location name="dinBoroda"/>
-      <Location name="dinSex"/>
-      <Location name="dinSex2"/>
-      <Location name="dinsexFX"/>
-      <Location name="boyStat"/>
       <Location name="events"/>
       <Location name="MenuLoc"/>
       <Location name="MenuMainLoc"/>
-      <Location name="oral"/>
-      <Location name="orgazm"/>
       <Location name="starenie"/>
       <Location name="stat"/>
       <Location name="stat_display"/>
+      <Location name="stat_sklattrib"/>
       <Location name="din_bad"/>
       <Location name="din_van"/>
       <Location name="statBat"/>
@@ -72,6 +64,17 @@
       <Location name="din_pav"/>
       <Location name="_statcheck"/>
     </Folder>
+    <Folder name="Stimulus">
+      <Location name="boyStat"/>
+      <Location name="pain"/>
+      <Location name="arousal"/>
+      <Location name="orgasm"/>
+      <Location name="dinSex"/>
+      <Location name="dinSex2"/>
+      <Location name="dinsexFX"/>
+      <Location name="oral"/>
+      <Location name="orgazm"/>
+    </Folder>
     <Folder name="Prostitution">
       <Location name="NormPR"/>
       <Location name="blowPR"/>

+ 1 - 1
locations/BMloc

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

+ 63 - 53
locations/Cheatmenu_din

@@ -105,14 +105,16 @@ $cheatmenu['Pirate'] = {
 }
 
 $cheatmenu['age'] = {
-!!	age = input("How many years you are now?")
-!!	if age <= 15:age = 15
+	:tooyoung
+	age = year - ((pcs_dob - (pcs_dob mod 10000)) / 10000)
+	if ((month * 100) + day) <= pcs_dob mod 10000: age -= 1
+	if age < 15: pcs_dob -= 10000 & jump 'tooyoung'
 	dynamic $cheatmenu['looks']
 }
 
 $cheatmenu['visualage'] = {
 	vidage = input("For how many years you want to look?")
-	if vidage <= 14:vidage = 14
+	if vidage <= 14: vidage = 14
 	dynamic $cheatmenu['looks']
 }
 
@@ -253,7 +255,7 @@ $cheatmenu['permanent'] = {
 		pl' <a href="exec:Enable_fbreath = 1 & dynamic $cheatmenu[''permanent'']">Always breath fresh: OFF</a>'
 	end
 	!remove them, add later after OOx system done
-	}
+	
 	if Enable_clearwrite = 1:
 		pl' <a href="exec:Enable_clearwrite = 0 & dynamic $cheatmenu[''permanent'']">Clean body write Instantly: ON</a>'
 	else
@@ -319,10 +321,10 @@ $cheatmenu['looks'] = {
 	pl'<a href="exec:dynamic $cheatmenu[''parameters'']">Show design parameters of body</a>'
 	pl'<a href="exec:dynamic $cheatmenu[''vneshpara'']">Show beauty parameters</a>'
 	pl''
-	pl'Now you are <<age>> years old'
-	!!if age >= 0:pl'<a href="exec:dynamic $cheatmenu[''age'']">Change age</a>'
+	pl'You are <a href="exec: pcs_dob += 10000 & dynamic $cheatmenu[''age'']">(-1)</a> <<age>> <a href="exec: pcs_dob -= 10000 & dynamic $cheatmenu[''age'']">(+1)</a> years old'
+	pl''
 	pl'<a href=>You look for <<vidage>> years</a>'
-	if vidage >= 0:pl'<a href="exec:dynamic $cheatmenu[''visualage'']">Change Visible age</a>'
+	pl'<a href="exec:dynamic $cheatmenu[''visualage'']">Change Visible age</a>'
 	pl''
 	pl 'You have <<$titsize>> breasts'
 	if tits => 0 and tits < 10:pl'<a href="exec:silicone += 5 & dynamic $cheatmenu[''looks'']">Enlarge breasts(silicone)</a>'
@@ -538,56 +540,64 @@ $cheatmenu['stats'] = {
 	clr
 	pl'<center><a href="exec:dynamic $cheatmenu"><b>Cheat menu</b></a></center>'
 	pl''
-	pl'Strength (<<pcs_stren>>): <a href="exec:pcs_stren += 1 & dynamic $cheatmenu[''stats'']">+1</a> <a href="exec:pcs_stren += 5 & dynamic $cheatmenu[''stats'']">+5</a> <a href="exec:pcs_stren += 10 & dynamic $cheatmenu[''stats'']">+10</a> <a href="exec:pcs_stren += 25 & dynamic $cheatmenu[''stats'']">+25</a> <a href="exec:pcs_stren -= 1 & dynamic $cheatmenu[''stats'']">-1</a> <a href="exec:pcs_stren -= 5 & dynamic $cheatmenu[''stats'']">-5</a> <a href="exec:pcs_stren -= 10 & dynamic $cheatmenu[''stats'']">-10</a> <a href="exec:pcs_stren -= 25 & dynamic $cheatmenu[''stats'']">-25</a>'
-	pl'Speed (<<speed>>): <a href="exec:speed += 1 & dynamic $cheatmenu[''stats'']">+1</a> <a href="exec:speed += 5 & dynamic $cheatmenu[''stats'']">+5</a> <a href="exec:speed += 10 & dynamic $cheatmenu[''stats'']">+10</a> <a href="exec:speed += 25 & dynamic $cheatmenu[''stats'']">+25</a> <a href="exec:speed -= 1 & dynamic $cheatmenu[''stats'']">-1</a> <a href="exec:speed -= 5 & dynamic $cheatmenu[''stats'']">-5</a> <a href="exec:speed -= 10 & dynamic $cheatmenu[''stats'']">-10</a> <a href="exec:speed -= 25 & dynamic $cheatmenu[''stats'']">-25</a>'
-	pl'Agility (<<pcs_agil>>): <a href="exec:pcs_agil += 1 & dynamic $cheatmenu[''stats'']">+1</a> <a href="exec:pcs_agil += 5 & dynamic $cheatmenu[''stats'']">+5</a> <a href="exec:pcs_agil += 10 & dynamic $cheatmenu[''stats'']">+10</a> <a href="exec:pcs_agil += 25 & dynamic $cheatmenu[''stats'']">+25</a> <a href="exec:pcs_agil -= 1 & dynamic $cheatmenu[''stats'']">-1</a> <a href="exec:pcs_agil -= 5 & dynamic $cheatmenu[''stats'']">-5</a> <a href="exec:pcs_agil -= 10 & dynamic $cheatmenu[''stats'']">-10</a> <a href="exec:pcs_agil -= 25 & dynamic $cheatmenu[''stats'']">-25</a>'
-	pl'Reaction (<<pcs_react>>): <a href="exec:pcs_react += 1 & dynamic $cheatmenu[''stats'']">+1</a> <a href="exec:pcs_react += 5 & dynamic $cheatmenu[''stats'']">+5</a> <a href="exec:pcs_react += 10 & dynamic $cheatmenu[''stats'']">+10</a> <a href="exec:pcs_react += 25 & dynamic $cheatmenu[''stats'']">+25</a> <a href="exec:pcs_react -= 1 & dynamic $cheatmenu[''stats'']">-1</a> <a href="exec:pcs_react -= 5 & dynamic $cheatmenu[''stats'']">-5</a> <a href="exec:pcs_react -= 10 & dynamic $cheatmenu[''stats'']">-10</a> <a href="exec:pcs_react -= 25 & dynamic $cheatmenu[''stats'']">-25</a>'
-	pl'Vitality (<<pcs_vital>>): <a href="exec:pcs_vital += 1 & dynamic $cheatmenu[''stats'']">+1</a> <a href="exec:pcs_vital += 5 & dynamic $cheatmenu[''stats'']">+5</a> <a href="exec:pcs_vital += 10 & dynamic $cheatmenu[''stats'']">+10</a> <a href="exec:pcs_vital += 25 & dynamic $cheatmenu[''stats'']">+25</a> <a href="exec:pcs_vital -= 1 & dynamic $cheatmenu[''stats'']">-1</a> <a href="exec:pcs_vital -= 5 & dynamic $cheatmenu[''stats'']">-5</a> <a href="exec:pcs_vital -= 10 & dynamic $cheatmenu[''stats'']">-10</a> <a href="exec:pcs_vital -= 25 & dynamic $cheatmenu[''stats'']">-25</a>'
-	pl'Spirit (<<pcs_sprt>>): <a href="exec:pcs_sprt += 1 & dynamic $cheatmenu[''stats'']">+1</a> <a href="exec:pcs_sprt += 5 & dynamic $cheatmenu[''stats'']">+5</a> <a href="exec:pcs_sprt += 10 & dynamic $cheatmenu[''stats'']">+10</a> <a href="exec:pcs_sprt += 25 & dynamic $cheatmenu[''stats'']">+25</a> <a href="exec:pcs_sprt -= 1 & dynamic $cheatmenu[''stats'']">-1</a> <a href="exec:pcs_sprt -= 5 & dynamic $cheatmenu[''stats'']">-5</a> <a href="exec:pcs_sprt -= 10 & dynamic $cheatmenu[''stats'']">-10</a> <a href="exec:pcs_sprt -= 25 & dynamic $cheatmenu[''stats'']">-25</a>'
-	pl'Intelligence (<<pcs_intel>>): <a href="exec:pcs_intel += 1 & dynamic $cheatmenu[''stats'']">+1</a> <a href="exec:pcs_intel += 5 & dynamic $cheatmenu[''stats'']">+5</a> <a href="exec:pcs_intel += 10 & dynamic $cheatmenu[''stats'']">+10</a> <a href="exec:pcs_intel += 25 & dynamic $cheatmenu[''stats'']">+25</a> <a href="exec:pcs_intel -= 1 & dynamic $cheatmenu[''stats'']">-1</a> <a href="exec:pcs_intel -= 5 & dynamic $cheatmenu[''stats'']">-5</a> <a href="exec:pcs_intel -= 10 & dynamic $cheatmenu[''stats'']">-10</a> <a href="exec:pcs_intel -= 25 & dynamic $cheatmenu[''stats'']">-25</a>'
+	pl 'Strength (<<stren_lvl>>): <a href="exec:stren_lvl += 1 & stren_lvlst = stren_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:stren_lvl>>): <a href="exec:stren_lvl += 5 & stren_lvlst = stren_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:stren_lvl += 10 & stren_lvlst = stren_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:stren_lvl -= 1 & stren_lvlst = stren_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:stren_lvl -= 5 & stren_lvlst = stren_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:stren_lvl -= 10 & stren_lvlst = stren_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Agility (<<agil_lvl>>): <a href="exec:agil_lvl += 1 & agil_lvlst = agil_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:agil_lvl>>): <a href="exec:agil_lvl += 5 & agil_lvlst = agil_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:agil_lvl += 10 & agil_lvlst = agil_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:agil_lvl -= 1 & agil_lvlst = agil_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:agil_lvl -= 5 & agil_lvlst = agil_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:agil_lvl -= 10 & agil_lvlst = agil_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Endurance (<<vital_lvl>>): <a href="exec:vital_lvl += 1 & vital_lvlst = vital_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:vital_lvl>>): <a href="exec:vital_lvl += 5 & vital_lvlst = vital_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:vital_lvl += 10 & vital_lvlst = vital_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:vital_lvl -= 1 & vital_lvlst = vital_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:vital_lvl -= 5 & vital_lvlst = vital_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:vital_lvl -= 10 & vital_lvlst = vital_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Intelligence (<<intel_lvl>>): <a href="exec:intel_lvl += 1 & intel_lvlst = intel_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:intel_lvl>>): <a href="exec:intel_lvl += 5 & intel_lvlst = intel_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:intel_lvl += 10 & intel_lvlst = intel_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:intel_lvl -= 1 & intel_lvlst = intel_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:intel_lvl -= 5 & intel_lvlst = intel_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:intel_lvl -= 10 & intel_lvlst = intel_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Mental Agility (<<react_lvl>>): <a href="exec:react_lvl += 1 & react_lvlst = react_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:react_lvl>>): <a href="exec:react_lvl += 5 & react_lvlst = react_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:react_lvl += 10 & react_lvlst = react_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:react_lvl -= 1 & react_lvlst = react_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:react_lvl -= 5 & react_lvlst = react_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:react_lvl -= 10 & react_lvlst = react_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Sprit (<<sprt_lvl>>): <a href="exec:sprt_lvl += 1 & sprt_lvlst = sprt_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:sprt_lvl>>): <a href="exec:sprt_lvl += 5 & sprt_lvlst = sprt_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:sprt_lvl += 10 & sprt_lvlst = sprt_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:sprt_lvl -= 1 & sprt_lvlst = sprt_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:sprt_lvl -= 5 & sprt_lvlst = sprt_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:sprt_lvl -= 10 & sprt_lvlst = sprt_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Charisma (<<chrsm_lvl>>): <a href="exec:chrsm_lvl += 1 & chrsm_lvlst = chrsm_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:chrsm_lvl>>): <a href="exec:chrsm_lvl += 5 & chrsm_lvlst = chrsm_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:chrsm_lvl += 10 & chrsm_lvlst = chrsm_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:chrsm_lvl -= 1 & chrsm_lvlst = chrsm_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:chrsm_lvl -= 5 & chrsm_lvlst = chrsm_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:chrsm_lvl -= 10 & chrsm_lvlst = chrsm_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Perception (<<prcptn_lvl>>): <a href="exec:prcptn_lvl += 1 & prcptn_lvlst = prcptn_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:prcptn_lvl>>): <a href="exec:prcptn_lvl += 5 & prcptn_lvlst = prcptn_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:prcptn_lvl += 10 & prcptn_lvlst = prcptn_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:prcptn_lvl -= 1 & prcptn_lvlst = prcptn_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:prcptn_lvl -= 5 & prcptn_lvlst = prcptn_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:prcptn_lvl -= 10 & prcptn_lvlst = prcptn_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	if MagikDostup = 0: pl 'Magic (<<magik_lvl>>): <a href="exec:magik_lvl += 1 & magik_lvlst = magik_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:magik_lvl>>): <a href="exec:magik_lvl += 5 & magik_lvlst = magik_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:magik_lvl += 10 & magik_lvlst = magik_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:magik_lvl -= 1 & magik_lvlst = magik_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:magik_lvl -= 5 & magik_lvlst = magik_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:magik_lvl -= 10 & magik_lvlst = magik_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl''
+	pl'<b>Combat:</b>'
+	pl 'Jabs (<<jab_lvl>>): <a href="exec:jab_lvl += 1 & jab_lvlst = jab_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:jab_lvl>>): <a href="exec:jab_lvl += 5 & jab_lvlst = jab_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:jab_lvl += 10 & jab_lvlst = jab_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:jab_lvl -= 1 & jab_lvlst = jab_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:jab_lvl -= 5 & jab_lvlst = jab_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:jab_lvl -= 10 & jab_lvlst = jab_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Power Strikes (<<punch_lvl>>): <a href="exec:punch_lvl += 1 & punch_lvlst = punch_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:punch_lvl>>): <a href="exec:punch_lvl += 5 & punch_lvlst = punch_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:punch_lvl += 10 & punch_lvlst = punch_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:punch_lvl -= 1 & punch_lvlst = punch_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:punch_lvl -= 5 & punch_lvlst = punch_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:punch_lvl -= 10 & punch_lvlst = punch_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Kicks (<<kick_lvl>>): <a href="exec:kick_lvl += 1 & kick_lvlst = kick_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:kick_lvl>>): <a href="exec:kick_lvl += 5 & kick_lvlst = kick_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:kick_lvl += 10 & kick_lvlst = kick_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:kick_lvl -= 1 & kick_lvlst = kick_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:kick_lvl -= 5 & kick_lvlst = kick_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:kick_lvl -= 10 & kick_lvlst = kick_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Defence (<<def_lvl>>): <a href="exec:def_lvl += 1 & def_lvlst = def_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:def_lvl>>): <a href="exec:def_lvl += 5 & def_lvlst = def_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:def_lvl += 10 & def_lvlst = def_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:def_lvl -= 1 & def_lvlst = def_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:def_lvl -= 5 & def_lvlst = def_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:def_lvl -= 10 & def_lvlst = def_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Marksmanship (<<shoot_lvl>>): <a href="exec:shoot_lvl += 1 & shoot_lvlst = shoot_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:shoot_lvl>>): <a href="exec:shoot_lvl += 5 & shoot_lvlst = shoot_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:shoot_lvl += 10 & shoot_lvlst = shoot_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:shoot_lvl -= 1 & shoot_lvlst = shoot_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:shoot_lvl -= 5 & shoot_lvlst = shoot_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:shoot_lvl -= 10 & shoot_lvlst = shoot_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
 	pl''
-	pl'Dominance (<<pcs_dom>>): <a href="exec:pcs_dom += 1 & dynamic $cheatmenu[''stats'']">+1</a> <a href="exec:pcs_dom += 5 & dynamic $cheatmenu[''stats'']">+5</a> <a href="exec:pcs_dom += 10 & dynamic $cheatmenu[''stats'']">+10</a> <a href="exec:pcs_dom -= 1 & dynamic $cheatmenu[''stats'']">-1</a> <a href="exec:pcs_dom -= 5 & dynamic $cheatmenu[''stats'']">-5</a> <a href="exec:pcs_dom -= 10 & dynamic $cheatmenu[''stats'']">-10</a>'
-	pl'Submissiveness (<<sub>>): <a href="exec:sub += 1 & dynamic $cheatmenu[''stats'']">+1</a> <a href="exec:sub += 5 & dynamic $cheatmenu[''stats'']">+5</a> <a href="exec:sub += 10 & dynamic $cheatmenu[''stats'']">+10</a> <a href="exec:sub -= 1 & dynamic $cheatmenu[''stats'']">-1</a> <a href="exec:sub -= 5 & dynamic $cheatmenu[''stats'']">-5</a> <a href="exec:sub -= 10 & dynamic $cheatmenu[''stats'']">-10</a>'
+	pl'<b>Craft:</b>'
+	pl 'Singing (<<vokal_lvl>>): <a href="exec:vokal_lvl += 1 & vokal_lvlst = vokal_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:vokal_lvl>>): <a href="exec:vokal_lvl += 5 & vokal_lvlst = vokal_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:vokal_lvl += 10 & vokal_lvlst = vokal_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:vokal_lvl -= 1 & vokal_lvlst = vokal_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:vokal_lvl -= 5 & vokal_lvlst = vokal_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:vokal_lvl -= 10 & vokal_lvlst = vokal_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Tailoring (<<sewng_lvl>>): <a href="exec:sewng_lvl += 1 & sewng_lvlst = sewng_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:sewng_lvl>>): <a href="exec:sewng_lvl += 5 & sewng_lvlst = sewng_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:sewng_lvl += 10 & sewng_lvlst = sewng_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:sewng_lvl -= 1 & sewng_lvlst = sewng_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:sewng_lvl -= 5 & sewng_lvlst = sewng_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:sewng_lvl -= 10 & sewng_lvlst = sewng_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Instrumental Music (<<instrmusic_lvl>>): <a href="exec:instrmusic_lvl += 1 & instrmusic_lvlst = instrmusic_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:instrmusic_lvl>>): <a href="exec:instrmusic_lvl += 5 & instrmusic_lvlst = instrmusic_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:instrmusic_lvl += 10 & instrmusic_lvlst = instrmusic_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:instrmusic_lvl -= 1 & instrmusic_lvlst = instrmusic_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:instrmusic_lvl -= 5 & instrmusic_lvlst = instrmusic_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:instrmusic_lvl -= 10 & instrmusic_lvlst = instrmusic_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Photography (<<photoskl_lvl>>): <a href="exec:photoskl_lvl += 1 & photoskl_lvlst = photoskl_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:photoskl_lvl>>): <a href="exec:photoskl_lvl += 5 & photoskl_lvlst = photoskl_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:photoskl_lvl += 10 & photoskl_lvlst = photoskl_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:photoskl_lvl -= 1 & photoskl_lvlst = photoskl_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:photoskl_lvl -= 5 & photoskl_lvlst = photoskl_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:photoskl_lvl -= 10 & photoskl_lvlst = photoskl_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Artistic Skills (<<artskls_lvl>>): <a href="exec:artskls_lvl += 1 & artskls_lvlst = artskls_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:artskls_lvl>>): <a href="exec:artskls_lvl += 5 & artskls_lvlst = artskls_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:artskls_lvl += 10 & artskls_lvlst = artskls_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:artskls_lvl -= 1 & artskls_lvlst = artskls_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:artskls_lvl -= 5 & artskls_lvlst = artskls_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:artskls_lvl -= 10 & artskls_lvlst = artskls_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
 	pl''
-	if pcs_run >= 0:pl'<a href="exec:pcs_run += 25 & dynamic $cheatmenu[''stats'']">Running+25: <<pcs_run>></a>'
-	if pcs_run > 0:pl'<a href="exec:pcs_run -= 25 & dynamic $cheatmenu[''stats'']">Running-25: <<pcs_run>></a>'
-	if pcs_vball >= 0:pl'<a href="exec:pcs_vball += 25 & dynamic $cheatmenu[''stats'']">Volleyball+25: <<pcs_vball>></a>'
-	if pcs_vball >= 25:pl'<a href="exec:pcs_vball -= 25 & dynamic $cheatmenu[''stats'']">Volleyball-25: <<pcs_vball>></a>'
+	pl'<b>Dance:</b>'
+	pl 'Modern Dancing (<<danc_lvl>>): <a href="exec:danc_lvl += 1 & danc_lvlst = danc_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:danc_lvl>>): <a href="exec:danc_lvl += 5 & danc_lvlst = danc_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:danc_lvl += 10 & danc_lvlst = danc_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:danc_lvl -= 1 & danc_lvlst = danc_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:danc_lvl -= 5 & danc_lvlst = danc_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:danc_lvl -= 10 & danc_lvlst = danc_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Erotic Dancing (<<dancero_lvl>>): <a href="exec:dancero_lvl += 1 & dancero_lvlst = dancero_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:dancero_lvl>>): <a href="exec:dancero_lvl += 5 & dancero_lvlst = dancero_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:dancero_lvl += 10 & dancero_lvlst = dancero_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:dancero_lvl -= 1 & dancero_lvlst = dancero_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:dancero_lvl -= 5 & dancero_lvlst = dancero_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:dancero_lvl -= 10 & dancero_lvlst = dancero_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Pole Dancing (<<dancpol_lvl>>): <a href="exec:dancpol_lvl += 1 & dancpol_lvlst = dancpol_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:dancpol_lvl>>): <a href="exec:dancpol_lvl += 5 & dancpol_lvlst = dancpol_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:dancpol_lvl += 10 & dancpol_lvlst = dancpol_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:dancpol_lvl -= 1 & dancpol_lvlst = dancpol_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:dancpol_lvl -= 5 & dancpol_lvlst = dancpol_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:dancpol_lvl -= 10 & dancpol_lvlst = dancpol_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
 	pl''
-	if pcs_shoot >= 0:pl' <a href="exec:pcs_shoot += 25 & dynamic $cheatmenu[''stats'']">Shooting +25: <<pcs_shoot>></a>'
-	if pcs_shoot > 0:pl' <a href="exec:pcs_shoot -= 25 & dynamic $cheatmenu[''stats'']">Shooting -25: <<pcs_shoot>></a>'
-	if pcs_sewng >= 0:pl' <a href="exec:pcs_sewng += 25 & dynamic $cheatmenu[''stats'']">Sewing + 25: <<pcs_sewng>></a>'
-	if pcs_sewng > 0:pl' <a href="exec:pcs_sewng -= 25 & dynamic $cheatmenu[''stats'']">Sewing - 25: <<pcs_sewng>></a>'
-	if pcs_chess >= 0:pl' <a href="exec:pcs_chess += 25 & dynamic $cheatmenu[''stats'']">Chess + 25: <<pcs_chess>></a>'
-	if pcs_chess > 0:pl' <a href="exec:pcs_chess -= 25 & dynamic $cheatmenu[''stats'']">Chess - 25: <<pcs_chess>></a>'
-	if pcs_servng >= 0:pl' <a href="exec:pcs_servng += 25 & dynamic $cheatmenu[''stats'']">Serving + 25: <<pcs_servng>></a>'
-	if pcs_servng > 0:pl' <a href="exec:pcs_servng -= 25 & dynamic $cheatmenu[''stats'']">Serving - 25: <<pcs_servng>></a>'
+	pl'<b>Sport:</b>'
+	pl 'Running (<<run_lvl>>): <a href="exec:run_lvl += 1 & run_lvlst = run_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:run_lvl>>): <a href="exec:run_lvl += 5 & run_lvlst = run_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:run_lvl += 10 & run_lvlst = run_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:run_lvl -= 1 & run_lvlst = run_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:run_lvl -= 5 & run_lvlst = run_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:run_lvl -= 10 & run_lvlst = run_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Volleyball (<<vball_lvl>>): <a href="exec:vball_lvl += 1 & vball_lvlst = vball_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:vball_lvl>>): <a href="exec:vball_lvl += 5 & vball_lvlst = vball_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:vball_lvl += 10 & vball_lvlst = vball_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:vball_lvl -= 1 & vball_lvlst = vball_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:vball_lvl -= 5 & vball_lvlst = vball_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:vball_lvl -= 10 & vball_lvlst = vball_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Ice Skating (<<icesktng_lvl>>): <a href="exec:icesktng_lvl += 1 & icesktng_lvlst = icesktng_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:icesktng_lvl>>): <a href="exec:icesktng_lvl += 5 & icesktng_lvlst = icesktng_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:icesktng_lvl += 10 & icesktng_lvlst = icesktng_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:icesktng_lvl -= 1 & icesktng_lvlst = icesktng_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:icesktng_lvl -= 5 & icesktng_lvlst = icesktng_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:icesktng_lvl -= 10 & icesktng_lvlst = icesktng_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Wrestling (<<wrstlng_lvl>>): <a href="exec:wrstlng_lvl += 1 & wrstlng_lvlst = wrstlng_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:wrstlng_lvl>>): <a href="exec:wrstlng_lvl += 5 & wrstlng_lvlst = wrstlng_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:wrstlng_lvl += 10 & wrstlng_lvlst = wrstlng_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:wrstlng_lvl -= 1 & wrstlng_lvlst = wrstlng_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:wrstlng_lvl -= 5 & wrstlng_lvlst = wrstlng_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:wrstlng_lvl -= 10 & wrstlng_lvlst = wrstlng_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Football (<<ftbll_lvl>>): <a href="exec:ftbll_lvl += 1 & ftbll_lvlst = ftbll_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:ftbll_lvl>>): <a href="exec:ftbll_lvl += 5 & ftbll_lvlst = ftbll_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:ftbll_lvl += 10 & ftbll_lvlst = ftbll_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:ftbll_lvl -= 1 & ftbll_lvlst = ftbll_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:ftbll_lvl -= 5 & ftbll_lvlst = ftbll_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:ftbll_lvl -= 10 & ftbll_lvlst = ftbll_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
 	pl''
-	if pcs_danc >= 0:pl'<a href="exec:pcs_danc += 25 &dynamic $cheatmenu[''stats'']">Dancing +25: <<pcs_danc>></a>'
-	if pcs_danc > 0:pl'<a href="exec:pcs_danc -= 25 &dynamic $cheatmenu[''stats'']">Dancing -25: <<pcs_danc>></a>'
-	if pcs_dancero >= 0:pl'<a href="exec:pcs_dancero += 25 &dynamic $cheatmenu[''stats'']">Erotic dancing +25: <<pcs_dancero>></a>'
-	if pcs_dancero > 0:pl'<a href="exec:pcs_dancero -= 25 &dynamic $cheatmenu[''stats'']">Erotic dancing -25: <<pcs_dancero>></a>'
-	if pcs_dancpol >= 0:pl'<a href="exec:pcs_dancpol += 25 & dynamic $cheatmenu[''stats'']">Pole dancing +25: <<pcs_dancpol>></a>'
-	if pcs_dancpol > 0:pl'<a href="exec:pcs_dancpol -= 25 & dynamic $cheatmenu[''stats'']">Pole dancing -25: <<pcs_dancpol>></a>'
+	pl'<b>Work:</b>'
+	pl 'Serving (<<servng_lvl>>): <a href="exec:servng_lvl += 1 & servng_lvlst = servng_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:servng_lvl>>): <a href="exec:servng_lvl += 5 & servng_lvlst = servng_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:servng_lvl += 10 & servng_lvlst = servng_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:servng_lvl -= 1 & servng_lvlst = servng_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:servng_lvl -= 5 & servng_lvlst = servng_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:servng_lvl -= 10 & servng_lvlst = servng_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Modeling (<<mdlng_lvl>>): <a href="exec:mdlng_lvl += 1 & mdlng_lvlst = mdlng_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:mdlng_lvl>>): <a href="exec:mdlng_lvl += 5 & mdlng_lvlst = mdlng_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:mdlng_lvl += 10 & mdlng_lvlst = mdlng_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:mdlng_lvl -= 1 & mdlng_lvlst = mdlng_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:mdlng_lvl -= 5 & mdlng_lvlst = mdlng_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:mdlng_lvl -= 10 & mdlng_lvlst = mdlng_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Medicine (<<medcn_lvl>>): <a href="exec:medcn_lvl += 1 & medcn_lvlst = medcn_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:medcn_lvl>>): <a href="exec:medcn_lvl += 5 & medcn_lvlst = medcn_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:medcn_lvl += 10 & medcn_lvlst = medcn_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:medcn_lvl -= 1 & medcn_lvlst = medcn_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:medcn_lvl -= 5 & medcn_lvlst = medcn_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:medcn_lvl -= 10 & medcn_lvlst = medcn_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
 	pl''
-	if pcs_vokal >= 0:pl'<a href="exec:pcs_vokal += 25 & dynamic $cheatmenu[''stats'']">Vocal skill +25: <<pcs_vokal>></a>'
-	if pcs_vokal > 0:pl'<a href="exec:pcs_vokal -= 25 & dynamic $cheatmenu[''stats'']">Vocal skill -25: <<pcs_vokal>></a>'
+	pl'<b>Others:</b>'
+	pl 'Chess (<<chess_lvl>>): <a href="exec:chess_lvl += 1 & chess_lvlst = chess_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:chess_lvl>>): <a href="exec:chess_lvl += 5 & chess_lvlst = chess_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:chess_lvl += 10 & chess_lvlst = chess_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:chess_lvl -= 1 & chess_lvlst = chess_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:chess_lvl -= 5 & chess_lvlst = chess_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:chess_lvl -= 10 & chess_lvlst = chess_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Gaming (<<ttgmng_lvl>>): <a href="exec:ttgmng_lvl += 1 & ttgmng_lvlst = ttgmng_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:ttgmng_lvl>>): <a href="exec:ttgmng_lvl += 5 & ttgmng_lvlst = ttgmng_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:ttgmng_lvl += 10 & ttgmng_lvlst = ttgmng_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:ttgmng_lvl -= 1 & ttgmng_lvlst = ttgmng_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:ttgmng_lvl -= 5 & ttgmng_lvlst = ttgmng_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:ttgmng_lvl -= 10 & ttgmng_lvlst = ttgmng_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'People skills (<<humint_lvl>>): <a href="exec:humint_lvl += 1 & humint_lvlst = humint_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:humint_lvl>>): <a href="exec:humint_lvl += 5 & humint_lvlst = humint_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:humint_lvl += 10 & humint_lvlst = humint_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:humint_lvl -= 1 & humint_lvlst = humint_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:humint_lvl -= 5 & humint_lvlst = humint_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:humint_lvl -= 10 & humint_lvlst = humint_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Persuasion (<<persuas_lvl>>): <a href="exec:persuas_lvl += 1 & persuas_lvlst = persuas_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:persuas_lvl>>): <a href="exec:persuas_lvl += 5 & persuas_lvlst = persuas_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:persuas_lvl += 10 & persuas_lvlst = persuas_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:persuas_lvl -= 1 & persuas_lvlst = persuas_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:persuas_lvl -= 5 & persuas_lvlst = persuas_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:persuas_lvl -= 10 & persuas_lvlst = persuas_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Observation (<<observ_lvl>>): <a href="exec:observ_lvl += 1 & observ_lvlst = observ_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:observ_lvl>>): <a href="exec:observ_lvl += 5 & observ_lvlst = observ_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:observ_lvl += 10 & observ_lvlst = observ_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:observ_lvl -= 1 & observ_lvlst = observ_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:observ_lvl -= 5 & observ_lvlst = observ_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:observ_lvl -= 10 & observ_lvlst = observ_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Makeup (<<makupskl_lvl>>): <a href="exec:makupskl_lvl += 1 & makupskl_lvlst = makupskl_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:makupskl_lvl>>): <a href="exec:makupskl_lvl += 5 & makupskl_lvlst = makupskl_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:makupskl_lvl += 10 & makupskl_lvlst = makupskl_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:makupskl_lvl -= 1 & makupskl_lvlst = makupskl_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:makupskl_lvl -= 5 & makupskl_lvlst = makupskl_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:makupskl_lvl -= 10 & makupskl_lvlst = makupskl_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Computer Skill (<<compskl_lvl>>): <a href="exec:compskl_lvl += 1 & compskl_lvlst = compskl_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:compskl_lvl>>): <a href="exec:compskl_lvl += 5 & compskl_lvlst = compskl_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:compskl_lvl += 10 & compskl_lvlst = compskl_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:compskl_lvl -= 1 & compskl_lvlst = compskl_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:compskl_lvl -= 5 & compskl_lvlst = compskl_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:compskl_lvl -= 10 & compskl_lvlst = compskl_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Hacking (<<comphckng_lvl>>): <a href="exec:comphckng_lvl += 1 & comphckng_lvlst = comphckng_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:comphckng_lvl>>): <a href="exec:comphckng_lvl += 5 & comphckng_lvlst = comphckng_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:comphckng_lvl += 10 & comphckng_lvlst = comphckng_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:comphckng_lvl -= 1 & comphckng_lvlst = comphckng_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:comphckng_lvl -= 5 & comphckng_lvlst = comphckng_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:comphckng_lvl -= 10 & comphckng_lvlst = comphckng_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	pl 'Handy-work (<<hndiwrk_lvl>>): <a href="exec:hndiwrk_lvl += 1 & hndiwrk_lvlst = hndiwrk_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:hndiwrk_lvl>>): <a href="exec:hndiwrk_lvl += 5 & hndiwrk_lvlst = hndiwrk_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:hndiwrk_lvl += 10 & hndiwrk_lvlst = hndiwrk_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:hndiwrk_lvl -= 1 & hndiwrk_lvlst = hndiwrk_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:hndiwrk_lvl -= 5 & hndiwrk_lvlst = hndiwrk_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:hndiwrk_lvl -= 10 & hndiwrk_lvlst = hndiwrk_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
+	if MagikDostup = 0: pl 'Spell Casting (<<splcstng_lvl>>): <a href="exec:splcstng_lvl += 1 & splcstng_lvlst = splcstng_lvl & dynamic $cheatmenu[''stats'']" >+1</a> <a href="exec:splcstng_lvl>>): <a href="exec:splcstng_lvl += 5 & splcstng_lvlst = splcstng_lvl & dynamic $cheatmenu[''stats'']" >+5</a> <a href="exec:splcstng_lvl += 10 & splcstng_lvlst = splcstng_lvl & dynamic $cheatmenu[''stats'']" >+10</a> <a href="exec:splcstng_lvl -= 1 & splcstng_lvlst = splcstng_lvl & dynamic $cheatmenu[''stats'']" >-1</a> <a href="exec:splcstng_lvl -= 5 & splcstng_lvlst = splcstng_lvl & dynamic $cheatmenu[''stats'']" >-5</a> <a href="exec:splcstng_lvl -= 10 & splcstng_lvlst = splcstng_lvl & dynamic $cheatmenu[''stats'']" >-10</a>'
 	pl''
 	if workPTU > 1:pl'<a href="exec:teachlevel += 10 & dynamic $cheatmenu[''stats'']">Reputation teacher+10: <<teachlevel>></a>'
 	if workPTU > 1:pl'<a href="exec:teachlevel -= 10 & dynamic $cheatmenu[''stats'']">Reputation teacher-10: <<teachlevel>></a>'
 	if pcs_grades >= 0:pl'<a href="exec:pcs_grades += 10 & dynamic $cheatmenu[''stats'']">Improve their academic performance: <<pcs_grades>></a>'
 	if schoolprogul >= 0:pl'<a href="exec:schoolprogul = 0 & dynamic $cheatmenu[''stats'']">Zero Absenteeism: <<schoolprogul>></a>'
 	pl''
-	pl'<b>Kickboxing:</b>'
-	if pcs_jab >= 0:pl'<a href="exec:pcs_jab += 25 & dynamic $cheatmenu[''stats'']">Jab +25: <<pcs_jab>></a>'
-	if pcs_jab > 0:pl'<a href="exec:pcs_jab -= 25 & dynamic $cheatmenu[''stats'']">Jab -25: <<pcs_jab>></a>'
-	if pcs_punch >= 0:pl'<a href="exec:pcs_punch += 25 & dynamic $cheatmenu[''stats'']">Power punch +25: <<pcs_punch>></a>'
-	if pcs_punch > 0:pl'<a href="exec:pcs_punch -= 25 & dynamic $cheatmenu[''stats'']">Power punch -25: <<pcs_punch>></a>'
-	if pcs_kick >= 0:pl'<a href="exec:pcs_kick += 25 & dynamic $cheatmenu[''stats'']">Kicks +25: <<pcs_kick>></a>'
-	if pcs_kick > 0:pl'<a href="exec:pcs_kick -= 25 & dynamic $cheatmenu[''stats'']">Kicks -25: <<pcs_kick>></a>'
-	if pcs_def >= 0:pl'<a href="exec:pcs_def += 25 & dynamic $cheatmenu[''stats'']">Defense +25: <<pcs_def>></a>'
-	if pcs_def > 0:pl'<a href="exec:pcs_def -= 25 & dynamic $cheatmenu[''stats'']">Defense -25: <<pcs_def>></a>'
-	pl''
 	pl'<b>Test options</b> present in the mechanism of the game, but not involved in the game quests:'
 	if mutagenP = 0:pl'Mutagen strength <a href="exec:mutagenP = 1 & pcs_stren = 150 & dynamic $cheatmenu[''stats'']">1Level</a>'
 	if mutagenP = 1:pl'Mutagen strength <a href="exec:mutagenP = 2 & pcs_stren = 200 & dynamic $cheatmenu[''stats'']">2Level</a>'
@@ -787,8 +797,9 @@ $cheatmenu['time'] = {
 	gs 'daystart'
 	gs 'stat'
 
-	temp_daystart = (year - 2015) * 365
-	temp_daystart += ((year - 2015) + 3) / 4
+	temp_daystart = (year - 2016) * 365
+!!2016 is a leapyear so no adjustment before division
+	temp_daystart += (year - 2016) / 4
 	i=1
 	:temp_daystart
 	if temp_month > i:
@@ -1029,11 +1040,10 @@ $cheatmenu['force_preg'] = {
 	preg = 1
 	cycle = 5
 	PregChem = 150
-	gs 'npcgeneratec', 0, 'A sperm donor', rand(18,34)
-	gs 'npcpreservec', $npclastgenerated
+	$wombthfath = 'A sperm donor'
 	babyembryo += 1
 	if fertegg = 0:
-		nextbaby = arrsize('$ChildFath')
+		Nextbaby = arrsize('$ChildFath')
 		Temppolkid = rand(0,1)
 		polkid[nextbaby] = Temppolkid
 		$kidname[nextbaby] = 'unborn'
@@ -1042,8 +1052,8 @@ $cheatmenu['force_preg'] = {
 		monthkid[nextbaby] = 0
 		yearkid[nextbaby] = 0
 		Babyptype[nextbaby] = 0
-		$ChildFath[nextbaby] = $npclastsaved
-		$ChildThFath[nextbaby] = $npclastsaved
+		$ChildFath[nextbaby] = 'A sperm donor'
+		$ChildThFath[nextbaby] = 'A sperm donor'
 		hairkid[nextbaby] = rand(0, 3)
 		eyeskid[nextbaby] = rand(0, 3)
 		ChildConType[nextbaby] = 0

+ 5 - 5
locations/Gadgarden

@@ -34,7 +34,7 @@ if $ARGS[0] = 'garden':
 		    pcs_sweat += 10
             work_garden = 0
 		    grandmahelp += 3
-		    pcs_stren += 1
+		    stren_exp += 1
 		    fat -= RAND(1,5)
 		    gs 'stat'
 			
@@ -52,7 +52,7 @@ if $ARGS[0] = 'garden':
 		    minut += 60
 		    water_garden = 0
 		    grandmahelp += 1
-		    pcs_vital += 1
+		    vital_exp += 1
 		    fat -= RAND(1,2)		    
 		    gs 'stat'
 			
@@ -70,7 +70,7 @@ if $ARGS[0] = 'garden':
 		    pcs_sweat += 10
 		    harvest_garden = 0
 		    grandmahelp += 3
-		    pcs_stren += 1
+		    stren_exp += 1
 		    fat -= RAND(1,3)		    
 		    gs 'stat'
 			
@@ -134,7 +134,7 @@ if $ARGS[0] = 'strawberry':
 			pcs_sweat += 10
 			collect_strawberries = 0
 			grandmahelp += 5
-		    pcs_agil += 1
+		    agil_exp += 1
             fat -= 1			
 			gs 'stat'
 			
@@ -195,7 +195,7 @@ if $ARGS[0] = 'fruit_garden':
 			pcs_sweat += 10
 			fruit_collect = 0
 			grandmahelp += 5
-		    pcs_agil += 1
+		    agil_exp += 1
             fat -= RAND(1,3)
 			gs 'stat'
 			

+ 1 - 1
locations/Gadhouse

@@ -197,7 +197,7 @@ if $ARGS[0]='':
 			act'Continue embroidering for an hour (1:00)':
 			cls
 			minut += 60
-			pcs_sewng += rand(0,1000)
+			sewng_exp += rand(0,1000)
 			gobramax = pcs_sewng/100
 			gobramin = pcs_sewng/200
 			newgobelen += rand(gobramin,gobramax)

+ 1 - 1
locations/Gadsarai

@@ -401,7 +401,7 @@ if $ARGS[0] = '':
 			act 'Go cycling':
 				cls
 				minut += 60
-				pcs_run += RAND(0,1)
+				run_exp += RAND(0,1)
 				speed += RAND(0,2)
 				fat -= RAND(2,7)
 				pcs_mood += 5

+ 2 - 2
locations/Gnpc2

@@ -45,7 +45,7 @@ $din_gboy_go_to_disco = {
 		end
 
 		minut += 120
-		if pcs_danc < 50 and pcs_agil >= pcs_danc:pcs_danc += 1
+		if pcs_danc < 50 and pcs_agil >= pcs_danc:danc_exp += 1
 		pcs_mood += 10
 		gs 'stat'
 		diskoIvrand = rand(0, 100)
@@ -257,7 +257,7 @@ $din_gboy_go_to_disco = {
 
 				act 'Decline his offer and keep dancing':
 					cla
-					if pcs_danc < 50 and pcs_agil >= pcs_danc:pcs_danc += 1
+					if pcs_danc < 50 and pcs_agil >= pcs_danc:danc_exp += 1
 					minut += 5
 					gs 'stat'
 					'Your <<$bfTitle[numnpc]>> gets himself a beer at the bar and in the meantime you continue to dance.'

+ 1 - 1
locations/JuliaMilHome

@@ -16,7 +16,7 @@ if lernHome ! 0:
 		!npc_rel[14] += 10
 		lernHome = 0
 		lern += rand(3, 6)
-		pcs_intel += rand(1, 2) + (mentats_dose - rand(0,mentats_dose))
+		intel_exp += rand(1, 2) + (mentats_dose - rand(0,mentats_dose))
 		gs 'stat'
 		'<center><img src="images/qwest/alter/npc/12.jpg"></center>'
 		'You spend an hour doing your homework with Julia, and thanks to her you manage to learn quite a lot. She''s a very clever girl, and good at explaining things.'

+ 2 - 2
locations/Katlake

@@ -79,8 +79,8 @@ if $ARGS[0] = 'voleybol':
 	katday = daystart
 	kat += 3
 	minut += 30
-	pcs_agil += 1
-	pcs_react += 1
+	agil_exp += 1
+	react_exp += 1
 	speed += 1
 	gs 'stat'
 	'<center><img src="images/img/lake/voleybol.jpg"></center>'

+ 1 - 1
locations/Komp

@@ -566,7 +566,7 @@ if $ARGS[0] = 'study':
 	minut = minut + 60
 	elektro = elektro + 3
 	internet -= 1
-	pcs_intel += 1 + (mentats_dose - rand(0,mentats_dose))
+	intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
 	'<center><b>The Institute for Education Measurement</b></center>'
 	'<center><img src="images/pics/komp/study.jpg"></center>'
 	'You spend an hour on the IEM website, reading news articles and educational blogs. You feel a bit smarter afterwards.'

+ 2 - 2
locations/LariskaHome

@@ -144,11 +144,11 @@ if $ARGS[0] = 'in':
 			if pcs_vball < 100:
 				act 'Drop the subject':gt 'LariskaHome','in'
 				act 'Tell you that you''ll go with her for support.':lariskaTrenerTalk = 1 & minut += 15 & gt 'Voltrener', 'start'
-			elseif pcs_vball >= 100 and volleysostav = 0:
+			else volleysostav = 0:
 				act 'Drop the subject':gt 'LariskaHome','in'
 				act 'Tell you that you''ll go with her for support.':lariskaTrenerTalk = 2 & minut += 15 & gt 'Voltrener', 'start'
 				act 'Tell her that you should both go together and ask to be on the team.':lariskaTrenerTalk = 3 & minut += 15 & gt 'Voltrener', 'start'
-			elseif pcs_vball >= 100 and volleysostav > 0:
+			else
 				act 'Drop the subject':gt 'LariskaHome','in'
 				act 'Tell you that you''ll go with her and since you''re already on the team, you can help convince the coach.':lariskaTrenerTalk = 4 & minut += 15 & gt 'Voltrener', 'start'
 			end

+ 21 - 10
locations/Military

@@ -125,16 +125,27 @@ if $ARGS[0] = 'pro1':
 
 	act 'Run away':
 		'<center><img src="images/img/_nuki/military/forest_running.jpg"></center>'
-		if pcs_run < 10:peshimraperand = rand(0, 11)
-		if pcs_run >= 10 and pcs_run < 20:peshimraperand = rand(0, 20)
-		if pcs_run >= 20 and pcs_run < 30:peshimraperand = rand(0, 30)
-		if pcs_run >= 30 and pcs_run < 40:peshimraperand = rand(0, 40)
-		if pcs_run >= 40 and pcs_run < 50:peshimraperand = rand(0, 50)
-		if pcs_run >= 50 and pcs_run < 60:peshimraperand = rand(0, 60)
-		if pcs_run >= 60 and pcs_run < 70:peshimraperand = rand(0, 70)
-		if pcs_run >= 70 and pcs_run < 80:peshimraperand = rand(0, 80)
-		if pcs_run >= 80 and pcs_run < 90:peshimraperand = rand(0, 90)
-		if pcs_run >= 90:peshimraperand = rand(11, 100)
+		if pcs_run < 10:
+			peshimraperand = rand(0, 11)
+		elseif pcs_run < 20:
+			peshimraperand = rand(0, 20)
+		elseif pcs_run < 30:
+			peshimraperand = rand(0, 30)
+		elseif pcs_run < 40:
+			peshimraperand = rand(0, 40)
+		elseif pcs_run < 50:
+			peshimraperand = rand(0, 50)
+		elseif pcs_run < 60:
+			peshimraperand = rand(0, 60)
+		elseif pcs_run < 70:
+			peshimraperand = rand(0, 70)
+		elseif pcs_run < 80:
+			peshimraperand = rand(0, 80)
+		elseif pcs_run < 90:
+			peshimraperand = rand(0, 90)
+		else
+			peshimraperand = rand(11, 100)
+		end
 
 		if peshimraperand < 11:
 			cla

+ 4 - 4
locations/Miroslava

@@ -817,7 +817,7 @@ if graze_cow = 1:
 		    minut += 60
 		    if salo > 3:salo -= RAND(1,3)
 		    fat -= 5
-		    pcs_run += 1
+		    run_exp += 1
 		    pcs_sweat += 10
 		    pcs_mood += 5     
 		    if temper >= 30 and sunWeather = 1:water -= 24
@@ -857,7 +857,7 @@ if graze_cow = 1:
 			pcs_sweat = 10 + rand(0,4)
 			pcs_mood += 5			    
 			pcs_willpwr += 5
-			if pcs_stren < 30:pcs_stren += 1
+			if pcs_stren < 30:stren_exp += 1
             gs 'stat'
                 
             '<center><img src="images/qwest/gadukino/gadfield/graze_cow_river_mira.jpg"></center>'
@@ -1146,7 +1146,7 @@ if miraQW >= 15 and Mira_no = 0 and (mitkasextimes < 13 or miraperversion >= 10
 			    pcs_sweat = 10 + rand(0,4)
 			    pcs_mood += 5			    
 			    pcs_willpwr += 5
-			    if pcs_stren < 30:pcs_stren += 1
+			    if pcs_stren < 30:stren_exp += 1
 			    gs'stat'
 			    
 			    if $clothingworntype = 'swimwear':
@@ -1177,7 +1177,7 @@ if miraQW >= 15 and Mira_no = 0 and (mitkasextimes < 13 or miraperversion >= 10
 			        pcs_sweat = 10 + rand(0,4)
 			        pcs_mood += 5			    
 			        pcs_willpwr += 5
-			        if pcs_stren < 30:pcs_stren += 1
+			        if pcs_stren < 30:stren_exp += 1
 			        gs'stat'
 			    
 					'<center><img src="images/qwest/gadukino/river/RiverTwoGirls.jpg"></center>'

+ 1 - 1
locations/NatBelHome

@@ -43,7 +43,7 @@ if lernHome ! 0:
 		!npc_rel[16] += 10
 		lernHome = 0
 		lern += rand(3, 6)
-		pcs_intel += rand(1, 2)
+		intel_exp += rand(1, 2)
 		gs 'stat'
 		'<center><img src="images/qwest/alter/npc/16.jpg"></center>'
 		'You spend an hour doing your homework with Natasha and reading up on what you did in class. Natasha might be poor but she''s a great study partner.'

+ 4 - 4
locations/Nudelake

@@ -56,10 +56,10 @@ if $ARGS[0] = 'voleybol':
 	act 'Play':
 		cla
 		*clr
-		pcs_agil += 1
-		pcs_react += 1
+		agil_exp += 1
+		react_exp += 1
 		speed += 1
-		pcs_vball += rand(1,3)
+		vball_exp += rand(1,3)
 		minut += 30
 		'<center><img src="images/img/lake/voleybol.jpg"></center>'
 		'You go up to the players and ask whether it is possible to join in, they are happy to put you on a team.'
@@ -107,7 +107,7 @@ if $ARGS[0] = 'swim':
 	pcs_mood += 5
 	pcs_willpwr += 5
 
-	if pcs_stren < 30:pcs_stren += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+	if pcs_stren < 30:stren_exp += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 
 	'<center><img src="images/img/lake/nudeswim.jpg"></center>'
 	'You go for a swim.'

+ 1 - 1
locations/Vika

@@ -75,7 +75,7 @@ if hour < 20:
 	act 'Study with Vika (1 h)':
 		cla
 		minut += 60
-		pcs_intel += 1 + (mentats_dose - rand(0,mentats_dose))
+		intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
 		vika += 1
 		'You get out your text books and notes, while you and Vika sit down together on the bed to study. You help each other with your class work, making it much easier and more fun to study.'
 

+ 2 - 2
locations/Voltrener

@@ -110,9 +110,9 @@ if $ARGS[0] = 'talk':
 	elseif volleysostav = 0:
 		if pcs_vball < 25:
 			'Coach looks at you "I''m busy, girl, do not distract me from my coaching."'
-		elseif pcs_vball >= 25 and pcs_vball < 50:
+		elseif pcs_vball < 50:
 			'Coach looked at you "<<$pcs_lastname>>. You need to devote more time to training, you are a very bad player."'
-		elseif pcs_vball >= 50 and pcs_vball < 75:
+		elseif pcs_vball < 75:
 			'Coach looked at you "<<$pcs_lastname>>. You certainly do not play bad, at least not bad for an amateur. With more work you could reach a higher level."'
 		else
 			'Coach looked at you "Ah, <<$pcs_lastname>>. You have the makings of an athlete, though I''m not sure if you are up to a professional level yet."'

+ 6 - 6
locations/albinahome

@@ -204,12 +204,12 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 						'<center><img src="images/etogame/stripdance.jpg"></center>'
 
 						if pcs_danc >= 100:
-							pcs_dancero += rand(2, 10)
+							dancero_exp += rand(2, 10)
 							'Albina taught you how to passionately dance to the music while stripping.'
 
 							if pcs_dancero >= 100:'But you could not learn anything new, you already know everything she could teach you.'
 						else
-							pcs_danc += rand(5, 15)
+							danc_exp += rand(5, 15)
 							'Striptease is too complex for you, you''re not able to dance and strip at the same time.'
 							'Albina recommends that you start with learning to dance.'
 						end
@@ -223,7 +223,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 						albsportday = daystart
 						minut += 120
 						fat -= 10
-						pcs_stren += rand (1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+						stren_exp += rand (1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 						vital += rand (1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 						pcs_mood -= 5
 						pcs_sweat += 30
@@ -231,7 +231,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 						'<center><img src="images/pic/poledance.jpg"></center>'
 
 						if pcs_danc >= 100 and pcs_dancero >= 100 and pcs_stren >= 80:
-							pcs_dancpol += rand(2, 5)
+							dancpol_exp += rand(2, 5)
 							'Albina taught you various acrobatic moves on the pole.'
 
 							if pcs_dancpol >= 100:'But you could not learn anything new, you already know everything she could teach you.'
@@ -251,7 +251,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 							cls
 							albsportday = daystart
 							minut += 120
-							pcs_stren += rand (2, 5) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+							stren_exp += rand (2, 5) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 							gs 'stat'
 							'<center><img src="images/qwest/alter/albina/stren.jpg"></center>'
 							'Albina shows you how to develop your strength using various exercises.'
@@ -332,7 +332,7 @@ if $ARGS[0] = 'game':
 		minut += 60
 		pcs_mood += 15
 		pcs_willpwr += 20
-		pcs_react += rand(0, 1)
+		react_exp += rand(0, 1)
 		gs 'stat'
 
 		'<center><img src="images/qwest/alter/albina/game.jpg"></center>'

+ 2 - 2
locations/artemEv

@@ -88,7 +88,7 @@ if $ARGS[0] = 'learn':
 	npc_rel[2] += 10
 	lernHome = 0
 	lern += rand(3, 6)
-	pcs_intel += rand(1, 2)
+	intel_exp += rand(1, 2)
 	artemtimes += 1
 	if ArtemBeInHome = 0:ArtemBeInHome = 1
 	gs 'stat'
@@ -1140,7 +1140,7 @@ $artemBibl = {
 	cls
 	minut += 30
 	lern += RAND(3,6)
-	pcs_intel += RAND(2,4)
+	intel_exp += RAND(2,4)
 	gs 'stat'
 	'<center><img src="images/qwest/alter/artom/walk/library.jpg"></center>'
 	'You do your homework in the library with Artem, and he sometimes goes to collect a book to explain something. It''s a very efficient study session, and you feel like you learned a lot in this short time.'

+ 1 - 1
locations/artemhome

@@ -258,7 +258,7 @@ if $ARGS[0] = 'inside':
 			artemtimes += 1
 			talkartemday = daystart
 			lern += rand(3, 6)
-			pcs_intel += rand(1, 2)
+			intel_exp += rand(1, 2)
 			minut += 60
 			pcs_mood += 10
 			gs 'stat'

+ 3 - 3
locations/bass

@@ -67,7 +67,7 @@ if $ARGS[0] = 'a':
 			pcs_mood += 5
 			pcs_willpwr += 5
 
-			if pcs_stren < 30:pcs_stren += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+			if pcs_stren < 30:stren_exp += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 
 			'<center><img src="images/qwest/kisame.jpg"></center>'
 			'Athlete put on a towel and walked up to you. He smiled and said "Hi sweetie My name is Kisame just for you Kitty!"'
@@ -139,7 +139,7 @@ if $ARGS[0] = 'a':
 			pcs_mood += 5
 			pcs_willpwr += 5
 
-			if pcs_stren < 40:pcs_stren += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+			if pcs_stren < 40:stren_exp += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 			if KisameSex = 0:KisameSex = 1 & Set guy += 1
 			gs 'boyStat', 40
 			spafinloc = 12
@@ -165,7 +165,7 @@ if $ARGS[0] = 'a':
 		pcs_mood += 5
 		pcs_willpwr += 5
 
-		if pcs_stren < 40:pcs_stren += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+		if pcs_stren < 40:stren_exp += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 
 		'<center><img src="images/pics/swim.jpg"></center>'
 		'You swim in the pool, the water refreshes and invigorates.'

+ 1 - 1
locations/bedrPar

@@ -148,7 +148,7 @@ if pcs_sewng >= 200:
 		act'Work on the tapestry for an hour':
 			cls
 			minut+=60
-			pcs_sewng += rand(0,1000)
+			sewng_exp += rand(0,1000)
 			gobramax = pcs_sewng / 100
 			gobramin = pcs_sewng / 200
 			newgobelen += rand(gobramin,gobramax)

+ 1 - 1
locations/beg

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 		pcs_mood -= 5
 		fat -= 5
 		pcs_sweat += 30
-		pcs_run += rand(1, 4)
+		run_exp += rand(1, 4)
 		'<center><img src="images/etogame/fit5.jpg"></center>'
 		'You spend two hours practicing 100 meter dashes to improve your speed, as well as doing several rounds around the stadium to work on your stamina. You are sweaty all over by the end of it, obviously, but you also feel that you''re a little better than before today''s training.'
 

+ 9 - 9
locations/beg1

@@ -69,7 +69,7 @@ end
 
 if $ARGS[0] = 'br':
 	cla
-	pcs_run += 1
+	run_exp += 1
 	fat -= 10
 	begplus = pcs_run + speed + pcs_vital + rand(1, 20)
 	begminus = salo/2 + rand(1, 20)
@@ -95,7 +95,7 @@ end
 
 if $ARGS[0] = '3':
 	cla
-	pcs_run += 1
+	run_exp += 1
 	fat -= 10
 	begplus = pcs_run + speed + pcs_vital + rand(1, 20)
 	begminus = salo/2 + rand(1, 20)
@@ -121,7 +121,7 @@ end
 
 if $ARGS[0] = '2':
 	cla
-	pcs_run += 1
+	run_exp += 1
 	fat -= 10
 	begplus = pcs_run + speed + pcs_vital + rand(1, 20)
 	begminus = salo/2 + rand(1, 20)
@@ -147,7 +147,7 @@ end
 
 if $ARGS[0] = '1':
 	cla
-	pcs_run += 1
+	run_exp += 1
 	fat -= 10
 	begplus = pcs_run + speed + pcs_vital + rand(1, 20)
 	begminus = salo/2 + rand(1, 20)
@@ -174,7 +174,7 @@ end
 
 if $ARGS[0] = 'kms':
 	cla
-	pcs_run += 1
+	run_exp += 1
 	fat -= 10
 	begplus = pcs_run + speed + pcs_vital + rand(1, 20)
 	begminus = salo/2 + rand(1, 20)
@@ -201,7 +201,7 @@ end
 
 if $ARGS[0] = 'ross':
 	cla
-	pcs_run += 1
+	run_exp += 1
 	fat -= 10
 	begplus = pcs_run + speed + pcs_vital + rand(1, 20)
 	begminus = salo + rand(1, 20)
@@ -229,7 +229,7 @@ end
 
 if $ARGS[0] = 'kval':
 	cla
-	pcs_run += 1
+	run_exp += 1
 	fat -= 10
 	razradbeg += 1
 	begplus = pcs_run + speed + pcs_vital + rand(1, 20)
@@ -256,7 +256,7 @@ end
 
 if $ARGS[0] = 'evro':
 	cla
-	pcs_run += 1
+	run_exp += 1
 	fat -= 10
 	razradbeg += 1
 	begplus = pcs_run + speed + pcs_vital + rand(1, 20)
@@ -301,7 +301,7 @@ end
 
 if $ARGS[0] = 'Int':
 	cla
-	pcs_run += 1
+	run_exp += 1
 	fat -= 10
 	razradbeg += 1
 	begplus = pcs_run + speed + pcs_vital + rand(1, 20)

+ 3 - 3
locations/bicycle

@@ -20,7 +20,7 @@ if $ARGS[0] = 'sarai':
 		        cls
 		        findvelday = daystart
 	            minut += 60
-		        pcs_run += RAND(0,2)
+		        run_exp += RAND(0,2)
 		        speed += rand(0,2)
 		        if salo > 0: salo -= 1
 		        fat -= 5
@@ -89,7 +89,7 @@ if $ARGS[0] = 'sarai':
 	    act 'Bike to the swamp (1:15)':
 		    cls
 		    minut += 75
-		    pcs_run += RAND(0,1)
+		    run_exp += RAND(0,1)
 		    speed += rand(0,1)
 		    if salo > 0: salo -= 1
 		    fat -= 1
@@ -172,7 +172,7 @@ if $ARGS[0] = 'swamp':
         if $clothingworntype ! 'nude' or exhibi > 0:	   
 		    cls
 	        minut += 75
-		    pcs_run += RAND(0,1)
+		    run_exp += RAND(0,1)
 		    speed += rand(0,1)
 		    if salo > 0: salo -= 1
 		    fat -= 1

+ 6 - 5
locations/body

@@ -374,11 +374,12 @@ if pcs_eyesize = 1:$glaza = 'You have medium-sized <<$pcs_eyecol>> eyes <<$pcs_l
 if pcs_eyesize = 2:$glaza = 'You have large <<$pcs_eyecol>> eyes <<$pcs_lashes>> and <<$brow>>.<<$glass>>'
 if pcs_eyesize = 3:$glaza = 'You have huge <<$pcs_eyecol>> eyes that almost look like they''re out of an anime, <<$pcs_lashes>> and <<$brow>>.<<$glass>>'
 
-if pcs_makeup = 0: mopkoef = -5 & $pcs_makeup = '<b><font color="red">Your makeup is smeared all over your face</font></b>'
-if pcs_makeup = 1: mopkoef = 0 & $pcs_makeup = 'You''re not wearing any kind of makeup'
-if pcs_makeup = 2: mopkoef = 5 & $pcs_makeup = 'Your makeup is light and subtle, with neutral tones to bring out your natural beauty'
-if pcs_makeup = 3: mopkoef = 10 & $pcs_makeup = 'Your makeup has some mildly vibrant tones, covering your minor imperfections and enhancing your best features'
-if pcs_makeup = 4: mopkoef = 20 & $pcs_makeup = 'Your makeup is thick enough to cover most imperfections, with rich shades drawing attention to your eyes and lips'
+mopkoef = pcs_makupskl / 5
+if mop = 0: mopkoef = -5 & $mop = '<b><font color="red">Your makeup is smeared all over your face</font></b>'
+if mop = 1: mopkoef = 0 & $mop = 'You''re not wearing any kind of makeup'
+if mop = 2: $mop = 'Your makeup is light and subtle, with neutral tones to bring out your natural beauty'
+if mop = 3: $mop = 'Your makeup has some mildly vibrant tones, covering your minor imperfections and enhancing your best features'
+if mop = 4: $mop = 'Your makeup is thick enough to cover most imperfections, with rich shades drawing attention to your eyes and lips'
 
 if pcs_leghair <= 0: legkoef = 0 & $pcs_leghair = 'You have smooth legs.'
 if pcs_leghair > 0 and pcs_leghair <= 2: legkoef = 3 & $pcs_leghair = 'You can''t see any hair, but your legs are rough to the touch'

+ 5 - 5
locations/body_shape

@@ -30,9 +30,9 @@ if $ARGS[0] = '':
 	if pcs_stren >= 26 and pcs_vital >= 26 and sftrstflag = 0:
 		if downmusl >= 5:
 			downmusl = 0
-			pcs_stren -= 1
-			pcs_vital -= 1
-			pcs_agil -= 1
+			stren_deg -= 1
+			vital_deg -= 1
+			agil_deg -= 1
 			fat += 5
 		else
 			downmusl += rand (0,1)
@@ -202,8 +202,8 @@ end
 			salo = 1
 			if fat > 1: fat -= 1
 		elseif fat <= 0 and pcs_stren + pcs_vital > 0:
-			pcs_stren -= 1
-			pcs_vital -= 1
+			stren_deg -= 1
+			vital_deg -= 1
 			salo = 1
 		else
 			if Enable_nogameover = 0:

+ 2 - 2
locations/brother

@@ -145,10 +145,10 @@ if $loc = 'gschool_grounds':
 					cls
 					minut += 60
 					npc_rel['A34'] += 5
-					pcs_agil += rand(0, 2)
+					agil_exp += rand(0, 2)
 					speed += rand(0, 2)
 					pcs_sweat += 30
-					pcs_run += rand(0, 2)
+					run_exp += rand(0, 2)
 					fat -= rand(2, 7)
 					gs 'stat'
 					'You spend an hour running around chasing the ball across the field with your brother and his friends Beshin and Zhendos.'

+ 1 - 1
locations/cafe2

@@ -37,7 +37,7 @@ end
 if $ARGS[0] = 'dance':
 	cla
 
-	if pcs_danc < 50 and pcs_agil >= pcs_danc:pcs_danc += 1
+	if pcs_danc < 50 and pcs_agil >= pcs_danc:danc_exp += 1
 
 	minut += 3
 	gs 'stat'

+ 2 - 2
locations/chessplay

@@ -7,8 +7,8 @@ if $ARGS[0] = '':
 	chess_com = 20
 	
 	chess_ind = (chessV - pcs_chess) / 100
-	pcs_chess += rand(pcs_intel/20,pcs_intel/10)
-	pcs_intel += 1
+	chess_exp += rand(pcs_intel/20,pcs_intel/10)
+	intel_exp += 1
 	minut += 60
 
 	gt 'chessplay', 'game'

+ 57 - 63
locations/cikl

@@ -6,14 +6,10 @@ hour -= 24
 
 !!moving the porn schedule ahead a day, flaffing for missed shootings, if it even matters
 if (film > 0 or pornstack = 1) and pfilmNO = 0 and pfilmSTOP = 0:
-	if pfilmday[0] > 0:gs 'pornschedule', 'pornmiss'
+	if pfilmday[0] > 0: gs 'pornschedule', 'pornmiss'
 	gs 'pornschedule', 'schedule'
 end
 
-age = year - ((pcs_dob - (pcs_dob mod 10000)) / 10000)
-if ((month * 100) + day) <= pcs_dob mod 10000: age -= 1
-if ((month * 100) + day) = pcs_dob mod 10000: vidage += 1
-if  pcs_dob mod 10000 = 229 and ((month * 100) + day) = 301 and Leapyear = 0: vidage += 1
 gs 'daystart'
 dynamic $hypnoDaychange
 
@@ -22,15 +18,24 @@ ringA = 0
 ringB = 0
 ringC = 0
 
-if BuyHous = 2 and ArendHouseSL <= 0:ArendHouseSL = 0 & BuyHous = 0 & housr = 0
-if BuyHous = 2 and ArendHouseSL > 0:ArendHouseSL -= 1
+if BuyHous = 2 and ArendHouseSL <= 0: ArendHouseSL = 0 & BuyHous = 0 & housr = 0
+if BuyHous = 2 and ArendHouseSL > 0: ArendHouseSL -= 1
 
+!!Appearance Age
 vidageday -= 1
-if workDolgDay > 0:workDolgDay -= 1
-if QWdogreiqTimer > 0:QWdogreiqTimer -= 1
-if husband > 0:husbanday += 1
-if husband > 10 and husbanday > 0:husband -= 15
-if fingal > 0:fingal -= 1
+if vidageday <= 0:
+	vidageday = 360
+	vidage += 1
+end
+!!Birthday
+age = year - ((pcs_dob - (pcs_dob mod 10000)) / 10000)
+if ((month * 100) + day) <= pcs_dob mod 10000: age -= 1
+
+if workDolgDay > 0: workDolgDay -= 1
+if QWdogreiqTimer > 0: QWdogreiqTimer -= 1
+if husband > 0: husbanday += 1
+if husband > 10 and husbanday > 0: husband -= 15
+if fingal > 0: fingal -= 1
 
 if husbandMark = 1 and husband <= 10:
 	husbizvradd = 0
@@ -44,7 +49,7 @@ if husbandMark = 1 and husband <= 10:
 	'<b><font color="red">Your husband has filed for a divorce.</font></b>'
 end
 
-if year_start ! year and katjaPreg = 0 and month >= 2:katjaPreg = 1
+if year_start ! year and katjaPreg = 0 and month >= 2: katjaPreg = 1
 
 !Clothing stock and price randomizers
 Clothingstock = rand (0,23)
@@ -92,8 +97,9 @@ end
 
 !Succubus Level & hunger calcs 
 if succubusflag = 1:
+
 	cheatHealth = 1
-		dynamic $cheatmenu['std_cure']
+	dynamic $cheatmenu['std_cure']
 
 !!	A Succubus cannot be a Bimbo
 	if bimbolevel > 0 and bimbo <= 0: bimbowithdrawal = 40
@@ -102,6 +108,8 @@ if succubusflag = 1:
 	if sucxpsnapshot >= succubxp: succhungry += 1
 	sucxpsnapshot = succubxp
 	if succubxp < 0: succubxp = 0
+
+!!	Level handling
 	if succubxp < 60:
 		succublvl = 1
 		$sucself1 = 'that feeling'
@@ -123,28 +131,33 @@ if succubusflag = 1:
 		sucstorecap = 200
 		if bimbolevel <= 0: supnatvnesh = 10
 	end
+
 	if sucskill >= 2 and succublvl >= 2: sucstorecap += 100
 	if sucskill >= 3 and succublvl >= 2: sucstorecap += (sucstorecap * 2) / 10
-	if mutagenP < (succublvl - 1): mutagenP = (succublvl - 1)
-	if mutagenS < (succublvl - 1): mutagenS = (succublvl - 1)
-	if mutagenA < (succublvl - 1): mutagenA = (succublvl - 1)
-	if mutagenR < (succublvl - 1): mutagenR = (succublvl - 1)
-	if mutagenV < (succublvl - 1): mutagenV = (succublvl - 1)
-	if mutagenW < (succublvl - 1): mutagenW = (succublvl - 1)
-	if mutagenI < (succublvl - 1): mutagenI = (succublvl - 1)
+
+	if stren_muta < (succublvl - 1): stren_muta = (succublvl - 1)
+	if agil_muta < (succublvl - 1): agil_muta = (succublvl - 1)
+	if vital_muta < (succublvl - 1): vital_muta = (succublvl - 1)
+	if intel_muta < (succublvl - 1): intel_muta = (succublvl - 1)
+	if react_muta < (succublvl - 1): react_muta = (succublvl - 1)
+	if sprt_muta < (succublvl - 1): sprt_muta = (succublvl - 1)
+	if chrsm_muta < (succublvl - 1): chrsm_muta = (succublvl - 1)
+	if prcptn_muta < (succublvl - 1): prcptn_muta = (succublvl - 1)
+
 	if (sucexcess >= 100 and (sucskill < 2 or succhungry > -2)) or (sucexcess >= 100 + sucstorecap and sucskill >= 2):
-		if pcs_stren < 250: pcs_stren += 1 & sucexcess -= 12
-		if speed < 250: speed += 1 & sucexcess -= 12
-		if pcs_agil < 250: pcs_agil += 1 & sucexcess -= 12
-		if pcs_react < 250: pcs_react += 1 & sucexcess -= 12
-		if pcs_vital < 250: pcs_vital += 1 & sucexcess -= 12
-		if pcs_sprt < 250: pcs_sprt += 1 & sucexcess -= 12
-		if pcs_intel < 250: pcs_intel += 1 & sucexcess -= 12
+		if pcs_stren < 250: stren_exp += 20 & sucexcess -= 10
+		if pcs_agil < 250: agil_exp += 20 & sucexcess -= 10
+		if pcs_vital < 250: vital_exp += 20 & sucexcess -= 10
+		if pcs_intel < 250: intel_exp += 20 & sucexcess -= 10
+		if pcs_react < 250: react_exp += 20 & sucexcess -= 10
+		if pcs_sprt < 250: sprt_exp += 20 & sucexcess -= 10
+		if pcs_chrsm < 250: chrsm_exp += 20 & sucexcess -= 10
+		if pcs_prcptn < 250: prcptn_exp += 20 & sucexcess -= 10
 		if succhungry > (0 - 2 - succublvl): succhungry -= 1 & sucexcess -= 10
-		if pcs_skin < 100: pcs_skin += 1 & sucexcess -= 2
+		if skinvan < 100: skinvan += 1 & sucexcess -= 2
 !!		This is to drive the Succubus vidage into the max appearance range
-		if vidageday < 720 and vidage >= 28: vidageday += 2 & sucexcess -= 2
-		if vidageday > 0 and vidage <= 20: vidageday -= 2 & sucexcess -= 2
+		if vidageday < 720 and vidage >= 28: vidageday += 4 & sucexcess -= 4
+		if vidageday > 0 and vidage <= 20: vidageday -= 4 & sucexcess -= 4
 		if vidageday >= 720 and vidage > 28:
 			vidageday -= 360
 			vidage -= 1
@@ -200,12 +213,12 @@ if defcurly = 1:
 end
 
 ! WD: Added daily reduction of braids for Maruda Hair Mod
-if hbraids > 0:hbraids -= 1
+if hbraids > 0: hbraids -= 1
 
 
 pcs_sweat += 2
 
-if pcs_tan > 0:pcs_tan -= 1
+if pcs_tan > 0: pcs_tan -= 1
 
 if prezikmsg = 2: prezikmsg = 3
 
@@ -384,16 +397,6 @@ if pcs_breath = 1:pcs_breath = 0
 
 if cheatNoEat = 1 and dounspell = 1:fat += 15
 
-if pcs_run >= 2000:
-	pcs_run -= 4
-elseif pcs_run >= 1500:
-	pcs_run -= 3
-elseif pcs_run >= 1000:
-	pcs_run -= 2
-elseif pcs_run >= 100:
-	pcs_run -= 1
-end
-
 !STD check
 if SifacOnce = 1:Sifilis += 1
 if GerpesOnce = 1:Gerpes += 1
@@ -409,12 +412,6 @@ if TriperOnce = 1:VeneraN += 1
 
 Venera = VeneraN
 
-!Appearance age
-if vidageday <= 0:
-	vidageday = 360
-	vidage += 1
-end
-
 if pcs_ass > 1 and ashrink > 0 and analplugIN = 0:
 	if anusK < 0:anusK = 0
 	if anusK < ashrinkdays:anusK += 1
@@ -663,7 +660,9 @@ if GspravkaT = 1:Gspravka -= 1
 if IvanPodstavaQW = 2 and PodpiskaNeviezd = 30:IvanPodstavaQW = 3
 if IvanPodstavaQW = 2 and PodpiskaNeviezd > 0 and PodpiskaNeviezd < 30:PodpiskaNeviezd += 1
 
-If dounspell = 1:
+gs 'stat_sklattrib', 'daycall'
+
+if dounspell = 1:
 	if strenbuf > 90:
 		strenbuf -= 2
 	elseif strenbuf > 80:
@@ -676,12 +675,12 @@ If dounspell = 1:
 		vitalbuf -= 1
 	end
 
-	if strenbuf > pcs_stren:strenbuf -= 1
-	if strenbuf < pcs_stren:strenbuf += 1
-	if vitalbuf > pcs_vital:vitalbuf -= 1
-	if vitalbuf < pcs_vital:vitalbuf += 1
-	if agilbuf > pcs_agil:agilbuf -= 1
-	if agilbuf < pcs_agil:agilbuf += 1
+	if strenbuf > pcs_stren: strenbuf -= 1
+	if strenbuf < pcs_stren: strenbuf += 1
+	if vitalbuf > pcs_vital: vitalbuf -= 1
+	if vitalbuf < pcs_vital: vitalbuf += 1
+	if agilbuf > pcs_agil: agilbuf -= 1
+	if agilbuf < pcs_agil: agilbuf += 1
 else
 	gs 'body_shape'
 end
@@ -960,11 +959,6 @@ if storyline = 1:
 	end
 end
 
-if birthday = day and birthmonth = month:
-	!!birthday
-	age += 1
-end
-
 if bcream_used >= 1:
     bcream_used = 0
     temp = rand(0,5)
@@ -988,7 +982,7 @@ elseif mentats_dose > 1:
     mentats_dose = 0
 end
 if breastpumped = 0 and breastcount > 0: breastcount -= 1
-if breastpumped = 1:breastpumped = 0
+if breastpumped = 1: breastpumped = 0
 
 !!Appearance base calculation call
 gs 'body_shape', 'basebeautycalc'
@@ -1000,7 +994,7 @@ horse_river = 0
 haying_time = 0
 mira_go_river = 0
 forestpicnic = 0
-if Mira_no > 0:Mira_no -= 1
+if Mira_no > 0: Mira_no -= 1
 
 --- cikl ---------------------------------
 

+ 2 - 2
locations/club

@@ -273,7 +273,7 @@ if $ARGS[0] = 'dance':
 			*clr
 			minut += 30
 			fat -= 1
-			pcs_danc += 1
+			danc_exp += 1
 			pcs_mood += 10
 			pcs_willpwr += 10
 			clrand = rand(0, 400)
@@ -1137,7 +1137,7 @@ if $ARGS[0] = 'work':
 			cla
 			*clr
 			hour += 1
-			pcs_danc += rand (1,3)
+			danc_exp += rand (1,3)
 			'<center><img src="images/etogame/club12.jpg"></center>'
 			if pcs_danc > rand (30, 100):
 				money += 300

+ 9 - 9
locations/danceclass

@@ -18,7 +18,7 @@ act 'Modern dance class (2:00)':
 	speed+= rand(1, 3)
 	pcs_mood -= 5
 	pcs_sweat += 30
-	pcs_danc += rand(5, 15)
+	danc_exp += rand(5, 15)
 	'<center><img src="images/etogame/fit1.jpg"></center>'
 
 	if pcs_danc < 100:'You studied modern dance, which is very popular in clubs.'
@@ -32,19 +32,19 @@ act 'Striptease class (2:00)':
 	*clr
 	minut += 120
 	fat -= 5
-	pcs_agil+= rand(1, 3)
+	agil_exp += rand(1, 3)
 	pcs_mood -= 8
 	pcs_sweat += 30
-	!!pcs_dancero += 1
+	!!dancero_exp += 1
 	'<center><img src="images/etogame/stripdance.jpg"></center>'
 
 	if pcs_danc >= 100:
-		pcs_dancero += rand(2, 10)
+		dancero_exp += rand(2, 10)
 		'You studied the art of burlesque, imaging yourself stripping to the music.'
 
 		if pcs_dancero >= 100:'But there is nothing more worth learning, since you have already mastered the art.'
 	elseif pcs_danc < 100:
-		pcs_danc += rand(5, 15)
+		danc_exp += rand(5, 15)
 		'This isn''t just taking clothes off, it''s a difficult dance style and your basics aren''t upto the task. The teacher recommends that you work on your modern dancing first.'
 	end
 
@@ -56,15 +56,15 @@ act 'Pole dancing class (2:00)':
 	*clr
 	minut += 120
 	fat -= 10
-	pcs_stren += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
-	pcs_vital += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+	stren_exp += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+	vital_exp += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 	pcs_mood -= 5
 	pcs_sweat += 30
-	!!pcs_dancpol += 1
+	!!dancpol_exp += 1
 	'<center><img src="images/etogame/poledance.jpg"></center>'
 
 	if pcs_danc >= 100 and pcs_dancero >= 100 and pcs_stren >= 80:
-		pcs_dancpol += rand(2, 5)
+		dancpol_exp += rand(2, 5)
 		'You studied various acrobatics on the pole.'
 
 		if pcs_dancpol >= 100:'But you could not learn anything new, you''re already a master of the art.'

+ 4 - 4
locations/din_bad

@@ -607,14 +607,14 @@ $dinalkowin1 = {
 	else
 		water += 10
 	end
-    if pcs_intel  > 5 : pcs_intel -= 1
+    if pcs_intel  > 5 : intel_deg -= 1
     alko += 5
 	cumspclnt = 2
 	gs 'cum_cleanup' 
 	pcs_breath = 0
     gs'stat'
-    view 'images/pic/alkowin.jpg'
-    
+	view 'images/pic/alkowin.jpg'
+
     'You take the bottle of wine out of your purse and slowly drink half of it.'
 }
 
@@ -626,7 +626,7 @@ $dinalkowin2 = {
 		water += 10
 	end
     wine = 0
-    if pcs_intel > 5: pcs_intel -= 1
+    if pcs_intel > 5: intel_deg -= 1
     alko += 5
 	cumspclnt = 2
 	gs 'cum_cleanup'

+ 2 - 2
locations/dina

@@ -183,9 +183,9 @@ $hypnoAddiction = {
 	
 	if hypnoWithdrawal > 0 and missCum >= timeTresh and pcs_sprt > 0:
 		if hypnoWithdrawal = 1:
-			pcs_sprt -= 1
+			sprt_deg -= 1
 		else
-			pcs_sprt -= 2
+			sprt_deg -= 2
 		end
 	end
 }

+ 4 - 4
locations/dk

@@ -90,7 +90,7 @@ if $ARGS[0] = 'holl':
 				cls
 				alexeyQW += 1
 				minut += 60
-				pcs_vokal += 1
+				vokal_exp += 1
 				vokalday = daystart
 				pcs_horny += 30
 				gs 'stat'
@@ -149,7 +149,7 @@ if $ARGS[0] = 'holl':
 				money -= 500
 				minut += 60
 				alexeyQW += 1
-				pcs_vokal += 1
+				vokal_exp += 1
 				vokalday = daystart
 				gs 'stat'
 				'You and your teacher Alexei engage in vocal training for an hour. Nothing he does, not even the way he looks at you would suggest that he had filled all of your holes after your last session.'
@@ -160,7 +160,7 @@ if $ARGS[0] = 'holl':
 			act 'Singing lesson - 500 <b>₽</b> (1:00)':
 				cls
 				alexeyQW += 1
-				pcs_vokal += 1
+				vokal_exp += 1
 				vokalday = daystart
 				gs 'stat'
 				'You enter Alexei''s office. He looks at you with guilt in his eyes. "I''m sorry, <<$pcs_nickname>>, I''m a musician and an artist first and foremost... but sometimes, I''m no better than a drunk redneck."'
@@ -194,7 +194,7 @@ if $ARGS[0] = 'holl':
 				minut += 60
 				money -= 500
 				alexeyQW += 1
-				pcs_vokal += 1
+				vokal_exp += 1
 				vokalday = daystart
 				gs 'stat'
 				!!'<center><img src="images/etogame/dk2.jpg"></center>'

+ 1 - 1
locations/dom_gor

@@ -22,7 +22,7 @@ if $clothingworntype = 'exercise' and teachlevel > 20 and parkrunday ! daystart
 		minut += 30
 		pcs_mood += 10
 		pcs_willpwr -= 10
-		pcs_run += 1
+		run_exp += 1
 		fat -= 8
 		speed += 1
 		pcs_sweat += 30

+ 6 - 6
locations/etoexhib

@@ -534,7 +534,7 @@ if $ARGS[0] = 'pos16':
 			pcs_mood += 5
 			pcs_willpwr += 5
 
-			if pcs_stren < 30:pcs_stren += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+			if pcs_stren < 30:stren_exp += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 
 			'<center><img src="images/pics/swim.jpg"></center>'
 			'You swim in the lake, the water refreshes and invigorates you.'
@@ -555,7 +555,7 @@ if $ARGS[0] = 'pos16':
 			pcs_willpwr += 5
 			pcs_horny += 10
 
-			if pcs_stren < 30:pcs_stren += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+			if pcs_stren < 30:stren_exp += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 
 			'<center><img src="images/etogame/lakenude.jpg"></center>'
 			'You swim in the lake completely naked, the water refreshes and invigorates you.'
@@ -606,7 +606,7 @@ if $ARGS[0] = 'pos18':
 				minut += 30
 				fat -= 1
 
-				if pcs_danc < 50 and pcs_agil >= pcs_danc:pcs_danc += 1
+				if pcs_danc < 50 and pcs_agil >= pcs_danc:danc_exp += 1
 
 				pcs_mood += 10
 				pcs_willpwr += 10
@@ -666,7 +666,7 @@ if $ARGS[0] = 'pos18':
 				minut += 30
 				fat -= 1
 
-				if pcs_danc < 50 and pcs_agil >= pcs_danc:pcs_danc += 1
+				if pcs_danc < 50 and pcs_agil >= pcs_danc:danc_exp += 1
 
 				pcs_mood += 10
 				pcs_willpwr += 10
@@ -1169,8 +1169,8 @@ if $ARGS[0] = 'pos27':
 			minut += 60
 			pcs_mood -= 5
 
-			if mentats_dose > 0:pcs_intel += mentats_dose - rand(0,mentats_dose)
-			if pcs_intel < 80:pcs_intel += 1 + (mentats_dose - rand(0,mentats_dose))
+			if mentats_dose > 0:intel_exp += mentats_dose - rand(0,mentats_dose)
+			if pcs_intel < 80:intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
 			if $clothingworntype = 'office' and (pcs_makeup = 1 or pcs_makeup = 2) and teachlevel < 70:teachlevel += 1
 			if pcs_makeup = 4:teachlevel -= 1
 

+ 9 - 9
locations/events

@@ -53,8 +53,8 @@ if $ARGS[0] = 'read':
 				if pcs_nerd > 0:
 					pcs_mood = 100
 
-					if pcs_stren > 1:pcs_stren -= 1
-					if pcs_vital > 5:pcs_vital -= 1
+					if pcs_stren > 1:stren_deg -= 1
+					if pcs_vital > 5:vital_deg -= 1
 					'For an hour you enthusiastically read the book, completely immersed in the authors world.'
 				else
 					pcs_mood += 10
@@ -93,8 +93,8 @@ if $ARGS[0] = 'read':
 					pcs_mood = 100
 					pcs_horny += 10
 
-					if pcs_stren > 1:pcs_stren -= 1
-					if pcs_vital > 5:pcs_vital -= 1
+					if pcs_stren > 1:stren_deg -= 1
+					if pcs_vital > 5:vital_deg -= 1
 
 					'For an hour you enthusiastically read the book, completely immersed in the story.'
 				else
@@ -168,7 +168,7 @@ if $ARGS[0] = 'read':
 					knitmag = 0
 					pcs_mood += 5
 					minut += 30
-					if pcs_sewng <= 100: pcs_sewng += rand(1,3)
+					if pcs_sewng <= 100: sewng_exp += rand(1,3)
 					'You relax for half an hour reading your knitting magazine.'
 					act 'Return':gt $loc, $Metka
 				end
@@ -260,7 +260,7 @@ if $ARGS[0] = 'hula':
 	*clr
 	minut += 15
 	obruchday = daystart
-	pcs_agil += 1
+	agil_exp += 1
 	pcs_sweat += 10
 	pcs_mood -= 5
 	fat -= 1
@@ -275,7 +275,7 @@ if $ARGS[0] = 'yoga':
 	*clr
 	minut += 15
 	bookYogday = daystart
-	pcs_sprt += 1
+	sprt_exp += 1
 	pcs_mood += 5
 
 	if $clothingworntype ! 'nude':
@@ -319,7 +319,7 @@ if $ARGS[0] = 'press':
 	*clr
 	minut += 15
 	pressday = daystart
-	pcs_vital += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+	vital_exp += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 	pcs_sweat += 15
 	pcs_mood -= 5
 	fat -= 1
@@ -342,7 +342,7 @@ if $ARGS[0] = 'push':
 	*clr
 	minut += 15
 	pushday = daystart
-	pcs_stren += 1 + (steroid_dose - rand(0,steroid_dose)) & clit_size + rand(0,(steroid_dose - rand(0,steroid_dose)))
+	stren_exp += 1 + (steroid_dose - rand(0,steroid_dose)) & clit_size + rand(0,(steroid_dose - rand(0,steroid_dose)))
 	pcs_sweat += 15
 	pcs_mood -= 5
 	fat -= 1

+ 11 - 11
locations/fit

@@ -244,7 +244,7 @@ if $ARGS[0] = 'gym':
 		*clr
 		minut += 120
 		fat -= 10
-		pcs_react += rand(1, 3)
+		react_exp += rand(1, 3)
 		pcs_mood -= 5
 		pcs_sweat += 30
 
@@ -258,7 +258,7 @@ if $ARGS[0] = 'gym':
 		cla
 		*clr
 		minut += 120
-		pcs_stren += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+		stren_exp += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 		fat -= 1
 		pcs_mood -= 5
 		pcs_sweat += 30
@@ -273,7 +273,7 @@ if $ARGS[0] = 'gym':
 		cla
 		*clr
 		minut += 120
-		pcs_vital += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+		vital_exp += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 		pcs_mood -= 5
 		fat -= 2
 		pcs_sweat += 30
@@ -288,7 +288,7 @@ if $ARGS[0] = 'gym':
 		cla
 		*clr
 		minut += 120
-		pcs_agil += rand(1, 3)
+		agil_exp += rand(1, 3)
 		fat -= 5
 		pcs_mood -= 5
 		pcs_sweat += 20
@@ -450,7 +450,7 @@ if $ARGS[0] = 'kickboxing':
 		pcs_mood -= 5
 		fat -= 4
 		pcs_sweat += 30
-		pcs_jab += rand(1, 3)
+		jab_exp += rand(1, 3)
 		'<center><img src="images/etogame/kik1.jpg"></center>'
 		'You practice your jabs on the speed bag and double-end bag, straight punches with a step forward. These strikes are not so powerful, but they are fast.'
 
@@ -461,11 +461,11 @@ if $ARGS[0] = 'kickboxing':
 		cla
 		*clr
 		minut += 120
-		pcs_stren += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+		stren_exp += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 		pcs_mood -= 5
 		fat -= 4
 		pcs_sweat += 30
-		pcs_punch += rand(1, 3)
+		punch_exp += rand(1, 3)
 		'<center><img src="images/etogame/kik1.jpg"></center>'
 		'You practice your power punches on the heavy bag. These are high impact and powerful, but they are hard to get to their target.'
 
@@ -476,11 +476,11 @@ if $ARGS[0] = 'kickboxing':
 		cla
 		*clr
 		minut += 120
-		pcs_stren += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+		stren_exp += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 		pcs_mood -= 5
 		fat -= 4
 		pcs_sweat += 30
-		pcs_kick += rand(1, 3)
+		kick_exp += rand(1, 3)
 		'<center><img src="images/etogame/kik1.jpg"></center>'
 		'You practice your powerful kicks on a kickboxing bag. These impacts are very powerful and able to cut down an opponant, but are very difficult to hit with.'
 
@@ -491,11 +491,11 @@ if $ARGS[0] = 'kickboxing':
 		cla
 		*clr
 		minut += 120
-		pcs_agil += rand(1, 3)
+		agil_exp += rand(1, 3)
 		pcs_mood -= 5
 		fat -= 4
 		pcs_sweat += 30
-		pcs_def += rand(1, 3)
+		def_exp += rand(1, 3)
 		'<center><img src="images/etogame/kik1.jpg"></center>'
 		'You practice your defense movements.'
 

+ 1 - 1
locations/gLakeNude

@@ -81,7 +81,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 				pcs_sweat = 10 + rand(0,4)
 				pcs_mood += 5
 				pcs_willpwr = pcs_willpwr + 5
-				if pcs_stren < 30:pcs_stren = pcs_stren + 1
+				if pcs_stren < 30: stren_exp += 1
 
 				if $clothingworntype = 'nude':
 					'<center><img src="images/img/lake/nudeswim.jpg"></center>'

+ 12 - 12
locations/gadfield

@@ -46,9 +46,9 @@ if $ARGS[0] = 'field':
 			    'Most of the village has shown up to help out with the hay. You and Mira also partake in the activities. You are really enjoying yourself, especially considering you spending time, sitting on the fresh cut hay, talking to Mira.'
 			else
 			    fat -= 5
-			    pcs_stren += 1
-			    pcs_agil += 1
-			    pcs_vital += 1
+			    stren_exp += 1
+			    agil_exp += 1
+			    vital_exp += 1
 			    pcs_sweat += 20
 			    '<center><img src="images/qwest/gadukino/gadfield/haying_time.jpg"></center>'
 			    'Almost all of the villagers have shown up to help out with the fresh cut hay. You decide to join them.'
@@ -155,7 +155,7 @@ if $ARGS[0] = 'cow':
 		            minut += 60
 		            if salo > 3:salo -= RAND(1,3)
 		            fat -= 5
-		            pcs_run += 1
+		            run_exp += 1
 		            sweat += 10
                     pcs_mood += 5
                     if temper >= 30 and sunWeather = 1:water -= 24
@@ -225,8 +225,8 @@ if $ARGS[0] = 'cow':
 		                pcs_nerd += 1
 		                blizoruk += 1
 		                pcs_mood = 100
-		                if pcs_stren > 1: pcs_stren -= 1
-		                if pcs_vital > 5: pcs_vital -= 1
+		                if pcs_stren > 1: stren_deg -= 1
+		                if pcs_vital > 5: vital_deg -= 1
 		                gs 'stat'
 		                 'You start reading a book you brought with you. You are so engrossed in the story you forget about the time.'
 	                else
@@ -319,7 +319,7 @@ if $ARGS[0] = 'cow2':
 			        sweat = 10 + rand(0,4)
 			        pcs_mood += 5
 			        pcs_willpwr += 5
-			        if pcs_stren < 30:pcs_stren += 1
+			        if pcs_stren < 30:stren_exp += 1
                     gs 'stat'
 
                     '<center><img src="images/qwest/gadukino/gadfield/graze_cow_river.jpg"></center>'
@@ -356,8 +356,8 @@ if $ARGS[0] = 'cow2':
 		                pcs_nerd += 1
 		                blizoruk += 1
 		                pcs_mood = 100
-		                if pcs_stren > 1: pcs_stren -= 1
-		                if pcs_vital > 5: pcs_vital -= 1
+		                if pcs_stren > 1: stren_deg -= 1
+		                if pcs_vital > 5: vital_deg -= 1
 		                gs 'stat'
 		                'You start reading a book you brought with you. You are so engrossed in the story you forget about the time.'
 	                else
@@ -424,7 +424,7 @@ if $ARGS[0] = 'cow3':
 		            minut += 60
 		            if salo > 3:salo -= RAND(1,3)
 		            fat -= 5
-		            pcs_run += 1
+		            run_exp += 1
 		            sweat += 10
                     pcs_mood += 5
                     if temper >= 30 and sunWeather = 1:water -= 24
@@ -494,8 +494,8 @@ if $ARGS[0] = 'cow3':
 		                pcs_nerd += 1
 		                blizoruk += 1
 		                pcs_mood = 100
-		                if pcs_stren > 1: pcs_stren -= 1
-		                if pcs_vital > 5: pcs_vital -= 1
+		                if pcs_stren > 1: stren_deg -= 1
+		                if pcs_vital > 5: vital_deg -= 1
 		                gs 'stat'
 		                'You start reading a book you brought with you. You are so engrossed in the story you forget about the time.'
 	                else

+ 4 - 4
locations/gadforestswamp

@@ -106,8 +106,8 @@ if $ARGS[0] = '2':
    	    *clr
 	    minut += 10
 	    swamprand = pcs_stren + pcs_agil
-	    pcs_stren += rand(0,1)
-	    pcs_agil += rand(0,1)
+	    stren_exp += rand(0,1)
+	    agil_exp += rand(0,1)
 	    pcs_sweat += 30
 	    temp = RAND(1,100)
 	    gs 'stat'
@@ -126,8 +126,8 @@ if $ARGS[0] = '2':
    	    *clr
 	    minut += 10
 	    swamprand = pcs_stren + pcs_agil
-	    pcs_stren += rand(0,1)
-	    pcs_agil += rand(0,1)	    
+	    stren_exp += rand(0,1)
+	    agil_exp += rand(0,1)	    
 	    pcs_sweat += 30
 	    temp = RAND(1,100)
 	    gs 'stat'

+ 4 - 4
locations/gadriver

@@ -237,7 +237,7 @@ if $ARGS[0] = 'Gadbitch':
 				pcs_mood += 5
 				pcs_willpwr += 5
 				temp = RAND(0,9)
-				if pcs_stren < 30:pcs_stren += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+				if pcs_stren < 30:stren_exp += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 				if hour >= 22 or hour <= 6:
 					if RAND(0,10) < 5 and MiraLoc = 1:
 						'<center><img src="images/qwest/gadukino/river/rivertwogirls.jpg"></center>'
@@ -314,7 +314,7 @@ if $ARGS[0] = 'Gadbitch':
 			pcs_sweat = 10 + rand(0,4)
 			pcs_mood += 5
 			pcs_willpwr = pcs_willpwr + 5
-			if pcs_stren < 30:pcs_stren = pcs_stren + 1
+			if pcs_stren < 30: stren_exp += 1
 			if hour >= 22 and hour <= 6:
 				'<center><img src="images/qwest/gadukino/river/watergirls1.jpg"></center>'
 				'You strip your clothes off and slowly step in to the cold river, kwowing that the darkness hides your nudity. You swim around feeling the refreshing and invigorating water caressing your body.'
@@ -952,13 +952,13 @@ if $ARGS[0] = 'fishing':
 					*clr
 					minut += 1
 					temp = RAND(0,120)
-					if temp < 50:pcs_react += 1
+					if temp < 50:react_exp += 1
 					gs 'stat'
 					
 					if pcs_react > temp:
 						pcs_mood += rand(5,10)
 						minut += 1
-						pcs_react += 1
+						react_exp += 1
 						fish += 1
 						gs 'stat'
 						'<center><img src="images/qwest/gadukino/river/fishyes.jpg"></center>'

+ 1 - 1
locations/gadroad

@@ -33,7 +33,7 @@ if $clothingworntype = 'exercise' and hour >= 6 and hour < 22 and daybegskver !
 		minut += 60
 		if salo > 3:salo -= RAND(1,3)
 		fat -= RAND(5,15)
-		pcs_run += RAND(3,6)
+		run_exp += RAND(3,6)
 		pcs_sweat += 20
 		daybegskver = daystart
 		gs'stat'

+ 6 - 6
locations/gdkbibl

@@ -29,11 +29,11 @@ if hour >= 8 and hour <= 18:
 		end
 		minut += 60
 		if pcs_intel >= 50:
-			pcs_intel += RAND(0,1) + (mentats_dose - rand(0,mentats_dose))
+			intel_exp += RAND(0,1) + (mentats_dose - rand(0,mentats_dose))
 		elseif pcs_intel >= 25:
-			pcs_intel += RAND(1,2) + (mentats_dose - rand(0,mentats_dose))
+			intel_exp += RAND(1,2) + (mentats_dose - rand(0,mentats_dose))
 		else
-			pcs_intel += RAND(1,3) + (mentats_dose - rand(0,mentats_dose))
+			intel_exp += RAND(1,3) + (mentats_dose - rand(0,mentats_dose))
 		end
 
 		blizoruk += 1
@@ -79,11 +79,11 @@ if hour >= 8 and hour <= 18:
 		end
 		minut += 60
 		if pcs_sprt >= 50:
-			pcs_sprt += RAND(0,1)
+			sprt_exp += RAND(0,1)
 		elseif pcs_sprt >= 25:
-			pcs_sprt += RAND(1,2)
+			sprt_exp += RAND(1,2)
 		else
-			pcs_sprt += RAND(1,3)
+			sprt_exp += RAND(1,3)
 		end
 
 		blizoruk += 1

+ 5 - 5
locations/gdkin

@@ -48,7 +48,7 @@ if $ARGS[0] = '':
 			minut += 5
 			!!fat -= 1
 
-			if pcs_danc < 50 and pcs_agil >= pcs_danc:pcs_danc += 1
+			if pcs_danc < 50 and pcs_agil >= pcs_danc:danc_exp += 1
 
 			pcs_mood += 10
 			pcs_willpwr += 10
@@ -306,7 +306,7 @@ end
 if $ARGS[0] = 'dance_vrp':
 	cls
 	minut += 5
-	if pcs_danc < 50 and pcs_agil >=pcs_danc:pcs_danc += 1
+	if pcs_danc < 50 and pcs_agil >=pcs_danc:danc_exp += 1
 	gs 'stat'
 	'<center><img src="images/etogame/club_dance5.jpg"></center>'
 	'You accepted the offer, the guy took you by the hand and brought you out onto the dance floor, where you started dancing together.'
@@ -346,7 +346,7 @@ if $ARGS[0] = 'dance_vrp':
 			'<center><img src="images/etogame/club_dance3.jpg"></center>'
 			if tanga=0 and PCloSkirt > 2: *clr & '<center><img src="images/etogame/club_dance4.jpg"></center>' & 
 			'Trying to move your body as erotically as possible, you lean forward while doing a complex dance move, completely forgetting that you''re not wearing panties. Now your dance partner knows as well and it seems he will likely never forget.'
-			pcs_danc += 1
+			danc_exp += 1
 			gs 'stat'
 			act 'Further':gt'gdkin'
 
@@ -396,7 +396,7 @@ if $ARGS[0] = 'dance_vrp':
 
 					if alko <= 2 and pcs_horny <= 75:
 						act 'Refuse':
-							if pcs_sprt <= 30: pcs_sprt += rand(0, 1)
+							if pcs_sprt <= 30: sprt_exp += rand(0, 1)
 							gt 'gdkin'
 						end
 					end
@@ -413,7 +413,7 @@ if $ARGS[0] = 'dance_vrp':
 		gs 'stat'
 		if alko <= 2 and pcs_horny <= 75:
 			act 'Refuse':
-				if pcs_sprt <= 30: pcs_sprt += rand(0, 1)
+				if pcs_sprt <= 30: sprt_exp += rand(0, 1)
 				gt 'gdkin'
 			end
 		end

+ 59 - 45
locations/gdksport

@@ -161,14 +161,14 @@ if $ARGS[0] = 'dance2':
 	minut += 120
 	fat -= 5
 
-	if pcs_agil< 50:pcs_agil += rand(1, 3)
-	if pcs_agil >= 50 and pcs_agil < 80:pcs_agil += rand(0, 2)
-	if pcs_agil >= 80:pcs_agil += rand(0, 1)
+	if pcs_agil< 50:agil_exp += rand(1, 3)
+	if pcs_agil >= 50 and pcs_agil < 80:agil_exp += rand(0, 2)
+	if pcs_agil >= 80:agil_exp += rand(0, 1)
 
 	pcs_mood -= 5
 	pcs_sweat += 30
 
-	if pcs_danc < pcs_agil and pcs_danc < 75:pcs_danc += rand(0,2)
+	if pcs_danc < pcs_agil and pcs_danc < 75:danc_exp += rand(0,2)
 
 	gs 'stat'
 	'<center><img src="images/etogame/fit1.jpg"></center>'
@@ -387,27 +387,27 @@ if $ARGS[0] = 'starlets':
 	cls
 	minut += 120
 	fat -= 5
-	if pcs_agil < 50: pcs_agil += rand(1, 3)
-	if pcs_agil >= 50 and pcs_agil < 80: pcs_agil += rand(0, 2)
-	if pcs_agil >= 80:pcs_agil += rand(0,1)
+	if pcs_agil < 50: agil_exp += rand(1, 3)
+	if pcs_agil >= 50 and pcs_agil < 80: agil_exp += rand(0, 2)
+	if pcs_agil >= 80:agil_exp += rand(0,1)
 
 	pcs_mood -= 5
 	pcs_sweat += 30
-	pcs_dancero += rand(1, 3)
+	dancero_exp += rand(1, 3)
 	gs 'stat'
 	'<center><img src="images/etogame/fit1.jpg"></center>'
 
 	if pcs_dancero < 20:
 		sub += 1
 		'You train together with the girls in "The Starlets". You danced badly and Albina constantly yelled at you and called you a bowlegged cow.'
-	elseif pcs_dancero >= 20 and pcs_dancero < 40:
+	elseif pcs_dancero < 40:
 		sub += 1
 		'You train together with the girls of "The Starlets". You sometimes managed to get the moves right, but most of the time you were out of synch or made the wrong move. Albina constantly yelled at you and called you a bowlegged cow.'
-	elseif pcs_dancero >= 40 and pcs_dancero < 60:
+	elseif pcs_dancero < 60:
 		'You train together with the girls of "The Starlets". You managed to get into the general rhythm and moved well with the other girls, but Albina is still not happy. "<<$pcs_nickname>>, you are very sluggish, you need to put more life into it."'
-	elseif pcs_dancero >= 60 and pcs_dancero < 80:
+	elseif pcs_dancero < 80:
 		'You train together with the girls of "The Starlets". You had the routine down pat with no mistakes, but Albina still nagged at you. "<<$pcs_nickname>>, you are not at a funeral, raise your head and smile!"'
-	elseif pcs_dancero >= 80:
+	else
 		stardance += 1
 		'You danced beautifully and Albina started to use you as an example for the other girls.'
 
@@ -570,7 +570,7 @@ if $ARGS[0] = 'racing2':
 
 	fat -= 5
 	pcs_sweat += 30
-	pcs_run += rand(0,2)
+	run_exp += rand(0,2)
 	gs 'stat'
 	'<center><img src="images/etogame/parkbeg.jpg"></center>'
 	'You spend 20 minutes on warm up, run for 90 minutes then spend 10 minutes on your cool down.'
@@ -587,21 +587,35 @@ if $ARGS[0] = 'vball2':
 
 	if alko = 0:
 		trenerepa += rand(0,2)
-		pcs_vball += rand(1, 3)
+		vball_exp += rand(1, 3)
 		speed += rand(0,2)
-		pcs_run += rand(0,2)
-
-		if pcs_agil < 50:pcs_agil += rand(1, 3)
-		if pcs_agil >= 50 and pcs_agil < 80:pcs_agil += rand(0, 2)
-		if pcs_agil >= 80:pcs_agil += rand(0, 1)
-		if pcs_stren < 10:pcs_stren += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
-		if pcs_stren >= 10 and pcs_stren < 20:pcs_stren += rand(1, 2) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
-		if pcs_stren >= 20 and pcs_stren < 30:pcs_stren += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
-		if pcs_stren >= 30 and pcs_stren < 40:pcs_stren += rand(0, 1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
-		if pcs_vital < 10:pcs_vital += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
-		if pcs_vital >= 10 and pcs_vital < 20:pcs_vital += rand(1, 2) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
-		if pcs_vital >= 20 and pcs_vital < 30:pcs_vital += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
-		if pcs_vital >= 30 and pcs_vital < 40:pcs_vital += rand(0, 1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+		run_exp += rand(0,2)
+
+		if pcs_agil < 50:
+			agil_exp += rand(1, 3)
+		elseif pcs_agil < 80:
+			agil_exp += rand(0, 2)
+		else
+			agil_exp += rand(0, 1)
+		end
+		if pcs_stren < 10:
+			stren_exp += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+		elseif pcs_stren < 20:
+			stren_exp += rand(1, 2) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+		elseif pcs_stren < 30:
+			stren_exp += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+		elseif pcs_stren < 40:
+			stren_exp += rand(0, 1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+		end
+		if pcs_vital < 10:
+			vital_exp += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+		elseif pcs_vital < 20:
+			vital_exp += rand(1, 2) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+		elseif pcs_vital < 30:
+			vital_exp += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+		elseif pcs_vital < 40:
+			vital_exp += rand(0, 1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+		end
 	end
 
 	pcs_mood -= 5
@@ -623,12 +637,12 @@ if $ARGS[0] = 'vball3':
 	minut += 120
 
 	if alko = 0:
-		pcs_vball += rand(1, 3)
+		vball_exp += rand(1, 3)
 		speed += rand(0,2)
-		pcs_agil += rand(0,2)
-		if pcs_stren < 40:pcs_stren += rand(0,2) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
-		if pcs_vital < 40:pcs_vital += rand(0,2) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
-		pcs_run += rand(1, 2)
+		agil_exp += rand(0,2)
+		if pcs_stren < 40:stren_exp += rand(0,2) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+		if pcs_vital < 40:vital_exp += rand(0,2) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+		run_exp += rand(1, 2)
 		pcs_dom += 1
 	end
 
@@ -642,11 +656,11 @@ if $ARGS[0] = 'vball3':
 	if alko = 0:
 		if pcs_vball < 25:
 			'You were an absolutely lousy player and made constant mistakes. Eventually, the coach had enough and he removed you from the court.'
-		elseif pcs_vball >= 25 and pcs_vball < 50:
+		elseif pcs_vball < 50:
 			'You did not play very well. Sometimes you made some blunders. The coach was angry, but tolerated your antics.'
-		elseif pcs_vball >= 50 and pcs_vball < 75:
+		elseif pcs_vball < 75:
 			'You played well on the court and rarely made any mistakes. The coach looked pleased with you.'
-		elseif pcs_vball >= 75:
+		else
 			'You played great on the court, and easily defeated your rivals. The coach looked pleased with your game.'
 			if rand(0, 1) = 0:
 				if andGevknow = 0:$nameAndGev = 'some guy'
@@ -668,14 +682,14 @@ if $ARGS[0] = 'vball4':
 	volkomday = daystart
 	minut += 120
 	speed += rand(1, 3)
-	pcs_agil += rand(1, 3)
-	if pcs_stren < 50:pcs_stren += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
-	if pcs_vital < 50:pcs_vital += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+	agil_exp += rand(1, 3)
+	if pcs_stren < 50:stren_exp += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+	if pcs_vital < 50:vital_exp += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 	pcs_mood -= 5
 	fat -= 5
 	pcs_sweat += 30
-	pcs_run += rand(1, 2)
-	pcs_vball += rand(1, 3)
+	run_exp += rand(1, 2)
+	vball_exp += rand(1, 3)
 	trenerepa += 1
 	pcs_dom += 1
 	gs 'stat'
@@ -706,14 +720,14 @@ if $ARGS[0] = 'vball5':
 	sorevday = daystart
 	minut += 180
 	speed += rand(1, 3)
-	pcs_agil += rand(1, 3)
-	if pcs_stren < 60:pcs_stren += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
-	if pcs_vital < 60:pcs_vital += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+	agil_exp += rand(1, 3)
+	if pcs_stren < 60:stren_exp += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+	if pcs_vital < 60:vital_exp += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 	pcs_mood -= 5
 	fat -= 5
 	pcs_sweat += 30
-	pcs_run += rand(1, 2)
-	pcs_vball += rand(1, 3)
+	run_exp += rand(1, 2)
+	vball_exp += rand(1, 3)
 	pcs_dom += 1
 	trenerepa += 2
 	gs 'stat'

+ 3 - 3
locations/glake

@@ -177,7 +177,7 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 			pcs_sweat = 10 + rand(0,4)
 			pcs_mood += 5
 			pcs_willpwr = pcs_willpwr + 5
-			if pcs_stren < 30:pcs_stren = pcs_stren + 1
+			if pcs_stren < 30: stren_exp += 1
 
 			if $clothingworntype = 'nude':
 				'<center><img src="images/img/lake/nudeswim<<rand(0,9)>>.jpg"></center>'
@@ -376,8 +376,8 @@ $katok_start = {
 	fat -= 1
 	pcs_sweat += 10
 	if speed < 100:speed += 1
-	if pcs_agil < 70:pcs_agil += 1
-	if pcs_react < 70:pcs_react += 1
+	if pcs_agil < 70:agil_exp += 1
+	if pcs_react < 70:react_exp += 1
 	konki_stat += 1
 	minut += 30
 	gs'stat'

+ 4 - 4
locations/grandpahelp

@@ -29,7 +29,7 @@ if grandpahelping = 0:
 		if month >= 4 and month <= 10:
 		    fat -= RAND(1,3)
 		else
-            pcs_stren += 1
+            stren_exp += 1
 		    fat -= RAND(1,5)
         end
 		gs'stat'
@@ -158,7 +158,7 @@ if grandpahelping = 6:
 		if month >= 4 and month <= 10:
 		    fat -= RAND(1,3)
 		else
-            pcs_stren += 1
+            stren_exp += 1
 		    fat -= RAND(1,5)
         end
 		gs'stat'
@@ -309,7 +309,7 @@ if grandpahelping = 12:
 		if month >= 4 and month <= 10:
 		    fat -= RAND(1,3)
 		else
-            pcs_stren += 1
+            stren_exp += 1
 		    fat -= RAND(1,5)
         end
 		gs'stat'
@@ -519,7 +519,7 @@ if grandpahelping = 22:
 		if month >= 4 and month <= 10:
 		    fat -= RAND(1,3)
 		else
-            pcs_stren += 1
+            stren_exp += 1
 		    fat -= RAND(1,5)
         end
 		gs'stat'

+ 4 - 4
locations/gschool_grounds

@@ -69,7 +69,7 @@ if $ARGS[0] = 'main':
 		act 'Go to your graduation':
 			cls
 			SchoolAtestat = 1
-			pcs_intel += 10
+			intel_exp += 10
 			gs 'stat'
 			'Everyone from your year is assembled in the classroom. Your teachers have gathered in front of the class, and congratulate all of you on completing high school. As they hand everyone their well-earned diplomas, they wish you luck for the future.'
 
@@ -186,7 +186,7 @@ if $ARGS[0] = 'sports':
 			minut += 60
 			schoolrunday = daystart
 			fat -= rand(2, 7)
-			pcs_run += rand(0, 2)
+			run_exp += rand(0, 2)
 			pcs_sweat += 20
 			gs 'stat'
 			if month > 2 and month < 9:
@@ -367,7 +367,7 @@ if $ARGS[0] = 'SchoolRun':
 			'You run as fast as you can, and manage to reach the finish line before anyone else. First place! Mr. Pavlovich, the P.E. teacher at your school, congratulates you on winning the competition, as you walk around with your arms raised in triumph.'
 		end
 
-		pcs_run += 1
+		run_exp += 1
 		fat -= 10
 
 		if swinbeg = 3 and LocalRun = 0:
@@ -440,7 +440,7 @@ if $ARGS[0] = 'SchoolRun2':
 			'You run as fast as you can, and manage to reach the finish line before anyone else. First place! Mr. Pavlovich, the P.E. teacher at your school, congratulates you on winning the competition yet again while you walk around with your arms raised in triumph.'
 		end
 
-		pcs_run += 1
+		run_exp += 1
 		fat -= 10
 
 		if swinbeggor = 3 and LocalRun = 1:

+ 5 - 5
locations/gschool_lessons

@@ -372,7 +372,7 @@ if $ARGS[0] = 'afternoon2':
 			pcs_mood -= 5
 			fat -= 5
 			pcs_sweat += 30
-			pcs_run += rand(0, 2)
+			run_exp += rand(0, 2)
 			'After the roll call, Mr. Pavlovich announces that you will be going on a run today.'
 			act 'Run':
 				*clr
@@ -404,7 +404,7 @@ if $ARGS[0] = 'afternoon2':
 				act 'Finish the run':gt 'gschool_lessons', 'postphys'
 			end
 		elseif fizrarand = 1:
-			pcs_agil += rand(1, 3)
+			agil_exp += rand(1, 3)
 			fat -= 5
 			pcs_mood -= 5
 			pcs_sweat += 30
@@ -412,7 +412,7 @@ if $ARGS[0] = 'afternoon2':
 			gs 'gschool_events', 'fiz_rand'
 			act 'End of lesson':gt 'gschool_lessons', 'postphys'
 		elseif fizrarand = 2:
-			pcs_stren += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+			stren_exp += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 			pcs_mood -= 5
 			fat -= 2
 			pcs_sweat += 30
@@ -432,7 +432,7 @@ if $ARGS[0] = 'afternoon2':
 				act 'End of lesson':gt 'gschool_lessons', 'postphys'
 			end
 		elseif fizrarand = 3:
-			pcs_vital += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+			vital_exp += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 			pcs_mood -= 5
 			fat -= 2
 			pcs_sweat += 30
@@ -488,7 +488,7 @@ if $ARGS[0] = 'afternoon2':
 			end
 		elseif fizrarand = 4:
 			cls
-			pcs_stren += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+			stren_exp += rand(1, 3) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 
 			pcs_mood -= 5
 			fat -= 2

+ 1 - 1
locations/gskver

@@ -133,7 +133,7 @@ if $clothingworntype = 'exercise' and hour > 5 and hour < 22 and daybegskver ! d
 		cls
 		minut += 60
 		fat -= rand(2, 7)
-		pcs_run += rand(0, 2)
+		run_exp += rand(0, 2)
 		pcs_sweat += 20
 		daybegskver = daystart
 		gs 'stat'

+ 4 - 4
locations/hanters

@@ -159,7 +159,7 @@ elseif hour = 8 or hour = 14 or hour = 19:
 	                            cls
                                 minut += 1
                                 fingal +=  rand(1,3)
-                                pcs_shoot += 1			
+                                shoot_exp += 1			
                                 gs'stat'       
        
                                 '<center><img src="images/qwest/gadukino/Swamp/shooting1.gif"></center>'
@@ -197,7 +197,7 @@ elseif hour = 8 or hour = 14 or hour = 19:
 	                            if (pcs_stren + pcs_shoot > 20) or (pcs_stren + pcs_shoot < 20 and temp = 1):
 	                                cls
 	                                minut += 60
-                                    pcs_shoot += 1    
+                                    shoot_exp += 1    
                                     gs'stat'
 
                                     '<center><img src="images/qwest/gadukino/Swamp/shooting2.gif"></center>'
@@ -207,7 +207,7 @@ elseif hour = 8 or hour = 14 or hour = 19:
                                 else
 	                                cls
 	                                minut += 5
-                                    pcs_shoot += 1    
+                                    shoot_exp += 1    
                                     gs'stat'
 
                                     '<center><img src="images/qwest/gadukino/hantersex/shooting1.gif"></center>'
@@ -232,7 +232,7 @@ elseif hour = 8 or hour = 14 or hour = 19:
 	                        act 'Go shooting (1:00)':
 	                            cls
 	                            minut += 60
-                                pcs_shoot += 1	    
+                                shoot_exp += 1	    
                                 gs'stat'
         
                                 '<center><img src="images/qwest/gadukino/Swamp/shooting2.gif"></center>'

+ 2 - 2
locations/kafe

@@ -340,8 +340,8 @@ if $ARGS[0] = 'workPred':
 			znarand = rand(0, 1200)
 			chai = rand(0, pcs_apprnc/4 + pcs_servng/2)
 
-			if pcs_servng < 100:pcs_servng += 1
-			if pcs_vital < 30:pcs_vital += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+			if pcs_servng < 100:servng_exp += 1
+			if pcs_vital < 30:vital_exp += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 
 			money += chai
 

+ 3 - 3
locations/katjaEv

@@ -32,8 +32,8 @@ if $ARGS[0] = '1':
 		'<center><img src="images/qwest/alter/npc/14.jpg"></center>'
 	else 	
 		'<center><img src="images/qwest/alter/katja/katja_home.jpg"></center>'
-		if katja_scool_sex=1 and KatjaHorny > 60 and rand (1,3) = 1: *clr & '<center><img src="images/qwest/alter/katja/katja_go_home_tanga.jpg"></center>' & 'You walk through the streets of Pavlovsky together with Kate to her house. You and chatted about all sorts of trivia and have fun. Suddenly Kate stopped and turned around looking at you, a mischievous look lifted her skirt. Showing you her panties. '
-		if Katja_tanga_end=1 and KatjaHorny > 60 and rand (1,3) = 1: *clr & '<center><img src="images/qwest/alter/katja/katja_go_home_no_tanga.jpg"></center>' & 'You walk through the streets of Pavlovsky together with Kate to her house. You and chatted about all sorts of trivia and have fun. Suddenly Kate stopped and turned around looking at you, a mischievous look lifted her skirt. Showing you her tender pussy, she seems to have forgotten her panties.'
+		if katschoolsex = 1 and KatjaHorny > 60 and rand (1,3) = 1: *clr & '<center><img src="images/qwest/alter/katja/katja_go_home_tanga.jpg"></center>' & 'You walk through the streets of Pavlovsky together with Kate to her house. You and chatted about all sorts of trivia and have fun. Suddenly Kate stopped and turned around looking at you, a mischievous look lifted her skirt. Showing you her panties. '
+		if Katja_tanga_end = 1 and KatjaHorny > 60 and rand (1,3) = 1: *clr & '<center><img src="images/qwest/alter/katja/katja_go_home_no_tanga.jpg"></center>' & 'You walk through the streets of Pavlovsky together with Kate to her house. You and chatted about all sorts of trivia and have fun. Suddenly Kate stopped and turned around looking at you, a mischievous look lifted her skirt. Showing you her tender pussy, she seems to have forgotten her panties.'
 	end
 	'You walk through the streets Pavlovsky together with Kate to her house. You and chatted about all sorts of trivia and have fun.'
 
@@ -71,7 +71,7 @@ if $ARGS[0] = '3':
 	npc_rel[14] += 10
 	lernHome = 0
 	lern += rand(2, 4)
-	pcs_intel += rand(0, 1) + (mentats_dose - rand(0,mentats_dose))
+	intel_exp += rand(0, 1) + (mentats_dose - rand(0,mentats_dose))
 	katjaLernTimes += 1
 	gs 'stat'
 	'<center><img src="images/qwest/alter/npc/14.jpg"></center>'

+ 1 - 1
locations/kinoM

@@ -61,7 +61,7 @@ if $ARGS[0] = 'a':
 	act 'Watch a movie':
 		cla
 		bfa -= 1
-		pcs_intel += 1 + (mentats_dose - rand(0,mentats_dose))
+		intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
 		'The movie proved interesting and you sat through the entire movie without interruption.'
 		xgt 'kinoM', 'b'
 	end

+ 1 - 1
locations/kotovSex

@@ -1518,7 +1518,7 @@ end
 if $ARGS[0] = 'misionary_bonus1':
 	cls
 	minut += 5
-	pcs_agil += 1
+	agil_exp += 1
 	pcs_dom += 1
 	gs'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></font></b></center>'

+ 1 - 1
locations/kotovtalker

@@ -31,7 +31,7 @@ if numnpc = 9 and npc_rel[numnpc] >= 80 and GorSlut = 0 and kotovLoveQW >= 0:
 				cls
 				minut += 5
 				npc_rel[numnpc] += 5
-				pcs_danc += rand(1, 3)
+				danc_exp += rand(1, 3)
 				pcs_horny += 10
 				kotovQW += 1
 				gs 'stat'

+ 2 - 2
locations/kruchess

@@ -19,8 +19,8 @@ else
 	if week ! 6:
 		'The kids are sitting around playing practise games and watched over and helped by coach Genrikh G.'
 		act 'Spend an hour practising with assistance from the coach':
-			pcs_chess += rand(pcs_intel/20,pcs_intel/10)
-			pcs_intel += 1
+			chess_exp += rand(pcs_intel/20,pcs_intel/10)
+			intel_exp += 1
 			minut += 60
 			gt 'kruchess'
 		end

+ 2 - 2
locations/krupo

@@ -14,7 +14,7 @@ LColor = RGB(106,90,205)
 '<center><img src="images/lur/kru/krupo.jpg"></center>'
 if tkan >= 0:'Your cloth will suffice for <<tkan>> more lessons.'
 if pcs_sewng < 50:
-	pcs_sewng += rand(pcs_intel/20, pcs_intel/10)
+	sewng_exp += rand(pcs_intel/20, pcs_intel/10)
 	minut += 60
 	'You spend an hour learning different sewing techniques.'
 	if pcs_sewng > 40:'The teacher tells you that you will need to bring in fabric for further studies, you can buy some in the hardware department at the supermarket.'
@@ -32,7 +32,7 @@ end
 if tkan > 0 and pcs_sewng >= 50:
 	minut += 60
 	tkan -= 1
-	pcs_sewng += rand(pcs_intel/20, pcs_intel/10)
+	sewng_exp += rand(pcs_intel/20, pcs_intel/10)
 	'For an hour you learn more advanced techniques and practice cutting and sewing the fabric you purchased.'
 end
 

+ 1 - 1
locations/krutishi

@@ -15,7 +15,7 @@ if grupTipe[numnpc] = 1:
 				cls
 				minut += 5
 				npc_rel[numnpc] += 5
-				pcs_danc += rand(1, 3)
+				danc_exp += rand(1, 3)
 
 				if numnpc = 1:pcs_mood = 100
 

+ 6 - 6
locations/lab

@@ -118,7 +118,7 @@ if $ARGS[0] = 'jugo':
 	if jugoday ! daystart:
 		act 'Develop strength (1:00)':
 			cla
-			pcs_stren += rand(3, 6) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+			stren_exp += rand(3, 6) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 			minut += 60
 			jugoday = daystart
 			'You do exercises under the guidance of Gustav.'
@@ -138,7 +138,7 @@ if $ARGS[0] = 'jugo':
 
 		act 'Develop agility (1:00)':
 			cla
-			pcs_agil += rand(3, 6)
+			agil_exp += rand(3, 6)
 			minut += 60
 			jugoday = daystart
 			'You do exercises under the guidance of Gustav.'
@@ -148,7 +148,7 @@ if $ARGS[0] = 'jugo':
 
 		act 'Develop reactions (1:00)':
 			cla
-			pcs_react += rand(3, 6)
+			react_exp += rand(3, 6)
 			minut += 60
 			jugoday = daystart
 			'You do exercises under the guidance of Gustav.'
@@ -158,7 +158,7 @@ if $ARGS[0] = 'jugo':
 
 		act 'Develop endurance (1:00)':
 			cla
-			pcs_vital += rand(3, 6) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+			vital_exp += rand(3, 6) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 			minut += 60
 			jugoday = daystart
 			'You do exercises under the guidance of Gustav.'
@@ -277,7 +277,7 @@ if $ARGS[0] = 'Tatiana':
 		if Tatianaday ! daystart:
 			act 'Develop intelligence (1:00)':
 				cla
-				pcs_intel += rand(3, 6)
+				intel_exp += rand(3, 6)
 				minut += 60
 				Tatianaday = daystart
 				'You study with Tatiana developing your intellect.'
@@ -287,7 +287,7 @@ if $ARGS[0] = 'Tatiana':
 
 			act 'Will develop (1:00)':
 				cla
-				pcs_sprt += rand(3, 6)
+				sprt_exp += rand(3, 6)
 				minut += 60
 				Tatianaday = daystart
 				'You meditate with Tatiana developing your willpower.'

+ 1 - 1
locations/lake

@@ -71,7 +71,7 @@ if $ARGS[0] = 'start':
 				pcs_mood += 5
 				pcs_willpwr += 5
 
-				if pcs_stren < 30:pcs_stren += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+				if pcs_stren < 30:stren_exp += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 
 				'<center><img src="images/pics/swim.jpg"></center>'
 				'You swim in the lake, the water refreshes and invigorates.'

+ 3 - 3
locations/lesbimistress

@@ -808,7 +808,7 @@ end
 if $ARGS[0] = 'neutral_1':
 	mistneutral[1] = 1
 	minut += 150
-	pcs_vital += RAND(0,2) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+	vital_exp += RAND(0,2) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 	gs'stat'
 	'<center><img src="images/picqw/mistress/sub47.jpg"></center>'
 	'Mistress smiles at you kindly: "You''re really beautiful, slave. Do you know that?"'
@@ -1072,7 +1072,7 @@ end
 if $ARGS[0] = 'neutral_8':
 	mistneutral[8] = 1
 	mistressrnd = RAND(0,1)
-	pcs_vital += RAND(0,1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+	vital_exp += RAND(0,1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 	minut += 120
 	MistressAdoration += 2
 	MistressObedience = 5
@@ -1670,7 +1670,7 @@ if $ARGS[0] = 'amazing_3':
 				pcs_sweat = 10 + rand(0,4)
 				pcs_mood += 5
 				pcs_willpwr += 5
-				if pcs_stren < 30:pcs_stren += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+				if pcs_stren < 30:stren_exp += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 				pcs_horny += RAND(50,75)
 				gs'stat'
 				'<center><img src="images/picqw/mistress/sub223.jpg"></center>'

+ 12 - 0
locations/loadg

@@ -144,5 +144,17 @@ if arrsize('$sparrnam') > arrsize('sparrcnt'):
 	jump 'spidloop'
 end
 
+!!For old save Succubae
+if mutagenP > 0: stren_muta = mutagenP & killvar 'mutagenP'
+if mutagenA > 0: agil_muta = mutagenA & killvar 'mutagenA'
+if mutagenV > 0: vital_muta = mutagenV & killvar 'mutagenV'
+if mutagenI > 0: intel_muta = mutagenI & killvar 'mutagenI'
+if mutagenR > 0: react_muta = mutagenR & killvar 'mutagenR'
+if mutagenW > 0: sprt_muta = mutagenW & killvar 'mutagenW'
+
+!!This sets new attributes to default on saves that did not have these attributes
+if pcs_chrsm <= 0: pcs_chrsm = 10
+if pcs_prcptn <= 0: pcs_prcptn = 10
+
 --- loadg ---------------------------------
 

+ 1 - 1
locations/mey_vika_events

@@ -1158,7 +1158,7 @@ if $args[0] = 'gym0':
 											cla
 											minut += 30
 											fat -= 10
-											pcs_react += RAND(1,2)
+											react_exp += RAND(1,2)
 											pcs_sweat += 3
 											mey_vika['gym_day'] = daystart
 											killvar 'zz_stage'

+ 2 - 2
locations/obroom

@@ -48,7 +48,7 @@ if $ARGS[0] = 'start':
 	act 'Learn lesson (2:00)':
 		cla
 		minut += 120
-		pcs_intel += 1 + (mentats_dose - rand(0,mentats_dose))
+		intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
 		'You prozanimavshis two hours seems something in your head postponed'
 
 		act 'Finish':gt 'obroom', 'start'
@@ -118,7 +118,7 @@ if $ARGS[0] = 'vika':
 		act 'Engage with Vika (1:00)':
 			cla
 			minut += 60
-			pcs_intel += 1 + (mentats_dose - rand(0,mentats_dose))
+			intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
 			vika += 1
 			'You overlaid textbooks and become engaged with Vika, reviews all absorbed twice as fast.'
 

+ 6 - 6
locations/park

@@ -112,7 +112,7 @@ if $ARGS[0] = 'start':
 			minut += 60
 			pcs_mood -= 10
 			pcs_willpwr -= 10
-			pcs_run += 1
+			run_exp += 1
 			fat -= 8
 			speed += 1
 			pcs_sweat += 30
@@ -259,8 +259,8 @@ if $ARGS[0] = 'luna':
 				minut += 30
 				money -= 50
 
-				if pcs_sprt < 30:pcs_sprt += 1
-				if pcs_sprt >= 30:pcs_sprt += rand(0, 1)
+				if pcs_sprt < 30:sprt_exp += 1
+				if pcs_sprt >= 30:sprt_exp += rand(0, 1)
 
 				pcs_willpwr += 10
 				pcs_mood += 10
@@ -313,7 +313,7 @@ if $ARGS[0] = 'luna':
 						'You couldn''t even hit the target once.'
 					end
 
-					pcs_shoot += 1
+					shoot_exp += 1
 
 					act 'Move away':gt 'park', 'luna'
 				end
@@ -334,8 +334,8 @@ if $ARGS[0] = 'luna':
 					stKo = pcs_stren * 20/100
 					damage = rand(pcs_stren - stKo, pcs_stren + stKo)
 
-					if pcs_stren < 30:pcs_stren += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
-					if pcs_stren >= 30:pcs_stren += rand(0, 1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+					if pcs_stren < 30:stren_exp += 1 + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+					if pcs_stren >= 30:stren_exp += rand(0, 1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 
 					'You swung the hammer as hard as you could, but it wasn''t enough for a new record. A LED screen lights up and shows you your score:<<damage>>'
 

+ 42 - 20
locations/parkivent

@@ -74,16 +74,27 @@ if $ARGS[0] = '1':
 		end
 
 		act 'Try to run away':
-			if pcs_run < 10:peshimraperand = rand(0, 11)
-			if pcs_run >= 10 and pcs_run < 30:peshimraperand = rand(0, 20)
-			if pcs_run >= 30 and pcs_run < 50:peshimraperand = rand(0, 30)
-			if pcs_run >= 50 and pcs_run < 70:peshimraperand = rand(0, 40)
-			if pcs_run >= 70 and pcs_run < 90:peshimraperand = rand(0, 50)
-			if pcs_run >= 90 and pcs_run < 110:peshimraperand = rand(0, 60)
-			if pcs_run >= 110 and pcs_run < 130:peshimraperand = rand(0, 70)
-			if pcs_run >= 130 and pcs_run < 150:peshimraperand = rand(0, 80)
-			if pcs_run >= 150 and pcs_run < 170:peshimraperand = rand(0, 90)
-			if pcs_run >= 170:peshimraperand = 11
+			if pcs_run < 10:
+				peshimraperand = rand(0, 11)
+			elseif pcs_run < 30:
+				peshimraperand = rand(0, 20)
+			elseif pcs_run < 50:
+				peshimraperand = rand(0, 30)
+			elseif pcs_run < 70:
+				peshimraperand = rand(0, 40)
+			elseif pcs_run < 90:
+				peshimraperand = rand(0, 50)
+			elseif pcs_run < 110:
+				peshimraperand = rand(0, 60)
+			elseif pcs_run < 130:
+				peshimraperand = rand(0, 70)
+			elseif pcs_run < 150:
+				peshimraperand = rand(0, 80)
+			elseif pcs_run < 170:
+				peshimraperand = rand(0, 90)
+			else
+				peshimraperand = 11
+			end
 
 			if peshimraperand <= 10:
 				cla
@@ -284,16 +295,27 @@ if $ARGS[0] = '3':
 					end
 
 					act 'Try to run away':
-						if pcs_run < 10:peshimraperand = rand(0, 11)
-						if pcs_run >= 10 and pcs_run < 30:peshimraperand = rand(0, 20)
-						if pcs_run >= 30 and pcs_run < 50:peshimraperand = rand(0, 30)
-						if pcs_run >= 50 and pcs_run < 70:peshimraperand = rand(0, 40)
-						if pcs_run >= 70 and pcs_run < 90:peshimraperand = rand(0, 50)
-						if pcs_run >= 90 and pcs_run < 110:peshimraperand = rand(0, 60)
-						if pcs_run >= 110 and pcs_run < 130:peshimraperand = rand(0, 70)
-						if pcs_run >= 130 and pcs_run < 150:peshimraperand = rand(0, 80)
-						if pcs_run >= 150 and pcs_run < 170:peshimraperand = rand(0, 90)
-						if pcs_run >= 170:peshimraperand = rand(0, 100)
+						if pcs_run < 10:
+							peshimraperand = rand(0, 11)
+						elseif pcs_run < 30:
+							peshimraperand = rand(0, 20)
+						elseif pcs_run < 50:
+							peshimraperand = rand(0, 30)
+						elseif pcs_run < 70:
+							peshimraperand = rand(0, 40)
+						elseif pcs_run < 90:
+							peshimraperand = rand(0, 50)
+						elseif pcs_run < 110:
+							peshimraperand = rand(0, 60)
+						elseif pcs_run < 130:
+							peshimraperand = rand(0, 70)
+						elseif pcs_run < 150:
+							peshimraperand = rand(0, 80)
+						elseif pcs_run < 170:
+							peshimraperand = rand(0, 90)
+						else
+							peshimraperand = rand(0, 100)
+						end
 
 						if peshimraperand < 11:
 							rape += 1

+ 1 - 1
locations/placer_sex

@@ -813,7 +813,7 @@ if $args[0] = 'card_stript':
 			Act 'Continue':
 				*clr & cla
 				'<center><img src="images/qwest/alter/parc_ev/placer_sex69.jpg"></center>'
-				pcs_dancero +=1
+				dancero_exp += 1
 				if pcs_dancero > 50:
 					'Your practise pays off, and the guys are very impressed with your skilful dance. They''re rubbing their erections idly, and you smirk at them: "Careful, boys! Your eyes will pop out of you keep staring at me like that!"'
 					'You''re used to people wanting to get handsy when you do a striptease for them, and deftly dodge the grabbing hand that you knew would come sooner or later. As you give it a playful slap, you say: "No no, you only won a striptease. No touching!"'

+ 2 - 2
locations/preCUST

@@ -149,8 +149,8 @@ if $ARGS[0] = 'Done':
 		pcs_intel = 10
 		pcs_sprt = 10
 		pcs_react = 10
-!!		pcs_chrsm = 10
-!!		pcs_prcptn = 10
+		pcs_chrsm = 10
+		pcs_prcptn = 10
 		pcs_magik = 0
 		money = 16500
 		housrA = 1

+ 5 - 5
locations/saveupdater

@@ -179,14 +179,14 @@ if $Astat_nickname[0] ! '': $pcs_nickname = $Astat_nickname[0]
 if $Astat_lastname[0] ! '': $pcs_lastname = $Astat_lastname[0]
 
 if horny > 0: pcs_horny += horny & killvar 'horny'
-if stren > 0: pcs_stren += stren & killvar 'stren'
-if agil > 0: pcs_agil += agil & killvar 'agil'
-if vital > 0: pcs_vital += vital & killvar 'vital'
-if intel > 0: pcs_intel += intel & killvar 'intel'
+if stren > 0: stren_exp += stren & killvar 'stren'
+if agil > 0: agil_exp += agil & killvar 'agil'
+if vital > 0: vital_exp += vital & killvar 'vital'
+if intel > 0: intel_exp += intel & killvar 'intel'
 if hcol > 0: pcs_haircol += hcol & killvar 'hcol'
 if Suspeh > 0: pcs_grades += Suspeh & killvar 'Suspeh'
 if tan > 0: pcs_tan += tan & killvar 'tan'
-if volleyboll > 0: pcs_vball += volleyboll & killvar 'volleyboll'
+if volleyboll > 0: vball_exp += volleyboll & killvar 'volleyboll'
 if hairlength > 0: pcs_hairlng += hairlength & killvar 'hairlength'
 if dom > 0: pcs_dom += dom & killvar 'dom'
 if $name ! '': $pcs_firstname = $name & killvar '$name'

+ 1 - 1
locations/shulga_room

@@ -1361,7 +1361,7 @@ if $ARGS[0] = 'shulga_lern':
 	if lernHome ! 0:
 		minut += 60
 		lern += RAND(1,6)
-		pcs_intel += RAND(1,2) + (mentats_dose - rand(0,mentats_dose))
+		intel_exp += RAND(1,2) + (mentats_dose - rand(0,mentats_dose))
 		gs'stat'
 		'<center><img src="images/zsoft/pod_ezd/shulgahome/bigroom/lern/ev<<lern_imgset>>.jpg"></center>'
 		'You sit down with Vasily for an hour, and do your homework.'	

+ 1 - 1
locations/soniaDisco

@@ -96,7 +96,7 @@ if $ARGS[0] = 'dance1':
 		act 'Stay at the disco':
 			cls
 			minut += 15
-			pcs_danc += 1
+			danc_exp += 1
 			soniaPS = 1
 			grupTipe[25] = -1
 			$npc_notes['A25'] = 'Ever since Sonia inadvertedly got way too drunk and gave five guys including Vitek and his friends a simultaneous blowjob near the disco, her reputation in Pavlovsk has been in shambles. The girls in her class all give her the silent treatment, pretending she does not exist. Meanwhile the guys all treat her like a cheap whore and regularly ask (or sometimes even demand) sex from her, knowing she doesn''t have the strength to say no.'

+ 96 - 273
locations/stat

@@ -13,22 +13,26 @@ if Enable_Android = 0:
 	end
 end
 
-if daystart_start = 0:
+if daystart_start < 100:
 	pl '<BR>Did you start at the <a href="exec:daystart_start = 241 & gs''daystart'' & gs''stat''">end of August</a> or <a href="exec:daystart_start = 152 & gs''daystart'' & gs''stat''">beginning of June</a>?'
 	exit
 end
 
 view
-rand1=rand(0,100)
+rand1 = rand(0,100)
 $stat_msg=''
-if pcs_sewng > 1000:pcs_sewng = 1000
 
-if cheatHealth = 1:dynamic $cheatmenu['std_cure']
+if MagikDostup = 0: magik_exp = orgasm
 
-if analplay >= 2 and pcs_ass <= 10:pcs_ass += 1 & analplay = 0
-if analplay >= 4 and pcs_ass <= 15:pcs_ass += 1 & analplay = 0
-if analplay >= 8 and pcs_ass <= 20:pcs_ass += 1 & analplay = 0
+if insleep = 0: gs 'stat_sklattrib'
 
+if cheatHealth = 1: dynamic $cheatmenu['std_cure']
+
+if analplay >= 2 and pcs_ass <= 10: pcs_ass += 1 & analplay = 0
+if analplay >= 4 and pcs_ass <= 15: pcs_ass += 1 & analplay = 0
+if analplay >= 8 and pcs_ass <= 20: pcs_ass += 1 & analplay = 0
+
+!!The following seems to be part of the combat system.
 musle[1] = musle
 flex[1] = pcs_agil
 stamina[1] = pcs_vital * 3
@@ -41,10 +45,6 @@ fat[1] = fat
 Bteh[1] = bteh
 Uteh[1] = uteh
 Zteh[1] = zteh
-!!flex[0] = pcs_agil
-!!stamina[0] = pcs_vital * 3
-!!krasota[0] = pcs_apprnc
-!!wipo[0] = pcs_sprt
 
 !!This is a temporary stop-gap measure for the accomadation skill and will be removed
 if succubusflag = 1 and sucskill >= 4:
@@ -60,29 +60,24 @@ if cheatWork = 1:work = 0
 if cheatWorkKiskis = 1:young_shop_miss = 0
 if cheatHapri = 1:pcs_hairbsh = 1
 if cheatKlisma = 1:klismaday = daystart & klismaday1 = 1
-
 if cheatNomakeup = 1:
-	if pcs_makeup = 0:pcs_makeup = 1
+	if pcs_makeup = 0: pcs_makeup = 1
 end
-
-if cheatNosweat = 1 and pcs_sweat > 0:pcs_sweat = 0
-
+if cheatNosweat = 1 and pcs_sweat > 0: pcs_sweat = 0
 if cheatNoEat = 1:
-	if pcs_energy < 35:pcs_energy = 35
-	if water < 35:water = 35
+	if pcs_energy < 35: pcs_energy = 35
 end
-
-if cheatpirate = 1 and pirathorny < 20:pirathorny = 20
-
-if CheatNoSleep = 1 and pcs_sleep < 35:pcs_sleep = 35
+if cheatpirate = 1 and pirathorny < 20: pirathorny = 20
+if CheatNoSleep = 1 and pcs_sleep < 35: pcs_sleep = 35
 
 if alko > 0 and frost > 0:frost = 0
 if StrongNarkota >= 20:
     if alko > 0:alko = 0
 end
-if lernSkill >= 8:pcs_intel += 1 & lernSkill = 0
 
-if lern >= 10:pcs_intel += 1 & lern = 0
+if lernSkill >= 8: intel_exp += 1 & lernSkill = 0
+if lern >= 10: intel_exp += 1 & lern = 0
+
 if GorSlut = 1:
 	$gnikname = 'flirt'
 elseif GorSlut = 2:
@@ -96,7 +91,6 @@ elseif GorSlut = 5:
 elseif GorSlut = 6:
 	$gnikname = 'talking pussy'
 end
-
 if GorSlut >= 2:KatjaKnowBJ = 1
 if GorSlut >= 1 or preg > 0:KatjaKnowSex = 1
 if GorSlut > 6: GorSlut = 6
@@ -155,25 +149,14 @@ if gopota >= 20 and gnewQW = 1:gnewQW = 2
 if workDisk = 4 and week > 5:workDisk = 1
 if workDisk = 3 and week > 5:workDiskAtkPlayer = 1
 
-if fat < 0:fat = 0
-if pcs_vokal < 0:pcs_vokal = 0
-if pcs_vokal > 100:pcs_vokal = 100
-if pcs_danc > 100:pcs_danc = 100
-if pcs_dancero > 100:pcs_dancero = 100
-if pcs_dancpol > 100:pcs_dancpol = 100
-
-
-if bfa < 0:bfa = 0
-if pcs_run < 0:pcs_run = 0
-if pcs_run > 2000:pcs_run = 2000
-if pcs_servng > 100:pcs_servng = 100
-if pcs_vag > 36:pcs_vag = 36
-if pcs_throat > 36:pcs_throat = 36
-if pcs_ass > 36:pcs_ass = 36
-if pcs_jab > 120:pcs_jab = 120
-if pcs_punch > 120:pcs_punch = 120
-if pcs_kick > 120:pcs_kick = 120
-if pcs_def > 120:pcs_def = 120
+if fat < 0: fat = 0
+
+if bfa < 0: bfa = 0
+
+if pcs_vag > 36: pcs_vag = 36
+if pcs_throat > 36: pcs_throat = 36
+if pcs_ass > 36: pcs_ass = 36
+
 if NarkImmune = 1:
 	if narkoman ! 0:narkoman = 0
 elseif nark >= 30 and narkoman = 0 and NarkImmune = 0:
@@ -199,141 +182,26 @@ if CheatSlut = 1 or succubusflag = 1:
 	if pcs_horny < 50 and CheatSlut = 1: pcs_horny = 50
 end
 
+!!These will be made obsolete with the combat system overhaul
 boxing = pcs_jab + pcs_punch + pcs_kick + pcs_def
-
-if boxing > 100:boxing = 100
-
-if pcs_stren > 100 and mutagenP = 0:pcs_stren = 100
-if speed > 100 and mutagenS = 0:speed = 100
-if pcs_agil > 100 and mutagenA = 0:pcs_agil = 100
-if pcs_react > 100 and mutagenR = 0:pcs_react = 100
-if pcs_vital > 100 and mutagenV = 0:pcs_vital = 100
-if pcs_sprt > 100 and mutagenW = 0:pcs_sprt = 100
-if pcs_intel > 100 and mutagenI = 0 and student = 0 and diplom = 0:pcs_intel = 100
-
-if pcs_stren > 150 and mutagenP = 1:pcs_stren = 150
-if speed > 150 and mutagenS = 1:speed = 150
-if pcs_agil > 150 and mutagenA = 1:pcs_agil = 150
-if pcs_react > 150 and mutagenR = 1:pcs_react = 150
-if pcs_vital > 150 and mutagenV = 1:pcs_vital = 150
-if pcs_sprt > 150 and mutagenW = 1:pcs_sprt = 150
-if pcs_intel > 150 and mutagenI = 1 and student = 0 and diplom = 0:pcs_intel = 150
-
-if pcs_stren > 200 and mutagenP = 2:pcs_stren = 200
-if speed > 200 and mutagenS = 2:speed = 200
-if pcs_agil > 200 and mutagenA = 2:pcs_agil = 200
-if pcs_react > 200 and mutagenR = 2:pcs_react = 200
-if pcs_vital > 200 and mutagenV = 2:pcs_vital = 200
-if pcs_sprt > 200 and mutagenW = 2:pcs_sprt = 200
-if pcs_intel > 200 and mutagenI = 2 and student = 0 and diplom = 0:pcs_intel = 200
-
-if pcs_stren > 250 and mutagenP = 3:pcs_stren = 250
-if speed > 250 and mutagenS = 3:speed = 250
-if pcs_agil > 250 and mutagenA = 3:pcs_agil = 250
-if pcs_react > 250 and mutagenR = 3:pcs_react = 250
-if pcs_vital > 250 and mutagenV = 3:pcs_vital = 250
-if pcs_sprt > 250 and mutagenW = 3:pcs_sprt = 250
-if pcs_intel > 250 and mutagenI = 3 and student = 0 and diplom = 0:pcs_intel = 250
-
-if pcs_intel > 250:pcs_intel = 250
+if boxing > 100: boxing = 100
 
 if MagikDostup = 0:
-	!!!CV edition: Moved the statement after each orgasm stage to it''s own string
-	$levelUpString = '<b>You feel like a strength has been revealed within you and you gush with magic, lifting you to a new energy level.</b>'
-
-	if orgasm >= 1 and pcs_magik < 1:
-		pcs_magik = 1
-		pcs_eyesize += 1
-		rikudo += 500
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 2 and pcs_magik < 2:
-		pcs_magik = 2
-		pcs_lashes += 1
-		rikudo += 500
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 4 and pcs_magik < 3:
-		pcs_magik = 3
-		pcs_eyesize += 1
-		rikudo += 500
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 8 and pcs_magik < 4:
-		pcs_magik = 4
-		pcs_lashes += 1
-		rikudo += 500
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 16 and pcs_magik < 5:
-		pcs_magik = 5
-		pcs_eyesize += 1
-		rikudo += 500
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 32 and pcs_magik < 6:
-		pcs_magik = 6
-		pcs_lashes += 1
-		rikudo += 1000
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 64 and pcs_magik < 7:
-		pcs_magik = 7
-		pcs_eyesize += 1
-		rikudo += 1000
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 100 and pcs_magik < 8:
-		pcs_magik = 8
-		rikudo += 1000
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 200 and pcs_magik < 9:
-		pcs_magik = 9
-		rikudo += 1000
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 300 and pcs_magik < 10:
-		pcs_magik = 10
-		rikudo += 2000
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 400 and pcs_magik < 11:
-		pcs_magik = 11
-		rikudo += 4000
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 500 and pcs_magik < 12:
-		pcs_magik = 12
-		rikudo += 4000
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 600 and pcs_magik < 13:
-		pcs_magik = 13
-		rikudo += 4000
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 700 and pcs_magik < 14:
-		pcs_magik = 14
-		rikudo += 4000
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 800 and pcs_magik < 15:
-		pcs_magik = 15
-		rikudo += 8000
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 900 and pcs_magik < 16:
-		pcs_magik = 16
-		rikudo += 8000
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 1000 and pcs_magik < 17:
-		pcs_magik = 17
-		rikudo += 8000
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 1100 and pcs_magik < 18:
-		pcs_magik = 18
-		rikudo += 8000
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 1200 and pcs_magik < 19:
-		pcs_magik = 19
-		rikudo += 8000
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 1300 and pcs_magik < 20:
-		pcs_magik = 20
-		rikudo += 16000
-		$stat_msg += '<BR>' + $levelUpString
-	elseif orgasm >= 1400 and pcs_magik < 20:
-		pcs_magik = 21
-		rikudo += 21000
-		$stat_msg += '<BR>' + $levelUpString
+
+	if pcs_magik > magikhigh:
+		magikhigh += 1
+		rikudo += pcs_magik * 100
+		$stat_msg += '<BR><b>You feel like a strength has been revealed within you and you gush with magic, lifting you to a new energy level.</b>'
+!!		This will be replaced when a more advanced physical system is made
+		if (pcs_magik mod 2 ! 0) and pcs_eyesize < 2: pcs_eyesize += 1
+		if (pcs_magik mod 2 = 0) and pcs_lashes < 2: pcs_lashes += 1
 	end
-	!!!
+
+else
+!!This is for error catching
+	killvar 'pcs_magik'
+	killvar 'rikudo'
+	killvar 'pcs_splcstng'
 end
 
 if pcs_dom > 100: pcs_dom = 100
@@ -343,22 +211,28 @@ if VAF > 200: VAF = 200
 if SUB >= pcs_dom and pcs_dom > 0:SUB = SUB - pcs_dom & pcs_dom = 0
 if pcs_dom >= SUB and SUB > 0:pcs_dom = pcs_dom - SUB & SUB = 0
 
-if pcs_horny < 0:pcs_horny = 0
-healthmax = (pcs_vital*10 + pcs_stren*5)
-willpowermax = (pcs_intel*5 + pcs_sprt*5)
+if pcs_horny < 0: pcs_horny = 0
+
+healthmax = (pcs_vital * 10 + pcs_stren * 5)
+willpowermax = (pcs_intel * 5 + pcs_sprt * 5)
+stammax = 5 * (2 * pcs_vital + pcs_agil + pcs_stren) / 2
 mannamax = (pcs_intel * pcs_magik) + pcs_magik * 100 + pcs_vital * 10 + rikudo
-if healthmax < 1:healthmax = 1
-if willpowermax < 1:willpowermax = 1
-if mannamax < 1:mannamax = 1
+speed = (2 * (pcs_stren + pcs_agil) + pcs_vital) / 5
+if healthmax < 1: healthmax = 1
+if willpowermax < 1: willpowermax = 1
+if stammax < 1: stammax = 1
+if mannamax < 1: mannamax = 1
+
 !pre-calc max value for later display
 if fairycurse >= daystart and fairyshoo > 0: pcs_horny = 90
-if min_arousal > pcs_horny:pcs_horny = min_arousal
-if Enable_lockhorny > 0 and pcs_horny < Enable_lockhorny - 1:pcs_horny = Enable_lockhorny - 1
-if pcs_horny < 0:pcs_horny = 0
-if pcs_health > healthmax:pcs_health = healthmax
-if pcs_willpwr > willpowermax:pcs_willpwr = willpowermax
-if pcs_manna > mannamax:pcs_manna = mannamax
-if pcs_mood > 100:pcs_mood = 100
+if min_arousal > pcs_horny: pcs_horny = min_arousal
+if Enable_lockhorny > 0 and pcs_horny < Enable_lockhorny - 1: pcs_horny = Enable_lockhorny - 1
+if pcs_horny < 0: pcs_horny = 0
+if pcs_health > healthmax: pcs_health = healthmax
+if pcs_willpwr > willpowermax: pcs_willpwr = willpowermax
+if pcs_stam > stammax: pcs_stam = stammax
+if pcs_manna > mannamax: pcs_manna = mannamax
+if pcs_mood > 100: pcs_mood = 100
 
 if hypnoAddict = 1 and pcs_horny < 30:
 	pcs_horny = 30
@@ -367,17 +241,13 @@ elseif hypnoAddict = 2 and pcs_horny < 50:
 end
 if spdirtyi = 1 or hypnoAddict = 0:missCum = 0
 if missCum >= timeTresh:
-	if pcs_horny < 90:pcs_horny = 90
+	if pcs_horny < 90: pcs_horny = 90
 	if preziktype = 0: prezikcount = prezik
 	if preziktype = 2: preziksabo = prezik
 	prezik = 0
 	preziktype = 1
 end
 
-
-
-!!musle = strenbuf + vitalbuf
-
 !!!!!!!!!!!
 !!!TIME!!!
 !!!!!!!!!!!
@@ -470,11 +340,11 @@ if minut >= 60:
 
 	if insleep = 1:
 		pcs_energy -= (4 + succublvl/2)
-		water -= (4 + succublvl/2)
+		pcs_stam += stammax / 10
 		pcs_sleep -= 4
 	else
 		pcs_energy -= (8 + succublvl)
-		water -= (8 + succublvl)
+		pcs_stam += stammax / 20
 		pcs_sleep -= 4
 	end
 
@@ -486,13 +356,13 @@ if minut >= 60:
 
 	if alko > 0 and alkoblock = 0:
 		if alko >= 4:
-			if pcs_run > 0:pcs_run -= 1
-			if pcs_vball >= 50:pcs_vball -= 1
+			if pcs_run > 0: run_deg -= 1
+			if vball_lvl >= 50: vball_deg -= 1
 
 			if alko >= 6:
-				if pcs_stren > 10:pcs_stren -= 1
-				if pcs_vital > 10:pcs_vital -= 1
-				if pcs_intel > 10:pcs_intel -= 1
+				if pcs_stren > 10: stren_deg -= 1
+				if pcs_vital > 10: vital_deg -= 1
+				if pcs_intel > 10: intel_deg -= 1
 
 				alko -= rand (1, 2)
 			end
@@ -606,16 +476,16 @@ if minut >= 60:
 	if pain['urethra'] > 0:pain['urethra'] -= rand(0,1)
 	if pain['cervix'] > 0:pain['cervix'] -= rand(0,1)
 
-    if aphrodisiac_timer >= 1:
-        if pcs_horny < 80:
-            pcs_horny = 80
-        else
-            pcs_horny += 10
-        end
-    aphrodisiac_timer -= 1
-    end
+	if aphrodisiac_timer >= 1:
+		if pcs_horny < 80:
+			pcs_horny = 80
+		else
+			pcs_horny += 10
+		end
+		aphrodisiac_timer -= 1
+	end
 
-    if tanga = 1 and clit_size >= 25:pcs_horny += 20
+	if tanga = 1 and clit_size >= 25:pcs_horny += 20
 
 	if insleep = 0:
 		pcs_sweat += rand(0,1)
@@ -651,9 +521,6 @@ if kid > 0:
 		jump 'LoopKidAgeCounter'
 	end
 end
-!!moodlet
-!!mannamax
-!!totminut
 
 if pcs_mood >= totminut:
 	pcs_mood = 100
@@ -676,20 +543,15 @@ if pcs_nerd > 0:
 	end
 	if lastreadday + 2 = daystart:
 		SbrosNerdism = 0
-
 		if pcs_mood > 50:pcs_mood -= 10
-
 		$mudnerd = '<font color="red">You really want to read something.</font>'
 	end
 
 	if lastreadday + 3 <= daystart:
 		if pcs_mood > 10:pcs_mood -= 10
-
 		SbrosNerdism = 1
 		$mudnerd = '<font color="red"><b>You have an incredibly strong desire to read!!!</b></font>'
 	end
-
-	!!$mudnerd += 'lastread<<lastread>> totminut<<totminut>> <<totminut - lastread>>'
 else
 	SbrosNerdism = 0
 	$mudnerd = ''
@@ -703,10 +565,10 @@ if bimbolevel > 0:
 	elseif bimbowithdrawal < 4:
 		$bimbostatus = '<font color="black">You feel, like, totally lame today.</font>'
 	elseif bimbowithdrawal < 6:
-		if pcs_mood > 50:pcs_mood -= 10
+		if pcs_mood > 50: pcs_mood -= 10
 		$bimbostatus = '<font color="red">You really feel, like, awful today.</font>'
 	elseif bimbowithdrawal >= 6:
-		if pcs_mood > 10:pcs_mood -= 10
+		if pcs_mood > 10: pcs_mood -= 10
 		$bimbostatus= '<font color="red"><b>You feel that, like, horrible today!</b></font>'
 	end
 
@@ -783,13 +645,11 @@ else
 			if pcs_horny < 50: pcs_horny = 50
 			if pcs_horny < 100: pcs_horny += succublvl
 			if succhungry > 0:
-				pcs_energy -= succhungry*succublvl
-				water -= succhungry*succublvl
-				pcs_sleep -= succhungry*succublvl
+				pcs_energy -= succhungry * succublvl
+				pcs_sleep -= succhungry * succublvl
 			end
 			cumres_idx = arrpos('sparrloc',12)
 			if cumres_idx >= 0 and sparrvol[cumres_idx] > 0:sexnutrition += 4 & gs 'cum_cleanup', 'cleanloc', 12
-			!if swallow > 0:sexnutrition += swallow * 2 & swallow = 0
 			cumres_idx = arrpos('sparrloc',0)
 			if cumres_idx >= 0 and cumsumvag > 0:sexnutrition += cumsumvag * 4 & gs 'cum_cleanup', 'cleanloc', 0
 			if cumres_idx >= 0 and cumsumass > 0:sexnutrition += cumsumass * 4 & gs 'cum_cleanup', 'cleanloc', 3
@@ -850,7 +710,6 @@ else
 						sexnutrition = 20
 					end
 				end
-				water += sexnutrition / 2
 				pcs_energy += sexnutrition / 2
 				pcs_sleep += sexnutrition / 20
 				if succhungry > 0: succhungry = 0
@@ -879,16 +738,16 @@ if succubusflag = 1:
 			pcs_energy += 8 + succublvl
 		else
 			pcs_energy += 8 + succublvl
-			sucexcess -= (8+succublvl) * (6-succublvl)
+			sucexcess -= (8 + succublvl) * (6 - succublvl)
 		end
 	end
 	if pcs_health < 0:
 		pcs_health = 10
-		sucexcess -= 25 * (9-succublvl)
+		sucexcess -= 25 * (9 - succublvl)
 	end
 	if pcs_willpwr < 0:
 		pcs_willpwr = 10
-		sucexcess -= 20 * (9-succublvl)
+		sucexcess -= 20 * (9 - succublvl)
 		sucpowzeroed = 4
 	end
 end
@@ -903,8 +762,8 @@ if pcs_energy < 0:
 	pcs_health -= 5
 
 	if fat = 0 and pcs_stren + pcs_vital > 0:
-		pcs_stren -= 1
-		pcs_vital -= 1
+		stren_deg -= 1
+		vital_deg -= 1
 		pcs_energy += 8
 	elseif fat = 0 and pcs_stren + pcs_vital <= 0:
 		if Enable_nogameover = 0 :
@@ -921,17 +780,10 @@ if pcs_energy < 0:
 	end
 end
 
-if water < 0:
-	water = 1
-	pcs_health -= 10
-	pcs_willpwr -= 1
-end
-
 if pcs_mood <= 0:
 	pcs_mood = 1
 	pcs_health -= 5
 	pcs_willpwr -= 5
-	!!fat += 1
 end
 
 if pcs_health < 0:
@@ -1029,16 +881,6 @@ else
 	$pcs_energy = '<font color="red">You are very hungry.</font>'
 end
 
-if water >= 80:
-	$water = '<font color="green">You are not thirsty at all.</font>'
-elseif water >= 40:
-	$water = '<font color="blue">You are slightly thirsty.</font>'
-elseif water >= 8:
-	$water = '<font color="brown">You are thirsty.</font>'
-else
-	$water = '<font color="red">You are very thirsty.</font>'
-end
-
 if pcs_sleep >= 80:
 	$pcs_sleep = '<font color="green">You are well rested.</font>'
 elseif pcs_sleep >= 40:
@@ -1049,39 +891,20 @@ else
 	$pcs_sleep = '<font color="red">You are very tired.</font>'
 end
 
-!$din_shame = {
-	!!dynamic din_shame
-	!!shame += 1
-	!!if shame >= 5:shame = 4 & shameless += 1
-	!!if shame >= 4:$shame = '<font color="red"><b>of your cheeks blaze zalivshego them blush with shame.</b></font>'
-	!!if shame = 3:$shame = '<font color="red">Your cheeks are red from the blush of shame.</font>'
-	!!if shame = 2:$shame = '<font color="brown">You nemnog opokrasneli shame.</font>'
-	!!if shame = 1:$shame = '<font color="green">You''re a little confused.</font>'
-	!!if shame <= 0:$shame = '<font color="green">You''re a little confused.</font>'
-	!!gs 'stat'
-}
-
-!!if shame >= 5:shame = 4 & shameless += 1
-!!if shame >= 4:$shame = '<font color="red"><b>of your cheeks blaze zalivshego them blush with shame.</b></font>'
-!!if shame = 3:$shame = '<font color="red">Your cheeks are red from the blush of shame.</font>'
-!!if shame = 2:$shame = '<font color="brown">You nemnog opokrasneli shame.</font>'
-!!if shame = 1:$shame = '<font color="green">You''re a little confused.</font>'
-!!if shame <= 0:$shame = '<font color="green">You''re a little confused.</font>'
-maxmood = 100-moodmodifier
+!!Mood
+maxmood = 100 - moodmodifier
 if pcs_mood > 100:
-	pcs_mood = 100
 	pcs_mood = 100
 	$pcs_mood = 'You feel buoyed.'
 elseif pcs_mood < 0:
 	pcs_mood = 0
-	!{Asylum: basically this means clinically insane, like court-ordered committed, saliva dripping, blubbering...
-		Ordinarily irreversible at this stage meaning Game Over, but cheat can help}
+!!	Asylum: basically this means clinically insane, like court-ordered committed, saliva dripping, blubbering... Ordinarily irreversible at this stage meaning Game Over, but cheat can help
 end
 
-if workFabrika = 1 and week => 1 and week <= 5 and hour > 8 and age => 16 and age < 18 and FabrikaProgulDay ! daystart or workFabrika = 1 and week => 1 and week <= 5 and hour > 16 and age > 18 and FabrikaProgulDay ! daystart:
+if workFabrika = 1 and week => 1 and week <= 5 and hour > 8 and age => 16 and age < 18 and FabrikaProgulDay ! day or workFabrika = 1 and week => 1 and week <= 5 and hour > 16 and age > 18 and FabrikaProgulDay ! day:
 	!absence from work in a factory in Pavlovsk
 	FabrikaProgul += 1
-	FabrikaProgulDay = daystart
+	FabrikaProgulDay = day
 end
 
 if hotelroom > 0:
@@ -1096,9 +919,9 @@ if hour >= 8 and hour < 16 and week < 6 and StoryLine > 0 and SchoolAtestat = 0
 	schoolProgulDay = daystart
 end
 
-if insleep = 0:gs 'stat_display'
+if insleep = 0: gs 'stat_display'
 
-if cumcondslip <= 0:cumcondslip_deep = 0
+if cumcondslip <= 0: cumcondslip_deep = 0
 
---- stat ---------------------------------
+--- stat -------------------------------
 

+ 85 - 118
locations/stat_display

@@ -73,7 +73,6 @@ end
 !!!!!!!!!!!!!!!!!!!!!
 
 if pcs_sleep > 100: pcs_sleep = 100
-if water > 100: water = 100
 
 if Enable_statfsize>0:$stat_msg = '<font size=<<Enable_statfsize>>><<$stat_msg>>'
 
@@ -91,15 +90,15 @@ else
 	end
 end
 $stat_msg += '<BR><<$stat_android>> <<$week[week]>> <<day>> <<$month>> <<year>>'
-$stat_android += '<<$week[week]>> <<day>>/<<month>>, <<money>> , <a href="exec:clr & pl $stat_android">Status</a>'
+$stat_android += '<<$week[week]>> <<day>>/<<month>>, <<money>> ?, <a href="exec:clr & pl $stat_android">Status</a>'
 ! $stat_android for short desc in android mode, $stat_msg for status bar.
 
 $stat_msg += '<BR>'
 $pockets = 'pockets'
-if bag > 0:$pockets = 'purse'
-$stat_msg += '<BR>You have <b><<money>> </b> in your <<$pockets>>.'
-if karta > 0:$stat_msg += '<BR>You have <b><<karta>> ₽</b> in your bank account.'
-if stolmoney > 0:$stat_msg += '<BR>You have <b><<stolmoney>> ₽</b> in your desk drawer.'
+if bag > 0: $pockets = 'purse'
+$stat_msg += '<BR>You have <b><<money>> ?</b> in your <<$pockets>>.'
+if karta > 0: $stat_msg += '<BR>You have <b><<karta>> ?</b> in your bank account.'
+if stolmoney > 0: $stat_msg += '<BR>You have <b><<stolmoney>> ?</b> in your desk drawer.'
 $stat_msg += '<BR>'
 
 if ETOmenu = 1:
@@ -118,25 +117,23 @@ else
 	gs 'indik', '1', pcs_health * 100 / healthmax, pcs_health
 	$stat_msg += '<BR><<$ind>> Health'
 
-	if mannamax <=0:
-		gs 'indik', '1', 0, pcs_manna
-	else
+	if MagikDostup = 0:
 		gs 'indik', '1', pcs_manna * 100 / mannamax, pcs_manna
+		$stat_msg += '<BR><<$ind>> Manna'
 	end
-	$stat_msg += '<BR><<$ind>> Manna'
 
 	gs 'indik', '1', pcs_willpwr * 100 / willpowermax, pcs_willpwr
 	$stat_msg += '<BR><<$ind>> Willpower'
 
+	gs 'indik', '1', pcs_stam * 100 / stammax, pcs_stam
+	$stat_msg += '<BR><<$ind>> Stamina'
+
 	gs 'indik', '1', pcs_mood, pcs_mood
 	$stat_msg += '<BR><<$ind>> Mood'
 
 	gs 'indik', '1', pcs_energy, pcs_energy
 	$stat_msg += '<BR><<$ind>> Hunger'
 
-	gs 'indik', '1', water, water
-	$stat_msg += '<BR><<$ind>> Thirst'
-
 	gs 'indik', '1', pcs_sleep, pcs_sleep
 	$stat_msg += '<BR><<$ind>> Sleep'
 end
@@ -147,36 +144,42 @@ if Enable_showattr = 0:
 end
 if Enable_showattr = 1:
 	$stat_msg += '<BR> <a href="exec:Enable_showattr = 0 & gs ''$menu_obnovit''">Attributes:</a>'
-	gs 'indik', '1',pcs_stren , pcs_stren
-	$stat_msg += '<BR><<$ind>> Power'
-	gs'indik','1',speed,speed
-	$stat_msg += '<BR><<$ind>> Speed'
-	gs'indik','1',pcs_agil,pcs_agil
+	gs 'indik', '1', pcs_stren, pcs_stren
+	$stat_msg += '<BR><<$ind>> Strength'
+	gs 'indik', '1', pcs_agil, pcs_agil
 	$stat_msg += '<BR><<$ind>> Agility'
-	gs'indik','1',pcs_vital,pcs_vital
+	gs 'indik', '1', pcs_vital, pcs_vital
 	$stat_msg += '<BR><<$ind>> Endurance'
-	gs'indik','1',pcs_intel,pcs_intel
+	gs 'indik', '1', pcs_intel, pcs_intel
 	$stat_msg += '<BR><<$ind>> Intelligence'
-	gs'indik','1',pcs_sprt,pcs_sprt
+	gs 'indik', '1', pcs_sprt, pcs_sprt
 	$stat_msg += '<BR><<$ind>> Spirit'
-	gs'indik','1',pcs_react,pcs_react
-	$stat_msg += '<BR><<$ind>> Reaction'
-	gs'indik','1',pcs_apprnc / 2,pcs_apprnc
+	gs 'indik', '1', pcs_react, pcs_react
+	$stat_msg += '<BR><<$ind>> Mental Agility'
+	gs 'indik', '1', pcs_chrsm, pcs_chrsm
+	$stat_msg += '<BR><<$ind>> Charisma'
+	gs 'indik', '1', pcs_prcptn, pcs_prcptn
+	$stat_msg += '<BR><<$ind>> Perception'
+	if MagikDostup = 0:
+		gs 'indik', '1', pcs_magik, pcs_magik
+		$stat_msg += '<BR><<$ind>> Magic'
+	end
+	gs 'indik', '1', pcs_apprnc / 2, pcs_apprnc
 	$stat_msg += '<BR><<$ind>> Attractiveness'
 	if SUB > 0:
-			gs'indik','1',SUB,SUB
+		gs 'indik','1', SUB, SUB
 		$stat_msg += '<BR><<$ind>> Subordination'
 	end
 	if pcs_dom > 0:
-			gs'indik','1',pcs_dom,pcs_dom
+		gs 'indik', '1', pcs_dom, pcs_dom
 		$stat_msg += '<BR><<$ind>> Dominance'
 	end
 	if SchoolAtestat = 0 and StoryLine > 0:
-			gs'indik','1',pcs_grades,pcs_grades
+		gs 'indik', '1', pcs_grades, pcs_grades
 		$stat_msg += '<BR><<$ind>> School Grades'
 	end
 	if exhibi > 0:
-		gs'indik','1',exhibi*25,exhibi & !max at [dina], exhibi>=4
+		gs 'indik', '1', exhibi * 25, exhibi & !max at [dina], exhibi>=4
 		$stat_msg += '<BR><<$ind>> exhibitionism'
 	end
 end
@@ -187,22 +190,38 @@ end
 if Enable_showskill = 1:
 	st_count=0
 	$show_table=''
-	if workPTU > 1:gs'show_table','<<teachlevel>> Teacher credibility','2'
-	if pcs_magik > 0:gs'show_table','<<pcs_magik>> Magic','2'
-	if pcs_jab > 0:gs'show_table','<<pcs_jab>> Jabs','2'
-	if pcs_punch > 0:gs'show_table','<<pcs_punch>> Power Strikes','2'
-	if pcs_kick > 0:gs'show_table','<<pcs_kick>> Kicks','2'
-	if pcs_def > 0:gs'show_table','<<pcs_def>> Defense','2'
-	if pcs_run > 0:gs'show_table','<<pcs_run>> Running','2'
-	if pcs_vball > 0:gs'show_table','<<pcs_vball>> Volleyball','2'
-	if pcs_servng > 0:gs'show_table','<<pcs_servng>> Waitressing','2'
-	if pcs_vokal > 0:gs'show_table','<<pcs_vokal>> Vocal','2'
-	if pcs_danc > 0:gs'show_table','<<pcs_danc>> Dancing','2'
-	if pcs_dancero > 0:gs'show_table','<<pcs_dancero>> Striptease','2'
-	if pcs_dancpol > 0:gs'show_table','<<pcs_dancpol>> Pole dancing','2'
-	if pcs_shoot > 0:gs'show_table','<<pcs_shoot>> Marksmanship','2'
-	if pcs_sewng > 0:gs'show_table','<<pcs_sewng>> Tailoring','2'
-	if pcs_chess > 0:gs'show_table','<<pcs_chess>> Chess','2'
+	if pcs_splcstng > 0: gs 'show_table', '<<pcs_splcstng>> Spell Casting', '2'
+	if pcs_jab > 0: gs 'show_table', '<<pcs_jab>> Jabs', '2'
+	if pcs_punch > 0: gs 'show_table', '<<pcs_punch>> Power Strikes', '2'
+	if pcs_kick > 0: gs 'show_table', '<<pcs_kick>> Kicks', '2'
+	if pcs_def > 0: gs 'show_table', '<<pcs_def>> Defence', '2'
+	if pcs_shoot > 0: gs 'show_table', '<<pcs_shoot>> Marksmanship', '2'
+	if pcs_vokal > 0: gs 'show_table', '<<pcs_vokal>> Singing', '2'
+	if pcs_sewng > 0: gs 'show_table', '<<pcs_sewng>> Tailoring', '2'
+	if pcs_instrmusic > 0: gs 'show_table', '<<pcs_instrmusic>> Instrumental Music', '2'
+	if pcs_photoskl > 0: gs 'show_table', '<<pcs_photoskl>> Photography', '2'
+	if pcs_artskls > 0: gs 'show_table', '<<pcs_artskls>> Artistic Skills', '2'
+	if pcs_danc > 0: gs 'show_table', '<<pcs_danc>> Modern Dancing', '2'
+	if pcs_dancero > 0: gs 'show_table', '<<pcs_dancero>> Erotic Dancing', '2'
+	if pcs_dancpol > 0: gs 'show_table', '<<pcs_dancpol>> Pole Dancing', '2'
+	if pcs_chess > 0: gs 'show_table', '<<pcs_chess>> Chess', '2'
+	if pcs_ttgmng > 0: gs 'show_table', '<<pcs_ttgmng>> Gaming', '2'
+	if pcs_humint > 0: gs 'show_table', '<<pcs_humint>> People skills', '2'
+	if pcs_persuas > 0: gs 'show_table', '<<pcs_persuas>> Persuasion', '2'
+	if pcs_run > 0: gs 'show_table', '<<pcs_run>> Running', '2'
+	if pcs_vball > 0: gs 'show_table', '<<pcs_vball>> Volleyball', '2'
+	if pcs_icesktng > 0: gs 'show_table', '<<pcs_icesktng>> Ice Skating', '2'
+	if pcs_wrstlng > 0: gs 'show_table', '<<pcs_wrstlng>> Wrestling', '2'
+	if pcs_ftbll > 0: gs 'show_table', '<<pcs_ftbll>> Football', '2'
+	if pcs_observ > 0: gs 'show_table', '<<pcs_observ>> Observation', '2'
+	if pcs_makupskl > 0: gs 'show_table', '<<pcs_makupskl>> Makeup Skill', '2'
+	if pcs_compskl > 0: gs 'show_table', '<<pcs_compskl>> Computer Skill', '2'
+	if pcs_comphckng > 0: gs 'show_table', '<<pcs_comphckng>> Hacking', '2'
+	if pcs_hndiwrk > 0: gs 'show_table', '<<pcs_hndiwrk>> Handy-work', '2'
+	if pcs_servng > 0: gs 'show_table', '<<pcs_servng>> Serving', '2'
+	if pcs_mdlng > 0: gs 'show_table', '<<pcs_mdlng>> Modelling', '2'
+	if pcs_medcn > 0: gs 'show_table', '<<pcs_medcn>> Medicine', '2'
+	if workPTU > 1: gs 'show_table','<<teachlevel>> Teacher credibility','2'
 	if st_count > 0 :$stat_msg += '<BR> <a href="exec:Enable_showskill = 0 & gs ''$menu_obnovit''">Skills:</a> <TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end
 if Enable_showrelation = 0:
@@ -267,7 +286,7 @@ if opPRE = 0: $stat_msg += '<BR><<$pcs_makeup>> and your hair is <<$pcs_hairbsh>
 
 if daystart - lastmens > 21 and thinkpreg = 0 and knowpreg = 0 and cycle ! 6 and pillcon <= 30000 and succubusflag ! 1 and cheatSlut = 0 and mesec = 0:
 	if daystart - lastmens < 28:
-		$stat_msg += '<BR><font color = #AB052A><b>Your period is late by <<daystart - lastmens - 20>> days.</b></font>'
+		$stat_msg += '<BR><font color = #AB052A><b>Your period is late by <<daystart - daylastperiod - 20>> days.</b></font>'
 	elseif daystart - lastmens < 35:
 		$stat_msg += '<BR><font color = #AB052A><b>Your period is late by more than a week!</b></font>'
 	elseif daystart - lastmens < 45:
@@ -316,16 +335,6 @@ elseif pcs_energy < 30:
 	$stat_msg += '<BR>You feel peckish and your thoughts sometimes drift towards food.'
 end
 
-if water < 5:
-	$stat_msg += '<BR><font color="red">You feel light-headed, if you don''t have something to drink very soon, you will pass out.</font>'
-elseif water < 10:
-	$stat_msg += '<BR><font color="red">You are dehydrated, you really need to have something to drink.</font>'
-elseif water < 20:
-	$stat_msg += '<BR>You are thirsty and your dry throat is irritating and distracting you.'
-elseif water < 30:
-	$stat_msg += '<BR>You feel a little thirsty and your mouth is a little dry.'
-end
-
 if pcs_sleep < 5:
 	$stat_msg += '<BR><font color="red">You can''t keep your eyes open, if you don''t go to bed now, you will fall asleep right here.</font>'
 elseif pcs_sleep < 10:
@@ -336,22 +345,21 @@ elseif pcs_sleep < 30:
 	$stat_msg += '<BR>You feel a little tired.'
 end
 
-if opPRE = 0 :
-    if tanga = 1 and clit_size >= 25:$stat_msg += '<BR><font color = #FF1493>Your panties keep rubbing against your clit and making you horny.</font>'
-
-    if pcs_horny >= 50:
-	    if pcs_horny < 90 and tanga = 1:
-		    $stat_msg += '<BR><font color = #DB7093>You are a little nervous, feeling nice between your legs <a href="exec:view''images/pc/body/pussy/briefs1.jpg''">itchy</a> from arousal.</font>'
-	    elseif pcs_horny < 90 and tanga = 0:
-		    $stat_msg += '<BR><font color = #DB7093>You are a little nervous, feeling nice between your legs <a href="exec:view''images/pc/body/pussy/briefs1a.jpg''">itchy</a> from arousal.</font>'
-	    elseif tanga = 1:
-		    $stat_msg += '<BR><font color = #FF1493>You can''t stop thinking about sex, between your legs you are <a href="exec:view''images/pc/body/pussy/briefs2.jpg''">soaked</a> from your juices.</font>'
-	    else
-		    $stat_msg += '<BR><font color = #FF1493>You can''t stop thinking about sex, between your legs you are <a href="exec:view''images/pc/body/pussy/briefs2a.jpg''">soaked</a> from your juices.</font>'
-	    end
-    end
+if tanga = 1 and clit_size >= 25:$stat_msg += '<BR><font color = #FF1493>Your panties keep rubbing against your clit and making you horny.</font>'
+
+if pcs_horny >= 50:
+	if pcs_horny < 90 and tanga = 1:
+		$stat_msg += '<BR><font color = #DB7093>You are a little nervous, feeling nice between your legs <a href="exec:view''images/pc/body/pussy/briefs1.jpg''">itchy</a> from arousal.</font>'
+	elseif pcs_horny < 90 and tanga = 0:
+		$stat_msg += '<BR><font color = #DB7093>You are a little nervous, feeling nice between your legs <a href="exec:view''images/pc/body/pussy/briefs1a.jpg''">itchy</a> from arousal.</font>'
+	elseif tanga = 1:
+		$stat_msg += '<BR><font color = #FF1493>You can''t stop thinking about sex, between your legs you are <a href="exec:view''images/pc/body/pussy/briefs2.jpg''">soaked</a> from your juices.</font>'
+	else
+		$stat_msg += '<BR><font color = #FF1493>You can''t stop thinking about sex, between your legs you are <a href="exec:view''images/pc/body/pussy/briefs2a.jpg''">soaked</a> from your juices.</font>'
+	end
 end
 
+
 $smoker = {
 	siga -= 1
 	smoker += 1
@@ -364,7 +372,7 @@ $smoker = {
 	pcs_breath = 0
 	pcs_mood += 100
 	wipo += 100
-	if pcs_energy < 80:pcs_energy += 4
+	if pcs_energy < 80: pcs_energy += 4
 	gs '$menu_obnovit'
 }
 
@@ -384,8 +392,7 @@ elseif CondomToggle = 0 and Sprezik > 0:
 	Sprezik = 0
 end
 
-!!if $pcs_mood ! '':$stat_msg += '<BR><font color="green"><b><<$pcs_mood>></b></font>' & $stat_msg += '<BR>'
-$stat_msg += '<br>'
+if $pcs_mood ! '':$stat_msg += '<BR><font color="green"><b><<$pcs_mood>></b></font>' & $stat_msg += '<BR>'
 
 if smoker >= 20:
 	if smokerNeed > 0:
@@ -405,7 +412,7 @@ elseif siga > 0:
 	$stat_msg += '<BR><a href="exec:dynamic $smoker"><font color = blue><b>You have <<siga>> cigarettes.</b></font></a><BR>'
 end
 
-if smokeHour = hour and smokeday = daystart and smokeminut >= minut:$stat_msg += '<BR><font color="green">You are smoking a cigarette.</font><BR>'
+if smokeHour = hour and smokeday = day and smokeminut >= minut:$stat_msg += '<BR><font color="green">You are smoking a cigarette.</font><BR>'
 
 if pcs_sweat < 0 : pcs_sweat = 0
 if pcs_sweat > 69 : pcs_sweat = 69
@@ -462,7 +469,6 @@ end
 if Enable_Hymenrestore = 1: pcs_vag = 0
 if Enable_tightrestore = 1: pcs_ass = 0 & if pcs_vag > 0:pcs_vag = 1
 if Enable_clearwrite > 0: body_write = 0 & face_write = 0
-!{
 if Enable_clearcum > 0:
 	killvar 'sparrvol[0]'
 end
@@ -471,7 +477,7 @@ if Enable_fbreath > 0:
 	gs 'cum_cleanup'
 	pcs_breath=1
 end
-}
+
 
 $clear_write = {
 	body_write = 0
@@ -481,7 +487,6 @@ $clear_write = {
 	'It takes you 10 minutes to thoroughly wash the obscene "painting" from your body.'
 }
 
-
 if body_write > 0 or face_write > 0:
 	if body_write > 1 and face_write = 0:
 		$stat_msg += '<BR><a href="exec:dynamic $clear_write"><b><font color = red>Your body is inscribed with derogatory graffiti.</font></b></a>'
@@ -918,7 +923,7 @@ if narkday ! daystart and narkoman = 1:$stat_msg += '<BR><b><font color="red">Yo
 if fingal > 0:$stat_msg += '<BR><b><font color="red">You have a black eye.</font></b>'
 
 ! WD: Bimbo look
-if bimbolevel > 0:$stat_msg += '<BR><<$bimbostatus>>'
+if bimbolevel > 0: $stat_msg += '<BR><<$bimbostatus>>'
 
 if tanga = 1 and $clothingworntype = 'nude':
 	$stat_msg += '<BR><b><font color = red>You are stripped down to your panties and your boobs sway invitingly as you walk</font></b>'
@@ -931,7 +936,7 @@ elseif tanga = 0:
 		$stat_msg += '<BR><b><font color = #FF1493>You like, totally forgot to put on any panties. You are such a bimbo.</font></b>'
 	elseif PCloSkirt > 3:
 		$stat_msg += '<BR><b><font color="red">Your face is flushed with shame, you are not wearing panties and your naked ass flashes from under your short skirt.</font></b>'
-	elseif opPRE = 0 and $clothingworntype ! 'nude':
+	elseif $clothingworntype ! 'nude':
 		$stat_msg += '<BR><b><font color="red">You are not wearing panties.</font></b>'
 	elseif towel = 1:
 		$stat_msg += '<BR><b><font color = red>Your naked body is covered only by a short towel.</font></b>'
@@ -1070,7 +1075,7 @@ if pfilmday[0] > 0:
 	end
 end
 if pornmiss = 1: $stat_msg += '<br><b>You missed a scheduled porno shoot!</b>'
-if prodcosttrue > 0: $stat_msg += '<br><b>You owe to the porn studio <<prodcost>></b>'
+if prodcosttrue > 0: $stat_msg += '<br><b>You owe to the porn studio <<prodcost>>?</b>'
 if firstkasting > 0 and pfilmNO < 1 and pornstack < 10: $stat_msg += '<br><b>You can contract to <<10-pornstack>> porno movie.</b>'
 if hour < 22 and week >= 2 and week <= 4 and workKafe = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift in cafe starting at 11:00.</font></b>'
 if hour < 17 and week < 5 and workSec >= 1 or hour < 17 and week < 5 and PersSecWork = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary from 9:00 to 17:00</font></b>'
@@ -1090,44 +1095,6 @@ proverka3 = 0
 proverka4 = 0
 proverka5 = 0
 
-! WD: Code for updating from old clothing system pre 0.5.0
-
-!!clothing converter, for old saves. Not complete listing.
-if remdrop = 0:
-	remdrop = 1
-
-	if jeans[1] = 1:cheap[15] = 1 & cheapH[15] = jeansH[1] & cheapB[15] = jeansB[1] & jeans[1] = 0
-	if jeans[205] = 1:average[65] = 1 & averageH[65] = jeansH[205] & averageB[65] = jeansB[205] & jeans[205] = 0
-	if jeans[202] = 1:average[64] = 1 & averageH[64] = jeansH[202] & averageB[64] = jeansB[202] & jeans[202] = 0
-	if jeans[2] = 1:average[62] = 1 & averageH[62] = jeansH[2] & averageB[62] = jeansB[2] & jeans[2] = 0
-	if jeans[222] = 1:average[75] = 1 & averageH[75] = jeansH[222] & averageB[75] = jeansB[222] & jeans[222] = 0
-	if jeans[223] = 1:average[76] = 1 & averageH[76] = jeansH[223] & averageB[76] = jeansB[223] & jeans[223] = 0
-	if jeans[224] = 1:average[78] = 1 & averageH[78] = jeansH[224] & averageB[78] = jeansB[224] & jeans[224] = 0
-	if jeans[232] = 1:average[79] = 1 & averageH[79] = jeansH[232] & averageB[79] = jeansB[232] & jeans[232] = 0
-	if jeans[233] = 1:average[80] = 1 & averageH[80] = jeansH[233] & averageB[80] = jeansB[233] & jeans[233] = 0
-	if jeans[267] = 1:expensive[3] = 1 & expensiveH[3] = jeansH[267] & expensiveB[3] = jeansB[267] & jeans[267] = 0
-	if jeans[263] = 1:expensive[18] = 1 & expensiveH[18] = jeansH[263] & expensiveB[18] = jeansB[263] & jeans[263] = 0
-	if jeans[234] = 1:expensive[71] = 1 & expensiveH[71] = jeansH[234] & expensiveB[71] = jeansB[234] & jeans[234] = 0
-	if jeans[231] = 1:expensive[124] = 1 & expensiveH[124] = jeansH[231] & expensiveB[124] = jeansB[231] & jeans[231] = 0
-	if yoga[1] = 1:exercise[1] = 1 & exerciseH[1] = yogaH[1] & yoga[1] = 0
-	if yoga[2] = 1:exercise[2] = 1 & exerciseH[2] = yogaH[2] & yoga[2] = 0
-	if yoga[4] = 1:exercise[4] = 1 & exerciseH[4] = yogaH[4] & yoga[4] = 0
-	if yoga[5] = 1:exercise[5] = 1 & exerciseH[5] = yogaH[5] & yoga[5] = 0
-	if yoga[6] = 1:exercise[6] = 1 & exerciseH[6] = yogaH[6] & yoga[6] = 0
-	if yoga[7] = 1:exercise[7] = 1 & exerciseH[7] = yogaH[7] & yoga[7] = 0
-	if yoga[8] = 1:exercise[8] = 1 & exerciseH[8] = yogaH[8] & yoga[8] = 0
-	if yoga[9] = 1:exercise[9] = 1 & exerciseH[9] = yogaH[9] & yoga[9] = 0
-	if yoga[10] = 1:exercise[10] = 1 & exerciseH[10] = yogaH[10] & yoga[10] = 0
-	if yoga[11] = 1:exercise[11] = 1 & exerciseH[11] = yogaH[11] & yoga[11] = 0
-	if yoga[12] = 1:exercise[12] = 1 & exerciseH[12] = yogaH[12] & yoga[12] = 0
-	if yoga[13] = 1:exercise[13] = 1 & exerciseH[13] = yogaH[13] & yoga[13] = 0
-	if yoga[14] = 1:exercise[14] = 1 & exerciseH[14] = yogaH[14] & yoga[14] = 0
-	if yoga[15] = 1:exercise[15] = 1 & exerciseH[15] = yogaH[15] & yoga[15] = 0
-	if yoga[16] = 1:exercise[16] = 1 & exerciseH[16] = yogaH[16] & yoga[16] = 0
-	if yoga[17] = 1:exercise[17] = 1 & exerciseH[17] = yogaH[17] & yoga[17] = 0
-	if yoga[18] = 1:exercise[18] = 1 & exerciseH[18] = yogaH[18] & yoga[18] = 0
-end
-
 if boletus + bilberry > 0:
 	if boletus + bilberry >= 10:
 		$stat_msg +='<br><b><font color = Olive>You have a full basket.</b></font> '
@@ -1138,7 +1105,7 @@ if boletus + bilberry > 0:
 	if bilberry > 0:$stat_msg +='berries: <b><<bilberry>></b> kg.'
 end
 
-if Enable_statfsize>0:$stat_msg += '<BR></font>' & !disable this, all texts comes from pl will have the same font size, like[time]
+if Enable_statfsize > 0: $stat_msg += '<BR></font>' & !disable this, all texts comes from pl will have the same font size, like[time]
 if Enable_faceturn = 1:	view FUNC('$face_image')
 if Enable_Android = 0:
 	pl '<<$stat_msg>>'

+ 463 - 0
locations/stat_sklattrib

@@ -0,0 +1,463 @@
+# stat_sklattrib
+
+!!********************  Warning!  ********************
+!!The code in this location is both complex and very fundamental to most systems!
+!!Use EXTREME caution if modifying!
+!!Ask if understanding is required
+!!****************************************************
+!!For Users;
+!! For any Attribute or Skill, outside of "stat_sklattrib", the only things that get used are;
+!! the variables themselves, pcs_"name", for checks
+!! "name"_exp to replace straight adds (i.e. stren_exp +=1 instead of pcs_stren += 1)
+!! "name"_deg to replace losses (i.e. stren_deg -= 1 instead of pcs_stren -= 1)
+!! "name"_muta if setting higher attribute limits due to "mutations" ("name"_muta replaces the "mutagen" variables)
+!! And checking "name"_lvl if and only if it''s being used to check if an NPC/Item can still train the PC. That is also the only time there should be a gate on "name"_exp += x and should be a minimum of += rand(3,5). No other gates should be used.
+!! The others are used in the code as controllers and modifying anything except "name"_exp, "name"_deg, and "name"_muta outside of this routine can break things
+
+!! Attributes & Skills
+!! $att_name[x] and $skl_name[x]; an array that stores the name of each attribute variable
+!! For each attribute and skill variable, there are the following sub-variables
+!! _lvl, is the base level of an attribute/skill before adjustment
+!! _lvlst, level yesterday, used for error checking
+!! _deg is the days to attribute/skill loss and is reset on XP gain
+!! _exp is the amount of total XP gained so far for each and will replace all the gains in the rest of the code
+!! _mem is the amount of XP yesterday
+!! _muta replaces the assorted mutagen variables for attributes, this is to replace the 30 lines of code with 1
+!! _flr, this is the floor through which an attribute/skill cannot fall
+
+!! Traits
+!! $traitattskl[x], this stores a list of all traits that can affect attribute or skill advancement or degradation, if a trait does not, it does not go in this array
+!! For each trait that can affect attribute or skill advancement or degradation;
+!! "trait"[y1] = 1 if affecting an attribute or = 2 if affecting a skill;
+!! "trait"[y2] = the index number in $att_name or $skl_name that corresponds to the skill/attribute to be effected;
+!! "trait"[y3] = indicates if it effects XP required to level by adjusting the base rate as a plus to the default of 60
+!! "trait"[y4] = indicates if it effects degradation rate by adjusting the base rate as a plus to the default of 60 for attributes or 90 (3/2) for skills
+!! the 'y' in the above is for traits that affect more than 1 skill or attribute, note they must be contiguous 0x, 1x, 2x, etc. there can be no gaps
+!! Note, the effects of multiple traits on a single skill or attribute stack
+
+!!Attribute variable list
+$att_name[0] = 'stren'
+$att_name[1] = 'agil'
+$att_name[2] = 'vital'
+$att_name[3] = 'intel'
+$att_name[4] = 'react'
+$att_name[5] = 'sprt'
+$att_name[6] = 'chrsm'
+$att_name[7] = 'prcptn'
+$att_name[8] = 'magik'
+
+!!Skill variable list
+!!Add new skills to the end; if removing a skill, move the rest up and then edit the Traits so that the index numbers are correct
+$skl_name[0] = 'jab'
+$skl_name[1] = 'punch'
+$skl_name[2] = 'kick'
+$skl_name[3] = 'def'
+$skl_name[4] = 'shoot'
+$skl_name[5] = 'vokal'
+$skl_name[6] = 'sewng'
+$skl_name[7] = 'instrmusic'
+$skl_name[8] = 'photoskl'
+$skl_name[9] = 'artskls'
+$skl_name[10] = 'danc'
+$skl_name[11] = 'dancero'
+$skl_name[12] = 'dancpol'
+$skl_name[13] = 'chess'
+$skl_name[14] = 'ttgmng'
+$skl_name[15] = 'humint'
+$skl_name[16] = 'persuas'
+$skl_name[17] = 'run'
+$skl_name[18] = 'vball'
+$skl_name[19] = 'icesktng'
+$skl_name[20] = 'wrstlng'
+$skl_name[21] = 'ftbll'
+$skl_name[22] = 'splcstng'
+$skl_name[23] = 'observ'
+$skl_name[24] = 'makupskl'
+$skl_name[25] = 'compskl'
+$skl_name[26] = 'comphckng'
+$skl_name[27] = 'hndiwrk'
+$skl_name[28] = 'servng'
+$skl_name[29] = 'mdlng'
+$skl_name[30] = 'medcn'
+
+
+!!Trait Section
+!!This is where Traits that will affect attribute or skill advancement or degradation have those aspects defined.
+!!Always put the trait name, variable name, and skill or attribute variable in a comment
+
+!!Natrual Dancer; Provides a 10% reduction in xp required to level dance skills
+nat_dancer[1] = 2 & nat_dancer[2] = 10 & nat_dancer[3] = -6 & nat_dancer[4] = 0
+nat_dancer[11] = 2 & nat_dancer[12] = 11 & nat_dancer[13] = -6 & nat_dancer[14] = 0
+nat_dancer[21] = 2 & nat_dancer[22] = 12 & nat_dancer[23] = -6 & nat_dancer[24] = 0
+
+!!Natrual Athlete; Provides a 10% reduction in xp required to level sports skills
+nat_athlete[1] = 2 & nat_athlete[2] = 17 & nat_athlete[3] = -6 & nat_athlete[4] = 0
+nat_athlete[11] = 2 & nat_athlete[12] = 18 & nat_athlete[13] = -6 & nat_athlete[14] = 0
+nat_athlete[21] = 2 & nat_athlete[22] = 19 & nat_athlete[23] = -6 & nat_athlete[24] = 0
+nat_athlete[31] = 2 & nat_athlete[32] = 20 & nat_athlete[33] = -6 & nat_athlete[34] = 0
+nat_athlete[41] = 2 & nat_athlete[42] = 21 & nat_athlete[43] = -6 & nat_athlete[44] = 0
+
+!!Scholarly; Provides a 10% reduction in xp required to level Intelligence, easier to get good notes at school, faster studying in the university
+schlrly[1] = 1 & schlrly[2] = 3 & schlrly[3] = -6 & schlrly[4] = 0
+
+
+!!Trait variable list; only traits that can affect attribute or skill advancement or degradation goes here
+$traitattskl[0] = 'nat_dancer'
+$traitattskl[1] = 'nat_athlete'
+$traitattskl[2] = 'schlrly'
+
+!!This is sets _lvl and _exp based on the value of pcs_"name" the first time so that _lvl and _exp do not need to set on start.
+!!Theoretically this can be eventually deleted.
+if attsklupdate = 0:
+	i = 0 & x = 1
+	:rstloop
+	expadj = 60
+	tl = 0
+	:trtrstloop
+	tltp = 0
+	:trtrstinsdlp
+!!	Note this loop is done with a flag set in the dynamic that is checked outside; this is because testing showed inconsistent results when jumping from inside the dynamic and with the whole loop in the dynamic.
+	dynamic "
+		if <<$traitattskl[tl]>> > 0 and <<$traitattskl[tl]>>[tltp + 1] = x and <<$traitattskl[tl]>>[tltp + 2] = i and <<$traitattskl[tl]>>[tltp + 3] ! 0: expadj += <<$traitattskl[tl]>>[tltp + 3]
+		if <<$traitattskl[tl]>>[tltp + 11] ! 0: insdlpflag = 1
+		"
+	if insdlpflag = 1: tltp += 10 & insdlpflag = 0 & jump 'trtrstinsdlp'
+	tl += 1
+	if tl < arrsize ('$traitattskl'): jump 'trtrstloop'
+	killvar 'tl' & killvar 'tltp' & killvar 'insdlpflag'
+
+	if x = 1:
+		$attskltmp = $att_name[i]
+	else
+		$attskltmp = $skl_name[i]
+	end
+
+	dynamic "if pcs_<<$attskltmp>> > 0 and <<$attskltmp>>_lvl = 0: <<$attskltmp>>_exp = (expadj * (pcs_<<$attskltmp>> - 1) * (pcs_<<$attskltmp>> - 1) / 60) + 1 & <<$attskltmp>>_lvl = pcs_<<$attskltmp>>"
+	killvar 'expadj' & killvar '$attskltmp'
+	i += 1
+	if (x = 1 and i < arrsize ('$att_name')) or (x = 2 and i < arrsize ('$skl_name')): jump 'rstloop'
+	i = 0 & x += 1
+	if x < 3: jump 'rstloop'
+	killvar 'i' & killvar 'x'
+
+	attsklupdate = 1
+end
+
+!!This is the section that runs when the call is from cikl
+if $ARGS[0] = 'daycall':
+!!	Attribute XP with Skill XP gain
+	x = 0
+	:sklxploop
+	y = 1
+	:persklloop
+	dynamic "$attnamtmp = $att_name[<<$skl_name[x]>>[y]]"
+	dynamic "
+		if <<$skl_name[x]>>_exp > <<$skl_name[x]>>_mem: <<$attnamtmp>>_exp += (<<$skl_name[x]>>_exp - <<$skl_name[x]>>_mem) / 5
+		if <<$skl_name[x]>>[y + 1] = -1 or y >= 9: lpstopflg = 1
+		"
+	killvar '$attnamtmp'
+	if lpstopflg = 0: y += 1 & jump 'persklloop'
+	killvar 'lpstopflg'
+	x += 1
+	if x < arrsize ('$skl_name'): jump 'sklxploop'
+	killvar 'x' & killvar 'y' & killvar '$attnamtmp'
+
+!!	Degradation Loop
+	i = 0 & x = 1
+	:degloop
+	degadj = 60
+	if x = 2: degadj += 30
+	expadj = 60
+	tl = 0
+	:trtdegloop
+	tltp = 0
+	:trtdeginsdlp
+!!	Note this loop is done with a flag set in the dynamic that is checked outside; this is because testing showed inconsistent results when jumping from inside the dynamic and with the whole loop in the dynamic.
+	dynamic "
+		if <<$traitattskl[tl]>> > 0 and <<$traitattskl[tl]>>[tltp + 1] = x and <<$traitattskl[tl]>>[tltp + 2] = i and <<$traitattskl[tl]>>[tltp + 3] ! 0: expadj += <<$traitattskl[tl]>>[tltp + 3]
+		if <<$traitattskl[tl]>> > 0 and <<$traitattskl[tl]>>[tltp + 1] = x and <<$traitattskl[tl]>>[tltp + 2] = i and <<$traitattskl[tl]>>[tltp + 4] ! 0: degadj += <<$traitattskl[tl]>>[tltp + 4]
+		if <<$traitattskl[tl]>>[tltp + 11] ! 0: insdlpflag = 1
+		"
+	if insdlpflag = 1: tltp += 10 & insdlpflag = 0 & jump 'trtdeginsdlp'
+	tl += 1
+	if tl < arrsize ('$traitattskl'): jump 'trtdegloop'
+	killvar 'tl' & killvar 'tltp' & killvar 'insdlpflag'
+
+	if x = 1:
+		$attskltmp = $att_name[i]
+	else
+		$attskltmp = $skl_name[i]
+	end
+
+	dynamic "
+		if <<$attskltmp>>_lvl ! <<$attskltmp>>_lvlst: <<$attskltmp>>_lvl = <<$attskltmp>>_lvlst
+		if <<$attskltmp>>_lvl < 100:
+			degtmp = (102 - <<$attskltmp>>_lvl + <<$attskltmp>>_muta)
+		else
+			degtmp = 2 + <<$attskltmp>>_muta
+		end
+	
+		degtmp = degadj * degtmp / 60
+		if degtmp < 2: degtmp = 2
+		
+		if <<$attskltmp>>_exp < <<$attskltmp>>_mem: <<$attskltmp>>_exp = <<$attskltmp>>_mem
+
+		if <<$attskltmp>>_exp = <<$attskltmp>>_mem:
+			<<$attskltmp>>_deg -= 1
+		else
+			<<$attskltmp>>_deg = degtmp
+		end
+
+		if <<$attskltmp>>_deg <= 0 and <<$attskltmp>>_lvl > <<$attskltmp>>_flr:
+			exptmp = <<$attskltmp>>_exp - (expadj * (<<$attskltmp>>_lvl - 1) * (<<$attskltmp>>_lvl - 1) / 60)
+			if exptmp < 0: exptmp = 0
+			<<$attskltmp>>_lvl -= 1
+			<<$attskltmp>>_deg = degtmp
+			<<$attskltmp>>_exp = (expadj * (<<$attskltmp>>_lvl - 1) * (<<$attskltmp>>_lvl - 1) / 60) + exptmp
+!!			This will only do anything if the PC builds exp well in excess of what is needed to level
+			if <<$attskltmp>>_exp > (expadj * (<<$attskltmp>>_lvl) * (<<$attskltmp>>_lvl) / 60): <<$attskltmp>>_exp -= (2 * <<$attskltmp>> - 1) / 10
+		end
+		<<$attskltmp>>_lvlst = <<$attskltmp>>_lvl
+		<<$attskltmp>>_mem = <<$attskltmp>>_exp
+		"
+	killvar 'degtmp' & killvar 'exptmp'
+	killvar 'degadj' & killvar 'expadj' & killvar '$attskltmp'
+	i += 1
+	if (x = 1 and i < arrsize ('$att_name')) or (x = 2 and i < arrsize ('$skl_name')): jump 'degloop'
+	i = 0 & x += 1
+	if x < 3: jump 'degloop'
+	killvar 'i' & killvar 'x'
+end
+
+!!Advancement Loop
+i = 0 & x = 1
+:advloop
+expadj = 60
+tl = 0
+:trtadvloop
+tltp = 0
+:trtadvinsdlp
+!!Note this loop is done with a flag set in the dynamic that is checked outside; this is because testing showed inconsistent results when jumping from inside the dynamic and with the whole loop in the dynamic.
+dynamic "
+	if <<$traitattskl[tl]>> > 0 and <<$traitattskl[tl]>>[tltp + 1] = x and <<$traitattskl[tl]>>[tltp + 2] = i and <<$traitattskl[tl]>>[tltp + 3] ! 0: expadj += <<$traitattskl[tl]>>[tltp + 3]
+	if <<$traitattskl[tl]>>[tltp + 11] ! 0: insdlpflag = 1
+	"
+if insdlpflag = 1: tltp += 10 & insdlpflag = 0 & jump 'trtadvinsdlp'
+tl += 1
+if tl < arrsize ('$traitattskl'): jump 'trtadvloop'
+killvar 'tl' & killvar 'tltp' & killvar 'insdlpflag'
+
+if x = 1:
+	$attskltmp = $att_name[i]
+else
+	$attskltmp = $skl_name[i]
+end
+
+dynamic "
+	if <<$attskltmp>>_lvl ! <<$attskltmp>>_lvlst: <<$attskltmp>>_lvl = <<$attskltmp>>_lvlst
+	if <<$attskltmp>>_exp > (expadj * <<$attskltmp>>_lvl * <<$attskltmp>>_lvl / 60): <<$attskltmp>>_lvl += 1
+	<<$attskltmp>>_lvlst = <<$attskltmp>>_lvl
+	if <<$attskltmp>>_lvl / 5 > <<$attskltmp>>_flr: <<$attskltmp>>_flr = <<$attskltmp>>_lvl / 5
+	if <<$attskltmp>>_lvl > (100 + (<<$attskltmp>>_muta * 50)): <<$attskltmp>>_lvl = (100 + (<<$attskltmp>>_muta * 50))
+	if <<$attskltmp>>_exp > (expadj * (<<$attskltmp>>_lvl + 1) * (<<$attskltmp>>_lvl + 1) / 60) - 1:
+		<<$attskltmp>>_exp = (expadj * (<<$attskltmp>>_lvl + 1) * (<<$attskltmp>>_lvl + 1) / 60) - 1
+		<<$attskltmp>>_mem = <<$attskltmp>>_exp
+	end
+	"
+killvar 'expadj' & killvar '$attskltmp'
+i += 1
+if (x = 1 and i < arrsize ('$att_name')) or (x = 2 and i < arrsize ('$skl_name')): jump 'advloop'
+i = 0 & x += 1
+if x < 3: jump 'advloop'
+killvar 'i' & killvar 'x'
+
+!!Attribute set section
+!!This is where an attribute pcs_"name" is set by "name"_lvl and any adjustments are added
+!!Even though most of these could be done without doing a _lvl to pcs_ convertion, doing so is future proofing
+
+pcs_stren = stren_lvl
+if pcs_stren < 1: pcs_stren = 1
+
+pcs_agil = agil_lvl
+if pcs_agil < 1: pcs_agil = 1
+
+pcs_vital = vital_lvl
+if pcs_vital < 1: pcs_vital = 1
+
+pcs_intel = intel_lvl - bimbostupidity - (5 * noorgasm)
+if pcs_intel < 1: pcs_intel = 1
+
+pcs_react = react_lvl
+if pcs_react < 1: pcs_react = 1
+
+pcs_sprt = sprt_lvl
+if pcs_sprt < 1: pcs_sprt = 1
+
+pcs_chrsm = chrsm_lvl
+if pcs_chrsm < 1: pcs_chrsm = 1
+
+pcs_prcptn = prcptn_lvl
+if pcs_prcptn < 1: pcs_prcptn = 1
+
+pcs_magik = magik_lvl
+if pcs_magik < 0: pcs_magik = 0
+
+!!Skill set Section
+!!Each skill has three lines, the first is the comment that says what the skill is, the next that sets pcs_"name", and the finial which sets "name"[1] to [x] with the attribute index of the attribute(s) ending with a -1 to show end.
+
+!!Jabs; Quick strikes that do not have much power
+pcs_jab = (jab_lvl + (pcs_agil * 2 + pcs_stren) / 3) / 2 - notfem
+jab[1] = 0 & jab[2] = 1 & jab[3] = -1
+
+!!Power Strikes; Hard strikes that are harder to land
+pcs_punch = (punch_lvl + (pcs_stren * 2 + pcs_agil) / 3) / 2 - notfem
+punch[1] = 0 & punch[2] = 1 & punch[3] = -1
+
+!!Kicks; Kicking, enough said
+pcs_kick = (kick_lvl + (pcs_stren * 3 + pcs_agil) / 4) / 2 - notfem
+kick[1] = 0 & kick[2] = 1 & kick[3] = -1
+
+!!Defence; Covers both blocking and dodging
+pcs_def = (def_lvl + (pcs_agil + pcs_stren + pcs_react) / 3) / 2 - notfem
+def[1] = 0 & def[2] = 1 & def[3] = 4 & def[4] = -1
+
+!!Marksmanship; Could be guns, bows, or spells
+pcs_shoot = (shoot_lvl + (pcs_agil + pcs_react) / 2) / 2
+shoot[1] = 1 & shoot[2] = 4 & shoot[3] = -1
+
+!!Singing; Should be self-explanatory
+pcs_vokal = (vokal_lvl + (pcs_intel + pcs_chrsm) / 2) / 2
+vokal[1] = 3 & vokal[2] = 6 & vokal[3] = -1
+
+!!Tailoring; Should be self-explanatory
+pcs_sewng = (sewng_lvl + (pcs_agil + pcs_intel) / 2) / 2
+sewng[1] = 1 & sewng[2] = 3 & sewng[3] = -1
+
+!!Instrumental Music; Skill at playing an instrument(s)
+pcs_instrmusic = (instrmusic_lvl + (2 * pcs_agil + pcs_intel) / 3) / 2
+instrmusic[1] = 1 & instrmusic[2] = 3 & instrmusic[3] = -1
+
+!!Photography; Should be self-explanatory
+pcs_photoskl = (photoskl_lvl + (2 * pcs_intel + pcs_react) / 3) / 2
+photoskl[1] = 3 & photoskl[2] = 4 & photoskl[3] = -1
+
+!!Artistic Skills; painting, drawing etc.
+pcs_artskls = (artskls_lvl + (pcs_intel + pcs_react + pcs_agil) / 3) / 2
+artskls[1] = 1 & artskls[2] = 3 & artskls[3] = 4 & artskls[4] = -1
+
+!!Modern Dancing; This is the basic dance skill and replaces 'dance'
+pcs_danc = (danc_lvl + (pcs_agil + pcs_react + pcs_vital) / 3) / 2 - notfem
+danc[1] = 1 & danc[2] = 2 & danc[3] = 4 & danc[4] = -1
+
+!!Erotic Dancing; This is used when individual eroticism is being displayed, also covers & replaces strip tease
+pcs_dancero = (dancero_lvl + (pcs_agil + pcs_chrsm + pcs_vital) / 3) / 2 - notfem + (3 * flxibt)
+dancero[1] = 1 & dancero[2] = 2 & dancero[3] = 6 & dancero[4] = -1
+
+!!Pole Dancing; Should be self-explanatory
+pcs_dancpol = (dancpol_lvl + (pcs_agil + pcs_stren + pcs_chrsm) / 3) / 2 - notfem + (3 * flxibt)
+dancpol[1] = 0 & dancpol[2] = 1 & dancpol[3] = 6 & dancpol[4] = -1
+
+!!Chess; Should be self-explanatory
+pcs_chess = (chess_lvl + pcs_intel) / 2 + (5 * logictrt)
+chess[1] = 3 & chess[2] = -1
+
+!!Gaming; Abstracts skills at all types of Table Top games
+pcs_ttgmng = (ttgmng_lvl + (2 * pcs_intel + pcs_react) / 3) / 2
+ttgmng[1] = 3 & ttgmng[2] = 4 & ttgmng[3] = -1
+
+!!People skills; basic human interaction skill set
+pcs_humint = (humint_lvl + (pcs_prcptn + pcs_chrsm + pcs_react)/3) / 2 + (5 * chrmng) - (5 * meantrt)
+humint[1] = 4 & humint[2] = 6 & humint[3] = 7 & humint[4] = -1
+
+!!Persuasion; Trained skill at getting people to agree with you or like you
+pcs_persuas = (persuas_lvl + (pcs_prcptn + pcs_chrsm) / 2) / 2 + (5 * chrmng) - (5 * meantrt)
+persuas[1] = 6 & persuas[2] = 7 & persuas[3] = -1
+
+!!Running; Should be self-explanatory
+pcs_run = (run_lvl + (2 * (pcs_agil + pcs_stren) + pcs_vital) / 5) / 2 - notfem
+run[1] = 0 & run[2] = 1 & run[3] = 2 & run[4] = -1
+
+!!Volleyball; Should be self-explanatory
+pcs_vball = (vball_lvl + (2 * pcs_agil + pcs_react + pcs_stren + pcs_vital) / 5) / 2 - notfem
+vball[1] = 0 & vball[2] = 1 & vball[3] = 2 & vball[4] = 4 & vball[5] = -1
+
+!!Ice Skating; Should be self-explanatory
+pcs_icesktng = (icesktng_lvl + (2 * pcs_agil + pcs_stren) / 3) / 2 - notfem
+icesktng[1] = 0 & icesktng[2] = 1 & icesktng[3] = -1
+
+!!Wrestling; Should be self-explanatory
+pcs_wrstlng = (wrstlng_lvl + (2 * pcs_stren + pcs_vital + pcs_agil) / 4) / 2 - notfem
+wrstlng[1] = 0 & wrstlng[2] = 1 & wrstlng[3] = 2 & wrstlng[4] = -1
+
+!!Football; Should be self-explanatory
+pcs_ftbll = (ftbll_lvl + (pcs_vital + pcs_agil + pcs_stren) / 3) / 2 - notfem
+ftbll[1] = 0 & ftbll[2] = 1 & ftbll[3] = 2 & ftbll[4] = -1
+
+!!Spell Casting; The ability to Successfully cast spells
+pcs_splcstng = (splcstng_lvl + (pcs_intel + pcs_react) / 2) / 2
+splcstng[1] = 3 & splcstng[2] = 4 & splcstng[3] = -1
+
+!!Observation; trained skill in noticing one's surroundings and events (nothing but surface detail)
+pcs_observ = (observ_lvl + (pcs_prcptn + pcs_react + pcs_intel)/3) / 2
+observ[1] = 3 & observ[2] = 4 & observ[3] = 7 & observ[4] = -1
+
+!!Makeup; Skill at applying makeup, goes into the vnesh calc as makupskl/5
+pcs_makupskl = (makupskl_lvl + (pcs_intel + pcs_agil) / 2) / 2
+makupskl[1] = 1 & makupskl[2] = 3 & makupskl[3] = -1
+
+!!Computer Skill; Skill at using and repairing computers
+pcs_compskl = (compskl_lvl + pcs_intel) / 2 + (5 * logictrt)
+compskl[1] = 3 & compskl[2] = -1
+
+!!Hacking; Skill at hacking computer systems
+pcs_comphckng = (comphckng_lvl + (pcs_intel + pcs_react) / 2) / 2 + (5 * logictrt)
+comphckng[1] = 3 & comphckng[2] = 4 & comphckng[3] = -1
+
+!!Handy-work; Used for non-mechanic work, i.e. plumbing
+pcs_hndiwrk = (hndiwrk_lvl + (2 * pcs_agil + pcs_intel) / 3) / 2
+hndiwrk[1] = 1 & hndiwrk[2] = 3 & hndiwrk[3] = -1
+
+!!Serving; Covers all aspects of waitressing and bartending
+pcs_servng = (servng_lvl + (pcs_intel + pcs_vital) / 2) / 2
+servng[1] = 2 & servng[2] = 3 & servng[3] = -1
+
+!!Modelling; Knowing how to pose and hold poses for long periods of time
+pcs_mdlng = (mdlng_lvl + (pcs_agil + pcs_vital) / 2) / 2 - notfem
+mdlng[1] = 1 & mdlng[2] = 2 & mdlng[3] = -1
+
+!!Medicine; Basic medical knowledge up to the level of Nursing
+pcs_medcn = (medcn_lvl + (pcs_intel + pcs_react + pcs_prcptn) / 3) / 2
+medcn[1] = 3 & medcn[2] = 4 & medcn[3] = 7 & medcn[4] = -1
+
+!!Skiing; Should be self-explanatory
+!!To add this skill, copy this "$skl_name[x] = 'skng'" to the end of the skils list above and replace the x with the next index number, then remove the comment and bracket marks on the next two lines and delete this line
+!!pcs_skng = (skng_lvl + (2 * pcs_agil + pcs_stren) / 3) / 2
+!!{skng[1] = 0 & skng[2] = 1 & skng[3] = -1}
+
+!!Larceny; picking locks, hotwire cars etc.; basic thief/stealing skills
+!!To add this skill, copy this "$skl_name[x] = 'thiefskls'" to the end of the skils list above and replace the x with the next index number, then remove the comment and bracket marks on the next two lines and delete this line
+!!pcs_thiefskls = (thiefskls_lvl + (2 * pcs_agil + pcs_react) / 3) / 2
+!!{thiefskls[1] = 1 & thiefskls[2] = 4 & thiefskls[3] = -1}
+
+!!Mechanic; Auto mechanic skill, can work on your own car
+!!To add this skill, copy this "$skl_name[x] = 'mchanc'" to the end of the skils list above and replace the x with the next index number, then remove the comment and bracket marks on the next two lines and delete this line
+!!pcs_mchanc = (mchanc_lvl + (2 * pcs_agil + pcs_intel) / 3) / 2
+!!{mchanc[1] = 1 & mchanc[2] = 3 & mchanc[3] = -1}
+
+!!Gambling; Should be self-explanatory
+!!To add this skill, copy this "$skl_name[x] = 'gmbling'" to the end of the skils list above and replace the x with the next index number, then remove the comment and bracket marks on the next two lines and delete this line
+!!pcs_gmbling = (gmbling_lvl + (2 * pcs_prcptn + pcs_intel + pcs_react) / 4) / 2
+!!{gmbling[1] = 3 & gmbling[2] = 4 & gmbling[3] = 7 & gmbling[4] = -1}
+
+!!Seduction; Trained art of making yourself sexually desired, by words, body language, tone etc.; should be checked with either a +hotcat or on a 300point scale with +vnesh (set elsewhere so not added here)
+!!To add this skill, copy this "$skl_name[x] = 'sdctn'" to the end of the skils list above and replace the x with the next index number, then remove the comment and bracket marks on the next two lines and delete this line
+!!pcs_sdctn = (sdctn_lvl + (pcs_prcptn + pcs_chrsm) / 2) / 2
+!!{sdctn[1] = 6 & sdctn[2] = 7 & sdctn[3] = -1}
+
+!!Computer Gaming; Skill at playing assorted computer and console games.
+!!To add this skill, copy this "$skl_name[x] = 'compgame'" to the end of the skils list above and replace the x with the next index number, then remove the comment and bracket marks on the next two lines and delete this line
+!!pcs_compgame = (compgame_lvl + (pcs_agil + pcs_react) / 2) / 2
+!!{compgame[1] = 1 & compgame[2] = 4 & compgame[3] = -1}
+
+--- stat_sklattrib ---------------------------------
+

+ 11 - 11
locations/strelba

@@ -41,7 +41,7 @@ if pcs_shoot = 0:
 			jump'markstrelba'
 		end
 	end
-elseif pcs_shoot > 0 and pcs_shoot < 20:
+elseif pcs_shoot < 20:
 	if gunpricel = 0:
 		if buurand >= 95:
 			damage = gunpower
@@ -71,7 +71,7 @@ elseif pcs_shoot > 0 and pcs_shoot < 20:
 		end
 	end
 end
-if pcs_shoot >= 20 and pcs_shoot < 40:
+if pcs_shoot < 40:
 	if gunpricel = 0:
 		if buurand >= 90:
 			damage = gunpower
@@ -100,7 +100,7 @@ if pcs_shoot >= 20 and pcs_shoot < 40:
 			jump'markstrelba'
 		end
 	end
-elseif pcs_shoot >= 40 and pcs_shoot<60:
+elseif pcs_shoot < 60:
 	if gunpricel = 0:
 		if buurand >= 85:
 			damage = gunpower
@@ -129,7 +129,7 @@ elseif pcs_shoot >= 40 and pcs_shoot<60:
 			jump'markstrelba'
 		end
 	end
-elseif pcs_shoot >= 60 and pcs_shoot < 80:
+elseif pcs_shoot < 80:
 	if gunpricel = 0:
 		if buurand >= 80:
 			damage = gunpower
@@ -158,7 +158,7 @@ elseif pcs_shoot >= 60 and pcs_shoot < 80:
 			jump'markstrelba'
 		end
 	end
-elseif pcs_shoot >= 80 and pcs_shoot < 100:
+elseif pcs_shoot < 100:
 	if gunpricel = 0:
 		if buurand >= 75:
 			damage = gunpower
@@ -188,7 +188,7 @@ elseif pcs_shoot >= 80 and pcs_shoot < 100:
 			jump'markstrelba'
 		end
 	end
-elseif pcs_shoot >= 100 and pcs_shoot < 150:
+elseif pcs_shoot < 150:
 	if gunpricel = 0:
 		if buurand >= 70:
 			damage = gunpower
@@ -217,7 +217,7 @@ elseif pcs_shoot >= 100 and pcs_shoot < 150:
 			jump'markstrelba'
 		end
 	end
-elseif pcs_shoot >= 150 and pcs_shoot < 200:
+elseif pcs_shoot < 200:
 	if gunpricel = 0:
 		if buurand >= 65:
 			damage = gunpower
@@ -246,7 +246,7 @@ elseif pcs_shoot >= 150 and pcs_shoot < 200:
 			jump'markstrelba'
 		end
 	end
-elseif pcs_shoot >= 200 and pcs_shoot < 300:
+elseif pcs_shoot < 300:
 	if gunpricel = 0:
 		if buurand >= 60:
 			damage = gunpower
@@ -275,7 +275,7 @@ elseif pcs_shoot >= 200 and pcs_shoot < 300:
 			jump'markstrelba'
 		end
 	end
-elseif pcs_shoot >= 300 and pcs_shoot < 400:
+elseif pcs_shoot < 400:
 	if gunpricel = 0:
 		if buurand >= 55:
 			damage = gunpower
@@ -304,7 +304,7 @@ elseif pcs_shoot >= 300 and pcs_shoot < 400:
 			jump'markstrelba'
 		end
 	end
-elseif pcs_shoot >= 400 and pcs_shoot < 500:
+elseif pcs_shoot < 500:
 	if gunpricel = 0:
 		if buurand >= 50:
 			damage = gunpower
@@ -333,7 +333,7 @@ elseif pcs_shoot >= 400 and pcs_shoot < 500:
 			jump'markstrelba'
 		end
 	end
-elseif pcs_shoot >= 500:
+else
 	if gunpricel = 0:
 		if buurand >= 45:
 			damage = gunpower

+ 6 - 6
locations/swamphouse

@@ -559,8 +559,8 @@ $stackmagazines = {
 			lastreadday = daystart
 			pcs_nerd += 10
 		end
-		if pcs_intel >= 50:pcs_intel += RAND(0,1)
-		if pcs_intel < 50:pcs_intel += RAND(0,2)
+		if pcs_intel >= 50:intel_exp += RAND(0,1)
+		if pcs_intel < 50:intel_exp += RAND(0,2)
 		blizoruk+=1
 		pcs_mood += 10
 		minut += 60
@@ -579,8 +579,8 @@ $stackmagazines = {
 			lastreadday = daystart
 			pcs_nerd += 10
 		end
-		if pcs_sprt >= 50:pcs_sprt += RAND(0,1)
-		if pcs_sprt < 50:pcs_sprt += RAND(0,2)
+		if pcs_sprt >= 50:sprt_exp += RAND(0,1)
+		if pcs_sprt < 50:sprt_exp += RAND(0,2)
 		blizoruk+=1
 		pcs_mood += 10
 		minut += 60
@@ -600,8 +600,8 @@ $stackmagazines = {
 			lastreadday = daystart
 			pcs_nerd += 10
 		end
-		if pcs_sprt >= 50:pcs_sprt += RAND(0,1)
-		if pcs_sprt < 50:pcs_sprt += RAND(0,2)
+		if pcs_sprt >= 50:sprt_exp += RAND(0,1)
+		if pcs_sprt < 50:sprt_exp += RAND(0,2)
 		blizoruk+=1
 		pcs_mood += 10
 		pcs_willpwr += 100

+ 1 - 1
locations/tanspalnya

@@ -42,7 +42,7 @@ end
 act 'Study (2:00)':
 	cla
 	minut += 120
-	pcs_intel += 1
+	intel_exp += 1
 	'You spend two hours studying and feel a little smarter now.'
 
 	act 'Finish':gt 'tanspalnya'

+ 3 - 3
locations/univer

@@ -48,7 +48,7 @@ if $ARGS[0] = 'start':
 			*clr
 			minut += 60
 			abiturient += 1
-			pcs_intel += 1 + (mentats_dose - rand(0,mentats_dose))
+			intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
 			'<center><img src="images/etogame/classroom.jpg"></center>'
 			'You attend the preparatory class for a hour, you stayed focused on learning what is needed so you can attend school.'
 
@@ -160,7 +160,7 @@ if $ARGS[0] = 'dekanat':
 			hour = 14
 			minut = 0
 			lektor += 1
-			pcs_intel += 1 + (mentats_dose - rand(0,mentats_dose))
+			intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
 			gs 'stat'
 			'<center><img src="images/etogame/classroom1.jpg"></center>'
 			'You attend the lecture, taking notes as the professor lectures the class about the course.'
@@ -280,7 +280,7 @@ if $ARGS[0] = 'dekanat':
 		act 'Hand in your course work':
 			cla
 			*clr
-			pcs_intel += 1 + (mentats_dose - rand(0,mentats_dose))
+			intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
 			kursovik = 0
 			kursovikD += 1
 			'<center><img src="images/etogame/classroom1.jpg"></center>'

+ 6 - 6
locations/vokzalGin

@@ -46,8 +46,8 @@ if $ARGS[0] = '':
 				minut += 60
 				pcs_sweat += 10
 
-				if pcs_vital < 15:pcs_vital += rand(0, 1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
-				if pcs_stren < 15:pcs_stren += rand(0, 1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+				if pcs_vital < 15:vital_exp += rand(0, 1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+				if pcs_stren < 15:stren_exp += rand(0, 1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 
 				gs 'stat'
 				'<center><img src="images/etogame/clener1.jpg"></center>'
@@ -64,8 +64,8 @@ if $ARGS[0] = '':
 				minut += 30
 				pcs_sweat += 10
 
-				if pcs_vital < 15:pcs_vital += rand(0, 1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
-				if pcs_stren < 15:pcs_stren += rand(0, 1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+				if pcs_vital < 15:vital_exp += rand(0, 1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+				if pcs_stren < 15:stren_exp += rand(0, 1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 
 				gs 'stat'
 				'<center><img src="images/etogame/clener1.jpg"></center>'
@@ -84,8 +84,8 @@ if $ARGS[0] = '':
 				minut += 30
 				pcs_sweat += 10
 
-				if pcs_vital < 15:pcs_vital += rand(0, 1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
-				if pcs_stren < 15:pcs_stren += rand(0, 1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+				if pcs_vital < 15:vital_exp += rand(0, 1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
+				if pcs_stren < 15:stren_exp += rand(0, 1) + (steroid_dose - rand(0,steroid_dose)) & gs 'obj_din', 'steroids'
 
 				gs 'stat'
 				'<center><img src="images/etogame/clener1.jpg"></center>'

+ 1 - 1
locations/vokzaltorg

@@ -15,7 +15,7 @@ if tovarand > tovarL:tovarand = tovarL
 tovpay = tovarand * 300
 money += tovpay
 tovarL -= tovarand
-pcs_sprt += rand(0, 1)
+sprt_exp += rand(0, 1)
 TorgVokzalTimes += 1
 pcs_dom += 1
 gs 'stat'

+ 1 - 1
locations/ybass

@@ -20,7 +20,7 @@ act 'Swim (1:00)':
 	pcs_sweat = 10 + rand(0,4)
 	pcs_mood += 5
 	pcs_willpwr += 5
-	if pcs_stren < 40:pcs_stren += 1
+	if pcs_stren < 40:stren_exp += 1
 
 	'<center><img src="images/pics/swim.jpg"></center>'
 	'You swim in the pool, the water refreshes and invigorates.'

+ 1 - 1
locations/ykamin

@@ -35,7 +35,7 @@ if pcs_sewng >= 200:
 		act'Work on the tapestry for an hour':
 			cls
 			minut += 60
-			pcs_sewng += rand(0,1000)
+			sewng_exp += rand(0,1000)
 			gobramax = pcs_sewng/100
 			gobramin = pcs_sewng/200
 			newgobelen += rand(gobramin,gobramax)