X-Git-Url: https://troll.desast.re/troll.git/blobdiff_plain/3718f0ba0107aba513f5bca0af89b5840d91cbca..1b81f1485b013f0a008c6452c33b48e239ea79e8:/src/main/java/com/codingame/game/View.java?ds=inline

diff --git a/src/main/java/com/codingame/game/View.java b/src/main/java/com/codingame/game/View.java
index a032aff..99ad664 100644
--- a/src/main/java/com/codingame/game/View.java
+++ b/src/main/java/com/codingame/game/View.java
@@ -27,8 +27,7 @@ class View {
         STILL("stands still.", 1),
         RIGHT("walks right.", 2);
 
-        String movement;
-        int index;
+        String movement; int index;
         Dir(String mvt, int i) { movement = mvt; index = i; }
     }
 
@@ -237,7 +236,7 @@ class View {
     Model model;
     Random random = new Random();
     Text trollMessage;
-    Sprite troll;
+    Group troll;
     Text trollPositionGauge;
     Player p0 = new Player(), p1 = new Player();
     Text turnCounter; int _turns = 0;
@@ -350,12 +349,19 @@ class View {
     }
 
     private void drawTroll() {
-        troll = graphicEntityModule.createSprite()
-            .setImage("troll.png")
+        Sprite trollBody = graphicEntityModule.createSprite()
+            .setImage("troll_body.png")
             .setAnchorX(0.5)
             .setAnchorY(1)
+            .setTint(0xfac200);
+        Sprite trollPants = graphicEntityModule.createSprite()
+            .setImage("pants_red.png")
+            .setAnchorX(0.5)
+            .setAnchorY(1);
+        troll = graphicEntityModule.createGroup(trollBody, trollPants)
             .setX(1920/2)
             .setY(880)
+            .setScaleX(random.nextInt(2) == 0 ? 1 : -1)
             .setZIndex(2);
         trollPositionGauge = graphicEntityModule.createText()
             .setZIndex(2)
@@ -375,6 +381,7 @@ class View {
             .setStrokeColor(0xFFFF00)
             .setFillColor(0xFFFF00)
             .setFontSize(40);
+        toggleModule.displayOnToggleState(trollMessage, "verboseTrolling", true);
     }
 
     private void moveTroll() {
@@ -503,16 +510,18 @@ class View {
             return specials[random.nextInt(specials.length)];
         }
 
-        int i = random.nextInt(directed.length + isotropic.length);
+        // yup, still biased
+        int i = random.nextInt(directed.length + isotropic.length / 3);
         if (i < directed.length) {
             return directed[i][d.index];
         }
         else {
-            return isotropic[i-directed.length];
+            return isotropic[random.nextInt(isotropic.length)];
         }
     }
 
     String specials[] = {
+        "Never gonna give you up\nNever gonna let you down\nNever gonna run around and desert you\nNever gonna make you cry\nNever gonna say goodbye\nNever gonna tell a lie and hurt you",
         "CG know what they're doing."
     };
 
@@ -521,23 +530,22 @@ class View {
         { "Han shot first", "I am your father", "Greedo shot first" },
 
         // everyday life
-        { "tea > coffee", "XXX", "coffee > tea" },
+        { "tea > coffee", "just drink\nkool-aid", "coffee > tea" },
         { "Marvel > DC", "Disney > 50 shades", "DC > Marvel" },
-
-        // troll ou incompris ou SJW
+        { "cats > dogs", "humans make\ngood pets", "dogs > cats" },
 
         // gaming
         { "PC > console", "pong is still\nunequaled", "console > PC" },
         { "Windows > Linux", "it's all Android anyway", "Linux > Windows" },
         { "pad > stick", "mouse gaming is lame", "stick > pad" },
         { "RTS > FPS", "solitaire best game", "FPS > RTS" },
-        { "YT gaming > twitch", "I stream on dailymotion", "twitch > YT gaming" },
+        { "YT gaming > twitch", "i watch other ppl play", "twitch > YT gaming" },
 
         // programming
-        { "vi < emacs", "I code with Notepad", "emacs > vi" },
+        { "vi < emacs", "i code with Notepad", "emacs > vi" },
         { "tabs < spaces", "gofmt FTW", "spaces < tabs" },
-        { "LISP is the most\npowerful language", "HTML is a programming language", "Forth is the most\npowerful language" },
-        { "static linking best", "symbolic linking best", "dynamic linking best" },
+        { "LISP is the most\npowerful language", "HTML is a\nprogramming language", "FORTH is the most\npowerful language" },
+        { "static linking best", "symlinking best", "dynamic linking best" },
         { "NPE > SIGSEGV", "kernel panic", "SIGSEGV > NPE" },
         { "objects > functions", "it's closures\nall the way down", "functions > objects" },
         { "GOTO FTW", "COME FROM FTW", "don't use GOTO" },
@@ -546,18 +554,30 @@ class View {
         // Internet
         { "gmail > github", "copy-paste FTW", "github > gmail" },
         { "MSIE > Safari", "Opera did it first", "Safari > MSIE" },
+        { "bing > yahoo", "duckduckgo best SE", "yahoo > bing" },
+        { "jira > trello", "bugzilla FTW", "trello > jira" },
+        { "IRC > slack", "chat is work", "discord < IRC" },
+        { "trolls > SJW", "i'm not trolling\njust misunderstood", "SJW > trolls" },
 
         // CodinGame
-        { "bing > yahoo", "duckduckgo best SE", "yahoo > bing" },
+        { "searcho no chokudai", "GAimax is True AI", "Smitsimax FTW" },
+        { "Automaton2000 > NN", "bots > humans", "AutomatonNN > 2000" },
         { "light theme best", "ascii > graphics", "dark theme best" },
-        { "simulation beats heuristics", "AI is a forest of ifs", "heuristics beat simulation" },
-        { "bruteforce always prevails", "you'll timeout anyway", "algorithms always prevail" }
+        { "simulation > heuristics", "true AI is just ifs", "heuristics > simulation" },
+        { "bruteforce FTW", "you'll timeout anyway", "algorithms FTW" }
     };
 
     String isotropic[] = {
         "Electron apps are the fastest",
         "Rosebud",
         "Thanos did nothing wrong",
-        "developers developers developers"
+        "developers developers developers",
+        "the cloud is just\nother ppl's computers",
+        "ur doin it rong",
+        "tortue",
+        "how is ur csb",
+        "31OCT = 25DEC",
+        "ASCII stupid question\nget a stupid ANSI",
+        "trolling is a art"
     };
 }