changed all words trash to rubbish. changed himiko's dialogue. remove…

…d glow effect after pick up

README.md

@@ -1,6 +1,6 @@
 # Welcome to Gomiland! 
 
-Gomiland is a recycling focused game where players explore the city of Gomiland and help pick up and sort trash. Learn about the Gomiland's effort to be a sustainable city by talking to the people and reading the signs!
+Gomiland is a recycling focused game where players explore the city of Gomiland and help pick up and sort rubbish. Learn about the Gomiland's effort to be a sustainable city by talking to the people and reading the signs!
 
 From the main menu you can:
 1. Start a new game

assets/yarn/friend.yarn

@@ -44,7 +44,7 @@ title: buy_bag
         {$friendName}: Looks like you don't have enough coins. Come back when you do!
     <<else>>
         <<upgradeBag>>
-        {$friendName}: Here you go! A bag that can hold 20 pieces of trash.
+        {$friendName}: Here you go! A bag that can hold 20 pieces of rubbish.
         {$friendName}: You can give your old one to Himiko. She will hand them out to people who don't have one.
     <<endif>>
 ===

assets/yarn/general.yarn

@@ -5,5 +5,5 @@ Himiko: Your bag is full. Go home to sort what you picked up.
 ===
 title: bag_is_empty
 ---
-Himiko: Your bag is empty. Look around for black balls of trash.
+Himiko: Your bag is empty. Look around for black balls of rubbish.
 ===

assets/yarn/himiko.yarn

@@ -2,27 +2,22 @@
 title: intro
 ---
 Himiko: Hello neighbour! The recycling initiative starts today!
-Himiko: As part of the Gomiland's effort to be a sustainable city, all trash has to be sorted.
-Himiko: I think you might be unsure about how to do this. Let me teach you!
-Himiko: We have 6 different kinds of trash: plastics, paper, glass, metal, food and electronics.
-Himiko: There are 6 bins in your home for each kind. The images on the bin tell you what they are.
-Himiko: Throw the trash into the correct bin and get coins!
-Himiko: First, you have to pick up the trash from the street.
-Himiko: There is one right over there! Pick it up and head home to place it in the bin.
+Himiko: As part of the Gomiland's effort to be a sustainable city, all rubbish has to be sorted.
+Himiko: Pick up the rubbish from the street. Then go back home to throw the rubbish into the correct bin!
+Himiko: Rubbish look like the glowing black ball over there. Pick it up and head home to place it in the bin.
 <<increaseBagSize 1>>
 <<changeState "post_intro">>
 ===
 title: post_intro
 ---
 Himiko: If you need help, you can read the sign over there.
-Himiko: Once you sort your first piece of trash, I will give you something nice!
+Himiko: Once you sort your first piece of rubbish, I will give you something nice!
 ===
 title: level_1_correct
 ---
 Himiko: Looks like you correctly sorted your first piece!
-Himiko: Congratulations! You got some coins from the city.
 Himiko: Remember, if you get any wrong, you get a fine from the city!
-Himiko: Here is a bigger bag for you to hold more pieces of trash.
+Himiko: Here is a bigger bag for you to hold more pieces of rubbish.
 Himiko: Let's go clean up Gomiland! Here is a map for you if you are lost.
 Himiko: Oh and don't forget to stop and talk to people. Some need help!
 <<increaseBagSize 10>>
@@ -31,10 +26,8 @@ Himiko: Oh and don't forget to stop and talk to people. Some need help!
 title: level_1_incorrect
 ---
 Himiko: Looks like you didn't get the first one right.
-Himiko: You get a fine for each incorrect disposal.
-Himiko: Don't worry, getting the first one wrong is common.
-Himiko: Keep trying and you'll get the hang of it!
-Himiko: Here is a bigger bag for you to hold more pieces of trash.
+Himiko: Don't worry, keep trying and you'll get the hang of it!
+Himiko: Here is a bigger bag for you to hold more pieces of rubbish.
 Himiko: Let's go clean up Gomiland! Here is a map for you if you are lost.
 Himiko: Oh and don't forget to stop and talk to people. Some need help!
 <<increaseBagSize 10>>

