Skip to content

Easier language implementation + Updated font #46

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

Merged
shiffman merged 3 commits into from
Dec 6, 2022
Merged

Easier language implementation + Updated font #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ac3ea0
Easier language implementation
Rodak123 Dec 4, 2022
f4f65e5
Updated font with German, Czech, and Italian characters
Rodak123 Dec 6, 2022
03865bd
Font now has spacing between letters
Rodak123 Dec 6, 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
202 changes: 177 additions & 25 deletions data/page_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,47 +29,84 @@
"title": "The Oregon Trail",
"choices": [
{
"text": "Travel the trail",
"text": {
"en": "Travel the trail",
"de": "Befahre die Spur"
},
"action": {
"type": "changePage",
"newPageName": "occupation"
}
},
{
"text": "Learn about the trail",
"text": {
"en": "Learn about the trail",
"de": "Mehr uber die Spur"
},
"action": {
"type": "changePage",
"newPageName": "about_game"
}
},
{
"text": "See the Oregon Top Ten",
"text": {
"en": "See the Oregon Top Ten",
"de": "sehe Oregon Top Ten an"
},
"action": {
"type": "changePage",
"newPageName": ""
}
},
{
"text": "Turn sound off",
"text": {
"en": "Turn sound off",
"de": "Ton ausschalten"
},
"action": {
"type": "toggleSetting",
"setting": "sound",
"secondAction": {
"type": "changeText",
"texts": ["Turn sound off", "Turn sound on"],
"texts": [
{
"en": "Turn sound off",
"de": "Ton ausschalten"
},
{
"en": "Turn sound on",
"de": "Ton anschalten"
}
],
"current": 0
}
}
},
{
"text": "Open the test page",
"text": {
"en": "Open the test page",
"de": "Testseite aufmachen"
},
"action": {
"type": "changePage",
"newPageName": "test"
}
},
{
"text": {
"en": "Change Language",
"de": "Sprache aendern"
},
"action": {
"type": "changePage",
"newPageName": "language"
}
}
],
"prompt": "What is your choice?",
"prompt": {
"en": "What is your choice?",
"de": "Was ist deine Wahl?"
},
"img": "img/title.png",
"content": {
"textIndent": 5
Expand All @@ -81,45 +118,66 @@
"type": "choice",
"showInput": true,
"data": {
"title": ["Many kinds of people made the", "trip to Oregon."],
"title": {
"en": ["Many kinds of people made the", "trip to Oregon."],
"de": ["Viele Arten von Menschen haben das gemacht", "Reise nach Oregon."]
},
"choices": [
{
"text": "Be a banker from Boston",
"text": {
"en": "Be a banker from Boston",
"de": "Sei ein Banker aus Boston"
},
"action": {
"type": "changePage",
"newPageName": ""
}
},
{
"text": "Be a carpenter from Ohio",
"text": {
"en": "Be a carpenter from Ohio",
"de": "Seien Sie ein Zimmermann aus Ohio"
},
"action": {
"type": "changePage",
"newPageName": ""
}
},
{
"text": "Be a farmer from Illinois",
"text": {
"en": "Be a farmer from Illinois",
"de": "Sei ein Bauer aus Illinois"
},
"action": {
"type": "changePage",
"newPageName": ""
}
},
{
"text": ["Find out the differences", "between theese choices"],
"text": {
"en": ["Find out the differences", "between theese choices"],
"de": ["Finden Sie die Unterschiede heraus", "zwischen diesen Entscheidungen"]
},
"action": {
"type": "changePage",
"newPageName": ""
}
},
{
"text": "Return back",
"text": {
"en": "Return back",
"de": "Kehren Sie zurück"
},
"action": {
"type": "changePage",
"newPageName": "main_menu"
}
}
],
"prompt": "What is your choice?",
"prompt": {
"en": "What is your choice?",
"de": "Was ist deine Wahl?"
},
"img": "",
"content": {
"textIndent": 2
Expand All @@ -133,17 +191,14 @@
"data": {
"title": "The Oregon Trail",
"prompt": "Press SPACE BAR to continue",
"text": [
"Try taking a journey by",
"covered wagon across 2000",
"miles of plains, rivers, and",
"mountains. Try! On the",
"plains, will you slosh your",
"oxen through mud and",
"water-filled ruts or will you",
"plod through dust six inches",
"deep?"
],
"text": {
"en": [
"Try taking a journey by covered wagon across 2000 miles of plains, rivers, and mountains. Try! On the plains, will you slosh your oxen through mud and water-filled ruts or will you plod through dust six inches deep?"
],
"de": [
"Versuchen Sie, eine Reise mit einem Planwagen über 2000 Meilen von Ebenen, Flüssen und Bergen zu unternehmen. Versuchen! Werden Sie Ihre Ochsen in der Ebene durch schlammige und wassergefüllte Furchen schwappen oder durch sechs Zoll tiefen Staub stapfen?"
]
},
"action": {
"type": "changePage",
"newPageName": "main_menu"
Expand All @@ -156,6 +211,103 @@
},
{
"name": "test"
},
{
"name": "language",
"type": "choice",
"showInput": true,
"data": {
"title": {
"en": "Choose your display language",
"de": "Wählen Sie Ihre Anzeigesprache"
},
"choices": [
{
"text": {
"en": "English",
"de": "Englisch"
},
"action": {
"type": "changeLanguage",
"language": "en",
"secondAction": {
"type": "changePage",
"newPageName": "main_menu"
}
}
},
{
"text": {
"en": "Deutsch",
"de": "Deutsch"
},
"action": {
"type": "changeLanguage",
"language": "de",
"secondAction": {
"type": "changePage",
"newPageName": "main_menu"
}
}
},
{
"text": {
"en": "Italiano",
"de": "Italienisch"
},
"action": {
"type": "changeLanguage",
"language": "it",
"secondAction": {
"type": "changePage",
"newPageName": "main_menu"
}
}
},
{
"text": {
"en": "Czech",
"de": "Tschechisch"
},
"action": {
"type": "changeLanguage",
"language": "cz",
"secondAction": {
"type": "changePage",
"newPageName": "main_menu"
}
}
},
{
"text": {
"en": "Add new language",
"de": "Neue Sprache hinzufuegen"
},
"action": {
"type": "changePage",
"newPageName": "test"
}
},
{
"text": {
"en": "Cancel",
"de": "beenden"
},
"action": {
"type": "changePage",
"newPageName": "main_menu"
}
}
],
"prompt": {
"en": "What is your choice?",
"de": "Was ist deine Wahl?"
},
"img": "",
"content": {
"textIndent": 2
}
}
}
]
}
Binary file modified fonts/codegon-mono.ttf
View file
Open in desktop
Binary file not shown.
Binary file modified fonts/codegon.ttf
View file
Open in desktop
Binary file not shown.
16 changes: 15 additions & 1 deletion js/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,24 @@ class Page {
this.renderPosition.y += offset;
}

renderText(indent, lines, prefix) {
getLinesFromTextObject(textObject) {
let lines = textObject[SETTINGS.language];
if (lines === undefined) {
if (textObject instanceof Object) {
lines = Object.values(textObject)[0];
} else {
lines = textObject; // if no translations avaiable
}
}
if (lines instanceof Array == false) {
lines = [lines];
}
return lines;
}

renderText(indent, textObject, prefix) {
const lines = this.getLinesFromTextObject(textObject);

let x = this.renderPosition.x + indent * this.fontSize;

for (var i = 0; i < lines.length; i++) {
Expand Down
3 changes: 3 additions & 0 deletions js/page_manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ class PageManager {
goToStart: (actionData) => {
this.changeToStartPage();
},
changeLanguage: (actionData) => {
SETTINGS.language = actionData.action.language;
},
};

/*
Expand Down
3 changes: 3 additions & 0 deletions js/page_types/info.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ class Info extends Page {
loadData(data) {
super.loadData(data);

const img = data.img;
if (img.length != 0) this.img = loadImage(img);

this.loadImportantVariable(data, 'prompt');
this.loadImportantVariable(data, 'action');
this.loadImportantVariable(data, 'text');
Expand Down
1 change: 1 addition & 0 deletions js/sketch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ p5.disableFriendlyErrors = true;
const SETTINGS = {
sound: true,
scale: 2,
language: 'en',
};

let data;
Expand Down