Fix merge conflicts in water well system

Terasology · Jul 23, 2020 · 00da1ae · 00da1ae
2 parents 4eaaae3 + 29a2955
commit 00da1ae
Show file tree

Hide file tree

Showing 47 changed files with 349 additions and 1,018 deletions.
diff --git a/assets/behaviors/angryCitizen.behavior b/assets/behaviors/angryCitizen.behavior
diff --git a/assets/behaviors/friendlyCitizen.behavior b/assets/behaviors/friendlyCitizen.behavior
diff --git a/assets/behaviors/neutralCitizen.behavior b/assets/behaviors/neutralCitizen.behavior
diff --git a/assets/behaviors/nocturnalCitizen.behavior b/assets/behaviors/nocturnalCitizen.behavior
diff --git a/assets/behaviors/scaredCitizen.behavior b/assets/behaviors/scaredCitizen.behavior
diff --git a/assets/materials/characters/angryGooey.mat b/assets/materials/characters/angryGooey.mat
diff --git a/assets/materials/characters/friendlyGooey.mat b/assets/materials/characters/friendlyGooey.mat
diff --git a/assets/materials/characters/neutralGooey.mat b/assets/materials/characters/neutralGooey.mat
diff --git a/assets/materials/characters/nocturnalGooey.mat b/assets/materials/characters/nocturnalGooey.mat
diff --git a/assets/materials/characters/scaredGooey.mat b/assets/materials/characters/scaredGooey.mat
diff --git a/assets/prefabs/buildings/marketPlace.prefab b/assets/prefabs/buildings/marketPlace.prefab
@@ -9,13 +9,12 @@
     },
     "MarketSubscriber" : {
      "production" : {
-       "waffles" : 10,
-       "Blueberry": 1,
-       "Raspberry": 1,
-       "Strawberry": 1,
-       "emptyCup" : 1
+         "AdditionalFruits:Blueberry": 3,
+         "AdditionalFruits:Raspberry": 3,
+         "AdditionalFruits:Strawberry": 3,
+         "MetalRenegades:emptyCup": 2
      },
-     "productionInterval" : 100
+    "productionInterval" : 10000
     },
     "InfiniteStorage" : {
      "inventory" : {}

diff --git a/assets/prefabs/characters/angryGooey.prefab b/assets/prefabs/characters/angryGooey.prefab