assets/yarn/hood_npcs.yarn

@@ -9,7 +9,7 @@ title: boy
 <<if $rand == 1>>
     Boy : Remember to separate plastics from paper!
 <<elseif  $rand == 2>>
-    Boy : I wonder if all trash can be recycled.
+    Boy : I wonder if all rubbish can be recycled.
 <<elseif  $rand == 3>>
     Boy : Sustainability of the planet effects us all.
 <<elseif  $rand == 4>>
@@ -65,6 +65,6 @@ title: woman
 <<elseif  $rand == 4>>
     Woman : I heard the local convenience store is planning to reduce single-use plastic containers.
 <<elseif  $rand == 5>>
-    Woman : It's tough sorting out all the trash!
+    Woman : It's tough sorting out all the rubbish!
 <<endif>>
 ===

assets/yarn/manuka.yarn

@@ -17,12 +17,12 @@ title: talk
     Manuka: The glass you collected helped us a lot!
     Manuka: The queen sends her regards.
     Manuka: We've gotten so many more orders!
-    Manuka: Collect 10 more pieces of trash made of glass pleazzzzz....
+    Manuka: Collect 10 more pieces of rubbish made of glass pleazzzzz....
     <<changeProgress 100>>
 <<elseif $progress < 110>>
     <<set $remainder = 110 - $progress>>
     Manuka: We have received a huge increase in honey orders!
-    Manuka: Collect {$remainder} more trash made of glass pleazzzzz....
+    Manuka: Collect {$remainder} more rubbish made of glass pleazzzzz....
 <<else>>
     Manuka: Bzzzz... Bzzzzz...
     Manuka: Bzzzz... Bzzzzz...

assets/yarn/moon.yarn

@@ -4,7 +4,7 @@ title: talk
 ---
 <<if $progress == -1>>
     MrMoon: Gomiland National Park is truly a sight to behold.
-    MrMoon: Oh you are picking up trash and sorting them at home?
+    MrMoon: Oh you are picking up rubbish and sorting them at home?
     MrMoon: What a wonderful person you are.
     MrMoon: I have an idea. My neighbours and I run a community garden.
     MrMoon: If you help us collect food scraps, we can make fertilizer.

assets/yarn/park_npcs.yarn

@@ -12,7 +12,7 @@ title: boy
     Boy : There is a decline in honey bees.
     Boy : It would be sad if we had no more bees to make honey.
 <<elseif  $rand == 3>>
-    Boy : I wonder why there is so much trash in the park...
+    Boy : I wonder why there is so much rubbish in the park...
 <<elseif  $rand == 4>>
     Boy : Let's make our planet cleaner, by using reusable bags and containers.
 <<elseif  $rand == 5>>

assets/yarn/ranger.yarn

@@ -2,8 +2,8 @@
 title: buy_bag
 ---
 Ranger: Hello adventurer! I'm Ranger Sean, Gomiland National Park's Chief Park Ranger.
-Ranger: Recently, there has been a bit of trash that park-goers leave behind.
-Ranger: Could you help make the park a cleaner place? I can sell you a big bag that you can hold more trash in!
+Ranger: Recently, there has been a bit of rubbish that park-goers leave behind.
+Ranger: Could you help make the park a cleaner place? I can sell you a big bag that you can hold more rubbish in!
 Ranger: It costs 10 coins for the bag. Do you want it?
 -> No
     Ranger: No problem. The one you have works fine!
@@ -13,13 +13,13 @@ Ranger: It costs 10 coins for the bag. Do you want it?
         Ranger: Looks like you don't have enough coins. Come back when you do!
     <<else>>
         <<upgradeBag>>
