Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit 290ded5

Browse files
committed
cleaner, neater, changelog
1 parent 850024e commit 290ded5

File tree

3 files changed

+24
-3
lines changed

3 files changed

+24
-3
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
101101

102102
- New `Scene` Lua functions `AddNavigatableArea(areaName)` and `ClearNavigatableAreas()`. This can be used to restrict pathfinding to only search a set of areas that have been added to the scene before via `Scene:SetArea(area)`.
103103

104+
- New `ADoor` Lua function `ResetSensorTimer()`. Resets the sensor timer for that door, making it take the full SensorInterval again for it to detect actors.
105+
106+
- New `SceneObject` Lua functions `IsBuyableInScriptOnly()`, `IsBuyableInObjectPickerOnly()`, and `IsBuyableInBuyMenuOnly()`.
107+
104108
</details>
105109

106110
<details><summary><b>Changed</b></summary>
@@ -141,6 +145,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
141145

142146
- Script values, i.e `GetStringValue`, `RemoveStringValue`, `StringValueExists` and the associated functions for `GetNumberValue`/`GetObjectValue`, have been moved from MOSRotating to MovableObject, so now any object with script support can use these values.
143147

148+
- The `SceneObject` property `IsBuyable` is now a function, e.g. `IsBuyable()`.
149+
144150
</details>
145151

146152
<details><summary><b>Fixed</b></summary>

Entities/SceneObject.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,12 @@ class SceneObject : public Entity {
464464

465465
bool IsBuyable() const { return m_Buyable; }
466466

467+
/// <summary>
468+
/// Gets the BuyableMode of this SceneObject.
469+
/// </summary>
470+
/// <returns>The BuyableMode of this SceneObject</returns>
471+
BuyableMode GetBuyableMode() const { return m_BuyableMode; }
472+
467473
/// <summary>
468474
/// Gets whether this SceneObject is available only in the BuyMenu list when buyable.
469475
/// </summary>

Lua/LuaBindingsEntities.cpp

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1338,19 +1338,28 @@ namespace RTE {
13381338
.property("RotAngle", &SceneObject::GetRotAngle, &SceneObject::SetRotAngle)
13391339
.property("Team", &SceneObject::GetTeam, &SceneObject::SetTeam)
13401340
.property("PlacedByPlayer", &SceneObject::GetPlacedByPlayer, &SceneObject::SetPlacedByPlayer)
1341+
.property("Buyable", &SceneObject::IsBuyable)
1342+
.property("BuyableMode", &SceneObject::GetBuyableMode)
13411343

13421344
.def("IsBuyable", &SceneObject::IsBuyable)
1343-
.def("IsBuyableInScriptOnly", &SceneObject::IsBuyableInScriptOnly)
1344-
.def("IsBuyableInObjectPickerOnly", &SceneObject::IsBuyableInObjectPickerOnly)
13451345
.def("IsBuyableInBuyMenuOnly", &SceneObject::IsBuyableInBuyMenuOnly)
1346+
.def("IsBuyableInObjectPickerOnly", &SceneObject::IsBuyableInObjectPickerOnly)
1347+
.def("IsBuyableInScriptOnly", &SceneObject::IsBuyableInScriptOnly)
13461348
.def("IsOnScenePoint", &SceneObject::IsOnScenePoint)
13471349
.def("GetGoldValue", &SceneObject::GetGoldValueOld)
13481350
.def("GetGoldValue", &SceneObject::GetGoldValue)
13491351
.def("SetGoldValue", &SceneObject::SetGoldValue)
13501352
.def("GetGoldValueString", &SceneObject::GetGoldValueString)
13511353
.def("GetTotalValue", &SceneObject::GetTotalValue)
13521354

1353-
.def("GetTotalValue", &LuaAdaptersSceneObject::GetTotalValue);
1355+
.def("GetTotalValue", &LuaAdaptersSceneObject::GetTotalValue)
1356+
1357+
.enum_("BuyableMode")[
1358+
luabind::value("NORESTRICTIONS", SceneObject::BuyableMode::NoRestrictions),
1359+
luabind::value("BUYMENUONLY", SceneObject::BuyableMode::BuyMenuOnly),
1360+
luabind::value("OBJECTPICKERONLY", SceneObject::BuyableMode::ObjectPickerOnly),
1361+
luabind::value("SCRIPTONLY", SceneObject::BuyableMode::ScriptOnly)];
1362+
13541363
}
13551364

13561365
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)