Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

машины для ивента #516

Merged
merged 4 commits into from
Mar 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Resources/Audio/ADT/Rimworld/rimworld_tribal.ogg
Binary file not shown.
8 changes: 8 additions & 0 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1514,6 +1514,14 @@ Entries:
id: 55711 #костыль отображения в Обновлениях
time: '2024-03-21T08:20:00.0000000+00:00'

- author: Пётр Игнатьевич
changes:
- {message: "Добавлен крафт костра", type: Add}
- {message: "Добавлены плавильни и печки, которые являются аналогами обычных машин, но работают без электричества", type: Add}
- {message: "Добавлен контент для ивента", type: Add}
id: 55713 #костыль отображения в Обновлениях
time: '2024-03-23T08:20:00.0000000+00:00'

- author: Котя
changes:
- {message: "Добавлено жало трансформации генокраду.", type: Add}
Expand Down
40 changes: 40 additions & 0 deletions Resources/Locale/ru-RU/ADT/other.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,42 @@
gun-was-personalized = Оружие персонализировано!
gun-personalize-verb = Персонализировать оружие

ent-ADTBoxMRERimworld = сухой паек
.desc = Питательный сухой паек, нередко встречающийся в пограничных мирах.
.suffix = { "Колонизация" }

ent-ADTMobWildPig = кабан
.desc = Дикая версия обычной домашней свиньи. В отличие от неё - быстрее, крепче и агрессивнее. И никогда давайте ему кличку Джерело.
.suffix = { "Колонизация" }

ent-ADTFurnance = плавильная печь
.desc = Простейшая печь, сложенная из камня. Позволяет сделать из руды готовый материал, пусть и не так эффективно, как переработчик в карго.
.suffix = { "Колонизация" }

ent-ADTFurnanceMachineCircuitboard = плавильная печь (машинная плата)
.desc = Простейшая печь, сложенная из камня. Позволяет сделать из руды готовый материал, пусть и не так эффективно, как переработчик в карго.
.suffix = { "Колонизация" }

ent-ADTWaterWell = колодец
.desc = Источник пригодной для питья воды.
.suffix = { "Колонизация" }

ent-ADTFoodFurnance = твердотопливная плита
.desc = Кулинарный пост твоей бабушки.
.suffix = { "Колонизация" }

ent-ADTFoodFurnanceMachineCircuitboard = твердотопливная плита (машинная плата)
.desc = Кулинарный пост твоей бабушки.
.suffix = { "Колонизация" }

ent-ADTForerunnersSphere = неизвестная сфера
.desc = Витающая в воздухе сфера неизвестного происхождения. Излучает странную энергию.
.suffix = { "Колонизация" }

ent-ADTForerunnersComputer = неизвестная консоль
.desc = Предмет, похожий на компьютер или рабочий стол. Но вы не знаете точно, как им пользоваться, и что написано на подобии экрана.
.suffix = { "Колонизация" }

ent-ADTForerunnersDoor = неизвестная дверь
.desc = Крайне крепкая дверь, созданная древней цивилизацией.
.suffix = { "Колонизация" }
25 changes: 25 additions & 0 deletions Resources/Prototypes/ADT/Catalog/Fills/Boxes/food_packs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,28 @@
contents:
- id: ADTFoodCinnamon
amount: 5

#сухой паек римворлд

- type: entity
name: M.R.E.
parent: BoxCardboard
id: ADTBoxMRERimworld
description: A box of decades old military surplus rations. It is surprisingly not rotten.
components:
- type: Storage
maxItemSize: Normal
grid:
- 0,0,5,1
- type: StorageFill
contents:
- id: FoodTinMRE
- id: FoodTinPeaches
- id: FoodSnackMREBrownie
- id: FoodTinBeans
- id: ADTMVitaminCanister
- id: DrinkWaterBottleFull
- id: MaterialCloth
- type: Sprite
sprite: ADT/Objects/Storage/rimworld_mre.rsi
state: icon
46 changes: 46 additions & 0 deletions Resources/Prototypes/ADT/Entities/Mobs/wild_animals.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
- type: entity
name: wild pig
parent: MobPig
id: ADTMobWildPig
description: Oink.
components:
- type: Sprite
drawdepth: Mobs
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: pig
sprite: ADT/Mobs/Animals/wild_pig.rsi
- type: Butcherable
spawned:
- id: FoodMeatBacon
amount: 3
- id: FoodMeat
amount: 3
- type: SentienceTarget
flavorKind: station-event-random-sentience-flavor-organic
- type: CanHostGuardian
- type: NPCRetaliation
attackMemoryLength: 10
- type: FactionException
- type: NpcFactionMember
factions:
- Passive
- type: HTN
rootTask:
task: SimpleHostileCompound
- type: MobThresholds
thresholds:
0: Alive
150: Dead
- type: MeleeWeapon
soundHit:
path: /Audio/Weapons/Xeno/alien_claw_flesh2.ogg
angle: 100
attackRate: 1.1
animation: WeaponArcFist
damage:
types:
Blunt: 15
- type: MovementSpeedModifier
baseWalkSpeed : 3.5
baseSprintSpeed : 4.8
Original file line number Diff line number Diff line change
@@ -0,0 +1,248 @@
- type: entity
parent: OreProcessor
id: ADTFurnance
name: Furnance
description: Furnance
components:
- type: Sprite
sprite: ADT/Structures/Machines/furnance.rsi
layers:
- state: icon
map: ["enum.LatheVisualLayers.IsRunning"]
- state: icon
shader: unshaded
map: ["enum.PowerDeviceVisualLayers.Powered"]
- state: icon
map: ["enum.MaterialStorageVisualLayers.Inserting"]
- state: icon
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: Machine
board: ADTFurnanceMachineCircuitboard
- type: Lathe
idleState: icon
runningState: icon
materialUseMultiplier: 1.25
timeMultiplier: 2.0
staticRecipes:
- SheetSteel30
- SheetGlass30
- SheetRGlass30
- SheetPlasma30
- SheetPGlass30
- SheetRPGlass30
- SheetPlasteel30
- SheetUranium30
- SheetUGlass30
- SheetRUGlass30
- IngotGold30
- IngotSilver30
- MaterialBananium10
- type: ApcPowerReceiver
needsPower: false
powerLoad: 0

