Sfoglia il codice sorgente

added shop_display

added shop_display to consolidate all the shops and changed the shop locations to use it.  fixed some of the shops so they show all the cloths.
Ditters 3 anni fa
parent
commit
9d06e2e9e8

+ 1 - 0
glife-notepad++

@@ -644,6 +644,7 @@
 			<File name="locations\Sgrup5" />
 			<File name="locations\SgrupDisco" />
 			<File name="locations\shop" />
+			<File name="locations\shop_display" />
 			<File name="locations\shopdacha" />
 			<File name="locations\show_table" />
 			<File name="locations\shulga_room" />

+ 1138 - 1137
glife.qproj

@@ -1,1140 +1,1141 @@
 <?xml version="1.0" encoding="utf-8"?>
 <QGen-project version="4.0.0 beta 1">
-	<Structure>
-	<Location name="start"/>
-	<Location name="version"/>
-	<Location name="history"/>
-	<Location name="gameover"/>
-	<Location name="begin"/>
-	<Location name="onobjsel"/>
-	<Location name="obj_din"/>
-	<Location name="journal"/>
-	<Location name="journal_quests"/>
-	<Location name="Cheatmenu_din"/>
-	<Location name="themes"/>
-	<Folder name="System">
-		<Location name="counter"/>
-		<Location name="loadg"/>
-		<Location name="LOCA"/>
-		<Location name="saveg"/>
-		<Location name="inputProcessing"/>
-		<Location name="restoreposition"/>
-		<Location name="saveposition"/>
-		<Location name="mod_setting"/>
-		<Location name="$difficulty"/>
-		<Location name="UnitAppearance"/>
-	</Folder>
-	<Folder name="Stats">
-		<Location name="DNA"/>
-		<Location name="cikl"/>
-		<Location name="daystart"/>
-		<Location name="dina"/>
-		<Location name="MenuLoc"/>
-		<Location name="MenuMainLoc"/>
-		<Location name="starenie"/>
-		<Location name="stat"/>
-		<Location name="stat_display"/>
-		<Location name="stat_sklattrib"/>
-		<Location name="stat_sklattrib_lvlset"/>
-		<Location name="fame"/>
-		<Location name="traits"/>
-		<Location name="din_bad"/>
-		<Location name="din_van"/>
-		<Location name="kid"/>
-		<Location name="pattest"/>
-		<Location name="subkid"/>
-		<Location name="set_home"/>
-	</Folder>
-	<Folder name="Functions">
-		<Location name="indik"/>
-		<Location name="indiktab"/>
-		<Location name="shortgs"/>
-		<Location name="show_table"/>
-		<Location name="femcyc"/>
-		<Location name="exercise"/>
-		<Location name="food"/>
-		<Location name="beverage"/>
-		<Location name="food_menu"/>
-		<Location name="sleep"/>
-		<Location name="willpower"/>
-		<Location name="drugs"/>
-		<Location name="npc_relationship"/>
-	</Folder>
-	<Folder name="Body">
-		<Location name="body"/>
-		<Location name="body_shape"/>
-		<Location name="lact_lib"/>
-		<Location name="lact_bp"/>
-		<Location name="body_din"/>
-		<Location name="medical_din"/>
-		<Location name="sweat"/>
-	</Folder>
-	<Folder name="Stimulus">
-		<Location name="boyStat"/>
-		<Location name="pain"/>
-		<Location name="arousal"/>
-		<Location name="orgasm"/>
-		<Location name="exhibitionism"/>
-		<Location name="dinSex"/>
-		<Location name="dinSex2"/>
-		<Location name="dinsexFX"/>
-		<Location name="oral"/>
-	</Folder>
-	<Folder name="CumManage">
-		<Location name="Cum_Manage"/>
-		<Location name="cum_arrcheat"/>
-		<Location name="cum_cleanup"/>
-		<Location name="cum_call"/>
-		<Location name="pregriskeval"/>
-		<Location name="cuminsidereact"/>
-	</Folder>
-	<Folder name="clothing">
-		<Location name="wardrobe"/>
-		<Location name="clothing"/>
-		<Location name="clothing_QV"/>
-		<Location name="changingroom"/>
-		<Location name="$clothing_name"/>
-		<Location name="$clothing_image"/>
-		<Location name="clothing_attributes"/>
-		<Location name="clothing_descriptions"/>
-		<Location name="$short_description"/>
-		<Location name="$attributes_gm_outfits"/>
-		<Location name="$attributes_gm_dress"/>
-		<Location name="$attributes_fashionista"/>
-		<Location name="$attributes_moncheri"/>
-		<Location name="$attributes_office"/>
-		<Location name="$attributes_school"/>
-		<Location name="$attributes_exercise"/>
-		<Location name="$attributes_fetish"/>
-		<Location name="$attributes_exhibit"/>
-		<Location name="$attributes_uniform"/>
-		<Location name="$attributes_coat"/>
-		<Location name="$attributes_swimwear"/>
-		<Location name="$attributes_beach"/>
-		<Location name="$attributes_flamingos_outfits"/>
-		<Location name="$attributes_flamingos_dress"/>
-		<Location name="$attributes_coco_outfits"/>
-		<Location name="$attributes_coco_dress"/>
-		<Location name="$attributes_fancy_burlesque"/>
-		<Location name="$attributes_dolls_outfits"/>
-		<Location name="$attributes_dolls_dress"/>
-		<Location name="$attributes_cats_outfits"/>
-		<Location name="$attributes_cats_dress"/>
-		<Location name="$attributes_bomba_outfits"/>
-		<Location name="$attributes_bomba_dress"/>
-		<Location name="$attributes_misc_outfits"/>
-		<Location name="lost_clothes_here"/>
-		<Location name="portnoi"/>
-		<Location name="portnoi2"/>
-	</Folder>
-	<Folder name="shoes">
-		<Location name="shoes"/>
-		<Location name="$shoe_image"/>
-		<Location name="$shoe_description"/>
-		<Location name="shoe_attributes"/>
-		<Location name="shoe_description2"/>
-		<Location name="$attributes_bomba_shoes"/>
-		<Location name="$attributes_danilovich_shoes"/>
-		<Location name="$attributes_gm_shoes"/>
-		<Location name="$attributes_dolls_shoes"/>
-		<Location name="$attributes_moncheri_shoes"/>
-		<Location name="$attrib_shoe_fetish"/>
-	</Folder>
-	<Folder name="coats">
-		<Location name="cloakroom"/>
-		<Location name="$attributes_bomba_coats"/>
-		<Location name="$attributes_cats_coats"/>
-		<Location name="$attributes_danilovich_coats"/>
-		<Location name="$attributes_dolls_coats"/>
-		<Location name="$attributes_gm_coats"/>
-		<Location name="$attributes_moncheri_coats"/>
-	</Folder>
-	<Folder name="underwear">
-		<Location name="underwear"/>
-		<Location name="bras"/>
-		<Location name="$bra_image"/>
-		<Location name="panties"/>
-		<Location name="$panty_image"/>
-	</Folder>
-	<Folder name="Accessories">
-		<Location name="purses"/>
-		<Location name="$purse_image"/>
-		<Location name="sewing"/>
-	</Folder>
-	<Folder name="Phone">
-		<Location name="telefon"/>
-		<Location name="phone_selfies"/>
-		<Location name="phone_selfies_popup"/>
-		<Location name="$phone_theme"/>
-	</Folder>
-	<Folder name="Prostitution">
-		<Location name="street_walker"/>
-		<Location name="Prostitute"/>
-		<Location name="NormPR"/>
-		<Location name="blowPR"/>
-		<Location name="AnalPR"/>
-	</Folder>
-	<Folder name="Quests">
-		<Location name="event"/>
-		<Location name="lesbidomhouse"/>
-		<Location name="lesbimistress"/>
-		<Location name="lesbisubhouse"/>
-		<Location name="city_kafeevents2"/>
-		<Location name="city_kafeevents3"/>
-		<Location name="ParkKafe"/>
-	</Folder>
-	<Folder name="Magic Quests">
-		<Location name="mainQW"/>
-		<Location name="tobiQW"/>
-		<Location name="kisameQW"/>
-		<Location name="succubus"/>
-		<Location name="serpent"/>
-	</Folder>
-	<Folder name="Prehistory">
-		<Location name="preSYS"/>
-		<Location name="preSYS2"/>
-		<Location name="preTG"/>
-		<Location name="preNT"/>
-		<Location name="preCUST"/>
-		<Location name="preALT"/>
-		<Location name="preCSB"/>
-	</Folder>
-	<Folder name="NPCManage">
-		<Location name="npccleanc"/>
-		<Location name="npcgeneratec"/>
-		<Location name="npcgenext"/>
-		<Location name="npcpreservec"/>
-		<Location name="npcrnamefile"/>
-		<Location name="npcstaticdefaults"/>
-		<Location name="npcstatic1"/>
-		<Location name="npcstatic2"/>
-		<Location name="npcstatic3"/>
-		<Location name="npcstatic4"/>
-		<Location name="npcstatic5"/>
-		<Location name="fight_npcdata"/>
-		<Location name="npc_intro"/>
-		<Location name="saveupdater"/>
-		<Location name="NPCChanger"/>
-	</Folder>
-	<Folder name="Combat">
-		<Location name="fight"/>
-		<Location name="ender"/>
-		<Location name="nill"/>
-		<Location name="test"/>
-		<Location name="kikbox"/>
-		<Location name="initKik"/>
-		<Location name="Kikatak"/>
-		<Location name="enderKik"/>
-		<Location name="razrKik"/>
-	</Folder>
-	<Folder name="Furniture">
-		<Location name="bed"/>
-		<Location name="bed2"/>
-		<Location name="dreams"/>
-		<Location name="budilnik"/>
-		<Location name="divan"/>
-		<Location name="Komp"/>
-		<Location name="kompMFC"/>
-		<Location name="kompMFCtwo"/>
-		<Location name="kompMFCanal"/>
-		<Location name="kompMFCoral"/>
-		<Location name="mirror"/>
-		<Location name="stol"/>
-		<Location name="kit_din"/>
-		<Location name="TV"/>
-		<Location name="vann"/>
-	</Folder>
-	<Folder name="Shared locations">
-		<Location name="outdoors"/>
-		<Location name="indoors"/>
-		<Location name="shop"/>
-		<Location name="bank"/>
-		<Location name="kiosk"/>
-		<Location name="taxi"/>
-		<Location name="train"/>
-		<Location name="train_incidental"/>
-		<Location name="metro"/>
-		<Location name="metro_events"/>
-		<Location name="events"/>
-		<Location name="flash"/>
-		<Location name="street_event"/>
-		<Location name="noticeboard"/>
-	</Folder>
-	<Folder name="Post office">
-		<Location name="post_office"/>
-		<Location name="post_master"/>
-		<Location name="post_deliveries"/>
-		<Location name="post_events"/>
-	</Folder>
-	<Folder name="Home Street - Locations">
-		<Location name="city_residential"/>
-		<Location name="city_pharmacy"/>
-		<Location name="city_smalloffice"/>
-		<Location name="city_dima"/>
-		<Location name="city_kafegivisex"/>
-		<Location name="city_irinaroom"/>
-		<Location name="city_kafe"/>
-		<Location name="city_kafe2"/>
-		<Location name="city_kafeend"/>
-		<Location name="city_kavkazkafe"/>
-		<Location name="city_jorahouse"/>
-		<Location name="city_lake"/>
-		<Location name="city_lake_path"/>
-		<Location name="city_drugden"/>
-		<Location name="city_bobka"/>
-		<Location name="city_park"/>
-		<Location name="park_walkeventsrnd"/>
-		<Location name="park_walkevents"/>
-		<Location name="city_clinic"/>
-		<Location name="city_market"/>
-		<Location name="city_marketwork"/>
-		<Location name="city_sauna"/>
-		<Location name="city_saunawhore"/>
-		<Location name="city_trashplace"/>
-		<Location name="city_trashplaceevents"/>
-		<Location name="city_marketsex"/>
-	</Folder>
-	<Folder name="BDSM_Club">
-		<Location name="BDSM_Club"/>
-		<Location name="BDSM_training"/>
-		<Location name="MHall"/>
-		<Location name="MDressing"/>
-		<Location name="MLanding"/>
-		<Location name="MDining"/>
-		<Location name="MLibrary"/>
-		<Location name="MBallroom"/>
-		<Location name="MRear"/>
-		<Location name="MConservatory"/>
-		<Location name="MKitchen"/>
-		<Location name="MBasement"/>
-		<Location name="MWestbed"/>
-		<Location name="MEastbed"/>
-		<Location name="MGames"/>
-		<Location name="MLiving"/>
-		<Location name="MBathrooms"/>
-	</Folder>
-	<Folder name="Trade Representative">
-		<Location name="city_trademission"/>
-		<Location name="StasQW"/>
-		<Location name="StasSex"/>
-	</Folder>
-	<Folder name="EfimovRA">
-		<Location name="billiard"/>
-		<Location name="billsvid"/>
-		<Location name="bordel"/>
-		<Location name="bordelv"/>
-		<Location name="bouling"/>
-		<Location name="kafesvid"/>
-		<Location name="kamera"/>
-		<Location name="kathouse0"/>
-		<Location name="Katlake"/>
-		<Location name="katspalnya"/>
-		<Location name="kazinosvid"/>
-		<Location name="kino"/>
-		<Location name="kinosvid"/>
-		<Location name="Kwlake1"/>
-		<Location name="Kwlake2"/>
-		<Location name="lezbsex"/>
-		<Location name="masharoom"/>
-		<Location name="Military"/>
-		<Location name="Nudelake"/>
-		<Location name="Palatka"/>
-		<Location name="parksvid"/>
-		<Location name="paysex"/>
-		<Location name="podrsex"/>
-		<Location name="police"/>
-		<Location name="qjob"/>
-		<Location name="sex"/>
-		<Location name="sexprefrand"/>
-		<Location name="sexdvanadva"/>
-		<Location name="sexdvoe"/>
-		<Location name="svidboy"/>
-		<Location name="Vnlake1"/>
-		<Location name="Vnlake2"/>
-		<Location name="WorkHosp"/>
-		<Location name="worksalon"/>
-	</Folder>
-	<Folder name="Nicholas">
-		<Location name="nichApartment"/>
-		<Location name="nichBathGuest"/>
-		<Location name="nichBathMaster"/>
-		<Location name="nichBathServant"/>
-		<Location name="nichBedroomMaster"/>
-		<Location name="nichBedroomServant"/>
-		<Location name="nichBedroomTanja"/>
-		<Location name="nichChore"/>
-		<Location name="nichClub"/>
-		<Location name="nichCook"/>
-		<Location name="nichGala"/>
-		<Location name="nichKitchen"/>
-		<Location name="nichLivingroom"/>
-		<Location name="nichNicholas"/>
-		<Location name="nichStudy"/>
-		<Location name="nichTanya"/>
-		<Location name="nichTaras"/>
-		<Location name="nichUtil"/>
-	</Folder>
-	<Folder name="Apartment">
-		<Location name="bedr"/>
-		<Location name="sitr"/>
-		<Location name="vanr"/>
-		<Location name="kuhr"/>
-		<Location name="korr"/>
-		<Location name="housecall"/>
-	</Folder>
-	<Folder name="Block">
-		<Location name="pav_complex"/>
-		<Location name="pav_complexb2"/>
-		<Location name="pav_complexb3"/>
-		<Location name="pav_complexold"/>
-		<Location name="pav_aptcourtev"/>
-		<Location name="pod_ezd"/>
-		<Location name="pod_whore"/>
-		<Location name="gopsex"/>
-		<Location name="misha"/>
-	</Folder>
-	<Folder name="Parent's Apartment">
-		<Location name="bedrPar"/>
-		<Location name="bedrPar2"/>
-		<Location name="sitrPar"/>
-		<Location name="vanrPar"/>
-		<Location name="kuhrPar"/>
-		<Location name="korrPar"/>
-		<Location name="selfplay"/>
-		<Location name="gtelefon"/>
-	</Folder>
-	<Folder name="Family">
-		<Location name="family_schedule"/>
-		<Location name="seeparentsex"/>
-		<Location name="father"/>
-		<Location name="fathersex"/>
-		<Location name="dinfather"/>
-		<Location name="mother"/>
-		<Location name="mother_sextalk"/>
-		<Location name="dinmother"/>
-		<Location name="sister"/>
-		<Location name="sister_chat"/>
-		<Location name="sistersleep"/>
-		<Location name="sisterQW"/>
-		<Location name="family"/>
-		<Location name="ludahome"/>
-		<Location name="olu"/>
-	</Folder>
-	<Folder name="Rolan">
-		<Location name="pav_complexrolan"/>
-		<Location name="rolanapt"/>
-		<Location name="rolanbath"/>
-	</Folder>
-	<Folder name="Generic boyfriend">
-		<Location name="Gnpc"/>
-		<Location name="Gnpc_cinema"/>
-		<Location name="Gnpc2"/>
-	</Folder>
-	<Folder name="Brother porn">
-		<Location name="brother"/>
-		<Location name="brother2"/>
-		<Location name="brother_voyeur"/>
-		<Location name="brother_lessons"/>
-		<Location name="seeporn"/>
-	</Folder>
-	<Folder name="Rex">
-		<Location name="rex_events"/>
-		<Location name="rex_party_home"/>
-		<Location name="rex_party_events"/>
-		<Location name="rex_party_boys_events"/>
-		<Location name="rex_party_girls_events"/>
-		<Location name="rex_party_sister_events"/>
-	</Folder>
-	<Folder name="Dima Nosov">
-		<Location name="dimaEv"/>
-		<Location name="dimaHome"/>
-		<Location name="dimalina"/>
-		<Location name="dimaRevenge"/>
-		<Location name="dinnpc"/>
-		<Location name="krutishi"/>
-	</Folder>
-	<Folder name="Artem Chebotarev">
-		<Location name="artem_events"/>
-		<Location name="artemhome"/>
-		<Location name="artem_date_events"/>
-		<Location name="artgar"/>
-	</Folder>
-	<Folder name="Igor Kruglov">
-		<Location name="igorev"/>
-		<Location name="igorhome"/>
-	</Folder>
-	<Folder name="Katja Meynold">
-		<Location name="katjaEv"/>
-		<Location name="katjaEvDin"/>
-		<Location name="KatjaHomeTalk"/>
-		<Location name="katja_sex"/>
-		<Location name="Katja_Tanga"/>
-	</Folder>
-	<Folder name="Vika Meynold">
-		<Location name="mey_home"/>
-		<Location name="NikoMeyHome"/>
-		<Location name="mey_vika_events"/>
-		<Location name="mey_tamara_events"/>
-	</Folder>
-	<Folder name="Niko Volkov">
-		<Location name="VolkovHome"/>
-		<Location name="NikoEv"/>
-		<Location name="NikoEv2"/>
-		<Location name="NikoDates"/>
-		<Location name="NikoDreams"/>
-		<Location name="NikoPayback"/>
-		<Location name="NikoSlut"/>
-		<Location name="NikoWhore"/>
-	</Folder>
-	<Folder name="Anushka">
-		<Location name="anushka"/>
-		<Location name="anushkaev1"/>
-		<Location name="anushapt"/>
-		<Location name="anushaptbr"/>
-		<Location name="anushkachat"/>
-	</Folder>
-	<Folder name="Sonia">
-		<Location name="soniadisco"/>
-	</Folder>
-	<Folder name="Gadyukino">
-		<Location name="gadhouse"/>
-		<Location name="grandmahelp"/>
-		<Location name="grandpahelp"/>
-		<Location name="gaddvor"/>
-		<Location name="gadsarai"/>
-		<Location name="gadbana"/>
-		<Location name="gadukino"/>
-		<Location name="gadukino_event"/>
-		<Location name="gadriver"/>
-		<Location name="meadow"/>
-		<Location name="mitka"/>
-		<Location name="mitkabuh"/>
-		<Location name="mitkabuh_group"/>
-		<Location name="mitkasex"/>
-		<Location name="gadprostitutes"/>
-		<Location name="bicycle"/>
-		<Location name="gadfield"/>
-		<Location name="gadgarden"/>
-		<Location name="gadmarket"/>
-		<Location name="gadroad"/>
-		<Location name="grigory"/>
-		<Location name="miroslavahome"/>
-		<Location name="miroslava"/>
-		<Location name="mirasex"/>
-		<Location name="mirafather"/>
-		<Location name="gadforest"/>
-		<Location name="gadforest_event"/>
-		<Location name="gadforestlost"/>
-	</Folder>
-	<Folder name="Swamp">
-		<Location name="swamp"/>
-		<Location name="swamp_yard"/>
-		<Location name="swamphouse"/>
-		<Location name="swampspring"/>
-		<Location name="backwater"/>
-		<Location name="hunters"/>
-		<Location name="huntersex"/>
-		<Location name="hunterLoveSex"/>
-		<Location name="hunter_ambient"/>
-		<Location name="hunter_favors"/>
-		<Location name="hunter_interactions"/>
-		<Location name="swamp_woods"/>
-		<Location name="andreihunter"/>
-		<Location name="igorhunter"/>
-		<Location name="sergeihunter"/>
-	</Folder>
-	<Folder name="Generator">
-		<Location name="placer"/>
-		<Location name="placer_pav_park"/>
-		<Location name="placer_man"/>
-		<Location name="placer_act"/>
-		<Location name="skverdin"/>
-		<Location name="placer_end"/>
-		<Location name="placer_sex"/>
-		<Location name="podval_rape"/>
-		<Location name="gopnik_house"/>
-		<Location name="placer_house"/>
-		<Location name="placer_house_one"/>
-		<Location name="placer_gop_orgy"/>
-		<Location name="fbHouse"/>
-		<Location name="fbDorm"/>
-		<Location name="fbDormD"/>
-		<Location name="fbGar"/>
-		<Location name="zsoft_gopskverGorSlut"/>
-	</Folder>
-	<Folder name="Pavlovsk">
-		<Location name="pav_residential"/>
-		<Location name="pav_commercial"/>
-		<Location name="pav_commercial_offices"/>
-		<Location name="pav_industrial"/>
-		<Location name="leonid"/>
-		<Location name="gargazel"/>
-		<Location name="garfather"/>
-		<Location name="pav_factory"/>
-		<Location name="pav_pharmacy"/>
-		<Location name="gkafe"/>
-		<Location name="motherkafeboss"/>
-		<Location name="pav_clinic"/>
-		<Location name="therapist"/>
-		<Location name="gevent"/>
-		<Location name="pav_park"/>
-		<Location name="gopskver"/>
-		<Location name="gskino"/>
-		<Location name="cafe_parco"/>
-		<Location name="kotovEv"/>
-		<Location name="IvanEv"/>
-		<Location name="strela"/>
-		<Location name="kotovSex"/>
-		<Location name="kotovdom"/>
-		<Location name="boymass"/>
-		<Location name="barbershop"/>
-		<Location name="MagEncounterFairy"/>
-		<Location name="ParChurch"/>
-		<Location name="ParChurch2"/>
-		<Location name="brothel"/>
-		<Location name="tour_guide"/>
-		<Location name="shop_coco_carmen"/>
-	</Folder>
-	<Folder name="pav_lake">
-		<Location name="glake"/>
-		<Location name="gLakeNude"/>
-		<Location name="gLakeNudeEvent"/>
-		<Location name="gLakeNudeForest"/>
-		<Location name="LakeBoyZ"/>
-	</Folder>
-	<Folder name="Fedor">
-		<Location name="FedorEv"/>
-		<Location name="FedorEv2"/>
-		<Location name="FedorEv3"/>
-		<Location name="FedorEv4"/>
-		<Location name="FedorMisc"/>
-	</Folder>
-	<Folder name="School">
-		<Location name="gschool_grounds"/>
-		<Location name="gschool_lessons"/>
-		<Location name="gschool_lessons1"/>
-		<Location name="gschool_lessons2"/>
-		<Location name="gschool_lessons3"/>
-		<Location name="gschool_lessons4"/>
-		<Location name="gschool_lessonsev1"/>
-		<Location name="gschool_lessonsev2"/>
-		<Location name="gschool_lessonsev3"/>
-		<Location name="gschool_break"/>
-		<Location name="gschool_lunch"/>
-		<Location name="gschool_office"/>
-		<Location name="gschool_events"/>
-		<Location name="gschool_gossip"/>
-		<Location name="gschool_groups"/>
-		<Location name="gschool_boys_bathroom"/>
-		<Location name="gschool_girls_bathroom"/>
-		<Location name="gschool_sex"/>
-		<Location name="gschool_detention"/>
-		<Location name="gschool_randperson"/>
-		<Location name="gschool_socialchg"/>
-		<Location name="gschool_socialchg1"/>
-		<Location name="gschool_schedule"/>
-		<Location name="gschool_chats"/>
-		<Location name="gschool_chats1"/>
-		<Location name="gschool_chats2"/>
-		<Location name="gschool_chats3"/>
-		<Location name="nogorslut"/>
-		<Location name="yesgorslut"/>
-		<Location name="bbgamein"/>
-		<Location name="bbgameout"/>
-		<Location name="fbgameout"/>
-		<Location name="gschool_cheerleading"/>
-		<Location name="nerd_game_night"/>
-		<Location name="gopnik_initiation"/>
-	</Folder>
-	<Folder name="Shared_appartment">
-		<Location name="pav_shared_apt"/>
-		<Location name="pav_shared_gp"/>
-		<Location name="pav_shared_nd"/>
-		<Location name="pav_shared_sp"/>
-	</Folder>
-	<Folder name="Community center">
-		<Location name="pav_commcenter"/>
-		<Location name="pav_commclubs"/>
-		<Location name="pav_library"/>
-		<Location name="gdkin"/>
-		<Location name="gdksport"/>
-		<Location name="gdktoilet"/>
-		<Location name="gdktoilet_mens"/>
-		<Location name="gdktoilet_womens"/>
-		<Location name="gdksex"/>
-		<Location name="BMloc"/>
-		<Location name="ugel"/>
-		<Location name="Voltrener"/>
-		<Location name="VolleyTrenCentr"/>
-		<Location name="VolleyTrenerSpeak"/>
-		<Location name="Voltrenersex"/>
-		<Location name="chessplay"/>
-		<Location name="boilerroom"/>
-		<Location name="krupo"/>
-		<Location name="kruchess"/>
-		<Location name="VoltrenerSexShower"/>
-		<Location name="Snpc"/>
-		<Location name="cumreaction"/>
-		<Location name="kotovtalker"/>
-	</Folder>
-	<Folder name="Event gym town">
-		<Location name="danceGev"/>
-		<Location name="volAndGev"/>
-	</Folder>
-	<Folder name="Station Campus">
-		<Location name="pav_train"/>
-		<Location name="pav_train_hall"/>
-		<Location name="pav_train_hall_events"/>
-		<Location name="pav_train_market"/>
-		<Location name="pav_station"/>
-		<Location name="katalkin"/>
-		<Location name="katalkinSex"/>
-		<Location name="katalkinAlko"/>
-		<Location name="kutuzka"/>
-		<Location name="olutaxi"/>
-	</Folder>
-	<Folder name="Christina Zvereva">
-		<Location name="gKristinaZv"/>
-	</Folder>
-	<Folder name="Julia Milov 12">
-		<Location name="JuliaMilGo"/>
-		<Location name="JuliaMilHome"/>
-		<Location name="JuliaMilVhod"/>
-	</Folder>
-	<Folder name="Arthur">
-		<Location name="arturRinok"/>
-		<Location name="arturHome"/>
-		<Location name="arturSex"/>
-		<Location name="arturkiosk"/>
-		<Location name="arturend"/>
-		<Location name="arturdin"/>
-		<Location name="arturQW"/>
-	</Folder>
-	<Folder name="Natasha Belova 16">
-		<Location name="natbelapt"/>
-		<Location name="natbelEv"/>
-		<Location name="natkolEv"/>
-		<Location name="natpimp"/>
-		<Location name="NatBelGo"/>
-	</Folder>
-	<Folder name="Albina">
-		<Location name="albinaRide"/>
-		<Location name="albinahome"/>
-		<Location name="albinaporog"/>
-		<Location name="albina_election_events"/>
-		<Location name="AlbStars"/>
-	</Folder>
-	<Folder name="Lariska">
-		<Location name="LariskaStart"/>
-		<Location name="LariskaGo"/>
-		<Location name="LariskaHome"/>
-		<Location name="lariska_schedule"/>
-		<Location name="lariska_storyline"/>
-	</Folder>
-	<Folder name="Pets">
-		<Location name="krol"/>
-		<Location name="popu"/>
-		<Location name="qwlocdog"/>
-		<Location name="RimmaSexQW"/>
-	</Folder>
-	<Folder name="Encounter Generator">
-		<Location name="din_npc"/>
-		<Location name="podezdM"/>
-		<Location name="sexm"/>
-		<Location name="dateM"/>
-		<Location name="kinoM"/>
-		<Location name="parkM"/>
-		<Location name="kafeM"/>
-		<Location name="restoranM"/>
-		<Location name="anekdot"/>
-		<Location name="stihi"/>
-		<Location name="love"/>
-		<Location name="brosok"/>
-	</Folder>
-	<Folder name="City Center">
-		<Location name="city_center"/>
-		<Location name="city_train"/>
-		<Location name="agentned"/>
-		<Location name="kameraKPZ"/>
-		<Location name="bass"/>
-		<Location name="burger"/>
-		<Location name="burgerWork"/>
-		<Location name="BurgerTip"/>
-		<Location name="moncheri"/>
-		<Location name="lusso"/>
-		<Location name="butoilet"/>
-		<Location name="cfnm"/>
-		<Location name="club"/>
-		<Location name="Club2"/>
-		<Location name="vipclub"/>
-		<Location name="danceclass"/>
-		<Location name="dorm"/>
-		<Location name="dormev1"/>
-		<Location name="city_library"/>
-		<Location name="fit"/>
-		<Location name="talent_agency"/>
-		<Location name="tatiana_lab"/>
-		<Location name="tatiana_missions"/>
-		<Location name="alexandriaEv"/>
-		<Location name="shop_fashionista"/>
-		<Location name="office"/>
-		<Location name="restoran"/>
-		<Location name="hairsalon"/>
-		<Location name="shopdacha"/>
-		<Location name="sportShop"/>
-		<Location name="scandalicious"/>
-		<Location name="torgcentr"/>
-		<Location name="univer"/>
-		<Location name="yarik"/>
-		<Location name="zoomagazine"/>
-		<Location name="budgetclothes"/>
-		<Location name="city_musicstore"/>
-		<Location name="city_musicstore_stock"/>
-	</Folder>
-	<Folder name="Salon">
-		<Location name="salon"/>
-		<Location name="masseuse_work"/>
-		<Location name="masseuse_schedule"/>
-		<Location name="masseuse_break"/>
-	</Folder>
-	<Folder name="Photo studio">
-		<Location name="foto"/>
-		<Location name="foto_shoot"/>
-		<Location name="foto_events"/>
-		<Location name="foto_events2"/>
-		<Location name="foto_model_documentary"/>
-		<Location name="foto_albums"/>
-		<Location name="foto_models"/>
-		<Location name="foto_models2"/>
-	</Folder>
-	<Folder name="Crime and Punishment">
-		<Location name="police_station"/>
-		<Location name="sentence"/>
-		<Location name="shoplifting"/>
-	</Folder>
-	<Folder name="North Side">
-		<Location name="city_industrial"/>
-		<Location name="city_industrial_train"/>
-		<Location name="Terminal"/>
-		<Location name="TerminalOffice"/>
-		<Location name="ivanRoom"/>
-		<Location name="trFatherMisha"/>
-		<Location name="dk"/>
-		<Location name="kakuzu"/>
-		<Location name="youry"/>
-		<Location name="alex"/>
-		<Location name="alexgang"/>
-		<Location name="lakecafe"/>
-		<Location name="laketoilet"/>
-		<Location name="LCporn"/>
-		<Location name="LCwork"/>
-		<Location name="pirsingsalon"/>
-		<Location name="obekt"/>
-		<Location name="obekt2"/>
-	</Folder>
-	<Folder name="Red Light">
-		<Location name="sexshop"/>
-		<Location name="stripclub"/>
-		<Location name="stwork"/>
-		<Location name="stwork2"/>
-	</Folder>
-	<Folder name="Bar Rabotnik">
-		<Location name="qwBarPolet"/>
-		<Location name="qwBarPoletToilet"/>
-		<Location name="qwBarBilliard"/>
-		<Location name="qwBarBilliard2"/>
-		<Location name="qwBarEncounters"/>
-		<Location name="MartinTalk"/>
-		<Location name="MartinSex"/>
-		<Location name="MartinSex2"/>
-		<Location name="MartinSex3"/>
-	</Folder>
-	<Folder name="North Road">
-		<Location name="dachain"/>
-		<Location name="dachamy"/>
-		<Location name="dachaogr"/>
-		<Location name="dachaogr0"/>
-		<Location name="dachi"/>
-		<Location name="graveyard"/>
-		<Location name="motel"/>
-		<Location name="road"/>
-		<Location name="youplace"/>
-		<Location name="furi"/>
-		<Location name="furisex"/>
-	</Folder>
-	<Folder name="Mansion">
-		<Location name="ybass"/>
-		<Location name="yban"/>
-		<Location name="ymans"/>
-		<Location name="ybedr"/>
-		<Location name="yvan"/>
-		<Location name="ykuh"/>
-		<Location name="yzal"/>
-		<Location name="ykamin"/>
-		<Location name="ydet"/>
-		<Location name="ybib"/>
-		<Location name="ysport"/>
-		<Location name="ykabinet"/>
-	</Folder>
-	<Folder name="Porn">
-		<Location name="BDSM"/>
-		<Location name="pornstudio"/>
-		<Location name="pornfilm"/>
-		<Location name="pornhist"/>
-		<Location name="pornschedule"/>
-	</Folder>
-	<Folder name="Boys">
-		<Location name="BDman"/>
-		<Location name="BDsex"/>
-		<Location name="boy"/>
-		<Location name="boyfrend"/>
-		<Location name="boylove"/>
-	</Folder>
-	<Folder name="music">
-		<Location name="music_actions"/>
-		<Location name="music_bedroompractice"/>
-		<Location name="music_onlinemusic"/>
- 		<Location name="music_gigstarts"/>
-   		<Location name="music_guitarlesson"/>   
-   		<Location name="music_buskingevents"/>
-		<Location name="music_delparco"/>
-	</Folder>
-	<Folder name="Lover">
-		<Location name="girl"/>
-		<Location name="girlfriend"/>
-		<Location name="dateF"/>
-		<Location name="lover"/>
-		<Location name="lover_change"/>
-		<Location name="lover_likes"/>
-		<Location name="lover_love"/>
-		<Location name="lover_meet"/>
-		<Location name="lover_pref"/>
-		<Location name="lover_pronouns"/>
-		<Location name="pronouns"/>
-	</Folder>
-	<Folder name="University">
-		<Location name="city_island"/>
-		<Location name="shop_dolls"/>
-		<Location name="vecher"/>
-		<Location name="obkitchen"/>
-		<Location name="obroom"/>
-		<Location name="Vika"/>
-		<Location name="univer_din"/>
-		<Location name="unicoursework"/>
-		<Location name="uniutil"/>
-		<Location name="shop_flamingos"/>
-	</Folder>
-	<Folder name="Game 1">
-		<Location name="KGstart"/>
-		<Location name="KGOLgame"/>
-		<Location name="KGOLenemy"/>
-		<Location name="KGOLboss"/>
-		<Location name="KGOLfight"/>
-		<Location name="KGOLexpa"/>
-	</Folder>
-	<Folder name="Game 2">
-		<Location name="KGDstart"/>
-		<Location name="KGDgame"/>
-		<Location name="KGDexp"/>
-		<Location name="KGDbefore"/>
-		<Location name="KGDfight"/>
-		<Location name="KGDparty"/>
-	</Folder>
-	<Folder name="Game 3">
-		<Location name="KGZstart"/>
-		<Location name="KGZgame"/>
-		<Location name="KGZdyn"/>
-		<Location name="KGZfight"/>
-	</Folder>
-	<Folder name="Game 4">
-		<Location name="FSstart"/>
-		<Location name="FSgame"/>
-		<Location name="FSstat"/>
-		<Location name="FSroom"/>
-	</Folder>
-	<Folder name="Youth Shop">
-		<Location name="shop_pussycats"/>
-		<Location name="andrey"/>
-		<Location name="gopnew"/>
-		<Location name="goplust"/>
-		<Location name="gopwho"/>
-	</Folder>
-	<Folder name="Cars">
-		<Location name="avtonorm"/>
-		<Location name="avt"/>
-		<Location name="avb"/>
-		<Location name="zaprF"/>
-		<Location name="zaprFWash"/>
-		<Location name="abduction"/>
-		<Location name="abductionCustomer"/>
-		<Location name="autosalonF"/>
-		<Location name="autoservisF"/>
-		<Location name="autotraidF"/>
-		<Location name="carF"/>
-		<Location name="carF1"/>
-	</Folder>
-	<Folder name="Quest">
-		<Location name="qwIzoldaApp"/>
-		<Location name="qwloc"/>
-		<Location name="qwmeet"/>
-	</Folder>
-	<Folder name="Casino">
-		<Location name="casino"/>
-		<Location name="mqroom"/>
-		<Location name="hotel"/>
-		<Location name="deckShuffle"/>
-	</Folder>
-	<Folder name="Menu">
-		<Location name="Menu.Info"/>
-		<Location name="Menu.Create"/>
-		<Location name="Menu.Add"/>
-		<Location name="Menu.AddCondition"/>
-		<Location name="Menu.AddModule"/>
-		<Location name="Menu.AddEvent"/>
-		<Location name="Menu.Call"/>
-		<Location name="Menu.Chosen"/>
-		<Location name="Menu.Time"/>
-		<Location name="Menu.Destroy"/>
-		<Location name="Menu.Treatment"/>
-	</Folder>
-	<Folder name="Game Menu">
-		<Location name="$menu_setting"/>
-		<Location name="$menu_skills"/>
-		<Location name="$menu_descrip"/>
-		<Location name="$menu_statistika"/>
-		<Location name="$menu_calendar"/>
-		<Location name="$menu_reputation"/>
-		<Location name="$menu_traits"/>
-		<Location name="$menu_mobila"/>
-		<Location name="$menu_magic"/>
-		<Location name="$menu_pain"/>
-		<Location name="$menu_face"/>
-		<Location name="$menu_body"/>
-		<Location name="$menu_clothes"/>
-		<Location name="$menu_bra"/>
-		<Location name="$menu_panties"/>
-		<Location name="$menu_shoes"/>
-		<Location name="$menu_tattoos"/>
-		<Location name="$menu_pirs"/>
-		<Location name="$menu_obnovit"/>
-		<Location name="$menu_bloknot"/>
-		<Location name="$menu_avariya"/>
-		<Location name="$menu_autosave"/>
-		<Location name="$menu_cheat"/>
-	</Folder>
-	<Folder name="Etogame">
-		<Location name="etoexhib"/>
-		<Location name="trainBimbo"/>
-		<Location name="parkBimbo"/>
-		<Location name="ptu_dush"/>
-		<Location name="nastja"/>
-		<Location name="Timofei"/>
-		<Location name="TimofeiMetro"/>
-		<Location name="balkon"/>
-		<Location name="balkon2"/>
-		<Location name="dom_gor"/>
-		<Location name="comendant"/>
-		<Location name="buklinik"/>
-		<Location name="buklinik_event"/>
-	</Folder>
-	<Folder name="Misc">
-		<Location name="beg"/>
-		<Location name="beg1"/>
-		<Location name="housing"/>
-		<Location name="husb"/>
-		<Location name="husbSex"/>
-		<Location name="Peterroom"/>
-		<Location name="sexorg"/>
-		<Location name="$stock_item_info"/>
-		<Location name="$stock_item"/>
-		<Location name="$single_stock_item"/>
-		<Location name="$buy_item"/>
-		<Location name="$buy_single_item"/>
-		<Location name="$face_image"/>
-		<Location name="$body_image"/>
-		<Location name="$pube_image"/>
-	</Folder>
-	<Folder name="New Year 2010">
-		<Location name="nyp_school"/>
-		<Location name="sny"/>
-	</Folder>
-	<Folder name="Deck of cards">
-		<Location name="card"/>
-	</Folder>
-	<Folder name="Hotel">
-		<Location name="HotelHole"/>
-		<Location name="hotel_resep"/>
-		<Location name="HotelAdmin"/>
-		<Location name="HotelWork"/>
-		<Location name="HotelRoom"/>
-	</Folder>
-	<Folder name="Shulga">
-		<Location name="shulgahome"/>
-		<Location name="shulgahall"/>
-		<Location name="shulgabed"/>
-		<Location name="shulgakuh"/>
-		<Location name="shulgabath"/>
-		<Location name="shulga_room"/>
-		<Location name="cardgame_durak"/>
-		<Location name="Serge_kuh"/>
-		<Location name="Serge_Shulgin"/>
-	</Folder>
-	<Folder name="Bel gang">
-		<Location name="LakeBoyDy"/>
-		<Location name="belgang"/>
-		<Location name="BelSex"/>
-		<Location name="belpicknick"/>
-	</Folder>
-	<Folder name="Old Town">
-		<Location name="liam"/>
-		<Location name="liamelkafe"/>
-		<Location name="stallion"/>
-		<Location name="larek"/>
-		<Location name="dvor"/>
-		<Location name="ugol"/>
-		<Location name="ugol1"/>
-		<Location name="artstudia"/>
-		<Location name="liames"/>
-		<Location name="burlesque"/>
-		<Location name="exhibitionistshop"/>
-		<Location name="kseniyaQW"/>
-		<Location name="parks"/>
-		<Location name="lug"/>
-		<Location name="dibodi"/>
-		<Location name="city_suburbs"/>
-		<Location name="din_pav"/>
-		<Location name="shop_fancy_pancy"/>
-		<Location name="shop_skuas"/>
-		<Location name="shop_tsar_bomba"/>
-	</Folder>
-	<Folder name="OldTownHome">
-		<Location name="vanr2x"/>
-		<Location name="korr2x"/>
-		<Location name="bedr2x"/>
-		<Location name="sitr2x"/>
-		<Location name="kuhr2x"/>
-		<Location name="koncepod"/>
-		<Location name="koncepod1"/>
-	</Folder>
-	<Folder name="crossfit_north">
-		<Location name="crossfit_north_box"/>
-		<Location name="crossfit_north_wod"/>
-		<Location name="crossfit_north_record"/>
-		<Location name="crossfit_north_girlmeet"/>
-	</Folder>
-	<Location name="LBZhouse"/>
-	<Location name="BanSexType"/>
-	<Folder name="Magic">
-		<Location name="castSpell"/>
-		<Location name="castSpellNPC"/>
-		<Location name="spellList"/>
-		<Location name="spellBook"/>
-		<Location name="spellTimer"/>
-		<Location name="spell"/>
-		<Location name="treeCircle"/>
-		<Location name="treeCircActs"/>
-		<Location name="treeCircEntry"/>
-	</Folder>
-	<Location name="cleanHTML"/>
-	</Structure>
+  <Structure>
+    <Location name="start"/>
+    <Location name="version"/>
+    <Location name="history"/>
+    <Location name="gameover"/>
+    <Location name="begin"/>
+    <Location name="onobjsel"/>
+    <Location name="obj_din"/>
+    <Location name="journal"/>
+    <Location name="journal_quests"/>
+    <Location name="Cheatmenu_din"/>
+    <Location name="themes"/>
+    <Folder name="System">
+      <Location name="counter"/>
+      <Location name="loadg"/>
+      <Location name="LOCA"/>
+      <Location name="saveg"/>
+      <Location name="inputProcessing"/>
+      <Location name="restoreposition"/>
+      <Location name="saveposition"/>
+      <Location name="mod_setting"/>
+      <Location name="UnitAppearance"/>
+    </Folder>
+    <Folder name="Stats">
+      <Location name="DNA"/>
+      <Location name="cikl"/>
+      <Location name="daystart"/>
+      <Location name="dina"/>
+      <Location name="MenuLoc"/>
+      <Location name="MenuMainLoc"/>
+      <Location name="starenie"/>
+      <Location name="stat"/>
+      <Location name="stat_display"/>
+      <Location name="stat_sklattrib"/>
+      <Location name="stat_sklattrib_lvlset"/>
+      <Location name="fame"/>
+      <Location name="traits"/>
+      <Location name="din_bad"/>
+      <Location name="din_van"/>
+      <Location name="kid"/>
+      <Location name="pattest"/>
+      <Location name="subkid"/>
+      <Location name="set_home"/>
+    </Folder>
+    <Folder name="Functions">
+      <Location name="indik"/>
+      <Location name="indiktab"/>
+      <Location name="shortgs"/>
+      <Location name="show_table"/>
+      <Location name="femcyc"/>
+      <Location name="exercise"/>
+      <Location name="food"/>
+      <Location name="beverage"/>
+      <Location name="food_menu"/>
+      <Location name="sleep"/>
+      <Location name="willpower"/>
+      <Location name="drugs"/>
+      <Location name="npc_relationship"/>
+      <Location name="shop_display"/>
+    </Folder>
+    <Folder name="Body">
+      <Location name="body"/>
+      <Location name="body_shape"/>
+      <Location name="lact_lib"/>
+      <Location name="lact_bp"/>
+      <Location name="body_din"/>
+      <Location name="medical_din"/>
+      <Location name="sweat"/>
+    </Folder>
+    <Folder name="Stimulus">
+      <Location name="boyStat"/>
+      <Location name="pain"/>
+      <Location name="arousal"/>
+      <Location name="orgasm"/>
+      <Location name="exhibitionism"/>
+      <Location name="dinSex"/>
+      <Location name="dinSex2"/>
+      <Location name="dinsexFX"/>
+      <Location name="oral"/>
+    </Folder>
+    <Folder name="CumManage">
+      <Location name="Cum_Manage"/>
+      <Location name="cum_arrcheat"/>
+      <Location name="cum_cleanup"/>
+      <Location name="cum_call"/>
+      <Location name="pregriskeval"/>
+      <Location name="cuminsidereact"/>
+    </Folder>
+    <Folder name="clothing">
+      <Location name="wardrobe"/>
+      <Location name="clothing"/>
+      <Location name="clothing_QV"/>
+      <Location name="changingroom"/>
+      <Location name="$clothing_name"/>
+      <Location name="$clothing_image"/>
+      <Location name="clothing_attributes"/>
+      <Location name="clothing_descriptions"/>
+      <Location name="$short_description"/>
+      <Location name="$attributes_gm_outfits"/>
+      <Location name="$attributes_gm_dress"/>
+      <Location name="$attributes_fashionista"/>
+      <Location name="$attributes_moncheri"/>
+      <Location name="$attributes_office"/>
+      <Location name="$attributes_school"/>
+      <Location name="$attributes_exercise"/>
+      <Location name="$attributes_fetish"/>
+      <Location name="$attributes_exhibit"/>
+      <Location name="$attributes_uniform"/>
+      <Location name="$attributes_coat"/>
+      <Location name="$attributes_swimwear"/>
+      <Location name="$attributes_beach"/>
+      <Location name="$attributes_flamingos_outfits"/>
+      <Location name="$attributes_flamingos_dress"/>
+      <Location name="$attributes_coco_outfits"/>
+      <Location name="$attributes_coco_dress"/>
+      <Location name="$attributes_fancy_burlesque"/>
+      <Location name="$attributes_dolls_outfits"/>
+      <Location name="$attributes_dolls_dress"/>
+      <Location name="$attributes_cats_outfits"/>
+      <Location name="$attributes_cats_dress"/>
+      <Location name="$attributes_bomba_outfits"/>
+      <Location name="$attributes_bomba_dress"/>
+      <Location name="$attributes_misc_outfits"/>
+      <Location name="lost_clothes_here"/>
+      <Location name="portnoi"/>
+      <Location name="portnoi2"/>
+    </Folder>
+    <Folder name="shoes">
+      <Location name="shoes"/>
+      <Location name="$shoe_image"/>
+      <Location name="$shoe_description"/>
+      <Location name="shoe_attributes"/>
+      <Location name="shoe_description2"/>
+      <Location name="$attributes_bomba_shoes"/>
+      <Location name="$attributes_danilovich_shoes"/>
+      <Location name="$attributes_gm_shoes"/>
+      <Location name="$attributes_dolls_shoes"/>
+      <Location name="$attributes_moncheri_shoes"/>
+      <Location name="$attrib_shoe_fetish"/>
+    </Folder>
+    <Folder name="coats">
+      <Location name="cloakroom"/>
+      <Location name="$attributes_bomba_coats"/>
+      <Location name="$attributes_cats_coats"/>
+      <Location name="$attributes_danilovich_coats"/>
+      <Location name="$attributes_dolls_coats"/>
+      <Location name="$attributes_gm_coats"/>
+      <Location name="$attributes_moncheri_coats"/>
+    </Folder>
+    <Folder name="underwear">
+      <Location name="underwear"/>
+      <Location name="bras"/>
+      <Location name="$bra_image"/>
+      <Location name="panties"/>
+      <Location name="$panty_image"/>
+    </Folder>
+    <Folder name="Accessories">
+      <Location name="purses"/>
+      <Location name="$purse_image"/>
+      <Location name="sewing"/>
+    </Folder>
+    <Folder name="Phone">
+      <Location name="telefon"/>
+      <Location name="phone_selfies"/>
+      <Location name="phone_selfies_popup"/>
+      <Location name="$phone_theme"/>
+    </Folder>
+    <Folder name="Prostitution">
+      <Location name="street_walker"/>
+      <Location name="Prostitute"/>
+      <Location name="NormPR"/>
+      <Location name="blowPR"/>
+      <Location name="AnalPR"/>
+    </Folder>
+    <Folder name="Quests">
+      <Location name="event"/>
+      <Location name="lesbidomhouse"/>
+      <Location name="lesbimistress"/>
+      <Location name="lesbisubhouse"/>
+      <Location name="city_kafeevents2"/>
+      <Location name="city_kafeevents3"/>
+      <Location name="ParkKafe"/>
+    </Folder>
+    <Folder name="Magic Quests">
+      <Location name="mainQW"/>
+      <Location name="tobiQW"/>
+      <Location name="kisameQW"/>
+      <Location name="succubus"/>
+      <Location name="Serpent"/>
+    </Folder>
+    <Folder name="Prehistory">
+      <Location name="preSYS"/>
+      <Location name="preSYS2"/>
+      <Location name="preTG"/>
+      <Location name="preNT"/>
+      <Location name="preCUST"/>
+      <Location name="preALT"/>
+      <Location name="preCSB"/>
+    </Folder>
+    <Folder name="NPCManage">
+      <Location name="npccleanc"/>
+      <Location name="npcgeneratec"/>
+      <Location name="npcgenext"/>
+      <Location name="npcpreservec"/>
+      <Location name="npcrnamefile"/>
+      <Location name="npcstaticdefaults"/>
+      <Location name="npcstatic1"/>
+      <Location name="npcstatic2"/>
+      <Location name="npcstatic3"/>
+      <Location name="npcstatic4"/>
+      <Location name="npcstatic5"/>
+      <Location name="fight_npcdata"/>
+      <Location name="npc_intro"/>
+      <Location name="saveupdater"/>
+      <Location name="NPCChanger"/>
+    </Folder>
+    <Folder name="Combat">
+      <Location name="fight"/>
+      <Location name="ender"/>
+      <Location name="nill"/>
+      <Location name="test"/>
+      <Location name="kikbox"/>
+      <Location name="initKik"/>
+      <Location name="Kikatak"/>
+      <Location name="enderKik"/>
+      <Location name="razrKik"/>
+    </Folder>
+    <Folder name="Furniture">
+      <Location name="bed"/>
+      <Location name="bed2"/>
+      <Location name="dreams"/>
+      <Location name="budilnik"/>
+      <Location name="divan"/>
+      <Location name="komp"/>
+      <Location name="kompMFC"/>
+      <Location name="kompMFCtwo"/>
+      <Location name="kompMFCanal"/>
+      <Location name="kompMFCoral"/>
+      <Location name="mirror"/>
+      <Location name="stol"/>
+      <Location name="kit_din"/>
+      <Location name="TV"/>
+      <Location name="vann"/>
+    </Folder>
+    <Folder name="Shared locations">
+      <Location name="outdoors"/>
+      <Location name="indoors"/>
+      <Location name="shop"/>
+      <Location name="bank"/>
+      <Location name="kiosk"/>
+      <Location name="taxi"/>
+      <Location name="train"/>
+      <Location name="train_incidental"/>
+      <Location name="metro"/>
+      <Location name="metro_events"/>
+      <Location name="events"/>
+      <Location name="flash"/>
+      <Location name="street_event"/>
+      <Location name="noticeboard"/>
+    </Folder>
+    <Folder name="Post office">
+      <Location name="post_office"/>
+      <Location name="post_master"/>
+      <Location name="post_deliveries"/>
+      <Location name="post_events"/>
+    </Folder>
+    <Folder name="Home Street - Locations">
+      <Location name="city_residential"/>
+      <Location name="city_pharmacy"/>
+      <Location name="city_smalloffice"/>
+      <Location name="city_dima"/>
+      <Location name="city_kafegivisex"/>
+      <Location name="city_irinaroom"/>
+      <Location name="city_kafe"/>
+      <Location name="city_kafe2"/>
+      <Location name="city_kafeend"/>
+      <Location name="city_kavkazkafe"/>
+      <Location name="city_jorahouse"/>
+      <Location name="city_lake"/>
+      <Location name="city_lake_path"/>
+      <Location name="city_drugden"/>
+      <Location name="city_bobka"/>
+      <Location name="city_park"/>
+      <Location name="park_walkeventsrnd"/>
+      <Location name="park_walkevents"/>
+      <Location name="city_clinic"/>
+      <Location name="city_market"/>
+      <Location name="city_marketwork"/>
+      <Location name="city_sauna"/>
+      <Location name="city_saunawhore"/>
+      <Location name="city_trashplace"/>
+      <Location name="city_trashplaceevents"/>
+      <Location name="city_marketsex"/>
+    </Folder>
+    <Folder name="BDSM_Club">
+      <Location name="BDSM_Club"/>
+      <Location name="BDSM_training"/>
+      <Location name="MHall"/>
+      <Location name="MDressing"/>
+      <Location name="MLanding"/>
+      <Location name="MDining"/>
+      <Location name="MLibrary"/>
+      <Location name="MBallroom"/>
+      <Location name="MRear"/>
+      <Location name="MConservatory"/>
+      <Location name="MKitchen"/>
+      <Location name="MBasement"/>
+      <Location name="MWestbed"/>
+      <Location name="MEastbed"/>
+      <Location name="MGames"/>
+      <Location name="MLiving"/>
+      <Location name="MBathrooms"/>
+    </Folder>
+    <Folder name="Trade Representative">
+      <Location name="city_trademission"/>
+      <Location name="StasQW"/>
+      <Location name="StasSex"/>
+    </Folder>
+    <Folder name="EfimovRA">
+      <Location name="billiard"/>
+      <Location name="billsvid"/>
+      <Location name="bordel"/>
+      <Location name="bordelv"/>
+      <Location name="bouling"/>
+      <Location name="kafesvid"/>
+      <Location name="kamera"/>
+      <Location name="kathouse0"/>
+      <Location name="Katlake"/>
+      <Location name="katspalnya"/>
+      <Location name="kazinosvid"/>
+      <Location name="kino"/>
+      <Location name="kinosvid"/>
+      <Location name="Kwlake1"/>
+      <Location name="Kwlake2"/>
+      <Location name="lezbsex"/>
+      <Location name="masharoom"/>
+      <Location name="Military"/>
+      <Location name="Nudelake"/>
+      <Location name="Palatka"/>
+      <Location name="parksvid"/>
+      <Location name="paysex"/>
+      <Location name="podrsex"/>
+      <Location name="police"/>
+      <Location name="qjob"/>
+      <Location name="sex"/>
+      <Location name="sexprefrand"/>
+      <Location name="sexdvanadva"/>
+      <Location name="sexdvoe"/>
+      <Location name="svidboy"/>
+      <Location name="Vnlake1"/>
+      <Location name="Vnlake2"/>
+      <Location name="WorkHosp"/>
+      <Location name="worksalon"/>
+    </Folder>
+    <Folder name="Nicholas">
+      <Location name="nichApartment"/>
+      <Location name="nichBathGuest"/>
+      <Location name="nichBathMaster"/>
+      <Location name="nichBathServant"/>
+      <Location name="nichBedroomMaster"/>
+      <Location name="nichBedroomServant"/>
+      <Location name="nichBedroomTanja"/>
+      <Location name="nichChore"/>
+      <Location name="nichClub"/>
+      <Location name="nichCook"/>
+      <Location name="nichGala"/>
+      <Location name="nichKitchen"/>
+      <Location name="nichLivingroom"/>
+      <Location name="nichNicholas"/>
+      <Location name="nichStudy"/>
+      <Location name="nichTanya"/>
+      <Location name="nichTaras"/>
+      <Location name="nichUtil"/>
+    </Folder>
+    <Folder name="Apartment">
+      <Location name="bedr"/>
+      <Location name="sitr"/>
+      <Location name="vanr"/>
+      <Location name="kuhr"/>
+      <Location name="korr"/>
+      <Location name="housecall"/>
+    </Folder>
+    <Folder name="Block">
+      <Location name="pav_complex"/>
+      <Location name="pav_complexb2"/>
+      <Location name="pav_complexb3"/>
+      <Location name="pav_complexOld"/>
+      <Location name="pav_aptcourtev"/>
+      <Location name="pod_ezd"/>
+      <Location name="pod_whore"/>
+      <Location name="gopsex"/>
+      <Location name="misha"/>
+    </Folder>
+    <Folder name="Parent's Apartment">
+      <Location name="bedrPar"/>
+      <Location name="bedrPar2"/>
+      <Location name="sitrPar"/>
+      <Location name="vanrPar"/>
+      <Location name="kuhrPar"/>
+      <Location name="korrPar"/>
+      <Location name="selfplay"/>
+      <Location name="gtelefon"/>
+    </Folder>
+    <Folder name="Family">
+      <Location name="family_schedule"/>
+      <Location name="seeparentsex"/>
+      <Location name="father"/>
+      <Location name="fathersex"/>
+      <Location name="dinfather"/>
+      <Location name="mother"/>
+      <Location name="mother_sextalk"/>
+      <Location name="dinmother"/>
+      <Location name="sister"/>
+      <Location name="sister_chat"/>
+      <Location name="sistersleep"/>
+      <Location name="sisterQW"/>
+      <Location name="family"/>
+      <Location name="ludahome"/>
+      <Location name="olu"/>
+    </Folder>
+    <Folder name="Rolan">
+      <Location name="pav_complexrolan"/>
+      <Location name="rolanapt"/>
+      <Location name="rolanbath"/>
+    </Folder>
+    <Folder name="Generic boyfriend">
+      <Location name="Gnpc"/>
+      <Location name="Gnpc_cinema"/>
+      <Location name="Gnpc2"/>
+    </Folder>
+    <Folder name="Brother porn">
+      <Location name="brother"/>
+      <Location name="brother2"/>
+      <Location name="brother_voyeur"/>
+      <Location name="brother_lessons"/>
+      <Location name="seeporn"/>
+    </Folder>
+    <Folder name="Rex">
+      <Location name="rex_events"/>
+      <Location name="rex_party_home"/>
+      <Location name="rex_party_events"/>
+      <Location name="rex_party_boys_events"/>
+      <Location name="rex_party_girls_events"/>
+      <Location name="rex_party_sister_events"/>
+    </Folder>
+    <Folder name="Dima Nosov">
+      <Location name="dimaEv"/>
+      <Location name="dimaHome"/>
+      <Location name="dimalina"/>
+      <Location name="dimaRevenge"/>
+      <Location name="dinnpc"/>
+      <Location name="krutishi"/>
+    </Folder>
+    <Folder name="Artem Chebotarev">
+      <Location name="artem_events"/>
+      <Location name="artemhome"/>
+      <Location name="artem_date_events"/>
+      <Location name="artgar"/>
+    </Folder>
+    <Folder name="Igor Kruglov">
+      <Location name="igorev"/>
+      <Location name="igorhome"/>
+    </Folder>
+    <Folder name="Katja Meynold">
+      <Location name="katjaEv"/>
+      <Location name="katjaEvDin"/>
+      <Location name="KatjaHomeTalk"/>
+      <Location name="katja_sex"/>
+      <Location name="Katja_Tanga"/>
+    </Folder>
+    <Folder name="Vika Meynold">
+      <Location name="mey_home"/>
+      <Location name="NikoMeyHome"/>
+      <Location name="mey_vika_events"/>
+      <Location name="mey_tamara_events"/>
+    </Folder>
+    <Folder name="Niko Volkov">
+      <Location name="VolkovHome"/>
+      <Location name="NikoEv"/>
+      <Location name="NikoEv2"/>
+      <Location name="NikoDates"/>
+      <Location name="NikoDreams"/>
+      <Location name="NikoPayback"/>
+      <Location name="NikoSlut"/>
+      <Location name="NikoWhore"/>
+    </Folder>
+    <Folder name="Anushka">
+      <Location name="anushka"/>
+      <Location name="anushkaev1"/>
+      <Location name="anushapt"/>
+      <Location name="anushaptbr"/>
+      <Location name="anushkachat"/>
+    </Folder>
+    <Folder name="Sonia">
+      <Location name="soniadisco"/>
+    </Folder>
+    <Folder name="Gadyukino">
+      <Location name="gadhouse"/>
+      <Location name="grandmahelp"/>
+      <Location name="grandpahelp"/>
+      <Location name="gaddvor"/>
+      <Location name="gadsarai"/>
+      <Location name="Gadbana"/>
+      <Location name="gadukino"/>
+      <Location name="gadukino_event"/>
+      <Location name="gadriver"/>
+      <Location name="meadow"/>
+      <Location name="mitka"/>
+      <Location name="mitkabuh"/>
+      <Location name="mitkabuh_group"/>
+      <Location name="mitkasex"/>
+      <Location name="gadprostitutes"/>
+      <Location name="bicycle"/>
+      <Location name="gadfield"/>
+      <Location name="gadgarden"/>
+      <Location name="gadmarket"/>
+      <Location name="gadroad"/>
+      <Location name="grigory"/>
+      <Location name="miroslavahome"/>
+      <Location name="miroslava"/>
+      <Location name="mirasex"/>
+      <Location name="mirafather"/>
+      <Location name="gadforest"/>
+      <Location name="gadforest_event"/>
+      <Location name="gadforestlost"/>
+    </Folder>
+    <Folder name="Swamp">
+      <Location name="swamp"/>
+      <Location name="swamp_yard"/>
+      <Location name="swamphouse"/>
+      <Location name="swampspring"/>
+      <Location name="backwater"/>
+      <Location name="hunters"/>
+      <Location name="huntersex"/>
+      <Location name="hunterLoveSex"/>
+      <Location name="hunter_ambient"/>
+      <Location name="hunter_favors"/>
+      <Location name="hunter_interactions"/>
+      <Location name="swamp_woods"/>
+      <Location name="andreihunter"/>
+      <Location name="igorhunter"/>
+      <Location name="sergeihunter"/>
+    </Folder>
+    <Folder name="Generator">
+      <Location name="placer"/>
+      <Location name="placer_pav_park"/>
+      <Location name="placer_man"/>
+      <Location name="placer_act"/>
+      <Location name="skverdin"/>
+      <Location name="placer_end"/>
+      <Location name="placer_sex"/>
+      <Location name="podval_rape"/>
+      <Location name="gopnik_house"/>
+      <Location name="placer_house"/>
+      <Location name="placer_house_one"/>
+      <Location name="placer_gop_orgy"/>
+      <Location name="fbHouse"/>
+      <Location name="fbDorm"/>
+      <Location name="fbDormD"/>
+      <Location name="fbGar"/>
+      <Location name="zsoft_gopskverGorSlut"/>
+    </Folder>
+    <Folder name="Pavlovsk">
+      <Location name="pav_residential"/>
+      <Location name="pav_commercial"/>
+      <Location name="pav_commercial_offices"/>
+      <Location name="pav_industrial"/>
+      <Location name="leonid"/>
+      <Location name="gargazel"/>
+      <Location name="garfather"/>
+      <Location name="pav_factory"/>
+      <Location name="pav_pharmacy"/>
+      <Location name="gkafe"/>
+      <Location name="motherkafeboss"/>
+      <Location name="pav_clinic"/>
+      <Location name="therapist"/>
+      <Location name="gevent"/>
+      <Location name="pav_park"/>
+      <Location name="gopskver"/>
+      <Location name="gskino"/>
+      <Location name="cafe_parco"/>
+      <Location name="kotovEv"/>
+      <Location name="IvanEv"/>
+      <Location name="strela"/>
+      <Location name="kotovSex"/>
+      <Location name="kotovdom"/>
+      <Location name="boymass"/>
+      <Location name="barbershop"/>
+      <Location name="MagEncounterFairy"/>
+      <Location name="ParChurch"/>
+      <Location name="ParChurch2"/>
+      <Location name="brothel"/>
+      <Location name="tour_guide"/>
+      <Location name="shop_coco_carmen"/>
+    </Folder>
+    <Folder name="pav_lake">
+      <Location name="gLake"/>
+      <Location name="gLakeNude"/>
+      <Location name="gLakeNudeEvent"/>
+      <Location name="gLakeNudeForest"/>
+      <Location name="LakeBoyZ"/>
+    </Folder>
+    <Folder name="Fedor">
+      <Location name="FedorEv"/>
+      <Location name="FedorEv2"/>
+      <Location name="FedorEv3"/>
+      <Location name="FedorEv4"/>
+      <Location name="FedorMisc"/>
+    </Folder>
+    <Folder name="School">
+      <Location name="gschool_grounds"/>
+      <Location name="gschool_lessons"/>
+      <Location name="gschool_lessons1"/>
+      <Location name="gschool_lessons2"/>
+      <Location name="gschool_lessons3"/>
+      <Location name="gschool_lessons4"/>
+      <Location name="gschool_lessonsev1"/>
+      <Location name="gschool_lessonsev2"/>
+      <Location name="gschool_lessonsev3"/>
+      <Location name="gschool_break"/>
+      <Location name="gschool_lunch"/>
+      <Location name="gschool_office"/>
+      <Location name="gschool_events"/>
+      <Location name="gschool_gossip"/>
+      <Location name="gschool_groups"/>
+      <Location name="gschool_boys_bathroom"/>
+      <Location name="gschool_girls_bathroom"/>
+      <Location name="gschool_sex"/>
+      <Location name="gschool_detention"/>
+      <Location name="gschool_randperson"/>
+      <Location name="gschool_socialchg"/>
+      <Location name="gschool_socialchg1"/>
+      <Location name="gschool_schedule"/>
+      <Location name="gschool_chats"/>
+      <Location name="gschool_chats1"/>
+      <Location name="gschool_chats2"/>
+      <Location name="gschool_chats3"/>
+      <Location name="nogorslut"/>
+      <Location name="yesgorslut"/>
+      <Location name="bbgamein"/>
+      <Location name="bbgameout"/>
+      <Location name="fbgameout"/>
+      <Location name="gschool_cheerleading"/>
+      <Location name="nerd_game_night"/>
+      <Location name="gopnik_initiation"/>
+    </Folder>
+    <Folder name="Shared_appartment">
+      <Location name="pav_shared_apt"/>
+      <Location name="pav_shared_gp"/>
+      <Location name="pav_shared_nd"/>
+      <Location name="pav_shared_sp"/>
+    </Folder>
+    <Folder name="Community center">
+      <Location name="pav_commcenter"/>
+      <Location name="pav_commclubs"/>
+      <Location name="pav_library"/>
+      <Location name="gdkin"/>
+      <Location name="gdksport"/>
+      <Location name="gdktoilet"/>
+      <Location name="gdktoilet_mens"/>
+      <Location name="gdktoilet_womens"/>
+      <Location name="gdksex"/>
+      <Location name="BMloc"/>
+      <Location name="ugel"/>
+      <Location name="Voltrener"/>
+      <Location name="VolleyTrenCentr"/>
+      <Location name="VolleyTrenerSpeak"/>
+      <Location name="Voltrenersex"/>
+      <Location name="chessplay"/>
+      <Location name="boilerroom"/>
+      <Location name="krupo"/>
+      <Location name="kruchess"/>
+      <Location name="VoltrenerSexShower"/>
+      <Location name="Snpc"/>
+      <Location name="cumreaction"/>
+      <Location name="kotovtalker"/>
+    </Folder>
+    <Folder name="Event gym town">
+      <Location name="danceGev"/>
+      <Location name="volAndGev"/>
+    </Folder>
+    <Folder name="Station Campus">
+      <Location name="pav_train"/>
+      <Location name="pav_train_hall"/>
+      <Location name="pav_train_hall_events"/>
+      <Location name="pav_train_market"/>
+      <Location name="pav_station"/>
+      <Location name="katalkin"/>
+      <Location name="katalkinSex"/>
+      <Location name="katalkinAlko"/>
+      <Location name="kutuzka"/>
+      <Location name="olutaxi"/>
+    </Folder>
+    <Folder name="Christina Zvereva">
+      <Location name="gKristinaZv"/>
+    </Folder>
+    <Folder name="Julia Milov 12">
+      <Location name="JuliaMilGo"/>
+      <Location name="JuliaMilHome"/>
+      <Location name="JuliaMilVhod"/>
+    </Folder>
+    <Folder name="Arthur">
+      <Location name="arturRinok"/>
+      <Location name="arturHome"/>
+      <Location name="arturSex"/>
+      <Location name="arturkiosk"/>
+      <Location name="arturend"/>
+      <Location name="arturdin"/>
+      <Location name="arturQW"/>
+    </Folder>
+    <Folder name="Natasha Belova 16">
+      <Location name="natbelapt"/>
+      <Location name="natbelEv"/>
+      <Location name="natkolEv"/>
+      <Location name="natpimp"/>
+      <Location name="NatBelGo"/>
+    </Folder>
+    <Folder name="Albina">
+      <Location name="albinaRide"/>
+      <Location name="albinahome"/>
+      <Location name="albinaporog"/>
+      <Location name="albina_election_events"/>
+      <Location name="AlbStars"/>
+    </Folder>
+    <Folder name="Lariska">
+      <Location name="LariskaStart"/>
+      <Location name="LariskaGo"/>
+      <Location name="LariskaHome"/>
+      <Location name="lariska_schedule"/>
+      <Location name="lariska_storyline"/>
+    </Folder>
+    <Folder name="Pets">
+      <Location name="krol"/>
+      <Location name="popu"/>
+      <Location name="qwlocdog"/>
+      <Location name="RimmaSexQW"/>
+    </Folder>
+    <Folder name="Encounter Generator">
+      <Location name="din_npc"/>
+      <Location name="podezdM"/>
+      <Location name="sexm"/>
+      <Location name="dateM"/>
+      <Location name="kinoM"/>
+      <Location name="parkM"/>
+      <Location name="kafeM"/>
+      <Location name="restoranM"/>
+      <Location name="anekdot"/>
+      <Location name="stihi"/>
+      <Location name="love"/>
+      <Location name="brosok"/>
+    </Folder>
+    <Folder name="City Center">
+      <Location name="city_center"/>
+      <Location name="city_train"/>
+      <Location name="agentned"/>
+      <Location name="kameraKPZ"/>
+      <Location name="bass"/>
+      <Location name="burger"/>
+      <Location name="burgerWork"/>
+      <Location name="BurgerTip"/>
+      <Location name="moncheri"/>
+      <Location name="lusso"/>
+      <Location name="butoilet"/>
+      <Location name="cfnm"/>
+      <Location name="club"/>
+      <Location name="Club2"/>
+      <Location name="vipclub"/>
+      <Location name="danceclass"/>
+      <Location name="dorm"/>
+      <Location name="dormev1"/>
+      <Location name="city_library"/>
+      <Location name="fit"/>
+      <Location name="talent_agency"/>
+      <Location name="tatiana_lab"/>
+      <Location name="tatiana_missions"/>
+      <Location name="alexandriaEv"/>
+      <Location name="shop_fashionista"/>
+      <Location name="office"/>
+      <Location name="restoran"/>
+      <Location name="hairsalon"/>
+      <Location name="shopdacha"/>
+      <Location name="sportShop"/>
+      <Location name="scandalicious"/>
+      <Location name="torgcentr"/>
+      <Location name="univer"/>
+      <Location name="yarik"/>
+      <Location name="zoomagazine"/>
+      <Location name="budgetclothes"/>
+      <Location name="city_musicstore"/>
+      <Location name="city_musicstore_stock"/>
+    </Folder>
+    <Folder name="Salon">
+      <Location name="salon"/>
+      <Location name="masseuse_work"/>
+      <Location name="masseuse_schedule"/>
+      <Location name="masseuse_break"/>
+    </Folder>
+    <Folder name="Photo studio">
+      <Location name="foto"/>
+      <Location name="foto_shoot"/>
+      <Location name="foto_events"/>
+      <Location name="foto_events2"/>
+      <Location name="foto_model_documentary"/>
+      <Location name="foto_albums"/>
+      <Location name="foto_models"/>
+      <Location name="foto_models2"/>
+    </Folder>
+    <Folder name="Crime and Punishment">
+      <Location name="police_station"/>
+      <Location name="sentence"/>
+      <Location name="shoplifting"/>
+    </Folder>
+    <Folder name="North Side">
+      <Location name="city_industrial"/>
+      <Location name="city_industrial_train"/>
+      <Location name="Terminal"/>
+      <Location name="TerminalOffice"/>
+      <Location name="ivanRoom"/>
+      <Location name="trFatherMisha"/>
+      <Location name="dk"/>
+      <Location name="kakuzu"/>
+      <Location name="youry"/>
+      <Location name="alex"/>
+      <Location name="alexgang"/>
+      <Location name="lakecafe"/>
+      <Location name="laketoilet"/>
+      <Location name="LCporn"/>
+      <Location name="LCwork"/>
+      <Location name="pirsingsalon"/>
+      <Location name="obekt"/>
+      <Location name="obekt2"/>
+    </Folder>
+    <Folder name="Red Light">
+      <Location name="sexshop"/>
+      <Location name="stripclub"/>
+      <Location name="stwork"/>
+      <Location name="stwork2"/>
+    </Folder>
+    <Folder name="Bar Rabotnik">
+      <Location name="qwBarPolet"/>
+      <Location name="qwBarPoletToilet"/>
+      <Location name="qwBarBilliard"/>
+      <Location name="qwBarBilliard2"/>
+      <Location name="qwBarEncounters"/>
+      <Location name="MartinTalk"/>
+      <Location name="MartinSex"/>
+      <Location name="MartinSex2"/>
+      <Location name="MartinSex3"/>
+    </Folder>
+    <Folder name="North Road">
+      <Location name="dachain"/>
+      <Location name="dachamy"/>
+      <Location name="dachaogr"/>
+      <Location name="dachaogr0"/>
+      <Location name="dachi"/>
+      <Location name="graveyard"/>
+      <Location name="motel"/>
+      <Location name="road"/>
+      <Location name="youplace"/>
+      <Location name="furi"/>
+      <Location name="furisex"/>
+    </Folder>
+    <Folder name="Mansion">
+      <Location name="ybass"/>
+      <Location name="yban"/>
+      <Location name="ymans"/>
+      <Location name="ybedr"/>
+      <Location name="yvan"/>
+      <Location name="ykuh"/>
+      <Location name="yzal"/>
+      <Location name="ykamin"/>
+      <Location name="ydet"/>
+      <Location name="ybib"/>
+      <Location name="ysport"/>
+      <Location name="ykabinet"/>
+    </Folder>
+    <Folder name="Porn">
+      <Location name="BDSM"/>
+      <Location name="pornstudio"/>
+      <Location name="pornfilm"/>
+      <Location name="pornhist"/>
+      <Location name="pornschedule"/>
+    </Folder>
+    <Folder name="Boys">
+      <Location name="BDman"/>
+      <Location name="BDsex"/>
+      <Location name="boy"/>
+      <Location name="boyfrend"/>
+      <Location name="boylove"/>
+    </Folder>
+    <Folder name="music">
+      <Location name="music_actions"/>
+      <Location name="music_bedroompractice"/>
+      <Location name="music_onlinemusic"/>
+      <Location name="music_gigstarts"/>
+      <Location name="music_guitarlesson"/>
+      <Location name="music_buskingevents"/>
+      <Location name="music_delparco"/>
+    </Folder>
+    <Folder name="Lover">
+      <Location name="girl"/>
+      <Location name="girlfriend"/>
+      <Location name="dateF"/>
+      <Location name="lover"/>
+      <Location name="lover_change"/>
+      <Location name="lover_likes"/>
+      <Location name="lover_love"/>
+      <Location name="lover_meet"/>
+      <Location name="lover_pref"/>
+      <Location name="lover_pronouns"/>
+      <Location name="pronouns"/>
+    </Folder>
+    <Folder name="University">
+      <Location name="city_island"/>
+      <Location name="shop_dolls"/>
+      <Location name="vecher"/>
+      <Location name="obkitchen"/>
+      <Location name="obroom"/>
+      <Location name="Vika"/>
+      <Location name="univer_din"/>
+      <Location name="unicoursework"/>
+      <Location name="uniutil"/>
+      <Location name="shop_flamingos"/>
+    </Folder>
+    <Folder name="Game 1">
+      <Location name="KGstart"/>
+      <Location name="KGOLgame"/>
+      <Location name="KGOLenemy"/>
+      <Location name="KGOLboss"/>
+      <Location name="KGOLfight"/>
+      <Location name="KGOLexpa"/>
+    </Folder>
+    <Folder name="Game 2">
+      <Location name="KGDstart"/>
+      <Location name="KGDgame"/>
+      <Location name="KGDexp"/>
+      <Location name="KGDbefore"/>
+      <Location name="KGDfight"/>
+      <Location name="KGDparty"/>
+    </Folder>
+    <Folder name="Game 3">
+      <Location name="KGZstart"/>
+      <Location name="KGZgame"/>
+      <Location name="KGZdyn"/>
+      <Location name="KGZfight"/>
+    </Folder>
+    <Folder name="Game 4">
+      <Location name="FSstart"/>
+      <Location name="FSgame"/>
+      <Location name="FSstat"/>
+      <Location name="FSroom"/>
+    </Folder>
+    <Folder name="Youth Shop">
+      <Location name="shop_pussycats"/>
+      <Location name="andrey"/>
+      <Location name="gopnew"/>
+      <Location name="goplust"/>
+      <Location name="gopwho"/>
+    </Folder>
+    <Folder name="Cars">
+      <Location name="avtonorm"/>
+      <Location name="avt"/>
+      <Location name="avb"/>
+      <Location name="zaprF"/>
+      <Location name="zaprFWash"/>
+      <Location name="abduction"/>
+      <Location name="abductionCustomer"/>
+      <Location name="autosalonF"/>
+      <Location name="autoservisF"/>
+      <Location name="autotraidF"/>
+      <Location name="carF"/>
+      <Location name="carF1"/>
+    </Folder>
+    <Folder name="Quest">
+      <Location name="qwIzoldaApp"/>
+      <Location name="qwloc"/>
+      <Location name="qwmeet"/>
+    </Folder>
+    <Folder name="Casino">
+      <Location name="casino"/>
+      <Location name="mqroom"/>
+      <Location name="hotel"/>
+      <Location name="deckShuffle"/>
+    </Folder>
+    <Folder name="Menu">
+      <Location name="Menu.Info"/>
+      <Location name="Menu.Create"/>
+      <Location name="Menu.Add"/>
+      <Location name="Menu.AddCondition"/>
+      <Location name="Menu.AddModule"/>
+      <Location name="Menu.AddEvent"/>
+      <Location name="Menu.Call"/>
+      <Location name="Menu.Chosen"/>
+      <Location name="Menu.Time"/>
+      <Location name="Menu.Destroy"/>
+      <Location name="Menu.Treatment"/>
+    </Folder>
+    <Folder name="Game Menu">
+      <Location name="$menu_setting"/>
+      <Location name="$menu_skills"/>
+      <Location name="$menu_descrip"/>
+      <Location name="$menu_statistika"/>
+      <Location name="$menu_calendar"/>
+      <Location name="$menu_reputation"/>
+      <Location name="$menu_traits"/>
+      <Location name="$menu_mobila"/>
+      <Location name="$menu_magic"/>
+      <Location name="$menu_pain"/>
+      <Location name="$menu_face"/>
+      <Location name="$menu_body"/>
+      <Location name="$menu_clothes"/>
+      <Location name="$menu_bra"/>
+      <Location name="$menu_panties"/>
+      <Location name="$menu_shoes"/>
+      <Location name="$menu_tattoos"/>
+      <Location name="$menu_pirs"/>
+      <Location name="$menu_obnovit"/>
+      <Location name="$menu_bloknot"/>
+      <Location name="$menu_avariya"/>
+      <Location name="$menu_autosave"/>
+      <Location name="$menu_cheat"/>
+    </Folder>
+    <Folder name="Etogame">
+      <Location name="etoexhib"/>
+      <Location name="trainbimbo"/>
+      <Location name="parkBimbo"/>
+      <Location name="ptu_dush"/>
+      <Location name="nastja"/>
+      <Location name="Timofei"/>
+      <Location name="TimofeiMetro"/>
+      <Location name="balkon"/>
+      <Location name="balkon2"/>
+      <Location name="dom_gor"/>
+      <Location name="comendant"/>
+      <Location name="buklinik"/>
+      <Location name="buklinik_event"/>
+    </Folder>
+    <Folder name="Misc">
+      <Location name="beg"/>
+      <Location name="beg1"/>
+      <Location name="housing"/>
+      <Location name="husb"/>
+      <Location name="husbSex"/>
+      <Location name="Peterroom"/>
+      <Location name="sexorg"/>
+      <Location name="$stock_item_info"/>
+      <Location name="$stock_item"/>
+      <Location name="$single_stock_item"/>
+      <Location name="$buy_item"/>
+      <Location name="$buy_single_item"/>
+      <Location name="$face_image"/>
+      <Location name="$body_image"/>
+      <Location name="$pube_image"/>
+    </Folder>
+    <Folder name="New Year 2010">
+      <Location name="nyp_school"/>
+      <Location name="sny"/>
+    </Folder>
+    <Folder name="Deck of cards">
+      <Location name="card"/>
+    </Folder>
+    <Folder name="Hotel">
+      <Location name="HotelHole"/>
+      <Location name="hotel_resep"/>
+      <Location name="HotelAdmin"/>
+      <Location name="HotelWork"/>
+      <Location name="HotelRoom"/>
+    </Folder>
+    <Folder name="Shulga">
+      <Location name="shulgahome"/>
+      <Location name="shulgahall"/>
+      <Location name="shulgabed"/>
+      <Location name="shulgakuh"/>
+      <Location name="shulgabath"/>
+      <Location name="shulga_room"/>
+      <Location name="cardgame_durak"/>
+      <Location name="Serge_kuh"/>
+      <Location name="Serge_Shulgin"/>
+    </Folder>
+    <Folder name="Bel gang">
+      <Location name="LakeBoyDy"/>
+      <Location name="belgang"/>
+      <Location name="BelSex"/>
+      <Location name="belpicknick"/>
+    </Folder>
+    <Folder name="Old Town">
+      <Location name="liam"/>
+      <Location name="liamelkafe"/>
+      <Location name="stallion"/>
+      <Location name="larek"/>
+      <Location name="dvor"/>
+      <Location name="ugol"/>
+      <Location name="ugol1"/>
+      <Location name="artstudia"/>
+      <Location name="liames"/>
+      <Location name="burlesque"/>
+      <Location name="exhibitionistshop"/>
+      <Location name="kseniyaQW"/>
+      <Location name="parks"/>
+      <Location name="lug"/>
+      <Location name="dibodi"/>
+      <Location name="city_suburbs"/>
+      <Location name="din_pav"/>
+      <Location name="shop_fancy_pancy"/>
+      <Location name="shop_skuas"/>
+      <Location name="shop_tsar_bomba"/>
+    </Folder>
+    <Folder name="OldTownHome">
+      <Location name="vanr2x"/>
+      <Location name="korr2x"/>
+      <Location name="bedr2x"/>
+      <Location name="sitr2x"/>
+      <Location name="kuhr2x"/>
+      <Location name="koncepod"/>
+      <Location name="koncepod1"/>
+    </Folder>
+    <Folder name="crossfit_north">
+      <Location name="crossfit_north_box"/>
+      <Location name="crossfit_north_wod"/>
+      <Location name="crossfit_north_record"/>
+      <Location name="crossfit_north_girlmeet"/>
+    </Folder>
+    <Location name="LBZhouse"/>
+    <Location name="BanSexType"/>
+    <Folder name="Magic">
+      <Location name="castSpell"/>
+      <Location name="castSpellNPC"/>
+      <Location name="spellList"/>
+      <Location name="spellBook"/>
+      <Location name="spellTimer"/>
+      <Location name="spell"/>
+      <Location name="treeCircle"/>
+      <Location name="treeCircActs"/>
+      <Location name="treeCircEntry"/>
+    </Folder>
+    <Location name="cleanHTML"/>
+    <Location name="_difficulty"/>
+  </Structure>
 </QGen-project>

