Skip to content

Commit

Permalink
Merge pull request #5 from xjyribro/spawners-popups-sprites
Browse files Browse the repository at this point in the history
Spawners popups sprites
  • Loading branch information
xjyribro authored Feb 21, 2024
2 parents e6bb7a6 + cc5eb3d commit b87d02a
Show file tree
Hide file tree
Showing 96 changed files with 1,562 additions and 431 deletions.
Binary file added assets/audio/bgm/hood_bgm.mp3
Binary file not shown.
Binary file removed assets/audio/bgm/mountain_diary.mp3
Binary file not shown.
Binary file added assets/audio/bgm/park_bgm.mp3
Binary file not shown.
Binary file removed assets/audio/bgm/roomboi.mp3
Binary file not shown.
Binary file removed assets/audio/bgm/scenic_stroll.mp3
Binary file not shown.
Binary file removed assets/audio/bgm/thanks_for_playing.mp3
Binary file not shown.
Binary file removed assets/audio/bgm/wumwob_squarewave.mp3
Binary file not shown.
Binary file added assets/images/rubbish/apple.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added assets/images/rubbish/battery.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/bowl.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/burrito.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/calendar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/chicken_leg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/container.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/cup_noodles.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/detegent_bottle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/egg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/egg_tray.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/gameboy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/laptop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/letter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/milk_carton.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/newspaper.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/pan.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/paper_bag.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/pizza.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/plastic_bag.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/plate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/pot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/sandwich.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/rubbish/spanner.png
Binary file added assets/images/rubbish/straw.png
Binary file added assets/images/rubbish/tablet.png
Binary file added assets/images/rubbish/teapot.png
Binary file added assets/images/rubbish/toilet_roll.png
123 changes: 85 additions & 38 deletions assets/tiles/hood.tmx

Large diffs are not rendered by default.

