changes from Gumbo playtest

2 years ago · 386653963e
7 changed files with 2313 additions and 467 deletions
--- a/namedropper/Assets/Resources/categories.yaml
+++ b/namedropper/Assets/Resources/categories.yaml
@ -584,4 +584,197 @@ Topics:
    - Flubber
    - Jumanji
    - Hook
-    - Mork & Mindy
+    - Mork & Mindy
+- Topic: Animals
+  Categories:
+  - Category: Birds
+    Elements:
+    - Eagle
+    - Crow
+    - Parakeet
+    - Cormorant
+    - Kingfisher
+    - Lorikeet
+    - Spoonbill
+    - Puffin
+    - Potoo
+    - Albatross
+    - Grebe
+  - Category: Insects
+    Elements:
+    - Bee
+    - Ant
+    - Mantis
+    - Moth
+    - Cricket
+    - Beetle
+    - Weevil
+    - Land Lobster
+    - Katydid
+    - Cockroach
+  - Category: Arachnids
+    Elements:
+    - Scorpion
+    - Spider
+    - Tick
+    - Chigger
+    - Mite   
+  - Category: Marsupials
+    Elements:
+    - Opossum
+    - Koala
+    - Tasmanian Devil
+    - Quokka
+    - Kangaroo
+    - Dunnart
+    - Quoll
+    - Bilby
+    - Wombat
+  - Category: Mythical
+    Elements:
+    - Unicorn
+    - Pegasus
+    - Hydra
+    - Dragon
+    - Chimera
+    - Sphynx
+    - Mermaid
+    - Werewolf
+    - Centaur
+    - Troll
+    - Ogre
+    - Manticore
+    - Pixie
+  - Category: Mammals
+    Elements:
+    - Human
+    - Rat
+    - Cat
+    - Dog
+    - Horse
+    - Cow
+    - Deer
+    - Moose
+    - Bat
+    - Goat
+    - Sheep
+    - Bear
+    - Whale
+    - Dolphin
+  - Category: Reptiles
+    Elements:
+    - Lizard
+    - Turtle
+    - Alligator
+    - Iguana
+    - Gecko
+    - Crocodile
+    - Thorny Devil
+    - Skink
+  - Category: Dinosaurs
+    Elements:
+    - Tyrarnnosaurus Rex
+    - Brontasaurus
+    - Giganotosaurus
+    - Allosaurus
+    - Ankylosaurus
+    - Diplodocus
+    - Triceratops
+    - Troodon
+    - Gallimimus
+    - Coelophysis
+    - Compsognathus
+- Topic: Rivers
+  Categories:
+  - Category: Asia
+    Elements:
+    - Yangtze
+    - Yellow
+    - Mekong
+    - Tenisei
+    - Lena
+    - Ob
+    - Euphrates
+    - Ganges
+    - Shinano
+    - Red
+    - Salween
+    - Irrawaddy
+    - Brahmaputra
+    - Helmand
+    - Amu Darya
+    - Sir Darya
+  - Category: North America
+    Elements:
+    - Missouri
+    - Mississippi
+    - Yukon
+    - Rio Grande
+    - Hudson
+    - Columbia
+    - MacKenzie
+    - Colorado
+    - Ohio
+    - Arkansas
+    - Snake
+    - Yellowstone
+    - Potomac
+    - Allegheny
+  - Category: Africa
+    Elements:
+    - Nile
+    - Congo
+    - Zambezi
+    - Orange
+    - Kasai
+    - Ubangi
+    - Limpopo
+  - Category: South American
+    Elements:
+    - Amazon
+    - Paraná
+    - Araguaia
+    - Tocantins
+    - São Francisco
+    - Rio de la Plata
+    - Orinoco
+    - Purús
+    - Paraguay
+    - Japurá
+    - Juruá
+    - Madeira
+    - Mamoré
+  - Category: Australia
+    Elements:  
+    - Murray
+    - Murrumbidgee
+    - Darling
+    - Lachlan
+    - Warrego
+    - Cooper Creek
+    - Paroo
+  - Category: Europe
+    Elements:
+    - Volga
+    - Danube
+    - Thames
+    - Rhine
+    - Rhône
+    - Loire
+    - Severn
+    - Po
+    - Seine
+    - Vistula
+    - Tiber
+    - Ural
+  - Category: Antarctica
+    Elements:
+    - Onyx
+    - Adams Stream
+    - Aiken Creek
+    - Alph
+    - Lawson Creek
+    - Priscu Stream
+    - Rezovski Creek
+    - Surko Stream
+    - Jemmi Creek
--- a/namedropper/Assets/Resources/categories.yaml.bak
+++ b/namedropper/Assets/Resources/categories.yaml.bak
@ -124,19 +124,7 @@ Topics:
    - Xavier Thorpe
    - Gomez Addams
    - Pugsley Addams