-        Ranger: Here you go! A bag that can hold 30 pieces of trash.
+        Ranger: Here you go! A bag that can hold 30 pieces of rubbish.
         Ranger: You can give your old one to Himiko. She will hand them out to people who don't have one.
     <<endif>>
 ===
 title: greeting
 ---
 Ranger: Hello again adventurer! Gomiland National Park offers a great variety of attractions.
 Ranger: Visit the Bamboo Forest and shrine, Park Castle or World Forest!
-Ranger: There are never ending places to explore. Remember to pick up the trash along the way!
+Ranger: There are never ending places to explore. Remember to pick up the rubbish along the way!
 ===

assets/yarn/risa.yarn

@@ -21,7 +21,7 @@ title: talk
     Risa: {$remainder} more to go!
 <<elseif $progress >= 5 and $progress < 100>>
     Risa: Thank you for your effort.
-    Risa: I have shown my boss the trash that you collected.
+    Risa: I have shown my boss the rubbish that you collected.
     Risa: He isn't convinced...
     Risa: I bet he needs more evidence. Could you collect another 10 more plastics please?
     Risa: I will also ask the city to increase the coins for plastics you throw as an incentive.

lib/constants/info_text.dart

@@ -7,9 +7,9 @@ class InfoText{
       'You can enable the Directional Joystick and A button in Settings.\n\n'
       'Gameplay:\n'
       '1. Walk around and explore the city of Gomiland!\n'
-      '2. Pick up trash on the ground. Press E on the keyboard or use the A button.\n'
+      '2. Pick up rubbish on the ground. Press E on the keyboard or use the A button.\n'
       '3. Start conversations with people. Press E on the keyboard or use the A button.\n'
-      '4. Head home when your bag is full. The current trash amount is on the top of the screen.\n';
+      '4. Head home when your bag is full. The current rubbish amount is on the top of the screen.\n';
 
   static const String construction_site = 'Construction of new town centre in progress\n\n'
       'For your own safety, keep clear of worksite.\n\n'
@@ -65,7 +65,7 @@ class InfoText{
 
   static const String park_sign = 'This way to Gomiland National Park.\n\n'
       'Visit the Castle, Bamboo Forest Shrine, World Forest and the Honey Bee Colony\n\n'
-      'Please pick up trash in the park. Let\'s do our part to keep the park clean!\n\n'
+      'Please pick up rubbish in the park. Let\'s do our part to keep the park clean!\n\n'
       'Importance of National Parks:\n'
       '1. Protect ecological biodiversity, preserve landscapes\n'
       '2. Provide economic support for natural and cultural resources through tourism\n'
@@ -108,7 +108,7 @@ class InfoText{
       'Now there are over 6500 parks around the world!';
 
   static const String castle = 'Gomiland castle\n\n\n'
-      'Please do not throw trash on the castle grounds.\n\n'
+      'Please do not throw rubbish on the castle grounds.\n\n'
       'Did you know: Lighting accounts for 15% of global electricity use.\n'
       'Switching to LEDs will use 90% less energy and last far longer than with the use of incandescent lights.';
 
@@ -141,7 +141,7 @@ class InfoText{
       'Find out about deforestation at https://ourworldindata.org/deforestation';
 
   static const String how_to_sort = 'Sorting Instructions:\n\n'
-      '1. Drag and drop the trash on the table into the bins\n'
+      '1. Drag and drop the rubbish on the table into the bins\n'
       '2. The bins correspond to a recyclable material type:\n'
       'Plastics, paper, glass, metal, food waste and electronics.\n'
       '3. Get G-coins from the city council for getting it right.\n'

lib/game/objects/spawners/rubbish_spawner.dart

@@ -66,6 +66,7 @@ class RubbishSpawner extends SpriteComponent
     increaseBagCount(game);
     playPickUpSound(game);
     sprite = null;
+    add(RemoveEffect());
     remove(_hitbox);
   }