Skip to content
This repository has been archived by the owner on Jun 28, 2024. It is now read-only.

Commit

Permalink
Fix: 13lackHawk prototypes
Browse files Browse the repository at this point in the history
  • Loading branch information
13lackHawk committed May 28, 2024
1 parent f8f0331 commit ae77972
Show file tree
Hide file tree
Showing 3 changed files with 196 additions and 196 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public override void Update(float frameTime)
}

UpdateUiState(uid);
// _userInterfaceSystem.TrySendUiMessage(uid, PlantExtractorUiKey.Key, new PlantExtractorWorkCompletedMessage()); //A-13 disable
_userInterfaceSystem.ServerSendUiMessage(uid, PlantExtractorUiKey.Key, new PlantExtractorWorkCompletedMessage());
}
}

Expand Down Expand Up @@ -140,7 +140,7 @@ private void UpdateUiState(EntityUid uid)
canExtract,
GetNetEntityArray(inputContainer.ContainedEntities.ToArray()));

// _userInterfaceSystem.TrySetUiState(uid, PlantExtractorUiKey.Key, state); //A-13 disable
_userInterfaceSystem.SetUiState(uid, PlantExtractorUiKey.Key, state);
}
#endregion

Expand Down Expand Up @@ -328,7 +328,7 @@ private void DoWork(EntityUid uid, PlantExtractorComponent component)
active.EndTime = _timing.CurTime + component.WorkTime * component.WorkTimeMultiplier;

component.AudioStream = _audioSystem.PlayPvs(component.ExtractSound, uid, AudioParams.Default.WithPitchScale(1 / component.WorkTimeMultiplier)).Value.Entity;
// _userInterfaceSystem.TrySendUiMessage(uid, PlantExtractorUiKey.Key, new PlantExtractorWorkStartedMessage()); //A-13 disable
_userInterfaceSystem.ServerSendUiMessage(uid, PlantExtractorUiKey.Key, new PlantExtractorWorkStartedMessage()); //A-13 disable
}
#endregion

Expand Down
220 changes: 110 additions & 110 deletions Resources/Prototypes/Andromeda/Entities/Mobs/NPCs/mousi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,113 +78,113 @@
strippingWindowPos: 2,4
displayName: ID

#- type: entity
# name: Мауси
# id: MobMousi
# parent: SimpleMobBase
# description: Пиип?...
# components:
# - type: NameIdentifier
# - type: Stripping
# - type: Strippable
# - type: CombatMode
# - type: Inventory
# templateId: mousi
# speciesId: mousi
# - type: InventorySlots
# - type: NpcFactionMember
# factions:
# - Mouse
# - type: Deathgasp
# - type: MobStateActions
# actions:
# Critical:
# - ActionCritSuccumb
# - ActionCritFakeDeath
# - ActionCritLastWords
# - type: Respirator
# damage:
# types:
# Asphyxiation: 0.25
# damageRecovery:
# types:
# Asphyxiation: -0.25
# - type: Hunger
# baseDecayRate: 0.1
# - type: Fixtures
# fixtures:
# fix1:
# shape:
# !type:PhysShapeCircle
# radius: 0.40
# density: 80
# mask:
# - MobMask
# layer:
# - MobLayer
# - type: UserInterface
# interfaces:
# - key: enum.StrippingUiKey.Key
# type: StrippableBoundUserInterface
# - type: InteractionPopup
# successChance: 0.8
# interactSuccessString: hugging-success-generic-mousi
# interactFailureString: hugging-failure-generic-mousi
# messagePerceivedByOthers: hugging-success-generic-mousi-others
# interactSuccessSpawn: EffectHearts
# interactSuccessSound: /Audio/Animals/fox_squeak.ogg
# interactFailureSound: /Audio/Effects/thudswoosh.ogg
# - type: Sprite
# drawdepth: Mobs
# sprite: Andromeda/Mobs/Animals/mousi.rsi
# layers:
# - map: [ "enum.DamageStateVisualLayers.Base" ]
# state: running
# - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
# state: running-unshaded
# shader: unshaded
# - type: DamageStateVisuals
# rotate: true
# states:
# Alive:
# Base: running
# Critical:
# Base: crit
# Dead:
# Base: dead
# - type: MobThresholds
# thresholds:
# 0: Alive
# 100: Critical
# 200: Dead
# - type: Stamina
# critThreshold: 100
# - type: Bloodstream
# bloodMaxVolume: 250
# - type: Hands
# - type: Speech
# speechSounds: Squeak
# speechVerb: SmallMob
# - type: Body
# prototype: Mousi
# requiredLegs: 1
# - type: Butcherable
# butcheringType: Spike
# spawned:
# - id: FoodMeat
# amount: 5
# - type: Puller
# needsHands: false
# - type: Vocal
# sounds:
# Male: Mouse
# Female: Mouse
# Unsexed: Mouse
# #- type: TTS
# # voice: mana
# - type: GhostRole
# allowMovement: true
# allowSpeech: true
# name: Мауси
# description: Вы большая, человекоподобная мышь. Скуик!
# - type: GhostTakeoverAvailable
- type: entity
name: Мауси
id: MobMousi
parent: SimpleMobBase
description: Пиип?...
components:
- type: NameIdentifier
- type: Stripping
- type: Strippable
- type: CombatMode
- type: Inventory
templateId: mousi
speciesId: mousi
- type: InventorySlots
- type: NpcFactionMember
factions:
- Mouse
- type: Deathgasp
- type: MobStateActions
actions:
Critical:
- ActionCritSuccumb
- ActionCritFakeDeath
- ActionCritLastWords
- type: Respirator
damage:
types:
Asphyxiation: 0.25
damageRecovery:
types:
Asphyxiation: -0.25
- type: Hunger
baseDecayRate: 0.1
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.40
density: 80
mask:
- MobMask
layer:
- MobLayer
- type: UserInterface
interfaces:
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
- type: InteractionPopup
successChance: 0.8
interactSuccessString: hugging-success-generic-mousi
interactFailureString: hugging-failure-generic-mousi
messagePerceivedByOthers: hugging-success-generic-mousi-others
interactSuccessSpawn: EffectHearts
interactSuccessSound: /Audio/Animals/fox_squeak.ogg
interactFailureSound: /Audio/Effects/thudswoosh.ogg
- type: Sprite
drawdepth: Mobs
sprite: Andromeda/Mobs/Animals/mousi.rsi
layers:
- map: [ "enum.DamageStateVisualLayers.Base" ]
state: running
- map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
state: running-unshaded
shader: unshaded
- type: DamageStateVisuals
rotate: true
states:
Alive:
Base: running
Critical:
Base: crit
Dead:
Base: dead
- type: MobThresholds
thresholds:
0: Alive
100: Critical
200: Dead
- type: Stamina
critThreshold: 100
- type: Bloodstream
bloodMaxVolume: 250
- type: Hands
- type: Speech
speechSounds: Squeak
speechVerb: SmallMob
- type: Body
prototype: Mousi
requiredLegs: 1
- type: Butcherable
butcheringType: Spike
spawned:
- id: FoodMeat
amount: 5
- type: Puller
needsHands: false
- type: Vocal
sounds:
Male: Mouse
Female: Mouse
Unsexed: Mouse
- type: TTS
voice: mana
- type: GhostRole
allowMovement: true
allowSpeech: true
name: Мауси
description: Вы большая, человекоподобная мышь. Скуик!
- type: GhostTakeoverAvailable
Loading

0 comments on commit ae77972

Please sign in to comment.