Maid Outfits Fix

outfits_convert.py

@@ -112,6 +112,9 @@ def file_convert(filename):
                         subtype = 'swimsuit'
                     else:
                         subtype = 'bikini'
+                elif itemtype == 'maid':
+                    itemtype = 'clothes'
+                    subtype = 'maid'
                 elif itemtype in ['outfits']:
                     subtype = itemtype[:-1]
                     id = id.replace(itemtype,itemtype[:-1])

sugarcube/src/autogenerated/locations/pavlov/hotel/pav_hotelWork.tw

@@ -1191,10 +1191,10 @@
 		<</actCLA>>
 	<</if>>
 
-:: pav_hotelWork_changeIntoMaidOutfit
+:: pav_hotelWork_changeIntoMaidOutfit[event]
 	<<addtime 10>>
 	<<run $wardrobe.lastWornSet('hotel_maid_work')>>
-	<<run $wardrobe.wearTemporary('maid_21')>>
+	<<run $wardrobe.wearTemporary('gm_maid_21')>>
 	<<run $wardrobe.wearTemporary('moncheri_shoes_51')>>
 
 	<<if getvar("$pc.pcs_inhib") < 30>><<run $pc.skillExperienceGain('inhibition',1)>><</if>>

sugarcube/src/autogenerated/outfits/compiled/_attributes_gm_maidcompiled.js

@@ -3,7 +3,8 @@ if(!setup.outfits)
 Object.assign(setup.outfits,{
 	'gm_maid_1':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'1',
 		"quality": 2,
 		"thinness": 1,
@@ -14,7 +15,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_2':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'2',
 		"quality": 3,
 		"thinness": 1,
@@ -25,7 +27,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_3':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'3',
 		"quality": 2,
 		"thinness": 2,
@@ -36,7 +39,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_4':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'4',
 		"quality": 2,
 		"thinness": 2,
@@ -47,7 +51,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_5':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'5',
 		"quality": 2,
 		"thinness": 2,
@@ -58,7 +63,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_6':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'6',
 		"quality": 3,
 		"thinness": 3,
@@ -69,7 +75,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_7':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'7',
 		"quality": 3,
 		"thinness": 2,
@@ -80,7 +87,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_8':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'8',
 		"quality": 2,
 		"thinness": 1,
@@ -91,7 +99,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_9':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'9',
 		"quality": 2,
 		"thinness": 2,
@@ -102,7 +111,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_10':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'10',
 		"quality": 3,
 		"thinness": 1,
@@ -113,7 +123,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_11':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'11',
 		"quality": 2,
 		"thinness": 2,
@@ -124,7 +135,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_12':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'12',
 		"quality": 2,
 		"thinness": 2,
@@ -135,7 +147,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_13':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'13',
 		"quality": 2,
 		"thinness": 3,
@@ -146,7 +159,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_14':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'14',
 		"quality": 2,
 		"thinness": 2,
@@ -157,7 +171,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_15':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'15',
 		"quality": 2,
 		"thinness": 2,
@@ -168,7 +183,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_16':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'16',
 		"quality": 5,
 		"thinness": 2,
@@ -179,7 +195,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_17':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'17',
 		"quality": 3,
 		"thinness": 2,
@@ -190,7 +207,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_18':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'18',
 		"quality": 3,
 		"thinness": 2,
@@ -201,7 +219,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_19':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'19',
 		"quality": 3,
 		"thinness": 2,
@@ -212,7 +231,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_20':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'20',
 		"quality": 3,
 		"thinness": 2,
@@ -223,7 +243,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_21':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'21',
 		"quality": 3,
 		"thinness": 4,
@@ -234,7 +255,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_22':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'22',
 		"quality": 3,
 		"thinness": 4,
@@ -245,7 +267,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_23':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'23',
 		"quality": 3,
 		"thinness": 4,
@@ -257,7 +280,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_24':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'24',
 		"quality": 2,
 		"thinness": 4,
@@ -269,7 +293,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_25':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'25',
 		"quality": 2,
 		"thinness": 6,
@@ -283,7 +308,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_26':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'26',
 		"quality": 2,
 		"thinness": 6,
@@ -294,7 +320,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_27':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'27',
 		"quality": 4,
 		"thinness": 5,
@@ -304,7 +331,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_28':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'28',
 		"quality": 3,
 		"thinness": 5,
@@ -315,7 +343,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_29':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'29',
 		"quality": 3,
 		"thinness": 5,
@@ -326,7 +355,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_30':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'30',
 		"quality": 3,
 		"thinness": 5,
@@ -337,7 +367,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_31':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'31',
 		"quality": 3,
 		"thinness": 5,
@@ -347,7 +378,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_32':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'32',
 		"quality": 3,
 		"thinness": 6,
@@ -360,7 +392,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_33':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'33',
 		"quality": 5,
 		"thinness": 4,
@@ -371,7 +404,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_34':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'34',
 		"quality": 4,
 		"thinness": 5,
@@ -383,7 +417,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_35':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'35',
 		"quality": 4,
 		"thinness": 5,
@@ -394,7 +429,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_36':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'36',
 		"quality": 4,
 		"thinness": 5,
@@ -405,7 +441,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_37':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'37',
 		"quality": 2,
 		"thinness": 5,
@@ -417,7 +454,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_38':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'38',
 		"quality": 4,
 		"thinness": 5,
@@ -428,7 +466,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_39':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'39',
 		"quality": 4,
 		"thinness": 6,
@@ -441,7 +480,8 @@ Object.assign(setup.outfits,{
 	},
 	'gm_maid_40':{
 		'vendor':'gm',
-		'type':'maid',
+		'type':'clothes',
+		'subtype':'maid',
 		'index':'40',
 		"quality": 4,
 		"thinness": 6,

sugarcube/src/style/wardrobe.css

@@ -236,7 +236,7 @@
 
 #outfitSets{
     display: grid;
-    grid-template-columns: 1fr auto repeat(6,5em);
+    grid-template-columns: 1fr auto auto repeat(6,5em);
     grid-auto-rows: 5em;
     grid-gap: 0.2em 0.2em;
 }

sugarcube/src/wardrobe/wardrobe.js

@@ -810,7 +810,7 @@ class Wardrobe{
 	wearTemporary(itemId){
 		let itemType = this.itemData(itemId).type;
 		this.strip(itemType);
-		console.log("WEARING NOW",itemId);
+		console.log("WEARING NOW",itemId,itemType);
 		this._wear(itemId);
 	}
 

sugarcube/src/wardrobe/wardrobe.tw

@@ -139,6 +139,12 @@
 							<</textWithTooltip>>
 						<</if>>
 					</div>
+					<div class="overwriteOption">
+						<<act 'Overwrite' 1>>
+							<<run $wardrobe.outfitAdd(_outfitKey)>>
+							<<gt 'wardrobe'>>
+						<</act>>
+					</div>
 					<div class="deleteOption">
 						<<linkreplace 'Delete'>>
 							<<link "Confirm">>