Changes

1,627 bytes added ,  20 April
Added 4 new beach portraits. Rearranged winter portraits to match regular ones, changed duplicate to neutral.
Line 24: Line 24:  
|-
 
|-
 
|
 
|
 +
'''Desert Festival (As Vendor)'''
 +
{|class="wikitable" style="width: 500px;"
 +
! style="width: 15%;" | Time
 +
! style="width: 85%;" | Location
 +
|-
 +
|11:10 AM
 +
|Boards the [[bus]] to [[Calico Desert]]
 +
|-
 +
|11:30 AM
 +
|Arrives at her [[Desert Festival#Villager Shops|booth]]
 +
|-
 +
|12:00 AM
 +
|Leaves booth and takes the bus back to the Valley
 +
|}
 +
 +
'''Spring 16 (Bus Service Restored)'''
 +
{|class="wikitable" style="width: 500px;"
 +
! style="width: 15%;" | Time
 +
! style="width: 85%;" | Location
 +
|-
 +
|9:20 AM
 +
|Boards the [[bus]] to [[Calico Desert]] to attend the [[Desert Festival]]
 +
|-
 +
|9:50 AM
 +
|Watches the races near the finish line
 +
|-
 +
|12:20 AM
 +
|Boards the bus back to the Valley
 +
|}
 +
 
'''Raining'''
 
'''Raining'''
 
{|class="wikitable" style="width: 500px;"
 
{|class="wikitable" style="width: 500px;"
Line 30: Line 60:  
|-
 
|-
 
|9:00 AM
 
|9:00 AM
|Bedroom.
+
|In her room.
 
|-
 
|-
 
|12:50 PM
 
|12:50 PM
Line 36: Line 66:  
|-
 
|-
 
|2:40 PM
 
|2:40 PM
|Lab.
+
|In the lab.
 
|-
 
|-
 
|4:40 PM
 
|4:40 PM
|Bedroom.
+
|In her room.
 
|-
 
|-
 
|11:00 PM
 
|11:00 PM
Line 51: Line 81:  
|-
 
|-
 
|9:00 AM
 
|9:00 AM
|Bedroom
+
|In her room.
 
|-
 
|-
 
|10:20 AM
 
|10:20 AM
|Lab
+
|In the lab.
 
|-
 
|-
 
|1:30 PM
 
|1:30 PM
Line 66: Line 96:  
|-
 
|-
 
|8:30 PM
 
|8:30 PM
|Bedroom.
+
|At home, in her room.
 
|-
 
|-
 
|11:00 PM
 
|11:00 PM
Line 87: Line 117:  
|-
 
|-
 
|6:30 PM
 
|6:30 PM
|Kitchen (House).
+
|At home, in the kitchen.
 
|-
 
|-
 
|10:20 PM
 
|10:20 PM
|Bedroom.
+
|In her room.
 
|-
 
|-
 
|12:00 AM
 
|12:00 AM
Line 102: Line 132:  
|-
 
|-
 
|9:00 AM
 
|9:00 AM
|Bedroom.
+
|In her room.
 
|-
 
|-
 
|10:20 AM
 
|10:20 AM
|Lab.
+
|In the lab.
 
|-
 
|-
 
|2:00 PM
 
|2:00 PM
Line 117: Line 147:  
|-
 
|-
 
|7:00 PM
 
|7:00 PM
|Bedroom
+
|At home, in her room.
 
|-
 
|-
 
|10:00 PM
 
|10:00 PM
Line 138: Line 168:  
|-
 
|-
 
|6:30 PM
 
|6:30 PM
|Kitchen (Home).
+
|At home, in the kitchen.
 
|-
 
|-
 
|10:20 PM
 
|10:20 PM
|Bedroom.
+
|In her room.
 
|-
 
|-
 
|12:00 AM
 
|12:00 AM
Line 153: Line 183:  
|-
 
|-
 
|9:00 AM
 
|9:00 AM
|Bedroom.
+
|In her room.
 
|-
 
|-
 
|10:20 AM
 
|10:20 AM
|Lab.
+
|In the lab.
 
|-
 
|-
 
|2:00 PM
 
|2:00 PM
Line 168: Line 198:  
|-
 
|-
 
|7:00 PM
 
|7:00 PM
|Bedroom.
+
|At home, in her room.
 
|-
 
|-
 
|10:00 PM
 
|10:00 PM
Line 180: Line 210:  
|-
 
|-
 
|9:00 AM
 
|9:00 AM
|Bedroom.
+
|In her room.
 
|-
 
|-
 
|10:20 AM
 
|10:20 AM
|Lab.
+
|In the lab.
 
|-
 
|-
 
|2:00 PM
 
|2:00 PM
Line 195: Line 225:  
|-
 
|-
 
|7:00 PM
 
|7:00 PM
|Bedroom.
+
|At home, in her room.
 
|-
 
|-
 
|10:00 PM
 
|10:00 PM
Line 207: Line 237:  
|-
 
|-
 
|9:00 AM
 
|9:00 AM
|Bedroom.
+
|In her room.
 
|-
 
|-
 
|10:20 AM
 
|10:20 AM
|Lab.
+
|In the lab.
 
|-
 
|-
 
|1:30 PM
 
|1:30 PM
Line 222: Line 252:  
|-
 
|-
 
|8:30 PM
 
|8:30 PM
|Bedroom.
+
|At home, in her room.
 
|-
 
|-
 
|11:00 PM
 
|11:00 PM
Line 232: Line 262:  
|-
 
|-
 
|
 
|
'''Green Rain'''
+
'''Green Rain (Year 1)'''
 +
{|class="wikitable" style="width: 500px;"
 +
! style="width: 15%;" | Time
 +
! style="width: 85%;" | Location
 +
|-
 +
|All day
 +
|In [[Sebastian]]'s room.
 +
|}
 +
 
 +
|-
 +
|
 +
'''Green Rain (Years 2+)'''
 
{|class="wikitable" style="width: 500px;"
 
{|class="wikitable" style="width: 500px;"
 
! style="width: 15%;" | Time
 
! style="width: 15%;" | Time
Line 238: Line 279:  
|-
 
|-
 
|All day
 
|All day
|In [[Sebastian]]'s room
+
|In her room.
 
|}
 
|}
   Line 247: Line 288:  
|-
 
|-
 
|9:00 AM
 
|9:00 AM
|In her bedroom.
+
|In her room.
 
|-
 
|-
 
|12:30 PM
 
|12:30 PM
Line 253: Line 294:  
|-
 
|-
 
|2:30 PM
 
|2:30 PM
|Goes to the laboratory in her house.
+
|Goes to the lab in her house.
 
|-
 
|-
 
|4:30 PM
 
|4:30 PM
|Returns to her room.
+
|At home, in her room.
 
|-
 
|-
 
|11:00 PM
 
|11:00 PM
Line 268: Line 309:  
|-
 
|-
 
|9:00 AM
 
|9:00 AM
|In her bedroom.
+
|In her room.
 
|-
 
|-
 
|10:20 AM
 
|10:20 AM
|In the laboratory.
+
|In the lab.
 
|-
 
|-
 
|1:30 PM
 
|1:30 PM
Line 319: Line 360:  
|-
 
|-
 
|10:20 AM
 
|10:20 AM
|In the laboratory.
+
|In the lab.
 
|-
 
|-
 
|2:00 PM
 
|2:00 PM
Line 370: Line 411:  
|-
 
|-
 
|10:20 AM
 
|10:20 AM
|In the laboratory.
+
|In the lab.
 
|-
 
|-
 
|2:00 PM
 
|2:00 PM
Line 397: Line 438:  
|-
 
|-
 
|10:20 AM
 
|10:20 AM
|In the laboratory.
+
|In the lab.
 
|-
 
|-
 
|2:00 PM
 
|2:00 PM
Line 424: Line 465:  
|-
 
|-
 
|10:20 AM
 
|10:20 AM
|In the laboratory.
+
|In the lab.
 
|-
 
|-
 
|1:30 PM
 
|1:30 PM
Line 452: Line 493:  
|-
 
|-
 
|10:20 AM
 
|10:20 AM
|In the laboratory.
+
|In the lab.
 
|-
 
|-
 
|1:30 PM
 
|1:30 PM
Line 500: Line 541:  
|-
 
|-
 
|10:20 AM
 
|10:20 AM
|In the laboratory.
+
|In the lab.
 
|-
 
|-
 
|2:00 PM
 
|2:00 PM
Line 512: Line 553:  
|-
 
|-
 
|7:10 PM
 
|7:10 PM
|In her room.
+
|At home, in her room.
 
|-
 
|-
 
|10:00 PM
 
|10:00 PM
Line 551: Line 592:  
|-
 
|-
 
|10:20 AM
 
|10:20 AM
|In the laboratory.
+
|In the lab.
 
|-
 
|-
 
|2:00 PM
 
|2:00 PM
Line 578: Line 619:  
|-
 
|-
 
|10:20 AM
 
|10:20 AM
|In the laboratory.
+
|In the lab.
 
|-
 
|-
 
|2:00 PM
 
|2:00 PM
Line 602: Line 643:  
|-
 
|-
 
|9:00 AM
 
|9:00 AM
|In her bedroom.
+
|In her room.
 
|-
 
|-
 
|10:20 AM
 
|10:20 AM
|In the laboratory.
+
|In the lab.
 
|-
 
|-
 
|1:30 PM
 
|1:30 PM
Line 632: Line 673:  
|-
 
|-
 
|2:30 PM
 
|2:30 PM
|Goes to the laboratory in her house.
+
|Goes to the lab in her house.
 
|-
 
|-
 
|4:30 PM
 
|4:30 PM
Line 654: Line 695:  
|-
 
|-
 
|9:20 AM
 
|9:20 AM
|In laboratory at home.  
+
|In lab at home.  
 
|-
 
|-
 
|11:00 AM
 
|11:00 AM
Line 660: Line 701:  
|-
 
|-
 
|3:40 PM
 
|3:40 PM
|Leaves home to attend Night Market
+
|Leaves home to attend Night Market.
 
|-
 
|-
 
|11:30 PM
 
|11:30 PM
|Leaves Night Market to return home
+
|Leaves Night Market to return home.
 
|}
 
|}
   Line 675: Line 716:  
|-
 
|-
 
|10:20 AM
 
|10:20 AM
|In laboratory at home.  
+
|In lab at home.  
 
|-
 
|-
 
|1:30 PM
 
|1:30 PM
|Leaves laboratory at home.
+
|Leaves lab at home.
 
|-
 
|-
 
|3:30 PM
 
|3:30 PM
Line 810: Line 851:  
|-
 
|-
 
|7:10 PM
 
|7:10 PM
|Back in her room.
+
|At home, in her room.
 
|-
 
|-
 
|10:00 PM
 
|10:00 PM
Line 835: Line 876:  
|-
 
|-
 
|7:10 PM
 
|7:10 PM
|Back in her room.
+
|At home, in her room.
 
|-
 
|-
 
|10:00 PM
 
|10:00 PM
Line 851: Line 892:  
|-
 
|-
 
|10:20 AM
 
|10:20 AM
|In the Lab at home.
+
|In the lab at home.
 
|-
 
|-
 
|2:00 PM
 
|2:00 PM
|Leaving lab goes to [[Pelican Town]].
+
|Leaves lab goes to [[Pelican Town]].
 
|-
 
|-
 
|3:00 PM
 
|3:00 PM
Line 863: Line 904:  
|-
 
|-
 
|7:00 PM
 
|7:00 PM
|In room, working on her "Device".
+
|In her room, working on her "Device".
 
|-
 
|-
 
|10:00 PM
 
|10:00 PM
Line 885: Line 926:  
|-
 
|-
 
|8:10 PM
 
|8:10 PM
|Back in her house.
+
|At home, in her house.
 
|-
 
|-
 
|}
 
|}
Line 899: Line 940:  
|-
 
