From 16d96c9dccaac273ed7f9f2262ba1f23430a8a99 Mon Sep 17 00:00:00 2001 From: Fishfish458 <47410468+Fishfish458@users.noreply.github.com> Date: Fri, 24 Dec 2021 06:20:20 -0600 Subject: [PATCH] Add backgammon and board game crate (#5884) * [ADD] backgammon, made pieces generic * [ADD] board game crate * [REMOVE] minor whitespace * Fix BOM * [CHANGE] feedback changes, condensed backgammon setup * [CHANGE] swapped backgammon y positions to correct ones Co-authored-by: fishfish458 Co-authored-by: Visne <39844191+Visne@users.noreply.github.com> --- .../Tabletop/TabletopBackgammonSetup.cs | 71 ++++++++++++++++++ .../Tabletop/TabletopParchisSetup.cs | 8 +- Resources/Locale/en-US/tabletop/tabletop.ftl | 3 + .../Prototypes/Catalog/Cargo/cargo_fun.yml | 12 +++ .../Prototypes/Catalog/Fills/Crates/fun.yml | 16 ++++ .../Objects/Fun/Tabletop/backgammon.yml | 25 ++++++ .../Entities/Objects/Fun/Tabletop/parchis.yml | 46 ------------ .../Objects/Fun/Tabletop/tabletopGeneric.yml | 61 +++++++++++++++ .../Machines/Computers/computers.yml | 1 + .../Fun/Tabletop/backgammon.rsi/board.png | Bin 0 -> 671 bytes .../Fun/Tabletop/backgammon.rsi/meta.json | 14 ++++ .../backgammonBoard.png | Bin 0 -> 9896 bytes .../backgammon_tabletop.rsi/meta.json | 14 ++++ .../Fun/Tabletop/generic_pieces.rsi/black.png | Bin 0 -> 602 bytes .../blue.png | Bin .../green.png | Bin .../meta.json | 8 +- .../red.png | Bin .../Fun/Tabletop/generic_pieces.rsi/white.png | Bin 0 -> 615 bytes .../yellow.png | Bin 20 files changed, 228 insertions(+), 51 deletions(-) create mode 100644 Content.Server/Tabletop/TabletopBackgammonSetup.cs create mode 100644 Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml create mode 100644 Resources/Prototypes/Entities/Objects/Fun/Tabletop/tabletopGeneric.yml create mode 100644 Resources/Textures/Objects/Fun/Tabletop/backgammon.rsi/board.png create mode 100644 Resources/Textures/Objects/Fun/Tabletop/backgammon.rsi/meta.json create mode 100644 Resources/Textures/Objects/Fun/Tabletop/backgammon_tabletop.rsi/backgammonBoard.png create mode 100644 Resources/Textures/Objects/Fun/Tabletop/backgammon_tabletop.rsi/meta.json create mode 100644 Resources/Textures/Objects/Fun/Tabletop/generic_pieces.rsi/black.png rename Resources/Textures/Objects/Fun/Tabletop/{parchis_pieces.rsi => generic_pieces.rsi}/blue.png (100%) rename Resources/Textures/Objects/Fun/Tabletop/{parchis_pieces.rsi => generic_pieces.rsi}/green.png (100%) rename Resources/Textures/Objects/Fun/Tabletop/{parchis_pieces.rsi => generic_pieces.rsi}/meta.json (69%) rename Resources/Textures/Objects/Fun/Tabletop/{parchis_pieces.rsi => generic_pieces.rsi}/red.png (100%) create mode 100644 Resources/Textures/Objects/Fun/Tabletop/generic_pieces.rsi/white.png rename Resources/Textures/Objects/Fun/Tabletop/{parchis_pieces.rsi => generic_pieces.rsi}/yellow.png (100%) diff --git a/Content.Server/Tabletop/TabletopBackgammonSetup.cs b/Content.Server/Tabletop/TabletopBackgammonSetup.cs new file mode 100644 index 0000000000..06f7f16d8d --- /dev/null +++ b/Content.Server/Tabletop/TabletopBackgammonSetup.cs @@ -0,0 +1,71 @@ +using JetBrains.Annotations; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization.Manager.Attributes; + +namespace Content.Server.Tabletop +{ + [UsedImplicitly] + public class TabletopBackgammonSetup : TabletopSetup + { + [DataField("boardPrototype")] + public string BackgammonBoardPrototype { get; } = "BackgammonBoardTabletop"; + + [DataField("whitePiecePrototype")] + public string WhitePiecePrototype { get; } = "WhiteTabletopPiece"; + + [DataField("blackPiecePrototype")] + public string BlackPiecePrototype { get; } = "BlackTabletopPiece"; + public override void SetupTabletop(TabletopSession session, IEntityManager entityManager) + { + var board = entityManager.SpawnEntity(BackgammonBoardPrototype, session.Position); + + const float borderLengthX = 7.35f; //BORDER + const float borderLengthY = 5.60f; //BORDER + + const float boardDistanceX = 1.25f; + const float pieceDistanceY = 0.80f; + + float getXPosition(float distanceFromSide, bool isLeftSide) + { + var pos = borderLengthX - (distanceFromSide * boardDistanceX); + return isLeftSide ? -pos : pos; + } + + float getYPosition(float positionNumber, bool isTop) + { + var pos = borderLengthY - (pieceDistanceY * positionNumber); + return isTop ? pos : -pos; + } + + void addPieces( + float distanceFromSide, + int numberOfPieces, + bool isBlackPiece, + bool isTop, + bool isLeftSide) + { + for (int i = 0; i < numberOfPieces; i++) + { + session.Entities.Add(entityManager.SpawnEntity(isBlackPiece ? BlackPiecePrototype : WhitePiecePrototype, session.Position.Offset(getXPosition(distanceFromSide, isLeftSide), getYPosition(i, isTop)))); + } + } + + // Top left + addPieces(0, 5, true, true, true); + // top middle left + addPieces(4, 3, false, true, true); + // top middle right + addPieces(5, 5, false, true, false); + // top far right + addPieces(0, 2, true, true, false); + // bottom left + addPieces(0, 5, false, false, true); + // bottom middle left + addPieces(4, 3, true, false, true); + // bottom middle right + addPieces(5, 5, true, false, false); + // bottom far right + addPieces(0, 2, false, false, false); + } + } +} diff --git a/Content.Server/Tabletop/TabletopParchisSetup.cs b/Content.Server/Tabletop/TabletopParchisSetup.cs index 38b6f5a5d2..2814da1069 100644 --- a/Content.Server/Tabletop/TabletopParchisSetup.cs +++ b/Content.Server/Tabletop/TabletopParchisSetup.cs @@ -11,16 +11,16 @@ namespace Content.Server.Tabletop public string ParchisBoardPrototype { get; } = "ParchisBoardTabletop"; [DataField("redPiecePrototype")] - public string RedPiecePrototype { get; } = "RedParchisPiece"; + public string RedPiecePrototype { get; } = "RedTabletopPiece"; [DataField("greenPiecePrototype")] - public string GreenPiecePrototype { get; } = "GreenParchisPiece"; + public string GreenPiecePrototype { get; } = "GreenTabletopPiece"; [DataField("yellowPiecePrototype")] - public string YellowPiecePrototype { get; } = "YellowParchisPiece"; + public string YellowPiecePrototype { get; } = "YellowTabletopPiece"; [DataField("bluePiecePrototype")] - public string BluePiecePrototype { get; } = "BlueParchisPiece"; + public string BluePiecePrototype { get; } = "BlueTabletopPiece"; public override void SetupTabletop(TabletopSession session, IEntityManager entityManager) { diff --git a/Resources/Locale/en-US/tabletop/tabletop.ftl b/Resources/Locale/en-US/tabletop/tabletop.ftl index 854b71a020..73489e245b 100644 --- a/Resources/Locale/en-US/tabletop/tabletop.ftl +++ b/Resources/Locale/en-US/tabletop/tabletop.ftl @@ -8,3 +8,6 @@ tabletop-chess-flip = Flip ## Parchís tabletop-parchis-board-name = Parchís + +## Backgammon +tabletop-backgammon-board-name = Backgammon diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index 23496dd129..e91a4c53e3 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml @@ -33,3 +33,15 @@ cost: 5000 category: Fun group: market + +- type: cargoProduct + name: "board game crate" + id: FunBoardGames + description: "Game nights have been proven to either decrease boredom or increase murderous rage depending on the game" + icon: + sprite: Objects/Fun/dice.rsi + state: d66 + product: CrateFunBoardGames + cost: 1500 + category: Fun + group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 3b77597215..de46ea973a 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -68,3 +68,19 @@ amount: 1 - id: CrayonWhite amount: 1 + +- type: entity + id: CrateFunBoardGames + name: board game crate + parent: CrateGenericSteel + components: + - type: StorageFill + contents: + - id: ChessBoard + amount: 1 + - id: BackgammonBoard + amount: 1 + - id: ParchisBoard + amount: 1 + - id: d6Dice + amount: 4 diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml new file mode 100644 index 0000000000..53414cb6e4 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml @@ -0,0 +1,25 @@ +- type: entity + parent: BaseItem + id: BackgammonBoard + name: backgammon board + description: Old fashioned game of dice and pieces. + components: + - type: Sprite + sprite: Objects/Fun/Tabletop/backgammon.rsi + state: board + - type: TabletopGame + boardName: tabletop-backgammon-board-name + size: 550, 410 + setup: + !type:TabletopBackgammonSetup + +- type: entity + id: BackgammonBoardTabletop + name: backgammon + abstract: true + components: + - type: Sprite + sprite: Objects/Fun/Tabletop/backgammon_tabletop.rsi + state: backgammonBoard + noRot: false + drawdepth: FloorTiles diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml index 43f694a529..058c1baa4d 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml @@ -26,49 +26,3 @@ noRot: false drawdepth: FloorTiles -# Parchís pieces -- type: entity - id: BaseParchisPiece - parent: BaseItem - abstract: true - components: - - type: TabletopDraggable - - type: Sprite - netsync: false - noRot: true - sprite: Objects/Fun/Tabletop/parchis_pieces.rsi - - type: Appearance - visuals: - - type: TabletopItemVisualizer - -- type: entity - id: RedParchisPiece - name: red piece - parent: BaseParchisPiece - components: - - type: Sprite - state: red - -- type: entity - id: GreenParchisPiece - name: green piece - parent: BaseParchisPiece - components: - - type: Sprite - state: green - -- type: entity - id: YellowParchisPiece - name: yellow piece - parent: BaseParchisPiece - components: - - type: Sprite - state: yellow - -- type: entity - id: BlueParchisPiece - name: blue piece - parent: BaseParchisPiece - components: - - type: Sprite - state: blue diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/tabletopGeneric.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/tabletopGeneric.yml new file mode 100644 index 0000000000..edf7bcf93d --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/tabletopGeneric.yml @@ -0,0 +1,61 @@ +- type: entity + id: BaseTabletopPiece + parent: BaseItem + abstract: true + components: + - type: TabletopDraggable + - type: Sprite + netsync: false + noRot: true + sprite: Objects/Fun/Tabletop/generic_pieces.rsi + - type: Appearance + visuals: + - type: TabletopItemVisualizer + +- type: entity + id: RedTabletopPiece + name: red piece + parent: BaseTabletopPiece + components: + - type: Sprite + state: red + +- type: entity + id: GreenTabletopPiece + name: green piece + parent: BaseTabletopPiece + components: + - type: Sprite + state: green + +- type: entity + id: YellowTabletopPiece + name: yellow piece + parent: BaseTabletopPiece + components: + - type: Sprite + state: yellow + +- type: entity + id: BlueTabletopPiece + name: blue piece + parent: BaseTabletopPiece + components: + - type: Sprite + state: blue + +- type: entity + id: WhiteTabletopPiece + name: white piece + parent: BaseTabletopPiece + components: + - type: Sprite + state: white + +- type: entity + id: BlackTabletopPiece + name: black piece + parent: BaseTabletopPiece + components: + - type: Sprite + state: black diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 92810ff79e..f967d3ed2a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -292,6 +292,7 @@ - FunPlushies - FunArtSupplies - FunInstruments + - FunBoardGames - MaterialSteel - MaterialGlass - MaterialPlastic diff --git a/Resources/Textures/Objects/Fun/Tabletop/backgammon.rsi/board.png b/Resources/Textures/Objects/Fun/Tabletop/backgammon.rsi/board.png new file mode 100644 index 0000000000000000000000000000000000000000..a37fd743b4d909f48edd63d002e3d5ee8a4a4406 GIT binary patch literal 671 zcmV;Q0$}}#P)EX>4Tx04R}tkv&MmKpe$iQ>7vm2RjsX$WR@`f~bh2RIvyaN?V~-2a`*`ph-iL z;^HW{799LotU9+0Yt2!bCVZf;JBE>hzEl0u6Z503ls?%w0>9UwF+Of|bE09CV$ zR6HhTbE{(D6+wgnjA2M(rk+SIX5cx#?&0I>U6f~epZjz4DS49tK9P8i>4rtTK|Hf* z>74h8L#!kz#OK8023?T&k?XR{Z=8z`3p_JqWK#3QA!4!E!Ey()lA#h$6Gs$PqkJLj zvch?bvs$UK);;+PgL!Qw&2^f?h+_!}Bq2gZ4P{hdAxf)8iis5M$2|Oljz38*nOtQs zax9<<6_Voz|AXJ%nuV!JHz^ncx?gPjV+0870?oQ@e;?a+^91le16NwxUu^)hpQP8@ zTI2}m-v%zO+nT%wT*Yz^VpW@9lF37?>Dn2!^=f(^K^sV6@b~2Mi1h z3=C5L9-xRL16*p5#cA$x#`)DD|LqMF2r4{y;Q^dYta|!H=rbmSYcgkFWWXkl3~;GI z7N@<-VKzTwQh?i>Ir}1tI5t6})E0|1INMg9pwI_>}f002ovPDHLk FV1n=A6deEn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/Tabletop/backgammon.rsi/meta.json b/Resources/Textures/Objects/Fun/Tabletop/backgammon.rsi/meta.json new file mode 100644 index 0000000000..3a4aac93f1 --- /dev/null +++ b/Resources/Textures/Objects/Fun/Tabletop/backgammon.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Fishfish458", + "size": { + "x": 23, + "y": 16 + }, + "states": [ + { + "name": "board" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/Tabletop/backgammon_tabletop.rsi/backgammonBoard.png b/Resources/Textures/Objects/Fun/Tabletop/backgammon_tabletop.rsi/backgammonBoard.png new file mode 100644 index 0000000000000000000000000000000000000000..0514e6662b42e4aef374d0fef5aad98d1a63c998 GIT binary patch literal 9896 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/Tabletop/parchis_pieces.rsi/blue.png b/Resources/Textures/Objects/Fun/Tabletop/generic_pieces.rsi/blue.png similarity index 100% rename from Resources/Textures/Objects/Fun/Tabletop/parchis_pieces.rsi/blue.png rename to Resources/Textures/Objects/Fun/Tabletop/generic_pieces.rsi/blue.png diff --git a/Resources/Textures/Objects/Fun/Tabletop/parchis_pieces.rsi/green.png b/Resources/Textures/Objects/Fun/Tabletop/generic_pieces.rsi/green.png similarity index 100% rename from Resources/Textures/Objects/Fun/Tabletop/parchis_pieces.rsi/green.png rename to Resources/Textures/Objects/Fun/Tabletop/generic_pieces.rsi/green.png diff --git a/Resources/Textures/Objects/Fun/Tabletop/parchis_pieces.rsi/meta.json b/Resources/Textures/Objects/Fun/Tabletop/generic_pieces.rsi/meta.json similarity index 69% rename from Resources/Textures/Objects/Fun/Tabletop/parchis_pieces.rsi/meta.json rename to Resources/Textures/Objects/Fun/Tabletop/generic_pieces.rsi/meta.json index 5412a69967..1fb44fb537 100644 --- a/Resources/Textures/Objects/Fun/Tabletop/parchis_pieces.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Tabletop/generic_pieces.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Zumorica", + "copyright": "Zumorica, Fishfish458", "size": { "x": 24, "y": 24 @@ -18,6 +18,12 @@ }, { "name": "blue" + }, + { + "name": "white" + }, + { + "name": "black" } ] } diff --git a/Resources/Textures/Objects/Fun/Tabletop/parchis_pieces.rsi/red.png b/Resources/Textures/Objects/Fun/Tabletop/generic_pieces.rsi/red.png similarity index 100% rename from Resources/Textures/Objects/Fun/Tabletop/parchis_pieces.rsi/red.png rename to Resources/Textures/Objects/Fun/Tabletop/generic_pieces.rsi/red.png diff --git a/Resources/Textures/Objects/Fun/Tabletop/generic_pieces.rsi/white.png b/Resources/Textures/Objects/Fun/Tabletop/generic_pieces.rsi/white.png new file mode 100644 index 0000000000000000000000000000000000000000..61d55b4ef0c612c0ee9056d9eddda2ab582dea9b GIT binary patch literal 615 zcmV-t0+{`YP)EX>4Tx04R}tkv&MmKpe$iQ>7vm5sP0qWT;LSL`58>ibb$c+6t{Ym|XfHG-*gu zTpR`0f`cE6RRitw zOXs{#9AZUDAwDM_Gw6cEk6f2se&bwlSm2o6%Cbmia4yO8s!Ta zmle)ioYhi=HSWn@7|dzQDX!BTMhuIHBLNXID%d~?79zB2q?kz3e$>N1Lere~bWuU7%jI?eAmTuAcz@XW&X}`pY$7=9Bbl zQwtvf-P^#$byJh~fXf|V;7OMZ$&vgtg?t`(KcjET0=>6D=c?OVV;`pvK$^N*x&aOj zfzbkGuX((?qqVnx&ouh`0fcUHu7W89tN;K232;bRa{vGf6951U69E94oEQKA00(qQ zO+^Rg3>OwNH`X4#O8@`>bxA})R7l5TV4yKzBu0^vg2{hu;`bh$VWh|cTn3Y35hF2% z-@Shts~TlRQ-YQ-;xinV!MH5KW(gyuh7+=cks5~MvxJdahU2n?i7xqoTCT_D3!3|2 z)PjMxV3_0sx)c?3DeUM{T+^k(p-YuXtxBKf004VWT^?uGO5*?k002ovPDHLkV1l1{ B13~}* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/Tabletop/parchis_pieces.rsi/yellow.png b/Resources/Textures/Objects/Fun/Tabletop/generic_pieces.rsi/yellow.png similarity index 100% rename from Resources/Textures/Objects/Fun/Tabletop/parchis_pieces.rsi/yellow.png rename to Resources/Textures/Objects/Fun/Tabletop/generic_pieces.rsi/yellow.png