-    - Larissa Weems   
-    Elements:
-    - Love On The Brain
-    - Consideration
-    - Umbrella
-    - Pon de Replay
-    - Bitch Better Have My Money
-    - Disturbia
-    - The Monster
-    - Diamonds
-    - Only Girl (In The World)
-    - Work
-    - S&M
+    - Larissa Weems
  - Category: House of Cards
    Elements:
    - Francis Underwood
@ -596,4 +584,123 @@ Topics:
    - Flubber
    - Jumanji
    - Hook
-    - Mork & Mindy
+    - Mork & Mindy
+- Topic: Animals
+  Categories:
+  - Category: Birds
+    Elements:
+    - Eagle
+    - Crow
+    - Parakeet
+    - Cormorant
+    - Kingfisher
+    - Lorikeet
+    - Spoonbill
+    - Puffin
+    - Potoo
+    - Albatross
+    - Grebe
+  - Category: Insects
+    Elements:
+    - Bee
+    - Ant
+    - Mantis
+    - Moth
+    - Cricket
+    - Beetle
+    - Weevil
+    - Land Lobster
+    - Katydid
+    - Cockroach
+  - Category: Arachnids
+    Elements:
+    - Scorpion
+    - Spider
+    - Tick
+    - Chigger
+    - Mite   
+  - Category: Marsupials
+    Elements:
+    - Opossum
+    - Koala
+    - Tasmanian Devil
+    - Quokka
+    - Kangaroo
+    - Dunnart
+    - Quoll
+    - Bilby
+    - Wombat
+  - Category: Mythical
+    Elements:
+    - Unicorn
+    - Pegasus
+    - Hydra
+    - Dragon
+    - Chimera
+    - Sphynx
+    - Mermaid
+    - Werewolf
+    - Centaur
+    - Troll
+    - Ogre
+    - Manticore
+    - Pixie
+  - Category: Mammals
+    Elements:
+    - Human
+    - Rat
+    - Cat
+    - Dog
+    - Horse
+    - Cow
+    - Deer
+    - Moose
+    - Bat
+    - Goat
+    - Sheep
+    - Bear
+    - Whale
+    - Dolphin
+  - Category: Reptiles
+    Elements:
+    - Lizard
+    - Turtle
+    - Alligator
+    - Iguana
+    - Gecko
+    - Crocodile
+    - Thorny Devil
+    - Skink
+  - Category: Dinosaurs
+    Elements:
+    - Tyrarnnosaurus Rex
+    - Brontasaurus
+    - Giganotosaurus
+    - Allosaurus
+    - Ankylosaurus
+    - Diplodocus
+    - Triceratops
+    - Troodon
+    - Gallimimus
+    - Coelophysis
+    - Compsognathus
+- Topic: Rivers
+  Categories:
+  - Category: Asia
+    Elements:
+    - Yangtze
+    - Yellow
+    - Mekong
+    - Tenisei
+    - Lena
+    - Ob
+    - Euphrates
+    - Ganges
+    - Shinano
+    - Red
+    - Salween
+    - Irrawaddy
+    - Brahmaputra
+    - Helmand
+    - Amu Darya
+    - Sir Darya
--- a/namedropper/Assets/Scenes/Game.unity
+++ b/namedropper/Assets/Scenes/Game.unity
@ -613,11 +613,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_RootOrder
-      value: 0
+      value: 2
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -646.9
+      value: -318.2
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.y
@ -731,11 +731,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_RootOrder
-      value: 0
+      value: 2
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -640.5
+      value: -507.9
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.y
@ -811,6 +811,8 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
+  - {fileID: 1973273086}
+  - {fileID: 1729924321}
  - {fileID: 1048268536}
  - {fileID: 1044471296}
  - {fileID: 1237273639}
