Add UI for setting solution transfer amount (#4074)

* basic eui and window * finish EUI, update defaults * unnecessary usings * convert to bounduserinterface * merge me up merge me up inside * Fix repeated define for component in prototype * impl swept UI suggestion * apply discord reviews * small changes
2021-07-25 00:53:53 -07:00
parent 8b6fa75e0e
commit d27164528e
21 changed files with 393 additions and 29 deletions
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -14,7 +14,7 @@
  - type: SolutionContainer
    maxVol: 10
  - type: SolutionTransfer
-    transferAmount: 5
+    maxTransferAmount: 10
  - type: Sprite
    netsync: false
    sprite: Objects/Consumable/Food/condiments.rsi
@@ -313,7 +313,7 @@
  - type: SolutionContainer
    maxVol: 30
  - type: SolutionTransfer
-    transferAmount: 5
+    maxTransferAmount: 30
  - type: Sprite
    netsync: false
    sprite: Objects/Consumable/Food/condiments.rsi
@@ -448,7 +448,7 @@
  - type: SolutionContainer
    maxVol: 15
  - type: SolutionTransfer
-    transferAmount: 5
+    maxTransferAmount: 15
  - type: Sprite
    netsync: false
    sprite: Objects/Consumable/Food/condiments.rsi
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -27,7 +27,6 @@
  - type: SolutionContainer
    maxVol: 50
  - type: SolutionTransfer
-    transferAmount: 5
  - type: Drink
    openSounds: packetOpenSounds
    useSound: /Audio/Items/eating_1.ogg
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
@@ -9,11 +9,15 @@
  - type: SolutionContainer
    maxVol: 50
  - type: SolutionTransfer
-    transferAmount: 5
+    canChangeTransferAmount: true
  - type: Drink
  - type: Sprite
    state: icon
  - type: Spillable
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface

 - type: entity
  parent: DrinkBase
@@ -56,8 +60,12 @@
  - type: SolutionContainer
    maxVol: 50
  - type: SolutionTransfer
-    transferAmount: 5
+    canChangeTransferAmount: true
  - type: TransformableContainer
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface

 - type: entity
  parent: DrinkGlassBase
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
@@ -8,7 +8,11 @@
  - type: SolutionContainer
    maxVol: 100
  - type: SolutionTransfer
-    transferAmount: 5
+    canChangeTransferAmount: true
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
  - type: Sprite
    state: icon
  - type: DamageOnLand
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
@@ -14,7 +14,12 @@
      - ReagentId: Cola
        Quantity: 20
  - type: SolutionTransfer
-    transferAmount: 5
+    canChangeTransferAmount: true
+    maxTransferAmount: 10
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
  - type: Sprite
    state: icon

--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml
@@ -8,7 +8,12 @@
  - type: SolutionContainer
    maxVol: 20
  - type: SolutionTransfer
-    transferAmount: 5
+    canChangeTransferAmount: true
+    maxTransferAmount: 10
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
  - type: Drink
    isOpen: true
  - type: Sprite
--- a/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml
@@ -9,14 +9,19 @@
  - type: LoopingSound
  - type: Sprite
    state: icon
-
  - type: SolutionContainer
    maxVol: 10
  - type: SolutionTransfer
-    transferAmount: 5
+    canChangeTransferAmount: true
+    maxTransferAmount: 5
  - type: Drink
    isOpen: true
  - type: Spillable
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
+


 # Containers
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -18,7 +18,6 @@
    maxVol: 100
    caps: Refillable, Drainable
  - type: SolutionTransfer
-    transferAmount: 5.0
  - type: Spillable
  - type: ItemCooldown
  - type: Spray
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -18,7 +18,12 @@
    maxVol: 30
    caps: OpenContainer
  - type: SolutionTransfer
-    transferAmount: 5
+    maxTransferAmount: 30
+    canChangeTransferAmount: true
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
  - type: Item
    sprite: Objects/Specific/Chemistry/beaker.rsi
  - type: Spillable
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -12,7 +12,7 @@
    netsync: false
    layers:
      - state: beaker
-      - state: beaker1  
+      - state: beaker1
        map: ["enum.SolutionContainerLayers.Fill"]
        visible: false
  - type: Item
@@ -21,7 +21,11 @@
    maxVol: 50
    caps: OpenContainer, FitsInDispenser # can add and remove solutions and fits in the chemmaster.
  - type: SolutionTransfer
-    transferAmount: 5.0
+    canChangeTransferAmount: true
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
  - type: Spillable
  - type: Drink
    isOpen: true
@@ -62,7 +66,7 @@
    sprite: Objects/Specific/Chemistry/beaker_large.rsi
    layers:
      - state: beakerlarge
-      - state: beakerlarge1  
+      - state: beakerlarge1
        map: ["enum.SolutionContainerLayers.Fill"]
        visible: false
  - type: Item
@@ -120,7 +124,14 @@
    caps: OpenContainer
    maxVol: 5
  - type: SolutionTransfer
-    transferAmount: 5.0
+    minTransferAmount: 1
+    transferAmount: 1
+    maxTransferAmount: 5
+    canChangeTransferAmount: true
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
  - type: Spillable
  - type: Item
    sprite: Objects/Specific/Chemistry/dropper.rsi
@@ -140,7 +151,7 @@
    sprite: Objects/Specific/Chemistry/syringe.rsi
    netsync: false
    layers:
-      - state: syringe1  
+      - state: syringe1
        map: ["enum.SolutionContainerLayers.Fill"]
        visible: false
      - state: syringe_base0
@@ -155,7 +166,7 @@
  - type: Appearance
    visuals:
      # this visualizer used for reagent inside
-    - type: SolutionContainerVisualizer 
+    - type: SolutionContainerVisualizer
      maxFillLevels: 4
      fillBaseName: syringe
      # this one for syrigine itself (plunger)
--- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
@@ -20,6 +20,13 @@
    maxVol: 500
  - type: SolutionTransfer
    transferAmount: 50
+    maxTransferAmount: 100
+    minTransferAmount: 10
+    canChangeTransferAmount: true
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
  - type: Physics
    bodyType: Dynamic
    fixtures:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -101,3 +101,4 @@
    maxVol: 15
    caps: Refillable, Drainable
  - type: SolutionTransfer
+    maxTransferAmount: 15
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -27,6 +27,7 @@
    caps: Refillable
    maxVol: 5
  - type: SolutionTransfer
+    maxTransferAmount: 5

 - type: MeleeWeaponAnimation
  id: spear