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

#1730 cargo console #1897

Merged
merged 13 commits into from May 29, 2019

Conversation

Projects
None yet
3 participants
@vlandemart
Copy link
Contributor

commented May 26, 2019

Purpose

Cargo console. Fixes #1730

Open Questions and Pre-Merge TODOs

  • This fix is tested on the same branch it is PR'ed to.
  • I correctly commented my code
  • My code is indented with tabs and not spaces
  • This PR does not include any unnecessary .meta, .prefab or .unity (scene) changes
  • This PR does not bring up any new compile errors
  • This PR has been tested in editor
  • This PR has been tested in multiplayer (with 2 clients and late joiners, if applicable)

Notes:

For now, only 3 tabs are implemented: Supplies (with all possible things you can order), cart and status. Nice stuff like bounties screen and separate request console will be done sometime.
Also, I couldn't come up with nice bounty system, so for now it's just a placeholder giving 50 credits for every ObjectBehaviour on shuttle.
Supplies data is held in "CargoData" scriptable object and loaded in CargoManager on GUI_Cargo.InitServer()
!!!CONTAINS SCENE CHANGE!!!

vlandemart added some commits May 25, 2019

Various after-merge fixes
Changed NetTabs for NetPages, fixed several errors after merging with latest dev
Rewrote stuff to NetPages
Tabs are now netsynced (Supply tab isnt working)
Fixed build NRE
*Changed Managers.prefab so console doesn't give NRE on build
*Supplies tab is working now
Categories
Implemented Categories in Supplies tab
Status tab
*Nicer status tab with more information, message window and timer
*Timer behaviour for cargo shuttle
*Separate file containing data (CargoData scriptavble object)
Merge with develop
(removed my scene changes)
Final commit (CONTAINS SCENE CHANGE)
*Mapped cargo console onto scene
*Implemented current shuttle status icon

@vlandemart vlandemart marked this pull request as ready for review May 27, 2019

@vlandemart vlandemart changed the title [DNM] #1730 cargo console #1730 cargo console May 27, 2019

Fixed reversed scroll in messages
Changed scrollbar direction to "bottom to top" on CentcomMessages
@Aranclanos

This comment has been minimized.

Copy link
Member

commented May 27, 2019

remove the Debug.Log() messages or change them to logger

@fomalsd fomalsd self-requested a review May 28, 2019

@fomalsd
Copy link
Contributor

left a comment

Very, very quality stuff!
There are several minor things I've noticed, but they can be fixed later as I'm inclined to merge this sooner because of scene and prefab changes

using System.Collections.Generic;
using UnityEngine;

public class CargoConsole : NetworkTabTrigger

This comment has been minimized.

Copy link
@fomalsd

fomalsd May 28, 2019

Contributor

hm, it's kinda identical to NetworkTabTrigger. might be a good idea to make NetworkTabTrigger non-abstract and remove this one (looks like design oversight)

Show resolved Hide resolved UnityProject/Assets/Scripts/Managers/CargoManager.cs Outdated
Show resolved Hide resolved UnityProject/Assets/Scripts/UI/Cargo/GUI_CargoTab.cs Outdated
@vlandemart
Copy link
Contributor Author

left a comment

There is a bug that will result in frozen game if you order more crates that shuttle can fit

Show resolved Hide resolved UnityProject/Assets/Scripts/Shuttles/CargoShuttle.cs Outdated
Various fixes
* Fixed endless while on Order spawn that resulted in game freeze
* Renamed sub-tabs into pages
* Now order spawns on leaving Centcom rather then arriving
Proper GetRandomFreePos() fix
Available positions are now calculated before spawning objects and stored in list.
@fomalsd
Copy link
Contributor

left a comment

just a couple more tiny things before merge

CargoShuttle fixes
* Added few comments
* Removed Debug.Logs
* Replaced transform.position with matrix position
@fomalsd

This comment has been minimized.

Copy link
Contributor

commented May 29, 2019

awesome, merging

@fomalsd fomalsd merged commit 9453eb7 into unitystation:develop May 29, 2019

@vlandemart vlandemart deleted the vlandemart:#1730-cargo-console branch May 31, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.