Skip to content

Commit

Permalink
fix #2462 & #2463
Browse files Browse the repository at this point in the history
* small test

* version bump
  • Loading branch information
BastLast authored Mar 27, 2024
1 parent 853e577 commit c55c7e0
Show file tree
Hide file tree
Showing 15 changed files with 258 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fr.bast.draftbot",
"version": "4.5.3.a",
"version": "4.5.4",
"main": "src/index.js",
"engines": {
"node": ">=16.17.1"
Expand Down
4 changes: 4 additions & 0 deletions resources/text/error.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"titleMeIsHurt": "{pseudo}, vous êtes actuellement blessé !",
"titleMeIsConfounded": "{pseudo}, vous êtes actuellement confus !",
"titleMeIsLost": "{pseudo}, vous êtes actuellement perdu !",
"titleMeIsFished": "{pseudo}, vous êtes actuellement empoissonné !",
"titleMeIsSleeping": "{pseudo}, vous êtes actuellement endormi !",
"titleMeIsOccupied": "{pseudo}, vous êtes actuellement occupé !",
"titleMeIsFine": "{pseudo}, vous n'êtes pas atteint par une altération d'état !",
Expand All @@ -48,6 +49,7 @@
"playerIsDrunk": "{askedPseudo} est actuellement ivre !",
"playerIsConfounded": "{askedPseudo} est actuellement confus !",
"playerIsLost": "{askedPseudo} est actuellement perdu !",
"playerIsFished": "{askedPseudo} est actuellement empoissonné !",
"playerBlocked": "Vous ne pouvez pas effectuer cela car vous avez une action en attente ({context}) !",
"anotherPlayerBlocked": "Vous ne pouvez pas effectuer cela car {username} a une action en attente ({context}) !",
"nameRules": "- Utiliser au moins une lettre\n- Ne pas mettre plus de 2 espaces consécutifs\n- Les caractères spéciaux ne sont pas autorisés\n- Entre {min} et {max} caractères",
Expand Down Expand Up @@ -122,6 +124,7 @@
"titleMeIsHurt": "{pseudo}, you are currently injured!",
"titleMeIsConfounded": "{pseudo}, you are currently confused!",
"titleMeIsLost": "{pseudo}, you are currently lost!",
"titleMeIsFished": "{pseudo}, you are currently fished!",
"titleMeIsSleeping": "{pseudo}, you are currently asleep!",
"titleMeIsOccupied": "{pseudo}, you are currently occupied!",
"titleMeIsFine": "{pseudo}, you are not affected by an alteration of state!",
Expand All @@ -143,6 +146,7 @@
"playerIsStarving": "{askedPseudo} is currently starving!",
"playerIsConfounded": "{askedPseudo} is currently confused!",
"playerIsLost": "{askedPseudo} is currently lost!",
"playerIsFished": "{askedPseudo} is currently fished!",
"playerBlocked": "You can't do this because you currently have a pending action ({context})!",
"anotherPlayerBlocked": "You can't do this because {username} currently has a pending action ({context})!",
"nameRules": "- Use at least one letter\n- Two spaces or more aren't allowed\n- Special characters aren't allowed\n- Between {min} and {max} characters",
Expand Down
83 changes: 83 additions & 0 deletions resources/text/events/74.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"triggers": [
{
"level": 20,
"date": {
"month": {
"from": 4,
"to": 4
},
"day": {
"from": 1,
"to": 3
}
},
"oncePer": "year",
"mapAttributes": [
"continent1"
]
}
],
"translations": {
"fr": "🐟 Alors que vous déambulez sans but précis, vos narines sont soudainement assaillies par une intense odeur iodée. Une étrange femme vêtue d'une robe aux motifs d'écailles de poisson, les cheveux emmêlés d'algues séchées, vous fait signe de la main. Elle est entourée de paniers débordant de fruits de mer aux couleurs vives et vous invite, avec un sourire édenté mais chaleureux, à goûter à sa spécialité culinaire : un plat mijoté avec amour à partir des plus beaux produits de l'océan.",
"en": "🐟 As you wander aimlessly, your nostrils are suddenly assaulted by a strong briny smell. A strange woman dressed in a fish scale-patterned gown, her hair tangled with dried seaweed, beckons you to come over. Surrounded by baskets brimming with brightly colored seafood, she invites you with a toothless yet warm smile to taste her culinary specialty, a lovingly stewed dish made from the finest oceanic produce."
},
"possibilities": {
"🍽️": {
"translations": {
"fr": "Prendre une grande bouchée du plat.",
"en": "Take a big bite of the dish."
},
"outcomes": [
{
"translations": {
"fr": "Le mélange des saveurs est divin, et une sensation d'euphorie vous envahit. Vos yeux se ferment malgré vous, et lorsque vous les rouvrez, vous découvrez que vous êtes à bord d'un bateau, bercé par le clapotis des vagues.",
"en": "The blend of flavors is heavenly, and a sense of euphoria washes over you. Your eyes close involuntarily, and when you reopen them, you find yourself aboard a boat, lulled by the lapping of the waves."
},
"mapLink": 1000
}
]
},
"🏃": {
"translations": {
"fr": "Partir en courant.",
"en": "Run away."
},
"outcomes": [
{
"translations": {
"fr": "La femme semble offensée par votre refus. Elle vous lance des invectives marines et vous bombarde de poissons morts. Vous parvenez à esquiver la plupart, mais un spécimen vous frappe en plein visage. Vous continuez à courir sans vous retourner.",
"en": "The woman seems offended by your refusal. She hurls marine insults and bombards you with dead fish. You manage to dodge most, but one specimen hits you square in the face. You keep running without looking back."
},
"effect": ":fish:"
}
]
},
"👃": {
"translations": {
"fr": "Renifler le plat de plus près d'un air suspicieux.",
"en": "Sniff the dish suspiciously up close."
},
"outcomes": [
{
"translations": {
"fr": "Vous vous penchez légèrement, intrigué par la senteur corsée émanant du plat de fruits de mer et la femme vous observe avec une intensité qui vous donne la chair de poule. Vous êtes sur le point de commenter le mélange curieux quand, soudainement, vous sentez ses mains vous écraser le visage contre l'assiette. Le monde devient humide et froid alors que votre nez plonge dans le plat. Vous croisez le regard vitreux d'un poisson cuit, l'œil de ce dernier vient peu à peu se presser contre le vôtre. Vos sens chavirent et l'obscurité engloutit votre vision. Lorsque vous reprenez conscience, vous êtes accueilli par le grincement du bois et l'odeur du sel, vous ressentez un balancement régulier et réalisez que vous êtes allongé sur les planches rugueuses du pont d'un navire.",
"en": "You lean in slightly, intrigued by the strong scent emanating from the seafood dish, and the woman watches you with an intensity that sends shivers down your spine. You're about to comment on the strange mix when, suddenly, you feel her hands crushing your face against the plate. The world becomes wet and cold as your nose plunges into the dish. You meet the glassy gaze of a cooked fish, its eye gradually pressing against your own. Your senses reel, and darkness swallows your vision. When you regain consciousness, you are greeted by the creaking of wood and the smell of salt, you feel a steady rocking, and realize that you're lying on the rough planks of a ship's deck."
},
"mapLink": 1000
}
]
},
"end": {
"outcomes": [
{
"translations": {
"fr": ":fish: Vous ne bougez pas, comme pétrifié. La femme prend cette réaction comme un refus et s'énerve . Elle vous lance des invectives marines et vous bombarde de poissons morts. Vous parvenez à esquiver la plupart, mais un spécimen vous frappe en plein visage. Vous continuez à courir sans vous retourner.",
"en": ":fish: You do not move, as if petrified. The woman takes this reaction as a refusal and becomes angry. She hurls marine insults and bombards you with dead fish. You manage to dodge most, but one specimen hits you square in the face. You keep running without looking back."
},
"effect": ":fish:"
}
]
}
}
}
12 changes: 12 additions & 0 deletions resources/text/objects/89.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"translations": {
"fr": "Poisson mort",
"en": "Dead fish"
},
"emote": ":fish:",
"rarity": 1,
"power": 1,
"nature": 3,
"frenchMasculine": 1,
"frenchPlural": 0
}
15 changes: 15 additions & 0 deletions resources/text/pets/73.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"translations": {
"fr": {
"maleName": "Poisson",
"femaleName": "Poisson"
},
"en": {
"maleName": "Fish",
"femaleName": "Fish"
}
},
"emoteMale": "🐟",
"emoteFemale": "🐟",
"rarity": 1
}
15 changes: 15 additions & 0 deletions resources/text/pets/74.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"translations": {
"fr": {
"maleName": "Poisson tropical",
"femaleName": "Poisson tropical"
},
"en": {
"maleName": "Tropical fish",
"femaleName": "Tropical fish"
}
},
"emoteMale": "🐠",
"emoteFemale": "🐠",
"rarity": 5
}
15 changes: 15 additions & 0 deletions resources/text/pets/75.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"translations": {
"fr": {
"maleName": "Poisson-globe",
"femaleName": "Poisson-globe"
},
"en": {
"maleName": "Blowfish",
"femaleName": "Blowfish"
}
},
"emoteMale": "🐡",
"emoteFemale": "🐡",
"rarity": 3
}
15 changes: 15 additions & 0 deletions resources/text/pets/76.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"translations": {
"fr": {
"maleName": "Méduse",
"femaleName": "Méduse"
},
"en": {
"maleName": "Jellyfish",
"femaleName": "Jellyfish"
}
},
"emoteMale": "🪼",
"emoteFemale": "🪼",
"rarity": 2
}
15 changes: 15 additions & 0 deletions resources/text/pets/77.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"translations": {
"fr": {
"maleName": "Requin",
"femaleName": "Requin"
},
"en": {
"maleName": "Shark",
"femaleName": "Shark"
}
},
"emoteMale": "🦈",
"emoteFemale": "🦈",
"rarity": 4
}
15 changes: 15 additions & 0 deletions resources/text/pets/78.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"translations": {
"fr": {
"maleName": "Baleine",
"femaleName": "Baleine"
},
"en": {
"maleName": "Whale",
"femaleName": "Whale"
}
},
"emoteMale": "🐋",
"emoteFemale": "🐋",
"rarity": 3
}
15 changes: 15 additions & 0 deletions resources/text/pets/79.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"translations": {
"fr": {
"maleName": "Baleine",
"femaleName": "Baleine"
},
"en": {
"maleName": "Whale",
"femaleName": "Whale"
}
},
"emoteMale": "🐳",
"emoteFemale": "🐳",
"rarity": 5
}
15 changes: 15 additions & 0 deletions resources/text/pets/80.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"translations": {
"fr": {
"maleName": "Crevette",
"femaleName": "Crevette"
},
"en": {
"maleName": "Shrimp",
"femaleName": "Shrimp"
}
},
"emoteMale": "🦐",
"emoteFemale": "🦐",
"rarity": 2
}
15 changes: 15 additions & 0 deletions resources/text/pets/81.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"translations": {
"fr": {
"maleName": "Homard",
"femaleName": "Homard"
},
"en": {
"maleName": "Lobster",
"femaleName": "Lobster"
}
},
"emoteMale": "🦞",
"emoteFemale": "🦞",
"rarity": 4
}
15 changes: 15 additions & 0 deletions resources/text/pets/82.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"translations": {
"fr": {
"maleName": "Dauphin",
"femaleName": "Dauphin"
},
"en": {
"maleName": "Dolphin",
"femaleName": "Dolphin"
}
},
"emoteMale": "🐬",
"emoteFemale": "🐬",
"rarity": 4
}
12 changes: 8 additions & 4 deletions src/core/constants/EffectsConstants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ export abstract class EffectsConstants {
STARVING: ":drooling_face:",
CONFOUNDED: ":confounded:",
LOST: ":face_with_monocle:",
SCARED: ":scream:"
SCARED: ":scream:",
FISHED: ":fish:"
};

static readonly EMOJIS = {
Expand All @@ -32,7 +33,8 @@ export abstract class EffectsConstants {
":drooling_face:": "🤤",
":confounded:": "😖",
":face_with_monocle:": "🧐",
":scream:": "😱"
":scream:": "😱",
":fish:": "🐟"
};

static readonly ERROR_TEXT = {
Expand All @@ -50,7 +52,8 @@ export abstract class EffectsConstants {
":drooling_face:": "Starving",
":confounded:": "Confounded",
":face_with_monocle:": "Lost",
":scream:": "Scared"
":scream:": "Scared",
":fish:": "Fished"
};

static readonly DURATION = {
Expand All @@ -68,6 +71,7 @@ export abstract class EffectsConstants {
":drooling_face:": 50,
":confounded:": 40,
":face_with_monocle:": 270,
":scream:": 15
":scream:": 15,
":fish:": 5
};
}

0 comments on commit c55c7e0

Please sign in to comment.