@ -888,7 +890,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_RootOrder
-      value: 2
+      value: 4
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.x
@ -1083,6 +1085,170 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 9049015333349338420, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
  m_PrefabInstance: {fileID: 881809258}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &903959528
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 903959529}
+  - component: {fileID: 903959530}
+  m_Layer: 5
+  m_Name: BarLeft
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &903959529
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 903959528}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -940, y: 10.08606, z: 0}
+  m_LocalScale: {x: 1, y: 1.675, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1391939819}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &903959530
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 903959528}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 3
+  m_Sprite: {fileID: 21300000, guid: 7a4abc8a226b01547a6b0f0bef45e38d, type: 3}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 280, y: 967}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!1 &974885548
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 974885549}
+  - component: {fileID: 974885550}
+  m_Layer: 0
+  m_Name: BarRight
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &974885549
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 974885548}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 939.06, y: 10.08606, z: 0}
+  m_LocalScale: {x: 2, y: 1.675, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1146299635}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &974885550
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 974885548}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 3
+  m_Sprite: {fileID: 21300000, guid: 7a4abc8a226b01547a6b0f0bef45e38d, type: 3}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 280, y: 967}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1001 &994779494
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -1140,11 +1306,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_RootOrder
-      value: 4
+      value: 6
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 894
+      value: 610.1
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.y
@ -1333,7 +1499,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_RootOrder
-      value: 1
+      value: 3
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.x
@ -1447,7 +1613,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_RootOrder
-      value: 0
+      value: 2
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.x
@ -1557,11 +1723,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_RootOrder
-      value: 3
+      value: 5
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 517.8
+      value: 434.5
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.y
@ -1637,6 +1803,8 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
+  - {fileID: 1200810652}
+  - {fileID: 974885549}
  - {fileID: 340749598}
  - {fileID: 1680381205}
  - {fileID: 1546442640}
@ -1707,11 +1875,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_RootOrder
-      value: 3
+      value: 5
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 379
+      value: 302
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.y
@ -1760,6 +1928,88 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
  m_PrefabInstance: {fileID: 1152717269}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1200810651
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1200810652}
+  - component: {fileID: 1200810653}
+  m_Layer: 5
+  m_Name: BarLeft
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1200810652
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1200810651}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -798.47, y: 10.08606, z: 0}
+  m_LocalScale: {x: 1.3, y: 1.675, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1146299635}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &1200810653
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1200810651}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 3
+  m_Sprite: {fileID: 21300000, guid: 7a4abc8a226b01547a6b0f0bef45e38d, type: 3}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 280, y: 967}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1001 &1217437521
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -1817,11 +2067,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_RootOrder
-      value: 4
+      value: 6
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 894
+      value: 742.4
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.y
@ -2006,7 +2256,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_RootOrder
-      value: 2
+      value: 4
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.x
@ -2152,6 +2402,8 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
+  - {fileID: 903959529}
+  - {fileID: 1959472267}
  - {fileID: 543563573}
  - {fileID: 1597234415}
  - {fileID: 714773756}
@ -2490,11 +2742,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_RootOrder
-      value: 2
+      value: 4
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -150.6
+      value: -7.54
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.y
@ -2675,11 +2927,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_RootOrder
-      value: 1
+      value: 3
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -261.6
+      value: -190.4
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.y
@ -2958,7 +3210,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_RootOrder
-      value: 1
+      value: 3
      objectReference: {fileID: 0}
    - target: {fileID: 1499098757095760799, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3}
      propertyPath: m_LocalPosition.x
@ -3052,6 +3304,88 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1729924320
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1729924321}
+  - component: {fileID: 1729924322}
+  m_Layer: 0
+  m_Name: BarRight
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1729924321
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1729924320}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 939.06006, y: 10.08606, z: 0}
+  m_LocalScale: {x: -3.14, y: 1.675, z: 1}
+  m_Children: []
+  m_Father: {fileID: 554321083}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &1729924322
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1729924320}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 3
+  m_Sprite: {fileID: 21300000, guid: 7a4abc8a226b01547a6b0f0bef45e38d, type: 3}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 280, y: 967}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1001 &1747069998
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -3390,6 +3724,170 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1957998281}
  m_CullTransparentMesh: 1
