소스 검색

Defaults in Compile Npcs

Stephan Fuchs 1 년 전
부모
커밋
a3a0e37bd3

+ 19 - 28
npcs_convert.py

@@ -20,6 +20,7 @@ def file_convert(filename):
         identifier = 'none'
         npc_id = ''
         npc_subobjects = {}
+        npc_defaults = []
         counter = 0
         for line in lines:
             line = line.strip()
@@ -36,10 +37,17 @@ def file_convert(filename):
 
                         file.write('\t},\n')
 
+                        if len(npc_defaults) > 0:
+                            file.write('\tdefaults:[')
+                            file.write(','.join(npc_defaults))
+                            file.write('],\n')
+
+
                     file.write('}\n')
 
                 npc_id = 'A'+match.group(1)
                 npc_subobjects = {}
+                npc_defaults = []
                 file.write('setup.npcs["'+npc_id+'"] = {\n')
             elif len(npc_id) > 0:
                 if match := re.match(r"""<<set(?:init)?\s+\$(npc_)?(\w*?)\[\s*'A'\s*\+\s*\$npctemp\s*(?:\+\s*'(\w+)')?\]\s*=\s*(.*?)\s*>>""",line):
@@ -51,40 +59,18 @@ def file_convert(filename):
                             npc_subobjects[match.group(2)] = {}
                         npc_subobjects[match.group(2)][subObjectName] = match.group(4)
                     else:
+                        v = match.group(4)
+                        if v.startswith('$'):
+                            v="'Incorrect Initialization: "+v+"'"
                         file.write('\t')
                         file.write(match.group(2))
                         file.write(':')
-                        file.write(match.group(4))
+                        file.write(v)
                         file.write(',\n')
+                elif match:= re.match(r"""<<gs 'npcstaticdefaults'\s*(.*?)>>""",line,re.I):
+                    npc_defaults.append(match.group(1).replace("' '",'_'))
 
 
-
-            if match := re.match(r"""^\s*::.*attributes_(.*?)\s*$""",line):
-                identifier = match.group(1)
-                file.write("setup.npcs['"+identifier+"'] = {\n")
-                continue
-            if match := re.match(r"""^\s*<<set\s+\$(.*?)\s*=\s*(.*?)>>\s*$""",line):
-                varname = match.group(1)
-                val = match.group(2)
-
-                if submatch := re.match(r"""\s*ERROR: FAILED TO CONVERT LITERAL: "{3}'(.*)"{3}\s*""",val):
-                    val = f"'{submatch.group(1)}'"
-
-                if len(val) > 2 and val.startswith("'") and val.endswith("'"):
-                    #It's a string
-                    val = val[1:-1]
-                    val = val.replace("'",r"\'")
-                    val = f"'{val}'"
-                if counter > 0:
-                    file.write(f"""\t\t"{varname}": {val},\n""")
-                continue
-            if match := re.match(r"""^\s*<<(?:else)?if\s+\$location_var\[\$here\]\[1\]\s*==\s*(\d+)\s*>>\s*$""",line):
-                id = match.group(1)
-                if counter > 0:
-                    file.write("\t},\n")
-                file.write("\t'"+id+"':{\n")
-                counter += 1
-
         for npc_subobject_id in npc_subobjects:
             npc_subobject = npc_subobjects[npc_subobject_id]
             file.write('\t'+npc_subobject_id+':{\n')
@@ -94,6 +80,11 @@ def file_convert(filename):
 
             file.write('\t},\n')
 
+            if len(npc_defaults) > 0:
+                file.write('\tdefaults:[')
+                file.write(','.join(npc_defaults))
+                file.write('],\n')
+
         file.write('}\n')
 
 

+ 38 - 4
sugarcube/src/autogenerated/npcstatic/compiled/npcstatic1compiled.js

