~ Changed in-game text color for Neutral to yellow

+ Added game_object:set_character_icon(texture_name)
OpenXRay · Dec 23, 2017 · 986f036 · 986f036
1 parent 6aa30b9
commit 986f036
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/src/xrGame/InventoryOwner.h b/src/xrGame/InventoryOwner.h
@@ -171,6 +171,11 @@ class CInventoryOwner : public CAttachmentOwner
     virtual void SetReputation(CHARACTER_REPUTATION_VALUE);
     virtual void ChangeReputation(CHARACTER_REPUTATION_VALUE);
 
+    virtual void SetIcon(const shared_str& iconName)
+    {
+        CharacterInfo().m_SpecificCharacter.data()->m_icon_name = iconName;
+    }
+
     //для работы с relation system
     u16 object_id() const;
     CHARACTER_COMMUNITY_INDEX Community() const { return CharacterInfo().Community().index(); };

diff --git a/src/xrGame/script_game_object.h b/src/xrGame/script_game_object.h
@@ -916,7 +916,9 @@ class CScriptGameObject
     void SetActorRunCoef(float run_coef);
 
     float GetActorRunBackCoef() const;
-    void SetActorRunBackCoef(float run_back_coef);  
+    void SetActorRunBackCoef(float run_back_coef);
+
+    void SetCharacterIcon(pcstr iconName);
     //-Alundaio
 #endif // GAME_OBJECT_EXTENDED_EXPORTS
     doors::door* m_door;

diff --git a/src/xrGame/script_game_object_inventory_owner.cpp b/src/xrGame/script_game_object_inventory_owner.cpp
@@ -2069,5 +2069,17 @@ void CScriptGameObject::SetActorRunBackCoef(float run_back_coef)
     }
     pActor->m_fRunBackFactor = run_back_coef;
 }
+
+void CScriptGameObject::SetCharacterIcon(pcstr iconName)
+{
+    CInventoryOwner* pInventoryOwner = smart_cast<CInventoryOwner*>(&object());
+
+    if (!pInventoryOwner)
+    {
+        ai().script_engine().script_log(LuaMessageType::Error, "SetCharacterIcon available only for InventoryOwner");
+        return;
+    }
+    return pInventoryOwner->SetIcon(iconName);
+}
 #endif
 //-Alundaio
diff --git a/src/xrGame/script_game_object_script3.cpp b/src/xrGame/script_game_object_script3.cpp
@@ -387,6 +387,8 @@ class_<CScriptGameObject>& script_register_game_object2(class_<CScriptGameObject
         .def("get_max_uses", &CScriptGameObject::GetMaxUses)
         // Phantom
         .def("phantom_set_enemy", &CScriptGameObject::PhantomSetEnemy)
+        // Actor
+        .def("set_character_icon", &CScriptGameObject::SetCharacterIcon)
 #endif
         //-Alundaio
 

diff --git a/src/xrGame/ui/UIInventoryUtilities.cpp b/src/xrGame/ui/UIInventoryUtilities.cpp
@@ -533,7 +533,7 @@ u32 InventoryUtilities::GetGoodwillColor(CHARACTER_GOODWILL gw)
     u32 res = 0xffc0c0c0;
     if (gw == NEUTRAL_GOODWILL)
     {
-        res = 0xffc0c0c0;
+        res = 0xfffce80b; //0xffc0c0c0;
     }
     else if (gw > 1000)
     {
@@ -569,7 +569,7 @@ u32 InventoryUtilities::GetRelationColor(ALife::ERelationType relation)
     switch (relation)
     {
     case ALife::eRelationTypeFriend: return 0xff00ff00; break;
-    case ALife::eRelationTypeNeutral: return 0xffc0c0c0; break;
+    case ALife::eRelationTypeNeutral: return 0xfffce80b/*0xffc0c0c0*/; break;
     case ALife::eRelationTypeEnemy: return 0xffff0000; break;
     default: NODEFAULT;
     }