Merge pull request #1309 from playmint/istanbul-fixes

Istanbul quest fixes

contracts/src/maps/quest-map/RegistrationOffice.js

@@ -136,7 +136,7 @@ export default function update({ selected, world, player }) {
                         {
                             id: 'default',
                             type: 'inline',
-                            html: "Give me goo and I'll register you. Collect some from other islands if you don't have enough",
+                            html: "Give me goo and I'll register you. If you have already spent yours, you will just have to go find some.",
                             buttons: [{ text: 'Register', type: 'action', action: craft, disabled: !canCraft }]
                         },
                     ],

contracts/src/maps/quest-map/quests/03_Orientation.yaml

@@ -4,13 +4,13 @@ spec:
   name: Orientation
   description: "Before the important work begins, all users need to prove their aptitude at the basics."
   tasks:
-    - kind: questComplete
-      name: Complete Goo Harvesting quest
-      quest: Goo Harvesting
     - kind: questComplete
       name: Complete Deletion Preparation quest
       quest: Deletion Preparation
     - kind: questComplete
       name: Complete Deletion Duty quest
       quest: Deletion Duty
+    - kind: questComplete
+      name: Complete Goo Harvesting quest
+      quest: Goo Harvesting
   next: ["Calling All Users"]

contracts/src/maps/quest-map/quests/03a_GooHarvesting.yaml → contracts/src/maps/quest-map/quests/03c_GooHarvesting.yaml

@@ -5,5 +5,5 @@ spec:
   description: "This world was created from the gooey remains of the last. You need to learn how to extract this goo."
   tasks:
     - kind: construct
-      name: Construct a Red Goo Extractor. It works better on a tile with a high red goo-per-hour value.
+      name: Construct a Red Goo Extractor. It should work on any old tile these days.
       buildingKind: Red Goo Extractor

frontend/src/components/panels/tile-info-panel.tsx

@@ -11,11 +11,11 @@ import {
 } from '@app/../../core/src';
 import { PluginContent } from '@app/components/organisms/tile-action';
 import {
-    GOO_BIG_THRESH,
+    //GOO_BIG_THRESH,
     GOO_BLUE,
     GOO_GREEN,
     GOO_RED,
-    GOO_SMALL_THRESH,
+    //GOO_SMALL_THRESH,
     getCoords,
     getGooRates,
     getTileDistance,
@@ -288,20 +288,24 @@ const TileAvailable: FunctionComponent<TileAvailableProps> = ({ player, mobileUn
     const { q, r, s } = getCoords(lastTile);
     const gooRates = getGooRates(lastTile);
     // const topGooRate = gooRates.length > 0 ? Math.floor(gooRates[0].gooPerSec * 100) / 100 : 0;
-    const topGooWeight = gooRates.length > 0 ? gooRates[0].weight : 0;
-    const topGooName = gooRates.length > 0 ? gooRates[0].name : '';
-    const hasSomeGoo = topGooWeight >= GOO_SMALL_THRESH;
-    const hasLotsGoo = topGooWeight >= GOO_BIG_THRESH;
+    //const topGooWeight = gooRates.length > 0 ? gooRates[0].weight : 0;
+    //const topGooName = gooRates.length > 0 ? gooRates[0].name : '';
+    //const hasSomeGoo = topGooWeight >= GOO_SMALL_THRESH;
+    //const hasLotsGoo = topGooWeight >= GOO_BIG_THRESH;
     const gooRatesInNameOrder = [GOO_RED, GOO_GREEN, GOO_BLUE]
         .map((idx) => gooRates.find((goo) => goo.index === idx))
         .filter((goo) => !!goo);
 
-    const tileName = hasSomeGoo ? `${topGooName.toUpperCase()} GOO TILE` : `TILE`;
+    /*const tileName = hasSomeGoo ? `${topGooName.toUpperCase()} GOO TILE` : `TILE`;
     const tileDescription = hasLotsGoo
         ? `A tile rich in ${topGooName} goo! ${topGooName} goo extractors will be very effective here`
         : hasSomeGoo
         ? `The tile has some ${topGooName} goo, extractors that need ${topGooName} goo will work well here`
         : undefined;
+    */
+
+    const tileName = 'TILE';
+    const tileDescription = ' ';
 
     return (
         <StyledTileInfoPanel>