1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-04 02:41:19 +00:00

Merge branch 'ejaansalah' into 'master'

Fix the spelling of expel in lua api

See merge request OpenMW/openmw!3608
This commit is contained in:
Alexei Kotov 2023-12-03 20:28:01 +00:00
commit 98dfb68d4a
2 changed files with 4 additions and 4 deletions

View File

@ -268,7 +268,7 @@ namespace MWLua
npcStats.setFactionReputation(factionId, existingReputation + value);
};
npc["expell"] = [](Object& actor, std::string_view faction) {
npc["expel"] = [](Object& actor, std::string_view faction) {
if (dynamic_cast<LObject*>(&actor) && !dynamic_cast<SelfObject*>(&actor))
throw std::runtime_error("Local scripts can modify only self");

View File

@ -846,14 +846,14 @@
-- NPC.modifyFactionReputation(player, "mages guild", 5);
---
-- Expell NPC from given faction.
-- Expel NPC from given faction.
-- Throws an exception if there is no such faction.
-- Note: expelled NPC still keeps his rank and reputation in faction, he just get an additonal flag for given faction.
-- @function [parent=#NPC] expell
-- @function [parent=#NPC] expel
-- @param openmw.core#GameObject actor NPC object
-- @param #string faction Faction ID
-- @usage local NPC = require('openmw.types').NPC;
-- NPC.expell(player, "mages guild");
-- NPC.expel(player, "mages guild");
---
-- Clear expelling of NPC from given faction.