6 Commits f81287568b ... f05d95aa4f

Author SHA1 Message Date
  Kevin_Smarts f05d95aa4f [changed] just trimmed the trailing spaces 2 months ago
  Kevin_Smarts 9bdd48967e Merge remote-tracking branch 'Hooded_Silence/master' 2 months ago
  Kevin_Smarts 7bc5fccf56 [fixed] missing opening bracket for comment 2 months ago
  Kevin_Smarts ea3e027815 Merge remote-tracking branch 'Awesome/master' 2 months ago
  Kevin_Smarts 519b1271fd [fixed] use of imperial crap breaking our perfect metric world, or something. Idk 2 months ago
  Hooded Silence 297d845f88 [Bug Fix] Remove errant comment breaks in npcstatic files 2 months ago
4 changed files with 51 additions and 50 deletions
  1. 27 26
      locations/npcstatic1.qsrc
  2. 11 11
      locations/npcstatic3.qsrc
  3. 12 12
      locations/npcstatic4.qsrc
  4. 1 1
      locations/npcstatic5.qsrc

+ 27 - 26
locations/npcstatic1.qsrc

@@ -23,6 +23,7 @@
 !!chubby - a bit fat
 !!fat - fat
 !!obese - very fat
+
 !{
 Empty number - 66(bandit), 100, 231
 
@@ -70,7 +71,7 @@ $npc_selfie['A<<npctemp>>'] = '<a href="exec:numnpc = 1 & gt ''phone_selfies'',
 !!	It is advisable to start an NPC with a call to reset all their preferences.
 !!		gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 !!		gs 'npc_standard_preferences', 'A<<npctemp>>'
-!!	
+!!
 !!	It should not matter, but it ensures that the npc is reset to the factory settings
 !!	Any later additions will be removed this way.
 
@@ -177,7 +178,7 @@ npc_rep['A<<npctemp>>'] = 260
 npc_intel['A<<npctemp>>'] = 57
 hotcat_rating['A<<npctemp>>'] =  8
 !!height_metric = 180cm
-!!height_imperial = 5'11"'
+!!height_imperial = 5foot 11inch
 !!body_build = average
 !!hair = brown
 
@@ -207,7 +208,7 @@ npc_rep['A<<npctemp>>'] = 30
 npc_intel['A<<npctemp>>'] = 84
 hotcat_rating['A<<npctemp>>'] = 6
 !!height_metric = 177cm
-!!height_imperial = 5'10"'
+!!height_imperial = 5foot 10inch
 !!body_build = average
 !!hair = black
 
@@ -237,7 +238,7 @@ npc_rep['A<<npctemp>>'] = 190
 npc_intel['A<<npctemp>>'] = 30
 hotcat_rating['A<<npctemp>>'] =  7
 !!height_metric = 181cm
-!!height_imperial = 5'11"'
+!!height_imperial = 5foot 11inch
 !!body_build = muscular
 !!hair = black
 
@@ -269,7 +270,7 @@ npc_sexskill['A<<npctemp>>'] = 1
 npc_intel['A<<npctemp>>'] = 47
 hotcat_rating['A<<npctemp>>'] = 5
 !!height_metric = 170cm
-!!height_imperial = 5'6"'
+!!height_imperial = 5foot 6inch
 !!body_build = skinny
 !!hair = blond
 
@@ -300,7 +301,7 @@ npc_rep['A<<npctemp>>'] = 160
 npc_intel['A<<npctemp>>'] = 41
 hotcat_rating['A<<npctemp>>'] = 7
 !!height_metric = 175cm
-!!height_imperial = 5'9"'
+!!height_imperial = 5foot 9inch
 !!body_build = toned/athletic
 !!hair = brown
 
@@ -330,7 +331,7 @@ npc_rep['A<<npctemp>>'] = 10
 npc_intel['A<<npctemp>>'] = 67
 hotcat_rating['A<<npctemp>>'] = 4
 !!height_metric = 172cm
-!!height_imperial = 5'8"'
+!!height_imperial = 5foot 8inch
 !!body_build = skinny
 !!hair = brown
 
@@ -360,7 +361,7 @@ npc_rep['A<<npctemp>>'] = 0
 npc_intel['A<<npctemp>>'] = 55
 hotcat_rating['A<<npctemp>>'] = 1
 !!height_metric = 174cm
-!!height_imperial = 5'9"'
+!!height_imperial = 5foot 9inch
 !!body_build = skinny
 !!hair = black
 
@@ -390,7 +391,7 @@ npc_rep['A<<npctemp>>'] = 170
 npc_intel['A<<npctemp>>'] = 52
 hotcat_rating['A<<npctemp>>'] =  7
 !!height_metric = 179cm
-!!height_imperial = 5'10"'
+!!height_imperial = 5foot 10inch
 !!body_build = muscular
 !!hair = brown
 
@@ -421,7 +422,7 @@ npc_sexskill['A<<npctemp>>'] = rand(0,2)
 npc_intel['A<<npctemp>>'] = 31
 hotcat_rating['A<<npctemp>>'] = 5
 !!height_metric = 189cm
-!!height_imperial = 6'2"'
+!!height_imperial = 6foot 2inch
 !!body_build = muscular
 !!hair = brown
 
@@ -452,7 +453,7 @@ npc_sexskill['A<<npctemp>>'] = rand(0,2)
 npc_intel['A<<npctemp>>'] = 48
 hotcat_rating['A<<npctemp>>'] = 6
 !!height_metric = 184cm
-!!height_imperial = 6'1"'
+!!height_imperial = 6foot 1inch
 !!body_build = wiry
 !!hair = black
 
@@ -483,7 +484,7 @@ npc_sexskill['A<<npctemp>>'] = rand(0,2)
 npc_intel['A<<npctemp>>'] = 33
 hotcat_rating['A<<npctemp>>'] =  4
 !!height_metric = 174cm
-!!height_imperial = 5'9"'
+!!height_imperial = 5foot 9inch
 !!body_build = toned/athletic
 !!hair = blond
 
@@ -513,7 +514,7 @@ npc_rep['A<<npctemp>>'] = 10
 npc_intel['A<<npctemp>>'] = 80
 hotcat_rating['A<<npctemp>>'] = 7
 !!height_metric = 170cm
-!!height_imperial = 5'7"'
+!!height_imperial = 5foot 7inch
 !!body_build = average
 !!hair = long brown hair just past her shoulders.
 !!pubic hair = Neatly trimmed landing strip
@@ -545,7 +546,7 @@ npc_bust['A<<npctemp>>'] = 8
 npc_rep['A<<npctemp>>'] = 40
 hotcat_rating['A<<npctemp>>'] = 6
 !!height_metric = 161cm
-!!height_imperial = 5'3"'
+!!height_imperial = 5foot 3inch
 !!body_build = toned/athletic
 !!hair = short blonde hair.
 !!pubic hair = neatly trimmed small V
@@ -576,7 +577,7 @@ npc_rep['A<<npctemp>>'] = 20
 npc_intel['A<<npctemp>>'] = 77
 hotcat_rating['A<<npctemp>>'] = 7
 !!height_metric = 162cm
-!!height_imperial = 5'4"'
+!!height_imperial = 5foot 4inch
 !!body_build = average
 !!hair = very long red hair reaching half way down her back.
 !!pubic hair = shaved
@@ -607,7 +608,7 @@ npc_intel['A<<npctemp>>'] = 52
 npc_rep['A<<npctemp>>'] = 90
 hotcat_rating['A<<npctemp>>'] = 7
 !!height_metric = 160cm
-!!height_imperial = 5'3"'
+!!height_imperial = 5foot 3inch
 !!body_build = average
 !!hair = long red hair just past her shoulders.
 !!pubic hair = neatly trimmed triangle
@@ -638,7 +639,7 @@ npc_intel['A<<npctemp>>'] = 73
 npc_rep['A<<npctemp>>'] = 30
 hotcat_rating['A<<npctemp>>'] = 6
 !!height_metric = 166cm
-!!height_imperial = 5'5"'
+!!height_imperial = 5foot 5inch
 !!body_build = average
 !!hair = very long light brown hair reaching half way down her back.
 !!pubic hair = neatly trimmed triangle
@@ -669,7 +670,7 @@ npc_intel['A<<npctemp>>'] = 44
 npc_rep['A<<npctemp>>'] = 60
 hotcat_rating['A<<npctemp>>'] = 8
 !!height_metric = 167cm
-!!height_imperial = 5'6"'
+!!height_imperial = 5foot 6inch
 !!body_build = petite
 !!hair = long blonde hair just past her shoulders.
 !!pubic hair = neatly trimmed landing strip
@@ -701,7 +702,7 @@ npc_intel['A<<npctemp>>'] = 32
 npc_rep['A<<npctemp>>'] = 80
 hotcat_rating['A<<npctemp>>'] = 7
 !!height_metric = 163cm
-!!height_imperial = 5'4"'
+!!height_imperial = 5foot 4inch
 !!body_build = muscular
 !!hair = long blonde hair just past her shoulders, almost always kept in a ponytail.
 !!pubic hair = neatly trimmed landing strip
@@ -732,7 +733,7 @@ npc_intel['A<<npctemp>>'] = 30
 npc_rep['A<<npctemp>>'] = 60
 hotcat_rating['A<<npctemp>>'] = 7
 !!height_metric = 165cm
-!!height_imperial = 5'5"'
+!!height_imperial = 5foot 5inch
 !!body_build = toned/athletic
 !!hair = long brown hair just past her shoulders, almost always kept in a ponytail.
 !!pubic hair = neatly trimmed landing strip
@@ -763,7 +764,7 @@ npc_intel['A<<npctemp>>'] = 33
 hotcat_rating['A<<npctemp>>'] = 6
 npc_rep['A<<npctemp>>'] = 30
 !!height_metric = 173cm
-!!height_imperial = 5'8"'
+!!height_imperial = 5foot 8inch
 !!body_build = toned/athletic
 !!hair = long dyed red hair just past her shoulders.
 !!pubic hair = neatly trimmed landing strip
@@ -794,7 +795,7 @@ npc_intel['A<<npctemp>>'] = 24
 hotcat_rating['A<<npctemp>>'] = 6
 npc_rep['A<<npctemp>>'] = 80
 !!height_metric = 162cm
-!!height_imperial = 5'4"'
+!!height_imperial = 5foot 4inch
 !!body_build = average
 !!hair = long brown hair almost always kept in a ponytail.
 !!pubic hair = neatly trimmed small V
@@ -825,7 +826,7 @@ npc_intel['A<<npctemp>>'] = 36
 npc_rep['A<<npctemp>>'] = 90
 hotcat_rating['A<<npctemp>>'] = 9
 !!height_metric = 174cm
-!!height_imperial = 5'9"'
+!!height_imperial = 5foot 9inch
 !!body_build = skinny
 !!hair = very long light brown hair reaching half way down her back.
 !!pubic hair = shaved
@@ -857,7 +858,7 @@ npc_intel['A<<npctemp>>'] = 46
 npc_rep['A<<npctemp>>'] = 70
 hotcat_rating['A<<npctemp>>'] = 8
 !!height_metric = 154cm
-!!height_imperial = 5'1"'
+!!height_imperial = 5foot 1inch
 !!body_build = toned/athletic
 !!hair = very long dark brown hair reaching half way down her back.
 !!pubic hair = shaved
@@ -888,7 +889,7 @@ npc_intel['A<<npctemp>>'] = 42
 npc_rep['A<<npctemp>>'] = 90
 hotcat_rating['A<<npctemp>>'] = 5
 !!height_metric = 165cm
-!!height_imperial = 5'5"'
+!!height_imperial = 5foot 5inch
 !!body_build = toned/athletic
 !!hair = long black hair just past her shoulders.
 !!pubic hair = neatly trimmed triangle
@@ -929,7 +930,7 @@ npc_bust['A<<npctemp>>'] = 9
 npc_intel['A<<npctemp>>']   = 54
 hotcat_rating['A<<npctemp>>'] = 6
 !!height_metric = 163cm
-!!height_imperial = 5'4"'
+!!height_imperial = 5foot 4inch
 !!body_build = petite
 !!hair = long brown hair just past her shoulders.
 !!pubic hair = Neatly trimmed triangle

+ 11 - 11
locations/npcstatic3.qsrc

@@ -729,7 +729,7 @@ npc_intel['A<<npctemp>>'] = 38
 npc_rep['A<<npctemp>>'] = 60
 hotcat_rating['A<<npctemp>>'] = 6
 !!height_metric = 171cm
-!!height_imperial = 5'7"'
+!!height_imperial = 5foot 7inch
 !!body_build = average
 !!hair = long black hair just past her shoulders.
 !!pubic hair = shaved
@@ -760,7 +760,7 @@ npc_intel['A<<npctemp>>'] = 63
 npc_rep['A<<npctemp>>'] = 60
 hotcat_rating['A<<npctemp>>'] = 7
 !!height_metric = 164cm
-!!height_imperial = 5'5"'
+!!height_imperial = 5foot 5inch
 !!body_build = petite
 !!hair = long redish brown hair just past her shoulders.
 !!pubic hair = Neatly trimmed triangle
@@ -790,7 +790,7 @@ npc_intel['A<<npctemp>>'] = 49
 hotcat_rating['A<<npctemp>>'] = 7
 npc_rep['A<<npctemp>>'] = 0
 !!height_metric = 170cm
-!!height_imperial = 5'7"'
+!!height_imperial = 5foot 7inch
 !!body_build = toned/athletic
 !!hair = long dirty blonde hair just past her shoulders, almost always kept in a ponytail.
 !!pubic hair = Neatly trimmed triangle
@@ -821,7 +821,7 @@ npc_intel['A<<npctemp>>'] = 86
 npc_rep['A<<npctemp>>'] = 10
 hotcat_rating['A<<npctemp>>'] = 5
 !!height_metric = 152cm
-!!height_imperial = 5'
+!!height_imperial = 5foot
 !!body_build = petite
 !!hair = long brown hair just past her shoulders, almost always kept up in a bun.
 !!pubic hair = untrimmed bush
@@ -852,7 +852,7 @@ hotcat_rating['A<<npctemp>>'] = 6
 npc_rep['A<<npctemp>>'] = 120
 
 !!height_metric = 168cm
-!!height_imperial = 5'6"'
+!!height_imperial = 5foot 6inch
 !!body_build = average
 !!hair = long black hair just past her shoulders.
 !!pubic hair = neatly trimmed landing strip
@@ -883,7 +883,7 @@ npc_intel['A<<npctemp>>'] = 76
 npc_rep['A<<npctemp>>'] = 220
 hotcat_rating['A<<npctemp>>'] = 8
 !!height_metric = 159cm
-!!height_imperial = 5'3"'
+!!height_imperial = 5foot 3inch
 !!body_build = petite
 !!hair = medium length black hair just past her chin.
 !!pubic hair = shaved
@@ -913,7 +913,7 @@ npc_intel['A<<npctemp>>'] = 28
 hotcat_rating['A<<npctemp>>'] = 4
 npc_rep['A<<npctemp>>'] = 70
 !!height_metric = 178cm
-!!height_imperial = 5'10"'
+!!height_imperial = 5foot 10inch
 !!body_build = muscular
 !!hair = long brown hair just past her shoulders.
 !!pubic hair = untrimmed bush
@@ -945,7 +945,7 @@ npc_intel['A<<npctemp>>'] = 47
 npc_rep['A<<npctemp>>'] = 220
 hotcat_rating['A<<npctemp>>'] = 8
 !!height_metric = 185cm
-!!height_imperial = 6'1"'
+!!height_imperial = 6foot 1inch
 !!body_build = toned/athletic
 !!hair = black
 
@@ -976,7 +976,7 @@ npc_intel['A<<npctemp>>'] = 37
 npc_rep['A<<npctemp>>'] = 210
 hotcat_rating['A<<npctemp>>'] = 8
 !!height_metric = 175cm
-!!height_imperial = 5'9"'
+!!height_imperial = 5foot 9inch
 !!body_build = average
 !!hair = brown
 
@@ -1006,7 +1006,7 @@ hotcat_rating['A<<npctemp>>'] = 6
 npc_rep['A<<npctemp>>'] = 130
 npc_intel['A<<npctemp>>'] = 44
 !!height_metric = 177cm
-!!height_imperial = 5'10"'
+!!height_imperial = 5foot 10inch
 !!body_build = average
 !!hair = brown
 
@@ -1033,7 +1033,7 @@ npc_intel['A<<npctemp>>'] = 40
 npc_rep['A<<npctemp>>'] = 320
 hotcat_rating['A<<npctemp>>'] = 7
 !!height_metric = 182cm
-!!height_imperial = 6'
+!!height_imperial = 6foot
 !!body_build = toned/athletic
 !!hair = black
 

+ 12 - 12
locations/npcstatic4.qsrc

@@ -23,7 +23,7 @@ hotcat_rating['A<<npctemp>>'] = 4
 npc_rep['A<<npctemp>>'] = 110
 npc_intel['A<<npctemp>>'] = 26
 !!height_metric = 196cm
-!!height_imperial = 6'5"'
+!!height_imperial = 6foot 5inch
 !!body_build = bodybuilder
 !!hair = black
 
@@ -53,7 +53,7 @@ hotcat_rating['A<<npctemp>>'] = 3
 npc_rep['A<<npctemp>>'] = 0
 npc_intel['A<<npctemp>>'] = 87
 !!height_metric = 173cm
-!!height_imperial = 5'8"'
+!!height_imperial = 5foot 8inch
 !!body_build = average
 !!hair = brown
 
@@ -84,7 +84,7 @@ npc_intel['A<<npctemp>>'] = 70
 npc_rep['A<<npctemp>>'] = 60
 hotcat_rating['A<<npctemp>>'] = 6
 !!height_metric = 182cm
-!!height_imperial = 6'
+!!height_imperial = 6foot
 !!body_build = skinny
 !!hair = redish/brown
 
@@ -115,7 +115,7 @@ npc_intel['A<<npctemp>>'] = 92
 npc_rep['A<<npctemp>>'] = 20
 hotcat_rating['A<<npctemp>>'] = 4
 !!height_metric = 176cm
-!!height_imperial = 5'10"'
+!!height_imperial = 5foot 10inch
 !!body_build = average
 !!hair = blond
 
@@ -145,7 +145,7 @@ hotcat_rating['A<<npctemp>>'] = 7
 npc_rep['A<<npctemp>>'] = 370
 npc_intel['A<<npctemp>>'] = 51
 !!height_metric = 179cm
-!!height_imperial = 5'10"'
+!!height_imperial = 5foot 10inch
 !!body_build = average
 !!hair = black
 
@@ -176,7 +176,7 @@ npc_intel['A<<npctemp>>'] = 51
 npc_rep['A<<npctemp>>'] = 240
 hotcat_rating['A<<npctemp>>'] = 7
 !!height_metric = 178cm
-!!height_imperial = 5'10"'
+!!height_imperial = 5foot 10inch
 !!body_build = average
 !!hair = blond
 
@@ -206,7 +206,7 @@ hotcat_rating['A<<npctemp>>'] = 5
 npc_rep['A<<npctemp>>'] = 260
 npc_intel['A<<npctemp>>'] = 42
 !!height_metric = 178cm
-!!height_imperial = 5'10"'
+!!height_imperial = 5foot 10inch
 !!body_build = toned/athletic
 !!hair = black
 
@@ -236,7 +236,7 @@ hotcat_rating['A<<npctemp>>'] = 5
 npc_rep['A<<npctemp>>'] = 170
 npc_intel['A<<npctemp>>'] = 34
 !!height_metric = 168cm
-!!height_imperial = 5'6"'
+!!height_imperial = 5foot 6inch
 !!body_build = muscular
 !!hair = brown
 
@@ -266,7 +266,7 @@ hotcat_rating['A<<npctemp>>'] = 6
 npc_rep['A<<npctemp>>'] = 280
 npc_intel['A<<npctemp>>'] = 44
 !!height_metric = 183cm
-!!height_imperial = 6'
+!!height_imperial = 6foot
 !!body_build = average
 !!hair = brown
 
@@ -297,7 +297,7 @@ npc_intel['A<<npctemp>>'] = 28
 npc_rep['A<<npctemp>>'] = 0
 hotcat_rating['A<<npctemp>>'] = 1
 !!height_metric = 188cm
-!!height_imperial = 6'2"'
+!!height_imperial = 6foot 2inch
 !!body_build = obese
 !!hair = brown
 
@@ -407,7 +407,7 @@ npc_intel['A<<npctemp>>'] = 36
 npc_rep['A<<npctemp>>'] = 120
 hotcat_rating['A<<npctemp>>'] = 5
 !!height_metric = 173cm
-!!height_imperial = 5'8"'
+!!height_imperial = 5foot 8inch
 !!body_build = toned/athletic
 !!hair = brown
 
@@ -832,7 +832,7 @@ hotcat_rating['A<<npctemp>>'] = 6
 npc_rep['A<<npctemp>>'] = 140
 npc_intel['A<<npctemp>>'] = 64
 !!height_metric = 183cm
-!!height_imperial = 6'
+!!height_imperial = 6foot
 !!body_build = wiry
 !!hair = black
 

+ 1 - 1
locations/npcstatic5.qsrc

@@ -375,7 +375,7 @@ npc_spermpot['A<<npctemp>>'] = 15000
 
 
 npctemp = 218
-$npc_dna['A<<npctemp>>'] = '5202110092 7845565703 6464348916 9732666365 5079835231 5694584637 6691107840' 
+$npc_dna['A<<npctemp>>'] = '5202110092 7845565703 6464348916 9732666365 5079835231 5694584637 6691107840'
 !! Her dads DNA: 6464348916 5694584637 6691107840 5573828639 2708900987 2978548641 1067638646
 $npc_firstname['A<<npctemp>>'] = 'Tanya'
 $npc_nickname['A<<npctemp>>'] = 'Tanya'