3 Achegas f05d95aa4f ... 2797a5eb6b

Autor SHA1 Mensaxe Data
  Hooded Silence 2797a5eb6b [Data Corruption] Fix merge corruption hai 2 meses
  Hooded Silence 34cd6a97ac Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife hai 2 meses
  Hooded Silence c108eb2f8f Revert "[Bug Fix] Remove errant comment breaks in npcstatic files" hai 2 meses
Modificáronse 3 ficheiros con 29 adicións e 29 borrados
  1. 26 25
      locations/npcstatic1.qsrc
  2. 2 2
      locations/npcstatic3.qsrc
  3. 1 2
      locations/npcstatic4.qsrc

+ 26 - 25
locations/npcstatic1.qsrc

@@ -24,6 +24,7 @@
 !!fat - fat
 !!obese - very fat
 
+!2022/01/03
 !{
 Empty number - 66(bandit), 100, 231
 
@@ -178,7 +179,7 @@ npc_rep['A<<npctemp>>'] = 260
 npc_intel['A<<npctemp>>'] = 57
 hotcat_rating['A<<npctemp>>'] =  8
 !!height_metric = 180cm
-!!height_imperial = 5foot 11inch
+!!height_imperial = 5ft 11in
 !!body_build = average
 !!hair = brown
 
@@ -208,7 +209,7 @@ npc_rep['A<<npctemp>>'] = 30
 npc_intel['A<<npctemp>>'] = 84
 hotcat_rating['A<<npctemp>>'] = 6
 !!height_metric = 177cm
-!!height_imperial = 5foot 10inch
+!!height_imperial = 5ft 10in
 !!body_build = average
 !!hair = black
 
@@ -238,7 +239,7 @@ npc_rep['A<<npctemp>>'] = 190
 npc_intel['A<<npctemp>>'] = 30
 hotcat_rating['A<<npctemp>>'] =  7
 !!height_metric = 181cm
-!!height_imperial = 5foot 11inch
+!!height_imperial = 5ft 11in
 !!body_build = muscular
 !!hair = black
 
@@ -270,7 +271,7 @@ npc_sexskill['A<<npctemp>>'] = 1
 npc_intel['A<<npctemp>>'] = 47
 hotcat_rating['A<<npctemp>>'] = 5
 !!height_metric = 170cm
-!!height_imperial = 5foot 6inch
+!!height_imperial = 5ft 6in
 !!body_build = skinny
 !!hair = blond
 
@@ -301,7 +302,7 @@ npc_rep['A<<npctemp>>'] = 160
 npc_intel['A<<npctemp>>'] = 41
 hotcat_rating['A<<npctemp>>'] = 7
 !!height_metric = 175cm
-!!height_imperial = 5foot 9inch
+!!height_imperial = 5ft 9in
 !!body_build = toned/athletic
 !!hair = brown
 
@@ -331,7 +332,7 @@ npc_rep['A<<npctemp>>'] = 10
 npc_intel['A<<npctemp>>'] = 67
 hotcat_rating['A<<npctemp>>'] = 4
 !!height_metric = 172cm
-!!height_imperial = 5foot 8inch
+!!height_imperial = 5ft 8in
 !!body_build = skinny
 !!hair = brown
 
@@ -361,7 +362,7 @@ npc_rep['A<<npctemp>>'] = 0
 npc_intel['A<<npctemp>>'] = 55
 hotcat_rating['A<<npctemp>>'] = 1
 !!height_metric = 174cm
-!!height_imperial = 5foot 9inch
+!!height_imperial = 5ft 9in
 !!body_build = skinny
 !!hair = black
 
@@ -391,7 +392,7 @@ npc_rep['A<<npctemp>>'] = 170
 npc_intel['A<<npctemp>>'] = 52
 hotcat_rating['A<<npctemp>>'] =  7
 !!height_metric = 179cm
-!!height_imperial = 5foot 10inch
+!!height_imperial = 5ft 10in
 !!body_build = muscular
 !!hair = brown
 
@@ -422,7 +423,7 @@ npc_sexskill['A<<npctemp>>'] = rand(0,2)
 npc_intel['A<<npctemp>>'] = 31
 hotcat_rating['A<<npctemp>>'] = 5
 !!height_metric = 189cm
-!!height_imperial = 6foot 2inch
+!!height_imperial = 6ft 2in
 !!body_build = muscular
 !!hair = brown
 
@@ -453,7 +454,7 @@ npc_sexskill['A<<npctemp>>'] = rand(0,2)
 npc_intel['A<<npctemp>>'] = 48
 hotcat_rating['A<<npctemp>>'] = 6
 !!height_metric = 184cm
-!!height_imperial = 6foot 1inch
+!!height_imperial = 6ft 1in
 !!body_build = wiry
 !!hair = black
 
@@ -484,7 +485,7 @@ npc_sexskill['A<<npctemp>>'] = rand(0,2)
 npc_intel['A<<npctemp>>'] = 33
 hotcat_rating['A<<npctemp>>'] =  4
 !!height_metric = 174cm
-!!height_imperial = 5foot 9inch
+!!height_imperial = 5ft 9in
 !!body_build = toned/athletic
 !!hair = blond
 
@@ -514,7 +515,7 @@ npc_rep['A<<npctemp>>'] = 10
 npc_intel['A<<npctemp>>'] = 80
 hotcat_rating['A<<npctemp>>'] = 7
 !!height_metric = 170cm
-!!height_imperial = 5foot 7inch
+!!height_imperial = 5ft 7in
 !!body_build = average
 !!hair = long brown hair just past her shoulders.
 !!pubic hair = Neatly trimmed landing strip
@@ -546,7 +547,7 @@ npc_bust['A<<npctemp>>'] = 8
 npc_rep['A<<npctemp>>'] = 40
 hotcat_rating['A<<npctemp>>'] = 6
 !!height_metric = 161cm
-!!height_imperial = 5foot 3inch
+!!height_imperial = 5ft 3in
 !!body_build = toned/athletic
 !!hair = short blonde hair.
 !!pubic hair = neatly trimmed small V
@@ -577,7 +578,7 @@ npc_rep['A<<npctemp>>'] = 20
 npc_intel['A<<npctemp>>'] = 77
 hotcat_rating['A<<npctemp>>'] = 7
 !!height_metric = 162cm
-!!height_imperial = 5foot 4inch
+!!height_imperial = 5ft 4in
 !!body_build = average
 !!hair = very long red hair reaching half way down her back.
 !!pubic hair = shaved
@@ -608,7 +609,7 @@ npc_intel['A<<npctemp>>'] = 52
 npc_rep['A<<npctemp>>'] = 90
 hotcat_rating['A<<npctemp>>'] = 7
 !!height_metric = 160cm
-!!height_imperial = 5foot 3inch
+!!height_imperial = 5ft 3in
 !!body_build = average
 !!hair = long red hair just past her shoulders.
 !!pubic hair = neatly trimmed triangle
@@ -639,7 +640,7 @@ npc_intel['A<<npctemp>>'] = 73
 npc_rep['A<<npctemp>>'] = 30
 hotcat_rating['A<<npctemp>>'] = 6
 !!height_metric = 166cm
-!!height_imperial = 5foot 5inch
+!!height_imperial = 5ft 5in
 !!body_build = average
 !!hair = very long light brown hair reaching half way down her back.
 !!pubic hair = neatly trimmed triangle
@@ -670,7 +671,7 @@ npc_intel['A<<npctemp>>'] = 44
 npc_rep['A<<npctemp>>'] = 60
 hotcat_rating['A<<npctemp>>'] = 8
 !!height_metric = 167cm
-!!height_imperial = 5foot 6inch
+!!height_imperial = 5ft 6in
 !!body_build = petite
 !!hair = long blonde hair just past her shoulders.
 !!pubic hair = neatly trimmed landing strip
@@ -702,7 +703,7 @@ npc_intel['A<<npctemp>>'] = 32
 npc_rep['A<<npctemp>>'] = 80
 hotcat_rating['A<<npctemp>>'] = 7
 !!height_metric = 163cm
-!!height_imperial = 5foot 4inch
+!!height_imperial = 5ft 4in
 !!body_build = muscular
 !!hair = long blonde hair just past her shoulders, almost always kept in a ponytail.
 !!pubic hair = neatly trimmed landing strip
@@ -733,7 +734,7 @@ npc_intel['A<<npctemp>>'] = 30
 npc_rep['A<<npctemp>>'] = 60
 hotcat_rating['A<<npctemp>>'] = 7
 !!height_metric = 165cm
-!!height_imperial = 5foot 5inch
+!!height_imperial = 5ft 5in
 !!body_build = toned/athletic
 !!hair = long brown hair just past her shoulders, almost always kept in a ponytail.
 !!pubic hair = neatly trimmed landing strip
@@ -764,7 +765,7 @@ npc_intel['A<<npctemp>>'] = 33
 hotcat_rating['A<<npctemp>>'] = 6
 npc_rep['A<<npctemp>>'] = 30
 !!height_metric = 173cm
-!!height_imperial = 5foot 8inch
+!!height_imperial = 5ft 8in
 !!body_build = toned/athletic
 !!hair = long dyed red hair just past her shoulders.
 !!pubic hair = neatly trimmed landing strip
@@ -795,7 +796,7 @@ npc_intel['A<<npctemp>>'] = 24
 hotcat_rating['A<<npctemp>>'] = 6
 npc_rep['A<<npctemp>>'] = 80
 !!height_metric = 162cm
-!!height_imperial = 5foot 4inch
+!!height_imperial = 5ft 4in
 !!body_build = average
 !!hair = long brown hair almost always kept in a ponytail.
 !!pubic hair = neatly trimmed small V
@@ -826,7 +827,7 @@ npc_intel['A<<npctemp>>'] = 36
 npc_rep['A<<npctemp>>'] = 90
 hotcat_rating['A<<npctemp>>'] = 9
 !!height_metric = 174cm
-!!height_imperial = 5foot 9inch
+!!height_imperial = 5ft 9in
 !!body_build = skinny
 !!hair = very long light brown hair reaching half way down her back.
 !!pubic hair = shaved
@@ -858,7 +859,7 @@ npc_intel['A<<npctemp>>'] = 46
 npc_rep['A<<npctemp>>'] = 70
 hotcat_rating['A<<npctemp>>'] = 8
 !!height_metric = 154cm
-!!height_imperial = 5foot 1inch
+!!height_imperial = 5ft 1in
 !!body_build = toned/athletic
 !!hair = very long dark brown hair reaching half way down her back.
 !!pubic hair = shaved
@@ -889,7 +890,7 @@ npc_intel['A<<npctemp>>'] = 42
 npc_rep['A<<npctemp>>'] = 90
 hotcat_rating['A<<npctemp>>'] = 5
 !!height_metric = 165cm
-!!height_imperial = 5foot 5inch
+!!height_imperial = 5ft 5in
 !!body_build = toned/athletic
 !!hair = long black hair just past her shoulders.
 !!pubic hair = neatly trimmed triangle
@@ -930,7 +931,7 @@ npc_bust['A<<npctemp>>'] = 9
 npc_intel['A<<npctemp>>']   = 54
 hotcat_rating['A<<npctemp>>'] = 6
 !!height_metric = 163cm
-!!height_imperial = 5foot 4inch
+!!height_imperial = 5ft 4in
 !!body_build = petite
 !!hair = long brown hair just past her shoulders.
 !!pubic hair = Neatly trimmed triangle

+ 2 - 2
locations/npcstatic3.qsrc

@@ -790,7 +790,7 @@ npc_intel['A<<npctemp>>'] = 49
 hotcat_rating['A<<npctemp>>'] = 7
 npc_rep['A<<npctemp>>'] = 0
 !!height_metric = 170cm
-!!height_imperial = 5foot 7inch
+!!height_imperial = 5feet 7inches
 !!body_build = toned/athletic
 !!hair = long dirty blonde hair just past her shoulders, almost always kept in a ponytail.
 !!pubic hair = Neatly trimmed triangle
@@ -945,7 +945,7 @@ npc_intel['A<<npctemp>>'] = 47
 npc_rep['A<<npctemp>>'] = 220
 hotcat_rating['A<<npctemp>>'] = 8
 !!height_metric = 185cm
-!!height_imperial = 6foot 1inch
+!height_imperial = 6foot 1inch
 !!body_build = toned/athletic
 !!hair = black
 

+ 1 - 2
locations/npcstatic4.qsrc

@@ -23,8 +23,7 @@ hotcat_rating['A<<npctemp>>'] = 4
 npc_rep['A<<npctemp>>'] = 110
 npc_intel['A<<npctemp>>'] = 26
 !!height_metric = 196cm
-!!height_imperial = 6foot 5inch
-!!body_build = bodybuilder
+!!height_imperial = 6foot 5inch!!body_build = bodybuilder
 !!hair = black