Power Cells and Power Cell Press #370
Conversation
*added textures for press and cells *added xml for press and cells *rendering of press does not work properly don't know why *Press job is at the moment just a dummy, have to find out why the job breaks the game
*added textures for press and cells *added xml for press and cells *rendering of press does not work properly don't know why *Press job is at the moment just a dummy, have to find out why the job breaks the game
Conflicts: Assets/Scripts/Controllers/JobSpriteController.cs
Conflicts: Assets/StreamingAssets/Localization/no-BM.lang.meta
|
just resolved the merge conflict Edit: Discussion is in #304 |
Don't know why it was there
|
Here's a friendly tip if you're new to markdown, if you leave a space between the asterisk and the first character Github would render it as an actual list. So instead of *foo You get
|
* Sprite of press is loaded * added job for press * press takes steel and outputs power cells
|
Finished evrything I wanted I am just clueless why the Power Cell sprite is not loaded the way it should be |
Conflicts: Assets/StreamingAssets/LUA/Furniture.lua
* added Localisation for en_US
|
@Xeni91 Can you remove the change to |
| furniture.AddJob(j) | ||
| end | ||
| else | ||
| furniture.ChangeParameter("smelttime", deltaTime) |
There was a problem hiding this comment.
@Xeni91 I think you have a small mistake here.
In the Furniture.xml you defined the Params as
So it should be presstime not smelttime, or am I reading it wrong?
|
At least for .cs files we use spaces instead of tabs. But as far as I know we havent explicitly said anything about .lua and .xml. But maybe we should. I just assumed spaces were used there as well. |
Conflicts: Assets/StreamingAssets/Localization/en_US.lang
This reverts commit 724c7c8.
|
Thanks for the feedback I will get to it shortly ... |
* Added the right param in funiture.lua * fixed the indention from furniture.xml
* Added the right param in funiture.lua * fixed the indention from furniture.xml
Conflicts: Assets/StreamingAssets/Data/Furniture.xml
|
Just wanted to point out that tabs and spaces were already mixed in that file, I'm not blaming you specifically. :) |
* indention fix for Furniture.xml
|
Yeah you are right ... sometimes there are only 2 spaces for indention and sometimes there are 4, but I used Tab instead of spaces that was zu problem |
* indention fix for Furniture.xml
|
I made another way of generating power: #466 |
|
#506 Made changes in order to enable power system to react on changes to |
| ======= | ||
| >>>>>>> FuelingSystem | ||
| WorldController.Instance.world.jobQueue.cbJobCreated += OnJobCreated; | ||
| WorldController.Instance.world.jobQueue.cbJobCreated += OnJobCreated; |
There was a problem hiding this comment.
In this file it seems you went the other way around, spaces became tabs. :)
I think your Monodevelop isnt configured correctly. Check the contribution guidelines, I think there are instructions in there.
|
Merged! |
|
@vogonistic Why did you merge this AND uranium? |
|
To get the resources in the game. You can open a new PR to make power cells out of Uranium. |
Edit: added better markdown thanks to @Mizipzor