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.

Sign up for GitHub

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

Datasets ops part 1 #1613

Merged
merged 5 commits into from
Dec 8, 2023
Merged

Datasets ops part 1 #1613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69e488d
big :trollface:
lzk228 Dec 6, 2023
e330ab1
Upsmol :trollface:#1
lzk228 Dec 6, 2023
baee6b2
smol :trollface: nimber 2
lzk228 Dec 6, 2023
f8542d4
very tiny :trollface:
lzk228 Dec 6, 2023
7cfa58f
test
lzk228 Dec 6, 2023
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
18 changes: 0 additions & 18 deletions Resources/Prototypes/Corvax/Datasets/Names/military.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
- type: dataset
id: NamesFirstMilitaryLeaderCorvax
values:
- Коммандер
- Полковник
- Подполковник
- Майор
- Лейтенант

- type: dataset
id: NamesFirstMilitaryCorvax
values:
- Прапорщик
- Старшина
- Сержант
- Капрал
- Ефрейтор

- type: dataset
id: NamesLastERTCallsign
values:
Expand Down
19 changes: 11 additions & 8 deletions Resources/Prototypes/Datasets/Names/military.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
- type: dataset
id: NamesFirstMilitaryLeader
values:
- Colonel
- Commander
- Lieutenant
- Major
- Коммандер
- Полковник
- Подполковник
- Майор
- Лейтенант

- type: dataset
id: NamesFirstMilitary
values:
- Corporal
- Sergeant
- Specialist

- Прапорщик
- Старшина
- Сержант
- Капрал
- Ефрейтор

26 changes: 13 additions & 13 deletions Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
- type: RandomMetadata
nameSegments:
- NamesFirstMilitaryLeader
- names_last
- names_last_male # Corvax-Localization
- type: RandomHumanoidSpawner
settings: DeathSquad

Expand All @@ -31,7 +31,7 @@
- type: RandomMetadata
nameSegments:
- NamesFirstMilitaryLeader
- names_last
- names_last_male # Corvax-Localization


## ERT Leader
Expand All @@ -46,7 +46,7 @@
state: ertleader
- type: RandomMetadata
nameSegments:
- NamesFirstMilitaryLeaderCorvax # Corvax-Localization
- NamesFirstMilitaryLeader
- NamesLastERTCallsign # Corvax-Localization
- type: RandomHumanoidSpawner
settings: ERTLeader
Expand All @@ -64,7 +64,7 @@
prototypes: [ ERTLeaderGear ]
- type: RandomMetadata
nameSegments:
- NamesFirstMilitaryLeaderCorvax # Corvax-Localization
- NamesFirstMilitaryLeader
- NamesLastERTCallsign # Corvax-Localization

- type: entity
Expand Down Expand Up @@ -124,7 +124,7 @@
state: ertjanitor
- type: RandomMetadata
nameSegments:
- NamesFirstMilitaryCorvax # Corvax-Localization
- NamesFirstMilitary
- NamesLastERTCallsign # Corvax-Localization
- type: RandomHumanoidSpawner
settings: ERTJanitor
Expand All @@ -140,7 +140,7 @@
- type: GhostTakeoverAvailable
- type: RandomMetadata
nameSegments:
- NamesFirstMilitaryCorvax # Corvax-Localization
- NamesFirstMilitary
- NamesLastERTCallsign # Corvax-Localization
- type: Loadout
prototypes: [ ERTJanitorGear ]
Expand Down Expand Up @@ -182,7 +182,7 @@
state: ertengineer
- type: RandomMetadata
nameSegments:
- NamesFirstMilitaryCorvax # Corvax-Localization
- NamesFirstMilitary
- NamesLastERTCallsign # Corvax-Localization
- type: RandomHumanoidSpawner
settings: ERTEngineer
Expand All @@ -198,7 +198,7 @@
- type: GhostTakeoverAvailable
- type: RandomMetadata
nameSegments:
- NamesFirstMilitaryCorvax # Corvax-Localization
- NamesFirstMilitary
- NamesLastERTCallsign # Corvax-Localization
- type: Loadout
prototypes: [ ERTEngineerGear ]
Expand Down Expand Up @@ -240,7 +240,7 @@
state: ertsecurity
- type: RandomMetadata
nameSegments:
- NamesFirstMilitaryCorvax # Corvax-Localization
- NamesFirstMilitary
- NamesLastERTCallsign # Corvax-Localization
- type: RandomHumanoidSpawner
settings: ERTSecurity
Expand All @@ -258,7 +258,7 @@
- type: GhostTakeoverAvailable
- type: RandomMetadata
nameSegments:
- NamesFirstMilitaryCorvax # Corvax-Localization
- NamesFirstMilitary
- NamesLastERTCallsign # Corvax-Localization
- type: Loadout
prototypes: [ ERTSecurityGear ]
Expand Down Expand Up @@ -320,7 +320,7 @@
state: ertmedical
- type: RandomMetadata
nameSegments:
- NamesFirstMilitaryCorvax # Corvax-Localization
- NamesFirstMilitary
- NamesLastERTCallsign # Corvax-Localization
- type: RandomHumanoidSpawner
settings: ERTMedical
Expand All @@ -336,7 +336,7 @@
- type: GhostTakeoverAvailable
- type: RandomMetadata
nameSegments:
- NamesFirstMilitaryCorvax # Corvax-Localization
- NamesFirstMilitary
- NamesLastERTCallsign # Corvax-Localization
- type: Loadout
prototypes: [ ERTMedicalGear ]
Expand Down Expand Up @@ -392,7 +392,7 @@
- type: GhostTakeoverAvailable
- type: RandomMetadata
nameSegments:
- NamesFirstMilitaryCorvax # Corvax-Localization
- NamesFirstMilitary
- NamesLastERTCallsign # Corvax-Localization
## Central Command

Expand Down