Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temp branch for merge #18

Closed
wants to merge 27 commits into from
Closed

Temp branch for merge #18

wants to merge 27 commits into from

Conversation

Bluntsord
Copy link
Collaborator

Added a buildUI, Item class and tower Inventory class.

build UI has var tower_to_be_built that changes upon clicking of the buttons in the build tool. Also can toggle between build mode and inspector mode.(Not needed feature as of now)

item class just has a texture rect that has attributes.
Items have 4 attributes as of now:

  1. Damage
  2. Attack Speed
  3. Projectile Speed
  4. Range Increase

Lastly the towerInventory class is composed by the tower class. Each tower has a tower inventory. Upon opening it, it gives a visual representation of the items equipped and the stats of the tower.

Currently the buildUI and the towerInventory is not under any folder but will both go under the UI folder when completed.

@bharathcs
Copy link
Member

bharathcs commented May 28, 2021

Hey i see a lot of *.import files were deleted. Could you reopen the godot project (that should trigger .import file creation), git add assets/img/ then commit and push? *.import files are necessary for source control, .import directories must be gitignored (src)

When you push on the TempBranchForMerge, you don't need to worry, it will auto update this PR.

@bharathcs
Copy link
Member

bharathcs commented May 28, 2021

From our discussions:

  • Move all game/.tscn and game/.gd to their right places
  • Move tower selector to UI, take it out of tower.tscn and keep it as part of UI elements
  • Set UI buttons to trigger set_action(...) when pressed by user
  • Have tower inspector have a variable called tower that will be set by map, and remember to reset it to null when user clicks another button (closing the inspector)

Meanwhile I will work on:

  • game ground tile assets
  • making sure aspect ratios from 4:3 to 21:9 are supported with filler tilemaps, with the real base aspect ratio always being 16:9.

@bharathcs
Copy link
Member

hmm we didn't discuss why Tower should be a KinematicBody, could you explain here?

@bharathcs
Copy link
Member

Will manually merge and ask tc to use a separate branch to stop making more unrelated commits to this PR.

@bharathcs bharathcs closed this May 29, 2021
@bharathcs bharathcs deleted the TempBranchForMerge branch May 30, 2021 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants