Code

Team 5 Economy#67

Code

Merged

Hasakev merged 47 commits intomainUQcsse3200/2023-studio-3:mainfrom Team-5--EconomyUQcsse3200/2023-studio-3:Team-5--EconomyCopy head branch name to clipboardAug 29, 2023

+680-7

Commits

Commits on Aug 16, 2023

• Added currency folder for economy-related classes.

  ryandmcneilly

  committed
  415ee57

• Added methods to the currency class. The currency class can now modify the amount of currency it has, and check if certain items can be bought.

  ryandmcneilly

  committed
  5ff59ed

• Implemented basis of DropFactory

  Show description for f810018
  Hasakev

  committed
  f810018

Commits on Aug 18, 2023

• Implemented some getters and setters for the Currency class. Currency's now has a member variable 'name' which describes the currency (e.g. Scrap).

  ryandmcneilly

  committed
  303190e

• Merge branch 'Team-5--Economy' of https://github.com/UQcsse3200/2023-studio-3 into Team-5--Economy

  ryandmcneilly

  committed
  f05c3e8

Commits on Aug 21, 2023

• Implemented a subclass of currency called "Scrap" which will be the main currency used throughout sprint 1.

  ryandmcneilly

  committed
  722a72e

• Implemented the Currency Service, so that other teams can interact with the currency's throughout the game.

  ryandmcneilly

  committed
  3ccc705

Commits on Aug 22, 2023

• Base DropComponent and DropFactory implemented.

  Show description for 242f172
  Hasakev

  committed
  242f172

Commits on Aug 25, 2023

• Added CurrencyDisplay.java for displaying the UI Currency Component

  nawal-0

  committed
  0c25957

Commits on Aug 26, 2023

• Initialises and registers the currency service

  nawal-0

  committed
  e6c89ed

• Modified UI to get currency values from the Currency Service. Also added comments

  nawal-0

  committed
  9a3e1d0

Commits on Aug 27, 2023

• Added some testfiles

  Hasakev

  committed
  c9966dd

• Merge branch 'Team-5--Economy' of https://github.com/UQcsse3200/2023-studio-3 into Team-5--Economy

  Hasakev

  committed
  55300f4

• Changed drop size and removed createScrapDrop() parameters

  nawal-0

  committed
  0b2ca00

• Added scrap.png

  nawal-0

  committed
  e16bdc4

• Began Implementing scrap collection feature

  Show description for f446827
  Hasakev

  committed
  f446827

Commits on Aug 28, 2023

• Added currency folder for economy-related classes.

  

  ryandmcneilly

  authored and

  Hasakev

  committed
  fc7aa24

• Added methods to the currency class. The currency class can now modify the amount of currency it has, and check if certain items can be bought.

  

  ryandmcneilly

  authored and

  Hasakev

  committed
  8fb6f5f

• Implemented some getters and setters for the Currency class. Currency's now has a member variable 'name' which describes the currency (e.g. Scrap).

  

  ryandmcneilly

  authored and

  Hasakev

  committed
  47014c8

• Implemented basis of DropFactory

  Show description for 0a3a2e8
  Hasakev

  committed
  0a3a2e8

• Implemented a subclass of currency called "Scrap" which will be the main currency used throughout sprint 1.

  

  ryandmcneilly

  authored and

  Hasakev

  committed
  e05758e

• Implemented the Currency Service, so that other teams can interact with the currency's throughout the game.

  

  ryandmcneilly

  authored and

  Hasakev

  committed
  5e5626e

• Base DropComponent and DropFactory implemented.

  Show description for d03c56d
  Hasakev

  committed
  d03c56d

• Added some testfiles

  Hasakev

  committed
  a313ac5

• Added CurrencyDisplay.java for displaying the UI Currency Component

  

  nawal-0

  authored and

  Hasakev

  committed
  90d80eb

• Initialises and registers the currency service

  

  nawal-0

  authored and

  Hasakev

  committed
  b3f7648

• Modified UI to get currency values from the Currency Service. Also added comments

  

  nawal-0

  authored and

  Hasakev

  committed
  f563a33

• Changed drop size and removed createScrapDrop() parameters

  

  nawal-0

  authored and

  Hasakev

  committed
  71ba7b2

• Added scrap.png

  

  nawal-0

  authored and

  Hasakev

  committed
  edec7d7

• Began Implementing scrap collection feature

  Show description for fe20181
  Hasakev

  committed
  fe20181

• Merge branch 'Team-5--Economy' of https://github.com/UQcsse3200/2023-studio-3 into Team-5--Economy

  Hasakev

  committed
  f33b621

• Reimplemented ghost king

  nawal-0

  committed
  fe5411a

• Added currencyDisplay to the CurrencyService for easier access. Created a file for Currency Tests

  nawal-0

  committed
  cf6955a

• Added tests for Currency and CurrencyService classes

  nawal-0

  committed
  1f1f79b

• Extended TowerFactory with createIncomeTower() method which spawns scrap generating turrets

  fattyhope

  committed
  7d11161

• Added mine tower image and additional test case

  nawal-0

  committed
  dce37de

• Implemented Drop Collection

  Show description for bc1ba22
  Hasakev

  committed
  bc1ba22

• Scrap Collection successfully updates UI.

  Show description for 6669c8a
  Hasakev

  committed
  6669c8a

Commits on Aug 29, 2023

• Update CurrencyTest.java

  Show description for 8ccfd94
  Hasakev

  committed
  8ccfd94

• Fixed DropComponent to correctly grab scrap value

  Hasakev

  committed
  c050b2e

• Created class CurrencyTask which updates scrap for IncomeTowers periodically

  fattyhope

  committed
  0d86766

• Merge branch 'Team-5--Economy' of https://github.com/UQcsse3200/2023-studio-3 into Team-5--Economy

  fattyhope

  committed
  0b11410

• Updated the dummy image to mine tower

  fattyhope

  committed
  1f277e8

• UI correctly updates when income turret generates.

  Show description for d983461
  Hasakev

  committed
  d983461

• Merge branch 'main' into Team-5--Economy

  Hasakev

  committed
  43f4ba3

• Fixed problem merging main to current branch

  Hasakev

  committed
  a49eaff

• Removed unneccesary component in walltower (unintentional)

  Hasakev

  committed
  e6fd894