@@ -30,6 +30,7 @@ setup.npcs["A1"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_coolkid'],
 }
 setup.npcs["A2"] = {
 	dna:'1993665716 1616738815 1589755494 1229942753 1120816404 1371564141 1910586302',
@@ -57,6 +58,7 @@ setup.npcs["A2"] = {
 		cum_on_clothes:- 1,
 		pregnant:- 1,
 	},
+	defaults:['defaults','group_nerd'],
 }
 setup.npcs["A3"] = {
 	dna:'1580777525 1747887345 8321006077 1970922187 1029352130 7921283143 7765736018',
@@ -79,6 +81,7 @@ setup.npcs["A3"] = {
 		cum_on_clothes:- 1,
 		pregnant:- 1,
 	},
+	defaults:['defaults','group_jock'],
 }
 setup.npcs["A4"] = {
 	dna:'1438762189 1855175944 1123617000 1817906848 1390916310 1459640815 1436321833',
@@ -104,6 +107,7 @@ setup.npcs["A4"] = {
 		cum_on_face:- 1,
 		cum_on_clothes:- 1,
 	},
+	defaults:['defaults','group_coolkid'],
 }
 setup.npcs["A5"] = {
 	dna:'1379973003 1196687437 1136761140 2107449234 1973361988 1939869341 1786180096',
@@ -127,6 +131,7 @@ setup.npcs["A5"] = {
 		cum_on_clothes:- 1,
 		strong:1,
 	},
+	defaults:['defaults','group_outcast','group_jock'],
 }
 setup.npcs["A6"] = {
 	dna:'1490744069 1013739636 1009283243 1951857582 1559659111 1792925326 1086487692',
@@ -153,6 +158,7 @@ setup.npcs["A6"] = {
 		cum_on_clothes:- 1,
 		strong:1,
 	},
+	defaults:['defaults','group_nerd'],
 }
 setup.npcs["A7"] = {
 	dna:'1689930319 1973226357 2129134392 2090450913 1513523102 2063456541 1533040976',
@@ -173,6 +179,7 @@ setup.npcs["A7"] = {
 		cum_on_face:- 1,
 		cum_on_clothes:- 1,
 	},
+	defaults:['defaults','group_outcast'],
 }
 setup.npcs["A8"] = {
 	dna:'1004746288 1743479356 1890053138 1336365224 1893621358 1730538237 1325162654',
@@ -201,6 +208,7 @@ setup.npcs["A8"] = {
 		pregnant:- 1,
 		strong:1,
 	},
+	defaults:['defaults','group_jock'],
 }
 setup.npcs["A9"] = {
 	dna:'1851794364 1224420951 1300723572 1628306107 1809003038 1301990921 1253822208',
@@ -227,6 +235,7 @@ setup.npcs["A9"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_gopnik'],
 }
 setup.npcs["A10"] = {
 	dna:'2049084127 1470960834 1280333156 1706598464 1268389504 1227431573 2132916352',
@@ -257,6 +266,7 @@ setup.npcs["A10"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_gopnik'],
 }
 setup.npcs["A11"] = {
 	dna:'2092485270 1750615492 1357552191 1799649757 1558588590 1808035750 1644370082',
@@ -284,6 +294,7 @@ setup.npcs["A11"] = {
 		cum_on_face:1,
 		cum_on_clothes:1,
 	},
+	defaults:['defaults','group_gopnik'],
 }
 setup.npcs["A12"] = {
 	dna:'1898622449 1904538322 8321006077 1825474042 1063577851 7921283143 7765736018',
@@ -313,6 +324,7 @@ setup.npcs["A12"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults','group_nerd'],
 }
 setup.npcs["A13"] = {
 	dna:'1731087833 1604487809 1464859113 1561062144 1440871037 1347904523 1150306572',
@@ -343,6 +355,7 @@ setup.npcs["A13"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults','group_jock'],
 }
 setup.npcs["A14"] = {
 	dna:'1743820731 1035407288 1124546006 1260253434 1082292496 1455110922 1434089976',
@@ -366,6 +379,7 @@ setup.npcs["A14"] = {
 		tatoo:- 1,
 		tan:1,
 	},
+	defaults:['defaults','group_coolkid'],
 }
 setup.npcs["A15"] = {
 	dna:'1743820731 1035407288 1124546006 1260253434 1082292496 1455110922 1434089976',
@@ -395,6 +409,7 @@ setup.npcs["A15"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults','group_coolkid'],
 }
 setup.npcs["A16"] = {
 	dna:'1119464721 1614037462 1646642112 1959746313 1085890273 1009333823 1238937878',
@@ -424,6 +439,7 @@ setup.npcs["A16"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults','group_nerd'],
 }
 setup.npcs["A17"] = {
 	dna:'1736016429 1462897715 2010810526 1845581584 1266092607 1950870951 1153689245',
@@ -453,6 +469,7 @@ setup.npcs["A17"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults','group_coolkid'],
 }
 setup.npcs["A18"] = {
 	dna:'1695885007 2098494473 1893236781 1197776866 1613803510 1095093401 1877459340',
@@ -483,6 +500,7 @@ setup.npcs["A18"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults','group_jock'],
 }
 setup.npcs["A19"] = {
 	dna:'1868882449 1367396730 1179635869 1781589830 2141637715 1988698459 1710383168',
@@ -512,6 +530,7 @@ setup.npcs["A19"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults','group_jock'],
 }
 setup.npcs["A20"] = {
 	dna:'1851794365 1224420951 1300723572 1628306107 1809003038 1301990921 1253822208',
@@ -538,6 +557,7 @@ setup.npcs["A20"] = {
 		pregnant:- 1,
 		strong:1,
 	},
+	defaults:['defaults','group_gopnik'],
 }
 setup.npcs["A21"] = {
 	dna:'1027294118 1526664895 1047167563 1146573782 1562782691 2063456541 1533040976',
@@ -560,6 +580,7 @@ setup.npcs["A21"] = {
 		tatoo:1,
 		pregnant:- 1,
 	},
+	defaults:['group_gopnik','defaults'],
 }
 setup.npcs["A22"] = {
 	dna:'2099547924 1046564078 1433794796 1591674416 1440637551 1386979191 1773169648',
@@ -589,6 +610,7 @@ setup.npcs["A22"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults','group_coolkid'],
 }
 setup.npcs["A23"] = {
 	dna:'1410862429 1854775733 1705291842 1147504758 1609009238 1203561941 1602837590',
@@ -619,6 +641,7 @@ setup.npcs["A23"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults','group_jock'],
 }
 setup.npcs["A24"] = {
 	dna:'1989757424 1370351107 1337196420 1362464918 1383218762 1045638336 1960389781',
@@ -647,6 +670,7 @@ setup.npcs["A24"] = {
 		pregnant:- 1,
 		strong:1,
 	},
+	defaults:['defaults','group_gopnik'],
 }
 setup.npcs["A25"] = {
 	dna:'1633731691 1389436996 1448312616 1738900889 1051507305 1144473144 1251857548',
@@ -674,6 +698,7 @@ setup.npcs["A25"] = {
 		cum_on_clothes:1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_outcast','group_coolkid'],
 }
 setup.npcs["A26"] = {
 	dna:'1047167563 2063456541 1533040976 1303801542 1620497680 1042269021 1659592524',
@@ -700,6 +725,7 @@ setup.npcs["A26"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_teacher'],
 }
 setup.npcs["A27"] = {
 	dna:'1526664895 1146573782 1562782691 1262684992 1354837515 1727531312 2004326261',
@@ -717,7 +743,7 @@ setup.npcs["A28"] = {
 	dna:'1085730943 1931034853 1979821791 1720869809 1405982728 2119519439 2110201703',
 	firstname:'Vladimir',
 	nickname:'Dad',
-	lastname:$pc.name_last,
+	lastname:'Incorrect Initialization: $pc.name_last',
 	usedname:'Vladimir',
 	notes:'Your stepfather is a greying, slightly flabby man working as a truck driver. Your mother divorced your biological father and married Vladimir when you were only one year old. You`ve never seen your biological father since their divorce, and as such you have no real memory of him.',
 	dob:19700418,
@@ -737,12 +763,13 @@ setup.npcs["A28"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_family'],
 }
 setup.npcs["A29"] = {
 	dna:'1545843327 1962976090 1780199176 1930957336 1888703623 1843607237 1675779774',
 	firstname:'Natasha',
 	nickname:'Mother',
-	lastname:$pc.name_last,
+	lastname:'Incorrect Initialization: $pc.name_last',
 	usedname:'Mother',
 	notes:'Your mother Natasha',
 	dob:19820612,
@@ -763,6 +790,7 @@ setup.npcs["A29"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_family'],
 }
 setup.npcs["A30"] = {
 	dna:'1545843328 1962976090 1780199176 1930957336 1888703623 1843607237 1675779774',
@@ -783,6 +811,7 @@ setup.npcs["A30"] = {
 		cum_on_face:- 1,
 		cum_on_clothes:- 1,
 	},
+	defaults:['defaults','group_family'],
 }
 setup.npcs["A31"] = {
 	dna:'1843607237 1942499229 1221585640 1038127602 1700766678 1100784200 1819267918',
@@ -811,6 +840,7 @@ setup.npcs["A31"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A32"] = {
 	dna:'1675779774 1167755546 1500737294 1443097159 1423316671 1056299351 1530143067',
@@ -841,12 +871,13 @@ setup.npcs["A32"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A33"] = {
 	dna:'1429755064 1545843327 1198040660 1962976090 1780199176 1936146603 2049979334',
 	firstname:'Anya',
 	nickname:'Sister',
-	lastname:$pc.name_last,
+	lastname:'Incorrect Initialization: $pc.name_last',
 	usedname:'Anya',
 	notes:'Your older sister',
 	dob:19970816,
@@ -868,12 +899,13 @@ setup.npcs["A33"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults','group_family'],
 }
 setup.npcs["A34"] = {
 	dna:'1588599246 1545843327 1085730943 1962976090 1780199176 1931034853 1979821791',
 	firstname:'Kolka',
 	nickname:'Kolka',
-	lastname:$pc.name_last,
+	lastname:'Incorrect Initialization: $pc.name_last',
 	usedname:'Kolka',
 	notes:'Your Brother',
 	dob:20001219,
@@ -897,6 +929,7 @@ setup.npcs["A34"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults','group_family'],
 }
 setup.npcs["A35"] = {
 	dna:'1198040660 1936146603 2049979334 1276791698 1325847789 1379325296 1029736884',
@@ -924,6 +957,7 @@ setup.npcs["A35"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_family'],
 }
 setup.npcs["A36"] = {
 	dna:'1902637322 1870968508 1231095894 1330096941 1541087381 1973617911 1386337081',

+ 15 - 0
sugarcube/src/autogenerated/npcstatic/compiled/npcstatic2compiled.js

@@ -55,6 +55,7 @@ setup.npcs["A54"] = {
 		pregnant:1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_family'],
 }
 setup.npcs["A55"] = {
 	dna:'1160422782 1599231242 1170518020 1844217422 1970929518 1568598475 1217564731',
@@ -71,6 +72,7 @@ setup.npcs["A55"] = {
 		short_skirt:1,
 		makeup:1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A56"] = {
 	dna:'1731740316 1035407288 1124546006 1260253434 1082292496 1455110922 1434089976',
@@ -98,6 +100,7 @@ setup.npcs["A56"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults','group_friends'],
 }
 setup.npcs["A57"] = {
 	dna:'1173276062 1427985989 1736266892 1028816280 1824359669 1132882533 1134471109',
@@ -124,6 +127,7 @@ setup.npcs["A57"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults','group_friends'],
 }
 setup.npcs["A58"] = {
 	dna:'1443401856 1151112047 8321006077 1153217734 1305220298 7921283143 7765736018',
@@ -152,6 +156,7 @@ setup.npcs["A58"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A59"] = {
 	dna:'1670044870 1746541889 1939734844 1792989216 1320934850 1111430962 2142228809',
@@ -180,6 +185,7 @@ setup.npcs["A59"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A60"] = {
 	dna:'1277459319 1572128651 2011848683 1766614432 1751115695 2053109941 2123319868',
@@ -304,6 +310,7 @@ setup.npcs["A69"] = {
 		tatoo:- 1,
 		strong:1,
 	},
+	defaults:['defaults','group_teacher'],
 }
 setup.npcs["A70"] = {
 	dna:'1625103852 1058929809 1950538836 1778016905 1380420827 1079863842 1745265049',
@@ -320,6 +327,7 @@ setup.npcs["A70"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A71"] = {
 	dna:'2132719934 1311181050 1171683829 1946919542 1528886114 2035827969 1077439399',
@@ -338,6 +346,7 @@ setup.npcs["A71"] = {
 		pregnant:1,
 		strong:1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A72"] = {
 	dna:'1416935739 1965395103 1375203982 1925522281 1102922011 2030344556 1049774393',
@@ -361,6 +370,7 @@ setup.npcs["A72"] = {
 		pregnant:1,
 		strong:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A73"] = {
 	dna:'2012922376 1037502234 1553944791 1481530732 1811451079 1396452842 1984210226',
@@ -428,6 +438,7 @@ setup.npcs["A77"] = {
 		tan:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A78"] = {
 	dna:'1129198910 2123899265 2070826103 1263408683 1266342598 1852602642 1659580757',
@@ -476,6 +487,7 @@ setup.npcs["A82"] = {
 		bimbo:- 1,
 		makeup:1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A83"] = {
 	dna:'1473539500 1300272748 1849153490 1148245338 1587757384 1435094984 1944660918',
@@ -498,6 +510,7 @@ setup.npcs["A83"] = {
 		cum_on_clothes:1,
 		strong:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A84"] = {
 	dna:'2106927598 1295208699 1791495642 1377661124 2006483992 1113518034 1579903219',
@@ -515,6 +528,7 @@ setup.npcs["A84"] = {
 		cum_on_face:- 1,
 		cum_on_clothes:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A85"] = {
 	dna:'1938942779 2106314839 1289521515 1217866816 2023591880 1519928587 1939169723',
@@ -569,6 +583,7 @@ setup.npcs["A89"] = {
 		makeup:1,
 		strong:1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A90"] = {
 	dna:'1551794736 1037303803 1438812408 1000615186 1838310950 1945611800 1031199730',

+ 30 - 0
sugarcube/src/autogenerated/npcstatic/compiled/npcstatic3compiled.js

@@ -118,6 +118,7 @@ setup.npcs["A112"] = {
 		tan:1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_friends'],
 }
 setup.npcs["A113"] = {
 	dna:'1774396206 1848301631 1697225452 1143268439 1252055647 2110725762 1260967419',
@@ -197,6 +198,7 @@ setup.npcs["A118"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A119"] = {
 	dna:'2031631571 1995569440 1450381571 1372658726 1715345534 1718505125 1736791711',
@@ -243,6 +245,7 @@ setup.npcs["A122"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A123"] = {
 	dna:'1213144477 1393767889 1853481730 1216131062 1625069235 1446669832 1709998708',
@@ -265,6 +268,7 @@ setup.npcs["A123"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A124"] = {
 	dna:'1665174694 1988944116 1807917594 1254176734 2064239242 1643819573 1392786112',
@@ -286,6 +290,7 @@ setup.npcs["A124"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A125"] = {
 	dna:'1782310214 1854425806 1138563924 1277981120 1771674321 1225102514 1034678700',
@@ -308,6 +313,7 @@ setup.npcs["A125"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A126"] = {
 	dna:'1464522854 1308604424 1705249327 1562011617 1043225628 1849417361 1015855202',
@@ -327,6 +333,7 @@ setup.npcs["A126"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A127"] = {
 	firstname:'Shulyov',
@@ -348,6 +355,7 @@ setup.npcs["A127"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A128"] = {
 	dna:'1329445270 1353015030 1000782701 1036165668 1639583614 1529658078 1975679453',
@@ -365,6 +373,7 @@ setup.npcs["A128"] = {
 		makeup:1,
 		tan:1,
 	},
+	defaults:['defaults','group_teacher'],
 }
 setup.npcs["A129"] = {
 	dna:'1440577620 1404493595 1159165013 1229533074 1597914660 1301026307 1275667543',
@@ -391,6 +400,7 @@ setup.npcs["A129"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_teacher'],
 }
 setup.npcs["A130"] = {
 	dna:'1726870149 1624130023 1044618711 1429525298 1800638929 1340956737 1405979189',
@@ -409,6 +419,7 @@ setup.npcs["A130"] = {
 		makeup:1,
 		tan:1,
 	},
+	defaults:['defaults','group_teacher'],
 }
 setup.npcs["A131"] = {
 	dna:'1290761368 1731705745 1556198951 1402252861 1318878286 1783536035 1235327987',
@@ -429,6 +440,7 @@ setup.npcs["A131"] = {
 		pregnant:- 1,
 		strong:1,
 	},
+	defaults:['defaults','group_teacher'],
 }
 setup.npcs["A132"] = {
 	dna:'1845705457 1671776475 1432615990 2143340423 1777183626 1122316963 1021792548',
@@ -454,6 +466,7 @@ setup.npcs["A132"] = {
 		cum_on_clothes:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_teacher'],
 }
 setup.npcs["A133"] = {
 	dna:'1771221536 2027750396 2089544713 1734369517 1759135620 1433377965 1088177703',
@@ -472,6 +485,7 @@ setup.npcs["A133"] = {
 		tan:1,
 		pregnant:1,
 	},
+	defaults:['defaults','group_teacher'],
 }
 setup.npcs["A134"] = {
 	dna:'1837796316 1436860618 1699933821 1423519204 1271493655 1566380915 1482989416',
@@ -497,6 +511,7 @@ setup.npcs["A134"] = {
 		cum_on_clothes:1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_teacher'],
 }
 setup.npcs["A135"] = {
 	dna:'1482962188 1063482733 1488899248 1806709653 1901966276 1373982700 1143695253',
@@ -522,6 +537,7 @@ setup.npcs["A135"] = {
 		cum_on_clothes:- 1,
 		strong:1,
 	},
+	defaults:['defaults','group_teacher'],
 }
 setup.npcs["A136"] = {
 	dna:'1323009327 1170828061 1350671739 1453635383 1122377435 1922441585 1637692781',
@@ -539,6 +555,7 @@ setup.npcs["A136"] = {
 		makeup:1,
 		tan:1,
 	},
+	defaults:['defaults','group_teacher'],
 }
 setup.npcs["A137"] = {
 	dna:'1366158823 1463494144 1620282105 1806630761 1949066883 1679902075 1297964182',
@@ -556,6 +573,7 @@ setup.npcs["A137"] = {
 		makeup:1,
 		tan:1,
 	},
+	defaults:['defaults','group_teacher'],
 }
 setup.npcs["A138"] = {
 	dna:'1041262937 1103319358 1212009691 1617547174 1655867289 1930930487 1952353548',
@@ -573,6 +591,7 @@ setup.npcs["A138"] = {
 		short_skirt:1,
 		makeup:1,
 	},
+	defaults:['defaults','group_teacher'],
 }
 setup.npcs["A139"] = {
 	dna:'1194676974 1594146631 1238391630 1274433221 1950748802 1727312584 8321006077',
@@ -600,6 +619,7 @@ setup.npcs["A139"] = {
 		cum_on_clothes:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_coolkid'],
 }
 setup.npcs["A140"] = {
 	dna:'1388957981 1104285969 1184925418 1994156965 1456422790 2095370094 1430302038',
@@ -619,6 +639,7 @@ setup.npcs["A140"] = {
 		tan:1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_coolkid'],
 }
 setup.npcs["A141"] = {
 	dna:'2132183395 1401313649 8321006077 1434417039 2321026077 7921283143 7765736018',
@@ -638,6 +659,7 @@ setup.npcs["A141"] = {
 		cum_on_face:- 1,
 		cum_on_clothes:- 1,
 	},
+	defaults:['defaults','group_jock'],
 }
 setup.npcs["A142"] = {
 	dna:'1972767054 1454786801 1222281674 1247981358 1828806656 1613393781 2115243730',
@@ -660,6 +682,7 @@ setup.npcs["A142"] = {
 		cum_on_face:- 1,
 		cum_on_clothes:- 1,
 	},
+	defaults:['defaults','group_nerd'],
 }
 setup.npcs["A143"] = {
 	dna:'1483702075 1521949936 1508959207 1971565483 1258438946 1771252769 1861114888',
@@ -680,6 +703,7 @@ setup.npcs["A143"] = {
 		piercing:1,
 		tatoo:1,
 	},
+	defaults:['defaults','group_gopnik'],
 }
 setup.npcs["A144"] = {
 	dna:'1273241012 2077038465 1275739884 1535053248 1434891447 1879708703 1237809681',
@@ -706,6 +730,7 @@ setup.npcs["A144"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_gopnik'],
 }
 setup.npcs["A145"] = {
 	dna:'1353721655 1926973992 1103624951 1850596792 1430454682 1886117868 1618747491',
@@ -731,6 +756,7 @@ setup.npcs["A145"] = {
 		pregnant:- 1,
 		strong:1,
 	},
+	defaults:['defaults','group_gopnik'],
 }
 setup.npcs["A146"] = {
 	dna:'1970425464 1559405118 2117548142 1930104143 1673957846 1166458305 1888536480',
@@ -755,6 +781,7 @@ setup.npcs["A146"] = {
 		tatoo:1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_coolkid'],
 }
 setup.npcs["A147"] = {
 	dna:'1457300123 1918120099 1967335170 1056889039 1290544338 1170828061 1350671739',
@@ -778,6 +805,7 @@ setup.npcs["A147"] = {
 		tan:1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_coolkid'],
 }
 setup.npcs["A148"] = {
 	dna:'1110871039 1215316528 1439574498 1881549627 1043257862 2062098828 1713844818',
@@ -808,6 +836,7 @@ setup.npcs["A148"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults','group_coolkid'],
 }
 setup.npcs["A149"] = {
 	dna:'1299436863 1261698091 1686799294 1465620552 1949917866 1150154188 1072586683',
@@ -828,4 +857,5 @@ setup.npcs["A149"] = {
 		makeup:1,
 		tan:1,
 	},
+	defaults:['defaults','group_jock'],
 }

+ 17 - 0
sugarcube/src/autogenerated/npcstatic/compiled/npcstatic4compiled.js

@@ -22,6 +22,7 @@ setup.npcs["A150"] = {
 		cum_on_clothes:- 1,
 		strong:1,
 	},
+	defaults:['defaults','group_jock'],
 }
 setup.npcs["A151"] = {
 	dna:'1668638992 1214865459 1808776698 1612495094 1514793001 1654481226 1823327274',
@@ -42,6 +43,7 @@ setup.npcs["A151"] = {
 		cum_on_face:- 1,
 		cum_on_clothes:- 1,
 	},
+	defaults:['defaults','group_nerd'],
 }
 setup.npcs["A152"] = {
 	dna:'1786501093 1834879963 1390361698 1051572151 1608736325 1790512075 1070782218',
@@ -67,6 +69,7 @@ setup.npcs["A152"] = {
 		makeup:1,
 		tatoo:1,
 	},
+	defaults:['defaults','group_nerd'],
 }
 setup.npcs["A153"] = {
 	dna:'1907002748 2085207351 1100129632 1342689598 1745456331 1873513432 1485648419',
@@ -89,6 +92,7 @@ setup.npcs["A153"] = {
 		cum_on_face:- 1,
 		cum_on_clothes:- 1,
 	},
+	defaults:['defaults','group_nerd'],
 }
 setup.npcs["A154"] = {
 	dna:'1942572074 1700154733 1692821756 1194715785 1803063877 2081935270 2014274394',
@@ -118,6 +122,7 @@ setup.npcs["A154"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_gopnik'],
 }
 setup.npcs["A155"] = {
 	dna:'1153126939 1063403218 1979820912 1002904260 1380666059 1009730022 1657156801',
@@ -142,6 +147,7 @@ setup.npcs["A155"] = {
 		makeup:1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_gopnik'],
 }
 setup.npcs["A156"] = {
 	dna:'1108429212 1130146285 1800931785 1571774683 1841942137 1677995681 1796981560',
@@ -167,6 +173,7 @@ setup.npcs["A156"] = {
 		tatoo:1,
 		pregnant:- 1,
 	},
+	defaults:['defaults','group_gopnik'],
 }
 setup.npcs["A157"] = {
 	dna:'1663800525 1510572542 1424729633 1976950271 1830743114 1783648027 1763271904',
@@ -192,6 +199,7 @@ setup.npcs["A157"] = {
 		tatoo:1,
 		pregnant:- 1,
 	},
+	defaults:['defaults','group_gopnik'],
 }
 setup.npcs["A158"] = {
 	dna:'1776510699 1586206108 1731953841 1110012478 1584998429 1767532419 1060614101',
@@ -222,6 +230,7 @@ setup.npcs["A158"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_gopnik'],
 }
 setup.npcs["A159"] = {
 	dna:'1426757610 1675195614 1268203516 1506174629 1153117090 1007713575 1605966541',
@@ -244,6 +253,7 @@ setup.npcs["A159"] = {
 		makeup:1,
 		tan:1,
 	},
+	defaults:['defaults','group_outcast'],
 }
 setup.npcs["A160"] = {
 	dna:'1428796224 1909315069 1882255348 1835514071 1201593987 2123583560 1823246593',
@@ -267,6 +277,7 @@ setup.npcs["A160"] = {
 		cum_on_clothes:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A161"] = {
 	dna:'1259280312 1641879774 1467473525 1487343721 1544500481 1151521798 1048594742',
@@ -331,6 +342,7 @@ setup.npcs["A165"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults','group_jock'],
 }
 setup.npcs["A166"] = {
 	dna:'8678987195 3857034937 9131318721 1506516098 6640960268 3377018962 2108967494',
@@ -348,6 +360,7 @@ setup.npcs["A166"] = {
 		cum_on_clothes:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A167"] = {
 	dna:'1784699091 1203401906 1216561919 1916388994 1239904750 1929086392 1148871462',
@@ -554,6 +567,7 @@ setup.npcs["A184"] = {
 		cum_on_clothes:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A185"] = {
 	dna:'1688667877 1444143245 1971085394 1614262160 1304657108 2094208929 1374312201',
@@ -593,6 +607,7 @@ setup.npcs["A186"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A187"] = {
 	dna:'1828318755 1912110768 1763625475 1700953844 1635556809 1788400335 1891647424',
@@ -637,6 +652,7 @@ setup.npcs["A189"] = {
 		tatoo:1,
 		strong:- 1,
 	},
+	defaults:['defaults','group_gopnik'],
 }
 setup.npcs["A190"] = {
 	dna:'1492342626 1736208516 1680470700 1919367231 1804680320 1756178566 1187568265',
@@ -676,6 +692,7 @@ setup.npcs["A191"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A192"] = {
 	dna:'1893727481 1167237604 1303192980 1478078827 1870699157 1379809405 1569436993',

+ 14 - 1
sugarcube/src/autogenerated/npcstatic/compiled/npcstatic5compiled.js

@@ -78,6 +78,7 @@ setup.npcs["A204"] = {
 		tatoo:1,
 		strong:- 1,
 	},
+	defaults:['defaults','body_actor'],
 }
 setup.npcs["A205"] = {
 	dna:'1456495926 1825013001 1426346332 1658350924 1416940928 1235168107 1641113022',
@@ -102,6 +103,7 @@ setup.npcs["A205"] = {
 		tatoo:1,
 		tan:- 1,
 	},
+	defaults:['defaults','skills_combat_dance_sport','body_model'],
 }
 setup.npcs["A206"] = {
 	dna:'1445996359 2043177567 2087825407 1125768621 1193670508 1546731603 1153010368',
@@ -280,7 +282,7 @@ setup.npcs["A220"] = {
 	lastname:'Kirilova',
 	usedname:'Vika',
 	notes:'Vika goes to the local university. She comes from a town in a truly remote part of Russia. Her family is poor. She pays for her studies by working in a brothel in the city center.',
-	dob:$pcs_dob - 10000,
+	dob:'Incorrect Initialization: $pcs_dob - 10000',
 	gender:1,
 	hotcat_rating:7,
 	sexskill:2,
@@ -291,6 +293,7 @@ setup.npcs["A220"] = {
 		makeup:1,
 		tan:1,
 	},
+	defaults:['defaults','skills_combat_dance_sport','body_model'],
 }
 setup.npcs["A221"] = {
 	dna:'1948232040 5876497260 6370729556 6591408199 9948768808 2245632532 3569109223',
@@ -526,6 +529,7 @@ setup.npcs["A238"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults','skills_combat_dance_sport','body_model'],
 }
 setup.npcs["A239"] = {
 	dna:'1589755494 1371564141 1910586302 1267743255 0311208650 1976836914 9019710461',
@@ -546,6 +550,7 @@ setup.npcs["A239"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A240"] = {
 	dna:'6315098906 1018014534 6071786774 2270176358 8632551269 5000971274 7776119541',
@@ -574,6 +579,7 @@ setup.npcs["A240"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults','group_nerd'],
 }
 setup.npcs["A241"] = {
 	dna:'3849823959 9265257275 0692991116 4439206638 9610596560 1214701298 1760538714',
@@ -604,6 +610,7 @@ setup.npcs["A242"] = {
 		short_skirt:1,
 		makeup:1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A243"] = {
 	dna:'0',
@@ -628,6 +635,7 @@ setup.npcs["A243"] = {
 		cum_on_face:1,
 		cum_on_clothes:1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A244"] = {
 	dna:'0',
@@ -647,6 +655,7 @@ setup.npcs["A244"] = {
 		short_skirt:1,
 		makeup:1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A245"] = {
 	dna:'0',
@@ -668,6 +677,7 @@ setup.npcs["A245"] = {
 		cum_on_clothes:1,
 		pregnant:1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A246"] = {
 	dna:'0',
@@ -691,6 +701,7 @@ setup.npcs["A246"] = {
 		cum_on_clothes:1,
 		strong:1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A247"] = {
 	dna:'0',
@@ -714,6 +725,7 @@ setup.npcs["A247"] = {
 		cum_on_clothes:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A248"] = {
 	dna:'0',
@@ -744,6 +756,7 @@ setup.npcs["A248"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A249"] = {
 	dna:'0',

+ 9 - 0
sugarcube/src/autogenerated/npcstatic/compiled/npcstatic6compiled.js

@@ -74,6 +74,7 @@ setup.npcs["A253"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A254"] = {
 	dna:'0',
@@ -104,6 +105,7 @@ setup.npcs["A254"] = {
 		pregnant:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A255"] = {
 	dna:'0',
@@ -133,6 +135,7 @@ setup.npcs["A255"] = {
 		cum_on_clothes:- 1,
 		strong:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A256"] = {
 	dna:'0',
@@ -153,6 +156,7 @@ setup.npcs["A256"] = {
 		cum_on_face:- 1,
 		cum_on_clothes:- 1,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A257"] = {
 	dna:'0',
@@ -181,6 +185,7 @@ setup.npcs["A257"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A258"] = {
 	dna:'0',
@@ -208,6 +213,7 @@ setup.npcs["A258"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A259"] = {
 	dna:'0',
@@ -235,6 +241,7 @@ setup.npcs["A259"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A260"] = {
 	dna:'0',
@@ -262,6 +269,7 @@ setup.npcs["A260"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A261"] = {
 	dna:'0',
@@ -291,6 +299,7 @@ setup.npcs["A261"] = {
 		pregnant:0,
 		strong:0,
 	},
+	defaults:['defaults'],
 }
 setup.npcs["A262"] = {
 	dna:'0',