add achievements to storymode

TimRepke · Oct 20, 2016 · 4665a71 · 4665a71
1 parent e0aa1cb
commit 4665a71
Show file tree

Hide file tree

Showing 8 changed files with 949 additions and 1,085 deletions.
diff --git a/registration-system/index.php b/registration-system/index.php
@@ -421,7 +421,7 @@ private function showSignup($fahrt) {
                 else
                     header("Location: ?fid=" . $fid . "&saveerror=" . $saveResult);
             } else {
-                if (true or !isset($_REQUEST['hideErrors'])) {
+                if (!isset($_REQUEST['hideErrors'])) {
                     $this->showErrors($bachelor->getValidationErrors());
                 }
                 $signup_method->getFallbackMethod()->showInlineHTML();

diff --git a/registration-system/view/signups/game1/js/story.js b/registration-system/view/signups/game1/js/story.js
@@ -1149,10 +1149,7 @@ Story.credits = function () {
 
     function allDone() {
         clearInterval(standbyLoop);
-        Environment.fapi.setValue('signupstats', {
-            'method': 'game1',
-            'methodinfo': {'achievedAchievements': Game.achievements.achievedAchievements}
-        });
+        Environment.fapi.data.setSignupStats('game1', {'achievedAchievements': Game.achievements.achievedAchievements});
         Environment.fapi.submitSignup();
     }
 };

diff --git a/registration-system/view/signups/story/graphics/age.svg b/registration-system/view/signups/story/graphics/age.svg
diff --git a/registration-system/view/signups/story/graphics/begin.svg b/registration-system/view/signups/story/graphics/begin.svg
diff --git a/registration-system/view/signups/story/graphics/eat.svg b/registration-system/view/signups/story/graphics/eat.svg
diff --git a/registration-system/view/signups/story/graphics/travelEnd.svg b/registration-system/view/signups/story/graphics/travelEnd.svg
diff --git a/registration-system/view/signups/story/index.php b/registration-system/view/signups/story/index.php
@@ -23,7 +23,15 @@ public static function getLogo() {
     }
 
     public static function getScore($stats) {
-        return rand(30,99);
+        $allowedAchievements = ['test','stein','elch2','bagger','ball','ohh','star','park'];
+        if (isset($stats['achievements'])) {
+            $cnt = 0;
+            foreach($stats['achievements'] as $a){
+                if (in_array($a, $allowedAchievements)) $cnt++;
+            }
+            return round($cnt/count($allowedAchievements)*100);
+        }
+        return 0;
     }
 
     public static function getBadgeDetails($stats) {