- type: entity
parent: BaseMachineCircuitboard
id: ADTFurnanceMachineCircuitboard
name: ore furnance machine board
components:
- type: Sprite
state: supply
- type: MachineBoard
prototype: ADTFurnance
requirements:
MatterBin: 1
Manipulator: 3
materialRequirements:
Glass: 1

- type: entity
name: water well
id: ADTWaterWell
parent: SinkEmpty
suffix: Water
components:
- type: SolutionContainerManager
solutions:
drainBuffer:
maxVol: 200
tank:
reagents:
- ReagentId: Water
Quantity: 2000
- type: SolutionRegeneration
solution: tank
generated:
reagents:
- ReagentId: Water
Quantity: 10
- type: Sprite
sprite: ADT/Structures/Machines/water_well.rsi
layers:
- state: icon
- map: [ "enum.SolutionContainerLayers.Fill" ]
state: icon
visible: false

- type: entity
id: ADTFoodFurnance
parent: KitchenMicrowave
name: Food Furnance
description: It's magic.
components:
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.4,-0.4,0.4,0.4"
density: 190
mask:
- MachineMask
layer:
- MachineLayer
- type: Sprite
sprite: ADT/Structures/Machines/food_furnance.rsi
- type: ApcPowerReceiver
needsPower: false
powerLoad: 0
- type: Machine
board: ADTFoodFurnanceMachineCircuitboard

- type: entity
parent: BaseMachineCircuitboard
id: ADTFoodFurnanceMachineCircuitboard
name: food furnance machine board
components:
- type: Sprite
state: supply
- type: MachineBoard
prototype: ADTFoodFurnance
requirements:
MatterBin: 1
Manipulator: 3
materialRequirements:
Glass: 1

- type: entity
id: ADTForerunnersSphere
name: Forerunners Sphere
description: Forerunners Sphere
placement:
mode: SnapgridCenter
components:
- type: SpriteFade
- type: Clickable
- type: Sprite
sprite: ADT/Objects/Decoration/forerunners_sphere.rsi
drawdepth: Overdoors
state: icon
- type: Physics
bodyType: Static
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.5,0,0.5,-0.5"
density: 1000
layer:
- WallLayer
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 5000
behaviors:
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel:
min: 10
max: 20
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metal_break1.ogg
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: PointLight
radius: 4.8
energy: 2.6
color: "#28b85f"

- type: entity
id: ADTForerunnersComputer
name: Forerunners Computer
description: Forerunners Computer
placement:
mode: SnapgridCenter
components:
- type: SpriteFade
- type: Clickable
- type: Sprite
sprite: ADT/Objects/Decoration/forerunners_computer.rsi
drawdepth: Overdoors
state: icon
- type: Physics
bodyType: Static
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.35,-0.35,0.35,0.35"
density: 1000
layer:
- WallLayer
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 5000
behaviors:
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel:
min: 10
max: 20
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/metal_break1.ogg
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: PointLight
radius: 2.8
energy: 1.6
color: "#28b85f"

- type: entity
id: ADTForerunnersDoor
name: forerunners door
parent: BaseMaterialDoorNavMap
description: A door, where will it lead?
components:
- type: Sprite
sprite: ADT/Structures/Doors/forerunners_door.rsi
layers:
- state: closed
map: ["enum.DoorVisualLayers.Base"]
- type: Damageable
damageContainer: Inorganic
damageModifierSet: StrongMetallic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 800
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- type: PointLight
radius: 2.8
energy: 1.6
color: "#28b85f"
Loading
Loading