From ee2846613ae401c8a6786e595019e4bb37d63aee Mon Sep 17 00:00:00 2001 From: creamybag Date: Tue, 25 Mar 2025 17:47:44 +0300 Subject: [PATCH] guildmaster's rapier (#1070) --- .../Locale/en-US/_CP14/loadouts/loadout.ftl | 3 +- .../Locale/ru-RU/_CP14/loadouts/loadout.ftl | 3 +- .../ModularTools/Garde/guildmaster.yml | 13 ++++++++ .../Entities/Objects/ModularTools/grips.yml | 24 ++++++++++++++ .../Objects/Weapons/ModularPresets/rapier.yml | 17 ++++++++++ .../_CP14/Loadouts/Jobs/guildmaster.yml | 16 +++++++++- .../_CP14/Loadouts/role_loadouts.yml | 1 + .../_CP14/ModularCraft/Garde/guildmaster.yml | 25 +++++++++++++++ .../metall_rapier.rsi/equipped-BELT1.png | Bin 281 -> 280 bytes .../metall_rapier.rsi/equipped-BELT2.png | Bin 279 -> 282 bytes .../guildmaster_garde.rsi/equipped-BELT1.png | Bin 0 -> 289 bytes .../guildmaster_garde.rsi/equipped-BELT2.png | Bin 0 -> 253 bytes .../Garde/guildmaster_garde.rsi/icon.png | Bin 0 -> 364 bytes .../guildmaster_garde.rsi/inhand-left.png | Bin 0 -> 521 bytes .../guildmaster_garde.rsi/inhand-right.png | Bin 0 -> 512 bytes .../Garde/guildmaster_garde.rsi/meta.json | 30 ++++++++++++++++++ .../guildmaster_grip.rsi/equipped-BELT1.png | Bin 0 -> 217 bytes .../guildmaster_grip.rsi/equipped-BELT2.png | Bin 0 -> 214 bytes .../Grip/guildmaster_grip.rsi/icon.png | Bin 0 -> 250 bytes .../Grip/guildmaster_grip.rsi/inhand-left.png | Bin 0 -> 237 bytes .../guildmaster_grip.rsi/inhand-right.png | Bin 0 -> 247 bytes .../Grip/guildmaster_grip.rsi/meta.json | 30 ++++++++++++++++++ 22 files changed, 159 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/guildmaster.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml create mode 100644 Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/equipped-BELT1.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/equipped-BELT2.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/equipped-BELT1.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/equipped-BELT2.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/meta.json diff --git a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl index 2db4c83977..335bc384cb 100644 --- a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl @@ -60,4 +60,5 @@ cp14-loadout-guildmaster-cloak = Guildmaster cloak cp14-loadout-guildmaster-shirt = Guildmaster shirt cp14-loadout-guildmaster-pants = Guildmaster pants cp14-loadout-guildmaster-shoes = Guildmaster shoes -cp14-loadout-guildmaster-spells = Guildmaster spells \ No newline at end of file +cp14-loadout-guildmaster-spells = Guildmaster spells +cp14-loadout-guildmaster-weapons = Guildmaster weapon \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl index 40d70111b8..45c464b0cc 100644 --- a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl @@ -60,4 +60,5 @@ cp14-loadout-guildmaster-cloak = Накидка гильдмастера cp14-loadout-guildmaster-shirt = Рубашка гильдмастера cp14-loadout-guildmaster-pants = Штаны гильдмастера cp14-loadout-guildmaster-shoes = Ботинки гильдмастера -cp14-loadout-guildmaster-spells = Заклинания гильдмастера \ No newline at end of file +cp14-loadout-guildmaster-spells = Заклинания гильдмастера +cp14-loadout-guildmaster-weapons = Оружие гильдмастера \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/guildmaster.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/guildmaster.yml new file mode 100644 index 0000000000..c1b64365be --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/guildmaster.yml @@ -0,0 +1,13 @@ +- type: entity + parent: CP14ModularGardeBase + id: CP14ModularGardeGuildmaster + categories: [ ForkFiltered ] + name: guildmaster's rapier garde + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi + layers: + - state: icon + - type: CP14ModularCraftPart + possibleParts: + - GardeGuildmaster \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml index 2b9a8badc5..c67cd8604e 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml @@ -231,6 +231,30 @@ - !type:DoActsBehavior acts: ["Destruction"] +- type: entity + parent: CP14ModularGripShort + id: CP14ModularGripGuildmaster + name: guildmaster's rapier grip + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi + layers: + - state: icon + - type: CP14ModularCraftStartPoint + startProtoPart: CP14ModularGripIron + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 120 #x2.4 durability + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:CP14ModularDisassembleBehavior + - !type:DoActsBehavior + acts: ["Destruction"] + # Long - type: entity parent: CP14ModularGripLong diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml new file mode 100644 index 0000000000..f0182668ac --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml @@ -0,0 +1,17 @@ +- type: entity + id: CP14ModularGuildmasterRapier + parent: CP14ModularGripGuildmaster + name: guildmaster's personal rapier + description: A personal weapon issued to each guildmaster. Combines reliability and killing power. + components: + - type: Sprite + layers: + - state: icon + - sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi + state: icon + - sprite: _CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi + state: icon + - type: CP14ModularCraftAutoAssemble + details: + - BladeIronRapier + - GardeGuildmaster \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml index b4fe3a7a14..5bdf5bdd6d 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml @@ -82,4 +82,18 @@ id: CP14ActionSpellMonolithWarp dummyEntity: CP14ActionSpellMonolithWarp actions: - - CP14ActionSpellMonolithWarp \ No newline at end of file + - CP14ActionSpellMonolithWarp + +#Weapons + +- type: loadoutGroup + id: CP14GuildmasterWeapons + name: cp14-loadout-guildmaster-weapons + loadouts: + - CP14ModularGuildmasterRapier + +- type: loadout + id: CP14ModularGuildmasterRapier + storage: + back: + - CP14ModularGuildmasterRapier diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index aff9e7fc4d..e5331881db 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -126,6 +126,7 @@ id: JobCP14Guildmaster groups: - CP14GeneralSpells + - CP14GuildmasterWeapons - CP14GuildmasterOuterClothing - CP14GeneralEyes - CP14GuildmasterHead diff --git a/Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml b/Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml new file mode 100644 index 0000000000..556e8571d0 --- /dev/null +++ b/Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml @@ -0,0 +1,25 @@ +# Concept +# + Damage + durability + +- type: modularPart + id: BaseGardeGuildmaster + modifiers: + - !type:EditDamageableModifier + multiplier: 0.8 + - !type:EditSharpened + sharpnessDamageMultiplier: 0.8 + - !type:EditMeleeWeapon + damageMultiplier: 1.2 + - !type:EditIncreaseDamageOnWield + damageMultiplier: 1.2 + +- type: modularPart + id: GardeGuildmaster + slots: + - Garde + rsiPath: _CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseGardeGuildmaster + diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT1.png index 9008c58a6a49f1f1b0861c8891564c4ca47dbf2c..cda538ccd418874d5328b9bc2d9b868801fd7eeb 100644 GIT binary patch delta 239 zcmbQqG=ph^Vf`gf7srr_IdAV=?ID(ch-(Zv{+_4pn1A@PUpez{!Im|$3H1T9fF@L?H@HhM bFdS$%4|348w{2bW8)S;7tDnm{r-UW|@v&hI delta 240 zcmbQiG?Qt9Vf|%K7srr_IdAVAWGUIdfF8&D_0=VjS-qZfAZK0&2)}oO<*;L%#vsSP-Klu|6Q~ zWB#gd>`z7c5BytTBfnK!*dg^O^9Ebh_v*$Cl~xN%L2~aIem8%*)1;+s&unuDsLyT> Y<{9 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT2.png index f54e664fe5236075a5068f199ca99859cb947e53..caa9f978d7ff30836a545c50f775876aa0456221 100644 GIT binary patch delta 241 zcmbQvG>d71Vf__P7srr_IdAV=YDbL zznsIm?nB|uUk}1V8Q|cSkTce9~sr*$981Rn-gt3C#X bhWu)#{u{dX?=DtZf=uyr^>bP0l+XkK5_Mr3 delta 238 zcmbQmG@WUJVf{r<7srr_IdAVAJ2p8s&&d}YDas>xEOniCn;O|RY_b4GZvn))`z z9$|-#5e(OFE1PBoB{A+`e4KM&|Bbi&`w*SgNSZzR#t1Q#f#F}* z*Oud-_pE=e(Ph-WvgvDy#ZgTe~DWM4f@qc-d literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/equipped-BELT2.png new file mode 100644 index 0000000000000000000000000000000000000000..5fcca87825ae46739954b8c0a7eae04f98c2c99c GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|wtKobhE&XX zd&`i|F;JlO;b#|6+Q`0DG=iaX(uvTB#xqAsC;yK= zaPrKSVilkPKv0uzEWPxOam1E2jE66LoS{7Xl$1d7m0jij({DRpdamFrYjR`WnVb7B zeB;P`wczK+RquAJKl~)}%%@408K>E}}^a4nar>mdKI;Vst0Bx9KrvLx| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..676a6a1061aa8dbcd42263edebbc82d915ba036e GIT binary patch literal 364 zcmV-y0h9iTP)Px$CP_p=R9J=WlQB!fP!xr~r={Q$DOOq#;^+^^ARQI_1qJ^@9Gps42R8|>9VJ^S zbQgzovpBp(I_c89$q*q>D1lOV4n;SI_cA#6zWttaxc6LeI2;bge@EC3Y8C3`OmTkq zApp{-tG%9&@P|g44O{cmn^#tgoag97Cl7B_*)F&Db7QR?Tl4+S0rTX7Dl1Usns|~k z-L#E2Y8+rWQ>+#_Pgh6eBS}2T@mo!%o3@Zrn#!4XAP54|sH>~2_%Tlk&&u2?z;}qV z#;5jMO|Bo`t&0p6CkTQ7fI+{5D%W+q?E*+Cky5gEeE4fP6Rh44!0Y)8`UQZFUoz`6 z)ViNmq0UF!@{QAS`;LZTtTzB4{Gre))Bu-A#%Wnc&f#!4{)R7_J#Sf33@|MK0000< KMNUMnLSTZ!Dx3%a literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..75f905eba0c4c54f5d86fecb2e4aeda95fe1338d GIT binary patch literal 521 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z4|}>ehE&XX zduyY&bfN^?hvz+WZXfJS3ix64lYPo|6^k%Oor8`O%7l(TdL;5k*-4FkY4VFHjxsJK zD_6VN7kdU5!* z-_{j>-6G|8KhOWwyQyrItL(Z=!{^S)(~icxaCQmM6ur`FH_flgf7SMqOU>N1AzrMa zf;%pl&-&6|csl88-h*7f<-ZaO*`)W{q%pE^7thRM<>uSGR;G`kX6Bm%b5*0>v(0af%B9q&T`P_&DvGbgHOe#|iKL zFB+FKco_8fyLas=Z~hv_cU->sS>!xZkl>}y65G#e*Ub75;LXOcY)$kGqx*~uAHM!o zd6d!+wfXO>$7?30G&5|loSU^*x+jOR&G^LjZ1I^@GxsqmHI+ZUf3?-lZQ>KY-xuE{ zEuPLEWxm5kXVvpX_3tuwF$9VzGVOW(>(h0{q5j%G z=bStDw{B0@zcW%{wzB4@I%i&=#MV7sd50g{)EYlmmUWX2r=T6IGiL?Vg`xtC92Qat8NphBte+cNPof zdo&C8-ezQ25WuT@|9fw1teBwV>(A4eF8gk|vw7-06D0(gB_!Cv0d!eb!6K!kn%<>S(oB!DQ`8Q;0Gxxn;eC=hl zqshUm?QepvMXX?QVY$2PyH4%l%y28WogWhz7k+%LAHsNd+4A@Mc{belez?xwWbVt( z$m`!@e=YyW|FAy%KxU@<t0#J*}%Ja;lE{eTjW=-+5cs$Q0OO1Tiv%d yKdYZ?jd~%WNh7g_?CIVW+6tm9nn@Thvyy{7DkS_0Kg{q7S?e1oIzUDkfqf7g=} zsQ1URm0cOHjh3A=?A)fOY`;$Me6>mF$N8#r@}677lyzIxU48!X*$&^=S@vPmJillu zlv_T1XBs93)CmL++;4K<;678Yf8llYpUXnun3}mZhy%r+z2X(m&^JB!rt&ICnWw9t J%Q~loCIEvYQON)R literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/equipped-BELT2.png new file mode 100644 index 0000000000000000000000000000000000000000..7ff79c3632be3c4e1324a789cd38d76eea1c618f GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|CV09yhE&XX zdut)@p#YJ#i){w1O=>Mt9uq6g#@;!}9n-iqC7m$T{FzOEnDmswDhPcuI1NooD38`^OdQBMRReZWA`7BDo=1kx8A5$u^_<#0Rjsr~jQ3uYiV zyz-~Jr&<3afgQX4^F6-Kt}prHXshHIp|zfToMK+G48<%!HTAys-fa^7;s53L{y%!5 z_>$=GOOlv)qLF qz0N%S@Bb-asYZ4m*l~=pj12FN8vYS13JwOkpTX1B&t;ucLK6TM3|~S3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..281da0cda7dc06a3e4b9195f9352a06788fb05db GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|mV3H5hE&XX zdrOh;kb{83Mcv~o*n(|1M4DKR%I5hkKd-X1lb?E06|HS3j3^P6{Zy^#ehisAoc#iorVTXBFE^)2jv2S8BR1UN-;Q)W05={k7Z|TX?7Q9<*v$`1XnW z!cVKdU3*>|A9r=0e5=&0bEP1MLO?@n-}KAJ&97X0`oex^Z1i=`314