Skip to content

Hull classifiers to antennas #118

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.

Sign up for GitHub

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

Open
drNovikov wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Hull classifiers to antennas #118

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
bacc7f3
Changed HullClassifier to MyRadioAntenna instead of MyBeacon
drNovikov Sep 6, 2015
66ddb81
Changed HullClassifier mount points so they cover the whole surface
drNovikov Sep 6, 2015
eaa9d07
Bacon surfaces made fully mountable
drNovikov Sep 7, 2015
36137ad
Beacon and Hull Classifiers mount points reverted to vanilla
drNovikov Sep 8, 2015
7b42980
Fixed a typo in a comment
drNovikov Sep 8, 2015
9820af1
Removed my *.bak from .gitignore
drNovikov Sep 9, 2015
5b0d57b
"/gc fleet stop" enables thrusters, enables gyroscopes, sets gyro pow…
drNovikov Sep 20, 2015
dd2d4d1
Added ResourceSinkGroup to hull classifier definitions
drNovikov Oct 8, 2015
e6d5a38
cp round reward imprvs and fixes
zrisher Jul 21, 2015
444b575
add ability to show/hide CP GPS markers
zrisher Aug 7, 2015
eb49dc6
Changed HullClassifier to MyRadioAntenna instead of MyBeacon
drNovikov Sep 6, 2015
37b4173
Changed HullClassifier mount points so they cover the whole surface
drNovikov Sep 6, 2015
7c473fe
Bacon surfaces made fully mountable
drNovikov Sep 7, 2015
28a15f9
Beacon and Hull Classifiers mount points reverted to vanilla
drNovikov Sep 8, 2015
0bca8bc
Fixed a typo in a comment
drNovikov Sep 8, 2015
5edd8b5
Removed my *.bak from .gitignore
drNovikov Sep 9, 2015
327dbc4
"/gc fleet stop" enables thrusters, enables gyroscopes, sets gyro pow…
drNovikov Sep 20, 2015
f67dfb1
Added ResourceSinkGroup to hull classifier definitions
drNovikov Oct 8, 2015
04a0f5c
Merge remote-tracking branch 'origin/dev-drnovikov' into dev-drnovikov
drNovikov Oct 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ Data/Scripts/GardenConquest/GardenConquest.v11.suo
modinfo.sbmi
GardenConquestTests/bin/
GardenConquestTests/obj/
*.bak
Copy link
Collaborator

@zrisher zrisher Sep 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What file were you working with that had this extension?

Copy link
Author

@drNovikov drNovikov Sep 8, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

*bak is how I marked the backups.

Copy link
Collaborator

@zrisher zrisher Sep 9, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which backups are you referring to? So with git, you never need to save backups of files that have already been committed to the tree, because they're always available through the commit history. You can check out any version of any file from any time it's been committed.

The gitignore is meant to include all files that should everyone working on this project would want to ignore - so we only include file types that are directly correlated with the body of code. Personal preferences we leave to the global .gitignore file (likely already available in your ~ directory).

This isn't to be a dick, it's just long term better practice to be semantic about what we include to help describe the project and ensure no one is ever surprised because they try to add a legitimate file but it's ignored due to an unfamiliar ignore.

Copy link
Author

@drNovikov drNovikov Sep 9, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Understood :) Thanks for the clarification, I've never used github before, so I am still new to the practices.

Will move this to my global .gitignore Sorry for cluttering the file, I thought it influences my github only.

*.bak is how I use Notepad++ to quickly test an idea without involving repositories. I just copy a file to *.bak, and then test ideas by changing the original file and seeing the effect. Reverting is faster than with git.

