Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(character/deletion): Fixes deletion logic and adds missing language settings #23

Merged
merged 8 commits into from
Mar 26, 2022
Merged

fix(character/deletion): Fixes deletion logic and adds missing language settings #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d4b9160
update translation files to show correct text when deleting a character
Local9 Mar 26, 2022
85759df
update build folder
Local9 Mar 26, 2022
ebad7c6
json lint
Local9 Mar 26, 2022
c127615
fix logic around character deletion
Local9 Mar 26, 2022
52d316b
fix prompt handling for deletion logic
Local9 Mar 26, 2022
e451e59
remove loggers
Local9 Mar 26, 2022
1ca0a60
Health is no longer reset to the value before refresh
Local9 Mar 26, 2022
b598145
update build .dll
Local9 Mar 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 50 additions & 88 deletions VORP-Character[Client-Server]/build/vorp_character/config/En.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
{
"PressRightOrLeft": "Press [<-] or [->] to select your gender",

"PressGuide": "Rotate <-[A] [D]-> | Cameras [W] or [S]",

//New Update
"CreateNewChar": "Create New",
"DeleteChar": "Delete",
"MoneyTag": "Money",
"CharactersFull": "You can't create more characters",
"PressSelectInfo": "Change character <- or -> | Select Character [ENTER]",

"ButtonSupprName": "Confirm Deletion",
"SUPPRConfirmMsg": "Enter 'delete' to delete the character.",
"SUPPRCode": "delete",
"CommandHat": "hat",
"CommandEyeWear": "eyewear",
"CommandMask": "mask",
Expand Down Expand Up @@ -40,102 +39,75 @@
"CommandGunbeltAccs": "gunbeltaccs",
"CommandUndress": "undress",
"CommandDress": "dress",

"Scale": "Height #",
"ScaleList": "Character Height",
"ScaleDesc": "Adjust the height (we recommend choosing this as your final option or you will not be able to see the cameras well)",

"EyeBrows": "Eyebrows #",
"EyeBrowsList": "Type of Eyebrows",
"EyeBrowsDesc": "Eyebrows form",

"Scars": "Scar #",
"ScarsList": "Types of Scars",
"ScarsDesc": "Add Scars",

"Spots": "Spots #",
"SpotsList": "Types of Spots",
"SpotsDesc": "Solar Spots",

"Disc": "Petechiae #",
"DiscList": "Types of Petechiae",
"DiscDesc": "Red stains on the face (because of the age)",

"Complex": "Complexion #",
"ComplexList": "Types of Complexion",
"ComplexDesc": "Solar burns",

"Acne": "Acne #",
"AcneList": "Types of Acne",
"AcneDesc": "Add Acne to the face",

"Ageing": "Ageing #",
"AgeingList": "Types of Ageing",
"AgeingDesc": "Face Ageing",

"Moles": "Moles #",
"MolesList": "Types of Moles",
"MolesDesc": "Add Moles",

"Freckles": "Freckles #",
"FrecklesList": "Types of Freckles",
"FrecklesDesc": "Add Freckles",

"Grimes": "Grime #",
"GrimesList": "Types of Grime",
"GrimesDesc": "Add grime or dirt",

"Lipsticks": "Lipstick #",
"LipsticksList": "Types of Lipstick",
"LipsticksDesc": "Add Makeup",

"LipsticksColors": "Color #",
"LipsticksColorsList": "Base Lipstick Color",
"LipsticksColorsDesc": "Add Makeup",

"LipsticksPColors": "Color #",
"LipsticksPColorsList": "Mixed Lipstick Color",
"LipsticksPColorsDesc": "Add Makeup",

"Shadows": "Eyeshadow #",
"ShadowsList": "Types of Eyeshadow",
"ShadowsDesc": "Add Makeup",

"ShadowsColors": "Color #",
"ShadowsColorsList": "Base Eyeshadow Color",
"ShadowsColorsDesc": "Add Makeup",

"ShadowsPColors": "Color #",
"ShadowsPColorsList": "Mixed Eyeshadow Color",
"ShadowsPColorsDesc": "Add Makeup",

"Eyes": "Eyes #",
"EyesList": "Types of Eyes",
"EyesDesc": "Change the eye color",

//Input Name
"PlaceHolderInputName": "Write the first name and last name of your character",
"ButtonInputName": "Confirm",
"InputError": "You must have a name longer than 3 letters",

//Body
"TitleMainMenu": "Character Editor",
"SubTitleMainMenu": "Customize your character",
"FinishBtnMainMenu": "Finish and Safe",
"SubFinishBtnMainMenu": "Finish character creation.",

"TitleClothesMenu": "Dressing room",
"SubTitleClothesMenu": "Dress up your character",

"TitleFaceMenu": "Customize face",
"SubTitleFaceMenu": "Customize your characters face",

"TitleSkinMenu": "Customize Skin",
"SubTitleSkinMenu": "Customize your characters body",

"TitleImportMenu": "Import Skin",
"SubTitleImportMenu": "If you have played in another server that uses VORP Core you will be able to import your skin.",

"LegsValues": "Legs #",
"TorsoValues": "Torso #",
"FaceValues": "Face #",
Expand All @@ -147,7 +119,6 @@
"BodySizeValue": "Body #",
"WaistValue": "Waist #",
"NoExistValue": "Does not exist",

"LegsType": "Type of legs",
"TorsoType": "Type of torso",
"FaceType": "Type of face",
Expand Down Expand Up @@ -196,8 +167,6 @@
"BodyType": "Type of body",
"WaistType": "Type of waist",
"Confirm": "Confirm",

///Descriptions of the body Menu sections
"LegsTypeDesc": "Choose the type of legs",
"TorsoTypeDesc": "Choose the type of torso",
"FaceTypeDesc": "Choose the type of face",
Expand Down Expand Up @@ -246,67 +215,63 @@
"BodyTypeDesc": "Choose the body type",
"WaistTypeDesc": "Choose the waist",
"ConfirmDesc": "Time to dress up, you will be able to return to this section if you want to change something",

//Ropa
"TitleMenuClothes": "Dressing room", // Menu Tittle
"SubTitleMenuClothes": "Dress up your character", // Menu Description

"HatsValue": "Hat #", // The options of the hats section
"GlassesValue": "Glasses #", // The options of the glasses section
"NeckwearValue": "Garment #", // The options of the neckwear section
"TiesValue": "Tie #", // The options of the ties section
"ShirtsValue": "Shirt #", // The options of the shirts section
"SuspendersValue": "Suspenders #", // The options of the suspenders section
"VestsValue": "Vest #", // The options of the vests section
"CoatsValue": "Coat #", // The options of the coats section
"PonchosValue": "Poncho #", // The options of the ponchos section
"CloaksValue": "Cap #", // The options of the cloaks section
"GlovesValue": "Gloves #", // The options of the gloves section
"RingsValue": "Ring #", // The options of the rings section
"BraceletsValue": "Bracelet #", // The options of the bracelets section
"HolstersValue": "Holster #", // The options of the holsters section
"BeltsValue": "Belt #", // The options of the belts section
"BucklesValue": "Buckle #", // The options of the buckles section
"PantsValue": "Pants #", // The options of the pants section
"SkirtsValue": "Falda #", // The options of the skirts section
"ChapsValue": "Chaps #", // The options of the chaps section
"BootsValue": "Boots #", // The options of the boots section
"SpursValue": "Spurs #", // The options of the spurs section
"TitleMenuClothes": "Dressing room",
"SubTitleMenuClothes": "Dress up your character",
"HatsValue": "Hat #",
"GlassesValue": "Glasses #",
"NeckwearValue": "Garment #",
"TiesValue": "Tie #",
"ShirtsValue": "Shirt #",
"SuspendersValue": "Suspenders #",
"VestsValue": "Vest #",
"CoatsValue": "Coat #",
"PonchosValue": "Poncho #",
"CloaksValue": "Cap #",
"GlovesValue": "Gloves #",
"RingsValue": "Ring #",
"BraceletsValue": "Bracelet #",
"HolstersValue": "Holster #",
"BeltsValue": "Belt #",
"BucklesValue": "Buckle #",
"PantsValue": "Pants #",
"SkirtsValue": "Falda #",
"ChapsValue": "Chaps #",
"BootsValue": "Boots #",
"SpursValue": "Spurs #",
"SpatsValue": "Spats #",
"GauntletsValue": "Gauntlets #",
"LoadoutsValue": "Loadouts #",
"AccessoriesValue": "Accessories #",
"SatchelsValue": "Satchels #",
"GunbeltAccsValue": "Gunbelt Accessories #",
"NoHatsValue": "Without a Hat", // The option it gives when you do not wear a hat
"NoGlassesValue": "Without Glasses", // The option it gives when you do not wear glasses
"NoNeckwearValue": "Without Neckwear", // The option it gives when you do not wear neckwear
"NoTiesValue": "Without a Tie", // The option it gives when you do not wear a tie
"NoShirtsValue": "Without a Shirt", // The option it gives when you do not wear a shirt
"NoSuspendersValue": "Without Suspenders", // The option it gives when you do not wear suspenders
"NoVestsValue": "Without a Vest", // The option it gives when you do not wear a vest
"NoCoatsValue": "Without a Coat", // The option it gives when you do not wear a coat
"NoPonchosValue": "Without a Poncho", // The option it gives when you do not wear a poncho
"NoCloaksValue": "Without a Cloak", // The option it gives when you do not wear a cloak
"NoGlovesValue": "Without Gloves", // The option it gives when you do not wear gloves
"NoRingsValue": "Without a Ring", // The option it gives when you do not wear a ring
"NoBraceletsValue": "Without a Bracelet", // The option it gives when you do not wear a bracelet
"NoHolstersValue": "Without a Holster", // The option it gives when you do not wear a holster
"NoBeltsValue": "Without a Belt", // The option it gives when you do not wear a belt
"NoBucklesValue": "Without a Buckle", // The option it gives when you do not wear a buckle
"NoPantsValue": "Without Pants", // The option it gives when you do not wear pants
"NoSkirtsValue": "Without a Skirt", // The option it gives when you do not wear a skirt
"NoChapsValue": "Without Chaps", // The option it gives when you do not wear chaps
"NoBootsValue": "Without Boots", // The option it gives when you do not wear boots
"NoSpursValue": "Without Spurs", // The option it gives when you do not wear spurs
"NoHatsValue": "Without a Hat",
"NoGlassesValue": "Without Glasses",
"NoNeckwearValue": "Without Neckwear",
"NoTiesValue": "Without a Tie",
"NoShirtsValue": "Without a Shirt",
"NoSuspendersValue": "Without Suspenders",
"NoVestsValue": "Without a Vest",
"NoCoatsValue": "Without a Coat",
"NoPonchosValue": "Without a Poncho",
"NoCloaksValue": "Without a Cloak",
"NoGlovesValue": "Without Gloves",
"NoRingsValue": "Without a Ring",
"NoBraceletsValue": "Without a Bracelet",
"NoHolstersValue": "Without a Holster",
"NoBeltsValue": "Without a Belt",
"NoBucklesValue": "Without a Buckle",
"NoPantsValue": "Without Pants",
"NoSkirtsValue": "Without a Skirt",
"NoChapsValue": "Without Chaps",
"NoBootsValue": "Without Boots",
"NoSpursValue": "Without Spurs",
"NoSpatsValue": "Without Spats",
"NoGauntletsValue": "Without Gauntlets",
"NoLoadoutsValue": "Without Loadouts",
"NoAccessoriesValue": "Without Accessories",
"NoSatchelsValue": "Without Satchels",
"NoGunbeltAccsValue": "Without Gunbelt Accs",
"NoMaskValue": "Without Face Mask", // The option it gives when you do not wear a face mask

"NoMaskValue": "Without Face Mask",
"Hats": "Hats",
"Glasses": "Glasses",
"Masks": "Face Masks",
Expand Down Expand Up @@ -338,10 +303,7 @@
"Accessories": "Accessories",
"Satchels": "Satchels",
"GunbeltAccs": "Gunbelt Accessories",

"Finish": "Dress up character", // Confirms the options of the Menu

// Descriptions of the Clothing Menu
"Finish": "Dress up character",
"HatsDesc": "Choose the hat",
"GlassesDesc": "Choose the glasses",
"MasksDesc": "Choose the mask if you want to wear one",
Expand Down Expand Up @@ -374,4 +336,4 @@
"GunbeltAccsDesc": "Choose the gunbelt accessories",
"FinishDesc": "Make sure you have everything chosen as you want, you will have to go to a clothing store in order to change your clothes",
"TipFinal": "Welcome to VORP RP, we hope that your stay is the most entertaining."
}
}
Loading