+ 4 - 4
locations/bras.qsrc

@@ -145,17 +145,17 @@ if $ARGS[0] = 'view_bra_item':
 	if $ARGS[1] = 'shop':
 		if dyneval('RESULT = <<$ARGS[2]>>_bras[<<ARGS[3]>>]') = 1:
 			'You already own this item.'
-			act 'Leave': gt $loc, $loc_arg
+			act 'Leave': gt 'shop_display', $loc, $loc_arg
 		else
 			price = ARGS[4]
 			'Price: <<ARGS[4]>> <b>₽</b>'
-			act 'Leave': gt $loc, $loc_arg
+			act 'Leave': gt 'shop_display', $loc, $loc_arg
 			if money >= price:
 				act 'Buy (cash)':
 					money -= price
 					dynamic $ARGS[2] + '_bras[<<ARGS[3]>>] = 1'
 					dynamic $ARGS[2] + '_brasS[<<ARGS[3]>>] = 0'
-					gt $loc, $loc_arg
+					gt 'shop_display', $loc, $loc_arg
 				end
 			else
 				'You do not have enough cash to buy this bra.'
@@ -165,7 +165,7 @@ if $ARGS[0] = 'view_bra_item':
 					karta -= price
 					dynamic $ARGS[2] + '_bras[<<ARGS[3]>>] = 1'
 					dynamic $ARGS[2] + '_brasS[<<ARGS[3]>>] = 0'
