Lots of cleanup, fix some rewrite rules, better example

dropecho · Apr 27, 2020 · 146751b · 146751b
1 parent e8304e1
commit 146751b
Show file tree

Hide file tree

Showing 10 changed files with 269 additions and 123 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -51,9 +51,12 @@
   <button id="generate" onClick="generate()">Generate another</button>
   <div id="langname"></div>
   <div class="row">
-    <table id="config"/>
-    <table id="words" />
-    <table id="phrases" />
+    <div class="column">
+      <table id="config"></table>
+      <table id="ortho"></table>
+    </div>
+      <table id="words"></table>
+      <table id="phrases"></table>
   </div>
   <script src="./index.js"></script>
 </body>
diff --git a/docs/index.js b/docs/index.js
@@ -30,10 +30,12 @@ function generate(){
 
   let languagename = gen.createWord('language');
 
+  document.getElementById('langname').innerHTML =
+    `The language of ${ languagename }`;
+
   var configtable = document.getElementById('config');
   configtable.innerHTML = '<thead><th>Config</th><th></th></thead>';
 
-
   function addConfigRow(name, data) {
     var row = document.createElement('tr');
     configtable.append(row);
@@ -57,8 +59,37 @@ function generate(){
   addConfigRow('max syllables in word', gen.config.word_length_max);
 
 
-  document.getElementById('langname').innerHTML =
-    `The language of ${ languagename }`;
+  var orthoTable = document.getElementById('ortho');
+  orthoTable.innerHTML = '<thead><th>Phoneme</th><th>Written</th></thead>';
+
+  function addOrthoRow(letter, ortho) {
+    var row = document.createElement('tr');
+    orthoTable.append(row);
+
+    var configName = document.createElement('td');
+    configName.innerText = letter;
+    var configValue = document.createElement('td');
+    configValue.innerText = ortho;
+    row.append(configName);
+    row.append(configValue);
+  }
+
+  var letters = gen.config.vowels
+    .concat(gen.config.consonants)
+    .concat(gen.config.sset)
+    .concat(gen.config.lset)
+    .concat(gen.config.fset)
+    .reduce((a, b) => {
+      if(a.indexOf(b) === -1) {
+        a.push(b);
+      }
+
+      return a;
+    }, []);
+
+  for(let i = 0; i < letters.length; i++) {
+    addOrthoRow(letters[i], gen.spell.spell(letters[i]));
+  }
 
 
   let wordTable = document.getElementById('words');

diff --git a/docs/langgen.js b/docs/langgen.js
diff --git a/src/dropecho/langgen/Consts.hx b/src/dropecho/langgen/Consts.hx
@@ -1,5 +1,7 @@
 package dropecho.langgen;
 
+import seedyrng.Random;
+
 @:expose("Consts")
 class Consts {
 	public static var consonant_sets = [
@@ -87,37 +89,45 @@ class Consts {
 		'Doubles' => ['A' => 'aa', 'E' => 'ee', 'I' => 'ii', 'O' => 'oo', 'U' => 'uu']
 	];
 
-	public static function getRandomConsonantSet(random) {
+	public static function getRandomCorthSet(random:Random) {
+		return corthsets.get(random.choice([for (k in corthsets.keys()) k]));
+	}
+
+	public static function getRandomVorthSet(random:Random) {
+		return vorthsets.get(random.choice([for (k in vorthsets.keys()) k]));
+	}
+
+	public static function getRandomConsonantSet(random:Random) {
 		var keys = [for (x in consonant_sets.keys()) x];
 
 		return consonant_sets[random.choice(keys)];
 	}
 
-	public static function getRandomVowelSet(random) {
+	public static function getRandomVowelSet(random:Random) {
 		var keys = [for (x in vowel_sets.keys()) x];
 		return vowel_sets[random.choice(keys)];
 	}
 
-	public static function getRandomSSet(random) {
+	public static function getRandomSSet(random:Random) {
 		var keys = [for (x in ssets.keys()) x];
 		return ssets[random.choice(keys)];
 	}
 
-	public static function getRandomFSet(random) {
+	public static function getRandomFSet(random:Random) {
 		var keys = [for (x in fsets.keys()) x];
 		return fsets[random.choice(keys)];
 	}
 
-	public static function getRandomLSet(random) {
+	public static function getRandomLSet(random:Random) {
 		var keys = [for (x in lsets.keys()) x];
 		return lsets[random.choice(keys)];
 	}
 
-	public static function getRandomSyllableStructure(random) {
+	public static function getRandomSyllableStructure(random:Random) {
 		return random.choice(syllable_structures);
 	}
 
-	public static function getRandomPhraseStructure(random) {
+	public static function getRandomPhraseStructure(random:Random) {
 		return random.choice(phrase_structures);
 	}
 }