Skip to content

Commit

Permalink
Revert "Update passed and failed customer list UI"
Browse files Browse the repository at this point in the history 
This reverts commit fb352fb.
  • Loading branch information
@ImLeiSu
ImLeiSu committed Oct 15, 2024
1 parent fb352fb commit f76f4b4
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 101 deletions.
153 changes: 60 additions & 93 deletions source/core/src/main/com/csse3200/game/components/maingame/EndDayDisplay.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
package com.csse3200.game.components.maingame;

import com.badlogic.gdx.graphics.g2d.TextureAtlas;
import com.badlogic.gdx.scenes.scene2d.ui.*;
import com.csse3200.game.entities.configs.CustomerPersonalityConfig;
import com.csse3200.game.entities.configs.NPCConfigs;
import com.csse3200.game.files.FileLoader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -16,6 +11,12 @@
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.Stage;
import com.badlogic.gdx.scenes.scene2d.ui.Image;
import com.badlogic.gdx.scenes.scene2d.ui.Label;
import com.badlogic.gdx.scenes.scene2d.ui.List;
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane;
import com.badlogic.gdx.scenes.scene2d.ui.Table;
import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
Expand Down Expand Up @@ -47,12 +48,11 @@ public class EndDayDisplay extends UIComponent {
public final java.util.List<String> customerNameArray;
public final java.util.List<String> passedCustomerArray;
public final java.util.List<String> failedCustomerArray;
private final Table passedCustomerTable;
private final Table failedCustomerTable;
private List<String> passedCustomerList;
private List<String> failedCustomerList;
private static final int STARTING_GOLD = ServiceLocator.getLevelService().getCurrGold();
private static final String POINT_IMAGE_PATH = "images/point.png";
private static final String TINY_5 = "flat-earth/skin/fonts/Tiny5-Regular.ttf";
private static final NPCConfigs configs = FileLoader.readClass(NPCConfigs.class, "configs/NPCs.json");

/**
* Constructor for the EndDayDisplay class.
Expand All @@ -66,8 +66,8 @@ public EndDayDisplay() {
this.customerNameArray = new ArrayList<>();
this.passedCustomerArray = new ArrayList<>();
this.failedCustomerArray = new ArrayList<>();
passedCustomerTable = new Table(skin);
failedCustomerTable = new Table(skin);
passedCustomerList = new List<>(skin);
failedCustomerList = new List<>(skin);
}

/**
Expand All @@ -88,9 +88,6 @@ public void create() {
addListeners();
}

/**
* Registers event listeners relevant to the end-of-day display operations, such as gold updates and customer events.
*/
public void addListeners() {
ServiceLocator.getDocketService().getEvents().addListener("goldUpdated", this::handleGoldUpdate);
ServiceLocator.getLevelService().getEvents().addListener("customerSpawned", this::updateCustomerList);
Expand Down Expand Up @@ -207,16 +204,25 @@ public void setupCustomerLists() {
// Customer lists
Table listTable = new Table();

Label passedLabel = new Label("Passed Customers", skin);
passedLabel.setFontScale(1.8f);
Label failedLabel = new Label("Failed Customers", skin);
failedLabel.setFontScale(1.8f);
FreeTypeFontGenerator generator = new FreeTypeFontGenerator(Gdx.files.internal(TINY_5));
FreeTypeFontParameter parameter = new FreeTypeFontParameter();
parameter.size = 30;
parameter.gamma = 1.8f;
BitmapFont font = generator.generateFont(parameter);
generator.dispose();
Label.LabelStyle newStyle = new Label.LabelStyle();
newStyle.font = font;
newStyle.fontColor = Color.WHITE;

Label passedLabel = new Label("Passed Customers", newStyle);
passedLabel.setFontScale(1.2f);
Label failedLabel = new Label("Failed Customers", newStyle);
failedLabel.setFontScale(1.2f);
listTable.add(passedLabel).pad(10).center();
listTable.add(failedLabel).pad(10).center().row();

ScrollPane passedScrollPane = new ScrollPane(passedCustomerTable, skin);
ScrollPane passedScrollPane = new ScrollPane(passedCustomerList, skin);
passedScrollPane.setSmoothScrolling(true);
ScrollPane failedScrollPane = new ScrollPane(failedCustomerTable, skin);
ScrollPane failedScrollPane = new ScrollPane(failedCustomerList, skin);
failedScrollPane.setSmoothScrolling(true);
listTable.add(passedScrollPane).pad(10).expand().width(400).fillY();
listTable.add(failedScrollPane).pad(10).expand().width(400).fillY().row();
Expand All @@ -231,12 +237,22 @@ public void setupCustomerLists() {
* the end-of-day display, effectively closing it.
*/
public void addCloseButton() {
TextButton.TextButtonStyle style = new TextButton.TextButtonStyle();
Texture texture = ServiceLocator.getResourceService()
.getAsset("images/finish.png", Texture.class);

Drawable drawable = new TextureRegionDrawable(new TextureRegion(texture));
style.up = new TextureRegionDrawable(new TextureRegion(texture));

FreeTypeFontGenerator generator = new FreeTypeFontGenerator(Gdx.files.internal(TINY_5));
FreeTypeFontParameter parameter = new FreeTypeFontParameter();
parameter.size = 30;
parameter.gamma = 1.8f;
BitmapFont font = generator.generateFont(parameter);
generator.dispose();
style.font = font;
style.fontColor = Color.RED;

ImageButton closeBtn = new ImageButton(drawable);
TextButton closeBtn = new TextButton("", style);

closeBtn.addListener(new ClickListener() {
@Override
Expand Down Expand Up @@ -267,6 +283,7 @@ public void handleGoldUpdate(int gold) {

public void handlePassedCustomer(String customerName) {
passedCustomerArray.add(customerName.toUpperCase());
passedCustomerList.setItems(passedCustomerArray.toArray(new String[0]));
logger.info("Customer passed: {}", customerName);
}

Expand All @@ -282,64 +299,39 @@ public void updateCustomerList(String customerName) {
logger.info("Updated customer list with: {}", customerNameArray);
}

/**
* Recalculates the failed customers list, updating UI elements accordingly.
*/
private void recalculateFailedCustomers() {
failedCustomerTable.clearChildren();
failedCustomerArray.clear();
failedCustomerArray.addAll(customerNameArray);
for (String passedName : passedCustomerArray) {
failedCustomerArray.remove(passedName);
}
for (String passedName : passedCustomerArray) {
assertCustomerTexture(passedName, passedCustomerTable);
}
for (String failedName : failedCustomerArray) {
assertCustomerTexture(failedName, failedCustomerTable);
}
failedCustomerList.setItems(failedCustomerArray.toArray(new String[0]));
logger.info("Failed customers recalculated: {}", failedCustomerArray);
}

/**
* Retrieves configuration details for a customer based on their name.
*
* @param name the name of the customer.
* @return the configuration details of the customer.
* Shows the end-of-day display.
* This method makes the display visible and updates all dynamic content to reflect
* the current game state. It is usually called in response to a game event.
*/
private CustomerPersonalityConfig getCustomerConfig(String name) {
return switch (name) {
case "HANK" -> configs.Hank;
case "LEWIS" -> configs.Lewis;
case "SILVER" -> configs.Silver;
case "JOHN" -> configs.John;
case "MOONKI" -> configs.Moonki;
default -> configs.Default;
public void show() {
recalculateFailedCustomers();
setVisible(true);
getLayout().setVisible(true);
getBirdImage().setVisible(true);
getPointImage1().setVisible(true);
getPointImage2().setVisible(true);
getPointImage3().setVisible(true);
gameScreen.pause(); // Pause the game when the display is shown
imageX = (float) (3 * Gdx.graphics.getWidth()) / 4; // Reset image position
Task birdMoveTask = new Task() {
@Override
public void run() {
updateBirdPosition(Gdx.graphics.getDeltaTime());
}
};
}

/**
* Attempts to load and display a customer's texture in the provided table. This method retrieves the customer's
* texture based on their personality configuration and adds it to the specified table along with the customer's name.
*
* @param customerName The name of the customer for whom the texture is to be loaded.
* @param customerTable The table where the customer's image and name label are to be displayed.
*/
private void assertCustomerTexture(String customerName, Table customerTable) {
CustomerPersonalityConfig config = getCustomerConfig(customerName);
try {
TextureAtlas atlas = ServiceLocator.getResourceService().getAsset(config.texture, TextureAtlas.class);
TextureRegion region = atlas.findRegion("default");
Image image = new Image(region);
Label label = new Label(customerName, skin);
label.setFontScale(1.5f);

customerTable.row().pad(10);
customerTable.add(image).size(70, 70);
customerTable.add(label);
} catch (Exception e) {
logger.error("Failed to load texture for customer {}", customerName, e);
}
Timer.schedule(birdMoveTask, 0, 1 / 60f); // Schedule the task
this.animateGoldChange();
}

/**
Expand Down Expand Up @@ -383,31 +375,6 @@ public void run() {
));
}

/**
* Shows the end-of-day display.
* This method makes the display visible and updates all dynamic content to reflect
* the current game state. It is usually called in response to a game event.
*/
public void show() {
recalculateFailedCustomers();
setVisible(true);
getLayout().setVisible(true);
getBirdImage().setVisible(true);
getPointImage1().setVisible(true);
getPointImage2().setVisible(true);
getPointImage3().setVisible(true);
gameScreen.pause(); // Pause the game when the display is shown
imageX = (float) (3 * Gdx.graphics.getWidth()) / 4; // Reset image position
Task birdMoveTask = new Task() {
@Override
public void run() {
updateBirdPosition(Gdx.graphics.getDeltaTime());
}
};
Timer.schedule(birdMoveTask, 0, 1 / 60f); // Schedule the task
this.animateGoldChange();
}

/**
* Hides the display and triggers the game to continue.
* This method is called when the close button is activated, hiding the display
Expand Down
4 changes: 0 additions & 4 deletions source/core/src/main/com/csse3200/game/entities/factories/NPCFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,6 @@ public static void decreaseCustomerCount() {
customerCount --;
}

public static void reset() {
customerCount = 0;
}

private NPCFactory() {
throw new IllegalStateException("Instantiating static util class");
}
Expand Down
2 changes: 0 additions & 2 deletions source/core/src/main/com/csse3200/game/screens/MainGameScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import com.csse3200.game.entities.Entity;
import com.csse3200.game.entities.EntityService;
import com.csse3200.game.entities.factories.LevelFactory;
import com.csse3200.game.entities.factories.NPCFactory;
import com.csse3200.game.entities.factories.RenderFactory;
import com.csse3200.game.entities.factories.UIFactory;
import com.csse3200.game.input.InputComponent;
Expand Down Expand Up @@ -266,7 +265,6 @@ public void dispose() {
* Reset screen UI
*/
public void resetScreen() {
NPCFactory.reset();
EntityService entityService = ServiceLocator.getEntityService();
entityService.dispose();
ServiceLocator.registerEntityService(new EntityService());
Expand Down
4 changes: 2 additions & 2 deletions source/core/src/test/com/csse3200/game/components/maingame/EndDayDisplayTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class EndDayDisplayTest {
DayNightService dayNightService;
LevelService levelService;
EndDayDisplay endDayDisplay;

private EventHandler eventHandler;
/**
* Sets up the environment before each test by initializing services
*/
Expand Down Expand Up @@ -106,7 +106,7 @@ void setUp() {

@Test
void testAddListeners() {
EventHandler eventHandler = new EventHandler();
eventHandler = new EventHandler();
endDayDisplay.addListeners();

EventListener0 goldUpdated = mock(EventListener0.class);
Expand Down

0 comments on commit f76f4b4

Please sign in to comment.