From 90a67bf3b0801f4af9ee5fe69075276f5ccb049a Mon Sep 17 00:00:00 2001 From: VividPups <68whiskty@gmail.com> Date: Wed, 20 Nov 2024 20:50:50 -0600 Subject: [PATCH] ONI MELEE Oni melee --- .../Floof/Entities/Objects/Weapons/Melee.yml | 83 ++++++++++++++++++ .../Crafting/Graphs/brassknuckles_graph.yml | 36 ++++++++ .../Floof/Recipes/Crafting/improvised.yml | 26 ++++++ .../Prototypes/Loadouts/Jobs/service.yml | 17 ++++ Resources/Prototypes/tags.yml | 5 ++ .../Melee/brassknuckles.rsi/equipped-HAND.png | Bin 0 -> 218 bytes .../Weapons/Melee/brassknuckles.rsi/icon.png | Bin 0 -> 223 bytes .../Melee/brassknuckles.rsi/inhand-left.png | Bin 0 -> 193 bytes .../Melee/brassknuckles.rsi/inhand-right.png | Bin 0 -> 203 bytes .../Weapons/Melee/brassknuckles.rsi/meta.json | 26 ++++++ .../Melee/crassknuckles.rsi/equipped-HAND.png | Bin 0 -> 192 bytes .../Weapons/Melee/crassknuckles.rsi/icon.png | Bin 0 -> 223 bytes .../Melee/crassknuckles.rsi/inhand-left.png | Bin 0 -> 162 bytes .../Melee/crassknuckles.rsi/inhand-right.png | Bin 0 -> 176 bytes .../Weapons/Melee/crassknuckles.rsi/meta.json | 26 ++++++ 15 files changed, 219 insertions(+) create mode 100644 Resources/Prototypes/Floof/Entities/Objects/Weapons/Melee.yml create mode 100644 Resources/Prototypes/Floof/Recipes/Crafting/Graphs/brassknuckles_graph.yml create mode 100644 Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/icon.png create mode 100644 Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/meta.json create mode 100644 Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/icon.png create mode 100644 Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/inhand-left.png create mode 100644 Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/inhand-right.png create mode 100644 Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/meta.json diff --git a/Resources/Prototypes/Floof/Entities/Objects/Weapons/Melee.yml b/Resources/Prototypes/Floof/Entities/Objects/Weapons/Melee.yml new file mode 100644 index 00000000000..acb3c3c82a1 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Objects/Weapons/Melee.yml @@ -0,0 +1,83 @@ +- type: entity + name: brass knuckles + parent: ClothingHandsBase + id: WeaponBrassKnuckles + description: Ever wanted to protect your bar but your hands are too big for guns? S.E.S.W.C has what you need! + components: + - type: Sprite + sprite: Floof/Objects/Weapons/Melee/brassknuckles.rsi + state: icon + - type: Clothing + sprite: Floof/Objects/Weapons/Melee/brassknuckles.rsi + - type: MeleeWeapon + autoAttack: true + attackRate: 2 # ~12 dps + damage: + types: + Blunt: 6 + soundHit: + collection: Punch + animation: WeaponArcFist + mustBeEquippedToUse: true + - type: StaminaDamageOnHit + damage: 11 + - type: Armor + modifiers: + coefficients: + Shock: 1.05 # oh no so conductive + - type: Insulated + coefficient: 1.5 # Extra damage. Don't punch wires, kids. + - type: Tag + tags: + - WhitelistChameleon + - BrassKnuckles + - type: PhysicalComposition + materialComposition: + Brass: 1000 + - type: StaticPrice + price: 30 # Ensures these can be sold and have a reasonable vending value. + +- type: entity + name: improvised brass knuckles + parent: WeaponBrassKnuckles + id: WeaponBrassKnucklesImprovised + description: Ever wanted to punch just a little harder? + components: + - type: MeleeWeapon + attackRate: 1.6 # ~9.6 dps + - type: Construction + graph: GraphWeaponBrassKnucklesImprovised + node: WeaponBrassKnucklesImprovised + +- type: entity + name: crass knuckles + parent: WeaponBrassKnuckles + id: WeaponBrassKnucklesWhoopie + description: Questionably silent, questionably deadly. + components: + - type: Sprite + sprite: Floof/Objects/Weapons/Melee/crassknuckles.rsi + state: icon + - type: Clothing + sprite: Floof/Objects/Weapons/Melee/crassknuckles.rsi + - type: MeleeWeapon + damage: + types: + Blunt: 0 # ~0 dps :^) + Structural: 0 + soundHit: + collection: Parp + - type: Construction + graph: GraphWeaponBrassKnucklesWhoopie + node: WeaponBrassKnucklesWhoopie + - type: StaminaDamageOnHit + damage: 4 # 8 per second, similar to the toy hammer + - type: Armor + modifiers: + coefficients: + Shock: 1.0 # Nothing special. + - type: Insulated + coefficient: 1 # Nothing special. + - type: Tag + tags: + - WhitelistChameleon diff --git a/Resources/Prototypes/Floof/Recipes/Crafting/Graphs/brassknuckles_graph.yml b/Resources/Prototypes/Floof/Recipes/Crafting/Graphs/brassknuckles_graph.yml new file mode 100644 index 00000000000..8ea26290021 --- /dev/null +++ b/Resources/Prototypes/Floof/Recipes/Crafting/Graphs/brassknuckles_graph.yml @@ -0,0 +1,36 @@ +- type: constructionGraph + id: GraphWeaponBrassKnucklesImprovised + start: start + graph: + - node: start + edges: + - to: WeaponBrassKnucklesImprovised + steps: + - material: Brass + amount: 10 + doAfter: 4 + - node: WeaponBrassKnucklesImprovised + entity: WeaponBrassKnucklesImprovised + +- type: constructionGraph + id: GraphWeaponBrassKnucklesWhoopie + start: start + graph: + - node: start + edges: + - to: WeaponBrassKnucklesWhoopie + steps: + - tag: BrassKnuckles + icon: + sprite: Floof/Objects/Weapons/Melee/brassknuckles.rsi + state: icon + name: brass knuckles + doAfter: 2 + - tag: WhoopieCushion + icon: + sprite: Objects/Fun/whoopie.rsi + state: icon + name: whoopie cushion + doAfter: 2 + - node: WeaponBrassKnucklesWhoopie + entity: WeaponBrassKnucklesWhoopie diff --git a/Resources/Prototypes/Floof/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Floof/Recipes/Crafting/improvised.yml index a89e5f5e418..f4fa65485e6 100644 --- a/Resources/Prototypes/Floof/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Floof/Recipes/Crafting/improvised.yml @@ -24,3 +24,29 @@ sprite: Floof/Structures/sleepingbag.rsi state: open objectType: Item + +- type: construction + name: improvised brass knuckles + id: BrassKnucklesImprovised + graph: GraphWeaponBrassKnucklesImprovised + startNode: start + targetNode: WeaponBrassKnucklesImprovised + category: construction-category-weapons + description: Ever wanted to punch just a little harder? + icon: + sprite: Floof/Objects/Weapons/Melee/brassknuckles.rsi + state: icon + objectType: Item + +- type: construction + name: crass knuckles + id: CrassKnuckles + graph: GraphWeaponBrassKnucklesWhoopie + startNode: start + targetNode: WeaponBrassKnucklesWhoopie + category: construction-category-weapons + description: Questionably silent, unquestionably deadly. + icon: + sprite: Floof/Objects/Weapons/Melee/crassknuckles.rsi + state: icon + objectType: Item diff --git a/Resources/Prototypes/Loadouts/Jobs/service.yml b/Resources/Prototypes/Loadouts/Jobs/service.yml index c0f04ef151a..579a402d5c2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/service.yml +++ b/Resources/Prototypes/Loadouts/Jobs/service.yml @@ -319,6 +319,23 @@ items: - WeaponSniperMosinRubber +- type: loadout # Floof + id: LoadoutServiceBartenderBrassKnuckles + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderWeapon + - !type:CharacterJobRequirement + jobs: + - Bartender + - !type:CharacterSpeciesRequirement + species: + - Oni + items: + - WeaponBrassKnuckles + - type: loadout id: LoadoutServiceJumpsuitBartenderNt category: JobsServiceBartender diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index fb8d005c244..70157410ee3 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1363,3 +1363,8 @@ - type: Tag id: WriteIgnoreStamps + +#Floof tags + +- type: Tag + id: BrassKnuckles diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/equipped-HAND.png b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..15c95b994a46b650930baf5ae7f943dd17543c64 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=3q4&NLn`LHy}6sW*+76HVDg#= zD`#|0nmMCORxfmw2b;B-%f;%gwf0g^yg7l&8SHe5`zAiGzqNbjX5Xvx)^}RI`jfaI z^<1EF!#rn=BQvDlUlqUbiIvT~{$y=Kpj^2)!=K(q@`@mx2d;a)em_zAX3)NCdwiv5 zmEK;ydba-4h-Wgdw|%dc?dy1yQ1$kI^~*Samx^rmC|}K`&+oc26ddB7@XzO#%XIq~ OkQtt?elF{r5}E*G>RCtt literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/icon.png b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..537c32f1bb8d9d01b42bab41a0d9f3abc6db8f39 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyJOMr-u0VQTnDT~1)r1pBx?Mb-+;p5iX!The9h%H+v#^m)>$^#b3eHeCPEx1QU&n~}Nd T(6SpqmoRv``njxgN@xNAYM)fy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/inhand-left.png b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5543d82e7b04c6c6cc90a817bab3713ad9eb8e25 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|sy$sCLn`LH zy|q!WK|z4UVJq9JMQTpjo3yGAoRCzW%zm+Od&B(a9PgKN0u?hH^71SF!gqL1f4=0Q z81}-$iN`*tz@zE+DEg^OcuX-GbuQB``^9a nnfAui|KGlyWq+*&gTocZc@NbUk0ej$0V(%%^>bP0l+XkK*r7*3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/inhand-right.png b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..eb143f60324dbacf57d247f0e65c656c7d4a7173 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|T0LDHLn`LH zy>*cHkO2>C0DD-1R@$QzK6ATd&#VkmU81#!Rr_M~_Y?Q+j`abRGc@q`|JGe?JSB3r zd?v^8)VpT(ml%}%}@zvd*&6|luX%v#iq zFS%8c;g7p#?0M}qtNFk5NDKH}cx2*yQqkv5jSvIF9O-P^$h}3nFIghD+~J}z)S0gY$yboFyt=akR{0DlfTjQ{`u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/icon.png b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..03fe3c298dd341f58a17d0ae6cbb5540b5eb58fc GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyJOMr-u0VRCvcU#*^YdC8R=o57+-jk8d#PEuDaVf42)Ul^ zTivmuRPSal*NbPe4ypG;mM-7R$h4sTaxMRvGVxz5Q*s!6YOPm!{I5JYwSt8wqwwYK zdCwQ0p8nzY7n!Mbf_+?{B5MU^PjQ#=E$K3LW%6V=`aJ2>dV%j!8?JxoThDFX&B$DJ TXxR;*OBg&|{an^LB{Ts5ayCsy&V9AI3zfk8Y$+|&wWiKnZd%Q~loCICDd BF7p5Y literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/inhand-right.png b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..45893fcc6681ecd8bcbd76c62ec6589dba22e135 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!gaUj*T!D0zs3MU34+cO6gBVzp ztt7}VnBhMo6C?Bd7s79W;_jXWKiI64!lvHDXVZ?@N&eTaBn}YAXbL| zFDveO2>8F>^O<$(gS8X%co-PUo=w`Y^Tgwc@g@!1s=E3(o;RAauiDBW9`v!a1!R|} LtDnm{r-UW|99cSS literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/meta.json b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/meta.json new file mode 100644 index 00000000000..7d2effdd440 --- /dev/null +++ b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "icon by Whatstone, inhand-left, inhand-right, equipped-HAND by VividPups, modified by Whatstone", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}