-					gt $loc, $loc_arg
+					gt 'shop_display', $loc, $loc_arg
 				end
 			else
 				'You do not have enough money in your bank to buy this bra.'

+ 11 - 495
locations/budgetclothes.qsrc

@@ -32,30 +32,12 @@ if $ARGS[0] = 'start':
 
 		act 'Return':gt 'budgetclothes', 'start'
 
-		act 'View clothing':
-			minut += 5
-			gt 'budgetclothes', 'clothes'
-		end
-
-		act 'View dresses':
-			minut += 5
-			gt 'budgetclothes', 'dresses'
-		end
-
-		act 'View office wear':
-			minut += 5
-			gt 'budgetclothes', 'office'
-		end
-
-		act 'View uniforms':
-			minut += 5
-			gt 'budgetclothes', 'uniform'
-		end
+		act 'View clothing': minut += 5 & gt 'shop_display', 'budgetclothes', 'clothes'
+		act 'View dresses':	minut += 5 & gt 'shop_display', 'budgetclothes', 'dress'
+		act 'View office wear':	minut += 5 & gt 'shop_display', 'budgetclothes', 'office'
+		act 'View uniforms': minut += 5 & gt 'shop_display', 'budgetclothes', 'uniform'
+		act 'View school uniforms':	minut += 5 & gt 'shop_display', 'budgetclothes', 'school'
 
