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.

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

Jump to bottom

Power Cells and Power Cell Press #370

Merged
merged 18 commits into from
Aug 22, 2016
Merged

Power Cells and Power Cell Press #370

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
681bc13
[WIP] Power Cells
Xeni91 Aug 20, 2016
d986de7
[WIP] Power Cells
Xeni91 Aug 20, 2016
1513a3e
Merge remote-tracking branch 'refs/remotes/origin/FuelingSystem'
Xeni91 Aug 20, 2016
56245b8
Merge branch 'master'
Xeni91 Aug 20, 2016
724c7c8
Update JobSpriteController.cs
Xeni91 Aug 20, 2016
368ff68
Updated Power Cell
Xeni91 Aug 20, 2016
e1eb29c
Merged branch master into FuelingSystem
Xeni91 Aug 20, 2016
cf6001b
Merge branch 'master'
Xeni91 Aug 20, 2016
8103ee4
Localisation
Xeni91 Aug 20, 2016
334c7d7
Merge remote-tracking branch 'refs/remotes/origin/master'
Xeni91 Aug 21, 2016
3be55fe
Revert "Update JobSpriteController.cs"
Xeni91 Aug 20, 2016
8ea66ed
Added the right param
Xeni91 Aug 21, 2016
8ce021d
Added the right param
Xeni91 Aug 21, 2016
67f27d1
Merge remote-tracking branch 'refs/remotes/origin/FuelingSystem'
Xeni91 Aug 21, 2016
2a4fa56
Idention Fix
Xeni91 Aug 21, 2016
665a3ab
Idention Fix
Xeni91 Aug 21, 2016
3b41d42
Merged branch FuelingSystem into FuelingSystem
Xeni91 Aug 21, 2016
e9206c1
Update JobSpriteController.cs
Xeni91 Aug 21, 2016
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
9 changes: 3 additions & 6 deletions Assets/Scripts/Controllers/JobSpriteController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,10 @@ public class JobSpriteController : MonoBehaviour
// Use this for initialization
void Start()
{
jobGameObjectMap = new Dictionary<Job, GameObject>();
fsc = GameObject.FindObjectOfType<FurnitureSpriteController>();
<<<<<<< HEAD
jobGameObjectMap = new Dictionary<Job, GameObject>();
fsc = GameObject.FindObjectOfType<FurnitureSpriteController>();
Copy link
Contributor

Choose a reason for hiding this comment

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

Tabs wanna be changed


=======
>>>>>>> FuelingSystem
WorldController.Instance.world.jobQueue.cbJobCreated += OnJobCreated;
WorldController.Instance.world.jobQueue.cbJobCreated += OnJobCreated;
Copy link
Collaborator

Choose a reason for hiding this comment

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

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.

}

void OnJobCreated(Job job)
Expand Down
30 changes: 15 additions & 15 deletions Assets/StreamingAssets/Data/Furniture.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,26 +220,26 @@
<UnlocalizedDescription>furn_metal_smelter_desc</UnlocalizedDescription>
</Furniture>

<Furniture objectType="Power Cell Press">
<Name>Power Cell Press</Name>
<Description>A press that converts steel plate and something into power cells.</Description>
<MovementCost>1</MovementCost>
<Width>2</Width>
<Height>2</Height>
<Furniture objectType="Power Cell Press">
<Name>Power Cell Press</Name>
<Description>A press that converts steel plate and something into power cells.</Description>
<MovementCost>1</MovementCost>
<Width>2</Width>
<Height>2</Height>

<BuildingJob jobTime="1"/>
<BuildingJob jobTime="1"/>

<Params>
<Param name="presstime" value="0" />
<Param name="presstime_required" value="15" />
</Params>
<Params>
<Param name="presstime" value="0" />
<Param name="presstime_required" value="15" />
</Params>

<OnUpdate FunctionName="PowerCellPress_UpdateAction" />
<OnUpdate FunctionName="PowerCellPress_UpdateAction" />

<LocalizationCode>furn_power_cell_press</LocalizationCode>
<UnlocalizedDescription>furn_power_cell_press_desc</UnlocalizedDescription>
<LocalizationCode>furn_power_cell_press</LocalizationCode>
<UnlocalizedDescription>furn_power_cell_press_desc</UnlocalizedDescription>

</Furniture>
</Furniture>

<Furniture objectType="Small Landing Pad">
<Name>Small Landing Pad</Name>
Expand Down