|-
 
|6:00 AM
 
|6:00 AM
|At Home
+
|At farmhouse.
 
|-
 
|-
 
|8:00 AM
 
|8:00 AM
Line 954: Line 995:  
''Battery Pack''
 
''Battery Pack''
 
{{Quote|This will be perfect for powering my latest project! Thanks, (Name)!}}  
 
{{Quote|This will be perfect for powering my latest project! Thanks, (Name)!}}  
 +
''Dwarf Gadget''
 +
{{Quote|Ooh, this is exciting! I’ll deconstruct it and see if I can reverse-engineer the technology.}}
 
''Gold Bar''
 
''Gold Bar''
 
{{Quote|Ah, pure gold... It's not the strongest material, but it has some really useful properties!}}  
 
{{Quote|Ah, pure gold... It's not the strongest material, but it has some really useful properties!}}  
Line 994: Line 1,037:  
|{{Description|Diamond}}
 
|{{Description|Diamond}}
 
|[[Mining]]  
 
|[[Mining]]  
 +
|
 +
|-
 +
|[[File:Dwarf Gadget.png|center]]
 +
|[[Dwarf Gadget]]
 +
|{{Description|Dwarf Gadget}}
 +
|[[Artifacts]]
 
|
 
|
 
|-
 
|-
Line 1,161: Line 1,210:  
|-
 
|-
 
| [[File:Maru Concerned.png|48px|center]]
 
| [[File:Maru Concerned.png|48px|center]]
| colspan="3"| <ul><li>'''All [[Friendship#Universal Dislikes|Universal Dislikes]]''' ''(except [[Battery Pack]], [[Copper Bar]], [[Gold Bar]], [[Iridium Bar]], [[Iron Bar]], [[Oak Resin]], &amp; [[Pine Tar]])''</li></ul>
+
| colspan="3"| <ul><li>'''All [[Friendship#Universal Dislikes|Universal Dislikes]]''' ''(except [[Battery Pack]], [[Copper Bar]], [[Dwarf Gadget]], [[Gold Bar]], [[Iridium Bar]], [[Iron Bar]], [[Oak Resin]], &amp; [[Pine Tar]])''</li></ul>
 
|-
 
|-
 
|[[File:Blackberry.png|center]]
 
|[[File:Blackberry.png|center]]
Line 1,423: Line 1,472:     
''8+ Hearts''
 
''8+ Hearts''
{{Quote| [Player], you're looking sharp today.}}
+
{{Quote|[Player], you're looking sharp today.}}
    
'''Fall'''
 
'''Fall'''
Line 1,460: Line 1,509:  
''8+ Hearts''
 
''8+ Hearts''
 
{{Quote|Hi [Player]! Hey, don't you think my snowman looks kind of like you?}}
 
{{Quote|Hi [Player]! Hey, don't you think my snowman looks kind of like you?}}
 +
 +
'''Green Rain'''
 +
 +
''Year 1''
 +
{{Quote|I want to go collect samples with my dad, but my Mom is insisting we stay here...}}
 +
''Years 2+''
 +
{{Quote|This is a rare opportunity to study a unique phenomenon... every moment counts!}}
    
'''At Ginger Island'''
 
'''At Ginger Island'''
Line 1,706: Line 1,762:  
File:Maru Winter 01.png
 
File:Maru Winter 01.png
 
File:Maru Winter 02.png
 
File:Maru Winter 02.png
File:Maru Winter 03.png
+
File:Maru Winter 08.png
File:Maru Winter 04.png
   
File:Maru Winter 05.png
 
File:Maru Winter 05.png
File:Maru Winter 06.png
   
File:Maru Winter 09.png
 
File:Maru Winter 09.png
 +
File:Maru Winter 04.png
 +
File:Maru Winter 03.png
 
</gallery>
 
</gallery>
 
<gallery mode="packed" class="portraitgallery">
 
<gallery mode="packed" class="portraitgallery">
Line 1,716: Line 1,772:  
File:Maru Beach Happy.png
 
File:Maru Beach Happy.png
 
File:Maru Beach Concerned.png
 
File:Maru Beach Concerned.png
 +
File:Maru Beach Neutral.png
 +
File:Maru Beach Annoyed.png
 +
File:Maru Beach Surprised No Sunglasses.png
 +
File:Maru Beach Blush.png
 
File:Maru Beach Surprised.png
 
File:Maru Beach Surprised.png
 
</gallery>
 
</gallery>
Line 1,735: Line 1,795:  
{{History|1.4|Added 14-heart event. Fixed glitch where Maru would wear her work uniform after-hours on festival days. Fixed bug causing Maru to wear normal clothes inside the clinic after one of her heart events.}}
 
{{History|1.4|Added 14-heart event. Fixed glitch where Maru would wear her work uniform after-hours on festival days. Fixed bug causing Maru to wear normal clothes inside the clinic after one of her heart events.}}
 
{{History|1.5|Added beach portraits.}}
 
{{History|1.5|Added beach portraits.}}
{{History|1.6|Added winter portraits. Added [[Maru Portrait]].}}
+
{{History|1.6|Added winter portraits and more beach portraits. Added [[Maru Portrait]]. Now loves [[Dwarf Gadget]].}}
 +
{{History|1.6.4|Removed eyeglasses from beach portraits.}}
    
{{NavboxVillagers}}
 
{{NavboxVillagers}}
992

edits