Unit DB Feature parity PR #57

Raistlfiren · 2016-11-22T03:27:38Z

This is currently a placeholder PR as I work on updating code to fix weapons, add DoTPulses, fix fire cycle, add more weapon details, add link to Github blueprint, and add stat highlighting.

This should knock out the following issues - https://github.com/spooky/unitdb/issues/56, https://github.com/spooky/unitdb/issues/54, https://github.com/spooky/unitdb/issues/53

Current todo list:

Raistlfiren · 2016-11-27T02:15:40Z

@spooky - Please review the PR when you get a chance. I have fixed all of the problems with weapons now, and I have added more information about beams. I also added a link from the blueprint ID to the specific Github page for easy reference. (This might need to be more obvious than what it currently is.)

As an aside, I would like to link/include this unit database as the main database now on the new website. Do you have any problems with connecting this repository to the official Faforever organization? Or at least me adding a Dockerfile so it can be deployed on the Faforever servers?

spooky · 2016-12-06T14:06:17Z

@Raistlfiren thanks for the PR, will need a bit more time to review/merge though. As for connecting this to faforever & linking/installing/sharing - no problems with that, this is open source and is meant to serve the community. Connecting or trasfering the repo to faforever would require me haivng admi permissions in that organization (https://help.github.com/articles/transferring-a-repository-owned-by-your-personal-account/)

Raistlfiren · 2016-12-06T14:27:53Z

@spooky - thank you for taking the time to review the PR. I will try to discuss the merge with downlord and sheeo.

Raistlfiren · 2016-12-06T14:52:52Z

@spooky - After speaking with downlord on slack, he said that we can transfer the repository to the organization and you would still have write access to the repository at first. Admin access would need to be explicitly given to you by visionik or sheeo. I will try to reach out to them as well.

Raistlfiren · 2017-01-04T22:47:10Z

@spooky - I just wanted to check in and see if you have been able to review it and think about moving to the Faforever organization. Downlord should be able to help you with the transition. If you would like to talk further, then we can discuss it on slack.

spooky · 2017-01-12T13:21:02Z

@Raistlfiren will do, just can't seem to find the time. When I do, I'll catch someone on slack and try to push this further.

spooky

I've put comments near the places that need to be fixed

spooky

some changes are needed.

spooky · 2017-01-12T22:53:14Z

tools/cleaner.py

@@ -398,12 +398,12 @@ def run(app_path):
    unit_data_path = os.path.join(app_path, 'data', 'index.json')
    unit_dataFat_path = os.path.join(app_path, 'data', 'index.fat.json')

-    unit_list = load_unit_file(unit_data_path)
+    unit_list = load_unit_file(unit_dataFat_path)


this commit is incorrect, though I understand the confusion. The way this works is that first the file called (by default) index.json is generated by running blueprint2json.lua so that file is actually the complete blueprint db (no filtering). Then the cleaner is run and that's what adjusts the index.json to a format understood by the app. So as misleading as it seems, the previous version of the code is correct.
As an improvement it would be nice to create a config file containing all the paths - that should clear up the confusion

Well, the problem is that the method slenderize is being called AFTER the file is loaded. I was running into issues where some of the new properties like FiringRandomness, FiringTolerance, and etc... wasn't being added to my index.json file because the index.json file only included the slimmed down version of properties. Unless I am still not clear about this, please verify. Thanks!

Slenderize is ment to throw out all the properties that are not used so that the index is smaller in size. The issue you need to solve is why slenderize doesn't find the new properties.

This may help:
https://github.com/spooky/unitdb/blob/master/tools/cleaner.py#L349

Yeah, exactly. The problem was that index.json did not include the methods and so they were not being included in the updated output. Once I changed that to the fat JSON file, then I was able to get all of the new methods and include them in the outputted file - index.json. The methods weren't included because they were never included initially.

spooky · 2017-01-12T22:59:07Z

app/css/main.css

@@ -171,7 +171,7 @@ footer {
 }
 .faction {
    float: left;
-    width: 25%;
+    /*width: 25%;*/


this broke the layout when a filter is applied. Check what happens when you click any of the class filters (e.g navy) or type in a unit name

spooky · 2017-01-12T23:05:01Z

app/js/UnitDecorator.js

+
+            return unitDb.dpsCalculator.dps(weapon, stats);
+        },
+        isTML = function(weapon) {


isTML = function(weapon) { return !!weapon.ForceSingleFire; }

spooky · 2017-01-12T23:07:20Z

app/js/UnitDecorator.js

+            if (weapon.ForceSingleFire)
+                return true;
+
+            return false;


there's a lot of dense code in this file - this should be extracted to smaller methods - right now it's really hard to follow.

spooky · 2017-01-12T23:09:10Z

test/spec/dps.js

@@ -27,7 +27,8 @@ describe('dps', function () {
        'TurretYawSpeed': 100,
        'WeaponCategory': 'Direct Fire'
    };
-    var dps = unitDb.dpsCalculator.dps(weapon);
+    var stats = JSON.parse('{"shots":1,"cycle":0.3,"damage":8,"salvoDelay":0,"salvoSize":1,"dotPulse":1}');


JSON.parse is really not needed here... this is js, you can just create the object directly. That goes for all the JSON.parse calls that have been added in this file.

This is silly. I don't really know why I did this. Thanks for the catch and I will update my PR soon with these changes.

… fat file

spooky · 2017-11-04T11:04:34Z

merged changes in 931f00b

Raistlfiren changed the title ~~[WIP] Unit DB Feature parity PR~~ Unit DB Feature parity PR Dec 6, 2016

spooky requested changes Jan 12, 2017

View reviewed changes

Raistlfiren added 9 commits January 31, 2017 15:52

Fixed weapon grouping when adding muzzles into the weapons.

66af0fc

Fixed a minor issue with cleaner pulling from cleaned file instead of…

0720d8d

… fat file

Added link to github for further reference to unit.

3d8e394

Added firing randomness and tolerance.

1ddc9b3

Added projectile lifetime

09fffbb

Added new index.json file to utilize all the new fields being used

d3f5b51

Improved weapon stats and added tml information.

52d4294

Fixed weapon tests

7851f49

Rebased.

b83922d

Raistlfiren force-pushed the feature-parity branch from 7733781 to b83922d Compare January 31, 2017 21:57

Raistlfiren added 2 commits February 1, 2017 08:24

Updated README

91e827c

Updated tests to remove JSON.parse.

9a4e4d3

spooky closed this Nov 4, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Unit DB Feature parity PR #57

Unit DB Feature parity PR #57

Raistlfiren commented Nov 22, 2016 •

edited

Loading

Raistlfiren commented Nov 27, 2016

spooky commented Dec 6, 2016 •

edited

Loading

Raistlfiren commented Dec 6, 2016

Raistlfiren commented Dec 6, 2016

Raistlfiren commented Jan 4, 2017

spooky commented Jan 12, 2017

spooky left a comment •

edited

Loading

spooky left a comment

spooky Jan 12, 2017

Raistlfiren Jan 13, 2017

spooky Jan 14, 2017

spooky Jan 14, 2017

Raistlfiren Jan 23, 2017

spooky Jan 12, 2017

spooky Jan 12, 2017

spooky Jan 12, 2017

spooky Jan 12, 2017

Raistlfiren Jan 13, 2017

spooky commented Nov 4, 2017

Unit DB Feature parity PR #57

Unit DB Feature parity PR #57

Conversation

Raistlfiren commented Nov 22, 2016 • edited Loading

Raistlfiren commented Nov 27, 2016

spooky commented Dec 6, 2016 • edited Loading

Raistlfiren commented Dec 6, 2016

Raistlfiren commented Dec 6, 2016

Raistlfiren commented Jan 4, 2017

spooky commented Jan 12, 2017

spooky left a comment • edited Loading

Choose a reason for hiding this comment

spooky left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

spooky commented Nov 4, 2017

Raistlfiren commented Nov 22, 2016 •

edited

Loading

spooky commented Dec 6, 2016 •

edited

Loading

spooky left a comment •

edited

Loading