1
1

5 Commity 814f3f7863 ... d043c87c15

Autor SHA1 Správa Dátum
  Reddo d043c87c15 Multiple shortcuts for Say 5 rokov pred
  Reddo 5d2bf7f9e1 Bigger inputs 5 rokov pred
  Reddo 9b89bc24dd Let player choose order of keys, just leave the mods for after 5 rokov pred
  Reddo 8148495381 Fix bugs 5 rokov pred
  Reddo d13c1de1d8 typo 5 rokov pred

+ 0 - 2
app/Controls/Modules/KeyHandler.ts

@@ -351,8 +351,6 @@ module Controls.KeyHandler {
                 if (ma != mb) {
                     return ma - mb;
                 }
-                if (a.representation < b.representation) return -1;
-                else if (a.representation > b.representation) return 1;
                 return 0;
             });
 

+ 1 - 1
app/Controls/Modules/KeyHandler/KeySetter.ts

@@ -5,7 +5,7 @@ module Controls.KeyHandler.KeySetter {
     function printTable() {
         let p = document.createElement("p");
         p.classList.add("content");
-        p.appendChild(document.createTextNode("Each row usually has a purpose, though an row will do if there are not enough keys in the ideal row."));
+        p.appendChild(document.createTextNode("Each row usually has a purpose, though any row will do if there are not enough keys in the ideal row."));
         Elements.CurrentTurnHandler.print(p);
 
         p = document.createElement("p");

+ 50 - 0
app/Elements/Classes/Say.ts

@@ -37,6 +37,14 @@ class Say {
 
     private centered : boolean = false;
 
+    public static Action (a : any) {
+        return new SayAction(a);
+    }
+
+    public static Bold (a : any) {
+        return new SayBold(a);
+    }
+
     public static Mention (target : Thing, uppercase = true) : Array<any> {
         if (target == WorldState.player) {
             return [new SayYou(uppercase)];
@@ -57,6 +65,48 @@ class Say {
         }
     }
 
+    public Article (target : Thing, uppercase = true) {
+        let arr = [];
+        if (target.isUnique()) {
+            arr.push(new SayThe(uppercase));
+        } else {
+            arr.push(new SayAn(uppercase));
+        }
+        arr.push(target);
+        return arr;
+    }
+
+    /**
+     * He, She, It
+     * @param target
+     * @param uppercase
+     * @constructor
+     */
+    public Subject (target : Thing, uppercase = true) {
+        return new SayHeSheIt(target, uppercase);
+    }
+
+    /**
+     * Him, Her, It
+     * @param target
+     * @param uppercase
+     * @constructor
+     */
+    public Object (target : Thing, uppercase = true) {
+        return new SayHimHerIt(target, uppercase);
+    }
+
+    /**
+     * His, Hers, Its
+     * @param target
+     * @param uppercase
+     * @constructor
+     */
+    public Possessive (target : Thing, uppercase = true) {
+        return new SayHisHersIts(target, uppercase);
+    }
+
+
     public static Speak (speaker : Thing | string, ...message : Array<any>) {
         if (typeof speaker == "string") {
             return [new SayBold(speaker, ": "), ...message];

+ 3 - 1
app/Elements/Classes/Say/SayHeSheIt.ts

@@ -18,7 +18,9 @@ class SayHeSheIt extends Say {
         } else {
             if (next instanceof Humanoid) {
                 let gender = next.getGenderValue();
-                if (gender.genderValueCorrected > 65) {
+                if (WorldState.isPlayer(next)) {
+                    this.node.nodeValue = "I";
+                } else if (gender.genderValueCorrected > 65) {
                     this.node.nodeValue = "she ";
                 } else if (gender.genderValueCorrected < 35) {
                     this.node.nodeValue = "he ";

+ 3 - 1
app/Elements/Classes/Say/SayHimHerIt.ts

@@ -18,7 +18,9 @@ class SayHimHerIt extends Say {
         } else {
             if (next instanceof Humanoid) {
                 let gender = next.getGenderValue();
-                if (gender.genderValueCorrected > 65) {
+                if (WorldState.isPlayer(next)) {
+                    this.node.nodeValue = "me";
+                } else if (gender.genderValueCorrected > 65) {
                     this.node.nodeValue = "her ";
                 } else if (gender.genderValueCorrected < 35) {
                     this.node.nodeValue = "him ";

+ 3 - 1
app/Elements/Classes/Say/SayHisHersIts.ts

@@ -18,7 +18,9 @@ class SayHisHersIts extends Say {
         } else {
             if (next instanceof Humanoid) {
                 let gender = next.getGenderValue();
-                if (gender.genderValueCorrected > 65) {
+                if (WorldState.isPlayer(next)) {
+                    this.node.nodeValue = "my";
+                } else if (gender.genderValueCorrected > 65) {
                     this.node.nodeValue = "hers ";
                 } else if (gender.genderValueCorrected < 35) {
                     this.node.nodeValue = "his ";

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
content/PlayBegins/Dialogue/IntroMenu.dl


+ 2 - 2
content/PlayBegins/Dialogue/IntroMenu.dl.ts

@@ -1,4 +1,4 @@
-// File created automatically by custom Dialogger on 4/7/2019, 4:57:41 PM
+// File created automatically by custom Dialogger on 4/7/2019, 6:04:12 PM
 // Do not tamper with this file.
 // It will be replaced automatically by Dialogger and all changes will be lost.
 // Instead change IntroMenu.dl.
@@ -336,7 +336,7 @@ module DialogueTrees {
         
         
         node = new DialogueNode("3c334c63-9030-4fba-884e-a147f40eb8f5");
-        node.setNext("");
+        node.setNext("1");
         tree.addNode(node);
         
         return tree;

+ 5 - 0
sass/text/_say.scss

@@ -142,4 +142,9 @@ b.action {
   &::after {
     content: "* ";
   }
+}
+
+
+input.keySelectorInput {
+  width: 80%;
 }

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov