fixed origin on actor.json

Author: flipcoder

bin/data/actors/actor.json

@@ -2,7 +2,7 @@
     "type" : "sprite",
     "size" : [ 16, 16 ],
     "tile-size" : [ 16, 16 ],
-    "origin" : [ 8, 12 ],
+    "origin" : [ 0.5, 0.75 ],
     "mask" : [ 0.25, 0.5, 0.75, 1.0 ],
     "animation" : {
         "speed" : 10.0,

bin/data/audio/grampire-death.wav

@@ -3,24 +3,24 @@
     "actor": "grampire",
     "input": {
         "binds": {
-            "gamepad hat 0": "left",
-            "gamepad hat 1": "right",
-            "gamepad hat 2": "up",
-            "gamepad hat 3": "down",
-            "gamepad 0": [
+            "left": "left",
+            "right": "right",
+            "up": "up",
+            "down": "down",
+            "z": [
                 "shoot",
                 "select"
             ],
-            "gamepad 12": "sprint",
-            "gamepad 3": "strafe",
-            "gamepad 1": "reload",
-            "gamepad 4": [
+            "left shift": "sprint",
+            "x": "strafe",
+            "v": "reload",
+            "c": [
                 "next_weapon",
                 "back"
             ],
-            "gamepad 17": "previous_weapon",
-            "gamepad 20": "action",
-            "gamepad 21": "escape"
+            "d": "previous_weapon",
+            "a": "action",
+            "escape": "escape"
         }
     }
 }

bin/data/audio/grampire-hurt.wav

@@ -1,8 +1,8 @@
 {
    "audio" : {
-      "music-volume" : 0,
-      "sound-volume" : 0,
-      "volume" : 0
+      "music-volume" : 100,
+      "sound-volume" : 100,
+      "volume" : 100
    },
    "video" : {
       "resolution" : "1920x1080",

bin/profiles/default.json

@@ -9,11 +9,12 @@ Character :: Character(
     Cache<Resource, std::string>* resources,
     glm::vec3 pos = glm::vec3(0.0f)
 ):
+    Sprite(fn, resources, profile->config()->at<string>("actor"), pos),
     m_HP(100),
     m_MaxHP(100),
     m_Armor(0),
     m_MaxArmor(0),
-    Sprite(fn, resources, profile->config()->at<string>("actor"), pos),
+    m_Skin(profile->config()->at<string>("actor")),
     m_pSession(session),
     m_pProfile(profile),
     //m_pController(profile->controller().get()),

bin/settings.json

@@ -162,6 +162,7 @@ class Character:
         std::vector<std::string> m_Items;
         kit::reactive<int> m_Weapon = 0;
 
+        std::string m_Skin;
         Session* m_pSession = nullptr;
         Profile* m_pProfile = nullptr;
         Controller* m_pController = nullptr;

src/Character.cpp

@@ -93,7 +93,7 @@ void Thing :: init_thing()
         // so we offset
         move(glm::vec3(
             m_pSprite->origin().x * m_pSprite->size().x,
-            m_pSprite->origin().y  * m_pSprite->size().y,
+            m_pSprite->origin().y * m_pSprite->size().y,
             0.0f
         ));
         //m_pPlaceholder->detach(); // don't want to invalidate iterator