Browse Source

Merge remote-tracking branch 'CroWke/master'

KevinSmarts 5 years ago
parent
commit
e6a7474e16

+ 1 - 0
glife.qproj

@@ -182,6 +182,7 @@
 		<Location name="npcpreservec"/>
 		<Location name="npcrnamefile"/>
 		<Location name="npcbreeder"/>
+		<Location name="npcstaticdefaults"/>
 		<Location name="npcstatic1"/>
 		<Location name="npcstatic2"/>
 		<Location name="npcstatic3"/>

File diff suppressed because it is too large
+ 48 - 718
locations/npcstatic1.qsrc


File diff suppressed because it is too large
+ 12 - 839
locations/npcstatic2.qsrc


File diff suppressed because it is too large
+ 12 - 844
locations/npcstatic3.qsrc


File diff suppressed because it is too large
+ 11 - 748
locations/npcstatic4.qsrc


File diff suppressed because it is too large
+ 21 - 606
locations/npcstatic5.qsrc


+ 25 - 0
locations/npcstaticdefaults.qsrc

@@ -0,0 +1,25 @@
+# npcstaticdefaults
+
+if $ARGS[0] = 'defaults':
+	npc_run['A<<npctemp>>'] = rand(1,10)
+	npc_vball['A<<npctemp>>'] = rand(1,10)
+	npc_shoot['A<<npctemp>>'] = rand(1,10)
+	npc_sewing['A<<npctemp>>'] = rand(1,10)
+	npc_serving['A<<npctemp>>'] = rand(1,10)
+	npc_chess['A<<npctemp>>'] = rand(1,10)
+	npc_dance['A<<npctemp>>'] = rand(1,10)
+	npc_danceero['A<<npctemp>>'] = rand(1,10)
+	npc_jab['A<<npctemp>>'] = rand(1,10)
+	npc_punch['A<<npctemp>>'] = rand(1,10)
+	npc_kick['A<<npctemp>>'] = rand(1,10)
+	npc_def['A<<npctemp>>'] = rand(1,10)
+	npc_vokal['A<<npctemp>>'] = rand(1,10)
+	npc_teach['A<<npctemp>>'] = rand(1,10)
+	$npc_dad['A<<npctemp>>'] = 'U'
+	$npc_mom['A<<npctemp>>'] = 'U'
+	$npc_pic['A<<npctemp>>'] = 'xPICx'
+	$npc_PersType['A<<npctemp>>'] = 'XXXX'
+end
+
+--- npcstaticdefaults ---------------------------------
+

+ 1 - 1
locations/stwork.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Dressing room for strippers</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/striprazd.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/backstage' + rand(1,7) + '.jpg"></center>'
 	''
 	'There are several <a href="exec:gt ''mirror'', ''start''">mirrors</a> hanging on the wall, where you can <a href="exec:gt ''mirror'', ''brush''">brush</a> your hair, and a selection of <a href="exec:gt ''wardrobe'', ''start''">clothes</a> hanging on rails for the girls to dress in.'
 	'There are some stairs leading to the <a href="exec:gt ''stwork'', ''stripgirl''">stage</a> where you can head out to perform.'

Some files were not shown because too many files changed in this diff