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

[ART] new art for power cell and copper wire, fixed scaling problem with cell #1047

Closed
wants to merge 2 commits into from
Closed

[ART] new art for power cell and copper wire, fixed scaling problem with cell #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
025d37f
new art for power cell and copper wire, fixed scaling problem in powe…
dusho Aug 30, 2016
7685e5b
new version of power cell and copper wire (more top down angle)
dusho Sep 5, 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
Binary file modified Assets/StreamingAssets/Images/Inventory/Copper Wire.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Assets/StreamingAssets/Images/Inventory/Copper Wire.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Sprites>
<Sprite name="Copper Wire" x="0" y="0" w="1" h="1" pixelPerUnit="128" />
<Sprite name="Copper Wire" x="0" y="0" w="1" h="1" pixelPerUnit="64" />
</Sprites>
Binary file modified Assets/StreamingAssets/Images/Inventory/Power Cell.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ...mingAssets/Images/Inventory/PowerCell.xml → ...ingAssets/Images/Inventory/Power Cell.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Sprites>
<Sprite name="Power Cell" x="0" y="0" w="1" h="1" pixelPerUnit="128" />
<Sprite name="Power Cell" x="0" y="0" w="1" h="1" pixelPerUnit="64" />
</Sprites>
2 changes: 1 addition & 1 deletion Assets/StreamingAssets/LUA/Furniture.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ function PowerCellPress_UpdateAction(furniture, deltaTime)
local outputSpot = World.Current.GetTileAt(spawnSpot.X+2, spawnSpot.y)

if(outputSpot.Inventory == nil) then
World.Current.inventoryManager.PlaceInventory( outputSpot, Inventory.__new("Power Cell", 5, 1) )
World.Current.inventoryManager.PlaceInventory( outputSpot, Inventory.__new("Power Cell", 1) )
spawnSpot.Inventory.StackSize = spawnSpot.Inventory.StackSize-10
else
if(outputSpot.Inventory.StackSize <= 4) then
Expand Down