Move towers + cleanup #59
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also removed the unused `lookingTowards` and `autoShoot` fields.
Also removed the rotation logic from `TowerLogic`, so that only rotatable towers have that logic.
This was duplicated from `TowerLogic`.
...to the separate script, `ProjectileTowerLogic`.
This fixes the axe tower being rotated wrongly, as its initial rotation is `(-90, 0, 0)` instead of `(0, 0, 0)`.
This makes the values of `HeldInteractable`, `FocusedInteractable`, `LiftedObject` and `TargetCell` visible in the inspector, but unable to be written to.
This makes the value of `TurretInput` visible in the inspector, but unable to be written to.
...to `TowerScript`.
They're now mapped to the character typed - no matter the physical location.
# Conflicts: # Assets/Prefabs/PlayerControls.inputactions # Assets/Scripts/Player/PlayerControls.cs # Assets/Scripts/Player/PlayerStateController_Input.cs
Fueredoriku
approved these changes
Nov 18, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added a button (M/Gamepad north button) for moving the focused tower, which removes the tower from the game and puts the player in building mode.
Other highlights:
AxeTowerController->AxeTowerAnimationController(dc10cd1)RotatableTowerLogicand removed rotation logic fromAxeTowerAnimationController(b6b2e07 and 50aa5cc)TowerLogictoProjectileTowerLogic(eb2ed8a)