Attempt at generic factory furniture (consume/produce) #1084

dusho · 2016-09-02T07:17:19Z

Working in generic consume/produce (discussed in #604)
Can do:

added optional Workshop (FurnitureWorkshop.cs) to Furniture .xml
furniture can handle multiple production chains (recipes)
can have multiple input/output slots
added context menu if there is more than 1 available production chain
load/save seems to be working (Inventory.locked is not persisted, after load, items from input are taken away - new issue, I guess)

There is new temporary Metal Furnace (that works as Metal Smelter) just to try things out. Idea is to get rid of most of repeated code in LUA for furniture that consumes and produces something
New art for Power cell press, input: 3x uranium, 2x steel plate, output: 1x power cell

…ontext menu fix, load/save

vogonistic · 2016-09-05T06:09:33Z

Assets/Editor/FactoryInfoTest.cs

+        fi.PossibleProductions = new System.Collections.Generic.List<FactoryInfo.ProductionChain>();
+        //fi.InputSlots = new List<FactoryInfo.IntVector2>() { new FactoryInfo.IntVector2(1, 0) };
+        //fi.OutputSlots = new List<FactoryInfo.IntVector2>() { new FactoryInfo.IntVector2(2, 0) };
+        var chain1 = new FactoryInfo.ProductionChain() { Name="Iron smelting", ProcessingTime = 4.0f };


This test file doesn't look formatted according to the rules in the CONTRIBUTING.md file. It's pretty hard to read.

vogonistic · 2016-09-05T06:20:35Z

+1 on adding Copper, but that could probably have been added in a small separate PR which I'd taken in a heartbeat.

In general I like the consume/produce pattern. This looks like a pretty good improvement to the current way of doing conversions on top of that.

svmnotn · 2016-09-05T15:50:49Z

@dusho this PR has some conflicts, please fix them

zwrawr · 2016-09-06T21:43:08Z

Assets/StreamingAssets/Data/Furniture.xml

+
+    <JobSpotOffset X="1" Y="0" />
+
+	<FactoryInfo>


Your xml has a mix of spaces and tabs, pick one or the other :)

…ess and power cell, context menu action on furniture still not working...

dusho · 2016-09-06T22:48:42Z

made some changes.. still having problem with context menu Action not changing my params (some problem with being a copy or something and not updating real furniture params)
Added new temp art here

…ext menu still doesn't work as expected

dusho · 2016-09-09T05:28:19Z

new commit, got rid of that partial class.. factory overall renamed to workshop.. to have class FurnitureWorkshop (instead of FurnitureFactory that can be confused with design pattern)
still having issue with context menu.. last is triggered no matter which one of workshop's context items is selected

…urniture-factory

dusho · 2016-09-09T07:57:33Z

merged with upstream
added copper plate and renamed raw_copper to Raw Copper for consistency with other resources
there seems to be funky behavior of jobs when items are not available (job is put into waitingJobQueue and then never put into active jobQueue, even if items are available) - not related to this commit

…the broken localization on furniture description

Grenkin1988 · 2016-09-10T07:46:52Z

Assets/StreamingAssets/Images/Inventory/Raw Copper.xml

+<?xml version="1.0" encoding="utf-8"?>
+<Sprites>
+	<Sprite name="Raw Copper"     x="0" y="0" w="1" h="1" pixelPerUnit="64" />
+</Sprites>


Add one line at the end

Grenkin1988 · 2016-09-10T07:53:35Z

FurnitureWorkshop has StyleCop errors

Grenkin1988 · 2016-09-10T08:29:02Z

Assets/Scripts/Models/FurnitureWorkshop.cs

