-
-
Notifications
You must be signed in to change notification settings - Fork 44
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
Periodic Housekeeping PR 1 #895
Conversation
Remove warp bleed factor. Report actual cost in computer. Keep removing (unused) functionality from Energetic class. Fix typo in Benjamen's name
…gine-Source into task_drive_components
- Remove VS_PI and replace with standard M_PI - Fuel tank is integrated (can't upgrade). Remove options in base_computer. - Use standard ftl_energy.MaxLevel() instead of getWarpEnergy and warpCapData. - Remove support for additive and multiplicative capacitors and reactor. - Make unit_csv load reactor and capacitors the standard way using Load. - Remove WCfuelhack in unit_csv. Make energy source a configuration item. Game doesn't need to compute this every loop. - Remove vsfilesystem reference in unit_csv_factory. Breaks testing. - Remove reference to Unit in Cloak. Improves encapsulation. - Merge EnergyType enum into ComponentType. - Move GetUpgradeType to component_utils. - Remove Component::Describe. We'll do this in python along with the rest of the text in base_computer. - Make component query manifest for price, volume and description. - Add a whole bunch of getters to component. - Add support for infinite energy source. Useful for WC drive and reactor. - Move factors to configuration. You can now control utilization of drive and other components using the config file. - Add resiliency to Graphics2 and Manifest loading. Does not crash game if missing. Issues: - Jump causes damage. Unclear if this is new. There is code to do this in the engine.
I'm having a little trouble making this as a patch that applies to master. --edit... just checked out the branch you are working on, and it is compiling now. ;) |
OK, first mayor problem. When loading a saved game with a different ship, the SPEC drive seems to perform normally. Also, if you start a new campaign, and immediately save your game and then exit VegaStrike, loading that saved game on the next run coredumps VegaStrike.
|
Some added information, I checked with master branch, and on that SPEC works normally. |
The crash is because of #865 . It seems I didn't fix the issue. I had a recollection that I did. |
engine/src/resource/product.h
Outdated
@@ -32,6 +32,8 @@ class Product | |||
std::string name; | |||
// TODO: Can be a fraction for things such as fuel, water, etc. But not for now. | |||
Resource<int> quantity; | |||
|
|||
// TODO: move to int, x100 and add code to deal with cents. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we probably should just do whole credits and not concern ourselves with fractional credits
(e.g 1 credit = 1 penny = 1 shilling .... )
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah. I figured that one out too. Still need a todo.
Just did a little cross-checking here. I'm pretty sure this PR introduces #898 as the issue is not present in the current master. Also, please update this branch by merging in master. |
I will. I find myself with a bit more time and to facilitate reviews by @BenjamenMeyer , I'm working on multiple branches in parallel. This is all fine and dandy, except when it isn't. |
…gine-Source into task_drive_components
I think I fixed this in vegastrike/Assets-Production#129. You can test this by making the changes to ships.json. |
Hi there. Of course, a little testing can help to get things merged faster and then hopefully we will have less branches hanging around. I'm testing this branch now. It's running together with task_ship_view branch of Assets that has been patched with PR 129. So far, its pretty good. I am able to start a new campaign, and save the game. When starting a new instance of vs and loading the created saved game, you now have flight controls, which is great. |
Just saw my ship take some damage going through a jump as well, that's definitely something new. |
Just played a little more. Every jump now causes damage to the armor. Every jump I did some other part of the armor got damaged, so there is some randomness there. It does not seem to be confined to one ship type either, any ship that you are flying is taking damage through a jump. |
Tested the PR #901 against this branch, and there is no damage when you jump to a new system now. |
One thing I am noticing with this branch is that in a save game where I am flying around in a Goddard with a SPEC capacitor V, it says I don't have enough jump energy. In master branch the same jump drive with SPEC works flawlessly. When looking at the SPEC capacitor in the base computer, it says "It was not an upgrade, check the code" |
Can you post the following: |
Hi there. SPEC capacitor V Spec: With the task_drive_components branch: It does not appear to recognize the SPEC capacitor. Here is the csv of the milspec Goddard that is displaying this issue: |
This is odd. I looked at the csv and Goddard.milspec is 200 for warp and 200 for jump. It comes with a warp capacitor of 450 so it should work out of the box. Out of curiosity, can you start a new game with a Goddard.milspec and just fly it. I think the issue is the ftl capacitor overwrote the current number with 0 for some reason. I'll try and get to it today and see if I can figure this out. |
Hi there. I started a new campaign, and saved it. The thing with this saved game, though, is that I sold the milspec package some time ago, and installed my own components. I had a bit of spare cash lying around, and could afford more upgraded components than that of the milspec package. Now, if you remove the milspec package, the ship should just be the stock version, right? |
A bit more information. Started a new campaign, and went to the shipyards straight away. The SPEC capacitors listed for sale have the same error message as the screenshot I added in to this PR. To me, it looks like the game engine is not properly reading the SPEC capacitor part of Assets. The other components appear to be fine, with descriptions and all. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi there!
While Play testing this PR, there are a few issues. If these are fixed in another branch, then this one is good to go. However, they do bear mentioning here:
SPEC capacitor details are not available, and Jump drive cannot be purchased.
In the following screenshot, a new campaign was started, and in the upgrade ship area of Atlantis, you can see that the jump drive is red and unpurchase-able. Also, the SPEC capacitor specs are showing an error message.
Saving and loading works, and you have all flight controls in the saved game, so that is a bonus.
SPEC engages, but then a second later disengages. This might be due to the game not reading the proper values for the SPEC capacitor.
Top speed in Llama begin is 120, and after you do your first repair and refuel it is 125, which is what is normal, which means that the game is reading Llama.begin properly.
When loading a saved game with a .milspec ship, you also cannot jump, and on the HUD is states that the jump energy is low.
When loading a saved game with a .stock ship, you can jump, but still in the ship upgrades computer there are no stats on the SPEC capacitor or the jump drive.
Fuel burn rates seem to be normal.
Comparing the same tests against current master, SPEC capacitor has details and engages properly on a new campaign.
You still can't purchase a jump drive, but I do believe that this is fixed in another branch.
In conclusion, it would appear that this PR does introduce the issue where the SPEC capacitor's info is not read properly, and that has some knock-on effects.
Jump Drive - I know I fixed this in another branch. I'll try and find out where and maybe separate it, if the branch is still in testing. SPEC - unable to reproduce with Llama.begin. Can you confirm your asset production branch is master and is up to date? Goddard.milspec - unable to reproduce. Saved a new game and edited to Goddard. Ship goes into SPEC even without the package. Jumps with and without. SPEC capacitor looks fine in upgrade view. Are you testing the branch itself or the master with the branch merged into it? |
Hi there! I am testing just the branch, but I now know how to check out master and merge the branch to it. In my limited understanding of how git works, I thought it would not make a difference if I just checked out the branch, rather than merge it into master. Will double check that Assets is the latest master, and play test with latest engine with this branch merged into it. |
This branch has a merge conflict with engine/src/cmd/basecomputer.cpp, and so does not merge cleanly. I don't know how to fix this, unfortunately. |
Hi there! Thanks for fixing that merging conflict. The volume on the video is quite low, as there has been no processing done on it, so you will have to turn up the volume a bit to hear properly. Please see if you can see a problem in my testing setup. |
Unfortunately, I discovered I was working on the wrong branch. I intended to work on the drive, which is why it's called 'task_drive_components'. When I actually worked on the drive, I had to name the branch 'task_real_drive_components'. You can stop play testing for now. Everything reproduces.
|
OK, good to know it was not something on my side. Let me know when to test this branch again, please. |
- Duplicate FTL consumption - Save original figures without factors - Make FTL capacitor factor 1.0 and FTL drive factor 0.1. That's also contributed to the SPEC issue.
Go for it. It should now work even with Llama.begin with reactor02. |
Hi there! Just took it for a spin, and SPEC now works in a new campaign. So, technically you can start a new game and be able to just play normally, which I suppose is a good thing for someone new to Vega Strike. However, there is still something that bothers me. |
I was unable to reproduce that.
Yeah. I am not a fan of that. At some point in the near future I plan on simplifying assets somewhat. The current thinking is to make warp cost and jump cost functions of mass. That would get rid of these inconsistencies and shorten the file. I also want to remove support for eight and six facets and make armor four facets. Merge moment into mass. Save four facet shields and front, back, left and right (and not top-left-port whatever). |
Managed to reproduce it. This should go away when we merge #904. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When merging in the other branch mentioned, the issue with the SPEC capacitor description does go away.
With both these branches merged, I cannot find any fault with the game play.
This one is good to go!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add a log message for the abort
Code Changes:
Issues:
Jump causes damage. Unclear if this is new. There is code to do this in the engine.