252 changes: 221 additions & 31 deletions assets/tiles/park.tmx

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions assets/yarn/general.yarn
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@
title: bag_is_full
---
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.
===
19 changes: 17 additions & 2 deletions assets/yarn/himiko.yarn
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Himiko: First, you have pick up the trash from the street.
Himiko: There is one right over there!
Himiko: Pick it up and head home to throw it.
Himiko: Once you sort your first rubbish come talk to me.
<<increaseBagSize 1>>
<<changeState "post_intro">>
===
title: post_intro
Expand Down Expand Up @@ -48,6 +49,20 @@ Himiko: Oh and don't forget to stop and talk to others.
===
title: level_2
---
Himiko: Hi! How's the collection going?
Himiko: Some people give extra incentives for helping them.
<<if $dayOfWeek == "Monday">>
Himiko: Hi! How's the collection going?
Himiko: Some people give extra incentives for helping them.
<<elseif $dayOfWeek == "Tuesday">>
Himiko : Happy Tuesday!
<<elseif $dayOfWeek == "Wednesday">>
Himiko : Happy Wednesday!
<<elseif $dayOfWeek == "Thursday">>
Himiko : Happy Thursday!
<<elseif $dayOfWeek == "Friday">>
Himiko : Happy Friday!
<<elseif $dayOfWeek == "Saturday">>
Himiko : Happy Saturday!
<<elseif $dayOfWeek == "Sunday">>
Himiko : Happy Sunday!
<<endif>>
===
31 changes: 31 additions & 0 deletions assets/yarn/kushi.yarn
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<<character "Mr Kushi" Kushi>>
title: talk
---
<<if $progress < 30>>
Kushi: Good {$timeOfDay}! Pleased to meet you.
Kushi: I am Mr Kushi, boss of Go convenient stores.
Kushi: We run the largest 24hr convenient store chain in Gomiland!
<<elseif $progress >= 30 and $progress < 100>>
Kushi: What? You have picked up over 80 plastics from the ground?
<<changeProgress 100>>
<<else>>
Kushi: What? You have picked up over 80 plastics from the ground?
Kushi: I guess many are products of Go 24hr convenient store...
Kushi: I am thinking of reducing the single use plastics that we use.
Kushi: Tell me, do you use reusable bags?
-> No
Kushi: Hmm... I guess our customers also would not use them.
-> Yes
Kushi: Ah. Maybe getting our customers to bring reusable bags is feasible.
Kushi: What about the plastic packaging and containers we currently use.
Kushi: Are customers going to pay more and be inconvenienced if we switch to alternatives?
-> Yes
Kushi: Oh no. I cannot let that happen.
Kushi: The customers are the most important.
-> No
Kushi: I see. In that case we could start encouraging buyers to bring their own bags
Kushi: We will also change some of our single use plastic products to use alternative materials!
Kushi: Thank you for your help. We hope that this change would benefit our brand and the residents.
<<changeProgress 200>>
<<endif>>
===
3 changes: 2 additions & 1 deletion assets/yarn/moon.yarn
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ title: talk
<<set $remainder = 150 - $progress>>
MrMoon: Collect another {$remainder} and maybe we can produce better crops.
<<else>>
MrMoon: end
MrMoon: The community garden can now create a wider variety of plants!
MrMoon: Using our own compost beats having to buy expensive chemicals from the store.
<<changeProgress 200>>
<<endif>>
===
14 changes: 7 additions & 7 deletions assets/yarn/rubbish_error.yarn
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,29 @@
<<declare $rubbishName as String>>
title: rubbish_error
---
Someone: Wrong!
Someone: Dear resident, please throw {$rubbishName} into the correct bin.
===
title: plastic_error
---
Risa: Wrong! {$rubbishName} is not made of plastic.
Risa: {$rubbishName} is not made of plastic.
===
title: glass_error
---
Manuka: Wrong! {$rubbishName} is not made of glass.
Manuka: Bzzzz! {$rubbishName} is not made of glass.
===
title: metal_error
---
Stark: Wrong! {$rubbishName} is not made of metal.
Stark: Hey be careful kid! {$rubbishName} ain't made of metal.
===
title: electronics_error
---
Asimov: Wrong! {$rubbishName} is not electronic waste.
Asimov: {$rubbishName} is not electronic waste. I can't use that!
===
title: paper_error
---
QianBi: Wrong! {$rubbishName} is not made of paper.
QianBi: This is a great disaster! {$rubbishName} is not made of paper.
===
title: food_error
---
Moon: Wrong! {$rubbishName} is not food waste.
Moon: {$rubbishName} is not food waste.
===
114 changes: 96 additions & 18 deletions lib/assets.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions lib/constants/constants.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const double boxMarginFromLeft = 28;

// map
const double tileSize = 32;
const int spawnerCount = 100;
const double parkStartX = 96;
const double parkStartY = 3660;
const double hoodStartFromRoomX = 1780;
Expand All @@ -18,7 +19,7 @@ const double hoodStartFromParkX = 6270;
const double hoodStartFromParkY = 4300;

// player
const double playerSpeed = 2;
const double playerSpeed = 16;
const double maxRaycastDist = 40;

// day cycle
Expand All @@ -29,10 +30,12 @@ const morningStartMins = 360;
const afternoonStartMins = 720;
const eveningStartMins = 1080;
const nightStartMins = 0;
const newDayMins = 0;
const spawnRatio = .5;

// dialogue
const double dialogueBoxFontSize = 24;
const double infoPopupFontSize = 16;
const double infoPopupFontSize = 17;
const double dialogueButtonFontSize = 16;
const double timePerChar = 0.05;
const int npcDialogueCount = 5;
Expand Down Expand Up @@ -94,4 +97,6 @@ class Strings {
static const friendsList = 'friendsList';
static const friendRequestsSent = 'friendRequestsSent';
static const friendRequestsReceived = 'friendRequestsReceived';
static const hoodSpawners = 'hoodSpawners';
static const parkSpawners = 'parkSpawners';
}
Loading

0 comments on commit b87d02a

Please sign in to comment.