From 33442fb3eabea2b19f375dcf34d6b45d8a9b49c2 Mon Sep 17 00:00:00 2001 From: TaiwanSmurf <taiwansmurf1@gmail.com> Date: Fri, 27 Sep 2019 16:15:09 +0800 Subject: [PATCH 1/2] Repositioned icons to the left side of the text --- game/base-system/images.twee | 2 +- game/overworld-forest/loc-cabin/widgets.twee | 2 +- game/overworld-forest/loc-forest/main.twee | 6 +-- game/overworld-forest/loc-lake/main.twee | 8 +-- game/overworld-forest/loc-wolfpack/main.twee | 2 +- game/overworld-town/loc-beach/main.twee | 4 +- game/overworld-town/loc-bus/main.twee | 26 ++++----- game/overworld-town/loc-bus/widgets.twee | 2 +- game/overworld-town/loc-cafe/main.twee | 6 +-- game/overworld-town/loc-park/main.twee | 2 +- .../loc-school/changing-rooms.twee | 54 +++++++++---------- game/overworld-town/loc-school/hallways.twee | 8 +-- game/overworld-town/loc-school/main.twee | 4 +- game/overworld-town/loc-school/widgets.twee | 14 ++--- game/overworld-town/loc-shop/main.twee | 8 +-- game/overworld-town/loc-street/barb.twee | 4 +- .../overworld-town/loc-street/connudatus.twee | 2 +- game/overworld-town/loc-street/danube.twee | 2 +- game/overworld-town/loc-street/harvest.twee | 4 +- .../loc-street/nightingale.twee | 2 +- game/overworld-town/loc-street/widgets.twee | 26 ++++----- game/overworld-town/loc-street/wolf.twee | 2 +- game/overworld-town/special-robin/walk.twee | 2 +- .../loc-sewers/widgets.twee | 2 +- 24 files changed, 97 insertions(+), 97 deletions(-) diff --git a/game/base-system/images.twee b/game/base-system/images.twee index 5df2c3498f..6026bcb223 100644 --- a/game/base-system/images.twee +++ b/game/base-system/images.twee @@ -343,7 +343,7 @@ <<widget "busicon">><<nobr>> <<if $images is 1>> -<img id="icon" src="img/misc/icon/bus.gif"> +<img id="icon" src="img/misc/icon/bus.png"> <</if>> <</nobr>><</widget>> diff --git a/game/overworld-forest/loc-cabin/widgets.twee b/game/overworld-forest/loc-cabin/widgets.twee index af672c5405..499e85cdc0 100644 --- a/game/overworld-forest/loc-cabin/widgets.twee +++ b/game/overworld-forest/loc-cabin/widgets.twee @@ -150,7 +150,7 @@ Your clothes are kept in the corner. <br> <<if $edenfreedom gte 1>> -<<link [[Enter the forest|Forest]]>><<endevent>><<set $forest to 60>><</link>><<foresticon>> +<<foresticon>><<link [[Enter the forest|Forest]]>><<endevent>><<set $forest to 60>><</link>> <br> <<else>> <<link [[Escape|Eden Cabin Escape]]>><<endevent>><<set $forest to 80>><</link>> diff --git a/game/overworld-forest/loc-forest/main.twee b/game/overworld-forest/loc-forest/main.twee index 5fe001f98d..acb122086a 100644 --- a/game/overworld-forest/loc-forest/main.twee +++ b/game/overworld-forest/loc-forest/main.twee @@ -63,11 +63,11 @@ Search this area Leave the forest <br> -<<link [[Danube Street (0:10)|Danube Street]]>><<pass 10>><<set $foresthunt to 0>><</link>><<danubeicon>> +<<danubeicon>><<link [[Danube Street (0:10)|Danube Street]]>><<pass 10>><<set $foresthunt to 0>><</link>> <br> -<<link [[Wolf Street (0:10)|Wolf Street]]>><<pass 10>><<set $foresthunt to 0>><</link>><<wolficon>> +<<wolficon>><<link [[Wolf Street (0:10)|Wolf Street]]>><<pass 10>><<set $foresthunt to 0>><</link>> <br> -<<link [[Nightingale Street (0:10)|Nightingale Street]]>><<pass 10>><<set $foresthunt to 0>><</link>><<nightingaleicon>> +<<nightingaleicon>><<link [[Nightingale Street (0:10)|Nightingale Street]]>><<pass 10>><<set $foresthunt to 0>><</link>> <br><br> diff --git a/game/overworld-forest/loc-lake/main.twee b/game/overworld-forest/loc-lake/main.twee index 276eb54bd0..01d16b3867 100644 --- a/game/overworld-forest/loc-lake/main.twee +++ b/game/overworld-forest/loc-lake/main.twee @@ -55,7 +55,7 @@ There's a rocky alcove, where you could store your clothes. <</if>> <<link [[South to waterfall (0:10)|Lake Waterfall]]>><<pass 10>><</link>> <br><br> -<<link [[Forest (0:10)|Forest]]>><<pass 10>><</link>><<foresticon>> +<<foresticon>><<link [[Forest (0:10)|Forest]]>><<pass 10>><</link>> <br> <<set $eventskip to 0>> <</if>> @@ -154,7 +154,7 @@ You keep low and stay among the trees to keep your <<lewdness>> from being seen. <br> <<link [[South to campsite (0:20)|Lake Campsite]]>><<pass 20>><</link>> <br><br> -<<link [[Forest (0:10)|Forest]]>><<pass 10>><</link>><<foresticon>> +<<foresticon>><<link [[Forest (0:10)|Forest]]>><<pass 10>><</link>> <br> <<set $eventskip to 0>> <</if>> @@ -201,7 +201,7 @@ You keep low and stay among the trees to keep your <<lewdness>> from being seen. <<link [[South to shore (0:10)|Lake Shore]]>><<pass 10>><</link>> <br><br> -<<link [[Forest (0:10)|Forest]]>><<pass 10>><</link>><<foresticon>> +<<foresticon>><<link [[Forest (0:10)|Forest]]>><<pass 10>><</link>> <br> <<set $eventskip to 0>> <</if>> @@ -248,7 +248,7 @@ You keep low and stay among the trees to keep your <<lewdness>> from being seen. <<link [[North to fishing rock (0:10)|Lake Fishing Rock]]>><<pass 10>><</link>> <br><br> -<<link [[Forest (0:10)|Forest]]>><<pass 10>><</link>><<foresticon>> +<<foresticon>><<link [[Forest (0:10)|Forest]]>><<pass 10>><</link>> <br> <<set $eventskip to 0>> <</if>> diff --git a/game/overworld-forest/loc-wolfpack/main.twee b/game/overworld-forest/loc-wolfpack/main.twee index a81cd3d05c..0993a0818c 100644 --- a/game/overworld-forest/loc-wolfpack/main.twee +++ b/game/overworld-forest/loc-wolfpack/main.twee @@ -108,7 +108,7 @@ Most of the pack is out hunting. <br> <<link [[Go Inside|Wolf Cave]]>><</link>> <br><br> -<<link [[Walk into the forest (0:10)|Forest]]>><<pass 10>><<set $eventskip to 1>><<set $forest to 60>><</link>><<foresticon>> +<<foresticon>><<link [[Walk into the forest (0:10)|Forest]]>><<pass 10>><<set $eventskip to 1>><<set $forest to 60>><</link>> <br> <</if>> diff --git a/game/overworld-town/loc-beach/main.twee b/game/overworld-town/loc-beach/main.twee index d66cbda24e..115819136e 100644 --- a/game/overworld-town/loc-beach/main.twee +++ b/game/overworld-town/loc-beach/main.twee @@ -101,11 +101,11 @@ You could go for a swim, but make sure to dress appropriately. Travel <br> <<if $exposed lte 0>> -<<cliff>><<clifficon>> +<<clifficon>><<cliff>> <br> <</if>> <<if $exposed lte 0>> -<<starfish>><<starfishicon>> +<<starfishicon>><<starfish>> <br> <</if>> diff --git a/game/overworld-town/loc-bus/main.twee b/game/overworld-town/loc-bus/main.twee index 7cca73b600..f1a27f3d26 100644 --- a/game/overworld-town/loc-bus/main.twee +++ b/game/overworld-town/loc-bus/main.twee @@ -10,48 +10,48 @@ You climb aboard the bus. Tickets cost £1. Residential <br> -<<link [[Buy a ticket to Domus Street (Home)|Bus seat]]>><<set $bus to "domus">><<set $money -= 100>><</link>><<domusicon>> +<<domusicon>><<link [[Buy a ticket to Domus Street (Home)|Bus seat]]>><<set $bus to "domus">><<set $money -= 100>><</link>> <br> -<<link [[Buy a ticket to Barb Street (Studio)|Bus seat]]>><<set $bus to "barb">><<set $money -= 100>><</link>><<barbicon>> +<<barbicon>><<link [[Buy a ticket to Barb Street (Studio)|Bus seat]]>><<set $bus to "barb">><<set $money -= 100>><</link>> <br> -<<link [[Buy a ticket to Danube Street (Mansions)|Bus seat]]>><<set $bus to "danube">><<set $money -= 100>><</link>><<danubeicon>> +<<danubeicon>><<link [[Buy a ticket to Danube Street (Mansions)|Bus seat]]>><<set $bus to "danube">><<set $money -= 100>><</link>> <br> -<<link [[Buy a ticket to Wolf Street (Temple)|Bus seat]]>><<set $bus to "wolf">><<set $money -= 100>><</link>><<wolficon>> +<<wolficon>><<link [[Buy a ticket to Wolf Street (Temple)|Bus seat]]>><<set $bus to "wolf">><<set $money -= 100>><</link>> <br><br> Commercial <br> -<<link [[Buy a ticket to High Street (Shopping Centre)|Bus seat]]>><<set $bus to "high">><<set $money -= 100>><</link>><<highicon>> +<<highicon>><<link [[Buy a ticket to High Street (Shopping Centre)|Bus seat]]>><<set $bus to "high">><<set $money -= 100>><</link>> <br> -<<link [[Buy a ticket to Connudatus Street (Clubs)|Bus seat]]>><<set $bus to "connudatus">><<set $money -= 100>><</link>><<connudatusicon>> +<<connudatusicon>><<link [[Buy a ticket to Connudatus Street (Clubs)|Bus seat]]>><<set $bus to "connudatus">><<set $money -= 100>><</link>> <br> -<<link [[Buy a ticket to Cliff Street (Cafe)|Bus seat]]>><<set $bus to "cliff">><<set $money -= 100>><</link>><<clifficon>> +<<clifficon>><<link [[Buy a ticket to Cliff Street (Cafe)|Bus seat]]>><<set $bus to "cliff">><<set $money -= 100>><</link>> <br> -<<link [[Buy a ticket to Nightingale Street (Hospital)|Bus seat]]>><<set $bus to "nightingale">><<set $money -= 100>><</link>><<nightingaleicon>> +<<nightingaleicon>><<link [[Buy a ticket to Nightingale Street (Hospital)|Bus seat]]>><<set $bus to "nightingale">><<set $money -= 100>><</link>> <br> -<<link [[Buy a ticket to Starfish Street (Beach)|Bus seat]]>><<set $bus to "starfish">><<set $money -= 100>><</link>><<starfishicon>> +<<starfishicon>><<link [[Buy a ticket to Starfish Street (Beach)|Bus seat]]>><<set $bus to "starfish">><<set $money -= 100>><</link>> <br> -<<link [[Buy a ticket to Oxford Street (School)|Bus seat]]>><<set $bus to "oxford">><<set $money -= 100>><</link>><<oxfordicon>> +<<oxfordicon>><<link [[Buy a ticket to Oxford Street (School)|Bus seat]]>><<set $bus to "oxford">><<set $money -= 100>><</link>> <br><br> Industrial <br> -<<link [[Buy a ticket to Elk Street|Bus seat]]>><<set $bus to "elk">><<set $money -= 100>><</link>><<elkicon>> +<<elkicon>><<link [[Buy a ticket to Elk Street|Bus seat]]>><<set $bus to "elk">><<set $money -= 100>><</link>> <br> -<<link [[Buy a ticket to Mer Street (Docks)|Bus seat]]>><<set $bus to "mer">><<set $money -= 100>><</link>><<mericon>> +<<mericon>><<link [[Buy a ticket to Mer Street (Docks)|Bus seat]]>><<set $bus to "mer">><<set $money -= 100>><</link>> <br> -<<link [[Buy a ticket to Harvest Street (Pub)|Bus seat]]>><<set $bus to "harvest">><<set $money -= 100>><</link>><<harvesticon>> +<<harvesticon>><<link [[Buy a ticket to Harvest Street (Pub)|Bus seat]]>><<set $bus to "harvest">><<set $money -= 100>><</link>> <br> <<else>> diff --git a/game/overworld-town/loc-bus/widgets.twee b/game/overworld-town/loc-bus/widgets.twee index d50008d1b9..ea015d92f1 100644 --- a/game/overworld-town/loc-bus/widgets.twee +++ b/game/overworld-town/loc-bus/widgets.twee @@ -1,7 +1,7 @@ :: Widgets Bus [widget] <<widget "buswait">><<nobr>> - <<link [[Wait for a bus (0:02)|Bus]]>><<pass 2>><</link>><<busicon>> + <<busicon>><<link [[Wait for a bus (0:02)|Bus]]>><<pass 2>><</link>> <br> <</nobr>><</widget>> diff --git a/game/overworld-town/loc-cafe/main.twee b/game/overworld-town/loc-cafe/main.twee index 5ffaf952bc..dae630e90d 100644 --- a/game/overworld-town/loc-cafe/main.twee +++ b/game/overworld-town/loc-cafe/main.twee @@ -51,15 +51,15 @@ You are hiding beneath a table to protect your dignity. <<if $openinghours is 1 and $exposed lt 1 and $cafeeaten isnot 1>> <<if $money gte 500>> - <<link [[Buy Fruit Salad (0:20 £5)|Cafe Fruit Salad]]>><<set $cafeeaten to 1>><<set $money -= 500>><<stress -6>><<pass 20>><</link>><<if $images is 1>><img id="icon" src="img/misc/icon/food_fruitsalad.png"> <</if>><<lstress>> + <<if $images is 1>><img id="icon" src="img/misc/icon/food_fruitsalad.png"><</if>><<link [[Buy Fruit Salad (0:20 £5)|Cafe Fruit Salad]]>><<set $cafeeaten to 1>><<set $money -= 500>><<stress -6>><<pass 20>><</link>><<lstress>> <br> <</if>> <<if $money gte 1000>> - <<link [[Buy Pancakes (0:20 £10)|Cafe Pancakes]]>><<set $cafeeaten to 1>><<set $money -= 1000>><<tiredness -6>><<pass 20>><</link>><<if $images is 1>><img id="icon" src="img/misc/icon/food_pancakes.png"> <</if>><<ltiredness>> + <<if $images is 1>><img id="icon" src="img/misc/icon/food_pancakes.png"><</if>><<link [[Buy Pancakes (0:20 £10)|Cafe Pancakes]]>><<set $cafeeaten to 1>><<set $money -= 1000>><<tiredness -6>><<pass 20>><</link>><<ltiredness>> <br> <</if>> <<if $money gte 5000>> - <<link [[Buy Deluxe Cream Bun (0:20 £50)|Cafe Cream Bun]]>><<set $cafeeaten to 1>><<set $catbuild += 1>><<set $money -= 5000>><<pass 20>><<stress -18>><</link>><<if $images is 1>><img id="icon" src="img/misc/icon/food_creambun.png"> <</if>><<llstress>> + <<if $images is 1>><img id="icon" src="img/misc/icon/food_creambun.png"><</if>><<link [[Buy Deluxe Cream Bun (0:20 £50)|Cafe Cream Bun]]>><<set $cafeeaten to 1>><<set $catbuild += 1>><<set $money -= 5000>><<pass 20>><<stress -18>><</link>><<llstress>> <br> <</if>> <</if>> diff --git a/game/overworld-town/loc-park/main.twee b/game/overworld-town/loc-park/main.twee index dabfec3918..8e70092f62 100644 --- a/game/overworld-town/loc-park/main.twee +++ b/game/overworld-town/loc-park/main.twee @@ -217,7 +217,7 @@ The dog whimpers and flees into a bush. <<tearful>> you gather yourself. :: Widgets Park [widget] <<widget "park">><<nobr>> -<<link [[Park (0:05)|Park]]>><<pass 5>><</link>><<parkicon>> +<<parkicon>><<link [[Park (0:05)|Park]]>><<pass 5>><</link>> <</nobr>><</widget>> diff --git a/game/overworld-town/loc-school/changing-rooms.twee b/game/overworld-town/loc-school/changing-rooms.twee index 6abc479eb7..71268594fd 100644 --- a/game/overworld-town/loc-school/changing-rooms.twee +++ b/game/overworld-town/loc-school/changing-rooms.twee @@ -22,13 +22,13 @@ You are in the boy's changing room. <<link [[Locker|School Boy Wardrobe]]>><</link>> <br> <<if $exposed gte 2 and $exhibitionism gte 75>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>><<gdelinquency>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>><<gdelinquency>> <br><br> <<elseif $exposed gte 2>> <span class="pink">You can't enter the pool while so exposed!</span> <br><br> <<else>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>> <br><br> <</if>> <<else>> @@ -52,13 +52,13 @@ You are in the boy's changing room. <<link [[Locker|School Boy Wardrobe]]>><</link>> <br> <<if $exposed gte 2 and $exhibitionism gte 75>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>><<gdelinquency>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>><<gdelinquency>> <br><br> <<elseif $exposed gte 2>> <span class="pink">You can't enter the pool while so exposed!</span> <br><br> <<else>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>> <br><br> <</if>> <</if>> @@ -83,13 +83,13 @@ You are in the boy's changing room. <<link [[Locker|School Boy Wardrobe]]>><</link>> <br> <<if $exposed gte 2 and $exhibitionism gte 75>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>><<gdelinquency>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>><<gdelinquency>> <br><br> <<elseif $exposed gte 2>> <span class="pink">You can't enter the pool while so exposed!</span> <br><br> <<else>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>> <br><br> <</if>> <<elseif $exposed gte 2 and $malechance isnot 0>> @@ -153,13 +153,13 @@ You are in the boy's changing room. <<link [[Locker|School Boy Wardrobe]]>><</link>> <br> <<if $exposed gte 2 and $exhibitionism gte 75>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>><<gdelinquency>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>><<gdelinquency>> <br><br> <<elseif $exposed gte 2>> <span class="pink">You can't enter the pool while so exposed!</span> <br><br> <<else>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>> <br><br> <</if>> <<else>> @@ -183,13 +183,13 @@ You are in the boy's changing room. <<link [[Locker|School Boy Wardrobe]]>><</link>> <br> <<if $exposed gte 2 and $exhibitionism gte 75>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>><<gdelinquency>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>><<gdelinquency>> <br><br> <<elseif $exposed gte 2>> <span class="pink">You can't enter the pool while so exposed!</span> <br><br> <<else>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>> <br><br> <</if>> <</if>> @@ -214,13 +214,13 @@ You are in the boy's changing room. <<link [[Locker|School Boy Wardrobe]]>><</link>> <br> <<if $exposed gte 2 and $exhibitionism gte 75>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>><<gdelinquency>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>><<gdelinquency>> <br><br> <<elseif $exposed gte 2>> <span class="pink">You can't enter the pool while so exposed!</span> <br><br> <<else>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>> <br><br> <</if>> <<elseif $exposed gte 2 and $malechance isnot 0>> @@ -270,7 +270,7 @@ You are in the boy's changing room. <<if $player.gender is "m">> It's empty as school is not in session. <br><br> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>> <br><br> <<link [[Leave|School Pool Entrance]]>><</link>> <br> @@ -280,7 +280,7 @@ You are in the boy's changing room. <<else>> It's empty as school is not in session. Even so, being here makes you feel naughty. <br><br> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>> <br><br> <<link [[Leave|School Pool Entrance]]>><</link>> <br> @@ -315,13 +315,13 @@ You are in the girl's changing room. <<link [[Locker|School Girl Wardrobe]]>><</link>> <br> <<if $exposed gte 2 and $exhibitionism gte 75>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>><<gdelinquency>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>><<gdelinquency>> <br><br> <<elseif $exposed gte 2>> <span class="pink">You can't enter the pool while so exposed!</span> <br><br> <<else>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>> <br><br> <</if>> <<else>> @@ -345,13 +345,13 @@ You are in the girl's changing room. <<link [[Locker|School Girl Wardrobe]]>><</link>> <br> <<if $exposed gte 2 and $exhibitionism gte 75>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>><<gdelinquency>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>><<gdelinquency>> <br><br> <<elseif $exposed gte 2>> <span class="pink">You can't enter the pool while so exposed!</span> <br><br> <<else>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>> <br><br> <</if>> <</if>> @@ -376,13 +376,13 @@ You are in the girl's changing room. <<link [[Locker|School Girl Wardrobe]]>><</link>> <br> <<if $exposed gte 2 and $exhibitionism gte 75>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>><<gdelinquency>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>><<gdelinquency>> <br><br> <<elseif $exposed gte 2>> <span class="pink">You can't enter the pool while so exposed!</span> <br><br> <<else>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>> <br><br> <</if>> <<elseif $exposed gte 2 and $malechance isnot 100>> @@ -446,13 +446,13 @@ You are in the girl's changing room. <<link [[Locker|School Girl Wardrobe]]>><</link>> <br> <<if $exposed gte 2 and $exhibitionism gte 75>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>><<gdelinquency>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>><<gdelinquency>> <br><br> <<elseif $exposed gte 2>> <span class="pink">You can't enter the pool while so exposed!</span> <br><br> <<else>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>> <br><br> <</if>> <<else>> @@ -476,13 +476,13 @@ You are in the girl's changing room. <<link [[Locker|School Girl Wardrobe]]>><</link>> <br> <<if $exposed gte 2 and $exhibitionism gte 75>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>><<gdelinquency>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>><<gdelinquency>> <br><br> <<elseif $exposed gte 2>> <span class="pink">You can't enter the pool while so exposed!</span> <br><br> <<else>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>> <br><br> <</if>> <</if>> @@ -513,7 +513,7 @@ You are in the girl's changing room. <span class="pink">You can't enter the pool while so exposed!</span> <br><br> <<else>> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>> <br><br> <</if>> <<elseif $exposed gte 2 and $malechance isnot 100>> @@ -565,7 +565,7 @@ You are in the girl's changing room. <<if $player.gender is "f">> It's empty as school is not in session. <br><br> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>> <br><br> <<link [[Leave|School Pool Entrance]]>><</link>> <br> @@ -575,7 +575,7 @@ You are in the girl's changing room. <<else>> It's empty as school is not in session. Even so, being here makes you feel naughty. <br><br> - <<link [[Enter the pool room|School Pool]]>><</link>><<swimmingicon>> + <<swimmingicon>><<link [[Enter the pool room|School Pool]]>><</link>> <br><br> <<link [[Leave|School Pool Entrance]]>><</link>> <br> diff --git a/game/overworld-town/loc-school/hallways.twee b/game/overworld-town/loc-school/hallways.twee index 04fa016eb6..91d42cf225 100644 --- a/game/overworld-town/loc-school/hallways.twee +++ b/game/overworld-town/loc-school/hallways.twee @@ -86,13 +86,13 @@ Facilities <br><br> Classrooms <br> - <<link [[Science classroom (0:01)|Science Classroom]]>><<pass 1>><</link>><<scienceicon>> + <<scienceicon>><<link [[Science classroom (0:01)|Science Classroom]]>><<pass 1>><</link>> <br> - <<link [[Maths classroom (0:01)|Maths Classroom]]>><<pass 1>><</link>><<mathicon>> + <<mathicon>><<link [[Maths classroom (0:01)|Maths Classroom]]>><<pass 1>><</link>> <br> - <<link [[English classroom (0:01)|English Classroom]]>><<pass 1>><</link>><<englishicon>> + <<englishicon>><<link [[English classroom (0:01)|English Classroom]]>><<pass 1>><</link>> <br> - <<link [[History classroom (0:01)|History Classroom]]>><<pass 1>><</link>><<historyicon>> + <<historyicon>><<link [[History classroom (0:01)|History Classroom]]>><<pass 1>><</link>> <br> <</if>> diff --git a/game/overworld-town/loc-school/main.twee b/game/overworld-town/loc-school/main.twee index 4d3b97bcba..637497dd45 100644 --- a/game/overworld-town/loc-school/main.twee +++ b/game/overworld-town/loc-school/main.twee @@ -144,10 +144,10 @@ The rear playground is empty. <<if $historytrait gte 1>> <<if $parktunnelintro gte 1>> - <<link [[Secret tunnel to park (0:05)|Park]]>><<pass 5>><</link>><<parkicon>> + <<parkicon>><<link [[Secret tunnel to park (0:05)|Park]]>><<pass 5>><</link>> <br> <<else>> - <<link [[Secret tunnel to park (0:05)|Park Tunnel]]>><<pass 5>><</link>><<parkicon>> + <<parkicon>><<link [[Secret tunnel to park (0:05)|Park Tunnel]]>><<pass 5>><</link>> <br> <</if>> <</if>> diff --git a/game/overworld-town/loc-school/widgets.twee b/game/overworld-town/loc-school/widgets.twee index 16b40acb90..c6b38ecb17 100644 --- a/game/overworld-town/loc-school/widgets.twee +++ b/game/overworld-town/loc-school/widgets.twee @@ -37,27 +37,27 @@ <<widget "schoolperiod">><<nobr>> <<if $exposed lte 0>> <<if $schoolstate is "morning">> -<<link [[Go to your science lesson (0:01)|Science Classroom]]>><<pass 1>><</link>><<scienceicon>> +<<scienceicon>><<link [[Go to your science lesson (0:01)|Science Classroom]]>><<pass 1>><</link>> <br><br> <<elseif $schoolstate is "first">> -<<link [[Go to your science lesson (0:01)|Science Classroom]]>><<pass 1>><</link>><<scienceicon>> +<<scienceicon>><<link [[Go to your science lesson (0:01)|Science Classroom]]>><<pass 1>><</link>> <br><br> <<elseif $schoolstate is "second">> -<<link [[Go to your maths lesson (0:01)|Maths Classroom]]>><<pass 1>><</link>><<mathicon>> +<<mathicon>><<link [[Go to your maths lesson (0:01)|Maths Classroom]]>><<pass 1>><</link>> <br><br> <<elseif $schoolstate is "third">> -<<link [[Go to your English lesson (0:01)|English Classroom]]>><<pass 1>><</link>><<englishicon>> +<<englishicon>><<link [[Go to your English lesson (0:01)|English Classroom]]>><<pass 1>><</link>> <br><br> <<elseif $schoolstate is "lunch">> <<link [[Join the masses in the canteen (0:01)|Canteen]]>><<pass 1>><</link>> <br> -<<link [[Wait in the history classroom (0:01)|History Classroom]]>><<pass 1>><</link>><<historyicon>> +<<historyicon>><<link [[Wait in the history classroom (0:01)|History Classroom]]>><<pass 1>><</link>> <br><br> <<elseif $schoolstate is "fourth">> -<<link [[Go to your history lesson (0:01)|History Classroom]]>><<pass 1>><</link>><<historyicon>> +<<historyicon>><<link [[Go to your history lesson (0:01)|History Classroom]]>><<pass 1>><</link>> <br><br> <<elseif $schoolstate is "fifth">> -<<link [[Go to your swimming lesson (0:01)|School Pool Entrance]]>><<pass 1>><</link>><<swimmingicon>> +<<swimmingicon>><<link [[Go to your swimming lesson (0:01)|School Pool Entrance]]>><<pass 1>><</link>> <br><br> <</if>> <</if>> diff --git a/game/overworld-town/loc-shop/main.twee b/game/overworld-town/loc-shop/main.twee index fa30cce1cc..60f6e38178 100644 --- a/game/overworld-town/loc-shop/main.twee +++ b/game/overworld-town/loc-shop/main.twee @@ -51,7 +51,7 @@ With your arms bound you can't even cover yourself. <<link [[Clothing Shop (0:01)|Clothing Shop Sneak]]>><<pass 1>><</link>> <br> - <<link [[Tailor Shop (0:01)|Tailor Shop Sneak]]>><<pass 1>><</link>><<if $images is 1>> <<tailoricon>><</if>> + <<tailoricon>><<link [[Tailor Shop (0:01)|Tailor Shop Sneak]]>><<pass 1>><</link>> <br><br> <<link [[Main floor (0:02)|Shopping Centre]]>><<pass 2>><</link>> <br> @@ -78,7 +78,7 @@ With your arms bound you can't even cover yourself. <<link [[Clothing Shop (0:01)|Clothing Shop Sneak]]>><<pass 1>><</link>> <br> - <<link [[Tailor Shop (0:01)|Tailor Shop Sneak]]>><<pass 1>><</link>><<if $images is 1>> <<tailoricon>><</if>> + <<tailoricon>><<link [[Tailor Shop (0:01)|Tailor Shop Sneak]]>><<pass 1>><</link>> <br><br> <<link [[Main floor (0:02)|Shopping Centre]]>><<pass 2>><</link>> <br> @@ -100,12 +100,12 @@ With your arms bound you can't even cover yourself. <<if $daystate is "night">> <<link [[Clothing Shop (0:01)|Clothing Shop Sneak]]>><<pass 1>><</link>> <br> - <<link [[Tailor Shop (0:01)|Tailor Shop Sneak]]>><<pass 1>><</link>><<if $images is 1>> <<tailoricon>><</if>> + <<tailoricon>><<link [[Tailor Shop (0:01)|Tailor Shop Sneak]]>><<pass 1>><</link>> <br> <<else>> <<link [[Clothing Shop (0:01)|Clothing Shop]]>><<pass 1>><</link>> <br> - <<link [[Tailor (0:01)|Tailor Shop]]>><<pass 1>><</link>><<if $images is 1>> <<tailoricon>><</if>> + <<tailoricon>><<link [[Tailor (0:01)|Tailor Shop]]>><<pass 1>><</link>> <br> <</if>> <br> diff --git a/game/overworld-town/loc-street/barb.twee b/game/overworld-town/loc-street/barb.twee index 6ec1159ff3..bccc3fd106 100644 --- a/game/overworld-town/loc-street/barb.twee +++ b/game/overworld-town/loc-street/barb.twee @@ -52,7 +52,7 @@ You are on Barb Street. Silver blocks of flats tower all around you. You can hea <br> <</if>> <<if $exposed lte 0>> - <<link [[Police Station (0:02)|Police Station]]>><<pass 2>><</link>><<policeicon>> + <<policeicon>><<link [[Police Station (0:02)|Police Station]]>><<pass 2>><</link>> <br> <<if $dorenintro gte 1>> <<link [[Doren's Flat (0:02)|Doren Entrance]]>><<pass 2>><</link>> @@ -60,7 +60,7 @@ You are on Barb Street. Silver blocks of flats tower all around you. You can hea <</if>> <</if>> <<if $phase is 10>> - <<link [[Sneak into Police Station side door (0:05)|Police Back Office]]>><<pass 5>><<set $phase is 0>><</link>><<policeicon>> + <<policeicon>><<link [[Sneak into Police Station side door (0:05)|Police Back Office]]>><<pass 5>><<set $phase is 0>><</link>> <br> <</if>> <br> diff --git a/game/overworld-town/loc-street/connudatus.twee b/game/overworld-town/loc-street/connudatus.twee index 86f4c7680d..b9dcd94993 100644 --- a/game/overworld-town/loc-street/connudatus.twee +++ b/game/overworld-town/loc-street/connudatus.twee @@ -34,7 +34,7 @@ You are on Connudatus Street. The numerous clubs, bars and restaurants make it t Places of interest <br> <<if $daystate isnot "dawn" and $daystate isnot "day" and $exposed lte 1>> - <<link [[Strip Club|Strip Club]]>><</link>><<stripclubicon>> + <<stripclubicon>><<link [[Strip Club|Strip Club]]>><</link>> <br> <</if>> <<if $daystate isnot "dusk" and $daystate isnot "night" and $hour isnot 6>> diff --git a/game/overworld-town/loc-street/danube.twee b/game/overworld-town/loc-street/danube.twee index 978a0c0e5b..91ceb3ac69 100644 --- a/game/overworld-town/loc-street/danube.twee +++ b/game/overworld-town/loc-street/danube.twee @@ -32,7 +32,7 @@ You are on Danube Street. The houses here are spacious and stately. <<else>> Places of interest <br> - <<link [[Forest (0:10)|Forest]]>><<pass 10>><<set $forest to 0>><<set $eventskip to 1>><</link>><<foresticon>> + <<foresticon>><<link [[Forest (0:10)|Forest]]>><<pass 10>><<set $forest to 0>><<set $eventskip to 1>><</link>> <br> <<if $exhibitionismrun is "danube" and $exposed lte 1>> <<link [[Oak behind spa|Danube Oak]]>><</link>> diff --git a/game/overworld-town/loc-street/harvest.twee b/game/overworld-town/loc-street/harvest.twee index dad0440bd1..c56aa54855 100644 --- a/game/overworld-town/loc-street/harvest.twee +++ b/game/overworld-town/loc-street/harvest.twee @@ -33,14 +33,14 @@ You are on Harvest Street. There's a road leading out of town, and many of the b Places of interest <br> <<if $brothelintro is 1 and $exposed lte 1>> - <<link [[Brothel (0:01)|Brothel]]>><<pass 1>><</link>><<brothelicon>> + <<brothelicon>><<link [[Brothel (0:01)|Brothel]]>><<pass 1>><</link>> <br> <<elseif $brothelknown is 1 and $exposed lte 0>> <<link [[Enter suspicious building (0:05)|Brothel Intro]]>><<set $brothelintro to 1>><<pass 5>><</link>> <br> <</if>> <<if $pubintro is 1 and $exposed lte 0>> - <<link [[Pub (0:02)|Pub]]>><<pass 2>><</link>><<pubicon>> + <<pubicon>><<link [[Pub (0:02)|Pub]]>><<pass 2>><</link>> <br> <<elseif $exposed lte 0>> <<link [[Pub (0:02)|Pub Intro]]>><<pass 2>><</link>> diff --git a/game/overworld-town/loc-street/nightingale.twee b/game/overworld-town/loc-street/nightingale.twee index ce0c766c3d..949505eeb3 100644 --- a/game/overworld-town/loc-street/nightingale.twee +++ b/game/overworld-town/loc-street/nightingale.twee @@ -34,7 +34,7 @@ You are on Nightingale Street. It is dominated by the civic hospital but there a <br> <<link [[Hospital (0:01)->Hospital front]]>><<pass 1>><</link>> <br> - <<link [[Forest (0:10)|Forest]]>><<set $eventskip to 1>><<pass 10>><<set $forest to 0>><</link>><<foresticon>> + <<foresticon>><<link [[Forest (0:10)|Forest]]>><<set $eventskip to 1>><<pass 10>><<set $forest to 0>><</link>> <br><br> <<if $exposed gte 1 and $daystate isnot "night">> <<else>> diff --git a/game/overworld-town/loc-street/widgets.twee b/game/overworld-town/loc-street/widgets.twee index dcc289b1f3..f9d1e92869 100644 --- a/game/overworld-town/loc-street/widgets.twee +++ b/game/overworld-town/loc-street/widgets.twee @@ -1122,7 +1122,7 @@ A hooded figure bumps into you. A note falls from the folds of their coat, landi :: Widgets Nightingale [widget] <<widget "nightingale">><<nobr>> -<<link [[Nightingale Street (0:05) (Hospital)|Nightingale Street]]>><<pass 5>><</link>><<nightingaleicon>> +<<nightingaleicon>><<link [[Nightingale Street (0:05) (Hospital)|Nightingale Street]]>><<pass 5>><</link>> <</nobr>><</widget>> @@ -1144,7 +1144,7 @@ A hooded figure bumps into you. A note falls from the folds of their coat, landi :: Widgets Domus [widget] <<widget "domus">><<nobr>> -<<link [[Domus Street (0:05) (Home)|Domus Street]]>><<pass 5>><</link>><<domusicon>> +<<domusicon>><<link [[Domus Street (0:05) (Home)|Domus Street]]>><<pass 5>><</link>> <</nobr>><</widget>> @@ -1164,7 +1164,7 @@ A hooded figure bumps into you. A note falls from the folds of their coat, landi :: Widgets Danube [widget] <<widget "danube">><<nobr>> -<<link [[Danube Street (0:05) (Mansions)|Danube Street]]>><<pass 5>><</link>><<danubeicon>> +<<danubeicon>><<link [[Danube Street (0:05) (Mansions)|Danube Street]]>><<pass 5>><</link>> <</nobr>><</widget>> @@ -1184,7 +1184,7 @@ A hooded figure bumps into you. A note falls from the folds of their coat, landi :: Widgets Wolf [widget] <<widget "wolf">><<nobr>> -<<link [[Wolf Street (0:05) (Temple)|Wolf Street]]>><<pass 5>><</link>><<wolficon>> +<<wolficon>><<link [[Wolf Street (0:05) (Temple)|Wolf Street]]>><<pass 5>><</link>> <</nobr>><</widget>> @@ -1204,7 +1204,7 @@ A hooded figure bumps into you. A note falls from the folds of their coat, landi :: Widgets Elk [widget] <<widget "elk">><<nobr>> -<<link [[Elk Street (0:05)|Elk Street]]>><<pass 5>><</link>><<elkicon>> +<<elkicon>><<link [[Elk Street (0:05)|Elk Street]]>><<pass 5>><</link>> <</nobr>><</widget>> @@ -1347,7 +1347,7 @@ You've pushed yourself too much. You black out. :: Widgets Harvest [widget] <<widget "harvest">><<nobr>> -<<link [[Harvest Street (0:05) (Pub)|Harvest Street]]>><<pass 5>><</link>><<harvesticon>> +<<harvesticon>><<link [[Harvest Street (0:05) (Pub)|Harvest Street]]>><<pass 5>><</link>> <</nobr>><</widget>> @@ -1367,7 +1367,7 @@ You've pushed yourself too much. You black out. :: Widgets Mer [widget] <<widget "mer">><<nobr>> -<<link [[Mer Street (0:05) (Docks)|Mer Street]]>><<pass 5>><</link>><<mericon>> +<<mericon>><<link [[Mer Street (0:05) (Docks)|Mer Street]]>><<pass 5>><</link>> <</nobr>><</widget>> @@ -1387,7 +1387,7 @@ You've pushed yourself too much. You black out. :: Widgets Starfish [widget] <<widget "starfish">><<nobr>> -<<link [[Starfish Street (0:05) (Beach)|Starfish Street]]>><<pass 5>><</link>><<starfishicon>> +<<starfishicon>><<link [[Starfish Street (0:05) (Beach)|Starfish Street]]>><<pass 5>><</link>> <</nobr>><</widget>> @@ -1407,7 +1407,7 @@ You've pushed yourself too much. You black out. :: Widgets Cliff [widget] <<widget "cliff">><<nobr>> -<<link [[Cliff Street (0:05) (Cafe)|Cliff Street]]>><<pass 5>><</link>><<clifficon>> +<<clifficon>><<link [[Cliff Street (0:05) (Cafe)|Cliff Street]]>><<pass 5>><</link>> <</nobr>><</widget>> @@ -1427,7 +1427,7 @@ You've pushed yourself too much. You black out. :: Widgets Barb [widget] <<widget "barb">><<nobr>> -<<link [[Barb Street (0:05) (Studio)|Barb Street]]>><<pass 5>><</link>><<barbicon>> +<<barbicon>><<link [[Barb Street (0:05) (Studio)|Barb Street]]>><<pass 5>><</link>> <</nobr>><</widget>> @@ -1447,7 +1447,7 @@ You've pushed yourself too much. You black out. :: Widgets Connudatus [widget] <<widget "connudatus">><<nobr>> -<<link [[Connudatus Street (0:05) (Clubs)|Connudatus Street]]>><<pass 5>><</link>><<connudatusicon>> +<<connudatusicon>><<link [[Connudatus Street (0:05) (Clubs)|Connudatus Street]]>><<pass 5>><</link>> <</nobr>><</widget>> @@ -1578,7 +1578,7 @@ You find a quiet place and open the <<walletstop>> :: Widgets High [widget] <<widget "high">><<nobr>> -<<link [[High Street (0:05) (Shopping Centre)|High Street]]>><<pass 5>><</link>><<highicon>> +<<highicon>><<link [[High Street (0:05) (Shopping Centre)|High Street]]>><<pass 5>><</link>> <</nobr>><</widget>> @@ -1598,7 +1598,7 @@ You find a quiet place and open the <<walletstop>> :: Widgets Oxford [widget] <<widget "oxford">><<nobr>> -<<link [[Oxford Street (0:05) (School)|Oxford Street]]>><<pass 5>><</link>><<oxfordicon>> +<<oxfordicon>><<link [[Oxford Street (0:05) (School)|Oxford Street]]>><<pass 5>><</link>> <</nobr>><</widget>> diff --git a/game/overworld-town/loc-street/wolf.twee b/game/overworld-town/loc-street/wolf.twee index d0f4ad9102..0817e219b3 100644 --- a/game/overworld-town/loc-street/wolf.twee +++ b/game/overworld-town/loc-street/wolf.twee @@ -34,7 +34,7 @@ You are on Wolf Street. The nearby forest bleeds into the town here, particularl <br> <<link [[Temple (0:01)|Temple]]>><<pass 1>><</link>> <br> - <<link [[Forest (0:10)|Forest]]>><<pass 10>><<set $forest to 0>><<set $eventskip to 1>><</link>><<foresticon>> + <<foresticon>><<link [[Forest (0:10)|Forest]]>><<pass 10>><<set $forest to 0>><<set $eventskip to 1>><</link>> <br><br> <<if $exposed gte 1 and $daystate isnot "night">> <<else>> diff --git a/game/overworld-town/special-robin/walk.twee b/game/overworld-town/special-robin/walk.twee index ba9927d01a..fbb62d91e9 100644 --- a/game/overworld-town/special-robin/walk.twee +++ b/game/overworld-town/special-robin/walk.twee @@ -20,7 +20,7 @@ Robin smiles and nods. <</if>> -<<link [[Forest (0:30)|Robin Forest]]>><<pass 30>><<set $robinwalk to 1>><</link>><<foresticon>> +<<foresticon>><<link [[Forest (0:30)|Robin Forest]]>><<pass 30>><<set $robinwalk to 1>><</link>> <br> <<if $robinlove gte 20 and $money gte 1500>> <<link [[Cinema (£15 2:00)|Robin Walk Cinema]]>><<pass 15>><<set $money -= 1500>><</link>> diff --git a/game/overworld-underground/loc-sewers/widgets.twee b/game/overworld-underground/loc-sewers/widgets.twee index c205eda53c..6b663ae5a3 100644 --- a/game/overworld-underground/loc-sewers/widgets.twee +++ b/game/overworld-underground/loc-sewers/widgets.twee @@ -63,7 +63,7 @@ :: Widgets Storm Drain Entrance [widget] <<widget "stormdrain">><<nobr>> -<<link [[Manhole (0:05)|Storm Drain Entrance]]>><<pass 5>><</link>><<sewericon>> +<<sewericon>><<link [[Manhole (0:05)|Storm Drain Entrance]]>><<pass 5>><</link>> <</nobr>><</widget>> :: Widgets Drain Exit [widget] -- GitLab From f2f6095c5f2927085d9238c69afdd7ebf0c6b7ba Mon Sep 17 00:00:00 2001 From: TaiwanSmurf <taiwansmurf1@gmail.com> Date: Sat, 28 Sep 2019 00:14:13 +0800 Subject: [PATCH 2/2] minor fix (wrong file extension) --- game/base-system/images.twee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game/base-system/images.twee b/game/base-system/images.twee index 6026bcb223..5df2c3498f 100644 --- a/game/base-system/images.twee +++ b/game/base-system/images.twee @@ -343,7 +343,7 @@ <<widget "busicon">><<nobr>> <<if $images is 1>> -<img id="icon" src="img/misc/icon/bus.png"> +<img id="icon" src="img/misc/icon/bus.gif"> <</if>> <</nobr>><</widget>> -- GitLab