-		act 'View school uniforms':
-			minut += 5
-			gt 'budgetclothes', 'school'
-		end
 	end
 
 	act 'Visit shoe department':
@@ -64,482 +46,16 @@ if $ARGS[0] = 'start':
 
 		act 'Return':gt 'budgetclothes', 'start'
 
-		act 'View regular shoes':
-			minut += 5
-			gt 'budgetclothes', 'shoes'
-		end
-
-		act 'View exercise shoes':
-			minut += 5
-			gt 'budgetclothes', 'danilovich'
-		end
-	end
-
-	act 'View panties':
-		minut += 5
-		gt 'budgetclothes', 'panties'
-	end
-
-	act 'View bras':
-		minut += 5
-		gt 'budgetclothes', 'bras'
-	end
-
-	act 'View purses':
-		minut += 5
-		gt 'budgetclothes', 'purses'
-	end
-
-	act 'View coats':
-		minut += 5
-		gt 'budgetclothes', 'coats'
-	end
-end
-
-if $ARGS[0] = 'clothes':
-	$loc_arg = 'clothes'
-	$loc = 'budgetclothes'
-	$menu_loc = 'budgetclothes'
-	$menu_arg = 'clothes'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing G&M outfits</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'budgetclothes', 'start'
-	end
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-
-		if Clothingstock - 16 > 0:
-			i = 1
-		elseif Clothingstock - 8 > 0:
-			i = 2
-		else
-			i = 3
-		end
-
-		:loopgm_outfits
-			if gm_outfits[i] = 0:
-				gs 'clothing_attributes', 'gm_outfits', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_outfits''"><img src="images/pc/items/gm/outfits/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 3
-
-			if i = 414:i = 415
-		if i <= 150:jump 'loopgm_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
-end
-
-if $ARGS[0] = 'gm_outfits':
-	cla
-	menu_off = 1
-	if gm_outfits[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'budgetclothes', 'clothes'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_outfits',i, 1000
-end
-
-if $ARGS[0] = 'dresses':
-	$loc_arg = 'dresses'
-	$loc = 'budgetclothes'
-	$menu_loc = 'budgetclothes'
-	$menu_arg = 'dresses'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing G&M dresses</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'budgetclothes', 'start'
-	end
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality1
-
-		if Clothingstock - 16 > 0:
-			i = 1
-		elseif Clothingstock - 8 > 0:
-			i = 2
-		else
-			i = 3
-		end
-
-		:loopgm_dress
-			if gm_dress[i] = 0:
-				gs 'clothing_attributes', 'gm_dress', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_dress''"><img src="images/pc/items/gm/dress/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 3
-		if i <= 150:jump 'loopgm_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality1'
-end
-
-if $ARGS[0] = 'gm_dress':
-	cla
-	menu_off = 1
-	if gm_dress[i] ! 0:
-		msg 'You already own this dress.'
-		gt 'budgetclothes', 'dresses'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_dress',i, 1000
-end
-
-if $ARGS[0] = 'office':
-	$menu_loc = 'budgetclothes'
-	$menu_arg = 'office'
-	menu_off = 0
-	$loc_arg = $ARGS[0]
-	$loc = 'budgetclothes'
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing G&M office clothing</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'budgetclothes', 'start'
-	end
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality2
-		if Clothingstock > 15:
-			i = 3
-		elseif Clothingstock > 7:
-			i = 2
-		else
-			i = 1
-		end
-
-		:loopoffice
-			if gm_office[i] = 0:
-				gs 'clothing_attributes', 'gm_office', i
-				gs 'clothing_QV', 'shop_filter'
+		act 'View regular shoes': minut += 5 & gt 'shop_display', 'budgetclothes', 'shoes'
+		act 'View exercise shoes': minut += 5 &	gt 'shop_display', 'budgetclothes', 'danilovich'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''officeclo''"><img src="images/pc/clothing/5office/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 3
-		if i <= 140:jump 'loopoffice'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality2'
-end
-
-if $ARGS[0] = 'officeclo':
-	cla
-	menu_off = 1
-	if gm_office[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'budgetclothes', 'office'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_office',i, 2000
+	act 'View panties':	minut += 5 & gt 'shop_display', 'budgetclothes', 'panties'
+	act 'View bras': minut += 5 & gt 'shop_display', 'budgetclothes', 'bras'
+	act 'View purses': minut += 5 & gt 'shop_display', 'budgetclothes', 'purses'
+	act 'View coats': minut += 5 & gt 'shop_display', 'budgetclothes', 'coats'
 end
 
-if $ARGS[0] = 'uniform':
-	$menu_loc = 'budgetclothes'
-	$menu_arg = 'uniform'
-	menu_off = 0
-	$loc_arg = $ARGS[0]
-	$loc = 'budgetclothes'
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing G&M uniforms</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'budgetclothes', 'start'
-	end
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality3
-		if Clothingstock > 15:
-			i = 1
-		elseif Clothingstock > 7:
-			i = 2
-		else
-			i = 3
-		end
-
-		:loopuniform
-			if gm_uniform[i] = 0:
-				gs 'clothing_attributes', 'gm_uniform', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''uniformclo''"><img src="images/pc/clothing/10uniform/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 3
-		if i <= 60:jump 'loopuniform'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality3'
-end
-
-if $ARGS[0] = 'uniformclo':
-	cla
-	menu_off = 1
-	if gm_uniform[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'budgetclothes', 'uniform'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_uniform',i, 2000
-end
-
-if $ARGS[0] = 'school':
-	$menu_loc = 'budgetclothes'
-	$menu_arg = 'school'
-	menu_off = 0
-	$loc_arg = $ARGS[0]
-	$loc = 'budgetclothes'
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing G&M school uniforms</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'budgetclothes', 'start'
-	end
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality4
-		if Clothingstock > 15:
-			i = 1
-		elseif Clothingstock > 7:
-			i = 2
-		else
-			i = 3
-		end
-
-		:loopschool
-			if gm_school[i] = 0:
-				gs 'clothing_attributes', 'gm_school', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''schoolclo''"><img src="images/pc/clothing/6school/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 3
-			if i = 6:i = 9
-		if i <= 80:jump 'loopschool'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality4'
-end
-
-if $ARGS[0] = 'schoolclo':
-	cla
-	menu_off = 1
-	if gm_school[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'budgetclothes', 'school'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_school',i, 1500
-end
-
-if $ARGS[0] = 'shoes':
-	$loc_arg = 'shoes'
-	$loc = 'budgetclothes'
-	$menu_loc = 'budgetclothes'
-	$menu_arg = 'shoes'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'budgetclothes', 'start'
-	end
-
-	:loopgm_shoes
-		if sgm[i] = 0:*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''budget_shoes''"><img src="images/pc/shoes/g&m/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 40:jump 'loopgm_shoes'
-end
-
-if $ARGS[0] = 'budget_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'gm',i, 700
-
-if $ARGS[0] = 'danilovich':
-	$loc_arg = 'danilovich'
-	$loc = 'budgetclothes'
-	$menu_loc = 'budgetclothes'
-	$menu_arg = 'danilovich'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'budgetclothes', 'start'
-	end
-
-	if Clothingstock > 11:
-		i = 1
-	else
-		i = 2
-	end
-
-	:loopdanilovich_shoes
-		if sdanilovich[i] = 0:*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''danilovich_shoes''"><img src="images/pc/items/danilovich/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 2
-		if i = 21:i = 23
-	if i <= 30:jump 'loopdanilovich_shoes'
-end
-
-if $ARGS[0] = 'danilovich_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'danilovich',i, 800
-
-if $ARGS[0] = 'coats':
-	$menu_loc = 'budgetclothes'
-	$menu_arg = 'coats'
-	menu_off = 0
-	$loc_arg = $ARGS[0]
-	$loc = 'budgetclothes'
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'budgetclothes', 'start'
-	end
-
-	i = 2
-	:loopcoats
-		if coat[i] = 0:*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''coatsclo''"><img src="images/pc/clothing/11coat/<<i>>.jpg" 	height="250" /></a>'
-		i += 1
-		if i = 5:i = 6
-		if i = 9:i = 10
-		if i = 11:i = 12
-	if i <= 20:jump 'loopcoats'
-end
-
-if $ARGS[0] = 'coatsclo':
-	cla
-	menu_off = 1
-	if coat[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'budgetclothes', 'coats'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'coat',i, 1000
-end
-
-if $ARGS[0] = 'purses':
-	$menu_loc = 'budgetclothes'
-	$menu_arg = 'purses'
-	menu_off = 0
-	$loc_arg = 'purses'
-	$loc = 'budgetclothes'
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'budgetclothes', 'start'
-	end
-
-	i = 1
-	:looppurses
-		if gm_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''purses2''"><img src="images/pc/items/gm/purses/<<i>>.jpg" 	height="250" /></a>'
-		i += 1
-	if i <= 14:jump 'looppurses'
-end
-
-if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'gm',i, 1500
-
-if $ARGS[0] = 'panties':
-	$loc_arg = 'panties'
-	$loc = 'budgetclothes'
-	$menu_loc = 'budgetclothes'
-	$menu_arg = 'panties'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'budgetclothes', 'start'
-	end
-
-	i = 1
-	:looppanties
-		if cheap_panties[i] = 0:*p '<a href="exec: gt ''panties'', ''view_panty_item'', ''shop'', ''cheap'', <<i>>, 300"><img src="images/pc/panties/basic/<<i>>.jpg" 	height="250" /></a>'
-		i += 1
-		if i = 7: i = 8
-		if i = 9: i = 10
-		if i = 21: i = 22
-		if i = 37: i = 38
-	if i <= 37:jump 'looppanties'
-end
-
-if $ARGS[0] = 'bras':
-	$menu_loc = 'budgetclothes'
-	$menu_arg = 'bras'
-	menu_off = 0
-	$loc_arg = 'bras'
-	$loc = 'budgetclothes'
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'budgetclothes', 'start'
-	end
-
-	i = 1
-	:loopbras
-		if cheap_bras[i] = 0:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''cheap'', <<i>>, 300"><img src="images/pc/bras/basic/<<i>>.jpg" 	height="250" /></a>'
-		i += 1
-		if i = 11: i = 13
-		if i = 16: i = 17
-		if i = 18: i = 19
-	if i <= 19:jump 'loopbras'
-end
-
-
 --- budgetclothes ---------------------------------
 

+ 5 - 5
locations/clothing.qsrc

@@ -593,8 +593,8 @@ if $ARGS[0] = 'view_clothing_item':
 
 	if $ARGS[1] = 'shop':
 		if dyneval('RESULT = <<$ARGS[2]>>[<<ARGS[3]>>]') = 1:
-			'You already own this item.'
-			act 'Leave': gt $loc, $loc_arg
+			'You already own this item.'		
+			act 'Leave': gt 'shop_display', $loc, $loc_arg
 		else
 			if $ARGS[2] = 'coat' and ARGS[3] = 5:
 				price = ARGS[4]
@@ -603,7 +603,7 @@ if $ARGS[0] = 'view_clothing_item':
 				price = price / 50 * 50
 			end
 			'Price: <<price>> <b>₽</b>'
-			act 'Leave': gt $loc, $loc_arg
+			act 'Leave': gt 'shop_display', $loc, $loc_arg
 			if CloInhibit > pcs_inhib:
 				'You don''t feel daring enough to wear an outfit this revealing and can''t bring yourself to buy it.'
 			elseif karta + bankDebtLimit < Price and money < Price:
@@ -637,7 +637,7 @@ if $ARGS[0] = 'view_clothing_item':
 						dynamic $ARGS[2] + '_b[<<ARGS[3]>>] = pcs_hips'
 						dynamic $ARGS[2] + '_s[<<ARGS[3]>>] = 0'
 						gs 'stat'
-						gt $loc, $loc_arg
+						gt 'shop_display', $loc, $loc_arg
 					end
 				end
 				if karta + bankDebtLimit >= Price:
@@ -668,7 +668,7 @@ if $ARGS[0] = 'view_clothing_item':
 						dynamic $ARGS[2] + '_b[<<ARGS[3]>>] = pcs_hips'
 						dynamic $ARGS[2] + '_s[<<ARGS[3]>>] = 0'
 						gs 'stat'
-						gt $loc, $loc_arg
+						gt 'shop_display', $loc, $loc_arg
 					end
 				end
 			end

+ 14 - 14
locations/clothing_QV.qsrc

@@ -735,51 +735,51 @@ end
 if $ARGS[0] = 'shop_header':
 	$Headerstring = '<TH>Sort by quality '
 	if clothingfilter['quality'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''quality''] = 1 & gt $loc, $loc_arg">High - Low</a></TH>'
+		$Headerstring += '<a href="exec:clothingfilter[''quality''] = 1 & gt ''shop_display'', $loc, $loc_arg">High - Low</a></TH>'
 	else
-		$Headerstring += '<a href="exec:clothingfilter[''quality''] = 0 & gt $loc, $loc_arg">Random</a></TH>'
+		$Headerstring += '<a href="exec:clothingfilter[''quality''] = 0 & gt ''shop_display'', $loc, $loc_arg">Random</a></TH>'
 	end
 
 	$Headerstring += '<TH>Prostitute clothing '
 	if clothingfilter_prost = 0:
-		$Headerstring += '<a href="exec:clothingfilter_prost = 1 & gt $loc, $loc_arg">Included</a></TH>'
+		$Headerstring += '<a href="exec:clothingfilter_prost = 1 & gt ''shop_display'', $loc, $loc_arg">Included</a></TH>'
 	else
-		$Headerstring += '<a href="exec:clothingfilter_prost = 0 & gt $loc, $loc_arg">Excluded</a></TH>'
+		$Headerstring += '<a href="exec:clothingfilter_prost = 0 & gt ''shop_display'', $loc, $loc_arg">Excluded</a></TH>'
 	end
 
 	$Headerstring += '<TH>Bimbo clothing '
 	if clothingfilter_bimbo = 0:
-		$Headerstring += '<a href="exec:clothingfilter_bimbo = 1 & gt $loc, $loc_arg">Included</a></TH>'
+		$Headerstring += '<a href="exec:clothingfilter_bimbo = 1 & gt ''shop_display'', $loc, $loc_arg">Included</a></TH>'
 	else
-		$Headerstring += '<a href="exec:clothingfilter_bimbo = 0 & gt $loc, $loc_arg">Excluded</a></TH>'
+		$Headerstring += '<a href="exec:clothingfilter_bimbo = 0 & gt ''shop_display'', $loc, $loc_arg">Excluded</a></TH>'
 	end
 
 	$Headerstring += '<TH>Neither Prostitute or Bimbo clothing '
 	if clothingfilter_norm = 0:
-		$Headerstring += '<a href="exec:clothingfilter_norm = 1 & gt $loc, $loc_arg">Included</a></TH>'
+		$Headerstring += '<a href="exec:clothingfilter_norm = 1 & gt ''shop_display'', $loc, $loc_arg">Included</a></TH>'
 	else
-		$Headerstring += '<a href="exec:clothingfilter_norm = 0 & gt $loc, $loc_arg">Excluded</a></TH>'
+		$Headerstring += '<a href="exec:clothingfilter_norm = 0 & gt ''shop_display'', $loc, $loc_arg">Excluded</a></TH>'
 	end
 
 	$Headerstring += '<TH>Clothing you don''t find risqué '
 	if clothingfilter_comf = 0:
-		$Headerstring += '<a href="exec:clothingfilter_comf = 1 & gt $loc, $loc_arg">Included</a></TH>'
+		$Headerstring += '<a href="exec:clothingfilter_comf = 1 & gt ''shop_display'', $loc, $loc_arg">Included</a></TH>'
 	else
-		$Headerstring += '<a href="exec:clothingfilter_comf = 0 & gt $loc, $loc_arg">Excluded</a></TH>'
+		$Headerstring += '<a href="exec:clothingfilter_comf = 0 & gt ''shop_display'', $loc, $loc_arg">Excluded</a></TH>'
 	end
 
 	$Headerstring += '<TH>Risqué clothing '
 	if clothingfilter_daring = 0:
-		$Headerstring += '<a href="exec:clothingfilter_daring = 1 & gt $loc, $loc_arg">Included</a></TH>'
+		$Headerstring += '<a href="exec:clothingfilter_daring = 1 & gt ''shop_display'', $loc, $loc_arg">Included</a></TH>'
 	else
-		$Headerstring += '<a href="exec:clothingfilter_daring = 0 & gt $loc, $loc_arg">Excluded</a></TH>'
+		$Headerstring += '<a href="exec:clothingfilter_daring = 0 & gt ''shop_display'', $loc, $loc_arg">Excluded</a></TH>'
 	end
 
 	$Headerstring += '<TH>Clothing too risqué for you  '
 	if clothingfilter_too_daring = 0:
-		$Headerstring += '<a href="exec:clothingfilter_too_daring = 1 & gt $loc, $loc_arg">Included</a></TH>'
+		$Headerstring += '<a href="exec:clothingfilter_too_daring = 1 & gt ''shop_display'', $loc, $loc_arg">Included</a></TH>'
 	else
-		$Headerstring += '<a href="exec:clothingfilter_too_daring = 0 & gt $loc, $loc_arg">Excluded</a></TH>'
+		$Headerstring += '<a href="exec:clothingfilter_too_daring = 0 & gt ''shop_display'', $loc, $loc_arg">Excluded</a></TH>'
 	end
 
 	'<center><table border=1><<$Headerstring>></table></center>'

+ 3 - 130
locations/exhibitionistshop.qsrc

@@ -26,140 +26,13 @@ if $ARGS[0] = 'start':
 		*nl
 		'The shop is closing and you have to leave.'
 	else
-		act 'View clothing':
-			minut += 5
-			gt 'exhibitionistshop', 'clo'
-		end
-
-		act 'View panties':
-			minut += 5
-			gt 'exhibitionistshop', 'panties'
-		end
-
-		act 'View bras':
-			minut += 5
-			gt 'exhibitionistshop', 'bras'
-		end
+		act 'View clothing': minut += 5 & gt 'shop_display', 'exhibitionistshop', 'clothes'
+		act 'View panties': minut += 5 & gt 'shop_display', 'exhibitionistshop', 'panties'
+		act 'View bras': minut += 5 & gt 'shop_display', 'exhibitionistshop', 'bras'
 	end
 end
 
-if $ARGS[0] = 'clo':
-	$loc_arg = 'clo'
-	$loc = 'exhibitionistshop'
-	cls
-	gs'stat'
-	'<center><b><font color="maroon">Exhibitionist clothing</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'exhibitionistshop', 'start'
-	end
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-		if Clothingstock >= 18:
-			i = 1
-		elseif Clothingstock >= 12:
-			i = 2
-		elseif Clothingstock >= 6:
-			i = 3
-		else
-			i = 4
-		end
-
-		:loopexhibit
-			if exhibit[i] = 0:
-				gs 'clothing_attributes', 'exhibit', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''exhibit''"><img <<$set_imgh>> src="images/pc/clothing/9exhibit/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 4
-		if i <= 125:jump 'loopexhibit'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
-end
-
-if $ARGS[0] = 'exhibit':
-	cla
-	
-	if exhibit[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'exhibitionistshop', 'clo'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'exhibit',i, 1000
-end
-
-if $ARGS[0] = 'panties':
-	$loc_arg = 'panties'
-	$loc = 'exhibitionistshop'
-	cls
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'exhibitionistshop', 'start'
-	end
-
-	i = 2
 
-	:loopexhibitionist_panties
-		if exhibitionist_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''panties2''"><img src="images/pc/panties/exhibitionist/<<i>>.jpg" height="150" /></a> '
-		i += 1
-	if i <= 59:jump 'loopexhibitionist_panties'
-end
-
-if $ARGS[0] = 'panties2':
-	cla
-	
-	if exhibitionist_panties[i] ! 0:
-		msg 'You already own these panties.'
-		gt 'exhibitionistshop', 'panties'
-	end
-
-	gt 'panties', 'view_panty_item', 'shop', 'exhibitionist',i, 600
-
-end
-
-if $ARGS[0] = 'bras':
-	$loc_arg = 'bras'
-	$loc = 'exhibitionistshop'
-	cls
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'exhibitionistshop', 'start'
-	end
-
-	i = 2
-
-	:loopexhibitionist_bras
-		if exhibitionist_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''bras2''"><img src="images/pc/bras/exhibitionist/<<i>>.jpg" height="150" /></a> '
-		i += 1
-	if i <= 37:jump 'loopexhibitionist_bras'
-end
-
-if $ARGS[0] = 'bras2':
-	cla
-	
-	if exhibitionist_bras[i] ! 0:
-		msg 'You already own these bras.'
-		gt 'exhibitionistshop', 'bras'
-	end
-
-	gt 'bras', 'view_bra_item', 'shop', 'exhibitionist',i, 600
-
-end
 
 
 --- exhibitionistshop ---------------------------------

+ 4 - 96
locations/moncheri.qsrc

@@ -45,12 +45,10 @@ if $ARGS[0] = 'start':
 
 	act 'Leave the boutique': minut += 3 & gt 'torgcentr'
 	
-	act 'View clothing': minut += 5 & gt 'moncheri', 'clothes'
-
-	act 'View shoes': minut += 5 & gt 'moncheri', 'shoes'
-
-	act 'View purses': minut += 5 & gt 'moncheri', 'purses'
-
+	act 'View clothing': minut += 5 & gt 'shop_display', 'moncheri', 'clothes'
+	act 'View shoes': minut += 5 & gt 'shop_display', 'moncheri', 'shoes'
+	act 'View purses': minut += 5 & gt 'shop_display', 'moncheri', 'purses'
+	!act 'View coats': minut += 5 & gt 'shop_display', 'moncheri', 'coats'
 	act 'View coats':
 		cla
 		act 'Return': minut += 1 & gt 'moncheri', 'start'
@@ -65,96 +63,6 @@ if $ARGS[0] = 'start':
 
 end
 
-if $ARGS[0] = 'clothes':
-	$loc_arg = 'clothes'
-	$loc = 'moncheri'
-	$menu_loc = 'moncheri'
-	$menu_arg = 'clothes'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing Mon Chéri outfits</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return': minut += 1 & gt 'moncheri', 'start'
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-		if Clothingstock > 11:
-			i = 1
-		else
-			i = 2
-		end
-
-		:loopmoncheri
-			if moncheri[i] = 0:
-				gs 'clothing_attributes', 'moncheri', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri''"><img src="images/pc/clothing/4formal/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 2
-		if i <= 185:jump 'loopmoncheri'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
-end
-
-if $ARGS[0] = 'moncheri':
-	cla
-	menu_off = 1
-	if moncheri[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'moncheri', 'clothes'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'moncheri',i, 20000
-
-end
-
-if $ARGS[0] = 'shoes':
-	$loc_arg = $ARGS[0]
-	$loc = 'moncheri'
-	$menu_loc = 'moncheri'
-	$menu_arg = 'shoes'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return': minut += 1 & gt 'moncheri', 'start'
-
-	:loopmoncheri_shoes
-		if smoncheri[i] = 0:*p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_shoes''"><img src="images/pc/items/moncheri/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 40:jump 'loopmoncheri_shoes'
-end
-
-if $ARGS[0] = 'moncheri_shoes':	gt 'shoes', 'view_shoe_item', 'shop', 'moncheri',i, 5000
-
-if $ARGS[0] = 'purses':
-	$loc_arg = 'purses'
-	$loc = 'moncheri'
-	$menu_loc = 'moncheri'
-	$menu_arg = 'purses'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return': minut += 1 & gt 'moncheri', 'start'
-
-	i = 1
-
-	:loopmoncheri_purses
-		if moncheri_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''moncheri'', ''purses2''"><img src="images/pc/items/moncheri/purses/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 20:jump 'loopmoncheri_purses'
-end
-
-if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'moncheri',i, 4000
-
 if $ARGS[0] = 'rima':
 	*clr & cla
 	menu_off = 1

+ 4 - 4
locations/panties.qsrc

@@ -148,17 +148,17 @@ if $ARGS[0] = 'view_panty_item':
 	if $ARGS[1] = 'shop':
 		if dyneval('RESULT = <<$ARGS[2]>>_panties[<<ARGS[3]>>]') = 1:
 			'You already own this item.'
-			act 'Leave': gt $loc, $loc_arg
+			act 'Leave': gt 'shop_display', $loc, $loc_arg
 		else
 			price = ARGS[4]
 			'Price: <<ARGS[4]>> <b>₽</b>'
-			act 'Leave': gt $loc, $loc_arg
+			act 'Leave': gt 'shop_display', $loc, $loc_arg
 			if money >= price:
 				act 'Buy (cash)':
 					money -= price
 					dynamic $ARGS[2] + '_panties[<<ARGS[3]>>] = 1'
 					dynamic $ARGS[2] + '_pantiesS[<<ARGS[3]>>] = 0'
-					gt $loc, $loc_arg
+					gt 'shop_display', $loc, $loc_arg
 				end
 			else
 				'You do not have enough cash to buy these panties.'
@@ -168,7 +168,7 @@ if $ARGS[0] = 'view_panty_item':
 					karta -= price
 					dynamic $ARGS[2] + '_panties[<<ARGS[3]>>] = 1'
 					dynamic $ARGS[2] + '_pantiesS[<<ARGS[3]>>] = 0'
-					gt $loc, $loc_arg
+					gt 'shop_display', $loc, $loc_arg
 				end
 			else
 				'You do not have enough money in your bank to buy these panties.'

+ 4 - 4
locations/purses.qsrc

@@ -125,11 +125,11 @@ if $ARGS[0] = 'view_purse_item':
 	if $ARGS[1] = 'shop':
 		if dyneval('RESULT = <<$ARGS[2]>>_purses[<<ARGS[3]>>]') = 1:
 			'You already own this purse.'
-			act 'Leave': gt $loc, $loc_arg
+			act 'Leave': gt 'shop_display', $loc, $loc_arg
 		else
 			price = ARGS[4]
 			'Price: <<ARGS[4]>> <b>₽</b>'
-			act 'Leave': gt $loc, $loc_arg
+			act 'Leave': gt 'shop_display', $loc, $loc_arg
 			if money >= price:
 				act 'Buy (cash)':
 					money -= price
@@ -139,7 +139,7 @@ if $ARGS[0] = 'view_purse_item':
 						$currentpursetype = $ARGS[2]
 						currentpursenumber = ARGS[3]
 					end
-					gt $loc, $loc_arg
+					gt 'shop_display', $loc, $loc_arg
 				end
 			else
 				'You do not have enough cash to buy this purse.'
@@ -153,7 +153,7 @@ if $ARGS[0] = 'view_purse_item':
 						$currentpursetype = $ARGS[2]
 						currentpursenumber = ARGS[3]
 					end
-					gt $loc, $loc_arg
+					gt 'shop_display', $loc, $loc_arg
 				end
 			else
 				'You do not have enough money in your bank to buy this purse.'

+ 1 - 50
locations/scandalicious.qsrc

@@ -21,57 +21,8 @@ if $ARGS[0] = 'start':
 		gt 'torgcentr'
 	end
 
-	act 'View swimwear':
-		cla
-		minut += 5
-		gt 'scandalicious', 'swim'
-	end
+	act 'View swimwear': minut += 5 & gt 'shop_display', 'scandalicious', 'swim'
 end
 
-if $ARGS[0] = 'swim':
-	$loc_arg = 'swim'
-	$loc = 'scandalicious'
-	cls
-	gs'stat'
-	'<center><b><font color="maroon">Swimwear - one size fits all</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'scandalicious', 'start'
-	end
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-		if Clothingstock > 18:
-			i = 1
-		elseif Clothingstock > 12:
-			i = 2
-		elseif Clothingstock > 6:
-			i = 3
-		else
-			i = 4
-		end
-
-		:loopbeach
-			if beach[i] = 0:
-				gs 'clothing_attributes', 'beach', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''swim1''"><img src="images/pc/clothing/15beachbabe/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 4
-		if i <= 103:jump 'loopbeach'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
-end
-
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'shop', 'beach',i, 1750
-
 --- scandalicious ---------------------------------
 

+ 4 - 147
locations/sexshop.qsrc

@@ -134,10 +134,10 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	act 'Look through the fetish clothing':	minut += 1 & gt 'sexshop', 'clo'
-	act 'Look through the panties':	minut += 1 & gt 'sexshop', 'panties'
-	act 'Look through the bras': minut += 1 & gt 'sexshop', 'bras'
-	act 'Look through the fetish shoes': minut += 1 & gt 'sexshop', 'shoes'
+	act 'Look through the fetish clothing':	minut += 1 & gt 'shop_display', 'sexshop', 'clothes'
+	act 'Look through the panties':	minut += 1 & gt 'shop_display', 'sexshop', 'panties'
+	act 'Look through the bras': minut += 1 & gt 'shop_display', 'sexshop', 'bras'
+	act 'Look through the fetish shoes': minut += 1 & gt 'shop_display', 'sexshop', 'shoes'
 	
 	if money < 145 and karta + bankDebtLimit < 145:
 		'You cannot afford lubricant.'
@@ -632,149 +632,6 @@ if $ARGS[0] = 'start':
 	end
 end
 
-if $ARGS[0] = 'clo':
-	$loc_arg = 'clo'
-	$loc = 'sexshop'
-	$menu_loc = 'sexshop'
-	$menu_arg = 'clo'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Fetish clothing - for all your personal needs</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return': minut += 1 & gt 'sexshop', 'start'
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-		i = Clothingstock + 1
-
-		if Clothingstock > 20:
-			i -= 20
-		elseif Clothingstock > 16:
-			i -= 16
-		elseif Clothingstock > 12:
-			i -= 12
-		elseif Clothingstock > 8:
-			i -= 8
-		elseif Clothingstock > 4:
-			i -= 4
-		end
-
-		:loopfetish
-			if fetish[i] = 0:
-				gs 'clothing_attributes', 'fetish', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-					
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''fetish''"><img <<$set_imgh>> src="images/pc/clothing/8fetish/<<i>>.jpg"	height="250" /></a>'
-				end
-			end
-			i += 4
-		if i <= 240:jump 'loopfetish'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
-end
-
-if $ARGS[0] = 'fetish':
-	cla
-	
-	if fetish[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'sexshop', 'clo'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'fetish',i, 1000
-end
-
-
-if $ARGS[0] = 'shoes':
-	$loc_arg = 'shoes'
-	$loc = 'sexshop'
-	$menu_loc = 'sexshop'
-	$menu_arg = 'shoes'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return': minut += 1 & gt 'sexshop', 'start'
-
-	if Clothingstock > 11:
-		i = 1
-	else
-		i = 2
-	end
-
-	:loopfetish_shoes
-		if sfetish[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''fetish_shoes''"><img src="images/pc/shoes/fetish/<<i>>.jpg" height="250" /></a>'
-		i += 2
-	if i <= 27:jump 'loopfetish_shoes'
-end
-
-if $ARGS[0] = 'fetish_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'fetish',i, 2500
-
-if $ARGS[0] = 'panties':
-	$loc_arg = 'panties'
-	$loc = 'sexshop'
-	$menu_loc = 'sexshop'
-	$menu_arg = 'panties'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return': minut += 1 & gt 'sexshop', 'start'
-
-	i = 1
-
-	:loopsexshop_panties
-		if sexshop_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''panties2''"><img src="images/pc/panties/sexshop/<<i>>.jpg"	height="250" /></a> '
-		i += 1
-	if i <= 43:jump 'loopsexshop_panties'
-end
-
-if $ARGS[0] = 'panties2':
-	cla
-	
-	if sexshop_panties[i] ! 0:
-		msg 'You already own these panties.'
-		gt 'sexshop', 'panties'
-	end
-
-	gt 'panties', 'view_panty_item', 'shop', 'sexshop',i, 500
-end
-
-if $ARGS[0] = 'bras':
-	$loc_arg = 'bras'
-	$loc = 'sexshop'
-	$menu_loc = 'sexshop'
-	$menu_arg = 'bras'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return': minut += 1 & gt 'sexshop', 'start'
-
-	i = 1
-
-	:loopsexshop_bras
-		if sexshop_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''bras2''"><img src="images/pc/bras/sexshop/<<i>>.jpg"	height="250" /></a> '
-		i += 1
-	if i <= 27:jump 'loopsexshop_bras'
-end
-
-if $ARGS[0] = 'bras2':
-	cla
-	
-	if sexshop_bras[i] ! 0:
-		msg 'You already own this bra.'
-		gt 'sexshop', 'bras'
-	end
-
-	gt 'bras', 'view_bra_item', 'shop', 'sexshop',i, 500
-
-end
 
 if $ARGS[0] = 'podval':
 	$menu_loc = 'sexshop'

+ 4 - 4
locations/shoes.qsrc

@@ -204,12 +204,12 @@ if $ARGS[0] = 'view_shoe_item':
 	if $ARGS[1] = 'shop':
 		if dyneval('RESULT = S<<$ARGS[2]>>[<<ARGS[3]>>]') = 1:
 			'You already own these shoes.'
-			act 'Leave': gt $loc, $loc_arg
+			act 'Leave': gt 'shop_display', $loc, $loc_arg
 		else
 			price = ('<<ARGS[4]>>' * ((5 * ShoQuality) + 100) / 100) * 1000 / (1250 - Clothingstock[ARGS[3]]) * 3 / 2
 			price = price / 50 * 50
 			'Price: <<price>> <b>₽</b>'
-			act 'Leave': gt $loc, $loc_arg
+			act 'Leave': gt 'shop_display', $loc, $loc_arg
 			if money >= Price:
 				act 'Buy (cash)':
 					h = 0
@@ -218,7 +218,7 @@ if $ARGS[0] = 'view_shoe_item':
 					h += (3 * ShoQuality)
 					money -= price
 					dynamic 'S<<$ARGS[2]>>[<<ARGS[3]>>] = 1'
-					gt $loc, $loc_arg
+					gt 'shop_display', $loc, $loc_arg
 				end
 			else
 				'You do not have enough cash to buy these shoes.'
@@ -231,7 +231,7 @@ if $ARGS[0] = 'view_shoe_item':
 					h += (3 * ShoQuality)
 					karta -= price
 					dynamic 'S<<$ARGS[2]>>[<<ARGS[3]>>] = 1'
-					gt $loc, $loc_arg
+					gt 'shop_display', $loc, $loc_arg
 				end
 			else
 				'You do not have enough money in your bank to buy these shoes.'

+ 6 - 148
locations/shop_coco_carmen.qsrc

@@ -1,5 +1,6 @@
 # shop_coco_carmen
 
+
 if $ARGS[0] = 'start':
 	$loc_arg = $ARGS[0]
 	$loc = 'shop_coco_carmen'
@@ -18,155 +19,12 @@ if $ARGS[0] = 'start':
 
 	act 'Leave the coco': minut += 3 & gt 'pav_commercial'
 	
-	act 'View dresses': minut += 5 & gt 'shop_coco_carmen', 'dress'
-
-	act 'View other outfits': minut += 5 & gt 'shop_coco_carmen', 'outfits'
-
-	act 'View purses': minut += 5 & gt 'shop_coco_carmen', 'purses'
-end
-
-if $ARGS[0] = 'dress':
-	$loc_arg = 'dress'
-	$loc = 'shop_coco_carmen'
-	$menu_loc = 'shop_coco_carmen'
-	$menu_arg = 'dress'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing Coco Carmen dresses</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return': minut += 1 & gt 'shop_coco_carmen', 'start'
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dress
-		if Clothingstock > 11:
-			i = 1
-		else
-			i = 2
-		end
-
-		:loopcoco_dress
-			if coco_dress[i] = 0:
-				gs 'clothing_attributes', 'coco_dress', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_coco_carmen'', ''coco_dress''"><img src="images/pc/items/coco/dress/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 2
-		if i <= 100:jump 'loopcoco_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
-end
-
-if $ARGS[0] = 'coco_dress':
-	cla
-	menu_off = 1
-	if coco_dress[i] ! 0:
-		msg 'You already own this dress.'
-		gt 'shop_coco_carmen', 'dress'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'coco_dress',i, 3000
-end
-
-if $ARGS[0] = 'outfits':
-	$loc_arg = 'outfits'
-	$loc = 'shop_coco_carmen'
-	$menu_loc = 'shop_coco_carmen'
-	$menu_arg = 'outfits'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing Coco Carmen outfits</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return': minut += 1 & gt 'shop_coco_carmen', 'start'
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_outfits
-		if Clothingstock > 11:
-			i = 1
-		else
-			i = 2
-		end
-
-		:loopcoco_outfits
-			if coco_outfits[i] = 0:
-				gs 'clothing_attributes', 'coco_outfits', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_coco_carmen'', ''coco_outfits''"><img src="images/pc/items/coco/outfits/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 2
-		if i <= 90:jump 'loopcoco_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_outfits'
-end
-
-if $ARGS[0] = 'coco_outfits':
-	cla
-	menu_off = 1
-	if coco_outfits[i] ! 0:
-		msg 'You already own this outfit.'
-		gt 'shop_coco_carmen', 'outfits'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'coco_outfits',i, 3000
-
-end
-
-if $ARGS[0] = 'shoes':
-	$loc_arg = $ARGS[0]
-	$loc = 'shop_coco_carmen'
-	$menu_loc = 'shop_coco_carmen'
-	$menu_arg = 'shoes'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return': minut += 1 & gt 'shop_coco_carmen', 'start'
-
-	if Clothingstock > 11:
-		i = 1
-	else
-		i = 2
-	end
-
-	:loopcoco_shoes
-		if scoco[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_coco_carmen'', ''coco_shoes''"><img src="images/pc/shoes/coco/<<i>>.jpg" height="250" /></a>'
-		i += 2
-	if i <= 37:jump 'loopcoco_shoes'
-end
-
-if $ARGS[0] = 'purses':
-	$loc_arg = 'purses'
-	$loc = 'shop_coco_carmen'
-	$menu_loc = 'shop_coco_carmen'
-	$menu_arg = 'purses'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return': minut += 1 & gt 'shop_coco_carmen', 'start'
-
-	i = 1
-
-	:loopcoco_purses
-		if coco_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_coco_carmen'', ''purses2''"><img src="images/pc/items/coco/purses/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 20:jump 'loopcoco_purses'
+	act 'View dresses': minut += 5 & gt 'shop_display', 'shop_coco_carmen', 'dress'
+	
+	act 'View other outfits': minut += 5 & gt 'shop_display', 'shop_coco_carmen', 'clothes'
+	
+	act 'View purses': minut += 5 & gt 'shop_display', 'shop_coco_carmen', 'purses'
 end
 
-if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'coco',i, 2000
-
 --- shop_coco_carmen ---------------------------------
 

+ 7 - 0
locations/shop_display.gsrc

@@ -0,0 +1,7 @@
+#shop_display
+
+if $ARGS[0] = 'start':
+
+end
+
+--- shop_display ---------------------------------

+ 761 - 0
locations/shop_display.qsrc

@@ -0,0 +1,761 @@
+# shop_display
+
+if $ARGS[0] = 'shop_coco_carmen':
+	$shop = 'Coco Carmen'
+	$loc = $ARGS[0]
+	$menu_loc = $ARGS[0]
+
+	if $ARGS[1] = 'dress':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]
+		$product = 'Dresses'
+		$product_code = 'coco_dress'
+		$shop_array = 'coco_dress'		
+		$img_loc = 'images/pc/items/coco/dress/'
+		price = 3000
+		filter = 1
+		numproduct = 100		
+	elseif $ARGS[1] = 'clothes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]	
+		$product = 'Outfits'
+		$product_code = 'coco_outfits'
+		$shop_array = 'coco_outfits'	
+		$img_loc = 'images/pc/items/coco/outfits/'
+		price = 3000
+		filter = 1
+		numproduct = 90			
+	elseif $ARGS[1] = 'purses':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]	
+		$product = 'Purses'
+		$product_code = 'purses2'
+		$shop_array = 'coco_purses'		
+		$img_loc = 'images/pc/items/coco/purses/'
+		price = 2000
+		filter = 0	
+		$shortshop = 'coco'
+		numproduct = 20
+	end		
+	
+elseif $ARGS[0] = 'sportshop':
+	$shop = 'Danilovich Sporting Goods'	
+	$loc = $ARGS[0]
+	$menu_loc = $ARGS[0]	
+
+	if $ARGS[1] = 'clothes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]	
+		$product = 'Sports Clothing'
+		$product_code = 'exercise'
+		$shop_array = 'exercise'		
+		$img_loc = 'images/pc/clothing/7exercise/'
+		price = 2000		
+		filter = 1
+		numproduct = 260			
+	elseif $ARGS[1] = 'bras':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]	
+		$product = 'Bras'
+		$product_code = 'bras2'
+		$shop_array = 'sport_bras'		
+		$img_loc = 'images/pc/bras/sport/'
+		price = 1000		
+		filter = 0
+		$shortshop = 'sport'
+		numproduct = 8			
+	elseif $ARGS[1] = 'panties':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Panties'
+		$product_code = 'panties2'
+		$shop_array = 'sport_panties'		
+		$img_loc = 'images/pc/panties/sport/'
+		price = 1000			
+		filter = 0	
+		$shortshop = 'sport'
+		numproduct = 8			
+	elseif $ARGS[1] = 'danilovich':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Exercise Shoes'
+		$product_code = 'training_shoes'
+		$shop_array = 'sdanilovich'		
+		$img_loc = 'images/pc/items/danilovich/shoes/'
+		price = 1500			
+		filter = 0
+		$shortshop = 'danilovich'
+		numproduct = 40			
+	elseif $ARGS[1] = 'swim':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]	
+		$product = 'Swimwear'
+		$product_code = 'swim1'
+		$shop_array = 'swimwear'		
+		$img_loc = 'images/pc/clothing/12swimwear/'
+		price = 1750		
+		filter = 1	
+		numproduct = 213			
+	elseif $ARGS[1] = 'purses':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Purses'
+		$product_code = 'purses2'
+		$shop_array = 'danilovich_purses'		
+		$img_loc = 'images/pc/items/danilovich/purses/'
+		price = 1500	
+		filter = 0		
+		$shortshop = 'danilovich'		
+		numproduct = 20			
+	end		
+		
+elseif $ARGS[0] = 'sexshop':
+	$shop = 'The Erotomaniac'
+	$loc = $ARGS[0]
+	$menu_loc = $ARGS[0]
+	
+	if $ARGS[1] = 'clothes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Fetish Clothing - for all your personal needs'
+		$product_code = 'fetish'
+		$shop_array = 'fetish'		
+		$img_loc = 'images/pc/clothing/8fetish/'
+		price = 1000		
+		filter = 1
+		numproduct = 240			
+	elseif $ARGS[1] = 'bras':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Bras'
+		$product_code = 'bras2'
+		$shop_array = 'sexshop_bras'		
+		$img_loc = 'images/pc/bras/sexshop/'
+		price = 500			
+		filter = 0
+		$shortshop = 'sexshop'		
+		numproduct = 27			
+	elseif $ARGS[1] = 'panties':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Panties'
+		$product_code = 'panties2'
+		$shop_array = 'sexshop_panties'		
+		$img_loc = 'images/pc/panties/sexshop/'
+		price = 500			
+		filter = 0	
+		$shortshop = 'sexshop'				
+		numproduct = 43			
+	elseif $ARGS[1] = 'shoes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Fetish Shoes'
+		$product_code = 'fetish_shoes'
+		$shop_array = 'sfetish'		
+		$img_loc = 'images/pc/shoes/fetish/'
+		price = 2500		
+		filter = 0	
+		$shortshop = 'fetish'			
+		numproduct = 27			
+	end		
+	
+elseif $ARGS[0] = 'exhibitionistshop':
+	$shop = 'Expression of You'	
+	$loc = $ARGS[0]
+	$menu_loc = $ARGS[0]	
+		
+	if $ARGS[1] = 'clothes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Outfits'
+		$product_code = 'exhibit'
+		$shop_array = 'exhibit'		
+		$img_loc = 'images/pc/clothing/9exhibit/'
+		price = 1000		
+		filter = 1
+		numproduct = 125			
+	elseif $ARGS[1] = 'bras':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Bras'
+		$product_code = 'bras2'
+		$shop_array = 'exhibitionist_bras'		
+		$img_loc = 'images/pc/bras/exhibitionist/'
+		price = 600		
+		filter = 0
+		$shortshop = 'exhibitionist'			
+		numproduct = 37			
+	elseif $ARGS[1] = 'panties':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Panties'
+		$product_code = 'panties2'
+		$shop_array = 'exhibitionist_panties'	
+		$img_loc = 'images/pc/panties/exhibitionist/'
+		price = 600			
+		filter = 0	
+		$shortshop = 'exhibitionist'			
+		numproduct = 59			
+	end		
+
+elseif $ARGS[0] = 'shop_fashionista':
+	$shop = 'Fashionista'	
+	$loc = $ARGS[0]
+	$menu_loc = $ARGS[0]	
+	
+	if $ARGS[1] = 'clothes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Outfits'
+		$product_code = 'shmotmag'
+		$shop_array = 'fashionista'		
+		$img_loc = 'images/pc/items/fashionista/dress/'
+		price = 8000			
+		filter = 1
+		numproduct = 200			
+	elseif $ARGS[1] = 'bras':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Bras'
+		$product_code = 'bras2'
+		$shop_array = 'fashionista_bras'		
+		$img_loc = 'images/pc/bras/fashionista/'
+		price = 750			
+		filter = 0
+		$shortshop = 'fashionista'		
+		numproduct = 42			
+	elseif $ARGS[1] = 'panties':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Panties'
+		$product_code = 'panties2'
+		$shop_array = 'fashionista_panties'		
+		$img_loc = 'images/pc/panties/fashionista/'
+		price = 750		
+		filter = 0	
+		$shortshop = 'fashionista'		
+		numproduct = 79			
+	elseif $ARGS[1] = 'purses':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Purses'
+		$product_code = 'purses2'
+		$shop_array = 'fashionista_purses'		
+		$img_loc = 'images/pc/items/fashionista/purses/'
+		price = 3000			
+		filter = 0	
+		$shortshop = 'fashionista'		
+		numproduct = 20			
+	end		
+	
+elseif $ARGS[0] = 'shop_flamingos':
+	$shop = 'Flamingo''s'	
+	$loc = $ARGS[0]
+	$menu_loc = $ARGS[0]	
+		
+	if $ARGS[1] = 'dress':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Dresses'
+		$product_code = 'flamingos_dress'
+		$shop_array = 'flamingos_dress'		
+		$img_loc = 'images/pc/items/flamingos/dress/'
+		price = 3000		
+		filter = 1
+		numproduct = 90			
+	elseif $ARGS[1] = 'clothes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Outfits'
+		$product_code = 'flamingos_outfits'
+		$shop_array = 'flamingos_outfits'		
+		$img_loc = 'images/pc/items/flamingos/outfits/'
+		price = 3000		
+		filter = 1
+		numproduct = 50			
+	elseif $ARGS[1] = 'purses':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Purses'
+		$product_code = 'purses2'
+		$shop_array = 'flamingos_purses'		
+		$img_loc = 'images/pc/items/flamingos/purses/'
+		price = 2000		
+		filter = 0	
+		$shortshop = 'flamingos'				
+		numproduct = 20	
+	end				
+	
+elseif $ARGS[0] = 'budgetclothes':
+	$shop = 'G & M'	
+	$loc = $ARGS[0]
+	$menu_loc = $ARGS[0]	
+		
+	if $ARGS[1] = 'clothes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Outfits'
+		$product_code = 'gm_outfits'
+		$shop_array = 'gm_outfits'		
+		$img_loc = 'images/pc/items/gm/outfits/'
+		price = 1000
+		filter = 1
+		numproduct = 150			
+	elseif $ARGS[1] = 'dress':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Dresses'
+		$product_code = 'gm_dress'
+		$shop_array = 'gm_dress'		
+		$img_loc = 'images/pc/items/gm/dress/'
+		price = 1000		
+		filter = 1
+		numproduct = 150			
+	elseif $ARGS[1] = 'office':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Office Wear'
+		$product_code = 'officeclo'
+		$shop_array = 'gm_office'		
+		$img_loc = 'images/pc/clothing/5office/'
+		price = 2000		
+		filter = 1	
+		numproduct = 140			
+	elseif $ARGS[1] = 'uniform':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Uniforms'
+		$product_code = 'uniformclo'
+		$shop_array = 'gm_uniform'		
+		$img_loc = 'images/pc/clothing/10uniform/'
+		price = 2000		
+		filter = 1
+		numproduct = 60			
+	elseif $ARGS[1] = 'school':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'School Uniforms'
+		$product_code = 'schoolclo'
+		$shop_array = 'gm_school'		
+		$img_loc = 'images/pc/clothing/6school/'
+		price = 1500		
+		filter = 1	
+		numproduct = 80			
+	elseif $ARGS[1] = 'shoes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Regular Shoes'
+		$product_code = 'budget_shoes'
+		$shop_array = 'sgm'		
+		$img_loc = 'images/pc/shoes/g&m/'
+		price = 700		
+		filter = 0		
+		$shortshop = 'gm'			
+		numproduct = 51			
+	elseif $ARGS[1] = 'danilovich':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Exercise Shoes'
+		$product_code = 'danilovich_shoes'
+		$shop_array = 'strainers'		
+		$img_loc = 'images/pc/items/danilovich/shoes/'
+		price = 800		
+		filter = 0
+		$shortshop = 'danilovich'			
+		numproduct = 40		
+	elseif $ARGS[1] = 'panties':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Panties'
+		$product_code = 'panties2'
+		$shop_array = 'cheap_panties'		
+		$img_loc = 'images/pc/panties/basic/'
+		price = 300		
+		filter = 0	
+		$shortshop = 'cheap'			
+		numproduct = 37			
+	elseif $ARGS[1] = 'bras':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Bras'
+		$product_code = 'bras2'
+		$shop_array = 'cheap_bras'		
+		$img_loc = 'images/pc/bras/basic/'
+		price = 300		
+		filter = 0
+		$shortshop = 'cheap'			
+		numproduct = 19			
+	elseif $ARGS[1] = 'purses':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Purses'
+		$product_code = 'purses2'
+		$shop_array = 'gm_purses'		
+		$img_loc = 'images/pc/items/gm/purses/'
+		price = 1500		
+		filter = 0	
+		$shortshop = 'gm'			
+		numproduct = 20		
+	elseif $ARGS[1] = 'coats':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Coats'
+		$product_code = 'coatsclo'
+		$shop_array = 'coat'		
+		$img_loc = 'images/pc/clothing/11coat/'
+		price = 1000		
+		filter = 0	
+		$shortshop = 'coat'			
+		numproduct = 20			
+	end		
+		
+elseif $ARGS[0] = 'moncheri':
+	$shop = 'Mon Chéri'	
+	$loc = $ARGS[0]
+	$menu_loc = $ARGS[0]	
+
+	if $ARGS[1] = 'clothes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Outfits'
+		$product_code = 'moncheri'
+		$shop_array = 'moncheri'		
+		$img_loc = 'images/pc/clothing/4formal/'
+		price = 20000			
+		filter = 1
+		numproduct = 185			
+	elseif $ARGS[1] = 'shoes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Shoes'
+		$product_code = 'moncheri_shoes'
+		$shop_array = 'smoncheri'		
+		$img_loc = 'images/pc/items/moncheri/shoes/'
+		price = 5000			
+		filter = 0
+		$shortshop = 'moncheri'			
+		numproduct = 40			
+	elseif $ARGS[1] = 'purses':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Purses'
+		$product_code = 'purses2'
+		$shop_array = 'moncheri_purses'		
+		$img_loc = 'images/pc/items/moncheri/purses/'
+		price = 4000			
+		filter = 0	
+		$shortshop = 'moncheri'			
+		numproduct = 20			
+	!elseif $ARGS[1] = 'coats':
+	!	$loc_arg = $ARGS[1]
+	!	$menu_arg = $ARGS[1]		
+	!	$product = 'Coats'
+	!	$product_code = 'coatsclo'
+	!	$shop_array = 'moncheri_coats'		
+	!	$img_loc = 'images/pc/items/moncheri/coats/'
+	!	price = 50000			
+	!	filter = 0		
+	!	$shortshop = 'moncheri_coat'	
+	!	numproduct = 20			
+	end		
+		
+elseif $ARGS[0] = 'shop_dolls':
+	$shop = 'Patch Work Dolls'	
+	$loc = $ARGS[0]
+	$menu_loc = $ARGS[0]	
+		
+	if $ARGS[1] = 'dress':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]	
+		$product = 'Dresses'
+		$product_code = 'dolls_dress'
+		$shop_array = 'dolls_dress'		
+		$img_loc = 'images/pc/items/dolls/dress/'
+		price = 3500		
+		filter = 1
+		numproduct = 110			
+	elseif $ARGS[1] = 'clothes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Outfits'
+		$product_code = 'dolls_outfits'
+		$shop_array = 'dolls_outfits'		
+		$img_loc = 'images/pc/items/dolls/outfits/'
+		price = 3500		
+		filter = 1
+		numproduct = 50	
+	elseif $ARGS[1] = 'shoes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Shoes'
+		$product_code = 'shop_dolls'
+		$shop_array = 'sdolls'		
+		$img_loc = 'images/pc/items/dolls/shoes/'
+		price = 2000		
+		filter = 0	
+		$shortshop = 'dolls'	
+		numproduct = 30			
+	elseif $ARGS[1] = 'purses':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Purses'
+		$product_code = 'purses2'
+		$shop_array = 'dolls_purses'		
+		$img_loc = 'images/pc/items/dolls/purses/'
+		price = 2000		
+		filter = 0	
+		$shortshop = 'dolls'			
+		numproduct = 20			
+	end		
+	
+elseif $ARGS[0] = 'shop_pussycats':
+	$shop = 'Pussy-Cats'
+	$loc = $ARGS[0]
+	$menu_loc = $ARGS[0]	
+		
+	if $ARGS[1] = 'dress':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Dresses'
+		$product_code = 'yshopclo_dress'
+		$shop_array = 'cats_dress'		
+		$img_loc = 'images/pc/items/cats/dress/'
+		price = 3000			
+		filter = 1
+		numproduct = 110			
+	elseif $ARGS[1] = 'clothes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Outfits'
+		$product_code = 'yshopclo_outfit'
+		$shop_array = 'cats_outfits'		
+		$img_loc = 'images/pc/items/cats/outfits/'
+		price = 3000			
+		filter = 1
+		numproduct = 100			
+	elseif $ARGS[1] = 'panties':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Panties'
+		$product_code = 'panties2'
+		$shop_array = 'kats_panties'		
+		$img_loc = 'images/pc/panties/kats/'
+		price = 500			
+		filter = 0	
+		$shortshop = 'kats'			
+		numproduct = 72			
+	elseif $ARGS[1] = 'bras':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Bras'
+		$product_code = 'bras2'
+		$shop_array = 'kats_bras'		
+		$img_loc = 'images/pc/bras/kats/'
+		price = 500			
+		filter = 0		
+		numproduct = 41	
+		$shortshop = 'kats'	
+	elseif $ARGS[1] = 'shoes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Shoes'
+		$product_code = 'young_shoes'
+		$shop_array = 'spussy'		
+		$img_loc = 'images/pc/shoes/cats/'
+		price = 1750			
+		filter = 0		
+		$shortshop = 'pussy'	
+		numproduct = 38			
+	elseif $ARGS[1] = 'purses':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Purses'
+		$product_code = 'purses2'
+		$shop_array = 'cats_purses'		
+		$img_loc = 'images/pc/items/cats/purses/'
+		price = 2000			
+		filter = 0		
+		$shortshop = 'cats'			
+		numproduct = 20			
+	end			
+	
+elseif $ARGS[0] = 'scandalicious':
+	$shop = 'Scandalicious'	
+	$loc = $ARGS[0]
+	$menu_loc = $ARGS[0]	
+	
+	if $ARGS[1] = 'swim':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Swimwear'
+		$product_code = 'swim1'
+		$shop_array = 'beach'		
+		$img_loc = 'images/pc/clothing/15beachbabe/'
+		price = 1750			
+		filter = 1
+		numproduct = 103			
+	end
+	
+elseif $ARGS[0] = 'shop_skuas':
+	$shop = 'Skuas'	
+	$loc = $ARGS[0]
+	$menu_loc = $ARGS[0]	
+	
+	if $ARGS[1] = 'clothes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Outfits'
+		$product_code = 'skuas'
+		$shop_array = 'skuas'		
+		$img_loc = 'images/pc/items/skuas/'
+		price = 20000			
+		filter = 1
+		numproduct = 185			
+	end
+	
+elseif $ARGS[0] = 'shop_tsar_bomba':
+	$shop = 'Tsar Bomba'
+	$loc = $ARGS[0]
+	$menu_loc = $ARGS[0]	
+		
+	if $ARGS[1] = 'dress':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Dresses'
+		$product_code = 'bomba_dresses'
+		$shop_array = 'bomba_dress'		
+		$img_loc = 'images/pc/items/bomba/goth_dress/'
+		price = 3500				
+		filter = 1
+		numproduct = 70			
+	elseif $ARGS[1] = 'clothes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Outfits'
+		$product_code = 'bomba_outfits'
+		$shop_array = 'bomba_outfits'		
+		$img_loc = 'images/pc/items/bomba/goth_outfits/'
+		price = 3500			
+		filter = 1
+		numproduct = 50			
+	elseif $ARGS[1] = 'shoes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Shoes'
+		$product_code = 'bomba_shoes'
+		$shop_array = 'sbomba'	
+		$img_loc = 'images/pc/items/bomba/shoes/'
+		price = 2000			
+		filter = 0		
+		$shortshop = 'bomba'			
+		numproduct = 40			
+	elseif $ARGS[1] = 'purses':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Purses'
+		$product_code = 'purses2'
+		$shop_array = 'bomba_purses'		
+		$img_loc = 'images/pc/items/bomba/purses/'
+		price = 2000			
+		filter = 0	
+		$shortshop = 'bomba'			
+		numproduct = 20			
+	end			
+
+elseif $ARGS[0] = 'shop_fancy_pancy':
+	$shop = 'Fancy Pancy'	
+	$loc = $ARGS[0]
+	$menu_loc = $ARGS[0]	
+	
+	if $ARGS[1] = 'clothes':
+		$loc_arg = $ARGS[1]
+		$menu_arg = $ARGS[1]		
+		$product = 'Outfits'
+		$product_code = 'fancy_burlesque'
+		$shop_array = 'fancy_burlesque'		
+		$img_loc = 'images/pc/items/fancy/burlesque/'
+		price = 20000			
+		filter = 1
+		numproduct = 22			
+	end
+
+end
+
+
+menu_off = 0
+*clr & cla
+gs'stat'
+'<center><b><font color="maroon">Viewing <<$shop>> <<$product>></font></b></center>'
+*nl
+
+
+if filter = 1:
+	gs 'clothing_QV', 'shop_header'
+
+	act 'Return': minut += 1 & gt $loc, 'start'
+
+	clothingfilter['qualitycheck'] = 7
+	:loopquality
+		i=1
+
+		:loopshop
+			if dyneval('RESULT = <<$shop_array>>[<<i>>]') = 0:
+				gs 'clothing_attributes', $shop_array, i
+				gs 'clothing_QV', 'shop_filter'
+
+				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
+				
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: gt ''shop_display'', ''<<$loc>>'', ''<<$product_code>>'', <<i>>"><img src="<<$img_loc>><<i>>.jpg" 	height="250" /></a>'
+
+				end
+			end
+			i += 1
+		if i <= numproduct:jump 'loopshop'
+	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+end
+
+
+if filter = 0:
+	act 'Return': minut += 1 & gt $loc, 'start'
+
+	i = 1
+	:loopshop_1
+		if dyneval('RESULT = <<$shop_array>>[<<i>>]') = 0:*p '<a href="exec: gt ''shop_display'', ''<<$loc>>'', ''<<$product_code>>'', <<i>>"><img src="<<$img_loc>><<i>>.jpg" 	height="250" /></a> '
+		'<<$img_loc>><<i>>'
+		
+		i += 1
+	if i <= numproduct:jump 'loopshop_1'
+end
+
+
+if $ARGS[1] = $product_code:
+	cla
+	menu_off = 1
+	if dyneval('RESULT = <<$shop_array>>[<<ARGS2>>]') ! 0:
+		msg 'You already own this dress.'
+		gt 'shop_display', $loc, $loc_arg
+	end
+	
+	if $shortshop = '': 
+			$shortshop = 'coco'
+	end
+	
+	if $loc_arg = 'panties':
+		gt $loc_arg, 'view_panty_item', 'shop', $shortshop, ARGS[2], price
+	elseif $loc_arg = 'bras':
+		gt $loc_arg, 'view_bra_item', 'shop', $shortshop, ARGS[2], price
+	elseif $loc_arg = 'purses':
+		gt $loc_arg, 'view_purse_item', 'shop', $shortshop, ARGS[2], price		
+	elseif $loc_arg = 'shoes':
+		gt $loc_arg, 'view_shoe_item', 'shop', $shortshop, ARGS[2], price
+	elseif $loc_arg = 'coats':
+		gt 'clothing', 'view_clothing_item', 'shop', $shortshop, ARGS[2], price
+	else:	
+		gt 'clothing', 'view_clothing_item', 'shop', $shop_array, ARGS[2], price
+	end
+end
+
+
+
+--- shop_display ---------------------------------
+

+ 4 - 162
locations/shop_dolls.qsrc

@@ -52,10 +52,10 @@ if $ARGS[0] = 'browse':
 	''
 	'The store has a small front on a side street, but one glance is all you need to tell this is not your average clothing store. Inside the store, shelves and racks of alternative clothes are crammed into every available space - anybody setting out to find an inch of wall would have their work cut out for them. The checkout counter is near the entrance.'
 
-	act 'View dresses':gt 'shop_dolls', 'dress'
-	act 'View other outfits':gt 'shop_dolls', 'clothing'
-	act 'View shoes':gt 'shop_dolls', 'shoes'
-	act 'View purses':gt 'shop_dolls', 'purses'
+	act 'View dresses': minut += 5 & gt 'shop_display', 'shop_dolls', 'dress'
+	act 'View other outfits': minut += 5 & gt 'shop_display', 'shop_dolls', 'clothes'
+	act 'View shoes': minut += 5 & gt 'shop_display', 'shop_dolls', 'shoes'
+	act 'View purses': minut += 5 & gt 'shop_display', 'shop_dolls', 'purses'
 	!act 'Jewelery':gt 'shop_dolls', 'jewelry'
 	!act 'Piercings':gt 'shop_dolls', 'piecrings'
 
@@ -63,164 +63,6 @@ if $ARGS[0] = 'browse':
 end
 
 
-if $ARGS[0] = 'dress':
-	$loc_arg = 'dress'
-	$loc = 'shop_dolls'
-	$menu_arg = 'dress'
-	$menu_loc = 'shop_dolls'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing Patchwork Dolls dresses</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return':
-		cla
-		minut += 5
-		gt 'shop_dolls', 'browse'
-	end
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dress
-		if Clothingstock > 15:
-			i = 1
-		elseif Clothingstock > 7:
-			i = 3
-		else
-			i = 2
-		end
-
-		:loopdolls_dress
-			if dolls_dress[i] = 0:
-				gs 'clothing_attributes', 'dolls_dress', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_dress''"><img src="images/pc/items/dolls/dress/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 3
-		if i <= 110:jump 'loopdolls_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
-end
-
-if $ARGS[0] = 'dolls_dress':
-	cla
-
-	if dolls_dress[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_dolls', 'dress'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'dolls_dress',i, 3500
-
-end
-
-if $ARGS[0] = 'clothing':
-	$loc_arg = 'clothing'
-	$loc = 'shop_dolls'
-	$menu_arg = 'clothing'
-	$menu_loc = 'shop_dolls'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing Patchwork Dolls clothing</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return':
-		cla
-		minut += 5
-		gt 'shop_dolls', 'browse'
-	end
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-		if Clothingstock > 11:
-			i = 1
-		else
-			i = 2
-		end
-
-		:loopdolls
-			if dolls_outfits[i] = 0:
-				gs 'clothing_attributes', 'dolls_outfits', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_outfits''"><img src="images/pc/items/dolls/outfits/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 2
-		if i <= 50:jump 'loopdolls'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
-end
-
-if $ARGS[0] = 'dolls_outfits':
-	cla
-
-	if dolls_outfits[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_dolls', 'clothing'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'dolls_outfits',i, 3500
-
-end
-
-if $ARGS[0] = 'shoes':
-	$loc_arg = 'shoes'
-	$loc = 'shop_dolls'
-	$menu_arg = 'purses'
-	$menu_loc = 'shoes'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 5
-		gt 'shop_dolls', 'browse'
-	end
-
-	:loopdolls_shoes
-		if sdolls[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_shoes''"><img src="images/pc/items/dolls/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 30:jump 'loopdolls_shoes'
-end
-
-if $ARGS[0] = 'dolls_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'dolls',i, 2000
-
-if $ARGS[0] = 'purses':
-	$loc_arg = 'purses'
-	$loc = 'shop_dolls'
-	$menu_arg = 'purses'
-	$menu_loc = 'shop_dolls'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 5
-		gt 'shop_dolls', 'browse'
-	end
-
-	i = 1
-
-	:loopdolls_purses
-		if dolls_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''purses2''"><img src="images/pc/items/dolls/purses/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 20:jump 'loopdolls_purses'
-end
-
-if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'dolls',i, 2000
-
 if $ARGS[0] = 'savva':
 	*clr & cla
 	menu_off = 1

+ 1 - 49
locations/shop_fancy_pancy.qsrc

@@ -21,58 +21,10 @@ if $ARGS[0] = 'start':
 
 	act 'Leave the boutique': minut += 3 & gt 'liames'
 	
-	act 'View clothing': minut += 5 & gt 'shop_fancy_pancy', 'clothes'
+	act 'View clothing': minut += 5 & gt 'shop_display', 'shop_fancy_pancy', 'clothes'
 end
 
-if $ARGS[0] = 'clothes':
-	$loc_arg = 'clothes'
-	$loc = 'shop_fancy_pancy'
-	$menu_loc = 'shop_fancy_pancy'
-	$menu_arg = 'clothes'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing Fancy Pancy outfits</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return': minut += 1 & gt 'shop_fancy_pancy', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-		if Clothingstock > 11:
-			i = 1
-		else
-			i = 2
-		end
-
-		:loopfancy_burlesque
-			if fancy_burlesque[i] = 0:
-				gs 'clothing_attributes', 'fancy_burlesque', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fancy_pancy'', ''fancy_burlesque''"><img src="images/pc/items/fancy/burlesque/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 2
-		if i <= 22:jump 'loopfancy_burlesque'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
-end
-
-if $ARGS[0] = 'fancy_burlesque':
-	cla
-	menu_off = 1
-	if fancy_burlesque[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_fancy_pancy', 'clothes'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'fancy_burlesque',i, 20000
-
-end
 
 --- shop_fancy_pancy ---------------------------------
 

+ 7 - 139
locations/shop_fashionista.qsrc

@@ -24,13 +24,13 @@ if $ARGS[0] = 'start':
 		gt 'torgcentr'
 	end
 	
-	act 'View clothing': minut += 5 & gt 'shop_fashionista', 'clothes'
-
-	act 'View panties': minut += 5 & gt 'shop_fashionista', 'panties'
-
-	act 'View bras': minut += 5 & gt 'shop_fashionista', 'bras'
-
-	act 'View purses': minut += 5 & gt 'shop_fashionista', 'purses'
+	act 'View clothing': minut += 5 & gt 'shop_display', 'shop_fashionista', 'clothes'
+	
+	act 'View panties': minut += 5 & gt 'shop_display', 'shop_fashionista', 'panties'
+	
+	act 'View bras': minut += 5 & gt 'shop_display', 'shop_fashionista', 'bras'
+	
+	act 'View purses': minut += 5 & gt 'shop_display', 'shop_fashionista', 'purses'
 	
 	act 'Try on some clothes': gt 'shop_fashionista', 'changingroom'
 end
@@ -255,137 +255,5 @@ if $ARGS[0] = 'dressingpanties2':
 end
 
 
-!! Old code
-if $ARGS[0] = 'clothes':
-	$loc_arg = 'clothes'
-	$loc = 'shop_fashionista'
-	menu_off = 1
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing shop_fashionista clothing</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_fashionista', 'start'
-	end
-	
-	i = Clothingstock +1
-
-	if Clothingstock - 12 > 0:i -= 12
-
-	:loopfashionista
-		if fashionista[i] = 0:
-			gs 'clothing_attributes', 'fashionista', i
-			gs 'clothing_QV', 'shop_filter'
-				
-			if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''shmotmag''"><img src="images/pc/items/fashionista/dress/<<i>>.jpg" 	height="250" /></a>'
-		end
-		i += 12
-	if i <= 200:jump 'loopfashionista'
-end
-
-if $ARGS[0] = 'shmotmag':
-	cla
-	
-	if fashionista[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_fashionista', 'clothes'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'fashionista',i, 8000
-end
-
-if $ARGS[0] = 'panties':
-	$loc_arg = 'panties'
-	$loc = 'shop_fashionista'
-	menu_off = 1
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_fashionista', 'start'
-	end
-
-	i = 1
-
-	:loopfashionista_panties
-		if fashionista_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''panties2''"><img src="images/pc/panties/fashionista/<<i>>.jpg" 	height="250" /></a> '
-		i += 1
-	if i <= 79:jump 'loopfashionista_panties'
-end
-
-if $ARGS[0] = 'panties2':
-	cla
-	
-	if fashionista_panties[i] ! 0:
-		msg 'You already own these panties.'
-		gt 'shop_fashionista', 'panties'
-	end
-
-	gt 'panties', 'view_panty_item', 'shop', 'fashionista',i, 750
-
-end
-
-if $ARGS[0] = 'bras':
-	$loc_arg = 'bras'
-	$loc = 'shop_fashionista'
-	menu_off = 1
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_fashionista', 'start'
-	end
-
-	i = 1
-
-	:loopfashionista_bras
-		if fashionista_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''bras2''"><img src="images/pc/bras/fashionista/<<i>>.jpg" 	height="250" /></a> '
-		i += 1
-	if i <= 42:jump 'loopfashionista_bras'
-end
-
-if $ARGS[0] = 'bras2':
-	cla
-	
-	if fashionista_bras[i] ! 0:
-		msg 'You already own this bra.'
-		gt 'shop_fashionista', 'bras'
-	end
-
-	gt 'bras', 'view_bra_item', 'shop', 'fashionista',i, 750
-end
-
-if $ARGS[0] = 'purses':
-	$loc_arg = 'purses'
-	$loc = 'shop_fashionista'
-	menu_off = 1
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_fashionista', 'start'
-	end
-
-	i = 1
-
-	:loopfashionista_purses
-		if fashionista_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''purses2''"><img src="images/pc/items/fashionista/purses/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 20:jump 'loopfashionista_purses'
-end
-
-if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'fashionista',i, 3000
-
 --- shop_fashionista ---------------------------------
 

+ 5 - 129
locations/shop_flamingos.qsrc

@@ -18,136 +18,12 @@ if $ARGS[0] = 'start':
 
 	act 'Leave the flamingos': minut += 3 & gt 'liames'
 	
-	act 'View dresses': minut += 5 & gt 'shop_flamingos', 'dresses'
-
-	act 'View other clothing': minut += 5 & gt 'shop_flamingos', 'clothes'
-
-	act 'View purses': minut += 5 & gt 'shop_flamingos', 'purses'
-end
-
-if $ARGS[0] = 'dresses':
-	$loc_arg = 'dresses'
-	$loc = 'shop_flamingos'
-	$menu_loc = 'shop_flamingos'
-	$menu_arg = 'dresses'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing Flamingo''s dresses</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return': minut += 1 & gt 'shop_flamingos', 'start'
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dress
-		if Clothingstock > 11:
-			i = 1
-		else
-			i = 2
-		end
-
-		:loopflamingos_dress
-			if flamingos_dress[i] = 0:
-				gs 'clothing_attributes', 'flamingos_dress', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_flamingos'', ''flamingos_dress''"><img src="images/pc/items/flamingos/dress/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 2
-		if i <= 90:jump 'loopflamingos_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
-end
-
-if $ARGS[0] = 'flamingos_dress':
-	cla
-	menu_off = 1
-	if flamingos_dress[i] ! 0:
-		msg 'You already own this dress.'
-		gt 'shop_flamingos', 'dresses'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'flamingos_dress',i, 3000
-end
-
-if $ARGS[0] = 'clothes':
-	$loc_arg = 'clothes'
-	$loc = 'shop_flamingos'
-	$menu_loc = 'shop_flamingos'
-	$menu_arg = 'clothes'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing Flamingo''s outfits</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return': minut += 1 & gt 'shop_flamingos', 'start'
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-		if Clothingstock > 11:
-			i = 1
-		else
-			i = 2
-		end
-
-		:loopflamingos
-			if flamingos_outfits[i] = 0:
-				gs 'clothing_attributes', 'flamingos_outfits', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_flamingos'', ''flamingos_outfits''"><img src="images/pc/items/flamingos/outfits/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 2
-		if i <= 50:jump 'loopflamingos'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
-end
-
-if $ARGS[0] = 'flamingos_outfits':
-	cla
-	menu_off = 1
-	if flamingos_outfits[i] ! 0:
-		msg 'You already own this outfit.'
-		gt 'shop_flamingos', 'clothes'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'flamingos_outfits',i, 3000
-
-end
-
-if $ARGS[0] = 'purses':
-	$loc_arg = 'purses'
-	$loc = 'shop_flamingos'
-	$menu_arg = 'purses'
-	$menu_loc = 'shop_flamingos'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 5
-		gt 'shop_flamingos', 'start'
-	end
-
-	i = 1
-
-	:loopflamingos_purses
-		if flamingos_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_flamingos'', ''purses2''"><img src="images/pc/items/flamingos/purses/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 20:jump 'loopflamingos_purses'
+	act 'View dresses': minut += 5 & gt 'shop_display', 'shop_flamingos', 'dress'
+	
+	act 'View other clothing': minut += 5 & gt 'shop_display', 'shop_flamingos', 'clothes'
+	
+	act 'View purses': minut += 5 & gt 'shop_display', 'shop_flamingos', 'purses'
 end
 
-if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'flamingos',i, 2000
-
 --- shop_flamingos ---------------------------------
 

+ 6 - 185
locations/shop_pussycats.qsrc

@@ -13,16 +13,12 @@ if $ARGS[0] = 'start':
 	'The latest chart topping pop single is playing throughout the small store. The interior is decorated in bright colors and bold designs, and the floor is packed with stands and tables displaying clothes with a more daring style. Looking around at all the advertisements with attractive yet emaciated models, you''ll either leave here seduced into buying something or with lower self-esteem.'
 
 	act 'Leave the shop': minut += 3 & gt 'torgcentr'
-
-	act 'View dresses': minut += 5 & gt 'shop_pussycats', 'dress'
-
-	act 'View other outfits': minut += 5 & gt 'shop_pussycats', 'clothes'
-
-	act 'View panties': minut += 5 & gt 'shop_pussycats', 'panties'
-
-	act 'View bras': minut += 5 & gt 'shop_pussycats', 'bras'
-
-	act 'View purses': minut += 5 & gt 'shop_pussycats', 'purses'
+	act 'View dresses': minut += 5 & gt 'shop_display', 'shop_pussycats', 'dress'
+	act 'View other outfits': minut += 5 & gt 'shop_display', 'shop_pussycats', 'clothes'
+	act 'View panties': minut += 5 & gt 'shop_display', 'shop_pussycats', 'panties'
+	act 'View bras': minut += 5 & gt 'shop_display', 'shop_pussycats', 'bras'
+	act 'View shoes': minut += 5 & gt 'shop_display', 'shop_pussycats', 'shoes'
+	act 'View purses': minut += 5 & gt 'shop_display', 'shop_pussycats', 'purses'
 
 	if hour >= 8 and hour <= 18 and young_shop_miss >= 3 and week < 6 and young_shop_work = 1:gt 'andrey'
 
@@ -1029,181 +1025,6 @@ if $ARGS[0] = 'endwork':
 	end
 end
 
-if $ARGS[0] = 'dress':
-	$loc_arg = 'dress'
-	$loc = 'shop_pussycats'
-	cls
-	gs'stat'
-	'<center><b><font color="maroon">Viewing Pussy Kats dresses</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_pussycats', 'start'
-	end
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dress
-		i = Clothingstock + 1
-
-		if Clothingstock > 15:
-			i = 1
-		elseif Clothingstock > 7:
-			i = 3
-		else
-			i = 2
-		end
-
-		:loopcats_dress
-			if cats_dress[i] = 0:
-				gs 'clothing_attributes', 'cats_dress', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''yshopclo_dress''"><img <<$set_imgh>> src="images/pc/items/cats/dress/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 3
-		if i <= 110:jump 'loopcats_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
-end
-
-if $ARGS[0] = 'yshopclo_dress': gt 'clothing', 'view_clothing_item', 'shop', 'cats_dress',i, 3000
-
-if $ARGS[0] = 'clothes':
-	$loc_arg = 'clothes'
-	$loc = 'shop_pussycats'
-	cls
-	gs'stat'
-	'<center><b><font color="maroon">Viewing Pussy Kats outfits</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_pussycats', 'start'
-	end
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-		i = Clothingstock + 1
-
-		if Clothingstock > 15:
-			i = 1
-		elseif Clothingstock > 7:
-			i = 3
-		else
-			i = 2
-		end
-
-		:loopcats_outfits
-			if cats_outfits[i] = 0:
-				gs 'clothing_attributes', 'cats_outfits', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''yshopclo_outfit''"><img <<$set_imgh>> src="images/pc/items/cats/outfits/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 3
-		if i <= 100:jump 'loopcats_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
-end
-
-if $ARGS[0] = 'yshopclo_outfit': gt 'clothing', 'view_clothing_item', 'shop', 'cats_outfits',i, 3000
-
-if $ARGS[0] = 'panties':
-	$loc_arg = 'panties'
-	$loc = 'shop_pussycats'
-	cls
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_pussycats', 'start'
-	end
-
-	i = 1
-
-	:loopkats_panties
-		if kats_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''panties2''"><img src="images/pc/panties/kats/<<i>>.jpg" 	height="250" /></a> '
-		i += 1
-	if i <= 72:jump 'loopkats_panties'
-end
-
-if $ARGS[0] = 'panties2':
-	cla
-	
-	if kats_panties[i] ! 0:
-		msg 'You already own these panties.'
-		gt 'shop_pussycats', 'panties'
-	end
-
-	gt 'panties', 'view_panty_item', 'shop', 'kats',i, 500
-
-end
-
-if $ARGS[0] = 'bras':
-	$loc_arg = 'bras'
-	$loc = 'shop_pussycats'
-	cls
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_pussycats', 'start'
-	end
-
-	i = 1
-
-	:loopkats_bras
-		if kats_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''bras2''"><img src="images/pc/bras/kats/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 41:jump 'loopkats_bras'
-end
-
-if $ARGS[0] = 'bras2':
-	cla
-	
-	if kats_bras[i] ! 0:
-		msg 'You already own this bra.'
-		gt 'shop_pussycats', 'bras'
-	end
-
-	gt 'bras', 'view_bra_item', 'shop', 'kats',i, 500
-
-end
-
-if $ARGS[0] = 'purses':
-	$loc_arg = 'purses'
-	$loc = 'shop_pussycats'
-	cls
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_pussycats', 'start'
-	end
-
-	i = 1
-
-	:loopcats_purses
-		if cats_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''purses2''"><img src="images/pc/items/cats/purses/<<i>>.jpg" 	height="250" /></a> '
-		i += 1
-	if i <= 20:jump 'loopcats_purses'
-end
-
-if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'cats',i, 2000
 
 --- shop_pussycats ---------------------------------
 

+ 1 - 50
locations/shop_skuas.qsrc

@@ -18,59 +18,10 @@ if $ARGS[0] = 'start':
 
 	act 'Leave the boutique': minut += 3 & gt 'torgcentr'
 	
-	!!act 'View clothing': minut += 5 & gt 'shop_skuas', 'clothes'
+	act 'View clothing': minut += 5 & gt 'shop_display', 'shop_skuas', 'clothes'
 
 end
 
-if $ARGS[0] = 'clothes':
-	$loc_arg = 'clothes'
-	$loc = 'shop_skuas'
-	$menu_loc = 'shop_skuas'
-	$menu_arg = 'clothes'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing Skuas outfits</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return': minut += 1 & gt 'shop_skuas', 'start'
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-		if Clothingstock > 11:
-			i = 1
-		else
-			i = 2
-		end
-
-		:loopskuas
-			if skuas[i] = 0:
-				gs 'clothing_attributes', 'skuas', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_skuas'', ''skuas''"><img src="images/pc/items/skuas/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 2
-		if i <= 185:jump 'loopskuas'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
-end
-
-if $ARGS[0] = 'skuas':
-	cla
-	menu_off = 1
-	if skuas[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_skuas', 'clothes'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'skuas',i, 20000
-
-end
 
 --- shop_skuas ---------------------------------
 

+ 7 - 148
locations/shop_tsar_bomba.qsrc

@@ -19,157 +19,16 @@ if $ARGS[0] = 'start':
 
 	act 'Leave the bomba': minut += 3 & gt 'liames'
 	
-	act 'View dresses': minut += 5 & gt 'shop_tsar_bomba', 'dresses'
-
-	act 'View other outfits': minut += 5 & gt 'shop_tsar_bomba', 'clothes'
-
-	act 'View shoes': minut += 5 & gt 'shop_tsar_bomba', 'shoes'
-
-	act 'View purses': minut += 5 & gt 'shop_tsar_bomba', 'purses'
-
-end
-
-if $ARGS[0] = 'dresses':
-	$loc_arg = 'dresses'
-	$loc = 'shop_tsar_bomba'
-	$menu_loc = 'shop_tsar_bomba'
-	$menu_arg = 'dresses'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing Tsar Bomba dresses</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return': minut += 1 & gt 'shop_tsar_bomba', 'start'
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dresses
-		if Clothingstock > 11:
-			i = 1
-		else
-			i = 2
-		end
-
-		:loopbomba_dresses
-			if bomba_dress[i] = 0:
-				gs 'clothing_attributes', 'bomba_dresses', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_dresses''"><img src="images/pc/items/bomba/goth_dress/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 2
-		if i <= 70:jump 'loopbomba_dresses'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dresses'
-end
-
-if $ARGS[0] = 'bomba_dresses':
-	cla
-	menu_off = 1
-	if bomba_dress[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_tsar_bomba', 'clothes'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'bomba_dress',i, 3500
-end
-
-if $ARGS[0] = 'clothes':
-	$loc_arg = 'clothes'
-	$loc = 'shop_tsar_bomba'
-	$menu_loc = 'shop_tsar_bomba'
-	$menu_arg = 'clothes'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing Tsar Bomba outfits</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return': minut += 1 & gt 'shop_tsar_bomba', 'start'
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-		if Clothingstock > 11:
-			i = 1
-		else
-			i = 2
-		end
-
-		:loopbomba
-			if bomba_outfits[i] = 0:
-				gs 'clothing_attributes', 'bomba_outfits', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_outfits''"><img src="images/pc/items/bomba/goth_outfits/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 2
-		if i <= 50:jump 'loopbomba'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
-end
-
-if $ARGS[0] = 'bomba_outfits':
-	cla
-	menu_off = 1
-	if bomba_outfits[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_tsar_bomba', 'clothes'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'bomba_outfits',i, 3500
-end
-
-if $ARGS[0] = 'purses':
-	$loc_arg = 'purses'
-	$loc = 'shop_tsar_bomba'
-	$menu_loc = 'shop_tsar_bomba'
-	$menu_arg = 'purses'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return': minut += 1 & gt 'shop_tsar_bomba', 'start'
-
-	i = 1
-
-	:loopbomba_purses
-		if bomba_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''purses2''"><img src="images/pc/items/bomba/purses/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 20:jump 'loopbomba_purses'
-end
-
-if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'bomba',i, 2000
-
-if $ARGS[0] = 'shoes':
-	$loc_arg = 'shoes'
-	$loc = 'shop_tsar_bomba'
-	$menu_arg = 'purses'
-	$menu_loc = 'shoes'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 5
-		gt 'shop_tsar_bomba', 'browse'
-	end
+	act 'View dresses': minut += 5 & gt 'shop_display', 'shop_tsar_bomba', 'dress'
+	
+	act 'View other outfits': minut += 5 & gt 'shop_display', 'shop_tsar_bomba', 'clothes'
+	
+	act 'View shoes': minut += 5 & gt 'shop_display', 'shop_tsar_bomba', 'shoes'
+	
+	act 'View purses': minut += 5 & gt 'shop_display', 'shop_tsar_bomba', 'purses'	
 
-	:loopbomba_shoes
-		if sbomba[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_shoes''"><img src="images/pc/items/bomba/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 40:jump 'loopbomba_shoes'
 end
 
-if $ARGS[0] = 'bomba_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'bomba',i, 2000
 
 --- shop_tsar_bomba ---------------------------------
 

+ 9 - 205
locations/sportShop.qsrc

@@ -19,17 +19,17 @@ if $ARGS[0] = 'start':
 	
 	act 'Leave':minut += 3 & gt 'torgcentr'
 
-	act 'View sports clothing':minut += 5 & gt 'sportshop', 'clo'
-
-	act 'View sports bras':minut += 5 & gt 'sportshop', 'bras'
+	act 'View sports clothing': minut += 5 & gt 'shop_display', 'sportshop', 'clothes'
 	
-	act 'View sports panties':minut += 5 & gt 'sportshop', 'panties'
+	act 'View sports bras': minut += 5 & gt 'shop_display', 'sportshop', 'bras'
 	
-	act 'View exercise shoes':minut += 5 & gt 'sportshop', 'danilovich'
-
-	act 'View swimwear':minut += 5 & gt 'sportshop', 'swim'
-
-	act 'View purses': minut += 5 & gt 'sportshop', 'purses'
+	act 'View sports panties': minut += 5 & gt 'shop_display', 'sportshop', 'panties'
+	
+	act 'View exercise shoes': minut += 5 & gt 'shop_display', 'sportshop', 'danilovich'
+	
+	act 'View swimwear': minut += 5 & gt 'shop_display', 'sportshop', 'swim'
+	
+	act 'View purses': minut += 5 & gt 'shop_display', 'sportshop', 'purses'
 
 	if skak = 0 and money >= 500:
 		act 'Buy a skipping rope (500 <b>₽</b>)':
@@ -84,202 +84,6 @@ if $ARGS[0] = 'start':
 	end
 end
 
-if $ARGS[0] = 'clo':
-	$loc_arg = 'clo'
-	$loc = 'sportShop'
-	cls
-	gs'stat'
-	'<center><b><font color="maroon">Sportswear - one size fits all</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'sportshop', 'start'
-	end
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality2
-		if Clothingstock > 16:
-			i = 1
-		elseif Clothingstock > 8:
-			i = 2
-		else
-			i = 3
-		end
-
-		:loopexercise
-			if exercise[i] = 0:
-				gs 'clothing_attributes', 'exercise', i
-				gs 'clothing_QV', 'shop_filter'
-					
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''sportshop'', ''exercise''"><img src="images/pc/clothing/7exercise/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 3
-		if i <= 260:jump 'loopexercise'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality2'
-end
-
-if $ARGS[0] = 'exercise': gt 'clothing', 'view_clothing_item', 'shop', 'exercise',i, 2000
-
-if $ARGS[0] = 'danilovich':
-	$loc_arg = 'danilovich'
-	$loc = 'sportShop'
-	cls
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'sportShop', 'start'
-	end
-
-	i = 1
-	:loopdanilovich_shoes
-		if sdanilovich[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''training_shoes''"><img src="images/pc/shoes/danilovich/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 40:jump 'loopdanilovich_shoes'
-end
-
-if $ARGS[0] = 'training_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'danilovich',i, 1500
-
-if $ARGS[0] = 'swim':
-	$loc_arg = 'swim'
-	$loc = 'sportShop'
-	cls
-	gs'stat'
-	'<center><b><font color="maroon">Swimwear - one size fits all</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'sportshop', 'start'
-	end
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-	!!4 is in he supermarket, so skipped
-		if Clothingstock > 18:
-			i = 1
-		elseif Clothingstock > 12:
-			i = 2
-		elseif Clothingstock > 6:
-			i = 3
-		else
-			i = 8
-		end
-
-		:loopswim
-			if swimwear[i] = 0:
-				gs 'clothing_attributes', 'swimwear', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''sportshop'', ''swim1''"><img src="images/pc/clothing/12swimwear/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 4
-		if i <= 213:jump 'loopswim'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
-end
-
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'shop', 'swimwear',i, 1750
-
-if $ARGS[0] = 'panties':
-	$loc_arg = 'panties'
-	$loc = 'sportShop'
-	cls
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'sportShop', 'start'
-	end
-
-	i = 1
-
-	:loopsport_panties
-		if sport_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''panties2''"><img src="images/pc/panties/sport/<<i>>.jpg" 	height="250" /></a> '
-		i += 1
-	if i <= 8:jump 'loopsport_panties'
-end
-
-if $ARGS[0] = 'panties2':
-	cla
-	
-	if sport_panties[i] ! 0:
-		msg 'You already own these panties.'
-		gt 'sportShop', 'panties'
-	end
-
-	gt 'panties', 'view_panty_item', 'shop', 'sport',i, 1000
-
-end
-
-if $ARGS[0] = 'bras':
-	$loc_arg = 'bras'
-	$loc = 'sportShop'
-	cls
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'sportShop', 'start'
-	end
-
-	i = 1
-
-	:loopsport_bras
-		if sport_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''bras2''"><img src="images/pc/bras/sport/<<i>>.jpg" 	height="250" /></a> '
-		i += 1
-	if i <= 8:jump 'loopsport_bras'
-end
-
-if $ARGS[0] = 'bras2':
-	cla
-	
-	if sport_bras[i] ! 0:
-		msg 'You already own this bra.'
-		gt 'sportShop', 'bras'
-	end
-
-	gt 'bras', 'view_bra_item', 'shop', 'sport',i, 1000
-
-end
-
-if $ARGS[0] = 'purses':
-	$loc_arg = 'purses'
-	$loc = 'sportShop'
-	menu_off = 1
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'sportShop', 'start'
-	end
-
-	i = 1
-
-	:loopdanilovich_purses
-		if danilovich_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''purses2''"><img src="images/pc/items/danilovich/purses/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 20:jump 'loopdanilovich_purses'
-end
-
-if $ARGS[0] = 'purses2': gt 'purses', 'view_purse_item', 'shop', 'danilovich',i, 1500
 
 --- sportShop ---------------------------------
 

+ 6 - 6
userDefineLang.xml

@@ -13,7 +13,7 @@
             <Keywords name="Numbers, suffix1"></Keywords>
             <Keywords name="Numbers, suffix2"></Keywords>
             <Keywords name="Numbers, range"></Keywords>
-            <Keywords name="Operators1"></Keywords>
+            <Keywords name="Operators1">, . * + - / = [ ( ] ) { } : & < > "</Keywords>
             <Keywords name="Operators2"></Keywords>
             <Keywords name="Folders in code1, open">if act {</Keywords>
             <Keywords name="Folders in code1, middle"></Keywords>
@@ -28,7 +28,7 @@
             <Keywords name="Keywords2">qspver curloc rand rnd max min</Keywords>
             <Keywords name="Keywords3">and or mod obj loc no</Keywords>
             <Keywords name="Keywords4">if iif act end</Keywords>
-            <Keywords name="Keywords5"></Keywords>
+            <Keywords name="Keywords5">$dyneval $user_text $usrtxt $maintxt $stattxt $func $curloc $selobj $selact $curact $getobj $mid $ucase $lcase $trim $replace $str $loc $strfind $ARGS dyneval input user_text usrtxt rgb isplay msecscount desc maintxt stattxt selobj selact curact arrsize arrpos countobj getobj led mid ucase lcase trim replace instr isnum val str arrcomp strcomp strpos strfind counter ongload ongsave onnewloc onactsel onobjsel onobjadd onobjdel usercom fname backimage args result cla clr clear xgt gt goto xgoto else elseif jump amp nl pl nosave disablescroll disablesubex debug usehtml bcolor fcolor lcolor fsize gt lt close dynamic</Keywords>
             <Keywords name="Keywords6"></Keywords>
             <Keywords name="Keywords7"></Keywords>
             <Keywords name="Keywords8"></Keywords>
@@ -40,10 +40,10 @@
             <WordsStyle name="LINE COMMENTS" fgColor="C0C0C0" bgColor="FFFFFF" fontName="" fontStyle="2" nesting="0" />
             <WordsStyle name="NUMBERS" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
             <WordsStyle name="KEYWORDS1" fgColor="0000A0" bgColor="FFFFFF" fontName="" fontStyle="1" nesting="0" />
-            <WordsStyle name="KEYWORDS2" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
-            <WordsStyle name="KEYWORDS3" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
-            <WordsStyle name="KEYWORDS4" fgColor="000080" bgColor="FFFFFF" fontName="" fontStyle="1" nesting="0" />
-            <WordsStyle name="KEYWORDS5" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="KEYWORDS2" fgColor="0000FF" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="KEYWORDS3" fgColor="0000FF" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="KEYWORDS4" fgColor="0000FF" bgColor="FFFFFF" fontName="" fontStyle="1" nesting="0" />
+            <WordsStyle name="KEYWORDS5" fgColor="0000FF" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
             <WordsStyle name="KEYWORDS6" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
             <WordsStyle name="KEYWORDS7" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
             <WordsStyle name="KEYWORDS8" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />