From 9011aab26b034fd32a92ab188710eb25b60258e2 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sun, 28 Jul 2024 18:22:50 +0300 Subject: [PATCH] Add 3 roles (without gameplay, alas) (#356) * add role icons * add roles prototype * Update job.yml --- Resources/Locale/en-US/_CP14/job/job.ftl | 13 ++++++- Resources/Locale/ru-RU/_CP14/job/job.ftl | 13 ++++++- .../_CP14/Loadouts/role_loadouts.yml | 36 ++++++++++++++++++ .../Roles/Jobs/Command/guard_commander.yml | 16 ++++++++ .../_CP14/Roles/Jobs/Command/house_keeper.yml | 16 ++++++++ .../_CP14/Roles/Jobs/Mercenary/innkeeper.yml | 13 +++++++ .../_CP14/Roles/Jobs/departments.yml | 3 ++ .../_CP14/Roles/play_time_tracker.yml | 11 +++++- .../Prototypes/_CP14/StatusEffects/job.yml | 23 ++++++++++- .../Misc/job_icons.rsi/Alchemist.png | Bin 202 -> 223 bytes .../Interface/Misc/job_icons.rsi/Captain.png | Bin 244 -> 245 bytes .../Misc/job_icons.rsi/GuardCommander.png | Bin 0 -> 228 bytes .../Misc/job_icons.rsi/HouseKeeper.png | Bin 0 -> 204 bytes .../Misc/job_icons.rsi/Innkeeper.png | Bin 0 -> 223 bytes .../Interface/Misc/job_icons.rsi/meta.json | 9 +++++ 15 files changed, 147 insertions(+), 6 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Roles/Jobs/Command/guard_commander.yml create mode 100644 Resources/Prototypes/_CP14/Roles/Jobs/Command/house_keeper.yml create mode 100644 Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/innkeeper.yml create mode 100644 Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/GuardCommander.png create mode 100644 Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/HouseKeeper.png create mode 100644 Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Innkeeper.png diff --git a/Resources/Locale/en-US/_CP14/job/job.ftl b/Resources/Locale/en-US/_CP14/job/job.ftl index b0d62d2350..16ab3195ae 100644 --- a/Resources/Locale/en-US/_CP14/job/job.ftl +++ b/Resources/Locale/en-US/_CP14/job/job.ftl @@ -1,8 +1,17 @@ cp14-job-name-captain = Expedition captain cp14-job-desc-captain = You are the most important person in this expedition. Organize its participants and manage the processes to complete the task set from the management. +cp14-job-name-guard-commander = Guard commander +cp14-job-desc-guard-commander = The most dangerous person on this expedition. Manage a squad of soldiers to ensure the safety of all members of the command. + +cp14-job-name-house-keeper = Housekeeper +cp14-job-desc-house-keeper = Responsible for material resources. Manage the expedition's supplies and finances, directing resources to the mercenaries who do all the dirty work. + cp14-job-name-adventurer = Adventurer -cp14-job-desc-adventurer = A hunter of thrills, riches and fame, constantly risking his life. Search for valuables in dangerous places and sell them to the settlement. +cp14-job-desc-adventurer = A hunter for thrills, riches and fame, constantly risking his life. Fulfill the most dangerous orders of the expedition organizers, earning a living by mining resources or killing monsters. cp14-job-name-alchemist = Alchemist -cp14-job-desc-alchemist = A scientist of sorts, exploring the nature of substances. Create poisons and medicines from numerous natural plants and ingredients and sell them to the settlement. \ No newline at end of file +cp14-job-desc-alchemist = A scientist of sorts, exploring the nature of substances. Create poisons and medicines from numerous natural plants and ingredients and earn money by selling them to people in need. + +cp14-job-name-innkeeper = Innkeeper +cp14-job-desc-innkeeper = Anywhere in Eberron there will be people looking to drink and relax. And you can capitalize on that desire! Find a way to provide people with good rest, food and drink. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/job/job.ftl b/Resources/Locale/ru-RU/_CP14/job/job.ftl index 3bdaf9d784..e1c8b12e4a 100644 --- a/Resources/Locale/ru-RU/_CP14/job/job.ftl +++ b/Resources/Locale/ru-RU/_CP14/job/job.ftl @@ -1,8 +1,17 @@ cp14-job-name-captain = Капитан экспедиции cp14-job-desc-captain = Вы - самая важная персона в этой экспедиции. Организуйте ее участников и руководите процессами, чтобы выполнить поставленную от руководства задачу. +cp14-job-name-guard-commander = Командир стражи +cp14-job-desc-guard-commander = Самая опасная личность на этой экспедиции. Управляйте отрядом солдат, чтобы обеспечить безопасность всех членов командования. + +cp14-job-name-house-keeper = Завхоз +cp14-job-desc-house-keeper = Ответственный за материальные ресурсы. Заведуйте запасами и финансами экспедиции, направляя ресурсы выполняющим всю грязную работу наемникам. + cp14-job-name-adventurer = Авантюрист -cp14-job-desc-adventurer = Охотник за острыми эмоциями, богатствами и славой, постоянно рискующий своей жизнью. Ищите ценности в опасных местах, и продавайте их поселению. +cp14-job-desc-adventurer = Охотник за острыми эмоциями, богатствами и славой, постоянно рискующий своей жизнью. Выполняйте самые опасные заказы организаторов экспедиции, зарабатывая на жизнь добычей ресурсов или убийством монстров. cp14-job-name-alchemist = Алхимик -cp14-job-desc-alchemist = В своем роде ученый, исследующий природу веществ. Создавайте яды и лекарства, из многочисленных природных растений и ингредиентов, и продавайте их поселению. \ No newline at end of file +cp14-job-desc-alchemist = В своем роде ученый, исследующий природу веществ. Создавайте яды и лекарства, из многочисленных природных растений и ингредиентов, и зарабатывайте деньги, продавая их нуждающимся. + +cp14-job-name-innkeeper = Трактирщик +cp14-job-desc-innkeeper = В любом месте Эберрона найдутся желающие выпить и отдохнуть. И вы можете заработать на этом желании! Найдите способ обеспечить людей хорошим отдыхом, едой и выпивкой. \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index f54e61305a..3dc479f729 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -22,6 +22,18 @@ - CP14BasicPants - CP14BasicShoes +- type: roleLoadout + id: CP14JobInnkeeper + groups: + - CP14BasicHead + - CP14BasicEyes + - CP14BasicMask + - CP14BasicCloak + - CP14BasicGloves + - CP14BasicShirt + - CP14BasicPants + - CP14BasicShoes + - type: roleLoadout id: JobCP14Captain groups: @@ -32,4 +44,28 @@ - CP14BasicGloves - CP14BasicShirt - CP14BasicPants + - CP14BasicShoes + +- type: roleLoadout + id: CP14JobGuardCommander + groups: + - CP14BasicHead + - CP14BasicEyes + - CP14BasicMask + - CP14BasicCloak + - CP14BasicGloves + - CP14BasicShirt + - CP14BasicPants + - CP14BasicShoes + +- type: roleLoadout + id: CP14JobHouseKeeper + groups: + - CP14BasicHead + - CP14BasicEyes + - CP14BasicMask + - CP14BasicCloak + - CP14BasicGloves + - CP14BasicShirt + - CP14BasicPants - CP14BasicShoes \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Command/guard_commander.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Command/guard_commander.yml new file mode 100644 index 0000000000..a97bf44460 --- /dev/null +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Command/guard_commander.yml @@ -0,0 +1,16 @@ +- type: job + id: CP14GuardCommander + name: cp14-job-name-guard-commander + description: cp14-job-desc-guard-commander + playTimeTracker: CP14JobGuardCommander + startingGear: CP14GuardCommanderGear + icon: "CP14JobIconGuardCommander" + requireAdminNotify: true + joinNotifyCrew: true + canBeAntag: false + supervisors: cp14-job-supervisors-command + +- type: startingGear + id: CP14GuardCommanderGear + equipment: + belt1: CP14WalletFilledTest \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Command/house_keeper.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Command/house_keeper.yml new file mode 100644 index 0000000000..9db6f2d552 --- /dev/null +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Command/house_keeper.yml @@ -0,0 +1,16 @@ +- type: job + id: CP14HouseKeeper + name: cp14-job-name-house-keeper + description: cp14-job-desc-house-keeper + playTimeTracker: CP14JobHouseKeeper + startingGear: CP14HouseKeeperGear + icon: "CP14JobIconHouseKeeper" + requireAdminNotify: true + joinNotifyCrew: true + canBeAntag: false + supervisors: cp14-job-supervisors-command + +- type: startingGear + id: CP14HouseKeeperGear + equipment: + belt1: CP14WalletFilledTest \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/innkeeper.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/innkeeper.yml new file mode 100644 index 0000000000..dc52df1b58 --- /dev/null +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/innkeeper.yml @@ -0,0 +1,13 @@ +- type: job + id: CP14Innkeeper + name: cp14-job-name-innkeeper + description: cp14-job-desc-innkeeper + playTimeTracker: CP14JobInnkeeper + startingGear: CP14InnkeeperGear + icon: "CP14JobIconInnkeeper" + supervisors: cp14-job-supervisors-command + +- type: startingGear + id: CP14InnkeeperGear + equipment: + belt1: CP14WalletFilledTest \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml index c2de998e89..84b9ff9f04 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml @@ -5,6 +5,7 @@ roles: - CP14Adventurer - CP14Alchemist + - CP14Innkeeper - type: department id: CP14Command @@ -12,3 +13,5 @@ color: "#fadb3e" roles: - CP14Captain + - CP14GuardCommander + - CP14HouseKeeper diff --git a/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml b/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml index 86877f6f23..228c534075 100644 --- a/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml +++ b/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml @@ -7,4 +7,13 @@ id: CP14JobAlchemist - type: playTimeTracker - id: CP14JobCaptain \ No newline at end of file + id: CP14JobInnkeeper + +- type: playTimeTracker + id: CP14JobCaptain + +- type: playTimeTracker + id: CP14JobGuardCommander + +- type: playTimeTracker + id: CP14JobHouseKeeper \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/StatusEffects/job.yml b/Resources/Prototypes/_CP14/StatusEffects/job.yml index e9e8153a53..e0517aeafe 100644 --- a/Resources/Prototypes/_CP14/StatusEffects/job.yml +++ b/Resources/Prototypes/_CP14/StatusEffects/job.yml @@ -19,9 +19,30 @@ sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi state: Alchemist +- type: statusIcon + parent: CP14JobIcon + id: CP14JobIconInnkeeper + icon: + sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi + state: Innkeeper + - type: statusIcon parent: CP14JobIcon id: CP14JobIconCaptain icon: sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi - state: Captain \ No newline at end of file + state: Captain + +- type: statusIcon + parent: CP14JobIcon + id: CP14JobIconGuardCommander + icon: + sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi + state: GuardCommander + +- type: statusIcon + parent: CP14JobIcon + id: CP14JobIconHouseKeeper + icon: + sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi + state: HouseKeeper diff --git a/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Alchemist.png b/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Alchemist.png index fd3d67a35e0abd6e5b3e47393564934eb00a68ce..daa4208e0c79ed6e2251cf3802371c224572f576 100644 GIT binary patch delta 182 zcmX@bc%N~CVf{=`7sn8ZsmUn`2?-Zgzx;px!!KE8HUZJ39an-*oLCWl`TzWf-)!6V zzrUBfB2i2zB_SX*DIu}qFW_RHO4$Ga delta 161 zcmV;S0ABy!0m=c8F@JHwHmhp|gQw;HZf@c*Aq3Z*u1WRaTN P00000NkvXXu0mjfndC;% diff --git a/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Captain.png b/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Captain.png index 2d32b578fde22f21d177313b27f14beb463466f5..f9fecf89118daa82a4799ad2037b7db36546798c 100644 GIT binary patch delta 204 zcmV;-05kve0rdfpF@LW~L_t&-m5q?G3W8u1g+D{VAy)^N5PqBk#kr-|@Bw;(2IpQO zqL%12TAW2+KzFrZO!3AgAJi+E}iMX`8bzzEdUYewQl*9QUQ+RShk4t=gXD4tQJs| z#E3}0(z=}ix!;VwE-SQdv8UmByTMI&oC?G9{vb0U0ILDYOhkyA`T)48KLRr-_Zzyx zus^=&3Nt%vPn$3wf4F&o_ia)tAWGuJvSFQ40oFf%dINf;LWA2j89M*~002ovPDHLk FV1k)*UH||9 diff --git a/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/GuardCommander.png b/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/GuardCommander.png new file mode 100644 index 0000000000000000000000000000000000000000..5e69854466413bf27166e4b57a1f5cb6457ec8b8 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{VjKx9jP7LeL$-D$|=6Sj}hDc0p zyx}sTBD0>skIj!QIZ`O&qGTk0UOejhnt(XbjuSGK_b={hJN(QqXgYVroV*D3 zy6vjJcqZ?9QYm|3?qBYPfc#f4_9{Q@#K8) bfBwDlJg2Q6W?s7pbSZ1|%O$WD@{VjKx9jP7LeL$-D$|+B{txLnNjq zrz9jK{P_6z_(S5W;}c|INd-*a`sGvKR{*nm*-k< z4-nDGN^RYIexB9gg6HRS+0;_zc1J}@?t4?$v1meLBV(u_kInp2sqKq)yt>ab|NZ_X zjrxp+Siv(~Gni7eB{_fUDVsJnPHb!}uwZ0xS9Z8FcgNKXpo1|%O$WD@{VjKx9jP7LeL$-D$|W_r3fhDc0p zonXjy$UvlR|BRRgjWG@dZ(qH8k$G#cGy8Wx**&e3o!Q&@nwC1B)T(H7y2RaLrRk+p zce?rb_x_?mrl%im2?rkeWRF5Y)%+S0#yzfI#cdffbk5B_}7bcIu*x8c97Eo1yi Wv&>^_OJabIWbkzLb6Mw<&;$TBomvC{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/meta.json index 5224c59fc3..962c91eebc 100644 --- a/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/meta.json @@ -13,8 +13,17 @@ { "name": "Alchemist" }, + { + "name": "Innkeeper" + }, { "name": "Captain" + }, + { + "name": "GuardCommander" + }, + { + "name": "HouseKeeper" } ] } \ No newline at end of file