ECS verbs and update context menu (#4594)
* Functioning ECS verbs Currently only ID card console works. * Changed verb types and allow ID card insertions * Verb GUI sorting and verb networking * More networking, and shared components * Clientside verbs work now. * Verb enums changed to bitmask flags * Verb Categories redo * Fix range check * GasTank Verb * Remove unnecessary bodypart verb * Buckle Verb * buckle & unbuckle verbs * Updated range checks * Item cabinet verbs * Add range user override * construction verb * Chemistry machine verbs * Climb Verb * Generalise pulled entity verbs * ViewVariables Verb * rejuvenate, delete, sentient, control verbs * Outfit verb * inrangeunoccluded and tubedirection verbs * attach-to verbs * remove unused verbs and move VV * Rename DebugVerbSystem * Ghost role and pointing verbs * Remove global verbs * Allow verbs to raise events * Changing categories and simplifying debug verbs * Add rotate and flip verbs * fix rejuvenate test * redo context menu * new Add Gas debug verb * Add Set Temperature debug verb * Uncuff verb * Disposal unit verbs * Add pickup verb * lock/unlock verb * Remove verb type, add specific verb events * rename verb messages -> events * Context menu displays verbs by interaction type * Updated context menu HandleMove previously, checked if entities moved 1 tile from click location. Now checks if entities moved out of view. Now you can actually right-click interact with yourself while walking! * Misc Verb menu GUI changes * Fix non-human/ghost verbs * Update types and categories * Allow non-ghost/human to open context menu * configuration verb * tagger verb * Morgue Verbs * Medical Scanner Verbs * Fix solution refactor merge issues * Fix context menu in-view check * Remove prepare GUI * Redo verb restrictions * Fix context menu UI * Disposal Verbs * Spill verb * Light verb * Hand Held light verb * power cell verbs * storage verbs and adding names to insert/eject * Pulling verb * Close context menu on verb execution * Strip verb * AmmoBox verb * fix pull verb * gun barrel verbs revolver verb energy weapon verbs Bolt action verb * Magazine gun barrel verbs * Add charger verbs * PDA verbs * Transfer amount verb * Add reagent verb * make alt-click use ECS verbs * Delete old verb files * Magboot verb * finalising tweaks * context menu visibility changes * code cleanup * Update AdminAddReagentUI.cs * Remove HasFlag * Consistent verb keys * Remove Linq, add comment * Fix in-inventory check * Update GUI text alignment and padding * Added close-menu option * Changed some "interaction" verbs to "activation" * Remove verb keys, use sorted sets * fix master merge * update some verb text * Undo Changes Remove some new verbs that can be added later undid some .ftl bugfixes, can and should be done separately * fix merge * Undo file rename * fix merge * Misc Cleanup * remove contraction * Fix keybinding issue * fix comment * merge fix * fix merge * fix merge * fix merge * fix merge * fix open-close verbs * adjust uncuff verb * fix merge and undo the renaming of SharedPullableComponent to PullableComponent. I'm tired of all of those merge conflicts
This commit is contained in:
Leon Friedrich
GitHub
@@ -9,10 +9,6 @@ id-card-console-window-insert-button = Insert
|
||||
access-id-card-console-component-no-hands-error = You have no hands.
|
||||
access-id-card-console-component-cannot-let-go-error = You can't let go of the ID card!
|
||||
|
||||
## EjectPrivilegedIDVerb
|
||||
|
||||
access-eject-privileged-id-verb-get-data-text = Eject Privileged ID
|
||||
|
||||
## EjectTargetIDVert
|
||||
|
||||
access-eject-target-id-verb-get-data-text = Eject Target ID
|
||||
## For Verbs
|
||||
id-card-console-privileged-id = Privileged ID
|
||||
id-card-console-target-id = Target ID
|
||||
@@ -4,6 +4,3 @@ bodypart-component-no-way-to-install-message = You see no way to install the {$p
|
||||
bodypart-component-no-way-to-attach-message = You see no useful way to attach the {$partName} anymore.
|
||||
bodypart-component-attach-success-message = You attach {$partName}
|
||||
bodypart-component-attach-fail-message = You can't attach {$partName}
|
||||
|
||||
# AttachBodypartVerb
|
||||
attach-bodypart-verb-get-data-text = Attach Body Part
|
||||
@@ -6,6 +6,3 @@ buckle-component-cannot-buckle-message = You can't buckle yourself there!
|
||||
buckle-component-other-cannot-buckle-message = You can't buckle {$owner} there!
|
||||
buckle-component-cannot-fit-message = You can't fit there!
|
||||
buckle-component-other-cannot-fit-message = {$owner} can't fit there!
|
||||
|
||||
# BuckleVerb
|
||||
buckle-verb-unbuckle = Unbuckle
|
||||
@@ -1,4 +0,0 @@
|
||||
## StrapVerb
|
||||
|
||||
strap-verb-get-data-text-buckle = Buckle
|
||||
strap-verb-get-data-text-unbuckle = Unbuckle
|
||||
@@ -3,11 +3,3 @@
|
||||
## Displayed when the item is successfully taken out of the cabinet.
|
||||
|
||||
comp-item-cabinet-successfully-taken = You take { THE($item) } from { THE($cabinet) }.
|
||||
|
||||
## Displayed in the context menu for the item cabinet.
|
||||
|
||||
comp-item-cabinet-eject-verb-text = Eject item
|
||||
|
||||
comp-item-cabinet-open-verb-text = Open
|
||||
comp-item-cabinet-close-verb-text = Close
|
||||
|
||||
|
||||
@@ -29,6 +29,3 @@ chem-master-window-create-pill-button = Create
|
||||
chem-master-window-create-bottle-button = Create
|
||||
cham-master-window-bottles-label = Bottles:
|
||||
chem-master-window-unknown-reagent-text = Unknown reagent
|
||||
|
||||
## Eject beaker verb
|
||||
eject-beaker-verb-get-data-text = Eject Beaker
|
||||
@@ -9,10 +9,8 @@ comp-solution-transfer-is-empty = {THE($target)} is empty!
|
||||
comp-solution-transfer-is-full = {THE($target)} is full!
|
||||
|
||||
## Displayed in change transfer amount verb's name
|
||||
comp-solution-transfer-verb-transfer-amount-min = {$amount}u
|
||||
comp-solution-transfer-verb-transfer-amount-max = {$amount}u
|
||||
comp-solution-transfer-verb-transfer-amount-ideal = {$amount}u
|
||||
comp-solution-transfer-verb-transfer-amount-custom = Custom
|
||||
comp-solution-transfer-verb-custom-amount = Custom
|
||||
comp-solution-transfer-verb-amount = {$amount}u
|
||||
|
||||
## Displayed after you successfully change a solution's amount using the BUI
|
||||
comp-solution-transfer-set-amount = Transfer amount set to {$amount}u.
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
deconstructible-verb-get-data-text = Begin deconstructing
|
||||
deconstructible-verb-begin-deconstruct = Begin deconstructing
|
||||
deconstructible-verb-activate-no-target-text = There is no way to deconstruct this.
|
||||
deconstructible-verb-activate-text = Examine to see instructions.
|
||||
@@ -22,6 +22,4 @@ disposal-self-insert-verb-get-data-text = Jump inside
|
||||
|
||||
disposal-flush-verb-get-data-text = Flush
|
||||
|
||||
## EjectVerb
|
||||
|
||||
disposal-eject-verb-get-data-text = Eject
|
||||
disposal-eject-verb-contents = contents
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
## ExamineSystem
|
||||
|
||||
examine-system-entity-does-not-exist = That entity doesn't exist
|
||||
examine-system-entity-does-not-exist = That entity doesn't exist
|
||||
|
||||
examine-verb-name = Examine
|
||||
@@ -1 +0,0 @@
|
||||
examine-verb-name = Examine
|
||||
@@ -1,3 +1,7 @@
|
||||
## PickUpVerb
|
||||
|
||||
pick-up-verb-get-data-text = Pick Up
|
||||
pick-up-verb-get-data-text = Pick Up
|
||||
|
||||
# "pick up" doesn't make sense if the item is already in their inventory
|
||||
|
||||
pick-up-verb-get-data-text-inventory = Put in hand
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
expendable-light-start-verb = Start Light
|
||||
@@ -2,6 +2,3 @@ handheld-light-component-on-examine-is-on-message = The light is currently [colo
|
||||
handheld-light-component-on-examine-is-off-message = The light is currently [color=darkred]off[/color].
|
||||
handheld-light-component-cell-missing-message = Cell missing...
|
||||
handheld-light-component-cell-dead-message = Dead cell...
|
||||
|
||||
# ToggleLightVerb
|
||||
toggle-light-verb-get-data-text = Toggle light
|
||||
|
||||
@@ -5,11 +5,8 @@ medical-scanner-component-msg-soul-broken = ERROR: Soul present, but defunct / d
|
||||
|
||||
## EnterVerb
|
||||
|
||||
enter-verb-get-data-text = Enter
|
||||
|
||||
## EjectVerb
|
||||
|
||||
medical-scanner-eject-verb-get-data-text = Eject
|
||||
medical-scanner-verb-enter = Enter
|
||||
medical-scanner-verb-noun-occupant = occupant
|
||||
|
||||
## UI
|
||||
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
power-cell-slot-component-no-cell = No cell
|
||||
power-cell-slot-component-eject-cell = Eject cell
|
||||
power-cell-slot-component-small-size-shorthand = S
|
||||
power-cell-slot-component-medium-size-shorthand = M
|
||||
power-cell-slot-component-large-size-shorthand = L
|
||||
@@ -1,11 +1,3 @@
|
||||
power-receiver-component-on-examine-main = It appears to be {$stateText}.
|
||||
power-receiver-component-on-examine-powered = [color=darkgreen]powered[/color]
|
||||
power-receiver-component-on-examine-unpowered = [color=darkred]un-powered[/color]
|
||||
|
||||
## InsertVerb
|
||||
|
||||
insert-verb-get-data-text = Insert {$itemName}
|
||||
|
||||
## EjectVerb
|
||||
|
||||
eject-verb-get-data-text = Eject {$containerName}
|
||||
@@ -1,8 +1,7 @@
|
||||
entity-storage-component-welded-shut-message = It's welded completely shut!
|
||||
entity-storage-component-locked-message = It's Locked!
|
||||
entity-storage-component-already-contains-user-message = It's too Cramped!
|
||||
|
||||
## OpenToggleVerb
|
||||
|
||||
open-toggle-verb-close = Close
|
||||
open-toggle-verb-open = Open
|
||||
open-toggle-verb-welded-shut-message = {$verb} (welded shut)
|
||||
@@ -1,5 +0,0 @@
|
||||
|
||||
## ToggleOpenVerb
|
||||
|
||||
toggle-open-verb-open = Open
|
||||
toggle-open-verb-close = Close
|
||||
@@ -1,2 +1,23 @@
|
||||
verb-system-waiting-on-server-text = Waiting on Server...
|
||||
verb-system-no-verbs-text = No verbs!
|
||||
verb-system-no-verbs-text = No verbs!
|
||||
verb-system-null-server-response = Entity not in view. You should not see this.
|
||||
|
||||
|
||||
# if verbs have a range of targets (e.g., multiple ejectables) you can
|
||||
# usually just use Entity.Name. But it is a bit odd when targeting yourself
|
||||
verb-self-target-pronoun = Yourself
|
||||
|
||||
|
||||
# verb categories & common verbs. These appear across multiple systems, so they may as well go here.
|
||||
|
||||
verb-toggle-light = Toggle light
|
||||
|
||||
verb-categories-debug = Debug
|
||||
verb-categories-eject = Eject
|
||||
verb-categories-insert = Insert
|
||||
verb-categories-buckle = Buckle
|
||||
verb-categories-unbuckle = Unbuckle
|
||||
verb-categories-close = Close
|
||||
verb-categories-open = Open
|
||||
verb-categories-rotate = Rotate
|
||||
verb-categories-transfer = Set Transfer Amount
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
## EjectCellVerb
|
||||
|
||||
eject-cell-verb-get-data-text = Eject cell
|
||||
eject-cell-verb-get-data-text-no-cell = No cell
|
||||
@@ -13,7 +13,3 @@ server-magazine-barrel-component-interact-using-ammo-success = Ammo inserted
|
||||
server-magazine-barrel-component-interact-using-ammo-full = Chamber full
|
||||
server-magazine-barrel-component-on-examine = It uses [color=white]{$caliber}[/color] ammo.
|
||||
server-magazine-barrel-component-on-examine-magazine-type = It accepts [color=white]{$magazineType}[/color] magazines.
|
||||
|
||||
## EjectMagazineVerb
|
||||
|
||||
eject-magazine-verb-get-data-text = Eject magazine
|
||||
@@ -3,7 +3,9 @@
|
||||
id: dragshadow
|
||||
abstract: true
|
||||
components:
|
||||
- type: Sprite
|
||||
layers:
|
||||
- shader: unshaded
|
||||
- type: HideContextMenu
|
||||
- type: Tag
|
||||
tags:
|
||||
- HideContextMenu
|
||||
- type: Sprite
|
||||
layers:
|
||||
- shader: unshaded
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
name: pointing arrow
|
||||
id: pointingarrow
|
||||
components:
|
||||
- type: Tag
|
||||
tags:
|
||||
- HideContextMenu
|
||||
- type: Sprite
|
||||
netsync: false
|
||||
sprite: Interface/Misc/pointing.rsi
|
||||
@@ -13,4 +16,3 @@
|
||||
- type: Appearance
|
||||
visuals:
|
||||
- type: RoguePointingArrowVisualizer
|
||||
- type: HideContextMenu
|
||||
|
||||
@@ -137,7 +137,7 @@
|
||||
state_anchored: pipe-j1s
|
||||
state_broken: pipe-b
|
||||
- type: Flippable
|
||||
entity: DisposalRouterFlipped
|
||||
mirrorEntity: DisposalRouterFlipped
|
||||
- type: UserInterface
|
||||
interfaces:
|
||||
- key: enum.DisposalRouterUiKey.Key
|
||||
@@ -170,7 +170,7 @@
|
||||
state_anchored: pipe-j2s
|
||||
state_broken: pipe-b
|
||||
- type: Flippable
|
||||
entity: DisposalRouter
|
||||
mirrorEntity: DisposalRouter
|
||||
- type: Physics
|
||||
fixtures:
|
||||
- shape:
|
||||
@@ -200,7 +200,7 @@
|
||||
state_anchored: pipe-j1
|
||||
state_broken: pipe-b
|
||||
- type: Flippable
|
||||
entity: DisposalJunctionFlipped
|
||||
mirrorEntity: DisposalJunctionFlipped
|
||||
- type: Physics
|
||||
fixtures:
|
||||
- shape:
|
||||
@@ -229,7 +229,7 @@
|
||||
state_anchored: pipe-j2
|
||||
state_broken: pipe-b
|
||||
- type: Flippable
|
||||
entity: DisposalJunction
|
||||
mirrorEntity: DisposalJunction
|
||||
- type: Physics
|
||||
fixtures:
|
||||
- shape:
|
||||
|
||||
@@ -40,8 +40,10 @@
|
||||
name: low wall overlay
|
||||
abstract: true
|
||||
components:
|
||||
- type: Tag
|
||||
tags:
|
||||
- HideContextMenu
|
||||
- type: Sprite
|
||||
color: "#889192"
|
||||
drawdepth: WallMountedItems
|
||||
sprite: Structures/Walls/low_wall.rsi
|
||||
- type: HideContextMenu
|
||||
|
||||
@@ -210,3 +210,6 @@
|
||||
|
||||
- type: Tag
|
||||
id: EmitterBolt
|
||||
|
||||
- type: Tag
|
||||
id: HideContextMenu
|
||||
|
||||
@@ -162,6 +162,7 @@ binds:
|
||||
type: State
|
||||
key: MouseRight
|
||||
canFocus: true
|
||||
priority: -1 # UIRightClick & EditorCancelPlace should fire first.
|
||||
- function: OpenCraftingMenu
|
||||
type: State
|
||||
key: G
|
||||
|
||||
Reference in New Issue
Block a user