+--- !u!1 &1959472266
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1959472267}
+  - component: {fileID: 1959472268}
+  m_Layer: 0
+  m_Name: BarRight
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1959472267
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1959472266}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 926, y: 10.08606, z: 0}
+  m_LocalScale: {x: 1, y: 1.675, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1391939819}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &1959472268
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1959472266}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 3
+  m_Sprite: {fileID: 21300000, guid: 7a4abc8a226b01547a6b0f0bef45e38d, type: 3}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 280, y: 967}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!1 &1973273085
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1973273086}
+  - component: {fileID: 1973273087}
+  m_Layer: 5
+  m_Name: 'BarLeft '
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1973273086
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1973273085}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -798.47, y: 10.08606, z: 0}
+  m_LocalScale: {x: 2.13, y: 1.675, z: 1}
+  m_Children: []
+  m_Father: {fileID: 554321083}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &1973273087
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1973273085}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 3
+  m_Sprite: {fileID: 21300000, guid: 7a4abc8a226b01547a6b0f0bef45e38d, type: 3}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 280, y: 967}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1001 &2050475643
 PrefabInstance:
  m_ObjectHideFlags: 0
--- a/namedropper/Assets/Scenes/Title.unity
+++ b/namedropper/Assets/Scenes/Title.unity
@ -380,7 +380,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_text: 'POPCAKES
+  m_text: 'POP * DROP

    by BumbleBear Games'
  m_isRightToLeft: 0
--- a/namedropper/Assets/Scenes/TopicSelect.unity
+++ b/namedropper/Assets/Scenes/TopicSelect.unity
--- a/namedropper/Assets/Scripts/Game.cs
+++ b/namedropper/Assets/Scripts/Game.cs
@ -23,11 +23,20 @@ public class Game : MonoBehaviour
    void Awake()
    {
        if (GameManager.Instance.Round == 1)
+        {
            CategoriesRound1.SetActive(true);
+            _seconds = 50;
+        }
        else if (GameManager.Instance.Round == 2)
+        {
            CategoriesRound2.SetActive(true);
+            _seconds = 60;
+        }
        else if (GameManager.Instance.Round == 3)
+        {
            CategoriesRound3.SetActive(true);
+            _seconds = 70;
+        }

        _originalFontSize = Timer.fontSize;
        _categories = FindObjectsOfType<Category>();
--- a/namedropper/Assets/Scripts/Wraparound.cs
+++ b/namedropper/Assets/Scripts/Wraparound.cs
@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.SceneManagement;

 public class Wraparound : MonoBehaviour
 {
@ -22,14 +23,62 @@ public class Wraparound : MonoBehaviour
            this.transform.position = new Vector3(transform.position.x, transform.position.y + SCREEN_HEIGHT, transform.position.z);
        }

-        if (this.transform.position.x < 0)
+
+        if (SceneManager.GetActiveScene().name == "TopicSelect")
+        {
+            if (this.transform.position.x < 0)
+            {
+                this.transform.position = new Vector3(transform.position.x + SCREEN_WIDTH, transform.position.y, transform.position.z);
+            }
+
+
+            if (this.transform.position.x > SCREEN_WIDTH)
+            {
+                this.transform.position = new Vector3(transform.position.x - SCREEN_WIDTH, transform.position.y, transform.position.z);
+            }
+
+            return;
+        }
+
+        //game scene
+        if (GameManager.Instance.Round == 3)
        {
-            this.transform.position = new Vector3(transform.position.x + SCREEN_WIDTH, transform.position.y, transform.position.z);
+            if (this.transform.localPosition.x < -782)
+            {
+                this.transform.localPosition = new Vector3(782, transform.localPosition.y, transform.localPosition.z);
+            }
+
+
+            if (this.transform.localPosition.x > 782)
+            {
+                this.transform.localPosition = new Vector3(-782, transform.localPosition.y, transform.localPosition.z);
+            }
        }
+        else if (GameManager.Instance.Round == 2)
+        {
+            if (this.transform.localPosition.x < -610)
+            {
+                this.transform.localPosition = new Vector3(655, transform.localPosition.y, transform.localPosition.z);
+            }
+

-        if (this.transform.position.x > SCREEN_WIDTH)
+            if (this.transform.localPosition.x > 655)
+            {
+                this.transform.localPosition = new Vector3(-610, transform.localPosition.y, transform.localPosition.z);
+            }
+        }
+        else if (GameManager.Instance.Round == 1)
        {
-            this.transform.position = new Vector3(transform.position.x - SCREEN_WIDTH, transform.position.y, transform.position.z);
+            if (this.transform.localPosition.x < -500)
+            {
+                this.transform.localPosition = new Vector3(500, transform.localPosition.y, transform.localPosition.z);
+            }
+
+            if (this.transform.localPosition.x > 500)
+            {
+                this.transform.localPosition = new Vector3(-500, transform.localPosition.y, transform.localPosition.z);
+            }
        }
+
    }
 }