30 changes: 15 additions & 15 deletions Data/BlockCategories.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
<DisplayName>Hull Classifiers</DisplayName>
<Name>Hull Classifiers</Name>
<ItemIds>
<string>Beacon/GCUnlicensedHullClassifier</string>
<string>Beacon/GCWorkerHullClassifier</string>
<string>Beacon/GCFoundryHullClassifier</string>
<string>Beacon/GCScoutHullClassifier</string>
<string>Beacon/GCFighterHullClassifier</string>
<string>Beacon/GCGunshipHullClassifier</string>
<string>Beacon/GCCorvetteHullClassifier</string>
<string>Beacon/GCFrigateHullClassifier</string>
<string>Beacon/GCDestroyerHullClassifier</string>
<string>Beacon/GCCruiserHullClassifier</string>
<string>Beacon/GCHeavyCruiserHullClassifier</string>
<string>Beacon/GCBattleshipHullClassifier</string>
<string>Beacon/GCOutpostHullClassifier</string>
<string>Beacon/GCInstallationHullClassifier</string>
<string>Beacon/GCFortressHullClassifier</string>
<string>RadioAntenna/GCUnlicensedHullClassifier</string>
<string>RadioAntenna/GCWorkerHullClassifier</string>
<string>RadioAntenna/GCFoundryHullClassifier</string>
<string>RadioAntenna/GCScoutHullClassifier</string>
<string>RadioAntenna/GCFighterHullClassifier</string>
<string>RadioAntenna/GCGunshipHullClassifier</string>
<string>RadioAntenna/GCCorvetteHullClassifier</string>
<string>RadioAntenna/GCFrigateHullClassifier</string>
<string>RadioAntenna/GCDestroyerHullClassifier</string>
<string>RadioAntenna/GCCruiserHullClassifier</string>
<string>RadioAntenna/GCHeavyCruiserHullClassifier</string>
<string>RadioAntenna/GCBattleshipHullClassifier</string>
<string>RadioAntenna/GCOutpostHullClassifier</string>
<string>RadioAntenna/GCInstallationHullClassifier</string>
<string>RadioAntenna/GCFortressHullClassifier</string>
</ItemIds>
</Category>
</CategoryClasses>
Expand Down
210 changes: 145 additions & 65 deletions Data/CubeBlocks.sbc
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Data/Prefabs/GCSpawnShip.sbc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,7 @@ people will try to kill you.
<BlinkLenght>10</BlinkLenght>
<BlinkOffset>0</BlinkOffset>
</MyObjectBuilder_CubeBlock>
<MyObjectBuilder_CubeBlock xsi:type="MyObjectBuilder_Beacon">
<MyObjectBuilder_CubeBlock xsi:type="MyObjectBuilder_RadioAntenna">
<SubtypeName>GCUnlicensedHullClassifier</SubtypeName>
<EntityId>200619511763221591</EntityId>
<Min x="2" y="-1" z="9" />
Expand Down
4 changes: 2 additions & 2 deletions Data/Scripts/GardenConquest/Blocks/GridEnforcer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ public override void Init(MyObjectBuilder_EntityBase objectBuilder) {
}

// We need to only turn on our rule checking after startup. Otherwise, if
// a beacon is destroyed and then the server restarts, all but the first
// a antenna is destroyed and then the server restarts, all but the first
// 25 blocks will be deleted on startup.
m_Grid.NeedsUpdate |= MyEntityUpdateEnum.EACH_100TH_FRAME;

Expand Down Expand Up @@ -975,7 +975,7 @@ private void removeExtraClassifiers(int removeCount = 100) {
/// The cleanest way to do that would be making Hull Classifiers a logic component
/// so we can track isWorking there and make sure it's closed when they are
/// This would require the ge to be able to find the HullClassifier component on
/// an added beacon, which seems like it might be possible, but also might not
/// an added antenna, which seems like it might be possible, but also might not
/// </remarks>
private List<HullClassifier> findWorstClassifiers(uint removeCount = 0) {
List<HullClassifier> worstClassifiers = new List<HullClassifier>();
Expand Down
2 changes: 1 addition & 1 deletion Data/Scripts/GardenConquest/Blocks/HullClassifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ private static HullClass.CLASS HullClassFromSubTypeString(String subTypeString)
/// </summary>
public static bool isClassifierBlock(IMySlimBlock block) {
IMyCubeBlock fatblock = block.FatBlock;
if (fatblock != null && fatblock is Ingame.IMyBeacon) {
if (fatblock != null && fatblock is Ingame.IMyRadioAntenna) {
String subTypeName = fatblock.BlockDefinition.SubtypeName;
if (subTypeName.Contains(SHARED_SUBTYPE))
return true;
Expand Down
2 changes: 1 addition & 1 deletion Data/Scripts/GardenConquest/Core/CommandProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ private String helpCPsText() {

"In order to control the CP, your fleet must " +
"have the most ships in that area that:\n" +
"* have a powered, broadcasting Hull Classifier beacon\n" +
"* have a powered, broadcasting Hull Classifier antenna\n" +
"* have a broadcast range on the classifier at least as large " +
" as the ship's distance to the CP. (This is to prevent players " +
"from hiding while capturing a CP. If someone stands in the " +
Expand Down
12 changes: 6 additions & 6 deletions Data/Scripts/GardenConquest/Records/ControlPoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,19 +207,19 @@ private Dictionary<long, Subfleet> nearbySubfleets() {
"nearbySubfleets", Logger.severity.ERROR);
continue;
}
InGame.IMyBeacon beacon = classifier.FatBlock as InGame.IMyBeacon;
if (beacon == null) {
log("Classifier could not be referenced as beacon",
InGame.IMyRadioAntenna antenna = classifier.FatBlock as InGame.IMyRadioAntenna;
if (antenna == null) {
log("Classifier could not be referenced as antenna",
"nearbySubfleets", Logger.severity.ERROR);
continue;
}
if (!beacon.IsWorking) {
log("Classifier beacon not working but grid was classified",
if (!antenna.IsWorking) {
log("Classifier antenna not working but grid was classified",
"nearbySubfleets", Logger.severity.ERROR);
continue;
}

if (beacon.Radius < VRageMath.Vector3.Distance(Position, grid.GetPosition())) {
if (antenna.Radius < VRageMath.Vector3.Distance(Position, grid.GetPosition())) {
log("Classifier range too small, skipping", "nearbySubfleets");
// TODO notify pilot
continue;
Expand Down