+                WorkshopMenuActions.Add(new WorkshopContextMenu()
+                {
+                    ProductionChainName = prodChainName,
+                    Function = (furn, prod) =>


I think more readable would be change lambda by simple method. ->

WorkshopMenuActions.Add(new WorkshopContextMenu { ProductionChainName = chain.Name, Function = ChangeCurrentProductionChain });

and

private static void ChangeCurrentProductionChain(Furniture furniture, string productName) { Parameter currentProdaction = furniture.Parameters[CUR_PRODUCTION_CHAIN_PARAM_NAME]; bool isNotProcessing = furniture.Parameters[CUR_PROCESSED_INV_PARAM_NAME].ToInt() == 0; // if selected production really changes and nothing is being processed now if (productName.Equals(currentProdaction.Value) || !isNotProcessing) { return; } furniture.CancelJobs(); furniture.Parameters[CUR_PRODUCTION_CHAIN_PARAM_NAME].SetValue(productName); }

…urniture-factory

dusho · 2016-09-10T13:07:59Z

incorporated comments from Grenkin1988 (thanks for great review!)
fixed StyleCop warnings

Grenkin1988 · 2016-09-10T13:19:29Z

You removed WorkshopContextMenu

dusho · 2016-09-10T13:30:21Z

sorry.. forgot to add newly created file. fixed

sboigelot · 2016-09-10T18:04:24Z

This branch has conflicts that must be resolved

…urniture-factory

… inventory

sboigelot · 2016-09-11T10:48:05Z

This branch break something, the character do not find job anymore: do not happen on master:

FilippoLeon did not find a job.
UnityEngine.Debug:Log(Object)
UberLogger.Logger:ForwardToUnity(Object, LogSeverity, Object, Object[]) (at Assets/UberLogger/UberLogger.cs:504)
UberLogger.Logger:Log(String, Object, LogSeverity, Object, Object[]) (at Assets/UberLogger/UberLogger.cs:452)
Debug:ULogChannel(String, String, Object[]) (at Assets/UberLogger/Debug.cs:233)
Character:GetNewJob() (at Assets/Scripts/Models/Character.cs:608)
Character:Update_DoJob(Single) (at Assets/Scripts/Models/Character.cs:707)
Character:Update(Single) (at Assets/Scripts/Models/Character.cs:346)
World:TickEveryFrame(Single) (at Assets/Scripts/Models/World.cs:167)
WorldController:Update() (at Assets/Scripts/Controllers/WorldController.cs:162)

dusho · 2016-09-11T18:02:29Z

can you describe the testcase? cause nothing different should happen for existing furniture (as it uses LUA code for update). But new code kicks in only for power cell press.. and metal furnace + there is trick with furnace that you have to pick what to smelt there in context menu (right click) , iron ore -> iron plate, copper ore -> copper plate

sboigelot · 2016-09-11T19:02:54Z

@dusho, I just tried it again. The test case is: start the game, open the unity console and check the console :)

The character stay stuck at the center tile and never does anything

sboigelot · 2016-09-11T20:04:19Z

Sorry, my bad, I'm silly, we have to order them to mine now, they won't stockpile ore by themself. This is confusing

…urniture-factory

dusho · 2016-09-11T21:23:41Z

well actually something is indeed broken.. in my branch they are not picking the ice at all.. in master it works - it's beeing stockpiled
I'm confused, as I did not change stockpile lua code.. and changes in Furniture.cs are related only to Workshop code.. I don't get it.. feels like some automerge messed up something somewhere, but I can't tell where

sboigelot · 2016-09-11T21:26:15Z

Assets/StreamingAssets/Data/Inventory.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Inventories>
    <Inventory type="Raw Iron" maxStackSize="50" basePrice="0.8" category="inv_cat_raw"/>
-    <Inventory type="Ice" maxStackSize="10" basePrice="1.2" category="inv_cat_raw"/>


this may be the issue about ice? just quick reading

ye.. wish I saw your comment sooner :)

dusho · 2016-09-11T21:40:04Z

ok fixed.. ice got removed from inventory.xml somehow

[WIP] Attemp at generic factory furniture (consume/produce) , TODO: c…

cfcee53

…ontext menu fix, load/save

dusho changed the title ~~[WIP] Attemp at generic factory furniture (consume/produce)~~ [WIP] Attempt at generic factory furniture (consume/produce) Sep 2, 2016

dusho mentioned this pull request Sep 5, 2016

Producer/Consumer pattern for furniture #604

Closed

vogonistic reviewed Sep 5, 2016
View reviewed changes

vogonistic mentioned this pull request Sep 5, 2016

Machine working stock pile #1153

Open

dusho mentioned this pull request Sep 6, 2016

Power Cell Press puts cells in walls #975

Closed

zwrawr reviewed Sep 6, 2016
View reviewed changes

mikejbrown changed the title ~~[WIP] Attempt at generic factory furniture (consume/produce)~~ [Conflicts] [WIP] Attempt at generic factory furniture (consume/produce) Sep 6, 2016

incorporated comments from vogonistic, new temp art for power cell pr…

41f6429

…ess and power cell, context menu action on furniture still not working...

dusho mentioned this pull request Sep 6, 2016

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

Closed

refactored, not a partial class anymore, some fixes and cleanup, cont…

a3937fc

…ext menu still doesn't work as expected

Merge remote-tracking branch 'upstream/master' into feature/generic-f…

7b43b6b

…urniture-factory

dusho changed the title ~~[Conflicts] [WIP] Attempt at generic factory furniture (consume/produce)~~ Attempt at generic factory furniture (consume/produce) Sep 9, 2016

Merge branch 'master' into feature/generic-furniture-factory + fixed …

2504c02

…the broken localization on furniture description

Grenkin1988 reviewed Sep 10, 2016
View reviewed changes

dusho added 2 commits September 10, 2016 14:59

incorporated comments from Grenkin1988

8ff0658

Merge remote-tracking branch 'upstream/master' into feature/generic-f…

ac6b155

…urniture-factory

dusho changed the title ~~[StyleCop errors] Attempt at generic factory furniture (consume/produce)~~ Attempt at generic factory furniture (consume/produce) Sep 10, 2016

forgot to add new file to repo

0ff2ca2

sboigelot changed the title ~~Attempt at generic factory furniture (consume/produce)~~ [Conflict] Attempt at generic factory furniture (consume/produce) Sep 10, 2016

Merge remote-tracking branch 'upstream/master' into feature/generic-f…

c3d35d1

…urniture-factory

dusho changed the title ~~[Conflict] Attempt at generic factory furniture (consume/produce)~~ Attempt at generic factory furniture (consume/produce) Sep 10, 2016

fixing job and inventory code in workshop after recent refactoring in…

eaa880e

… inventory

sboigelot changed the title ~~Attempt at generic factory furniture (consume/produce)~~ [Conflict] [Breaking] Attempt at generic factory furniture (consume/produce) Sep 11, 2016

dusho mentioned this pull request Sep 11, 2016

[Question] Power cell size? #690

Closed

sboigelot changed the title ~~[Conflict] [Breaking] Attempt at generic factory furniture (consume/produce)~~ [Conflict] Attempt at generic factory furniture (consume/produce) Sep 11, 2016

Merge remote-tracking branch 'upstream/master' into feature/generic-f…

ea24240

…urniture-factory

sboigelot reviewed Sep 11, 2016
View reviewed changes

ice got removed from inventory.xml somehow.. wtf

aa280f7

dusho changed the title ~~[Conflict] Attempt at generic factory furniture (consume/produce)~~ Attempt at generic factory furniture (consume/produce) Sep 11, 2016

sboigelot merged commit f27f429 into TeamPorcupine:master Sep 11, 2016

TomMalbran mentioned this pull request Sep 12, 2016

Fix OnJobComplete LUA #1294

Merged

dusho deleted the feature/generic-furniture-factory branch October 17, 2016 14:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Attempt at generic factory furniture (consume/produce) #1084

Attempt at generic factory furniture (consume/produce) #1084

dusho commented Sep 2, 2016 •

edited

Loading

vogonistic Sep 5, 2016

vogonistic commented Sep 5, 2016

svmnotn commented Sep 5, 2016

zwrawr Sep 6, 2016

dusho commented Sep 6, 2016

dusho commented Sep 9, 2016

dusho commented Sep 9, 2016

Grenkin1988 Sep 10, 2016

Grenkin1988 commented Sep 10, 2016

Grenkin1988 Sep 10, 2016

dusho commented Sep 10, 2016

Grenkin1988 commented Sep 10, 2016

dusho commented Sep 10, 2016

sboigelot commented Sep 10, 2016

sboigelot commented Sep 11, 2016

dusho commented Sep 11, 2016

sboigelot commented Sep 11, 2016

sboigelot commented Sep 11, 2016

dusho commented Sep 11, 2016 •

edited

Loading

sboigelot Sep 11, 2016

dusho Sep 11, 2016

dusho commented Sep 11, 2016

Attempt at generic factory furniture (consume/produce) #1084

Attempt at generic factory furniture (consume/produce) #1084

Conversation

dusho commented Sep 2, 2016 • edited Loading

vogonistic Sep 5, 2016

Choose a reason for hiding this comment

vogonistic commented Sep 5, 2016

svmnotn commented Sep 5, 2016

zwrawr Sep 6, 2016

Choose a reason for hiding this comment

dusho commented Sep 6, 2016

dusho commented Sep 9, 2016

dusho commented Sep 9, 2016

Grenkin1988 Sep 10, 2016

Choose a reason for hiding this comment

Grenkin1988 commented Sep 10, 2016

Grenkin1988 Sep 10, 2016

Choose a reason for hiding this comment

dusho commented Sep 10, 2016

Grenkin1988 commented Sep 10, 2016

dusho commented Sep 10, 2016

sboigelot commented Sep 10, 2016

sboigelot commented Sep 11, 2016

dusho commented Sep 11, 2016

sboigelot commented Sep 11, 2016

sboigelot commented Sep 11, 2016

dusho commented Sep 11, 2016 • edited Loading

sboigelot Sep 11, 2016

Choose a reason for hiding this comment

dusho Sep 11, 2016

Choose a reason for hiding this comment

dusho commented Sep 11, 2016

dusho commented Sep 2, 2016 •

edited

Loading

dusho commented Sep 11, 2016 •

edited

Loading